From 5cb36ed706c909f1470ae1bdb988ab486be1197c Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Fri, 4 May 2018 15:08:17 -0700
Subject: [PATCH 001/582] test: fix firebase deployment script test

When I fixed the project id in 2c4850dc582287b7c34d4d26066fe4993638cbf0,
I didn't realize we had a test that verified the wrong behavior.
---
 aio/scripts/deploy-to-firebase.test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/scripts/deploy-to-firebase.test.sh b/aio/scripts/deploy-to-firebase.test.sh
index 6093a3ab0e..0ffea8e128 100755
--- a/aio/scripts/deploy-to-firebase.test.sh
+++ b/aio/scripts/deploy-to-firebase.test.sh
@@ -94,7 +94,7 @@ Deployment URL    : https://angular.io/"
   )
   expected="Git branch        : 2.4.x
 Build/deploy mode : archive
-Firebase project  : angular-io-2
+Firebase project  : v2-angular-io
 Deployment URL    : https://v2.angular.io/"
   check "$actual" "$expected"
 )

From 14d8a980014900254c48928a7f7e01639f209f68 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 25 Apr 2018 13:40:49 +0300
Subject: [PATCH 002/582] refactor(aio): include print styles last to overwrite
 other styles (#23538)

PR Close #23538
---
 aio/src/styles/1-layouts/_layouts-dir.scss                | 1 -
 .../styles/{1-layouts/_print-layout.scss => _print.scss}  | 8 ++++----
 aio/src/styles/main.scss                                  | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename aio/src/styles/{1-layouts/_print-layout.scss => _print.scss} (97%)

diff --git a/aio/src/styles/1-layouts/_layouts-dir.scss b/aio/src/styles/1-layouts/_layouts-dir.scss
index c6f80728b4..93311dc79d 100644
--- a/aio/src/styles/1-layouts/_layouts-dir.scss
+++ b/aio/src/styles/1-layouts/_layouts-dir.scss
@@ -12,4 +12,3 @@
 @import 'sidenav';
 @import 'table-of-contents';
 @import 'top-menu';
-@import 'print-layout';
\ No newline at end of file
diff --git a/aio/src/styles/1-layouts/_print-layout.scss b/aio/src/styles/_print.scss
similarity index 97%
rename from aio/src/styles/1-layouts/_print-layout.scss
rename to aio/src/styles/_print.scss
index da26469d5a..38044f59b9 100644
--- a/aio/src/styles/1-layouts/_print-layout.scss
+++ b/aio/src/styles/_print.scss
@@ -16,7 +16,7 @@
 
     ul, ol, img, code-example, table, tr, .alert, .l-subsection, .feature {
         page-break-inside: avoid;
-    }   
+    }
 
     table tbody tr:last-child td {
         border-bottom: 1px solid $lightgray !important;
@@ -80,7 +80,7 @@
         }
     }
 
-    .content code { 
+    .content code {
         border: 0.5px solid $lightgray;
     }
 
@@ -96,7 +96,7 @@
         }
     }
 
-    .api-header label { 
+    .api-header label {
         color: $darkgray !important;
         font-weight: bold !important;
         margin: 2px !important;
@@ -107,4 +107,4 @@
     .feature-section img {
         max-width: 70px !important;
     }
-}
\ No newline at end of file
+}
diff --git a/aio/src/styles/main.scss b/aio/src/styles/main.scss
index 2809816ed8..8ca81bc8f8 100755
--- a/aio/src/styles/main.scss
+++ b/aio/src/styles/main.scss
@@ -12,3 +12,6 @@
 @import './0-base/base-dir';
 @import './1-layouts/layouts-dir';
 @import './2-modules/modules-dir';
+
+// import print styles
+@import './print';

From 3f20a5c7c8f9125755063ff90ee38faa830a1c3d Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 25 Apr 2018 13:47:14 +0300
Subject: [PATCH 003/582] refactor(aio): use the same selectors for screen and
 print styles (#23538)

PR Close #23538
---
 aio/src/styles/2-modules/_code.scss |  2 +-
 aio/src/styles/_print.scss          | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/aio/src/styles/2-modules/_code.scss b/aio/src/styles/2-modules/_code.scss
index 28396360e2..b2806bfa25 100644
--- a/aio/src/styles/2-modules/_code.scss
+++ b/aio/src/styles/2-modules/_code.scss
@@ -179,7 +179,7 @@ ol.linenums {
 /* SHELL / TERMINAL CODE BLOCKS */
 
 code-example.code-shell, code-example[language=sh], code-example[language=bash] {
-  & .pnk, .blk,.pln, .otl, .kwd, .typ, .tag, .str, .atv, .atn, .com, .lit, .pun, .dec {
+  .pnk, .blk, .pln, .otl, .kwd, .typ, .tag, .str, .atv, .atn, .com, .lit, .pun, .dec {
     color: $codegreen;
   }
 }
diff --git a/aio/src/styles/_print.scss b/aio/src/styles/_print.scss
index 38044f59b9..f15de7d455 100644
--- a/aio/src/styles/_print.scss
+++ b/aio/src/styles/_print.scss
@@ -66,12 +66,10 @@
     }
 
     code-example {
-        pre.lang-bash code span {
-            color: $mediumgray !important;
-        }
-
-        pre.lang-sh code span {
-            color: $darkgray !important;
+        &.code-shell, &[language=sh], &[language=bash] {
+            .pnk, .blk, .pln, .otl, .kwd, .typ, .tag, .str, .atv, .atn, .com, .lit, .pun, .dec {
+                color: $darkgray;
+            }
         }
 
         header {

From 57cf5509e68ec6b3bdcc667d12356013ba6c74b1 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 25 Apr 2018 13:48:44 +0300
Subject: [PATCH 004/582] fix(aio): fix `code-example` print styles when
 printing backgrounds (#23538)

Fixes #23431

PR Close #23538
---
 aio/src/styles/_print.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aio/src/styles/_print.scss b/aio/src/styles/_print.scss
index f15de7d455..07aa7c20f3 100644
--- a/aio/src/styles/_print.scss
+++ b/aio/src/styles/_print.scss
@@ -67,12 +67,15 @@
 
     code-example {
         &.code-shell, &[language=sh], &[language=bash] {
+            background: none;
+
             .pnk, .blk, .pln, .otl, .kwd, .typ, .tag, .str, .atv, .atn, .com, .lit, .pun, .dec {
                 color: $darkgray;
             }
         }
 
         header {
+            background: none;
             border: 0.5px solid $lightgray;
             color: $darkgray;
         }

From 3b067c85795c258f6583e4d3425137a0bdadd857 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 25 Apr 2018 13:50:31 +0300
Subject: [PATCH 005/582] fix(aio): remove main background color when printing
 (#23538)

PR Close #23538
---
 aio/src/styles/_print.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aio/src/styles/_print.scss b/aio/src/styles/_print.scss
index 07aa7c20f3..6364dcf795 100644
--- a/aio/src/styles/_print.scss
+++ b/aio/src/styles/_print.scss
@@ -5,6 +5,10 @@
         box-shadow: none !important;
     }
 
+    body, mat-sidenav-container {
+        background: none !important;
+    }
+
     h1 {
         height: 40px !important;
         color: $darkgray !important;

From b25e15c31720d241a98d589af577ac7d3e7231d7 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Thu, 3 May 2018 15:55:38 -0700
Subject: [PATCH 006/582] feat(aio): add v6 release notification (#23690)

PR Close #23690
---
 aio/src/app/app.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/aio/src/app/app.component.html b/aio/src/app/app.component.html
index 3519891b06..1e7ad72a53 100644
--- a/aio/src/app/app.component.html
+++ b/aio/src/app/app.component.html
@@ -8,13 +8,13 @@
   <mat-toolbar-row class="notification-container">
     <aio-notification
       icon="insert_comment"
-      iconLabel="Survey"
-      buttonText="Go to survey"
-      actionUrl="https://bit.ly/angular-survey-2018"
-      notificationId="survey-january-2018"
-      expirationDate="2018-01-19"
+      iconLabel="Announcement"
+      buttonText="Learn More"
+      actionUrl="https://blog.angular.io/version-6-0-0-of-angular-now-available-cc56b0efa7a4"
+      notificationId="angular-v6-announcement"
+      expirationDate="2018-07-01"
       (dismissed)="notificationDismissed()">
-      Help Angular by taking a <b>1 minute survey</b>!
+      Version 6 of Angular Now Available!
     </aio-notification>
   </mat-toolbar-row>
   <mat-toolbar-row>

From e3e15773eeec6a08f1333a87ebc6d10927a48a59 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 30 Apr 2018 12:48:24 -0700
Subject: [PATCH 007/582] build: update bazel to 0.13 (#23623)

PR Close #23623
---
 .circleci/config.yml         |  4 ++--
 WORKSPACE                    | 12 ++++++------
 tools/ngcontainer/Dockerfile |  2 +-
 tools/ngcontainer/README.md  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f374b332c6..236e4d1bc2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.2.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.2.0
+var_1: &docker_image angular/ngcontainer:0.3.0
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.0
 
 # Define common ENV vars
 var_3: &define_env_vars
diff --git a/WORKSPACE b/WORKSPACE
index 75bf37f86b..66e4591dd7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -9,7 +9,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.11.1")
+check_bazel_version("0.13.0")
 node_repositories(package_json = ["//:package.json"])
 
 yarn_install(
@@ -50,13 +50,13 @@ local_repository(
 # This commit matches the version of buildifier in angular/ngcontainer
 # If you change this, also check if it matches the version in the angular/ngcontainer
 # version in /.circleci/config.yml
-BAZEL_BUILDTOOLS_VERSION = "70bc7843bb9950fece2bc014ed16de03419e36e2"
+BAZEL_BUILDTOOLS_VERSION = "fd9878fd5de921e0bbab3dcdcb932c2627812ee1"
 
 http_archive(
     name = "com_github_bazelbuild_buildtools",
     url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
     strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
-    sha256 = "367c23a5fe7fc2a7cb57863d3718b4149f0e57426c48c8ad54c45348a0b53cc1",
+    sha256 = "27bb461ade23fd44ba98723ad98f84ee9c83cd3540b773b186a1bc5037f3d862",
 )
 
 http_archive(
@@ -74,9 +74,9 @@ go_register_toolchains()
 # Fetching the Bazel source code allows us to compile the Skylark linter
 http_archive(
     name = "io_bazel",
-    url = "https://github.com/bazelbuild/bazel/archive/5a35e72f9e97c06540c479f8c31512fb4656202f.zip",
-    strip_prefix = "bazel-5a35e72f9e97c06540c479f8c31512fb4656202f",
-    sha256 = "ed33a52874c14e3b487fb50f390c541fab9c81a33d986d38fb01766a66dbcd21",
+    url = "https://github.com/bazelbuild/bazel/archive/968f87900dce45a7af749a965b72dbac51b176b3.zip",
+    strip_prefix = "bazel-968f87900dce45a7af749a965b72dbac51b176b3",
+    sha256 = "e373d2ae24955c1254c495c9c421c009d88966565c35e4e8444c082cb1f0f48f",
 )
 
 # We have a source dependency on the Devkit repository, because it's built with
diff --git a/tools/ngcontainer/Dockerfile b/tools/ngcontainer/Dockerfile
index 69828df569..0c3f41421f 100644
--- a/tools/ngcontainer/Dockerfile
+++ b/tools/ngcontainer/Dockerfile
@@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
 ###
 # Bazel install
 # See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
-RUN BAZEL_VERSION="0.11.1" \
+RUN BAZEL_VERSION="0.13.0" \
  && wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
  && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
  && apt-get update \
diff --git a/tools/ngcontainer/README.md b/tools/ngcontainer/README.md
index 9037feadf2..0a9e0e9d9e 100644
--- a/tools/ngcontainer/README.md
+++ b/tools/ngcontainer/README.md
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
 - npm 5.5.1
 - yarn 1.3.2
 - Java 8 (for Closure Compiler and Bazel)
-- Bazel build tool v0.11.1 - http://bazel.build
+- Bazel build tool v0.13.0 - http://bazel.build
 - Google Chrome 63.0.3239.84
 - Mozilla Firefox 47.0.1
 - xvfb (virtual framebuffer) for headless testing

From 7e9649bdf1483885d61142172be3f709cde051e8 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 3 May 2018 11:55:56 -0700
Subject: [PATCH 008/582] build: update to latest nodejs bazel rules (#23683)

PR Close #23683
---
 WORKSPACE                   | 6 +++---
 integration/bazel/WORKSPACE | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 66e4591dd7..9328952214 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,9 +2,9 @@ workspace(name = "angular")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/1931156c232a08356dfda02e9c8b0275c2e63c00.zip",
-    strip_prefix = "rules_nodejs-1931156c232a08356dfda02e9c8b0275c2e63c00",
-    sha256 = "9cfe33276a6ac0076ee9ee159c4a2576f9851c0f437435b5ac19b2e592493078",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip",
+    strip_prefix = "rules_nodejs-0.8.0",
+    sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index a441cfcd15..e91d724fa3 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -2,9 +2,9 @@ workspace(name = "bazel_integration_test")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/cd368bd71a4b04fae0eafb5c5e2c906a93772584.zip",
-    strip_prefix = "rules_nodejs-cd368bd71a4b04fae0eafb5c5e2c906a93772584",
-    sha256 = "db74c61dd8bf73cc50aed56e78b7a8ad383f5869206901506cf8d3ee27f9277f",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip",
+    strip_prefix = "rules_nodejs-0.8.0",
+    sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")

From 005dc8f68b9d09f2a4db46bdbfae3e05d3604818 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 3 May 2018 10:30:58 +0100
Subject: [PATCH 009/582] docs(animations): fix content errors (#23668)

PR Close #23668
---
 packages/animations/src/animation_metadata.ts | 120 ++++++++++--------
 1 file changed, 67 insertions(+), 53 deletions(-)

diff --git a/packages/animations/src/animation_metadata.ts b/packages/animations/src/animation_metadata.ts
index cd0e463c06..a139972f21 100755
--- a/packages/animations/src/animation_metadata.ts
+++ b/packages/animations/src/animation_metadata.ts
@@ -236,8 +236,8 @@ export declare interface AnimationQueryOptions extends AnimationOptions {
  * Metadata representing the entry of animations. Instances of this interface are provided via the
  * animation DSL when the {@link stagger stagger animation function} is called.
  *
-* @experimental Animation support is experimental.
-*/
+ * @experimental Animation support is experimental.
+ */
 export interface AnimationStaggerMetadata extends AnimationMetadata {
   timings: string|number;
   animation: AnimationMetadata|AnimationMetadata[];
@@ -256,15 +256,14 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * Triggers are registered within the component annotation data under the
  * {@link Component#animations animations section}. An animation trigger can be placed on an element
  * within a template by referencing the name of the trigger followed by the expression value that
- the
- * trigger is bound to (in the form of `[@triggerName]="expression"`.
+ * the trigger is bound to (in the form of `[@triggerName]="expression"`.
  *
  * Animation trigger bindings strigify values and then match the previous and current values against
  * any linked transitions. If a boolean value is provided into the trigger binding then it will both
  * be represented as `1` or `true` and `0` or `false` for a true and false boolean values
  * respectively.
  *
- * ### Usage
+ * **Usage**
  *
  * `trigger` will create an animation trigger reference based on the provided `name` value. The
  * provided `animation` value is expected to be an array consisting of {@link state state} and
@@ -289,22 +288,27 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * ```
  *
  * The template associated with this component will make use of the `myAnimationTrigger` animation
- trigger by binding to an element within its template code.
+ * trigger by binding to an element within its template code.
  *
  * ```html
  * <!-- somewhere inside of my-component-tpl.html -->
  * <div [@myAnimationTrigger]="myStatusExp">...</div>
  * ```
  *
- * ### Using an inline function
+ * **Using an inline function**
+ *
  * The `transition` animation method also supports reading an inline function which can decide
  * if its associated animation should be run.
  *
  * ```
  * // this method will be run each time the `myAnimationTrigger`
  * // trigger value changes...
- * function myInlineMatcherFn(fromState: string, toState: string, element: any, params: {[key:
- string]: any}): boolean {
+ * function myInlineMatcherFn(
+ *   fromState: string,
+ *   toState: string,
+ *   element: any,
+ *   params: {[key: string]: any}
+ * ): boolean {
  *   // notice that `element` and `params` are also available here
  *   return toState == 'yes-please-animate';
  * }
@@ -328,13 +332,14 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * The inline method will be run each time the trigger
  * value changes
  *
- * ## Disable Animations
+ * **Disable Animations**
+ *
  * A special animation control binding called `@.disabled` can be placed on an element which will
- then disable animations for any inner animation triggers situated within the element as well as
- any animations on the element itself.
+ * then disable animations for any inner animation triggers situated within the element as well as
+ * any animations on the element itself.
  *
  * When true, the `@.disabled` binding will prevent all animations from rendering. The example
- below shows how to use this feature:
+ * below shows how to use this feature:
  *
  * ```ts
  * @Component({
@@ -357,16 +362,17 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * ```
  *
  * The `@childAnimation` trigger will not animate because `@.disabled` prevents it from happening
- (when true).
+ * (when true).
  *
  * Note that `@.disabled` will only disable all animations (this means any animations running on
  * the same element will also be disabled).
  *
- * ### Disabling Animations Application-wide
+ * **Disabling Animations Application-wide**
+ *
  * When an area of the template is set to have animations disabled, **all** inner components will
- also have their animations disabled as well. This means that all animations for an angular
- application can be disabled by placing a host binding set on `@.disabled` on the topmost Angular
- component.
+ * also have their animations disabled as well. This means that all animations for an angular
+ * application can be disabled by placing a host binding set on `@.disabled` on the topmost Angular
+ * component.
  *
  * ```ts
  * import {Component, HostBinding} from '@angular/core';
@@ -381,19 +387,20 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * }
  * ```
  *
- * ### What about animations that us `query()` and `animateChild()`?
- * Despite inner animations being disabled, a parent animation can {@link query query} for inner
- elements located in disabled areas of the template and still animate them as it sees fit. This is
- also the case for when a sub animation is queried by a parent and then later animated using {@link
- animateChild animateChild}.
-
- * ### Detecting when an animation is disabled
+ * **What about animations that use `query()` and `animateChild()`?**
+ *
+ * Despite inner animations being disabled, a parent animation can `query` for inner
+ * elements located in disabled areas of the template and still animate them as it sees fit. This is
+ * also the case for when a sub animation is queried by a parent and then later animated using
+ * animateChild`.
+ *
+ * **Detecting when an animation is disabled**
+ *
  * If a region of the DOM (or the entire application) has its animations disabled, then animation
  * trigger callbacks will still fire just as normal (only for zero seconds).
  *
  * When a trigger callback fires it will provide an instance of an {@link AnimationEvent}. If
- animations
- * are disabled then the `.disabled` flag on the event will be true.
+ * animations are disabled then the `.disabled` flag on the event will be true.
  *
  * @experimental Animation support is experimental.
  */
@@ -403,8 +410,8 @@ export function trigger(name: string, definitions: AnimationMetadata[]): Animati
 
 /**
  * `animate` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
+ * animation DSL language. If this information is new, please navigate to the
+ * {@link Component#animations component animations metadata page} to gain a better understanding of
  * how animations in Angular are used.
  *
  * `animate` specifies an animation step that will apply the provided `styles` data for a given
@@ -412,7 +419,8 @@ export function trigger(name: string, definitions: AnimationMetadata[]): Animati
  * to be used within {@link sequence an animation sequence}, {@link group group}, or {@link
  * transition transition}.
  *
- * ### Usage
+ * {@a usage}
+ * **Usage**
  *
  * The `animate` function accepts two input parameters: `timing` and `styles`:
  *
@@ -465,7 +473,7 @@ export function animate(
  * transition} and it will only continue to the next instruction once all of the inner animation
  * steps have completed.
  *
- * ### Usage
+ * **Usage**
  *
  * The `steps` data that is passed into the `group` animation function can either consist of {@link
  * style style} or {@link animate animate} function calls. Each call to `style()` or `animate()`
@@ -504,7 +512,7 @@ export function group(
  * To perform animation styling in parallel with other animation steps then have a look at the
  * {@link group group} animation function.
  *
- * ### Usage
+ * **Usage**
  *
  * The `steps` data that is passed into the `sequence` animation function can either consist of
  * {@link style style} or {@link animate animate} function calls. A call to `style()` will apply the
@@ -529,15 +537,15 @@ export function sequence(steps: AnimationMetadata[], options: AnimationOptions |
 
 /**
  * `style` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
+ * animation DSL language. If this information is new, please navigate to the
+ * {@link Component#animations component animations metadata page} to gain a better understanding of
  * how animations in Angular are used.
  *
  * `style` declares a key/value object containing CSS properties/styles that can then be used for
  * {@link state animation states}, within an {@link sequence animation sequence}, or as styling data
  * for both {@link animate animate} and {@link keyframes keyframes}.
  *
- * ### Usage
+ * **Usage**
  *
  * `style` takes in a key/value string map as data and expects one or more CSS property/value pairs
  * to be defined.
@@ -550,7 +558,7 @@ export function sequence(steps: AnimationMetadata[], options: AnimationOptions |
  * style({ width: 100, height: 0 })
  * ```
  *
- * #### Auto-styles (using `*`)
+ * **Auto-styles (using `*`)**
  *
  * When an asterix (`*`) character is used as a value then it will be detected from the element
  * being animated and applied as animation data when the animation starts.
@@ -589,18 +597,18 @@ export function style(
  * function. To register states to an animation trigger please have a look at the {@link trigger
  * trigger} function.
  *
- * #### The `void` state
+ * **The `void` state**
  *
  * The `void` state value is a reserved word that angular uses to determine when the element is not
  * apart of the application anymore (e.g. when an `ngIf` evaluates to false then the state of the
  * associated element is void).
  *
- * #### The `*` (default) state
+ * **The `*` (default) state**
  *
  * The `*` state (when styled) is a fallback state that will be used if the state that is being
  * animated is not declared within the trigger.
  *
- * ### Usage
+ * **Usage**
  *
  * `state` will declare an animation state with its associated styles
  * within the given trigger.
@@ -631,14 +639,14 @@ export function state(
 
 /**
  * `keyframes` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
+ * animation DSL language. If this information is new, please navigate to the
+ * {@link Component#animations component animations metadata page} to gain a better understanding
+ * of how animations in Angular are used.
  *
  * `keyframes` specifies a collection of {@link style style} entries each optionally characterized
  * by an `offset` value.
  *
- * ### Usage
+ * **Usage**
  *
  * The `keyframes` animation function is designed to be used alongside the {@link animate animate}
  * animation function. Instead of applying animations from where they are currently to their
@@ -697,7 +705,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * to animate to a state value and persist its styles then one or more {@link state animation
  * states} is expected to be defined.
  *
- * ### Usage
+ * **Usage**
  *
  * An animation transition is kicked off the `stateChangeExpr` predicate evaluates to true based on
  * what the previous state is and what the current state has become. In other words, if a transition
@@ -748,7 +756,8 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * <div [@myAnimationTrigger]="myStatusExp">...</div>
  * ```
  *
- * #### The final `animate` call
+ * {@a the-final-animate-call}
+ * **The final `animate` call**
  *
  * If the final step within the transition steps is a call to `animate()` that **only** uses a
  * timing value with **no style data** then it will be automatically used as the final animation arc
@@ -765,7 +774,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * ### Using :enter and :leave
+ * **Using :enter and :leave**
  *
  * Given that enter (insertion) and leave (removal) animations are so common, the `transition`
  * function accepts both `:enter` and `:leave` values which are aliases for the `void => *` and `*
@@ -781,7 +790,8 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * ### Boolean values
+ * **Boolean values**
+ *
  * if a trigger binding value is a boolean value then it can be matched using a transition
  * expression that compares `true` and `false` or `1` and `0`.
  *
@@ -797,7 +807,8 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * ### Using :increment and :decrement
+ * **Using :increment and :decrement**
+ *
  * In addition to the :enter and :leave transition aliases, the :increment and :decrement aliases
  * can be used to kick off a transition when a numeric value has increased or decreased in value.
  *
@@ -1006,7 +1017,8 @@ export function animation(
  *
  * Now each of the sub animations start off with respect to the `100ms` staggering step.
  *
- * ## The first frame of child animations
+ * **The first frame of child animations**
+ *
  * When sub animations are executed using `animateChild` the animation engine will always apply the
  * first frame of every sub animation immediately at the start of the animation sequence. This way
  * the parent animation does not need to set any initial styling data on the sub elements before the
@@ -1050,7 +1062,7 @@ export function useAnimation(
  * to the queried element (by default, an array is provided, then this will be
  * treated as an animation sequence).
  *
- * ### Usage
+ * **Usage**
  *
  * query() is designed to collect multiple elements and works internally by using
  * `element.querySelectorAll`. An additional options object can be provided which
@@ -1073,7 +1085,8 @@ export function useAnimation(
  * ], { optional: true })
  * ```
  *
- * ### Special Selector Values
+ * **Special Selector Values**
+ *
  *
  * The selector value within a query can collect elements that contain angular-specific
  * characteristics
@@ -1095,7 +1108,8 @@ export function useAnimation(
  *  query(':self, .record:enter, .record:leave, @subTrigger', [...])
  *  ```
  *
- * ### Demo
+ * **Demo**
+ *
  *
  * ```
  * @Component({
@@ -1144,7 +1158,7 @@ export function query(
  * animation DSL language. It is designed to be used inside of an animation {@link query query()}
  * and works by issuing a timing gap between after each queried item is animated.
  *
- * ### Usage
+ * **Usage**
  *
  * In the example below there is a container element that wraps a list of items stamped out
  * by an ngFor. The container element contains an animation trigger that will later be set

From e3518967ad705b133ee21eedcf9546b5cb2e817e Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 3 May 2018 10:31:30 +0100
Subject: [PATCH 010/582] style(animations): fix short param names (#23668)

PR Close #23668
---
 packages/animations/src/players/animation_player.ts | 4 ++--
 tools/public_api_guard/animations/animations.d.ts   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/animations/src/players/animation_player.ts b/packages/animations/src/players/animation_player.ts
index de3dfb4ffa..d88f733b19 100644
--- a/packages/animations/src/players/animation_player.ts
+++ b/packages/animations/src/players/animation_player.ts
@@ -26,7 +26,7 @@ export interface AnimationPlayer {
   finish(): void;
   destroy(): void;
   reset(): void;
-  setPosition(p: any /** TODO #9100 */): void;
+  setPosition(position: number): void;
   getPosition(): number;
   parentPlayer: AnimationPlayer|null;
   readonly totalTime: number;
@@ -93,7 +93,7 @@ export class NoopAnimationPlayer implements AnimationPlayer {
     }
   }
   reset(): void {}
-  setPosition(p: number): void {}
+  setPosition(position: number): void {}
   getPosition(): number { return 0; }
 
   /* @internal */
diff --git a/tools/public_api_guard/animations/animations.d.ts b/tools/public_api_guard/animations/animations.d.ts
index 07f51a54f8..b0f5a005b0 100644
--- a/tools/public_api_guard/animations/animations.d.ts
+++ b/tools/public_api_guard/animations/animations.d.ts
@@ -115,7 +115,7 @@ export interface AnimationPlayer {
     play(): void;
     reset(): void;
     restart(): void;
-    setPosition(p: any): void;
+    setPosition(position: number): void;
 }
 
 /** @experimental */
@@ -216,7 +216,7 @@ export declare class NoopAnimationPlayer implements AnimationPlayer {
     play(): void;
     reset(): void;
     restart(): void;
-    setPosition(p: number): void;
+    setPosition(position: number): void;
 }
 
 /** @experimental */

From 44095d95c97f7b89de98ad0eec21650324b88319 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Sat, 5 May 2018 08:34:25 -0700
Subject: [PATCH 011/582] Revert "docs(animations): fix content errors
 (#23668)"

This reverts commit 005dc8f68b9d09f2a4db46bdbfae3e05d3604818.

The PR accidently introduced a breaking change
https://github.com/angular/angular/pull/23668#discussion_r186265055
---
 packages/animations/src/animation_metadata.ts | 120 ++++++++----------
 1 file changed, 53 insertions(+), 67 deletions(-)

diff --git a/packages/animations/src/animation_metadata.ts b/packages/animations/src/animation_metadata.ts
index a139972f21..cd0e463c06 100755
--- a/packages/animations/src/animation_metadata.ts
+++ b/packages/animations/src/animation_metadata.ts
@@ -236,8 +236,8 @@ export declare interface AnimationQueryOptions extends AnimationOptions {
  * Metadata representing the entry of animations. Instances of this interface are provided via the
  * animation DSL when the {@link stagger stagger animation function} is called.
  *
- * @experimental Animation support is experimental.
- */
+* @experimental Animation support is experimental.
+*/
 export interface AnimationStaggerMetadata extends AnimationMetadata {
   timings: string|number;
   animation: AnimationMetadata|AnimationMetadata[];
@@ -256,14 +256,15 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * Triggers are registered within the component annotation data under the
  * {@link Component#animations animations section}. An animation trigger can be placed on an element
  * within a template by referencing the name of the trigger followed by the expression value that
- * the trigger is bound to (in the form of `[@triggerName]="expression"`.
+ the
+ * trigger is bound to (in the form of `[@triggerName]="expression"`.
  *
  * Animation trigger bindings strigify values and then match the previous and current values against
  * any linked transitions. If a boolean value is provided into the trigger binding then it will both
  * be represented as `1` or `true` and `0` or `false` for a true and false boolean values
  * respectively.
  *
- * **Usage**
+ * ### Usage
  *
  * `trigger` will create an animation trigger reference based on the provided `name` value. The
  * provided `animation` value is expected to be an array consisting of {@link state state} and
@@ -288,27 +289,22 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * ```
  *
  * The template associated with this component will make use of the `myAnimationTrigger` animation
- * trigger by binding to an element within its template code.
+ trigger by binding to an element within its template code.
  *
  * ```html
  * <!-- somewhere inside of my-component-tpl.html -->
  * <div [@myAnimationTrigger]="myStatusExp">...</div>
  * ```
  *
- * **Using an inline function**
- *
+ * ### Using an inline function
  * The `transition` animation method also supports reading an inline function which can decide
  * if its associated animation should be run.
  *
  * ```
  * // this method will be run each time the `myAnimationTrigger`
  * // trigger value changes...
- * function myInlineMatcherFn(
- *   fromState: string,
- *   toState: string,
- *   element: any,
- *   params: {[key: string]: any}
- * ): boolean {
+ * function myInlineMatcherFn(fromState: string, toState: string, element: any, params: {[key:
+ string]: any}): boolean {
  *   // notice that `element` and `params` are also available here
  *   return toState == 'yes-please-animate';
  * }
@@ -332,14 +328,13 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * The inline method will be run each time the trigger
  * value changes
  *
- * **Disable Animations**
- *
+ * ## Disable Animations
  * A special animation control binding called `@.disabled` can be placed on an element which will
- * then disable animations for any inner animation triggers situated within the element as well as
- * any animations on the element itself.
+ then disable animations for any inner animation triggers situated within the element as well as
+ any animations on the element itself.
  *
  * When true, the `@.disabled` binding will prevent all animations from rendering. The example
- * below shows how to use this feature:
+ below shows how to use this feature:
  *
  * ```ts
  * @Component({
@@ -362,17 +357,16 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * ```
  *
  * The `@childAnimation` trigger will not animate because `@.disabled` prevents it from happening
- * (when true).
+ (when true).
  *
  * Note that `@.disabled` will only disable all animations (this means any animations running on
  * the same element will also be disabled).
  *
- * **Disabling Animations Application-wide**
- *
+ * ### Disabling Animations Application-wide
  * When an area of the template is set to have animations disabled, **all** inner components will
- * also have their animations disabled as well. This means that all animations for an angular
- * application can be disabled by placing a host binding set on `@.disabled` on the topmost Angular
- * component.
+ also have their animations disabled as well. This means that all animations for an angular
+ application can be disabled by placing a host binding set on `@.disabled` on the topmost Angular
+ component.
  *
  * ```ts
  * import {Component, HostBinding} from '@angular/core';
@@ -387,20 +381,19 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * }
  * ```
  *
- * **What about animations that use `query()` and `animateChild()`?**
- *
- * Despite inner animations being disabled, a parent animation can `query` for inner
- * elements located in disabled areas of the template and still animate them as it sees fit. This is
- * also the case for when a sub animation is queried by a parent and then later animated using
- * animateChild`.
- *
- * **Detecting when an animation is disabled**
- *
+ * ### What about animations that us `query()` and `animateChild()`?
+ * Despite inner animations being disabled, a parent animation can {@link query query} for inner
+ elements located in disabled areas of the template and still animate them as it sees fit. This is
+ also the case for when a sub animation is queried by a parent and then later animated using {@link
+ animateChild animateChild}.
+
+ * ### Detecting when an animation is disabled
  * If a region of the DOM (or the entire application) has its animations disabled, then animation
  * trigger callbacks will still fire just as normal (only for zero seconds).
  *
  * When a trigger callback fires it will provide an instance of an {@link AnimationEvent}. If
- * animations are disabled then the `.disabled` flag on the event will be true.
+ animations
+ * are disabled then the `.disabled` flag on the event will be true.
  *
  * @experimental Animation support is experimental.
  */
@@ -410,8 +403,8 @@ export function trigger(name: string, definitions: AnimationMetadata[]): Animati
 
 /**
  * `animate` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the
- * {@link Component#animations component animations metadata page} to gain a better understanding of
+ * animation DSL language. If this information is new, please navigate to the {@link
+ * Component#animations component animations metadata page} to gain a better understanding of
  * how animations in Angular are used.
  *
  * `animate` specifies an animation step that will apply the provided `styles` data for a given
@@ -419,8 +412,7 @@ export function trigger(name: string, definitions: AnimationMetadata[]): Animati
  * to be used within {@link sequence an animation sequence}, {@link group group}, or {@link
  * transition transition}.
  *
- * {@a usage}
- * **Usage**
+ * ### Usage
  *
  * The `animate` function accepts two input parameters: `timing` and `styles`:
  *
@@ -473,7 +465,7 @@ export function animate(
  * transition} and it will only continue to the next instruction once all of the inner animation
  * steps have completed.
  *
- * **Usage**
+ * ### Usage
  *
  * The `steps` data that is passed into the `group` animation function can either consist of {@link
  * style style} or {@link animate animate} function calls. Each call to `style()` or `animate()`
@@ -512,7 +504,7 @@ export function group(
  * To perform animation styling in parallel with other animation steps then have a look at the
  * {@link group group} animation function.
  *
- * **Usage**
+ * ### Usage
  *
  * The `steps` data that is passed into the `sequence` animation function can either consist of
  * {@link style style} or {@link animate animate} function calls. A call to `style()` will apply the
@@ -537,15 +529,15 @@ export function sequence(steps: AnimationMetadata[], options: AnimationOptions |
 
 /**
  * `style` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the
- * {@link Component#animations component animations metadata page} to gain a better understanding of
+ * animation DSL language. If this information is new, please navigate to the {@link
+ * Component#animations component animations metadata page} to gain a better understanding of
  * how animations in Angular are used.
  *
  * `style` declares a key/value object containing CSS properties/styles that can then be used for
  * {@link state animation states}, within an {@link sequence animation sequence}, or as styling data
  * for both {@link animate animate} and {@link keyframes keyframes}.
  *
- * **Usage**
+ * ### Usage
  *
  * `style` takes in a key/value string map as data and expects one or more CSS property/value pairs
  * to be defined.
@@ -558,7 +550,7 @@ export function sequence(steps: AnimationMetadata[], options: AnimationOptions |
  * style({ width: 100, height: 0 })
  * ```
  *
- * **Auto-styles (using `*`)**
+ * #### Auto-styles (using `*`)
  *
  * When an asterix (`*`) character is used as a value then it will be detected from the element
  * being animated and applied as animation data when the animation starts.
@@ -597,18 +589,18 @@ export function style(
  * function. To register states to an animation trigger please have a look at the {@link trigger
  * trigger} function.
  *
- * **The `void` state**
+ * #### The `void` state
  *
  * The `void` state value is a reserved word that angular uses to determine when the element is not
  * apart of the application anymore (e.g. when an `ngIf` evaluates to false then the state of the
  * associated element is void).
  *
- * **The `*` (default) state**
+ * #### The `*` (default) state
  *
  * The `*` state (when styled) is a fallback state that will be used if the state that is being
  * animated is not declared within the trigger.
  *
- * **Usage**
+ * ### Usage
  *
  * `state` will declare an animation state with its associated styles
  * within the given trigger.
@@ -639,14 +631,14 @@ export function state(
 
 /**
  * `keyframes` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the
- * {@link Component#animations component animations metadata page} to gain a better understanding
- * of how animations in Angular are used.
+ * animation DSL language. If this information is new, please navigate to the {@link
+ * Component#animations component animations metadata page} to gain a better understanding of
+ * how animations in Angular are used.
  *
  * `keyframes` specifies a collection of {@link style style} entries each optionally characterized
  * by an `offset` value.
  *
- * **Usage**
+ * ### Usage
  *
  * The `keyframes` animation function is designed to be used alongside the {@link animate animate}
  * animation function. Instead of applying animations from where they are currently to their
@@ -705,7 +697,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * to animate to a state value and persist its styles then one or more {@link state animation
  * states} is expected to be defined.
  *
- * **Usage**
+ * ### Usage
  *
  * An animation transition is kicked off the `stateChangeExpr` predicate evaluates to true based on
  * what the previous state is and what the current state has become. In other words, if a transition
@@ -756,8 +748,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * <div [@myAnimationTrigger]="myStatusExp">...</div>
  * ```
  *
- * {@a the-final-animate-call}
- * **The final `animate` call**
+ * #### The final `animate` call
  *
  * If the final step within the transition steps is a call to `animate()` that **only** uses a
  * timing value with **no style data** then it will be automatically used as the final animation arc
@@ -774,7 +765,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * **Using :enter and :leave**
+ * ### Using :enter and :leave
  *
  * Given that enter (insertion) and leave (removal) animations are so common, the `transition`
  * function accepts both `:enter` and `:leave` values which are aliases for the `void => *` and `*
@@ -790,8 +781,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * **Boolean values**
- *
+ * ### Boolean values
  * if a trigger binding value is a boolean value then it can be matched using a transition
  * expression that compares `true` and `false` or `1` and `0`.
  *
@@ -807,8 +797,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * **Using :increment and :decrement**
- *
+ * ### Using :increment and :decrement
  * In addition to the :enter and :leave transition aliases, the :increment and :decrement aliases
  * can be used to kick off a transition when a numeric value has increased or decreased in value.
  *
@@ -1017,8 +1006,7 @@ export function animation(
  *
  * Now each of the sub animations start off with respect to the `100ms` staggering step.
  *
- * **The first frame of child animations**
- *
+ * ## The first frame of child animations
  * When sub animations are executed using `animateChild` the animation engine will always apply the
  * first frame of every sub animation immediately at the start of the animation sequence. This way
  * the parent animation does not need to set any initial styling data on the sub elements before the
@@ -1062,7 +1050,7 @@ export function useAnimation(
  * to the queried element (by default, an array is provided, then this will be
  * treated as an animation sequence).
  *
- * **Usage**
+ * ### Usage
  *
  * query() is designed to collect multiple elements and works internally by using
  * `element.querySelectorAll`. An additional options object can be provided which
@@ -1085,8 +1073,7 @@ export function useAnimation(
  * ], { optional: true })
  * ```
  *
- * **Special Selector Values**
- *
+ * ### Special Selector Values
  *
  * The selector value within a query can collect elements that contain angular-specific
  * characteristics
@@ -1108,8 +1095,7 @@ export function useAnimation(
  *  query(':self, .record:enter, .record:leave, @subTrigger', [...])
  *  ```
  *
- * **Demo**
- *
+ * ### Demo
  *
  * ```
  * @Component({
@@ -1158,7 +1144,7 @@ export function query(
  * animation DSL language. It is designed to be used inside of an animation {@link query query()}
  * and works by issuing a timing gap between after each queried item is animated.
  *
- * **Usage**
+ * ### Usage
  *
  * In the example below there is a container element that wraps a list of items stamped out
  * by an ngFor. The container element contains an animation trigger that will later be set

From 77ff72f93b86e57ba3fdc67a60a5b00c69c9a824 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Sat, 5 May 2018 08:36:49 -0700
Subject: [PATCH 012/582] Revert "style(animations): fix short param names
 (#23668)"

This reverts commit e3518967ad705b133ee21eedcf9546b5cb2e817e.

This PR accidentaly introduces a breaking change:
https://github.com/angular/angular/pull/23668#discussion_r186265055
---
 packages/animations/src/players/animation_player.ts | 4 ++--
 tools/public_api_guard/animations/animations.d.ts   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/animations/src/players/animation_player.ts b/packages/animations/src/players/animation_player.ts
index d88f733b19..de3dfb4ffa 100644
--- a/packages/animations/src/players/animation_player.ts
+++ b/packages/animations/src/players/animation_player.ts
@@ -26,7 +26,7 @@ export interface AnimationPlayer {
   finish(): void;
   destroy(): void;
   reset(): void;
-  setPosition(position: number): void;
+  setPosition(p: any /** TODO #9100 */): void;
   getPosition(): number;
   parentPlayer: AnimationPlayer|null;
   readonly totalTime: number;
@@ -93,7 +93,7 @@ export class NoopAnimationPlayer implements AnimationPlayer {
     }
   }
   reset(): void {}
-  setPosition(position: number): void {}
+  setPosition(p: number): void {}
   getPosition(): number { return 0; }
 
   /* @internal */
diff --git a/tools/public_api_guard/animations/animations.d.ts b/tools/public_api_guard/animations/animations.d.ts
index b0f5a005b0..07f51a54f8 100644
--- a/tools/public_api_guard/animations/animations.d.ts
+++ b/tools/public_api_guard/animations/animations.d.ts
@@ -115,7 +115,7 @@ export interface AnimationPlayer {
     play(): void;
     reset(): void;
     restart(): void;
-    setPosition(position: number): void;
+    setPosition(p: any): void;
 }
 
 /** @experimental */
@@ -216,7 +216,7 @@ export declare class NoopAnimationPlayer implements AnimationPlayer {
     play(): void;
     reset(): void;
     restart(): void;
-    setPosition(position: number): void;
+    setPosition(p: number): void;
 }
 
 /** @experimental */

From fc034270ced8f17cf17a82d3f8382dcef435b9a6 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 7 May 2018 10:47:59 -0700
Subject: [PATCH 013/582] fix(core): call ngOnDestroy on all services that have
 it (#23755)

Previously, ngOnDestroy was only called on services which were statically
determined to have ngOnDestroy methods. In some cases, such as with services
instantiated via factory functions, it's not statically known that the service
has an ngOnDestroy method.

This commit changes the runtime to look for ngOnDestroy when instantiating
all DI tokens, and to call the method if it's present.

Fixes #22466
Fixes #22240
Fixes #14818

PR Close #23755
---
 packages/core/src/view/ng_module.ts       | 16 +++++-
 packages/core/test/view/ng_module_spec.ts | 70 +++++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts
index 4a7d6a19ad..9e6bd20305 100644
--- a/packages/core/src/view/ng_module.ts
+++ b/packages/core/src/view/ng_module.ts
@@ -150,6 +150,15 @@ function _createProviderInstance(ngModule: NgModuleData, providerDef: NgModulePr
       injectable = providerDef.value;
       break;
   }
+
+  // The read of `ngOnDestroy` here is slightly expensive as it's megamorphic, so it should be
+  // avoided if possible. The sequence of checks here determines whether ngOnDestroy needs to be
+  // checked. It might not if the `injectable` isn't an object or if NodeFlags.OnDestroy is already
+  // set (ngOnDestroy was detected statically).
+  if (injectable !== UNDEFINED_VALUE && injectable != null && typeof injectable === 'object' &&
+      !(providerDef.flags & NodeFlags.OnDestroy) && typeof injectable.ngOnDestroy === 'function') {
+    providerDef.flags |= NodeFlags.OnDestroy;
+  }
   return injectable === undefined ? UNDEFINED_VALUE : injectable;
 }
 
@@ -199,12 +208,17 @@ function _callFactory(ngModule: NgModuleData, factory: any, deps: DepDef[]): any
 
 export function callNgModuleLifecycle(ngModule: NgModuleData, lifecycles: NodeFlags) {
   const def = ngModule._def;
+  const destroyed = new Set<any>();
   for (let i = 0; i < def.providers.length; i++) {
     const provDef = def.providers[i];
     if (provDef.flags & NodeFlags.OnDestroy) {
       const instance = ngModule._providers[i];
       if (instance && instance !== UNDEFINED_VALUE) {
-        instance.ngOnDestroy();
+        const onDestroy: Function|undefined = instance.ngOnDestroy;
+        if (typeof onDestroy === 'function' && !destroyed.has(instance)) {
+          onDestroy.apply(instance);
+          destroyed.add(instance);
+        }
       }
     }
   }
diff --git a/packages/core/test/view/ng_module_spec.ts b/packages/core/test/view/ng_module_spec.ts
index 4e89b95ae0..6e3c1fa9a1 100644
--- a/packages/core/test/view/ng_module_spec.ts
+++ b/packages/core/test/view/ng_module_spec.ts
@@ -101,6 +101,22 @@ function makeProviders(classes: any[], modules: any[]): NgModuleDefinition {
                     flags: NodeFlags.TypeClassProvider | NodeFlags.LazyProvider, token,
                     value: token,
                   }));
+  return makeModule(modules, providers);
+}
+
+function makeFactoryProviders(
+    factories: {token: any, factory: Function}[], modules: any[]): NgModuleDefinition {
+  const providers = factories.map((factory, index) => ({
+                                    index,
+                                    deps: [],
+                                    flags: NodeFlags.TypeFactoryProvider | NodeFlags.LazyProvider,
+                                    token: factory.token,
+                                    value: factory.factory,
+                                  }));
+  return makeModule(modules, providers);
+}
+
+function makeModule(modules: any[], providers: NgModuleProviderDef[]): NgModuleDefinition {
   const providersByKey: {[key: string]: NgModuleProviderDef} = {};
   providers.forEach(provider => providersByKey[tokenKey(provider.token)] = provider);
   return {factory: null, providers, providersByKey, modules, isRoot: true};
@@ -155,4 +171,58 @@ describe('NgModuleRef_ injector', () => {
 
   it('injects with the current injector always set',
      () => { expect(() => ref.injector.get(UsesInject)).not.toThrow(); });
+
+  it('calls ngOnDestroy on services created via factory', () => {
+    class Module {}
+
+    class Service {
+      static destroyed = 0;
+      ngOnDestroy(): void { Service.destroyed++; }
+    }
+
+    const ref = createNgModuleRef(
+        Module, Injector.NULL, [], makeFactoryProviders(
+                                       [{
+                                         token: Service,
+                                         factory: () => new Service(),
+                                       }],
+                                       [Module]));
+
+    expect(ref.injector.get(Service)).toBeDefined();
+    expect(Service.destroyed).toBe(0);
+    ref.destroy();
+    expect(Service.destroyed).toBe(1);
+  });
+
+  it('only calls ngOnDestroy once per instance', () => {
+    class Module {}
+
+    class Service {
+      static destroyed = 0;
+      ngOnDestroy(): void { Service.destroyed++; }
+    }
+
+    class OtherToken {}
+
+    const instance = new Service();
+    const ref = createNgModuleRef(
+        Module, Injector.NULL, [], makeFactoryProviders(
+                                       [
+                                         {
+                                           token: Service,
+                                           factory: () => instance,
+                                         },
+                                         {
+                                           token: OtherToken,
+                                           factory: () => instance,
+                                         }
+                                       ],
+                                       [Module]));
+
+    expect(ref.injector.get(Service)).toBe(instance);
+    expect(ref.injector.get(OtherToken)).toBe(instance);
+    expect(Service.destroyed).toBe(0);
+    ref.destroy();
+    expect(Service.destroyed).toBe(1);
+  });
 });

From 9e2d87f5b89e7cce27e316bddf94d6e0accb674b Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 2 May 2018 23:16:03 -0500
Subject: [PATCH 014/582] docs(aio): Update i18n example to Angular V6 (#23660)

PR Close #23660
---
 aio/content/examples/.DS_Store                | Bin 6148 -> 0 bytes
 aio/content/guide/i18n.md                     | 103 ++++++++---
 .../customizer/package-json/i18n.json         |  11 +-
 aio/tools/examples/example-boilerplate.js     |   3 +-
 .../examples/example-boilerplate.spec.js      |   2 +-
 .../shared/boilerplate/i18n/angular.json      | 172 ++++++++++++++++++
 .../shared/boilerplate/i18n/package.json      |  72 ++++----
 .../boilerplate/testing/.angular-cli.json     |  61 -------
 .../shared/boilerplate/testing/angular.json   | 142 +++++++++++++++
 9 files changed, 438 insertions(+), 128 deletions(-)
 delete mode 100644 aio/content/examples/.DS_Store
 create mode 100644 aio/tools/examples/shared/boilerplate/i18n/angular.json
 delete mode 100644 aio/tools/examples/shared/boilerplate/testing/.angular-cli.json
 create mode 100644 aio/tools/examples/shared/boilerplate/testing/angular.json

diff --git a/aio/content/examples/.DS_Store b/aio/content/examples/.DS_Store
deleted file mode 100644
index 55dd692a1cad00d879837390dddaea4656b88731..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}(Pm5VlL%twBOri33O+EOFq{L;2aQxJBjXgajgp9{6b!C8Cj{q)JnIs47MK
z0Q&&Tm7n(j9)cI)&W!CMs<O8gqG+ZXf8+7YIQd-JF=LF^y8bF-7GtagidYcPydyY{
zIwl3<LF8D&>vh^*lz7m89*ZW&XJi1^uE<&}gJ1jY`g!dr>|~Y76E92^r@wtKi5Vfp
zoDgSDE9p6zn{_)iH*Hu;PUr`oo7O`=YaIpgP83`Q@qW7JW<h#_!AD6FL4dYh?>G#4
z4QqZYi8D8hgH+YiHBRec>?gfi(vAI&iZ{iTec)y-s3Vr`X0Et|2WnUg{r=j|jk4UV
zR0n0*uU0E%xv~ChFc6}&xUzeA-u?aO@749q?cM!@UI7k&RwX|S4&f1uS28Z0G>($^
z0(`^xVH_bbKnxHA6V8Cy)=IMz{vP!B!~iky{~5sjL4qRM26K&S>wpG7A91{hhypg=
zB@m@S+hDE{MnJeu1=OkBTrs##2fs9Nw!vJZPG?-r40X)R+}u#OnjQR7g)?qzq?Q;U
z21Xf}(p?MB|DAu||3{OkM+^`HUy1=<+;+BW@Ji-v9eX)EYb9tC6b0jQjjt(SsG}HS
e@hDyZRRVsA2B2*)*9aaE`VdewP(uuSC<8C+ePIaz

diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index 2915bf727a..4a481d8131 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -42,11 +42,10 @@ locale id to find the correct corresponding locale data.
 
 By default, Angular uses the locale `en-US`, which is English as spoken in the United States of America.
 
-To set your app's locale to another value, use the CLI parameter `--locale` with the value
-of the locale id that you want to use:
+To set your app's locale to another value, use the CLI parameter `--configuration` with the value of the locale id that you want to use:
 
 <code-example language="sh" class="code-shell">
-  ng serve --aot --locale fr
+  ng serve --configuration=fr
 </code-example>
 
 If you use JIT, you also need to define the `LOCALE_ID` provider in your main module:
@@ -86,7 +85,7 @@ and `PercentPipe` use locale data to format data based on the `LOCALE_ID`.
 
 By default, Angular only contains locale data for `en-US`. If you set the value of
 `LOCALE_ID` to another locale, you must import locale data for that new locale.
-The CLI imports the locale data for you when you use the parameter `--locale` with `ng serve` and
+The CLI imports the locale data for you when you use the parameter `--configuration` with `ng serve` and
 `ng build`.
 
 If you want to import locale data for other languages, you can do it manually:
@@ -424,9 +423,9 @@ You can specify the translation format explicitly with the `--i18nFormat` flag a
 these example commands:
 
 <code-example language="sh" class="code-shell">
-ng xi18n  --i18nFormat=xlf
-ng xi18n  --i18nFormat=xlf2
-ng xi18n  --i18nFormat=xmb
+ng xi18n  --i18n-format=xlf
+ng xi18n  --i18n-format=xlf2
+ng xi18n  --i18n-format=xmb
 </code-example>
 
 The sample in this guide uses the default XLIFF 1.2 format.
@@ -442,11 +441,11 @@ The sample in this guide uses the default XLIFF 1.2 format.
 ### Other options
 
 You can specify the output path used by the CLI to extract your translation source file with
-the parameter `--outputPath`:
+the parameter `--output-path`:
 
 <code-example language="sh" class="code-shell">
 
-  ng xi18n --outputPath src/locale
+  ng xi18n --output-path locale
 
 </code-example>
 
@@ -455,15 +454,15 @@ the parameter `--outFile`:
 
 <code-example language="sh" class="code-shell">
 
-  ng xi18n --outFile source.xlf
+  ng xi18n --out-file source.xlf
 
 </code-example>
 
-You can specify the base locale of your app with the parameter `--locale`:
+You can specify the base locale of your app with the parameter `--i18n-locale`:
 
 <code-example language="sh" class="code-shell">
 
-  ng xi18n --locale fr
+  ng xi18n --i18n-locale fr
 
 </code-example>
 
@@ -663,7 +662,7 @@ format that Angular understands, such as `.xtb`.
 How you provide this information depends upon whether you compile with
 the JIT compiler or the AOT compiler.
 
-  * With [AOT](guide/i18n#merge-aot), you pass the information as a CLI parameter.
+  * With [AOT](guide/i18n#merge-aot), you pass the information as a configuration
   * With [JIT](guide/i18n#merge-jit), you provide the information at bootstrap time.
 
 
@@ -677,18 +676,67 @@ When you internationalize with the AOT compiler, you must pre-build a separate a
 package for each language and serve the appropriate package based on either server-side language
 detection or url parameters.
 
-You also need to instruct the AOT compiler to use your translation file. To do so, you use three
-options with the `ng serve` or `ng build` commands:
+You also need to instruct the AOT compiler to use your translation configuration. To do so, you configure the translation with three options in your `angular.json` file.
 
-* `--i18nFile`: the path to the translation file.
-* `--i18nFormat`: the format of the translation file.
-* `--locale`: the locale id.
+* `i18nFile`: the path to the translation file.
+* `i18nFormat`: the format of the translation file.
+* `i18nLocale`: the locale id.
 
-The example below shows how to serve the French language file created in previous sections of this
-guide:
+<code-example format="." language="ts">
+"configurations": {
+  ...
+  "fr": {
+    "aot": true,
+    "outputPath": "dist/my-project-fr/",
+    "i18nFile": "src/locale/messages.fr.xlf",
+    "i18nFormat": "xlf",
+    "i18nLocale": "fr",
+    ...
+  }
+}
+</code-example>
+
+You then pass the configuration with the `ng serve` or `ng build` commands. The example below shows how to serve the French language file created in previous sections of this guide:
 
 <code-example language="sh" class="code-shell">
-  ng serve --aot --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr
+  ng serve --configuration=fr
+</code-example>
+
+For production builds, you define a separate `production-fr` build configuration in your `angular.json`.
+
+<code-example format="." language="ts">
+"configurations": {
+  ...
+  "production-fr": {
+    "fileReplacements": [
+      {
+        "replace": "src/environments/environment.ts",
+        "with": "src/environments/environment.prod.ts"
+      }
+    ],
+    "optimization": true,
+    "outputHashing": "all",
+    "sourceMap": false,
+    "extractCss": true,
+    "namedChunks": false,
+    "aot": true,
+    "extractLicenses": true,
+    "vendorChunk": false,
+    "buildOptimizer": true,
+    "outputPath": "dist/my-project-fr/",
+    "i18nFile": "src/locale/messages.fr.xlf",
+    "i18nFormat": "xlf",
+    "i18nLocale": "fr",
+    "i18nMissingTranslation": "error"
+  },
+  ...
+}
+</code-example>
+
+The same configuration options can also be provided through the CLI with your existing `production` configuration.
+
+<code-example language="sh" class="code-shell">
+  ng build --prod --i18n-file src/locale/messages.fr.xlf --i18n-format xlf --i18n-locale fr
 </code-example>
 
 {@a merge-jit}
@@ -731,11 +779,16 @@ compilation, the app will fail to load.
 * Warning (default): show a 'Missing translation' warning in the console or shell.
 * Ignore: do nothing.
 
-If you use the AOT compiler, specify the warning level by using the CLI parameter
-`--missingTranslation`. The example below shows how to set the warning level to error:
+You specify the warning level in the `configurations` section your Angular CLI build configuration. The example below shows how to set the warning level to error:
 
-<code-example language="sh" class="code-shell">
-  ng serve --aot --missingTranslation=error
+<code-example format="." language="ts">
+"configurations": {
+  ...
+  "fr": {
+    ...
+    "i18nMissingTranslation": "error"
+  }
+}
 </code-example>
 
 If you use the JIT compiler, specify the warning level in the compiler config at bootstrap by adding
diff --git a/aio/tools/example-zipper/customizer/package-json/i18n.json b/aio/tools/example-zipper/customizer/package-json/i18n.json
index deb97a37b6..d257e96c1d 100644
--- a/aio/tools/example-zipper/customizer/package-json/i18n.json
+++ b/aio/tools/example-zipper/customizer/package-json/i18n.json
@@ -1,17 +1,18 @@
 {
   "scripts": [
-    { "name": "start", "command": "ng serve --aot" },
-    { "name": "start:fr", "command": "ng serve --aot --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr" },
+    { "name": "start", "command": "ng serve" },
+    { "name": "start:fr", "command": "ng serve --configuration=fr" },
     { "name": "build", "command": "ng build --prod" },
-    { "name": "build:fr", "command": "ng build --prod --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr" },
+    { "name": "build:fr", "command": "ng build --configuration=production-fr" },
     { "name": "test", "command": "ng test" },
     { "name": "lint", "command": "ng lint" },
-    { "name": "e2e", "command": "ng e2e --aot --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr" },
-    { "name": "extract", "command": "ng xi18n --outputPath=src/locale" }
+    { "name": "e2e", "command": "ng e2e" },
+    { "name": "extract", "command": "ng xi18n --output-path=locale" }
   ],
   "dependencies": [],
   "devDependencies": [
     "@angular/cli",
+    "@angular-devkit/build-angular",
     "@types/jasminewd2",
     "jasmine-spec-reporter",
     "karma-coverage-istanbul-reporter",
diff --git a/aio/tools/examples/example-boilerplate.js b/aio/tools/examples/example-boilerplate.js
index 1d5026196a..4f4c7bedf3 100644
--- a/aio/tools/examples/example-boilerplate.js
+++ b/aio/tools/examples/example-boilerplate.js
@@ -52,6 +52,7 @@ const cliRelativePath = BOILERPLATE_PATHS.cli.map(file => `../cli/${file}`);
 
 BOILERPLATE_PATHS.i18n = [
   ...cliRelativePath,
+  'angular.json',
   'package.json'
 ];
 
@@ -63,7 +64,7 @@ BOILERPLATE_PATHS.universal = [
 
 BOILERPLATE_PATHS.testing = [
   ...cliRelativePath,
-  '.angular-cli.json'
+  'angular.json'
 ];
 
 const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
diff --git a/aio/tools/examples/example-boilerplate.spec.js b/aio/tools/examples/example-boilerplate.spec.js
index dbf9820724..91cfd6b044 100644
--- a/aio/tools/examples/example-boilerplate.spec.js
+++ b/aio/tools/examples/example-boilerplate.spec.js
@@ -11,7 +11,7 @@ describe('example-boilerplate tool', () => {
     const sharedNodeModulesDir = path.resolve(sharedDir, 'node_modules');
     const BPFiles = {
       cli: 19,
-      i18n: 1,
+      i18n: 2,
       universal: 2,
       systemjs: 7,
       common: 1
diff --git a/aio/tools/examples/shared/boilerplate/i18n/angular.json b/aio/tools/examples/shared/boilerplate/i18n/angular.json
new file mode 100644
index 0000000000..00ec0bccd1
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/i18n/angular.json
@@ -0,0 +1,172 @@
+{
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular.io-example": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/angular.io-example",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
+            ],
+            "styles": [
+              {
+                "input": "src/styles.css"
+              }
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            },
+            "production-fr": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "outputPath": "dist/my-project-fr/",
+              "i18nFile": "src/locale/messages.fr.xlf",
+              "i18nFormat": "xlf",
+              "i18nLocale": "fr",
+              "i18nMissingTranslation": "error"
+            },
+            "fr": {
+              "aot": true,
+              "outputPath": "dist/my-project-fr/",
+              "i18nFile": "src/locale/messages.fr.xlf",
+              "i18nFormat": "xlf",
+              "i18nLocale": "fr",
+              "i18nMissingTranslation": "error"
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "angular.io-example:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "angular.io-example:build:production"
+            },
+            "fr": {
+              "browserTarget": "angular.io-example:build:fr"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "angular.io-example:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
+            "styles": [
+              {
+                "input": "styles.css"
+              }
+            ],
+            "scripts": [],
+            "assets": [
+              {
+                "glob": "favicon.ico",
+                "input": "src/",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "angular.io-example-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "angular.io-example:serve:fr"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/aio/tools/examples/shared/boilerplate/i18n/package.json b/aio/tools/examples/shared/boilerplate/i18n/package.json
index 74ab803af8..7870cc9daa 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/package.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/package.json
@@ -4,49 +4,51 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --aot",
-    "start:fr": "ng serve --aot --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr",
+    "start": "ng serve",
+    "start:fr": "ng serve --configuration=fr",
     "build": "ng build --prod",
-    "build:fr": "ng build --prod --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr",
+    "build:fr": "ng build --configuration=production-fr",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e --aot --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr",
-    "extract": "ng xi18n --outputPath=src/locale"
+    "e2e": "ng e2e",
+    "extract": "ng xi18n --output-path=locale"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.0.0",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "@angular/core": "^5.0.0",
-    "@angular/forms": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/platform-browser": "^5.0.0",
-    "@angular/platform-browser-dynamic": "^5.0.0",
-    "@angular/router": "^5.0.0",
-    "core-js": "^2.4.1",
-    "rxjs": "^5.5.2",
-    "zone.js": "^0.8.14"
+    "@angular/animations": "^6.0.0-rc.5",
+    "@angular/common": "^6.0.0-rc.5",
+    "@angular/compiler": "^6.0.0-rc.5",
+    "@angular/core": "^6.0.0-rc.5",
+    "@angular/forms": "^6.0.0-rc.5",
+    "@angular/http": "^6.0.0-rc.5",
+    "@angular/platform-browser": "^6.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
+    "@angular/router": "^6.0.0-rc.5",
+    "core-js": "^2.5.4",
+    "rxjs": "6.0.0-uncanny-rc.7",
+    "zone.js": "^0.8.24"
   },
   "devDependencies": {
-    "@angular/cli": "1.5.0",
-    "@angular/compiler-cli": "^5.0.0",
-    "@angular/language-service": "^5.0.0",
-    "@types/jasmine": "~2.8.0",
-    "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~6.0.60",
-    "codelyzer": "~3.2.0",
-    "jasmine-core": "~2.8.0",
-    "jasmine-spec-reporter": "~4.1.0",
-    "karma": "~1.7.0",
-    "karma-chrome-launcher": "~2.1.1",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
-    "karma-jasmine": "~1.1.0",
+    "@angular/compiler-cli": "^6.0.0-rc.5",
+    "@angular-devkit/build-angular": "~0.5.0",
+    "@angular/cli": "~6.0.0-rc.4",
+    "@angular/language-service": "^6.0.0-rc.5",
+    "@angular/platform-server": "^6.0.0-rc.5",
+    "@types/jasmine": "~2.8.6",
+    "@types/jasminewd2": "~2.0.3",
+    "@types/node": "~8.9.4",
+    "codelyzer": "~4.2.1",
+    "jasmine-core": "~2.99.1",
+    "jasmine-marbles": "^0.3.1",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~2.0.0",
+    "karma-chrome-launcher": "~2.2.0",
+    "karma-coverage-istanbul-reporter": "~1.4.2",
+    "karma-jasmine": "~1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.1.2",
-    "ts-node": "~3.2.0",
-    "tslint": "~5.7.0",
-    "typescript": "~2.4.2"
+    "protractor": "~5.3.0",
+    "ts-node": "~5.0.1",
+    "tslint": "~5.9.1",
+    "typescript": "~2.7.2"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/testing/.angular-cli.json b/aio/tools/examples/shared/boilerplate/testing/.angular-cli.json
deleted file mode 100644
index 8e9fd66a57..0000000000
--- a/aio/tools/examples/shared/boilerplate/testing/.angular-cli.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "angular.io-example"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "test.css",
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "src/tsconfig.spec.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json",
-      "exclude": "**/node_modules/**"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}
diff --git a/aio/tools/examples/shared/boilerplate/testing/angular.json b/aio/tools/examples/shared/boilerplate/testing/angular.json
new file mode 100644
index 0000000000..9aaab56b56
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/testing/angular.json
@@ -0,0 +1,142 @@
+{
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular.io-example": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/angular.io-example",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
+            ],
+            "styles": [
+              {
+                "input": "src/styles.css"
+              },
+              {
+                "input": "src/test.css"
+              }
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "angular.io-example:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "angular.io-example:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "angular.io-example:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
+            "styles": [
+              {
+                "input": "styles.css"
+              }
+            ],
+            "scripts": [],
+            "assets": [
+              {
+                "glob": "favicon.ico",
+                "input": "src/",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "angular.io-example-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "angular.io-example:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From d01ec03f54e2782a912869e9171268fccc92a270 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 3 May 2018 22:01:25 -0500
Subject: [PATCH 015/582] docs(aio): Upgrade example dependencies to Angular V6
 (#23660)

PR Close #23660
---
 aio/content/guide/i18n.md                     |  19 +-
 .../shared/boilerplate/cli/package.json       |  28 +-
 .../shared/boilerplate/i18n/package.json      |  30 +-
 .../shared/boilerplate/universal/package.json |  36 +-
 aio/tools/examples/shared/package.json        |  38 +-
 aio/tools/examples/shared/yarn.lock           | 451 ++++++++++--------
 6 files changed, 333 insertions(+), 269 deletions(-)

diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index 4a481d8131..4bcb42a408 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -682,7 +682,7 @@ You also need to instruct the AOT compiler to use your translation configuration
 * `i18nFormat`: the format of the translation file.
 * `i18nLocale`: the locale id.
 
-<code-example format="." language="ts">
+```
 "configurations": {
   ...
   "fr": {
@@ -694,17 +694,20 @@ You also need to instruct the AOT compiler to use your translation configuration
     ...
   }
 }
-</code-example>
+```
 
-You then pass the configuration with the `ng serve` or `ng build` commands. The example below shows how to serve the French language file created in previous sections of this guide:
+You then pass the configuration with the `ng serve` or `ng build` commands. 
+The example below shows how to serve the French language file created in previous 
+sections of this guide:
 
 <code-example language="sh" class="code-shell">
   ng serve --configuration=fr
 </code-example>
 
-For production builds, you define a separate `production-fr` build configuration in your `angular.json`.
+For production builds, you define a separate `production-fr` build configuration in 
+your `angular.json`.
 
-<code-example format="." language="ts">
+```
 "configurations": {
   ...
   "production-fr": {
@@ -731,7 +734,7 @@ For production builds, you define a separate `production-fr` build configuration
   },
   ...
 }
-</code-example>
+```
 
 The same configuration options can also be provided through the CLI with your existing `production` configuration.
 
@@ -781,7 +784,7 @@ compilation, the app will fail to load.
 
 You specify the warning level in the `configurations` section your Angular CLI build configuration. The example below shows how to set the warning level to error:
 
-<code-example format="." language="ts">
+```
 "configurations": {
   ...
   "fr": {
@@ -789,7 +792,7 @@ You specify the warning level in the `configurations` section your Angular CLI b
     "i18nMissingTranslation": "error"
   }
 }
-</code-example>
+```
 
 If you use the JIT compiler, specify the warning level in the compiler config at bootstrap by adding
 the 'MissingTranslationStrategy' property. The example below shows how to set the warning level to
diff --git a/aio/tools/examples/shared/boilerplate/cli/package.json b/aio/tools/examples/shared/boilerplate/cli/package.json
index 5f906801e7..1ef3da3ca3 100644
--- a/aio/tools/examples/shared/boilerplate/cli/package.json
+++ b/aio/tools/examples/shared/boilerplate/cli/package.json
@@ -12,27 +12,27 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.0.0-rc.5",
-    "@angular/common": "^6.0.0-rc.5",
-    "@angular/compiler": "^6.0.0-rc.5",
-    "@angular/core": "^6.0.0-rc.5",
-    "@angular/forms": "^6.0.0-rc.5",
-    "@angular/http": "^6.0.0-rc.5",
-    "@angular/platform-browser": "^6.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
-    "@angular/router": "^6.0.0-rc.5",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
     "angular-in-memory-web-api": "^0.6.0",
     "core-js": "^2.5.4",
-    "rxjs": "6.0.0-uncanny-rc.7",
+    "rxjs": "^6.0.0",
     "web-animations-js": "^2.3.1",
     "zone.js": "^0.8.24"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^6.0.0-rc.5",
-    "@angular-devkit/build-angular": "~0.5.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
     "typescript": "~2.7.2",
-    "@angular/cli": "~6.0.0-rc.4",
-    "@angular/language-service": "^6.0.0-rc.5",
+    "@angular/cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/boilerplate/i18n/package.json b/aio/tools/examples/shared/boilerplate/i18n/package.json
index 7870cc9daa..82de963571 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/package.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/package.json
@@ -15,25 +15,25 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.0.0-rc.5",
-    "@angular/common": "^6.0.0-rc.5",
-    "@angular/compiler": "^6.0.0-rc.5",
-    "@angular/core": "^6.0.0-rc.5",
-    "@angular/forms": "^6.0.0-rc.5",
-    "@angular/http": "^6.0.0-rc.5",
-    "@angular/platform-browser": "^6.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
-    "@angular/router": "^6.0.0-rc.5",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
     "core-js": "^2.5.4",
-    "rxjs": "6.0.0-uncanny-rc.7",
+    "rxjs": "^6.0.0",
     "zone.js": "^0.8.24"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^6.0.0-rc.5",
-    "@angular-devkit/build-angular": "~0.5.0",
-    "@angular/cli": "~6.0.0-rc.4",
-    "@angular/language-service": "^6.0.0-rc.5",
-    "@angular/platform-server": "^6.0.0-rc.5",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/boilerplate/universal/package.json b/aio/tools/examples/shared/boilerplate/universal/package.json
index 215e37ba93..5039c4bfc3 100644
--- a/aio/tools/examples/shared/boilerplate/universal/package.json
+++ b/aio/tools/examples/shared/boilerplate/universal/package.json
@@ -16,30 +16,30 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.0.0-rc.5",
-    "@angular/common": "^6.0.0-rc.5",
-    "@angular/compiler": "^6.0.0-rc.5",
-    "@angular/core": "^6.0.0-rc.5",
-    "@angular/forms": "^6.0.0-rc.5",
-    "@angular/http": "^6.0.0-rc.5",
-    "@angular/platform-browser": "^6.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
-    "@angular/router": "^6.0.0-rc.5",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
     "angular-in-memory-web-api": "^0.6.0",
-    "@nguniversal/common": "6.0.0-rc.2",
-    "@nguniversal/express-engine": "6.0.0-rc.2",
-    "@nguniversal/module-map-ngfactory-loader": "6.0.0-rc.2",
+    "@nguniversal/common": "^6.0.0",
+    "@nguniversal/express-engine": "^6.0.0",
+    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
     "core-js": "^2.5.4",
-    "rxjs": "6.0.0-uncanny-rc.7",
+    "rxjs": "^6.0.0",
     "web-animations-js": "^2.3.1",
     "zone.js": "^0.8.24"    
   },
   "devDependencies": {
-    "@angular/cli": "~6.0.0-rc.4",
-    "@angular/compiler-cli": "^6.0.0-rc.5",
-    "@angular/language-service": "^6.0.0-rc.5",
-    "@angular/platform-server": "^6.0.0-rc.5",
-    "@angular-devkit/build-angular": "~0.5.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 44a36e924d..90e2ff8e32 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -18,33 +18,33 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "^6.0.0-rc.5",
-    "@angular/common": "^6.0.0-rc.5",
-    "@angular/compiler": "^6.0.0-rc.5",
-    "@angular/core": "^6.0.0-rc.5",
-    "@angular/forms": "^6.0.0-rc.5",
-    "@angular/http": "^6.0.0-rc.5",
-    "@angular/platform-browser": "^6.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
-    "@angular/router": "^6.0.0-rc.5",
-    "@angular/service-worker": "^6.0.0-rc.5",
-    "@angular/upgrade": "^6.0.0-rc.5",
-    "@nguniversal/express-engine": "6.0.0-rc.2",
-    "@nguniversal/module-map-ngfactory-loader": "6.0.0-rc.2",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
+    "@angular/service-worker": "^6.0.0",
+    "@angular/upgrade": "^6.0.0",
+    "@nguniversal/express-engine": "^6.0.0",
+    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
     "angular-in-memory-web-api": "^0.6.0",
     "core-js": "^2.5.4",
     "express": "^4.14.1",
-    "rxjs": "6.0.0-uncanny-rc.7",
+    "rxjs": "^6.0.0",
     "systemjs": "0.19.39",
     "web-animations-js": "^2.3.1",
     "zone.js": "^0.8.24"
   },
   "devDependencies": {
-    "@angular/cli": "6.0.0-rc.4",
-    "@angular/compiler-cli": "^6.0.0-rc.5",
-    "@angular/language-service": "^6.0.0-rc.5",
-    "@angular/platform-server": "^6.0.0-rc.5",
-    "@angular-devkit/build-angular": "~0.5.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
     "@types/angular": "^1.5.16",
     "@types/angular-animate": "^1.5.5",
     "@types/angular-cookies": "^1.4.2",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index 890cb20c69..fcde5b4085 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -2,200 +2,195 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.5.6.tgz#758d1a725793641812279569edce3380f118da9e"
+"@angular-devkit/architect@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.6.0.tgz#622a933337c946ef85d646545cc4244272ccb402"
   dependencies:
-    "@angular-devkit/core" "0.5.6"
-    rxjs "^6.0.0-beta.3"
+    "@angular-devkit/core" "0.6.0"
+    rxjs "^6.0.0"
 
-"@angular-devkit/build-angular@~0.5.0":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.5.6.tgz#14c53c32653d153886c00911af6d62fceb7419de"
+"@angular-devkit/build-angular@~0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.6.0.tgz#f5757f80fc402458e6b5eae1578bbc2a1af44ebe"
   dependencies:
-    "@angular-devkit/architect" "0.5.6"
-    "@angular-devkit/build-optimizer" "0.5.6"
-    "@angular-devkit/core" "0.5.6"
-    "@ngtools/webpack" "6.0.0-rc.4"
-    ajv "^6.0.0"
+    "@angular-devkit/architect" "0.6.0"
+    "@angular-devkit/build-optimizer" "0.6.0"
+    "@angular-devkit/core" "0.6.0"
+    "@ngtools/webpack" "6.0.0"
+    ajv "~6.4.0"
     autoprefixer "^8.1.0"
     cache-loader "^1.2.2"
     chalk "~2.2.2"
-    circular-dependency-plugin "^5.0.0"
+    circular-dependency-plugin "^5.0.2"
     clean-css "^4.1.11"
-    copy-webpack-plugin "^4.5.0"
+    copy-webpack-plugin "^4.5.1"
     file-loader "^1.1.11"
     glob "^7.0.3"
     html-webpack-plugin "^3.0.6"
     istanbul "^0.4.5"
     istanbul-instrumenter-loader "^3.0.1"
     karma-source-map-support "^1.2.0"
-    less "^3.0.1"
+    less "^3.0.2"
     less-loader "^4.1.0"
-    license-webpack-plugin "^1.2.3"
+    license-webpack-plugin "^1.3.1"
     lodash "^4.17.4"
     memory-fs "^0.4.1"
-    mini-css-extract-plugin "~0.3.0"
+    mini-css-extract-plugin "~0.4.0"
     minimatch "^3.0.4"
-    node-sass "^4.7.2"
+    node-sass "^4.8.3"
     opn "^5.1.0"
     parse5 "^4.0.0"
     portfinder "^1.0.13"
     postcss "^6.0.19"
     postcss-import "^11.1.0"
-    postcss-loader "^2.1.1"
+    postcss-loader "^2.1.4"
     postcss-url "^7.3.1"
     raw-loader "^0.5.1"
-    request "^2.83.0"
     resolve "^1.5.0"
-    rxjs "^6.0.0-beta.3"
-    sass-loader "^6.0.7"
+    rxjs "^6.0.0"
+    sass-loader "^7.0.1"
     silent-error "^1.1.0"
     source-map-support "^0.5.0"
     stats-webpack-plugin "^0.6.2"
-    style-loader "^0.20.2"
+    style-loader "^0.21.0"
     stylus "^0.54.5"
     stylus-loader "^3.0.2"
     tree-kill "^1.2.0"
-    uglifyjs-webpack-plugin "^1.2.2"
+    uglifyjs-webpack-plugin "^1.2.5"
     url-loader "^1.0.1"
-    webpack "~4.5.0"
-    webpack-dev-middleware "^3.1.0"
-    webpack-dev-server "^3.1.1"
+    webpack "~4.6.0"
+    webpack-dev-middleware "^3.1.3"
+    webpack-dev-server "^3.1.4"
     webpack-merge "^4.1.2"
     webpack-sources "^1.1.0"
     webpack-subresource-integrity "^1.1.0-rc.4"
 
-"@angular-devkit/build-optimizer@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.5.6.tgz#c581489ccf5757800ac23d44052934cbcc6bafed"
+"@angular-devkit/build-optimizer@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.6.0.tgz#150a76155b473dea17327a176d18245a2da1c13e"
   dependencies:
     loader-utils "^1.1.0"
     source-map "^0.5.6"
     typescript "~2.7.2"
     webpack-sources "^1.1.0"
 
-"@angular-devkit/core@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.6.tgz#f7c9d550c86e924f2d75fe728e17e280be63d5ad"
+"@angular-devkit/core@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.6.0.tgz#d1a7275ff0f93de5cf007c4a549d1ebd00776fd0"
   dependencies:
-    ajv "~5.5.1"
-    chokidar "^1.7.0"
-    rxjs "^6.0.0-beta.3"
+    ajv "~6.4.0"
+    chokidar "^2.0.3"
+    rxjs "^6.0.0"
     source-map "^0.5.6"
 
-"@angular-devkit/schematics@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.6.tgz#25ecacc619579a9e54be854e28ae302b116f47d0"
+"@angular-devkit/schematics@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.6.0.tgz#0117dc7d5905b053df4f2918e2e073efd1091f5c"
   dependencies:
-    "@angular-devkit/core" "0.5.6"
-    "@ngtools/json-schema" "^1.1.0"
-    rxjs "^6.0.0-beta.3"
+    "@angular-devkit/core" "0.6.0"
+    rxjs "^6.0.0"
 
-"@angular/animations@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0-rc.5.tgz#4103f620f52023c0b26c741158276bdcc9c1a451"
+"@angular/animations@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0.tgz#cfc825dbfdf33bf3bf75962d1e12495aed5e3c32"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@6.0.0-rc.4":
-  version "6.0.0-rc.4"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.0-rc.4.tgz#f3cffcfdb84f7a187eb2d10bdd5831e397c5a00c"
+"@angular/cli@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.0.tgz#346b356775ddf8cdb8a9a5095b0663878eca3486"
   dependencies:
-    "@angular-devkit/architect" "0.5.6"
-    "@angular-devkit/core" "0.5.6"
-    "@angular-devkit/schematics" "0.5.6"
-    "@schematics/angular" "0.5.6"
-    "@schematics/update" "0.5.6"
-    chalk "~2.2.0"
-    fs-extra "^4.0.0"
-    node-modules-path "^1.0.0"
+    "@angular-devkit/architect" "0.6.0"
+    "@angular-devkit/core" "0.6.0"
+    "@angular-devkit/schematics" "0.6.0"
+    "@schematics/angular" "0.6.0"
+    "@schematics/update" "0.6.0"
     opn "~5.1.0"
     resolve "^1.1.7"
-    rxjs "^6.0.0-turbo-rc.4"
+    rxjs "^6.0.0"
     semver "^5.1.0"
     silent-error "^1.0.0"
     symbol-observable "^1.2.0"
-    yargs-parser "^9.0.2"
+    yargs-parser "^10.0.0"
 
-"@angular/common@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0-rc.5.tgz#eb31379f187b60ea9724595bc29dff7439c0efcc"
+"@angular/common@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0.tgz#ca3b6b6b96837fe048861da897c31991aa04954f"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0-rc.5.tgz#1ecb3702532def6e15051253ecd7e98467cf5842"
+"@angular/compiler-cli@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0.tgz#be50277faaa5ac08f3002c2c8cb8c39d220c76d5"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
     tsickle "^0.27.2"
 
-"@angular/compiler@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.5.tgz#6d163ff459c2aa3134efd3d2f187cff08a7aeabf"
+"@angular/compiler@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0.tgz#9092a0f02f33dd1108276ab93cc48142e36a1e95"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0-rc.5.tgz#33b1a6b4d0daaf1ec034fe2404a6009607f00cbd"
+"@angular/core@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0.tgz#785cc8a37b7fb784a6b7dcbd0984abb4f10e5dfe"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.0-rc.5.tgz#9594f2c2423e46aa345000097ce1f8e6e6569fc5"
+"@angular/forms@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.0.tgz#436e2df39dc57db124da5a5c02bc63909fdf7046"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0-rc.5.tgz#40dad79b77d463bd325263020e79e9512dc085eb"
+"@angular/http@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0.tgz#f409e35cd2f4990b43a37beab915ffdcd9c7c992"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.0.0-rc.5.tgz#19c24928aba82c6175e833d5fbeb6f82c58d72c0"
+"@angular/language-service@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.0.0.tgz#85bf577fd7f45eff13128d4f5f0125078d610aec"
 
-"@angular/platform-browser-dynamic@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0-rc.5.tgz#2f7fb42b10f2fd769d209dfed6b50b89590851d8"
+"@angular/platform-browser-dynamic@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz#66a34b65136446cb3ec39362fd6d2dbb5482ba70"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0-rc.5.tgz#492bc951339ff170eb057871626476b34e65227f"
+"@angular/platform-browser@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0.tgz#848b687ea46786483fddcdbbbd17b29c7adcc768"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.5.tgz#b8910231cc4c9891a9e2ce3ba35ebb7db84c9969"
+"@angular/platform-server@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0.tgz#482878cc538a80caa3962e9376e4225b20c2a4bd"
   dependencies:
     domino "^2.0.1"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.0-rc.5.tgz#b37f93cd81738b7a64697d1804c87c880d7bb636"
+"@angular/router@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.0.tgz#09a5c6f6220084c3575df81e8b36cbe9fff10d1f"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-6.0.0-rc.5.tgz#f55f89a3012ae6e0bca21463a8fd538ae3425eac"
+"@angular/service-worker@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-6.0.0.tgz#35a187554d33e05911544080fafc281ff1b322e0"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/upgrade@^6.0.0-rc.5":
-  version "6.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-6.0.0-rc.5.tgz#f4b35f8bcad8c77a8d3eb83af9418054e3a7b740"
+"@angular/upgrade@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-6.0.0.tgz#932e39709b17a455018c3dfe63a5b8e794027f05"
   dependencies:
     tslib "^1.9.0"
 
@@ -206,41 +201,38 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/json-schema@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
-
-"@ngtools/webpack@6.0.0-rc.4":
-  version "6.0.0-rc.4"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0-rc.4.tgz#683596658ee4592f19ad6075a9166f1afdb05cd9"
+"@ngtools/webpack@6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0.tgz#e160cccd85823e9b01ee7bc5156a02510a323a34"
   dependencies:
-    "@angular-devkit/core" "0.5.6"
+    "@angular-devkit/core" "0.6.0"
     tree-kill "^1.0.0"
     webpack-sources "^1.1.0"
 
-"@nguniversal/express-engine@6.0.0-rc.2":
-  version "6.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-6.0.0-rc.2.tgz#ca4a576d62614e04aea8a03f603b7e1235dff033"
+"@nguniversal/express-engine@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-6.0.0.tgz#f8bc7b5e940afb1ffdbdcb1bb22665d440ea0b0b"
 
-"@nguniversal/module-map-ngfactory-loader@6.0.0-rc.2":
-  version "6.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@nguniversal/module-map-ngfactory-loader/-/module-map-ngfactory-loader-6.0.0-rc.2.tgz#c3cdb60a7a3da180fc90e1ca39f22367427fb4d8"
+"@nguniversal/module-map-ngfactory-loader@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/module-map-ngfactory-loader/-/module-map-ngfactory-loader-6.0.0.tgz#0dd26c3f1c26d17bb21b8dfc0da53d82b7f11028"
 
-"@schematics/angular@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.5.6.tgz#c2b26037855c9a338d20bb8ace50743cb7a5af24"
+"@schematics/angular@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.6.0.tgz#d7589c50f80ef089f7fba526ed9becefb187b6a2"
   dependencies:
-    "@angular-devkit/core" "0.5.6"
-    "@angular-devkit/schematics" "0.5.6"
+    "@angular-devkit/core" "0.6.0"
+    "@angular-devkit/schematics" "0.6.0"
     typescript ">=2.6.2 <2.8"
 
-"@schematics/update@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.5.6.tgz#ffba0507eaccd78bd892480edf11945734d59547"
+"@schematics/update@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.6.0.tgz#1a5f75a5a02de85cc4b4bd4fa68dd53ddc95ba30"
   dependencies:
-    "@angular-devkit/core" "0.5.6"
-    "@angular-devkit/schematics" "0.5.6"
-    rxjs "^6.0.0-beta.3"
+    "@angular-devkit/core" "0.6.0"
+    "@angular-devkit/schematics" "0.6.0"
+    npm-registry-client "^8.5.1"
+    rxjs "^6.0.0"
     semver "^5.3.0"
     semver-intersect "^1.1.2"
 
@@ -429,7 +421,7 @@ ajv@^5.0.0, ajv@^5.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.0.0, ajv@^6.1.0:
+ajv@^6.1.0, ajv@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
   dependencies:
@@ -438,15 +430,6 @@ ajv@^6.0.0, ajv@^6.1.0:
     json-schema-traverse "^0.3.0"
     uri-js "^3.0.2"
 
-ajv@~5.5.1:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -1677,6 +1660,10 @@ btoa@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.1.2.tgz#3e40b81663f81d2dd6596a4cb714a8dc16cfabe0"
 
+buffer-from@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
@@ -1701,6 +1688,10 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -1884,7 +1875,7 @@ chalk@~0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
-chalk@~2.2.0, chalk@~2.2.2:
+chalk@~2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.2.2.tgz#4403f5cf18f35c05f51fbdf152bf588f956cf7cb"
   dependencies:
@@ -1896,7 +1887,7 @@ chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
-chokidar@1.7.0, chokidar@^1.4.1, chokidar@^1.4.2, chokidar@^1.7.0:
+chokidar@1.7.0, chokidar@^1.4.1, chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1928,7 +1919,7 @@ chokidar@^2.0.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@^2.0.2:
+chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
   dependencies:
@@ -1961,7 +1952,7 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-dependency-plugin@^5.0.0:
+circular-dependency-plugin@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
 
@@ -2239,6 +2230,15 @@ concat-stream@1.6.0, concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.5.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 concurrently@^3.0.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.0.tgz#8cf1b7707a6916a78a4ff5b77bb04dec54b379b2"
@@ -2354,7 +2354,7 @@ copy-webpack-plugin@^4.0.1:
     minimatch "^3.0.4"
     node-dir "^0.1.10"
 
-copy-webpack-plugin@^4.5.0:
+copy-webpack-plugin@^4.5.1:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.1.tgz#fc4f68f4add837cc5e13d111b20715793225d29c"
   dependencies:
@@ -3676,7 +3676,7 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^4.0.0, fs-extra@^4.0.2:
+fs-extra@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
   dependencies:
@@ -4224,6 +4224,10 @@ hosted-git-info@^2.1.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
+hosted-git-info@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -5303,9 +5307,9 @@ less-loader@^4.1.0:
     loader-utils "^1.1.0"
     pify "^3.0.0"
 
-less@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.0.1.tgz#ba2fea24a5632ccb8c84230d6043c0bf91855e37"
+less@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.0.2.tgz#1bcb9813bb6090c884ac142f02c633bd42931844"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
@@ -5313,7 +5317,7 @@ less@^3.0.1:
     mime "^1.4.1"
     mkdirp "^0.5.0"
     promise "^7.1.1"
-    request "2.81.0"
+    request "^2.83.0"
     source-map "^0.5.3"
 
 levn@~0.3.0:
@@ -5323,7 +5327,7 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@^1.2.3:
+license-webpack-plugin@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-1.3.1.tgz#688b76472188ef597918b7cae3eec7dc2fa5a0e8"
   dependencies:
@@ -5797,9 +5801,9 @@ mimic-response@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
 
-mini-css-extract-plugin@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.3.0.tgz#f8dc03abb3a8663f1a431143e232fb47fb4d9318"
+mini-css-extract-plugin@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
   dependencies:
     loader-utils "^1.1.0"
     webpack-sources "^1.1.0"
@@ -5938,7 +5942,11 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0, nan@^2.3.2:
+nan@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nan@^2.3.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
@@ -6059,10 +6067,6 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-modules-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
-
 node-pre-gyp@^0.6.36:
   version "0.6.38"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d"
@@ -6094,9 +6098,9 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-sass@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
+node-sass@^4.8.3:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6110,7 +6114,7 @@ node-sass@^4.7.2:
     lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.3.2"
+    nan "^2.10.0"
     node-gyp "^3.3.1"
     npmlog "^4.0.0"
     request "~2.79.0"
@@ -6138,7 +6142,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -6174,13 +6178,40 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-registry-client@^8.5.1:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.5.1.tgz#8115809c0a4b40938b8a109b8ea74d26c6f5d7f1"
+  dependencies:
+    concat-stream "^1.5.2"
+    graceful-fs "^4.1.6"
+    normalize-package-data "~1.0.1 || ^2.0.0"
+    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
+    once "^1.3.3"
+    request "^2.74.0"
+    retry "^0.10.0"
+    safe-buffer "^5.1.1"
+    semver "2 >=2.2.1 || 3.x || 4 || 5"
+    slide "^1.1.3"
+    ssri "^5.2.4"
+  optionalDependencies:
+    npmlog "2 || ^3.1.0 || ^4.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6390,6 +6421,13 @@ osenv@0, osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-cancelable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
@@ -6775,9 +6813,9 @@ postcss-load-plugins@^2.3.0:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
-postcss-loader@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.3.tgz#eb210da734e475a244f76ccd61f9860f5bb3ee09"
+postcss-loader@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.4.tgz#f44a6390e03c84108b2b2063182d1a1011b2ce76"
   dependencies:
     loader-utils "^1.1.0"
     postcss "^6.0.0"
@@ -7561,7 +7599,7 @@ request@2.81.0, request@~2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.83.0:
+request@^2.74.0, request@^2.83.0:
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
@@ -7697,6 +7735,10 @@ ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -7787,21 +7829,15 @@ rx@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-rxjs@6.0.0-uncanny-rc.7:
-  version "6.0.0-uncanny-rc.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-uncanny-rc.7.tgz#e5d6ebe2c538c583bf4b3600b60112d64a7a6991"
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@^5.4.2, rxjs@^5.5.2:
   version "5.5.10"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
   dependencies:
     symbol-observable "1.0.1"
 
-rxjs@^6.0.0-beta.3, rxjs@^6.0.0-turbo-rc.4:
-  version "6.0.0-turbo-rc.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-turbo-rc.4.tgz#5995dab91914f03ee4a68d923678333ae626d2ec"
+rxjs@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
   dependencies:
     tslib "^1.9.0"
 
@@ -7828,9 +7864,9 @@ sass-graph@^2.2.4:
     scss-tokenizer "^0.2.3"
     yargs "^7.0.0"
 
-sass-loader@^6.0.7:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.7.tgz#dd2fdb3e7eeff4a53f35ba6ac408715488353d00"
+sass-loader@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.1.tgz#fd937259ccba3a9cfe0d5f8a98746d48adfcc261"
   dependencies:
     clone-deep "^2.0.1"
     loader-utils "^1.0.1"
@@ -7862,7 +7898,7 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.5:
+schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
   dependencies:
@@ -7922,14 +7958,14 @@ semver-intersect@^1.1.2:
   dependencies:
     semver "^5.0.0"
 
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@^5.0.0, semver@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
 semver@~4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
@@ -8127,7 +8163,7 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-slide@^1.1.5:
+slide@^1.1.3, slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
@@ -8580,9 +8616,9 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-style-loader@^0.20.2:
-  version "0.20.3"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
+style-loader@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
@@ -8965,7 +9001,7 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^1.2.2, uglifyjs-webpack-plugin@^1.2.4:
+uglifyjs-webpack-plugin@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043"
   dependencies:
@@ -8978,6 +9014,19 @@ uglifyjs-webpack-plugin@^1.2.2, uglifyjs-webpack-plugin@^1.2.4:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+uglifyjs-webpack-plugin@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.5"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -9196,6 +9245,12 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  dependencies:
+    builtins "^1.0.3"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -9341,9 +9396,9 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.1.2, webpack-dev-middleware@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.2.tgz#be4d0c36a4fa7d69d6904093418514caa9df3a40"
+webpack-dev-middleware@3.1.3, webpack-dev-middleware@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"
   dependencies:
     loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
@@ -9353,9 +9408,9 @@ webpack-dev-middleware@3.1.2, webpack-dev-middleware@^3.1.0:
     url-join "^4.0.0"
     webpack-log "^1.0.1"
 
-webpack-dev-server@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.3.tgz#5cecfd8a9d60c4638284813f1cf9562f04e5c1c5"
+webpack-dev-server@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz#9a08d13c4addd1e3b6d8ace116e86715094ad5b4"
   dependencies:
     ansi-html "0.0.7"
     array-includes "^3.0.3"
@@ -9382,7 +9437,7 @@ webpack-dev-server@^3.1.1:
     spdy "^3.4.1"
     strip-ansi "^3.0.0"
     supports-color "^5.1.0"
-    webpack-dev-middleware "3.1.2"
+    webpack-dev-middleware "3.1.3"
     webpack-log "^1.1.2"
     yargs "11.0.0"
 
@@ -9428,9 +9483,9 @@ webpack-subresource-integrity@^1.1.0-rc.4:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@~4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.5.0.tgz#1e6f71e148ead02be265ff2879c9cd6bb30b8848"
+webpack@~4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.6.0.tgz#363eafa733710eb0ed28c512b2b9b9f5fb01e69b"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^3.0.0"
@@ -9446,7 +9501,7 @@ webpack@~4.5.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.2"
+    schema-utils "^0.4.4"
     tapable "^1.0.0"
     uglifyjs-webpack-plugin "^1.2.4"
     watchpack "^1.5.0"
@@ -9636,6 +9691,12 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yargs-parser@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.0.0.tgz#c737c93de2567657750cb1f2c00be639fd19c994"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"

From b0eca85e5187fbfe2f2edd02327ce2fc6f0e196b Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 24 Apr 2018 11:34:11 -0700
Subject: [PATCH 016/582] refactor(compiler): compile{Component,Directive} take
 only local information (#23545)

Previously, the compileComponent() and compileDirective() APIs still required
the output of global analysis, even though they only read local information
from that output.

With this refactor, compileComponent() and compileDirective() now define
their inputs explicitly, with the new interfaces R3ComponentMetadata and
R3DirectiveMetadata. compileComponentGlobal() and compileDirectiveGlobal()
are introduced and convert from global analysis output into the new metadata
format.

This refactor also splits out the view compiler into separate files as
r3_view_compiler_local.ts was getting unwieldy.

Finally, this refactor also splits out generation of DI factory functions
into a separate r3_factory utility as the logic is utilized between different
compilers.

PR Close #23545
---
 .../src/ngtsc/transform/src/injectable.ts     |   3 +-
 packages/compiler-cli/test/ngc_spec.ts        |   1 +
 packages/compiler/src/aot/compiler.ts         |   2 +-
 packages/compiler/src/core.ts                 |  17 +
 .../compiler/src/injectable_compiler_2.ts     |   1 +
 packages/compiler/src/render3/r3_factory.ts   | 288 ++++++
 .../compiler/src/render3/r3_identifiers.ts    |  10 +
 .../compiler/src/render3/r3_pipe_compiler.ts  |  12 +-
 packages/compiler/src/render3/view/api.ts     | 178 ++++
 .../compiler/src/render3/view/compiler.ts     | 444 ++++++++++
 .../template.ts}                              | 832 ++++--------------
 packages/compiler/src/render3/view/util.ts    | 122 +++
 .../src/template_parser/binding_parser.ts     |   2 -
 .../compiler/test/render3/mock_compile.ts     |   6 +-
 .../render3/r3_compiler_compliance_spec.ts    |   2 +-
 .../r3_view_compiler_input_outputs_spec.ts    |   2 +
 16 files changed, 1262 insertions(+), 660 deletions(-)
 create mode 100644 packages/compiler/src/render3/r3_factory.ts
 create mode 100644 packages/compiler/src/render3/view/api.ts
 create mode 100644 packages/compiler/src/render3/view/compiler.ts
 rename packages/compiler/src/render3/{r3_view_compiler_local.ts => view/template.ts} (55%)
 create mode 100644 packages/compiler/src/render3/view/util.ts

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts b/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
index 62bebcfd19..a97ffe38a1 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
@@ -131,7 +131,7 @@ function getUseType(clazz: ts.ClassDeclaration, checker: ts.TypeChecker): IvyInj
       }
     });
     const token = new WrappedNodeExpr(tokenExpr);
-    useType.push({token, optional, self, skipSelf});
+    useType.push({token, optional, self, skipSelf, attribute: false});
   });
   return useType;
 }
@@ -142,6 +142,7 @@ function getDep(dep: ts.Expression, checker: ts.TypeChecker): IvyInjectableDep {
     optional: false,
     self: false,
     skipSelf: false,
+    attribute: false,
   };
 
   function maybeUpdateDecorator(dec: ts.Identifier, token?: ts.Expression): void {
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index 14845f2c07..c4cbf8a1dd 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -2021,6 +2021,7 @@ describe('ngc transformer command-line', () => {
       const exitCode = main(['-p', path.join(basePath, 'tsconfig.json')]);
       expect(exitCode).toBe(0, 'Compile failed');
       expect(emittedFile('hello-world.js')).toContain('ngComponentDef');
+      expect(emittedFile('hello-world.js')).toContain('HelloWorldComponent_Factory');
     });
 
     it('should emit an injection of a string token', () => {
diff --git a/packages/compiler/src/aot/compiler.ts b/packages/compiler/src/aot/compiler.ts
index 775b8d5d8b..829691e6e8 100644
--- a/packages/compiler/src/aot/compiler.ts
+++ b/packages/compiler/src/aot/compiler.ts
@@ -25,7 +25,7 @@ import {ParseError} from '../parse_util';
 import {compileNgModule as compileIvyModule} from '../render3/r3_module_compiler';
 import {compilePipe as compileIvyPipe} from '../render3/r3_pipe_compiler';
 import {HtmlToTemplateTransform} from '../render3/r3_template_transform';
-import {compileComponent as compileIvyComponent, compileDirective as compileIvyDirective} from '../render3/r3_view_compiler_local';
+import {compileComponentFromRender2 as compileIvyComponent, compileDirectiveFromRender2 as compileIvyDirective} from '../render3/view/compiler';
 import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
 import {CompiledStylesheet, StyleCompiler} from '../style_compiler';
 import {SummaryResolver} from '../summary_resolver';
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index 6f6580fd10..1c704baf3f 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -361,3 +361,20 @@ export function parseSelectorToR3Selector(selector: string): R3CssSelectorList {
   const selectors = CssSelector.parse(selector);
   return selectors.map(parserSelectorToR3Selector);
 }
+
+// Pasted from render3/interfaces/definition since it cannot be referenced directly
+/**
+ * Flags passed into template functions to determine which blocks (i.e. creation, update)
+ * should be executed.
+ *
+ * Typically, a template runs both the creation block and the update block on initialization and
+ * subsequent runs only execute the update block. However, dynamically created views require that
+ * the creation block be executed separately from the update block (for backwards compat).
+ */
+export const enum RenderFlags {
+  /* Whether to run the creation block (e.g. create elements and directives) */
+  Create = 0b01,
+
+  /* Whether to run the update block (e.g. refresh bindings) */
+  Update = 0b10
+}
diff --git a/packages/compiler/src/injectable_compiler_2.ts b/packages/compiler/src/injectable_compiler_2.ts
index a29d18f404..0f01f881b0 100644
--- a/packages/compiler/src/injectable_compiler_2.ts
+++ b/packages/compiler/src/injectable_compiler_2.ts
@@ -30,6 +30,7 @@ export interface IvyInjectableDep {
   optional: boolean;
   self: boolean;
   skipSelf: boolean;
+  attribute: boolean;
 }
 
 export interface IvyInjectableMetadata {
diff --git a/packages/compiler/src/render3/r3_factory.ts b/packages/compiler/src/render3/r3_factory.ts
new file mode 100644
index 0000000000..78d7e3c75c
--- /dev/null
+++ b/packages/compiler/src/render3/r3_factory.ts
@@ -0,0 +1,288 @@
+/**
+ * @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 {StaticSymbol} from '../aot/static_symbol';
+import {CompileTypeMetadata, tokenReference} from '../compile_metadata';
+import {CompileReflector} from '../compile_reflector';
+import {InjectFlags} from '../core';
+import {Identifiers} from '../identifiers';
+import * as o from '../output/output_ast';
+import {Identifiers as R3} from '../render3/r3_identifiers';
+import {OutputContext} from '../util';
+
+import {unsupported} from './view/util';
+
+/**
+ * Metadata required by the factory generator to generate a `factory` function for a type.
+ */
+export interface R3FactoryMetadata {
+  /**
+   * String name of the type being generated (used to name the factory function).
+   */
+  name: string;
+
+  /**
+   * An expression representing the function (or constructor) which will instantiate the requested
+   * type.
+   *
+   * This could be a reference to a constructor type, or to a user-defined factory function. The
+   * `useNew` property determines whether it will be called as a constructor or not.
+   */
+  fnOrClass: o.Expression;
+
+  /**
+   * Regardless of whether `fnOrClass` is a constructor function or a user-defined factory, it
+   * may have 0 or more parameters, which will be injected according to the `R3DependencyMetadata`
+   * for those parameters.
+   */
+  deps: R3DependencyMetadata[];
+
+  /**
+   * Whether to interpret `fnOrClass` as a constructor function (`useNew: true`) or as a factory
+   * (`useNew: false`).
+   */
+  useNew: boolean;
+
+
+  /**
+   * An expression for the function which will be used to inject dependencies. The API of this
+   * function could be different, and other options control how it will be invoked.
+   */
+  injectFn: o.ExternalReference;
+
+  /**
+   * Whether the `injectFn` given above accepts a 2nd parameter indicating the default value to
+   * be used to resolve missing @Optional dependencies.
+   *
+   * If the optional parameter is used, injectFn for an optional dependency will be invoked as:
+   * `injectFn(token, null, flags)`.
+   *
+   * If it's not used, injectFn for an optional dependency will be invoked as:
+   * `injectFn(token, flags)`. The Optional flag will indicate that injectFn should select a default
+   * value if it cannot satisfy the injection request for the token.
+   */
+  useOptionalParam: boolean;
+
+  /**
+   * If present, the return of the factory function will be an array with the injected value in the
+   * 0th position and the extra results included in subsequent positions.
+   *
+   * Occasionally APIs want to construct additional values when the factory function is called. The
+   * paradigm there is to have the factory function return an array, with the DI-created value as
+   * well as other values. Specifying `extraResults` enables this functionality.
+   */
+  extraResults?: o.Expression[];
+}
+
+/**
+ * Resolved type of a dependency.
+ *
+ * Occasionally, dependencies will have special significance which is known statically. In that
+ * case the `R3ResolvedDependencyType` informs the factory generator that a particular dependency
+ * should be generated specially (usually by calling a special injection function instead of the
+ * standard one).
+ */
+export enum R3ResolvedDependencyType {
+  /**
+   * A normal token dependency.
+   */
+  Token = 0,
+
+  /**
+   * The dependency is for an attribute.
+   *
+   * The token expression is a string representing the attribute name.
+   */
+  Attribute = 1,
+
+  /**
+   * The dependency is for the `Injector` type itself.
+   */
+  Injector = 2,
+
+  /**
+   * The dependency is for `ElementRef`.
+   */
+  ElementRef = 3,
+
+  /**
+   * The dependency is for `TemplateRef`.
+   */
+  TemplateRef = 4,
+
+  /**
+   * The dependency is for `ViewContainerRef`.
+   */
+  ViewContainerRef = 5,
+}
+
+/**
+ * Metadata representing a single dependency to be injected into a constructor or function call.
+ */
+export interface R3DependencyMetadata {
+  /**
+   * An expression representing the token or value to be injected.
+   */
+  token: o.Expression;
+
+  /**
+   * An enum indicating whether this dependency has special meaning to Angular and needs to be
+   * injected specially.
+   */
+  resolved: R3ResolvedDependencyType;
+
+  /**
+   * Whether the dependency has an @Host qualifier.
+   */
+  host: boolean;
+
+  /**
+   * Whether the dependency has an @Optional qualifier.
+   */
+  optional: boolean;
+
+  /**
+   * Whether the dependency has an @Self qualifier.
+   */
+  self: boolean;
+
+  /**
+   * Whether the dependency has an @SkipSelf qualifier.
+   */
+  skipSelf: boolean;
+}
+
+/**
+ * Construct a factory function expression for the given `R3FactoryMetadata`.
+ */
+export function compileFactoryFunction(meta: R3FactoryMetadata): o.Expression {
+  // Each dependency becomes an invocation of an inject*() function.
+  const args =
+      meta.deps.map(dep => compileInjectDependency(dep, meta.injectFn, meta.useOptionalParam));
+
+  // The overall result depends on whether this is construction or function invocation.
+  const expr = meta.useNew ? new o.InstantiateExpr(meta.fnOrClass, args) :
+                             new o.InvokeFunctionExpr(meta.fnOrClass, args);
+
+  // If `extraResults` is specified, then the result is an array consisting of the instantiated
+  // value plus any extra results.
+  const retExpr =
+      meta.extraResults === undefined ? expr : o.literalArr([expr, ...meta.extraResults]);
+  return o.fn(
+      [], [new o.ReturnStatement(retExpr)], o.INFERRED_TYPE, undefined, `${meta.name}_Factory`);
+}
+
+function compileInjectDependency(
+    dep: R3DependencyMetadata, injectFn: o.ExternalReference,
+    useOptionalParam: boolean): o.Expression {
+  // Interpret the dependency according to its resolved type.
+  switch (dep.resolved) {
+    case R3ResolvedDependencyType.Token:
+    case R3ResolvedDependencyType.Injector: {
+      // Build up the injection flags according to the metadata.
+      const flags = InjectFlags.Default | (dep.self ? InjectFlags.Self : 0) |
+          (dep.skipSelf ? InjectFlags.SkipSelf : 0) | (dep.host ? InjectFlags.Host : 0) |
+          (dep.optional ? InjectFlags.Optional : 0);
+      // Determine the token used for injection. In almost all cases this is the given token, but
+      // if the dependency is resolved to the `Injector` then the special `INJECTOR` token is used
+      // instead.
+      let token: o.Expression = dep.token;
+      if (dep.resolved === R3ResolvedDependencyType.Injector) {
+        token = o.importExpr(Identifiers.INJECTOR);
+      }
+
+      // Build up the arguments to the injectFn call.
+      const injectArgs = [dep.token];
+      // If this dependency is optional or otherwise has non-default flags, then additional
+      // parameters describing how to inject the dependency must be passed to the inject function
+      // that's being used.
+      if (flags !== InjectFlags.Default || dep.optional) {
+        // Either the dependency is optional, or non-default flags are in use. Either of these cases
+        // necessitates adding an argument for the default value if such an argument is required
+        // by the inject function (useOptionalParam === true).
+        if (useOptionalParam) {
+          // The inject function requires a default value parameter.
+          injectArgs.push(dep.optional ? o.NULL_EXPR : o.literal(undefined));
+        }
+        // The last parameter is always the InjectFlags, which only need to be specified if they're
+        // non-default.
+        if (flags !== InjectFlags.Default) {
+          injectArgs.push(o.literal(flags));
+        }
+      }
+      return o.importExpr(injectFn).callFn(injectArgs);
+    }
+    case R3ResolvedDependencyType.Attribute:
+      // In the case of attributes, the attribute name in question is given as the token.
+      return o.importExpr(R3.injectAttribute).callFn([dep.token]);
+    case R3ResolvedDependencyType.ElementRef:
+      return o.importExpr(R3.injectElementRef).callFn([]);
+    case R3ResolvedDependencyType.TemplateRef:
+      return o.importExpr(R3.injectTemplateRef).callFn([]);
+    case R3ResolvedDependencyType.ViewContainerRef:
+      return o.importExpr(R3.injectViewContainerRef).callFn([]);
+    default:
+      return unsupported(
+          `Unknown R3ResolvedDependencyType: ${R3ResolvedDependencyType[dep.resolved]}`);
+  }
+}
+
+/**
+ * A helper function useful for extracting `R3DependencyMetadata` from a Render2
+ * `CompileTypeMetadata` instance.
+ */
+export function dependenciesFromGlobalMetadata(
+    type: CompileTypeMetadata, outputCtx: OutputContext,
+    reflector: CompileReflector): R3DependencyMetadata[] {
+  // Use the `CompileReflector` to look up references to some well-known Angular types. These will
+  // be compared with the token to statically determine whether the token has significance to
+  // Angular, and set the correct `R3ResolvedDependencyType` as a result.
+  const elementRef = reflector.resolveExternalReference(Identifiers.ElementRef);
+  const templateRef = reflector.resolveExternalReference(Identifiers.TemplateRef);
+  const viewContainerRef = reflector.resolveExternalReference(Identifiers.ViewContainerRef);
+  const injectorRef = reflector.resolveExternalReference(Identifiers.Injector);
+
+  // Iterate through the type's DI dependencies and produce `R3DependencyMetadata` for each of them.
+  const deps: R3DependencyMetadata[] = [];
+  for (let dependency of type.diDeps) {
+    if (dependency.token) {
+      const tokenRef = tokenReference(dependency.token);
+      let resolved: R3ResolvedDependencyType = R3ResolvedDependencyType.Token;
+      if (tokenRef === elementRef) {
+        resolved = R3ResolvedDependencyType.ElementRef;
+      } else if (tokenRef === templateRef) {
+        resolved = R3ResolvedDependencyType.TemplateRef;
+      } else if (tokenRef === viewContainerRef) {
+        resolved = R3ResolvedDependencyType.ViewContainerRef;
+      } else if (tokenRef === injectorRef) {
+        resolved = R3ResolvedDependencyType.Injector;
+      } else if (dependency.isAttribute) {
+        resolved = R3ResolvedDependencyType.Attribute;
+      }
+
+      // In the case of most dependencies, the token will be a reference to a type. Sometimes,
+      // however, it can be a string, in the case of older Angular code or @Attribute injection.
+      const token =
+          tokenRef instanceof StaticSymbol ? outputCtx.importExpr(tokenRef) : o.literal(tokenRef);
+
+      // Construct the dependency.
+      deps.push({
+        token,
+        resolved,
+        host: !!dependency.isHost,
+        optional: !!dependency.isOptional,
+        self: !!dependency.isSelf,
+        skipSelf: !!dependency.isSkipSelf,
+      });
+    } else {
+      unsupported('dependency without a token');
+    }
+  }
+
+  return deps;
+}
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index b0a6c9af22..030a2b9b94 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -90,11 +90,21 @@ export class Identifiers {
 
   static defineComponent: o.ExternalReference = {name: 'ɵdefineComponent', moduleName: CORE};
 
+  static ComponentDef: o.ExternalReference = {
+    name: 'ComponentDef',
+    moduleName: CORE,
+  };
+
   static defineDirective: o.ExternalReference = {
     name: 'ɵdefineDirective',
     moduleName: CORE,
   };
 
+  static DirectiveDef: o.ExternalReference = {
+    name: 'DirectiveDef',
+    moduleName: CORE,
+  };
+
   static defineInjector: o.ExternalReference = {
     name: 'defineInjector',
     moduleName: CORE,
diff --git a/packages/compiler/src/render3/r3_pipe_compiler.ts b/packages/compiler/src/render3/r3_pipe_compiler.ts
index f1a849c33c..98c75db184 100644
--- a/packages/compiler/src/render3/r3_pipe_compiler.ts
+++ b/packages/compiler/src/render3/r3_pipe_compiler.ts
@@ -12,8 +12,9 @@ import {DefinitionKind} from '../constant_pool';
 import * as o from '../output/output_ast';
 import {OutputContext, error} from '../util';
 
+import {compileFactoryFunction, dependenciesFromGlobalMetadata} from './r3_factory';
 import {Identifiers as R3} from './r3_identifiers';
-import {createFactory} from './r3_view_compiler_local';
+
 
 /**
  * Write a pipe definition to the output context.
@@ -30,7 +31,14 @@ export function compilePipe(
       {key: 'type', value: outputCtx.importExpr(pipe.type.reference), quoted: false});
 
   // e.g. `factory: function MyPipe_Factory() { return new MyPipe(); }`
-  const templateFactory = createFactory(pipe.type, outputCtx, reflector, []);
+  const deps = dependenciesFromGlobalMetadata(pipe.type, outputCtx, reflector);
+  const templateFactory = compileFactoryFunction({
+    name: identifierName(pipe.type) !,
+    fnOrClass: outputCtx.importExpr(pipe.type.reference), deps,
+    useNew: true,
+    injectFn: R3.directiveInject,
+    useOptionalParam: false,
+  });
   definitionMapValues.push({key: 'factory', value: templateFactory, quoted: false});
 
   // e.g. `pure: true`
diff --git a/packages/compiler/src/render3/view/api.ts b/packages/compiler/src/render3/view/api.ts
new file mode 100644
index 0000000000..71f1624a69
--- /dev/null
+++ b/packages/compiler/src/render3/view/api.ts
@@ -0,0 +1,178 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as o from '../../output/output_ast';
+import {ParseSourceSpan} from '../../parse_util';
+import * as t from '../r3_ast';
+import {R3DependencyMetadata} from '../r3_factory';
+
+/**
+ * Information needed to compile a directive for the render3 runtime.
+ */
+export interface R3DirectiveMetadata {
+  /**
+   * Name of the directive type.
+   */
+  name: string;
+
+  /**
+   * An expression representing a reference to the directive itself.
+   */
+  type: o.Expression;
+
+  /**
+   * A source span for the directive type.
+   */
+  typeSourceSpan: ParseSourceSpan;
+
+  /**
+   * Dependencies of the directive's constructor.
+   */
+  deps: R3DependencyMetadata[];
+
+  /**
+   * Unparsed selector of the directive, or `null` if there was no selector.
+   */
+  selector: string|null;
+
+  /**
+   * Information about the content queries made by the directive.
+   */
+  queries: R3QueryMetadata[];
+
+  /**
+   * Mappings indicating how the directive interacts with its host element (host bindings,
+   * listeners, etc).
+   */
+  host: {
+    /**
+     * A mapping of attribute binding keys to unparsed expressions.
+     */
+    attributes: {[key: string]: string};
+
+    /**
+     * A mapping of event binding keys to unparsed expressions.
+     */
+    listeners: {[key: string]: string};
+
+    /**
+     * A mapping of property binding keys to unparsed expressions.
+     */
+    properties: {[key: string]: string};
+  };
+
+  /**
+   * A mapping of input field names to the property names.
+   */
+  inputs: {[field: string]: string};
+
+  /**
+   * A mapping of output field names to the property names.
+   */
+  outputs: {[field: string]: string};
+}
+
+/**
+ * Information needed to compile a component for the render3 runtime.
+ */
+export interface R3ComponentMetadata extends R3DirectiveMetadata {
+  /**
+   * Information about the component's template.
+   */
+  template: {
+    /**
+     * Parsed nodes of the template.
+     */
+    nodes: t.Node[];
+
+    /**
+     * Whether the template includes <ng-content> tags.
+     */
+    hasNgContent: boolean;
+
+    /**
+     * Selectors found in the <ng-content> tags in the template.
+     */
+    ngContentSelectors: string[];
+  };
+
+  /**
+   * Information about usage of specific lifecycle events which require special treatment in the
+   * code generator.
+   */
+  lifecycle: {
+    /**
+     * Whether the component uses NgOnChanges.
+     */
+    usesOnChanges: boolean;
+  };
+
+  /**
+   * Information about the view queries made by the component.
+   */
+  viewQueries: R3QueryMetadata[];
+
+  /**
+   * A map of pipe names to an expression referencing the pipe type which are in the scope of the
+   * compilation.
+   */
+  pipes: Map<string, o.Expression>;
+
+  /**
+   * A map of directive selectors to an expression referencing the directive type which are in the
+   * scope of the compilation.
+   */
+  directives: Map<string, o.Expression>;
+}
+
+/**
+ * Information needed to compile a query (view or content).
+ */
+export interface R3QueryMetadata {
+  /**
+   * Name of the property on the class to update with query results.
+   */
+  propertyName: string;
+
+  /**
+   * Whether to read only the first matching result, or an array of results.
+   */
+  first: boolean;
+
+  /**
+   * Either an expression representing a type for the query predicate, or a set of string selectors.
+   */
+  predicate: o.Expression|string[];
+
+  /**
+   * Whether to include only direct children or all descendants.
+   */
+  descendants: boolean;
+
+  /**
+   * An expression representing a type to read from each matched node, or null if the node itself
+   * is to be returned.
+   */
+  read: o.Expression|null;
+}
+
+/**
+ * Output of render3 directive compilation.
+ */
+export interface R3DirectiveDef {
+  expression: o.Expression;
+  type: o.Type;
+}
+
+/**
+ * Output of render3 component compilation.
+ */
+export interface R3ComponentDef {
+  expression: o.Expression;
+  type: o.Type;
+}
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
new file mode 100644
index 0000000000..cba9e7be1f
--- /dev/null
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -0,0 +1,444 @@
+/**
+ * @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 {StaticSymbol} from '../../aot/static_symbol';
+import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileDirectiveSummary, CompilePipeMetadata, CompileQueryMetadata, CompileTokenMetadata, CompileTypeMetadata, flatten, identifierName, sanitizeIdentifier, tokenReference} from '../../compile_metadata';
+import {CompileReflector} from '../../compile_reflector';
+import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, convertPropertyBinding} from '../../compiler_util/expression_converter';
+import {ConstantPool, DefinitionKind} from '../../constant_pool';
+import * as core from '../../core';
+import {AST, AstMemoryEfficientTransformer, BindingPipe, BoundElementBindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
+import {Identifiers} from '../../identifiers';
+import {LifecycleHooks} from '../../lifecycle_reflector';
+import * as o from '../../output/output_ast';
+import {ParseSourceSpan, typeSourceSpan} from '../../parse_util';
+import {CssSelector, SelectorMatcher} from '../../selector';
+import {BindingParser} from '../../template_parser/binding_parser';
+import {OutputContext, error} from '../../util';
+
+import * as t from './../r3_ast';
+import {R3DependencyMetadata, R3ResolvedDependencyType, compileFactoryFunction, dependenciesFromGlobalMetadata} from './../r3_factory';
+import {Identifiers as R3} from './../r3_identifiers';
+import {R3ComponentDef, R3ComponentMetadata, R3DirectiveDef, R3DirectiveMetadata, R3QueryMetadata} from './api';
+import {BindingScope, TemplateDefinitionBuilder} from './template';
+import {CONTEXT_NAME, DefinitionMap, ID_SEPARATOR, MEANING_SEPARATOR, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, temporaryAllocator, unsupported} from './util';
+
+function baseDirectiveFields(
+    meta: R3DirectiveMetadata, constantPool: ConstantPool,
+    bindingParser: BindingParser): DefinitionMap {
+  const definitionMap = new DefinitionMap();
+
+  // e.g. `type: MyDirective`
+  definitionMap.set('type', meta.type);
+
+  // e.g. `selectors: [['', 'someDir', '']]`
+  definitionMap.set('selectors', createDirectiveSelector(meta.selector !));
+
+  const queryDefinitions = createQueryDefinitions(meta.queries, constantPool);
+
+  // e.g. `factory: () => new MyApp(injectElementRef())`
+  definitionMap.set('factory', compileFactoryFunction({
+                      name: meta.name,
+                      fnOrClass: meta.type,
+                      deps: meta.deps,
+                      useNew: true,
+                      injectFn: R3.directiveInject,
+                      useOptionalParam: false,
+                      extraResults: queryDefinitions,
+                    }));
+
+  // e.g. `hostBindings: (dirIndex, elIndex) => { ... }
+  definitionMap.set('hostBindings', createHostBindingsFunction(meta, bindingParser));
+
+  // e.g. `attributes: ['role', 'listbox']`
+  definitionMap.set('attributes', createHostAttributesArray(meta));
+
+  // e.g 'inputs: {a: 'a'}`
+  definitionMap.set('inputs', conditionallyCreateMapObjectLiteral(meta.inputs));
+
+  // e.g 'outputs: {a: 'a'}`
+  definitionMap.set('outputs', conditionallyCreateMapObjectLiteral(meta.outputs));
+
+  return definitionMap;
+}
+
+/**
+ * Compile a directive for the render3 runtime as defined by the `R3DirectiveMetadata`.
+ */
+export function compileDirective(
+    meta: R3DirectiveMetadata, constantPool: ConstantPool,
+    bindingParser: BindingParser): R3DirectiveDef {
+  const definitionMap = baseDirectiveFields(meta, constantPool, bindingParser);
+  const expression = o.importExpr(R3.defineDirective).callFn([definitionMap.toLiteralMap()]);
+  const type =
+      new o.ExpressionType(o.importExpr(R3.DirectiveDef, [new o.ExpressionType(meta.type)]));
+  return {expression, type};
+}
+
+/**
+ * Compile a component for the render3 runtime as defined by the `R3ComponentMetadata`.
+ */
+export function compileComponent(
+    meta: R3ComponentMetadata, constantPool: ConstantPool,
+    bindingParser: BindingParser): R3ComponentDef {
+  const definitionMap = baseDirectiveFields(meta, constantPool, bindingParser);
+
+  const selector = meta.selector && CssSelector.parse(meta.selector);
+  const firstSelector = selector && selector[0];
+
+  // e.g. `attr: ["class", ".my.app"]`
+  // This is optional an only included if the first selector of a component specifies attributes.
+  if (firstSelector) {
+    const selectorAttributes = firstSelector.getAttrs();
+    if (selectorAttributes.length) {
+      definitionMap.set(
+          'attrs', constantPool.getConstLiteral(
+                       o.literalArr(selectorAttributes.map(
+                           value => value != null ? o.literal(value) : o.literal(undefined))),
+                       /* forceShared */ true));
+    }
+  }
+
+  // Generate the CSS matcher that recognize directive
+  let directiveMatcher: SelectorMatcher|null = null;
+
+  if (meta.directives.size) {
+    const matcher = new SelectorMatcher();
+    meta.directives.forEach((expression, selector: string) => {
+      matcher.addSelectables(CssSelector.parse(selector), expression);
+    });
+    directiveMatcher = matcher;
+  }
+
+  // e.g. `template: function MyComponent_Template(_ctx, _cm) {...}`
+  const templateTypeName = meta.name;
+  const templateName = templateTypeName ? `${templateTypeName}_Template` : null;
+
+  const directivesUsed = new Set<o.Expression>();
+  const pipesUsed = new Set<o.Expression>();
+
+  const template = meta.template;
+  const templateFunctionExpression =
+      new TemplateDefinitionBuilder(
+          constantPool, CONTEXT_NAME, BindingScope.ROOT_SCOPE, 0, templateTypeName, templateName,
+          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed)
+          .buildTemplateFunction(
+              template.nodes, [], template.hasNgContent, template.ngContentSelectors);
+
+  definitionMap.set('template', templateFunctionExpression);
+
+  // e.g. `directives: [MyDirective]`
+  if (directivesUsed.size) {
+    definitionMap.set('directives', o.literalArr(Array.from(directivesUsed)));
+  }
+
+  // e.g. `pipes: [MyPipe]`
+  if (pipesUsed.size) {
+    definitionMap.set('pipes', o.literalArr(Array.from(pipesUsed)));
+  }
+
+  // e.g. `features: [NgOnChangesFeature(MyComponent)]`
+  const features: o.Expression[] = [];
+  if (meta.lifecycle.usesOnChanges) {
+    features.push(o.importExpr(R3.NgOnChangesFeature, null, null).callFn([meta.type]));
+  }
+  if (features.length) {
+    definitionMap.set('features', o.literalArr(features));
+  }
+
+  const expression = o.importExpr(R3.defineComponent).callFn([definitionMap.toLiteralMap()]);
+  const type =
+      new o.ExpressionType(o.importExpr(R3.ComponentDef, [new o.ExpressionType(meta.type)]));
+
+  return {expression, type};
+}
+
+/**
+ * A wrapper around `compileDirective` which depends on render2 global analysis data as its input
+ * instead of the `R3DirectiveMetadata`.
+ *
+ * `R3DirectiveMetadata` is computed from `CompileDirectiveMetadata` and other statically reflected
+ * information.
+ */
+export function compileDirectiveFromRender2(
+    outputCtx: OutputContext, directive: CompileDirectiveMetadata, reflector: CompileReflector,
+    bindingParser: BindingParser) {
+  const name = identifierName(directive.type) !;
+  name || error(`Cannot resolver the name of ${directive.type}`);
+
+  const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Directive);
+
+  const meta = directiveMetadataFromGlobalMetadata(directive, outputCtx, reflector);
+  const res = compileDirective(meta, outputCtx.constantPool, bindingParser);
+
+  // Create the partial class to be merged with the actual class.
+  outputCtx.statements.push(new o.ClassStmt(
+      name, null,
+      [new o.ClassField(definitionField, o.INFERRED_TYPE, [o.StmtModifier.Static], res.expression)],
+      [], new o.ClassMethod(null, [], []), []));
+}
+
+/**
+ * A wrapper around `compileComponent` which depends on render2 global analysis data as its input
+ * instead of the `R3DirectiveMetadata`.
+ *
+ * `R3ComponentMetadata` is computed from `CompileDirectiveMetadata` and other statically reflected
+ * information.
+ */
+export function compileComponentFromRender2(
+    outputCtx: OutputContext, component: CompileDirectiveMetadata, nodes: t.Node[],
+    hasNgContent: boolean, ngContentSelectors: string[], reflector: CompileReflector,
+    bindingParser: BindingParser, directiveTypeBySel: Map<string, any>,
+    pipeTypeByName: Map<string, any>) {
+  const name = identifierName(component.type) !;
+  name || error(`Cannot resolver the name of ${component.type}`);
+
+  const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Component);
+
+  const summary = component.toSummary();
+
+  // Compute the R3ComponentMetadata from the CompileDirectiveMetadata
+  const meta: R3ComponentMetadata = {
+    ...directiveMetadataFromGlobalMetadata(component, outputCtx, reflector),
+    selector: component.selector,
+    template: {
+        nodes, hasNgContent, ngContentSelectors,
+    },
+    lifecycle: {
+      usesOnChanges:
+          component.type.lifecycleHooks.some(lifecycle => lifecycle == LifecycleHooks.OnChanges),
+    },
+    directives: typeMapToExpressionMap(directiveTypeBySel, outputCtx),
+    pipes: typeMapToExpressionMap(pipeTypeByName, outputCtx),
+    viewQueries: queriesFromGlobalMetadata(component.viewQueries, outputCtx),
+  };
+  const res = compileComponent(meta, outputCtx.constantPool, bindingParser);
+
+  // Create the partial class to be merged with the actual class.
+  outputCtx.statements.push(new o.ClassStmt(
+      name, null,
+      [new o.ClassField(definitionField, o.INFERRED_TYPE, [o.StmtModifier.Static], res.expression)],
+      [], new o.ClassMethod(null, [], []), []));
+}
+
+/**
+ * Compute `R3DirectiveMetadata` given `CompileDirectiveMetadata` and a `CompileReflector`.
+ */
+function directiveMetadataFromGlobalMetadata(
+    directive: CompileDirectiveMetadata, outputCtx: OutputContext,
+    reflector: CompileReflector): R3DirectiveMetadata {
+  const summary = directive.toSummary();
+  const name = identifierName(directive.type) !;
+  name || error(`Cannot resolver the name of ${directive.type}`);
+
+  return {
+    name,
+    type: outputCtx.importExpr(directive.type.reference),
+    typeSourceSpan:
+        typeSourceSpan(directive.isComponent ? 'Component' : 'Directive', directive.type),
+    selector: directive.selector,
+    deps: dependenciesFromGlobalMetadata(directive.type, outputCtx, reflector),
+    queries: queriesFromGlobalMetadata(directive.queries, outputCtx),
+    host: {
+      attributes: directive.hostAttributes,
+      listeners: summary.hostListeners,
+      properties: summary.hostProperties,
+    },
+    inputs: directive.inputs,
+    outputs: directive.outputs,
+  };
+}
+
+/**
+ * Convert `CompileQueryMetadata` into `R3QueryMetadata`.
+ */
+function queriesFromGlobalMetadata(
+    queries: CompileQueryMetadata[], outputCtx: OutputContext): R3QueryMetadata[] {
+  return queries.map(query => {
+    let read: o.Expression|null = null;
+    if (query.read && query.read.identifier) {
+      read = outputCtx.importExpr(query.read.identifier.reference);
+    }
+    return {
+      propertyName: query.propertyName,
+      first: query.first,
+      predicate: selectorsFromGlobalMetadata(query.selectors, outputCtx),
+      descendants: query.descendants, read,
+    };
+  });
+}
+
+/**
+ * Convert `CompileTokenMetadata` for query selectors into either an expression for a predicate
+ * type, or a list of string predicates.
+ */
+function selectorsFromGlobalMetadata(
+    selectors: CompileTokenMetadata[], outputCtx: OutputContext): o.Expression|string[] {
+  if (selectors.length > 1 || (selectors.length == 1 && selectors[0].value)) {
+    const selectorStrings = selectors.map(value => value.value as string);
+    selectorStrings.some(value => !value) &&
+        error('Found a type among the string selectors expected');
+    return outputCtx.constantPool.getConstLiteral(
+        o.literalArr(selectorStrings.map(value => o.literal(value))));
+  }
+
+  if (selectors.length == 1) {
+    const first = selectors[0];
+    if (first.identifier) {
+      return outputCtx.importExpr(first.identifier.reference);
+    }
+  }
+
+  error('Unexpected query form');
+  return o.NULL_EXPR;
+}
+
+/**
+ *
+ * @param meta
+ * @param constantPool
+ */
+function createQueryDefinitions(
+    queries: R3QueryMetadata[], constantPool: ConstantPool): o.Expression[]|undefined {
+  const queryDefinitions: o.Expression[] = [];
+  for (let i = 0; i < queries.length; i++) {
+    const query = queries[i];
+    const predicate = getQueryPredicate(query, constantPool);
+
+    // e.g. r3.Q(null, somePredicate, false) or r3.Q(null, ['div'], false)
+    const parameters = [
+      o.literal(null, o.INFERRED_TYPE),
+      predicate,
+      o.literal(query.descendants),
+    ];
+
+    if (query.read) {
+      parameters.push(query.read);
+    }
+
+    queryDefinitions.push(o.importExpr(R3.query).callFn(parameters));
+  }
+  return queryDefinitions.length > 0 ? queryDefinitions : undefined;
+}
+
+// Turn a directive selector into an R3-compatible selector for directive def
+function createDirectiveSelector(selector: string): o.Expression {
+  return asLiteral(core.parseSelectorToR3Selector(selector));
+}
+
+function createHostAttributesArray(meta: R3DirectiveMetadata): o.Expression|null {
+  const values: o.Expression[] = [];
+  const attributes = meta.host.attributes;
+  for (let key of Object.getOwnPropertyNames(attributes)) {
+    const value = attributes[key];
+    values.push(o.literal(key), o.literal(value));
+  }
+  if (values.length > 0) {
+    return o.literalArr(values);
+  }
+  return null;
+}
+
+// Return a host binding function or null if one is not necessary.
+function createHostBindingsFunction(
+    meta: R3DirectiveMetadata, bindingParser: BindingParser): o.Expression|null {
+  const statements: o.Statement[] = [];
+
+  const temporary = temporaryAllocator(statements, TEMPORARY_NAME);
+
+  const hostBindingSourceSpan = meta.typeSourceSpan;
+
+  // Calculate the queries
+  for (let index = 0; index < meta.queries.length; index++) {
+    const query = meta.queries[index];
+
+    // e.g. r3.qR(tmp = r3.ld(dirIndex)[1]) && (r3.ld(dirIndex)[0].someDir = tmp);
+    const getDirectiveMemory = o.importExpr(R3.load).callFn([o.variable('dirIndex')]);
+    // The query list is at the query index + 1 because the directive itself is in slot 0.
+    const getQueryList = getDirectiveMemory.key(o.literal(index + 1));
+    const assignToTemporary = temporary().set(getQueryList);
+    const callQueryRefresh = o.importExpr(R3.queryRefresh).callFn([assignToTemporary]);
+    const updateDirective = getDirectiveMemory.key(o.literal(0, o.INFERRED_TYPE))
+                                .prop(query.propertyName)
+                                .set(query.first ? temporary().prop('first') : temporary());
+    const andExpression = callQueryRefresh.and(updateDirective);
+    statements.push(andExpression.toStmt());
+  }
+
+  const directiveSummary = metadataAsSummary(meta);
+
+  // Calculate the host property bindings
+  const bindings = bindingParser.createBoundHostProperties(directiveSummary, hostBindingSourceSpan);
+  const bindingContext = o.importExpr(R3.load).callFn([o.variable('dirIndex')]);
+  if (bindings) {
+    for (const binding of bindings) {
+      const bindingExpr = convertPropertyBinding(
+          null, bindingContext, binding.expression, 'b', BindingForm.TrySimple,
+          () => error('Unexpected interpolation'));
+      statements.push(...bindingExpr.stmts);
+      statements.push(o.importExpr(R3.elementProperty)
+                          .callFn([
+                            o.variable('elIndex'),
+                            o.literal(binding.name),
+                            o.importExpr(R3.bind).callFn([bindingExpr.currValExpr]),
+                          ])
+                          .toStmt());
+    }
+  }
+
+  // Calculate host event bindings
+  const eventBindings =
+      bindingParser.createDirectiveHostEventAsts(directiveSummary, hostBindingSourceSpan);
+  if (eventBindings) {
+    for (const binding of eventBindings) {
+      const bindingExpr = convertActionBinding(
+          null, bindingContext, binding.handler, 'b', () => error('Unexpected interpolation'));
+      const bindingName = binding.name && sanitizeIdentifier(binding.name);
+      const typeName = meta.name;
+      const functionName =
+          typeName && bindingName ? `${typeName}_${bindingName}_HostBindingHandler` : null;
+      const handler = o.fn(
+          [new o.FnParam('$event', o.DYNAMIC_TYPE)],
+          [...bindingExpr.stmts, new o.ReturnStatement(bindingExpr.allowDefault)], o.INFERRED_TYPE,
+          null, functionName);
+      statements.push(
+          o.importExpr(R3.listener).callFn([o.literal(binding.name), handler]).toStmt());
+    }
+  }
+
+  if (statements.length > 0) {
+    const typeName = meta.name;
+    return o.fn(
+        [
+          new o.FnParam('dirIndex', o.NUMBER_TYPE),
+          new o.FnParam('elIndex', o.NUMBER_TYPE),
+        ],
+        statements, o.INFERRED_TYPE, null, typeName ? `${typeName}_HostBindings` : null);
+  }
+
+  return null;
+}
+
+function metadataAsSummary(meta: R3DirectiveMetadata): CompileDirectiveSummary {
+  // clang-format off
+  return {
+    hostAttributes: meta.host.attributes,
+    hostListeners: meta.host.listeners,
+    hostProperties: meta.host.properties,
+  } as CompileDirectiveSummary;
+  // clang-format on
+}
+
+
+function typeMapToExpressionMap(
+    map: Map<string, StaticSymbol>, outputCtx: OutputContext): Map<string, o.Expression> {
+  // Convert each map entry into another entry where the value is an expression importing the type.
+  const entries = Array.from(map).map(
+      ([key, type]): [string, o.Expression] => [key, outputCtx.importExpr(type)]);
+  return new Map(entries);
+}
\ No newline at end of file
diff --git a/packages/compiler/src/render3/r3_view_compiler_local.ts b/packages/compiler/src/render3/view/template.ts
similarity index 55%
rename from packages/compiler/src/render3/r3_view_compiler_local.ts
rename to packages/compiler/src/render3/view/template.ts
index 4e1a4f9c1c..a27851d86b 100644
--- a/packages/compiler/src/render3/r3_view_compiler_local.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -6,212 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileQueryMetadata, CompileTypeMetadata, flatten, identifierName, sanitizeIdentifier, tokenReference} from '../compile_metadata';
-import {CompileReflector} from '../compile_reflector';
-import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, convertPropertyBinding} from '../compiler_util/expression_converter';
-import {ConstantPool, DefinitionKind} from '../constant_pool';
-import * as core from '../core';
-import {AST, AstMemoryEfficientTransformer, BindingPipe, BoundElementBindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../expression_parser/ast';
-import {Identifiers} from '../identifiers';
-import {LifecycleHooks} from '../lifecycle_reflector';
-import * as o from '../output/output_ast';
-import {ParseSourceSpan, typeSourceSpan} from '../parse_util';
-import {CssSelector, SelectorMatcher} from '../selector';
-import {BindingParser} from '../template_parser/binding_parser';
-import {OutputContext, error} from '../util';
+import {flatten, sanitizeIdentifier} from '../../compile_metadata';
+import {CompileReflector} from '../../compile_reflector';
+import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, convertPropertyBinding} from '../../compiler_util/expression_converter';
+import {ConstantPool} from '../../constant_pool';
+import * as core from '../../core';
+import {AST, AstMemoryEfficientTransformer, BindingPipe, BoundElementBindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
+import * as o from '../../output/output_ast';
+import {ParseSourceSpan} from '../../parse_util';
+import {CssSelector, SelectorMatcher} from '../../selector';
+import {OutputContext, error} from '../../util';
+import * as t from '../r3_ast';
+import {Identifiers as R3} from '../r3_identifiers';
 
-import * as t from './r3_ast';
-import {Identifiers as R3} from './r3_identifiers';
-
-
-
-/** Name of the context parameter passed into a template function */
-const CONTEXT_NAME = 'ctx';
-
-/** Name of the RenderFlag passed into a template function */
-const RENDER_FLAGS = 'rf';
-
-/** Name of the temporary to use during data binding */
-const TEMPORARY_NAME = '_t';
-
-/** The prefix reference variables */
-const REFERENCE_PREFIX = '_r';
-
-/** The name of the implicit context reference */
-const IMPLICIT_REFERENCE = '$implicit';
-
-/** Name of the i18n attributes **/
-const I18N_ATTR = 'i18n';
-const I18N_ATTR_PREFIX = 'i18n-';
-
-/** I18n separators for metadata **/
-const MEANING_SEPARATOR = '|';
-const ID_SEPARATOR = '@@';
-
-export function compileDirective(
-    outputCtx: OutputContext, directive: CompileDirectiveMetadata, reflector: CompileReflector,
-    bindingParser: BindingParser) {
-  const definitionMapValues: {key: string, quoted: boolean, value: o.Expression}[] = [];
-
-  const field = (key: string, value: o.Expression | null) => {
-    if (value) {
-      definitionMapValues.push({key, value, quoted: false});
-    }
-  };
-
-  // e.g. `type: MyDirective`
-  field('type', outputCtx.importExpr(directive.type.reference));
-
-  // e.g. `selectors: [['', 'someDir', '']]`
-  field('selectors', createDirectiveSelector(directive.selector !));
-
-  // e.g. `factory: () => new MyApp(injectElementRef())`
-  field('factory', createFactory(directive.type, outputCtx, reflector, directive.queries));
-
-  // e.g. `hostBindings: (dirIndex, elIndex) => { ... }
-  field('hostBindings', createHostBindingsFunction(directive, outputCtx, bindingParser));
-
-  // e.g. `attributes: ['role', 'listbox']`
-  field('attributes', createHostAttributesArray(directive, outputCtx));
-
-  // e.g 'inputs: {a: 'a'}`
-  field('inputs', conditionallyCreateMapObjectLiteral(directive.inputs));
-
-  // e.g 'outputs: {a: 'a'}`
-  field('outputs', conditionallyCreateMapObjectLiteral(directive.outputs));
-
-  const className = identifierName(directive.type) !;
-  className || error(`Cannot resolver the name of ${directive.type}`);
-
-  const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Directive);
-  const definitionFunction =
-      o.importExpr(R3.defineDirective).callFn([o.literalMap(definitionMapValues)]);
-
-  // Create the partial class to be merged with the actual class.
-  outputCtx.statements.push(new o.ClassStmt(
-      className, null,
-      [new o.ClassField(
-          definitionField, o.INFERRED_TYPE, [o.StmtModifier.Static], definitionFunction)],
-      [], new o.ClassMethod(null, [], []), []));
-}
-
-export function compileComponent(
-    outputCtx: OutputContext, component: CompileDirectiveMetadata, nodes: t.Node[],
-    hasNgContent: boolean, ngContentSelectors: string[], reflector: CompileReflector,
-    bindingParser: BindingParser, directiveTypeBySel: Map<string, any>,
-    pipeTypeByName: Map<string, any>) {
-  const definitionMapValues: {key: string, quoted: boolean, value: o.Expression}[] = [];
-
-  const field = (key: string, value: o.Expression | null) => {
-    if (value) {
-      definitionMapValues.push({key, value, quoted: false});
-    }
-  };
-
-  // Generate the CSS matcher that recognize directive
-  let directiveMatcher: SelectorMatcher|null = null;
-
-  if (directiveTypeBySel.size) {
-    const matcher = new SelectorMatcher();
-    directiveTypeBySel.forEach((staticType: any, selector: string) => {
-      matcher.addSelectables(CssSelector.parse(selector), staticType);
-    });
-    directiveMatcher = matcher;
-  }
-
-  // Directives and Pipes used from the template
-  const directives = new Set<any>();
-  const pipes = new Set<any>();
-
-  // e.g. `type: MyApp`
-  field('type', outputCtx.importExpr(component.type.reference));
-
-  // e.g. `selectors: [['my-app']]`
-  field('selectors', createDirectiveSelector(component.selector !));
-
-  const selector = component.selector && CssSelector.parse(component.selector);
-  const firstSelector = selector && selector[0];
-
-  // e.g. `attr: ["class", ".my.app"]`
-  // This is optional an only included if the first selector of a component specifies attributes.
-  if (firstSelector) {
-    const selectorAttributes = firstSelector.getAttrs();
-    if (selectorAttributes.length) {
-      field(
-          'attrs', outputCtx.constantPool.getConstLiteral(
-                       o.literalArr(selectorAttributes.map(
-                           value => value != null ? o.literal(value) : o.literal(undefined))),
-                       /* forceShared */ true));
-    }
-  }
-
-  // e.g. `factory: function MyApp_Factory() { return new MyApp(injectElementRef()); }`
-  field('factory', createFactory(component.type, outputCtx, reflector, component.queries));
-
-  // e.g `hostBindings: function MyApp_HostBindings { ... }
-  field('hostBindings', createHostBindingsFunction(component, outputCtx, bindingParser));
-
-  // e.g. `template: function MyComponent_Template(_ctx, _cm) {...}`
-  const templateTypeName = component.type.reference.name;
-  const templateName = templateTypeName ? `${templateTypeName}_Template` : null;
-
-  const templateFunctionExpression =
-      new TemplateDefinitionBuilder(
-          outputCtx, outputCtx.constantPool, reflector, CONTEXT_NAME, BindingScope.ROOT_SCOPE, 0,
-          templateTypeName, templateName, component.viewQueries, directiveMatcher, directives,
-          pipeTypeByName, pipes)
-          .buildTemplateFunction(nodes, [], hasNgContent, ngContentSelectors);
-
-  field('template', templateFunctionExpression);
-
-  // e.g. `directives: [MyDirective]`
-  if (directives.size) {
-    const expressions = Array.from(directives).map(d => outputCtx.importExpr(d));
-    field('directives', o.literalArr(expressions));
-  }
-
-  // e.g. `pipes: [MyPipe]`
-  if (pipes.size) {
-    const expressions = Array.from(pipes).map(d => outputCtx.importExpr(d));
-    field('pipes', o.literalArr(expressions));
-  }
-
-  // e.g `inputs: {a: 'a'}`
-  field('inputs', conditionallyCreateMapObjectLiteral(component.inputs));
-
-  // e.g 'outputs: {a: 'a'}`
-  field('outputs', conditionallyCreateMapObjectLiteral(component.outputs));
-
-  // e.g. `features: [NgOnChangesFeature(MyComponent)]`
-  const features: o.Expression[] = [];
-  if (component.type.lifecycleHooks.some(lifecycle => lifecycle == LifecycleHooks.OnChanges)) {
-    features.push(o.importExpr(R3.NgOnChangesFeature, null, null).callFn([outputCtx.importExpr(
-        component.type.reference)]));
-  }
-  if (features.length) {
-    field('features', o.literalArr(features));
-  }
-
-  const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Component);
-  const definitionFunction =
-      o.importExpr(R3.defineComponent).callFn([o.literalMap(definitionMapValues)]);
-  const className = identifierName(component.type) !;
-  className || error(`Cannot resolver the name of ${component.type}`);
-
-  // Create the partial class to be merged with the actual class.
-  outputCtx.statements.push(new o.ClassStmt(
-      className, null,
-      [new o.ClassField(
-          definitionField, o.INFERRED_TYPE, [o.StmtModifier.Static], definitionFunction)],
-      [], new o.ClassMethod(null, [], []), []));
-}
-
-function unsupported(feature: string): never {
-  if (this) {
-    throw new Error(`Builder ${this.constructor.name} doesn't support ${feature} yet`);
-  }
-  throw new Error(`Feature ${feature} is not supported yet`);
-}
+import {R3QueryMetadata} from './api';
+import {CONTEXT_NAME, I18N_ATTR, I18N_ATTR_PREFIX, ID_SEPARATOR, IMPLICIT_REFERENCE, MEANING_SEPARATOR, REFERENCE_PREFIX, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, getQueryPredicate, invalid, mapToExpression, noop, temporaryAllocator, trimTrailingNulls, unsupported} from './util';
 
 const BINDING_INSTRUCTION_MAP: {[type: number]: o.ExternalReference} = {
   [BoundElementBindingType.Property]: R3.elementProperty,
@@ -220,164 +29,7 @@ const BINDING_INSTRUCTION_MAP: {[type: number]: o.ExternalReference} = {
   [BoundElementBindingType.Style]: R3.elementStyleNamed,
 };
 
-function interpolate(args: o.Expression[]): o.Expression {
-  args = args.slice(1);  // Ignore the length prefix added for render2
-  switch (args.length) {
-    case 3:
-      return o.importExpr(R3.interpolation1).callFn(args);
-    case 5:
-      return o.importExpr(R3.interpolation2).callFn(args);
-    case 7:
-      return o.importExpr(R3.interpolation3).callFn(args);
-    case 9:
-      return o.importExpr(R3.interpolation4).callFn(args);
-    case 11:
-      return o.importExpr(R3.interpolation5).callFn(args);
-    case 13:
-      return o.importExpr(R3.interpolation6).callFn(args);
-    case 15:
-      return o.importExpr(R3.interpolation7).callFn(args);
-    case 17:
-      return o.importExpr(R3.interpolation8).callFn(args);
-  }
-  (args.length >= 19 && args.length % 2 == 1) ||
-      error(`Invalid interpolation argument length ${args.length}`);
-  return o.importExpr(R3.interpolationV).callFn([o.literalArr(args)]);
-}
-
-// Pipes always have at least one parameter, the value they operate on
-const pipeBindingIdentifiers = [R3.pipeBind1, R3.pipeBind2, R3.pipeBind3, R3.pipeBind4];
-
-function pipeBinding(args: o.Expression[]): o.ExternalReference {
-  return pipeBindingIdentifiers[args.length] || R3.pipeBindV;
-}
-
-const pureFunctionIdentifiers = [
-  R3.pureFunction0, R3.pureFunction1, R3.pureFunction2, R3.pureFunction3, R3.pureFunction4,
-  R3.pureFunction5, R3.pureFunction6, R3.pureFunction7, R3.pureFunction8
-];
-function getLiteralFactory(
-    outputContext: OutputContext, literal: o.LiteralArrayExpr | o.LiteralMapExpr): o.Expression {
-  const {literalFactory, literalFactoryArguments} =
-      outputContext.constantPool.getLiteralFactory(literal);
-  literalFactoryArguments.length > 0 || error(`Expected arguments to a literal factory function`);
-  let pureFunctionIdent =
-      pureFunctionIdentifiers[literalFactoryArguments.length] || R3.pureFunctionV;
-
-  // Literal factories are pure functions that only need to be re-invoked when the parameters
-  // change.
-  return o.importExpr(pureFunctionIdent).callFn([literalFactory, ...literalFactoryArguments]);
-}
-
-function noop() {}
-
-/**
- * Function which is executed whenever a variable is referenced for the first time in a given
- * scope.
- *
- * It is expected that the function creates the `const localName = expression`; statement.
- */
-type DeclareLocalVarCallback = (lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => void;
-
-class BindingScope implements LocalResolver {
-  /**
-   * Keeps a map from local variables to their expressions.
-   *
-   * This is used when one refers to variable such as: 'let abc = a.b.c`.
-   * - key to the map is the string literal `"abc"`.
-   * - value `lhs` is the left hand side which is an AST representing `abc`.
-   * - value `rhs` is the right hand side which is an AST representing `a.b.c`.
-   * - value `declared` is true if the `declareLocalVarCallback` has been called for this scope
-   * already.
-   */
-  private map = new Map < string, {
-    lhs: o.ReadVarExpr;
-    rhs: o.Expression|undefined;
-    declared: boolean;
-  }
-  > ();
-  private referenceNameIndex = 0;
-
-  static ROOT_SCOPE = new BindingScope().set('$event', o.variable('$event'));
-
-  private constructor(
-      private parent: BindingScope|null = null,
-      private declareLocalVarCallback: DeclareLocalVarCallback = noop) {}
-
-  get(name: string): o.Expression|null {
-    let current: BindingScope|null = this;
-    while (current) {
-      let value = current.map.get(name);
-      if (value != null) {
-        if (current !== this) {
-          // make a local copy and reset the `declared` state.
-          value = {lhs: value.lhs, rhs: value.rhs, declared: false};
-          // Cache the value locally.
-          this.map.set(name, value);
-        }
-        if (value.rhs && !value.declared) {
-          // if it is first time we are referencing the variable in the scope
-          // than invoke the callback to insert variable declaration.
-          this.declareLocalVarCallback(value.lhs, value.rhs);
-          value.declared = true;
-        }
-        return value.lhs;
-      }
-      current = current.parent;
-    }
-    return null;
-  }
-
-  /**
-   * Create a local variable for later reference.
-   *
-   * @param name Name of the variable.
-   * @param lhs AST representing the left hand side of the `let lhs = rhs;`.
-   * @param rhs AST representing the right hand side of the `let lhs = rhs;`. The `rhs` can be
-   * `undefined` for variable that are ambient such as `$event` and which don't have `rhs`
-   * declaration.
-   */
-  set(name: string, lhs: o.ReadVarExpr, rhs?: o.Expression): BindingScope {
-    !this.map.has(name) ||
-        error(`The name ${name} is already defined in scope to be ${this.map.get(name)}`);
-    this.map.set(name, {lhs: lhs, rhs: rhs, declared: false});
-    return this;
-  }
-
-  getLocal(name: string): (o.Expression|null) { return this.get(name); }
-
-  nestedScope(declareCallback: DeclareLocalVarCallback): BindingScope {
-    return new BindingScope(this, declareCallback);
-  }
-
-  freshReferenceName(): string {
-    let current: BindingScope = this;
-    // Find the top scope as it maintains the global reference count
-    while (current.parent) current = current.parent;
-    const ref = `${REFERENCE_PREFIX}${current.referenceNameIndex++}`;
-    return ref;
-  }
-}
-
-// Pasted from render3/interfaces/definition since it cannot be referenced directly
-/**
- * Flags passed into template functions to determine which blocks (i.e. creation, update)
- * should be executed.
- *
- * Typically, a template runs both the creation block and the update block on initialization and
- * subsequent runs only execute the update block. However, dynamically created views require that
- * the creation block be executed separately from the update block (for backwards compat).
- */
-// TODO(vicb): move to ../core
-export const enum RenderFlags {
-  /* Whether to run the creation block (e.g. create elements and directives) */
-  Create = 0b01,
-
-  /* Whether to run the update block (e.g. refresh bindings) */
-  Update = 0b10
-}
-
-class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
+export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   private _dataIndex = 0;
   private _bindingContext = 0;
   private _prefixCode: o.Statement[] = [];
@@ -398,19 +50,19 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   private _phToNodeIdxes: {[phName: string]: number[]}[] = [{}];
 
   constructor(
-      private outputCtx: OutputContext, private constantPool: ConstantPool,
-      private reflector: CompileReflector, private contextParameter: string,
+      private constantPool: ConstantPool, private contextParameter: string,
       parentBindingScope: BindingScope, private level = 0, private contextName: string|null,
-      private templateName: string|null, private viewQueries: CompileQueryMetadata[],
-      private directiveMatcher: SelectorMatcher|null, private directives: Set<any>,
-      private pipeTypeByName: Map<string, any>, private pipes: Set<any>) {
+      private templateName: string|null, private viewQueries: R3QueryMetadata[],
+      private directiveMatcher: SelectorMatcher|null, private directives: Set<o.Expression>,
+      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>) {
     this._bindingScope =
         parentBindingScope.nestedScope((lhsVar: o.ReadVarExpr, expression: o.Expression) => {
           this._bindingCode.push(
               lhsVar.set(expression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
         });
     this._valueConverter = new ValueConverter(
-        outputCtx, () => this.allocateDataSlot(), (name, localName, slot, value: o.ReadVarExpr) => {
+        constantPool, () => this.allocateDataSlot(),
+        (name, localName, slot, value: o.ReadVarExpr) => {
           const pipeType = pipeTypeByName.get(name);
           if (pipeType) {
             this.pipes.add(pipeType);
@@ -443,9 +95,8 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
       if (ngContentSelectors.length > 1) {
         const r3Selectors = ngContentSelectors.map(s => core.parseSelectorToR3Selector(s));
         // `projectionDef` needs both the parsed and raw value of the selectors
-        const parsed = this.outputCtx.constantPool.getConstLiteral(asLiteral(r3Selectors), true);
-        const unParsed =
-            this.outputCtx.constantPool.getConstLiteral(asLiteral(ngContentSelectors), true);
+        const parsed = this.constantPool.getConstLiteral(asLiteral(r3Selectors), true);
+        const unParsed = this.constantPool.getConstLiteral(asLiteral(ngContentSelectors), true);
         parameters.push(parsed, unParsed);
       }
 
@@ -456,15 +107,15 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
     for (let query of this.viewQueries) {
       // e.g. r3.Q(0, somePredicate, true);
       const querySlot = this.allocateDataSlot();
-      const predicate = getQueryPredicate(query, this.outputCtx);
-      const args = [
+      const predicate = getQueryPredicate(query, this.constantPool);
+      const args: o.Expression[] = [
         o.literal(querySlot, o.INFERRED_TYPE),
         predicate,
         o.literal(query.descendants, o.INFERRED_TYPE),
       ];
 
       if (query.read) {
-        args.push(this.outputCtx.importExpr(query.read.identifier !.reference));
+        args.push(query.read);
       }
       this.instruction(this._creationCode, null, R3.query, ...args);
 
@@ -482,13 +133,13 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
 
     const creationCode = this._creationCode.length > 0 ?
         [o.ifStmt(
-            o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(RenderFlags.Create), null, false),
+            o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(core.RenderFlags.Create), null, false),
             this._creationCode)] :
         [];
 
     const updateCode = this._bindingCode.length > 0 ?
         [o.ifStmt(
-            o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(RenderFlags.Update), null, false),
+            o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(core.RenderFlags.Update), null, false),
             this._bindingCode)] :
         [];
 
@@ -624,7 +275,7 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
     let attrArg: o.Expression = o.TYPED_NULL_EXPR;
 
     if (attributes.length > 0) {
-      attrArg = hasI18nAttr ? getLiteralFactory(this.outputCtx, o.literalArr(attributes)) :
+      attrArg = hasI18nAttr ? getLiteralFactory(this.constantPool, o.literalArr(attributes)) :
                               this.constantPool.getConstLiteral(o.literalArr(attributes), true);
     }
 
@@ -770,9 +421,8 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
 
     // Create the template function
     const templateVisitor = new TemplateDefinitionBuilder(
-        this.outputCtx, this.constantPool, this.reflector, templateContext, this._bindingScope,
-        this.level + 1, contextName, templateName, [], this.directiveMatcher, this.directives,
-        this.pipeTypeByName, this.pipes);
+        this.constantPool, templateContext, this._bindingScope, this.level + 1, contextName,
+        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes);
     const templateFunctionExpr =
         templateVisitor.buildTemplateFunction(template.children, template.variables);
     this._postfixCode.push(templateFunctionExpr.toDeclStmt(templateName, null));
@@ -839,223 +489,9 @@ class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   }
 }
 
-function getQueryPredicate(query: CompileQueryMetadata, outputCtx: OutputContext): o.Expression {
-  if (query.selectors.length > 1 || (query.selectors.length == 1 && query.selectors[0].value)) {
-    const selectors = query.selectors.map(value => value.value as string);
-    selectors.some(value => !value) && error('Found a type among the string selectors expected');
-    return outputCtx.constantPool.getConstLiteral(
-        o.literalArr(selectors.map(value => o.literal(value))));
-  }
-
-  if (query.selectors.length == 1) {
-    const first = query.selectors[0];
-    if (first.identifier) {
-      return outputCtx.importExpr(first.identifier.reference);
-    }
-  }
-
-  error('Unexpected query form');
-  return o.NULL_EXPR;
-}
-
-export function createFactory(
-    type: CompileTypeMetadata, outputCtx: OutputContext, reflector: CompileReflector,
-    queries: CompileQueryMetadata[]): o.Expression {
-  let args: o.Expression[] = [];
-
-  const elementRef = reflector.resolveExternalReference(Identifiers.ElementRef);
-  const templateRef = reflector.resolveExternalReference(Identifiers.TemplateRef);
-  const viewContainerRef = reflector.resolveExternalReference(Identifiers.ViewContainerRef);
-
-  for (let dependency of type.diDeps) {
-    const token = dependency.token;
-    if (token) {
-      const tokenRef = tokenReference(token);
-      if (tokenRef === elementRef) {
-        args.push(o.importExpr(R3.injectElementRef).callFn([]));
-      } else if (tokenRef === templateRef) {
-        args.push(o.importExpr(R3.injectTemplateRef).callFn([]));
-      } else if (tokenRef === viewContainerRef) {
-        args.push(o.importExpr(R3.injectViewContainerRef).callFn([]));
-      } else if (dependency.isAttribute) {
-        args.push(o.importExpr(R3.injectAttribute).callFn([o.literal(dependency.token !.value)]));
-      } else {
-        const tokenValue =
-            token.identifier != null ? outputCtx.importExpr(tokenRef) : o.literal(tokenRef);
-        const directiveInjectArgs = [tokenValue];
-        const flags = extractFlags(dependency);
-        if (flags != core.InjectFlags.Default) {
-          // Append flag information if other than default.
-          directiveInjectArgs.push(o.literal(flags));
-        }
-        args.push(o.importExpr(R3.directiveInject).callFn(directiveInjectArgs));
-      }
-    } else {
-      unsupported('dependency without a token');
-    }
-  }
-
-  const queryDefinitions: o.Expression[] = [];
-  for (let query of queries) {
-    const predicate = getQueryPredicate(query, outputCtx);
-
-    // e.g. r3.Q(null, somePredicate, false) or r3.Q(null, ['div'], false)
-    const parameters = [
-      o.literal(null, o.INFERRED_TYPE),
-      predicate,
-      o.literal(query.descendants),
-    ];
-
-    if (query.read) {
-      parameters.push(outputCtx.importExpr(query.read.identifier !.reference));
-    }
-
-    queryDefinitions.push(o.importExpr(R3.query).callFn(parameters));
-  }
-
-  const createInstance = new o.InstantiateExpr(outputCtx.importExpr(type.reference), args);
-  const result = queryDefinitions.length > 0 ? o.literalArr([createInstance, ...queryDefinitions]) :
-                                               createInstance;
-
-  return o.fn(
-      [], [new o.ReturnStatement(result)], o.INFERRED_TYPE, null,
-      type.reference.name ? `${type.reference.name}_Factory` : null);
-}
-
-function extractFlags(dependency: CompileDiDependencyMetadata): core.InjectFlags {
-  let flags = core.InjectFlags.Default;
-  if (dependency.isHost) {
-    flags |= core.InjectFlags.Host;
-  }
-  if (dependency.isOptional) {
-    flags |= core.InjectFlags.Optional;
-  }
-  if (dependency.isSelf) {
-    flags |= core.InjectFlags.Self;
-  }
-  if (dependency.isSkipSelf) {
-    flags |= core.InjectFlags.SkipSelf;
-  }
-  if (dependency.isValue) {
-    unsupported('value dependencies');
-  }
-  return flags;
-}
-
-/**
- *  Remove trailing null nodes as they are implied.
- */
-function trimTrailingNulls(parameters: o.Expression[]): o.Expression[] {
-  while (o.isNull(parameters[parameters.length - 1])) {
-    parameters.pop();
-  }
-  return parameters;
-}
-
-// Turn a directive selector into an R3-compatible selector for directive def
-function createDirectiveSelector(selector: string): o.Expression {
-  return asLiteral(core.parseSelectorToR3Selector(selector));
-}
-
-function createHostAttributesArray(
-    directiveMetadata: CompileDirectiveMetadata, outputCtx: OutputContext): o.Expression|null {
-  const values: o.Expression[] = [];
-  const attributes = directiveMetadata.hostAttributes;
-  for (let key of Object.getOwnPropertyNames(attributes)) {
-    const value = attributes[key];
-    values.push(o.literal(key), o.literal(value));
-  }
-  if (values.length > 0) {
-    return outputCtx.constantPool.getConstLiteral(o.literalArr(values));
-  }
-  return null;
-}
-
-// Return a host binding function or null if one is not necessary.
-function createHostBindingsFunction(
-    directiveMetadata: CompileDirectiveMetadata, outputCtx: OutputContext,
-    bindingParser: BindingParser): o.Expression|null {
-  const statements: o.Statement[] = [];
-
-  const temporary = temporaryAllocator(statements, TEMPORARY_NAME);
-
-  const hostBindingSourceSpan = typeSourceSpan(
-      directiveMetadata.isComponent ? 'Component' : 'Directive', directiveMetadata.type);
-
-  // Calculate the queries
-  for (let index = 0; index < directiveMetadata.queries.length; index++) {
-    const query = directiveMetadata.queries[index];
-
-    // e.g. r3.qR(tmp = r3.ld(dirIndex)[1]) && (r3.ld(dirIndex)[0].someDir = tmp);
-    const getDirectiveMemory = o.importExpr(R3.load).callFn([o.variable('dirIndex')]);
-    // The query list is at the query index + 1 because the directive itself is in slot 0.
-    const getQueryList = getDirectiveMemory.key(o.literal(index + 1));
-    const assignToTemporary = temporary().set(getQueryList);
-    const callQueryRefresh = o.importExpr(R3.queryRefresh).callFn([assignToTemporary]);
-    const updateDirective = getDirectiveMemory.key(o.literal(0, o.INFERRED_TYPE))
-                                .prop(query.propertyName)
-                                .set(query.first ? temporary().prop('first') : temporary());
-    const andExpression = callQueryRefresh.and(updateDirective);
-    statements.push(andExpression.toStmt());
-  }
-
-  const directiveSummary = directiveMetadata.toSummary();
-
-  // Calculate the host property bindings
-  const bindings = bindingParser.createBoundHostProperties(directiveSummary, hostBindingSourceSpan);
-  const bindingContext = o.importExpr(R3.load).callFn([o.variable('dirIndex')]);
-  if (bindings) {
-    for (const binding of bindings) {
-      const bindingExpr = convertPropertyBinding(
-          null, bindingContext, binding.expression, 'b', BindingForm.TrySimple,
-          () => error('Unexpected interpolation'));
-      statements.push(...bindingExpr.stmts);
-      statements.push(o.importExpr(R3.elementProperty)
-                          .callFn([
-                            o.variable('elIndex'),
-                            o.literal(binding.name),
-                            o.importExpr(R3.bind).callFn([bindingExpr.currValExpr]),
-                          ])
-                          .toStmt());
-    }
-  }
-
-  // Calculate host event bindings
-  const eventBindings =
-      bindingParser.createDirectiveHostEventAsts(directiveSummary, hostBindingSourceSpan);
-  if (eventBindings) {
-    for (const binding of eventBindings) {
-      const bindingExpr = convertActionBinding(
-          null, bindingContext, binding.handler, 'b', () => error('Unexpected interpolation'));
-      const bindingName = binding.name && sanitizeIdentifier(binding.name);
-      const typeName = identifierName(directiveMetadata.type);
-      const functionName =
-          typeName && bindingName ? `${typeName}_${bindingName}_HostBindingHandler` : null;
-      const handler = o.fn(
-          [new o.FnParam('$event', o.DYNAMIC_TYPE)],
-          [...bindingExpr.stmts, new o.ReturnStatement(bindingExpr.allowDefault)], o.INFERRED_TYPE,
-          null, functionName);
-      statements.push(
-          o.importExpr(R3.listener).callFn([o.literal(binding.name), handler]).toStmt());
-    }
-  }
-
-  if (statements.length > 0) {
-    const typeName = directiveMetadata.type.reference.name;
-    return o.fn(
-        [
-          new o.FnParam('dirIndex', o.NUMBER_TYPE),
-          new o.FnParam('elIndex', o.NUMBER_TYPE),
-        ],
-        statements, o.INFERRED_TYPE, null, typeName ? `${typeName}_HostBindings` : null);
-  }
-
-  return null;
-}
-
 class ValueConverter extends AstMemoryEfficientTransformer {
   constructor(
-      private outputCtx: OutputContext, private allocateSlot: () => number,
+      private constantPool: ConstantPool, private allocateSlot: () => number,
       private definePipe:
           (name: string, localName: string, slot: number, value: o.Expression) => void) {
     super();
@@ -1082,9 +518,8 @@ class ValueConverter extends AstMemoryEfficientTransformer {
       // calls to literal factories that compose the literal and will cache intermediate
       // values. Otherwise, just return an literal array that contains the values.
       const literal = o.literalArr(values);
-      return values.every(a => a.isConstant()) ?
-          this.outputCtx.constantPool.getConstLiteral(literal, true) :
-          getLiteralFactory(this.outputCtx, literal);
+      return values.every(a => a.isConstant()) ? this.constantPool.getConstLiteral(literal, true) :
+                                                 getLiteralFactory(this.constantPool, literal);
     });
   }
 
@@ -1095,51 +530,144 @@ class ValueConverter extends AstMemoryEfficientTransformer {
       // values. Otherwise, just return an literal array that contains the values.
       const literal = o.literalMap(values.map(
           (value, index) => ({key: map.keys[index].key, value, quoted: map.keys[index].quoted})));
-      return values.every(a => a.isConstant()) ?
-          this.outputCtx.constantPool.getConstLiteral(literal, true) :
-          getLiteralFactory(this.outputCtx, literal);
+      return values.every(a => a.isConstant()) ? this.constantPool.getConstLiteral(literal, true) :
+                                                 getLiteralFactory(this.constantPool, literal);
     });
   }
 }
 
-function invalid<T>(arg: o.Expression | o.Statement | t.Node): never {
-  throw new Error(
-      `Invalid state: Visitor ${this.constructor.name} doesn't handle ${o.constructor.name}`);
+
+
+// Pipes always have at least one parameter, the value they operate on
+const pipeBindingIdentifiers = [R3.pipeBind1, R3.pipeBind2, R3.pipeBind3, R3.pipeBind4];
+
+function pipeBinding(args: o.Expression[]): o.ExternalReference {
+  return pipeBindingIdentifiers[args.length] || R3.pipeBindV;
 }
 
-function asLiteral(value: any): o.Expression {
-  if (Array.isArray(value)) {
-    return o.literalArr(value.map(asLiteral));
-  }
-  return o.literal(value, o.INFERRED_TYPE);
-}
+const pureFunctionIdentifiers = [
+  R3.pureFunction0, R3.pureFunction1, R3.pureFunction2, R3.pureFunction3, R3.pureFunction4,
+  R3.pureFunction5, R3.pureFunction6, R3.pureFunction7, R3.pureFunction8
+];
+function getLiteralFactory(
+    constantPool: ConstantPool, literal: o.LiteralArrayExpr | o.LiteralMapExpr): o.Expression {
+  const {literalFactory, literalFactoryArguments} = constantPool.getLiteralFactory(literal);
+  literalFactoryArguments.length > 0 || error(`Expected arguments to a literal factory function`);
+  let pureFunctionIdent =
+      pureFunctionIdentifiers[literalFactoryArguments.length] || R3.pureFunctionV;
 
-function conditionallyCreateMapObjectLiteral(keys: {[key: string]: string}): o.Expression|null {
-  if (Object.getOwnPropertyNames(keys).length > 0) {
-    return mapToExpression(keys);
-  }
-  return null;
-}
-
-function mapToExpression(map: {[key: string]: any}, quoted = false): o.Expression {
-  return o.literalMap(
-      Object.getOwnPropertyNames(map).map(key => ({key, quoted, value: asLiteral(map[key])})));
+  // Literal factories are pure functions that only need to be re-invoked when the parameters
+  // change.
+  return o.importExpr(pureFunctionIdent).callFn([literalFactory, ...literalFactoryArguments]);
 }
 
 /**
- * Creates an allocator for a temporary variable.
+ * Function which is executed whenever a variable is referenced for the first time in a given
+ * scope.
  *
- * A variable declaration is added to the statements the first time the allocator is invoked.
+ * It is expected that the function creates the `const localName = expression`; statement.
  */
-function temporaryAllocator(statements: o.Statement[], name: string): () => o.ReadVarExpr {
-  let temp: o.ReadVarExpr|null = null;
-  return () => {
-    if (!temp) {
-      statements.push(new o.DeclareVarStmt(TEMPORARY_NAME, undefined, o.DYNAMIC_TYPE));
-      temp = o.variable(name);
+export type DeclareLocalVarCallback = (lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => void;
+
+export class BindingScope implements LocalResolver {
+  /**
+   * Keeps a map from local variables to their expressions.
+   *
+   * This is used when one refers to variable such as: 'let abc = a.b.c`.
+   * - key to the map is the string literal `"abc"`.
+   * - value `lhs` is the left hand side which is an AST representing `abc`.
+   * - value `rhs` is the right hand side which is an AST representing `a.b.c`.
+   * - value `declared` is true if the `declareLocalVarCallback` has been called for this scope
+   * already.
+   */
+  private map = new Map < string, {
+    lhs: o.ReadVarExpr;
+    rhs: o.Expression|undefined;
+    declared: boolean;
+  }
+  > ();
+  private referenceNameIndex = 0;
+
+  static ROOT_SCOPE = new BindingScope().set('$event', o.variable('$event'));
+
+  private constructor(
+      private parent: BindingScope|null = null,
+      private declareLocalVarCallback: DeclareLocalVarCallback = noop) {}
+
+  get(name: string): o.Expression|null {
+    let current: BindingScope|null = this;
+    while (current) {
+      let value = current.map.get(name);
+      if (value != null) {
+        if (current !== this) {
+          // make a local copy and reset the `declared` state.
+          value = {lhs: value.lhs, rhs: value.rhs, declared: false};
+          // Cache the value locally.
+          this.map.set(name, value);
+        }
+        if (value.rhs && !value.declared) {
+          // if it is first time we are referencing the variable in the scope
+          // than invoke the callback to insert variable declaration.
+          this.declareLocalVarCallback(value.lhs, value.rhs);
+          value.declared = true;
+        }
+        return value.lhs;
+      }
+      current = current.parent;
     }
-    return temp;
-  };
+    return null;
+  }
+
+  /**
+   * Create a local variable for later reference.
+   *
+   * @param name Name of the variable.
+   * @param lhs AST representing the left hand side of the `let lhs = rhs;`.
+   * @param rhs AST representing the right hand side of the `let lhs = rhs;`. The `rhs` can be
+   * `undefined` for variable that are ambient such as `$event` and which don't have `rhs`
+   * declaration.
+   */
+  set(name: string, lhs: o.ReadVarExpr, rhs?: o.Expression): BindingScope {
+    !this.map.has(name) ||
+        error(`The name ${name} is already defined in scope to be ${this.map.get(name)}`);
+    this.map.set(name, {lhs: lhs, rhs: rhs, declared: false});
+    return this;
+  }
+
+  getLocal(name: string): (o.Expression|null) { return this.get(name); }
+
+  nestedScope(declareCallback: DeclareLocalVarCallback): BindingScope {
+    return new BindingScope(this, declareCallback);
+  }
+
+  freshReferenceName(): string {
+    let current: BindingScope = this;
+    // Find the top scope as it maintains the global reference count
+    while (current.parent) current = current.parent;
+    const ref = `${REFERENCE_PREFIX}${current.referenceNameIndex++}`;
+    return ref;
+  }
+}
+
+/**
+ * Creates a `CssSelector` given a tag name and a map of attributes
+ */
+function createCssSelector(tag: string, attributes: {[name: string]: string}): CssSelector {
+  const cssSelector = new CssSelector();
+
+  cssSelector.setElement(tag);
+
+  Object.getOwnPropertyNames(attributes).forEach((name) => {
+    const value = attributes[name];
+
+    cssSelector.addAttribute(name, value);
+    if (name.toLowerCase() === 'class') {
+      const classes = value.trim().split(/\s+/g);
+      classes.forEach(className => cssSelector.addClassName(className));
+    }
+  });
+
+  return cssSelector;
 }
 
 // Parse i18n metas like:
@@ -1167,23 +695,27 @@ function parseI18nMeta(i18n?: string): {description?: string, id?: string, meani
   return {description, id, meaning};
 }
 
-/**
- * Creates a `CssSelector` given a tag name and a map of attributes
- */
-function createCssSelector(tag: string, attributes: {[name: string]: string}): CssSelector {
-  const cssSelector = new CssSelector();
-
-  cssSelector.setElement(tag);
-
-  Object.getOwnPropertyNames(attributes).forEach((name) => {
-    const value = attributes[name];
-
-    cssSelector.addAttribute(name, value);
-    if (name.toLowerCase() === 'class') {
-      const classes = value.trim().split(/\s+/g);
-      classes.forEach(className => cssSelector.addClassName(className));
-    }
-  });
-
-  return cssSelector;
+function interpolate(args: o.Expression[]): o.Expression {
+  args = args.slice(1);  // Ignore the length prefix added for render2
+  switch (args.length) {
+    case 3:
+      return o.importExpr(R3.interpolation1).callFn(args);
+    case 5:
+      return o.importExpr(R3.interpolation2).callFn(args);
+    case 7:
+      return o.importExpr(R3.interpolation3).callFn(args);
+    case 9:
+      return o.importExpr(R3.interpolation4).callFn(args);
+    case 11:
+      return o.importExpr(R3.interpolation5).callFn(args);
+    case 13:
+      return o.importExpr(R3.interpolation6).callFn(args);
+    case 15:
+      return o.importExpr(R3.interpolation7).callFn(args);
+    case 17:
+      return o.importExpr(R3.interpolation8).callFn(args);
+  }
+  (args.length >= 19 && args.length % 2 == 1) ||
+      error(`Invalid interpolation argument length ${args.length}`);
+  return o.importExpr(R3.interpolationV).callFn([o.literalArr(args)]);
 }
diff --git a/packages/compiler/src/render3/view/util.ts b/packages/compiler/src/render3/view/util.ts
new file mode 100644
index 0000000000..e96e4ed2cd
--- /dev/null
+++ b/packages/compiler/src/render3/view/util.ts
@@ -0,0 +1,122 @@
+/**
+ * @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 {ConstantPool} from '../../constant_pool';
+import * as o from '../../output/output_ast';
+import * as t from '../r3_ast';
+
+import {R3QueryMetadata} from './api';
+
+
+/** Name of the temporary to use during data binding */
+export const TEMPORARY_NAME = '_t';
+
+
+
+/** Name of the context parameter passed into a template function */
+export const CONTEXT_NAME = 'ctx';
+
+/** Name of the RenderFlag passed into a template function */
+export const RENDER_FLAGS = 'rf';
+
+/** The prefix reference variables */
+export const REFERENCE_PREFIX = '_r';
+
+/** The name of the implicit context reference */
+export const IMPLICIT_REFERENCE = '$implicit';
+
+/** Name of the i18n attributes **/
+export const I18N_ATTR = 'i18n';
+export const I18N_ATTR_PREFIX = 'i18n-';
+
+/** I18n separators for metadata **/
+export const MEANING_SEPARATOR = '|';
+export const ID_SEPARATOR = '@@';
+
+/**
+ * Creates an allocator for a temporary variable.
+ *
+ * A variable declaration is added to the statements the first time the allocator is invoked.
+ */
+export function temporaryAllocator(statements: o.Statement[], name: string): () => o.ReadVarExpr {
+  let temp: o.ReadVarExpr|null = null;
+  return () => {
+    if (!temp) {
+      statements.push(new o.DeclareVarStmt(TEMPORARY_NAME, undefined, o.DYNAMIC_TYPE));
+      temp = o.variable(name);
+    }
+    return temp;
+  };
+}
+
+
+export function unsupported(feature: string): never {
+  if (this) {
+    throw new Error(`Builder ${this.constructor.name} doesn't support ${feature} yet`);
+  }
+  throw new Error(`Feature ${feature} is not supported yet`);
+}
+
+export function invalid<T>(arg: o.Expression | o.Statement | t.Node): never {
+  throw new Error(
+      `Invalid state: Visitor ${this.constructor.name} doesn't handle ${o.constructor.name}`);
+}
+
+export function asLiteral(value: any): o.Expression {
+  if (Array.isArray(value)) {
+    return o.literalArr(value.map(asLiteral));
+  }
+  return o.literal(value, o.INFERRED_TYPE);
+}
+
+export function conditionallyCreateMapObjectLiteral(keys: {[key: string]: string}): o.Expression|
+    null {
+  if (Object.getOwnPropertyNames(keys).length > 0) {
+    return mapToExpression(keys);
+  }
+  return null;
+}
+
+export function mapToExpression(map: {[key: string]: any}, quoted = false): o.Expression {
+  return o.literalMap(
+      Object.getOwnPropertyNames(map).map(key => ({key, quoted, value: asLiteral(map[key])})));
+}
+
+/**
+ *  Remove trailing null nodes as they are implied.
+ */
+export function trimTrailingNulls(parameters: o.Expression[]): o.Expression[] {
+  while (o.isNull(parameters[parameters.length - 1])) {
+    parameters.pop();
+  }
+  return parameters;
+}
+
+export function getQueryPredicate(
+    query: R3QueryMetadata, constantPool: ConstantPool): o.Expression {
+  if (Array.isArray(query.predicate)) {
+    return constantPool.getConstLiteral(
+        o.literalArr(query.predicate.map(selector => o.literal(selector) as o.Expression)));
+  } else {
+    return query.predicate;
+  }
+}
+
+export function noop() {}
+
+export class DefinitionMap {
+  values: {key: string, quoted: boolean, value: o.Expression}[] = [];
+
+  set(key: string, value: o.Expression|null): void {
+    if (value) {
+      this.values.push({key, value, quoted: false});
+    }
+  }
+
+  toLiteralMap(): o.LiteralMapExpr { return o.literalMap(this.values); }
+}
diff --git a/packages/compiler/src/template_parser/binding_parser.ts b/packages/compiler/src/template_parser/binding_parser.ts
index 7cdcb2f0ee..bd798b81f2 100644
--- a/packages/compiler/src/template_parser/binding_parser.ts
+++ b/packages/compiler/src/template_parser/binding_parser.ts
@@ -17,8 +17,6 @@ import {ElementSchemaRegistry} from '../schema/element_schema_registry';
 import {CssSelector} from '../selector';
 import {splitAtColon, splitAtPeriod} from '../util';
 
-import {BoundElementPropertyAst, PropertyBindingType} from './template_ast';
-
 const PROPERTY_PARTS_SEPARATOR = '.';
 const ATTRIBUTE_PREFIX = 'attr';
 const CLASS_PREFIX = 'class';
diff --git a/packages/compiler/test/render3/mock_compile.ts b/packages/compiler/test/render3/mock_compile.ts
index 58c570b377..d74aa6d304 100644
--- a/packages/compiler/test/render3/mock_compile.ts
+++ b/packages/compiler/test/render3/mock_compile.ts
@@ -17,7 +17,7 @@ import {removeWhitespaces} from '../../src/ml_parser/html_whitespaces';
 import * as o from '../../src/output/output_ast';
 import {compilePipe} from '../../src/render3/r3_pipe_compiler';
 import {HtmlToTemplateTransform} from '../../src/render3/r3_template_transform';
-import {compileComponent, compileDirective} from '../../src/render3/r3_view_compiler_local';
+import {compileComponentFromRender2, compileDirectiveFromRender2} from '../../src/render3/view/compiler';
 import {BindingParser} from '../../src/template_parser/binding_parser';
 import {OutputContext, escapeRegExp} from '../../src/util';
 import {MockAotCompilerHost, MockCompilerHost, MockData, MockDirectory, arrayToMockDir, expectNoDiagnostics, settings, toMockFileArray} from '../aot/test_util';
@@ -313,11 +313,11 @@ export function compile(
               const hasNgContent = transform.hasNgContent;
               const ngContentSelectors = transform.ngContentSelectors;
 
-              compileComponent(
+              compileComponentFromRender2(
                   outputCtx, directive, nodes, hasNgContent, ngContentSelectors, reflector,
                   hostBindingParser, directiveTypeBySel, pipeTypeByName);
             } else {
-              compileDirective(outputCtx, directive, reflector, hostBindingParser);
+              compileDirectiveFromRender2(outputCtx, directive, reflector, hostBindingParser);
             }
           } else if (resolver.isPipe(pipeOrDirective)) {
             const metadata = resolver.getPipeMetadata(pipeOrDirective);
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 41c19bc162..fdea13d17a 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -1022,8 +1022,8 @@ describe('compiler compliance', () => {
             type: LifecycleComp,
             selectors: [['lifecycle-comp']],
             factory: function LifecycleComp_Factory() { return new LifecycleComp(); },
-            template: function LifecycleComp_Template(rf: IDENT, ctx: IDENT) {},
             inputs: {nameMin: 'name'},
+            template: function LifecycleComp_Template(rf: IDENT, ctx: IDENT) {},
             features: [$r3$.ɵNgOnChangesFeature(LifecycleComp)]
           });`;
 
diff --git a/packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts b/packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts
index ad101293d3..bfdbc3ab87 100644
--- a/packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts
@@ -62,6 +62,7 @@ describe('compiler compliance: listen()', () => {
             componentOutput: 'componentOutput',
             originalComponentOutput: 'renamedComponentOutput'
           }
+          …
         });`;
 
     const directiveDef = `
@@ -75,6 +76,7 @@ describe('compiler compliance: listen()', () => {
           directiveOutput: 'directiveOutput',
           originalDirectiveOutput: 'renamedDirectiveOutput'
         }
+        …
       });`;
 
 

From 971e78dc3502e208250da5e1d4497ae2fcbe7ed8 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 9 May 2018 06:28:05 -0700
Subject: [PATCH 017/582] ci: Remove Chuck from pullapprove (#23798)

Jason takes over his role on core, Keen for everything else

PR Close #23798
---
 .pullapprove.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pullapprove.yml b/.pullapprove.yml
index 59e3839df5..9ca33a0c8d 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -10,7 +10,6 @@
 # andrewseguin - Andrew Seguin
 # brandonroberts - Brandon Roberts
 # brocco - Mike Brocchi
-# chuckjaz - Chuck Jazdzewski
 # filipesilva - Filipe Silva
 # gkalpak - George Kalpakas
 # hansl - Hans Larsen
@@ -18,6 +17,7 @@
 # jasonaden - Jason Aden
 # kapunahelewong - Kapunahele Wong
 # kara - Kara Erickson
+# kyliau - Keen Yee Liau
 # matsko - Matias Niemelä
 # mhevery - Misko Hevery
 # petebacondarwin - Pete Bacon Darwin
@@ -94,7 +94,7 @@ groups:
           - "tools/bazel.rc"
     users:
       - alexeagle #primary
-      - chuckjaz
+      - kyliau
       - IgorMinar #fallback
       - mhevery
       - vikerman #fallback
@@ -133,7 +133,7 @@ groups:
         - "packages/core/*"
     users:
       - mhevery #primary
-      - chuckjaz
+      - jasonaden
       - kara
       - vicb
       - IgorMinar #fallback
@@ -237,7 +237,7 @@ groups:
       files:
         - "packages/language-service/*"
     users:
-      - chuckjaz #primary
+      - kyliau #primary
       # needs secondary
       - vicb
       - IgorMinar #fallback

From a800ccd92210fca4847364fbfef1a4f93f516f05 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 9 May 2018 13:49:54 +0300
Subject: [PATCH 018/582] fix(aio): add link to v5 docs (#23794)

Fixes #23781

PR Close #23794
---
 aio/content/navigation.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index b6336b1e72..407c5efe0f 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -498,18 +498,18 @@
           "title": "Keeping Up-to-Date",
           "tooltip": "Angular release practices, planning for updates, and update resources.",
           "children": [
-            { 
+            {
               "url": "guide/updating",
               "title": "Updating Your Projects",
               "tooltip": "Information about updating Angular applications and libraries to the latest version."
             },
-            { 
+            {
               "url": "guide/releases",
               "title": "Angular Releases",
               "tooltip": "Angular versioning, release, support, and deprecation policies and practices."
             }
           ]
-        },  
+        },
 
         {
           "title": "Upgrading from AngularJS",
@@ -660,9 +660,9 @@
   ],
 
   "docVersions": [
-    { "title": "v4 (LTS)", "url": "https://v4.angular.io" },
+    { "title": "v5", "url": "https://v5.angular.io" },
+    { "title": "v4", "url": "https://v4.angular.io" },
     { "title": "v2", "url": "https://v2.angular.io" },
     { "title": "AngularDart", "url": "https://webdev.dartlang.org/angular" }
-
   ]
 }

From 61170856ee26e44825f1d30d4590de746c6482b5 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 4 May 2018 08:31:46 +0100
Subject: [PATCH 019/582] build(aio): include `navigation.json` changes in
 docs-watch (#23698)

Closes #23582

PR Close #23698
---
 aio/tools/transforms/authors-package/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/tools/transforms/authors-package/index.js b/aio/tools/transforms/authors-package/index.js
index 31a5b89a7d..6fe25eb86b 100644
--- a/aio/tools/transforms/authors-package/index.js
+++ b/aio/tools/transforms/authors-package/index.js
@@ -8,7 +8,7 @@
 /* eslint no-console: "off" */
 
 function createPackage(changedFile) {
-  const marketingMatch = /^aio\/content\/marketing\/(.*)/.exec(changedFile);
+  const marketingMatch = /^aio\/content\/(?:marketing\/|navigation\.json)/.exec(changedFile);
   if (marketingMatch) {
     console.log('Building marketing docs');
     return require('./marketing-package').createPackage();

From c5ca5c0d9fa8e5c851e0646d234d25caf295923e Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 30 Apr 2018 10:33:02 -0700
Subject: [PATCH 020/582] build(bazel): update to rules_typescript 0.12.3
 (#23617)

PR Close #23617
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 9328952214..c3964d26bd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -26,9 +26,9 @@ yarn_install(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.1.zip",
-    strip_prefix = "rules_typescript-0.12.1",
-    sha256 = "24e2c36f60508c6d270ae4265b89b381e3f66d550e70c367ed3755ad8d7ce3b0",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.3.zip",
+    strip_prefix = "rules_typescript-0.12.3",
+    sha256 = "967068c3540f59407716fbeb49949c1600dbf387faeeab3089085784dd21f60c",
 )
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")

From 46674d5fac345eea3b421cbe4bddeebaa37dbce0 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 24 Apr 2018 14:22:55 -0700
Subject: [PATCH 021/582] test(ivy): add html to ivy ast transformer tests
 (#23546)

PR Close #23546
---
 .../compiler/src/expression_parser/ast.ts     |   7 +-
 packages/compiler/src/render3/r3_ast.ts       |  17 +-
 .../src/render3/r3_template_transform.ts      |   6 +-
 .../compiler/src/render3/view/template.ts     |  14 +-
 packages/compiler/src/render3/view/util.ts    |   3 -
 .../src/template_parser/binding_parser.ts     |  16 +-
 .../src/template_parser/template_ast.ts       |  12 +-
 packages/compiler/test/BUILD.bazel            |   3 +-
 .../test/expression_parser/parser_spec.ts     |   4 +-
 .../test/expression_parser/utils/BUILD.bazel  |  15 +
 .../expression_parser/{ => utils}/unparser.ts |   4 +-
 .../{ => utils}/validator.ts                  |   2 +-
 packages/compiler/test/render3/BUILD.bazel    |   2 +
 .../render3/r3_template_transform_spec.ts     | 486 ++++++++++++++++++
 .../template_parser/template_parser_spec.ts   |  43 +-
 15 files changed, 567 insertions(+), 67 deletions(-)
 create mode 100644 packages/compiler/test/expression_parser/utils/BUILD.bazel
 rename packages/compiler/test/expression_parser/{ => utils}/unparser.ts (97%)
 rename packages/compiler/test/expression_parser/{ => utils}/validator.ts (98%)
 create mode 100644 packages/compiler/test/render3/r3_template_transform_spec.ts

diff --git a/packages/compiler/src/expression_parser/ast.ts b/packages/compiler/src/expression_parser/ast.ts
index 08977f7251..c511a4dc23 100644
--- a/packages/compiler/src/expression_parser/ast.ts
+++ b/packages/compiler/src/expression_parser/ast.ts
@@ -705,7 +705,7 @@ export class ParsedVariable {
   constructor(public name: string, public value: string, public sourceSpan: ParseSourceSpan) {}
 }
 
-export const enum BoundElementBindingType {
+export const enum BindingType {
   // A regular binding to a property (e.g. `[property]="expression"`).
   Property,
   // A binding to an element attribute (e.g. `[attr.name]="expression"`).
@@ -720,7 +720,6 @@ export const enum BoundElementBindingType {
 
 export class BoundElementProperty {
   constructor(
-      public name: string, public type: BoundElementBindingType,
-      public securityContext: SecurityContext, public value: AST, public unit: string|null,
-      public sourceSpan: ParseSourceSpan) {}
+      public name: string, public type: BindingType, public securityContext: SecurityContext,
+      public value: AST, public unit: string|null, public sourceSpan: ParseSourceSpan) {}
 }
diff --git a/packages/compiler/src/render3/r3_ast.ts b/packages/compiler/src/render3/r3_ast.ts
index 029516eb98..52767919ad 100644
--- a/packages/compiler/src/render3/r3_ast.ts
+++ b/packages/compiler/src/render3/r3_ast.ts
@@ -7,7 +7,7 @@
  */
 
 import {SecurityContext} from '../core';
-import {AST, BoundElementBindingType, BoundElementProperty, ParsedEvent, ParsedEventType} from '../expression_parser/ast';
+import {AST, BindingType, BoundElementProperty, ParsedEvent, ParsedEventType} from '../expression_parser/ast';
 import {ParseSourceSpan} from '../parse_util';
 
 export interface Node {
@@ -29,14 +29,13 @@ export class TextAttribute implements Node {
   constructor(
       public name: string, public value: string, public sourceSpan: ParseSourceSpan,
       public valueSpan?: ParseSourceSpan) {}
-  visit<Result>(visitor: Visitor<Result>): Result { return visitor.visitAttribute(this); }
+  visit<Result>(visitor: Visitor<Result>): Result { return visitor.visitTextAttribute(this); }
 }
 
 export class BoundAttribute implements Node {
   constructor(
-      public name: string, public type: BoundElementBindingType,
-      public securityContext: SecurityContext, public value: AST, public unit: string|null,
-      public sourceSpan: ParseSourceSpan) {}
+      public name: string, public type: BindingType, public securityContext: SecurityContext,
+      public value: AST, public unit: string|null, public sourceSpan: ParseSourceSpan) {}
 
   static fromBoundElementProperty(prop: BoundElementProperty) {
     return new BoundAttribute(
@@ -106,7 +105,7 @@ export interface Visitor<Result = any> {
   visitContent(content: Content): Result;
   visitVariable(variable: Variable): Result;
   visitReference(reference: Reference): Result;
-  visitAttribute(attribute: TextAttribute): Result;
+  visitTextAttribute(attribute: TextAttribute): Result;
   visitBoundAttribute(attribute: BoundAttribute): Result;
   visitBoundEvent(attribute: BoundEvent): Result;
   visitText(text: Text): Result;
@@ -119,7 +118,7 @@ export class NullVisitor implements Visitor<void> {
   visitContent(content: Content): void {}
   visitVariable(variable: Variable): void {}
   visitReference(reference: Reference): void {}
-  visitAttribute(attribute: TextAttribute): void {}
+  visitTextAttribute(attribute: TextAttribute): void {}
   visitBoundAttribute(attribute: BoundAttribute): void {}
   visitBoundEvent(attribute: BoundEvent): void {}
   visitText(text: Text): void {}
@@ -141,7 +140,7 @@ export class RecursiveVisitor implements Visitor<void> {
   visitContent(content: Content): void {}
   visitVariable(variable: Variable): void {}
   visitReference(reference: Reference): void {}
-  visitAttribute(attribute: TextAttribute): void {}
+  visitTextAttribute(attribute: TextAttribute): void {}
   visitBoundAttribute(attribute: BoundAttribute): void {}
   visitBoundEvent(attribute: BoundEvent): void {}
   visitText(text: Text): void {}
@@ -185,7 +184,7 @@ export class TransformVisitor implements Visitor<Node> {
 
   visitVariable(variable: Variable): Node { return variable; }
   visitReference(reference: Reference): Node { return reference; }
-  visitAttribute(attribute: TextAttribute): Node { return attribute; }
+  visitTextAttribute(attribute: TextAttribute): Node { return attribute; }
   visitBoundAttribute(attribute: BoundAttribute): Node { return attribute; }
   visitBoundEvent(attribute: BoundEvent): Node { return attribute; }
   visitText(text: Text): Node { return text; }
diff --git a/packages/compiler/src/render3/r3_template_transform.ts b/packages/compiler/src/render3/r3_template_transform.ts
index b5679db9d0..44a4b92e8b 100644
--- a/packages/compiler/src/render3/r3_template_transform.ts
+++ b/packages/compiler/src/render3/r3_template_transform.ts
@@ -111,9 +111,12 @@ export class HtmlToTemplateTransform implements html.Visitor {
 
         inlineTemplateSourceSpan = attribute.valueSpan || attribute.sourceSpan;
 
+        const parsedVariables: ParsedVariable[] = [];
         this.bindingParser.parseInlineTemplateBinding(
             templateKey, templateValue, attribute.sourceSpan, templateMatchableAttributes,
-            templateParsedProperties, templateVariables);
+            templateParsedProperties, parsedVariables);
+        templateVariables.push(
+            ...parsedVariables.map(v => new t.Variable(v.name, v.value, v.sourceSpan)));
       } else {
         // Check for variables, events, property bindings, interpolation
         hasBinding = this.parseAttribute(
@@ -272,7 +275,6 @@ export class HtmlToTemplateTransform implements html.Visitor {
     return hasBinding;
   }
 
-
   private parseVariable(
       identifier: string, value: string, sourceSpan: ParseSourceSpan, variables: t.Variable[]) {
     if (identifier.indexOf('-') > -1) {
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index a27851d86b..9563936249 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -11,7 +11,7 @@ import {CompileReflector} from '../../compile_reflector';
 import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, convertPropertyBinding} from '../../compiler_util/expression_converter';
 import {ConstantPool} from '../../constant_pool';
 import * as core from '../../core';
-import {AST, AstMemoryEfficientTransformer, BindingPipe, BoundElementBindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
+import {AST, AstMemoryEfficientTransformer, BindingPipe, BindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
 import * as o from '../../output/output_ast';
 import {ParseSourceSpan} from '../../parse_util';
 import {CssSelector, SelectorMatcher} from '../../selector';
@@ -23,10 +23,10 @@ import {R3QueryMetadata} from './api';
 import {CONTEXT_NAME, I18N_ATTR, I18N_ATTR_PREFIX, ID_SEPARATOR, IMPLICIT_REFERENCE, MEANING_SEPARATOR, REFERENCE_PREFIX, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, getQueryPredicate, invalid, mapToExpression, noop, temporaryAllocator, trimTrailingNulls, unsupported} from './util';
 
 const BINDING_INSTRUCTION_MAP: {[type: number]: o.ExternalReference} = {
-  [BoundElementBindingType.Property]: R3.elementProperty,
-  [BoundElementBindingType.Attribute]: R3.elementAttribute,
-  [BoundElementBindingType.Class]: R3.elementClassNamed,
-  [BoundElementBindingType.Style]: R3.elementStyleNamed,
+  [BindingType.Property]: R3.elementProperty,
+  [BindingType.Attribute]: R3.elementAttribute,
+  [BindingType.Class]: R3.elementClassNamed,
+  [BindingType.Style]: R3.elementStyleNamed,
 };
 
 export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
@@ -331,7 +331,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     // Generate element input bindings
     element.inputs.forEach((input: t.BoundAttribute) => {
-      if (input.type === BoundElementBindingType.Animation) {
+      if (input.type === BindingType.Animation) {
         this._unsupported('animations');
       }
       const convertedBinding = this.convertPropertyBinding(implicit, input.value);
@@ -431,7 +431,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   // These should be handled in the template or element directly.
   readonly visitReference = invalid;
   readonly visitVariable = invalid;
-  readonly visitAttribute = invalid;
+  readonly visitTextAttribute = invalid;
   readonly visitBoundAttribute = invalid;
   readonly visitBoundEvent = invalid;
 
diff --git a/packages/compiler/src/render3/view/util.ts b/packages/compiler/src/render3/view/util.ts
index e96e4ed2cd..20e548515a 100644
--- a/packages/compiler/src/render3/view/util.ts
+++ b/packages/compiler/src/render3/view/util.ts
@@ -12,12 +12,9 @@ import * as t from '../r3_ast';
 
 import {R3QueryMetadata} from './api';
 
-
 /** Name of the temporary to use during data binding */
 export const TEMPORARY_NAME = '_t';
 
-
-
 /** Name of the context parameter passed into a template function */
 export const CONTEXT_NAME = 'ctx';
 
diff --git a/packages/compiler/src/template_parser/binding_parser.ts b/packages/compiler/src/template_parser/binding_parser.ts
index bd798b81f2..90b71d08eb 100644
--- a/packages/compiler/src/template_parser/binding_parser.ts
+++ b/packages/compiler/src/template_parser/binding_parser.ts
@@ -8,7 +8,7 @@
 
 import {CompileDirectiveSummary, CompilePipeSummary} from '../compile_metadata';
 import {SecurityContext} from '../core';
-import {ASTWithSource, BindingPipe, BoundElementBindingType, BoundElementProperty, EmptyExpr, ParsedEvent, ParsedEventType, ParsedProperty, ParsedPropertyType, ParsedVariable, ParserError, RecursiveAstVisitor, TemplateBinding} from '../expression_parser/ast';
+import {ASTWithSource, BindingPipe, BindingType, BoundElementProperty, EmptyExpr, ParsedEvent, ParsedEventType, ParsedProperty, ParsedPropertyType, ParsedVariable, ParserError, RecursiveAstVisitor, TemplateBinding} from '../expression_parser/ast';
 import {Parser} from '../expression_parser/parser';
 import {InterpolationConfig} from '../ml_parser/interpolation_config';
 import {mergeNsAndName} from '../ml_parser/tags';
@@ -239,12 +239,12 @@ export class BindingParser {
       BoundElementProperty {
     if (boundProp.isAnimation) {
       return new BoundElementProperty(
-          boundProp.name, BoundElementBindingType.Animation, SecurityContext.NONE,
-          boundProp.expression, null, boundProp.sourceSpan);
+          boundProp.name, BindingType.Animation, SecurityContext.NONE, boundProp.expression, null,
+          boundProp.sourceSpan);
     }
 
     let unit: string|null = null;
-    let bindingType: BoundElementBindingType = undefined !;
+    let bindingType: BindingType = undefined !;
     let boundPropertyName: string|null = null;
     const parts = boundProp.name.split(PROPERTY_PARTS_SEPARATOR);
     let securityContexts: SecurityContext[] = undefined !;
@@ -264,15 +264,15 @@ export class BindingParser {
           boundPropertyName = mergeNsAndName(ns, name);
         }
 
-        bindingType = BoundElementBindingType.Attribute;
+        bindingType = BindingType.Attribute;
       } else if (parts[0] == CLASS_PREFIX) {
         boundPropertyName = parts[1];
-        bindingType = BoundElementBindingType.Class;
+        bindingType = BindingType.Class;
         securityContexts = [SecurityContext.NONE];
       } else if (parts[0] == STYLE_PREFIX) {
         unit = parts.length > 2 ? parts[2] : null;
         boundPropertyName = parts[1];
-        bindingType = BoundElementBindingType.Style;
+        bindingType = BindingType.Style;
         securityContexts = [SecurityContext.STYLE];
       }
     }
@@ -282,7 +282,7 @@ export class BindingParser {
       boundPropertyName = this._schemaRegistry.getMappedPropName(boundProp.name);
       securityContexts = calcPossibleSecurityContexts(
           this._schemaRegistry, elementSelector, boundPropertyName, false);
-      bindingType = BoundElementBindingType.Property;
+      bindingType = BindingType.Property;
       this._validatePropertyOrAttributeName(boundPropertyName, boundProp.sourceSpan, false);
     }
 
diff --git a/packages/compiler/src/template_parser/template_ast.ts b/packages/compiler/src/template_parser/template_ast.ts
index 438a8b491a..4f69a54608 100644
--- a/packages/compiler/src/template_parser/template_ast.ts
+++ b/packages/compiler/src/template_parser/template_ast.ts
@@ -9,7 +9,7 @@
 import {AstPath} from '../ast_path';
 import {CompileDirectiveSummary, CompileProviderMetadata, CompileTokenMetadata} from '../compile_metadata';
 import {SecurityContext} from '../core';
-import {AST, BoundElementBindingType, BoundElementProperty, ParsedEvent, ParsedEventType, ParsedVariable} from '../expression_parser/ast';
+import {AST, BindingType, BoundElementProperty, ParsedEvent, ParsedEventType, ParsedVariable} from '../expression_parser/ast';
 import {LifecycleHooks} from '../lifecycle_reflector';
 import {ParseSourceSpan} from '../parse_util';
 
@@ -72,11 +72,11 @@ export enum PropertyBindingType {
 }
 
 const BoundPropertyMapping = {
-  [BoundElementBindingType.Animation]: PropertyBindingType.Animation,
-  [BoundElementBindingType.Attribute]: PropertyBindingType.Attribute,
-  [BoundElementBindingType.Class]: PropertyBindingType.Class,
-  [BoundElementBindingType.Property]: PropertyBindingType.Property,
-  [BoundElementBindingType.Style]: PropertyBindingType.Style,
+  [BindingType.Animation]: PropertyBindingType.Animation,
+  [BindingType.Attribute]: PropertyBindingType.Attribute,
+  [BindingType.Class]: PropertyBindingType.Class,
+  [BindingType.Property]: PropertyBindingType.Property,
+  [BindingType.Style]: PropertyBindingType.Style,
 };
 
 /**
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index b944d7dcc2..e7aaa323cf 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -5,7 +5,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 NODE_ONLY = [
     "**/*_node_only_spec.ts",
     "aot/**/*.ts",
-    "render3/**/*.ts",
 ]
 
 UTILS = [
@@ -37,6 +36,7 @@ ts_library(
         "//packages:types",
         "//packages/common",
         "//packages/compiler",
+        "//packages/compiler/test/expression_parser/utils",
         "//packages/compiler/testing",
         "//packages/core",
         "//packages/core/testing",
@@ -58,6 +58,7 @@ ts_library(
         ":test_utils",
         "//packages/compiler",
         "//packages/compiler-cli",
+        "//packages/compiler/test/expression_parser/utils",
         "//packages/compiler/testing",
         "//packages/core",
     ],
diff --git a/packages/compiler/test/expression_parser/parser_spec.ts b/packages/compiler/test/expression_parser/parser_spec.ts
index 6090e8a73f..e028ea9c3e 100644
--- a/packages/compiler/test/expression_parser/parser_spec.ts
+++ b/packages/compiler/test/expression_parser/parser_spec.ts
@@ -12,8 +12,8 @@ import {Parser, SplitInterpolation, TemplateBindingParseResult} from '@angular/c
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 
-import {unparse} from './unparser';
-import {validate} from './validator';
+import {unparse} from './utils/unparser';
+import {validate} from './utils/validator';
 
 describe('parser', () => {
   describe('parseAction', () => {
diff --git a/packages/compiler/test/expression_parser/utils/BUILD.bazel b/packages/compiler/test/expression_parser/utils/BUILD.bazel
new file mode 100644
index 0000000000..3030462016
--- /dev/null
+++ b/packages/compiler/test/expression_parser/utils/BUILD.bazel
@@ -0,0 +1,15 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "utils",
+    testonly = 1,
+    srcs = glob(
+        ["*.ts"],
+    ),
+    visibility = [
+        "//packages/compiler/test:__subpackages__",
+    ],
+    deps = [
+        "//packages/compiler",
+    ],
+)
diff --git a/packages/compiler/test/expression_parser/unparser.ts b/packages/compiler/test/expression_parser/utils/unparser.ts
similarity index 97%
rename from packages/compiler/test/expression_parser/unparser.ts
rename to packages/compiler/test/expression_parser/utils/unparser.ts
index 4f9aa33e4e..da27bfcbfb 100644
--- a/packages/compiler/test/expression_parser/unparser.ts
+++ b/packages/compiler/test/expression_parser/utils/unparser.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, AstVisitor, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast';
-import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/ml_parser/interpolation_config';
+import {AST, AstVisitor, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '../../../src/expression_parser/ast';
+import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../../src/ml_parser/interpolation_config';
 
 class Unparser implements AstVisitor {
   private static _quoteRegExp = /"/g;
diff --git a/packages/compiler/test/expression_parser/validator.ts b/packages/compiler/test/expression_parser/utils/validator.ts
similarity index 98%
rename from packages/compiler/test/expression_parser/validator.ts
rename to packages/compiler/test/expression_parser/utils/validator.ts
index c4fd221712..cfdc851da5 100644
--- a/packages/compiler/test/expression_parser/validator.ts
+++ b/packages/compiler/test/expression_parser/utils/validator.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast';
+import {AST, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead} from '../../../src/expression_parser/ast';
 
 import {unparse} from './unparser';
 
diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel
index 5f2f64d936..82c60a34e3 100644
--- a/packages/compiler/test/render3/BUILD.bazel
+++ b/packages/compiler/test/render3/BUILD.bazel
@@ -11,6 +11,8 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler/test:test_utils",
+        "//packages/compiler/test/expression_parser/utils",
+        "//packages/compiler/testing",
         "//packages/core",
     ],
 )
diff --git a/packages/compiler/test/render3/r3_template_transform_spec.ts b/packages/compiler/test/render3/r3_template_transform_spec.ts
new file mode 100644
index 0000000000..8880d5b584
--- /dev/null
+++ b/packages/compiler/test/render3/r3_template_transform_spec.ts
@@ -0,0 +1,486 @@
+/**
+ * @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 {BindingType} from '../../src/expression_parser/ast';
+import {Lexer} from '../../src/expression_parser/lexer';
+import {Parser} from '../../src/expression_parser/parser';
+import {visitAll} from '../../src/ml_parser/ast';
+import {HtmlParser} from '../../src/ml_parser/html_parser';
+import {DEFAULT_INTERPOLATION_CONFIG} from '../../src/ml_parser/interpolation_config';
+import {ParseError} from '../../src/parse_util';
+import * as t from '../../src/render3/r3_ast';
+import {HtmlToTemplateTransform} from '../../src/render3/r3_template_transform';
+import {BindingParser} from '../../src/template_parser/binding_parser';
+import {MockSchemaRegistry} from '../../testing';
+import {unparse} from '../expression_parser/utils/unparser';
+
+// Parse an html string to IVY specific info
+function parse(html: string) {
+  const htmlParser = new HtmlParser();
+
+  const parseResult = htmlParser.parse(html, 'path:://to/template', true);
+
+  if (parseResult.errors.length > 0) {
+    const msg = parseResult.errors.map(e => e.toString()).join('\n');
+    throw new Error(msg);
+  }
+
+  const htmlNodes = parseResult.rootNodes;
+  const expressionErrors: ParseError[] = [];
+  const expressionParser = new Parser(new Lexer());
+  const schemaRegistry = new MockSchemaRegistry(
+      {'invalidProp': false}, {'mappedAttr': 'mappedProp'}, {'unknown': false, 'un-known': false},
+      ['onEvent'], ['onEvent']);
+  const bindingParser = new BindingParser(
+      expressionParser, DEFAULT_INTERPOLATION_CONFIG, schemaRegistry, null, expressionErrors);
+  const r3Transform = new HtmlToTemplateTransform(bindingParser);
+
+  const r3Nodes = visitAll(r3Transform, htmlNodes);
+
+  if (r3Transform.errors) {
+    const msg = r3Transform.errors.map(e => e.toString()).join('\n');
+    throw new Error(msg);
+  }
+
+  return {
+    nodes: r3Nodes,
+    hasNgContent: r3Transform.hasNgContent,
+    ngContentSelectors: r3Transform.ngContentSelectors,
+  };
+}
+
+// Transform an IVY AST to a flat list of nodes to ease testing
+class R3AstHumanizer implements t.Visitor<void> {
+  result: any[] = [];
+
+  visitElement(element: t.Element) {
+    this.result.push(['Element', element.name]);
+    this.visitAll([
+      element.attributes,
+      element.inputs,
+      element.outputs,
+      element.references,
+      element.children,
+    ]);
+  }
+
+  visitTemplate(template: t.Template) {
+    this.result.push(['Template']);
+    this.visitAll([
+      template.attributes,
+      template.inputs,
+      template.references,
+      template.variables,
+      template.children,
+    ]);
+  }
+
+  visitContent(content: t.Content) {
+    this.result.push(['Content', content.selectorIndex]);
+    t.visitAll(this, content.attributes);
+  }
+
+  visitVariable(variable: t.Variable) {
+    this.result.push(['Variable', variable.name, variable.value]);
+  }
+
+  visitReference(reference: t.Reference) {
+    this.result.push(['Reference', reference.name, reference.value]);
+  }
+
+  visitTextAttribute(attribute: t.TextAttribute) {
+    this.result.push(['TextAttribute', attribute.name, attribute.value]);
+  }
+
+  visitBoundAttribute(attribute: t.BoundAttribute) {
+    this.result.push([
+      'BoundAttribute',
+      attribute.type,
+      attribute.name,
+      unparse(attribute.value),
+    ]);
+  }
+
+  visitBoundEvent(event: t.BoundEvent) {
+    this.result.push([
+      'BoundEvent',
+      event.name,
+      event.target,
+      unparse(event.handler),
+    ]);
+  }
+
+  visitText(text: t.Text) { this.result.push(['Text', text.value]); }
+
+  visitBoundText(text: t.BoundText) { this.result.push(['BoundText', unparse(text.value)]); }
+
+  private visitAll(nodes: t.Node[][]) { nodes.forEach(node => t.visitAll(this, node)); }
+}
+
+function expectFromHtml(html: string) {
+  const res = parse(html);
+  return expectFromR3Nodes(res.nodes);
+}
+
+function expectFromR3Nodes(nodes: t.Node[]) {
+  const humanizer = new R3AstHumanizer();
+  t.visitAll(humanizer, nodes);
+  return expect(humanizer.result);
+}
+
+describe('R3 template transform', () => {
+  describe('Nodes without binding', () => {
+    it('should parse text nodes', () => {
+      expectFromHtml('a').toEqual([
+        ['Text', 'a'],
+      ]);
+    });
+
+    it('should parse elements with attributes', () => {
+      expectFromHtml('<div a=b></div>').toEqual([
+        ['Element', 'div'],
+        ['TextAttribute', 'a', 'b'],
+      ]);
+    });
+
+    it('should parse ngContent', () => {
+      const res = parse('<ng-content select="a"></ng-content>');
+      expect(res.hasNgContent).toEqual(true);
+      expect(res.ngContentSelectors).toEqual(['a']);
+      expectFromR3Nodes(res.nodes).toEqual([
+        ['Content', 1],
+        ['TextAttribute', 'select', 'a'],
+      ]);
+    });
+
+    it('should parse ngContent when it contains WS only', () => {
+      expectFromHtml('<ng-content select="a">    \n   </ng-content>').toEqual([
+        ['Content', 1],
+        ['TextAttribute', 'select', 'a'],
+      ]);
+    });
+
+    it('should parse ngContent regardless the namespace', () => {
+      expectFromHtml('<svg><ng-content select="a"></ng-content></svg>').toEqual([
+        ['Element', ':svg:svg'],
+        ['Content', 1],
+        ['TextAttribute', 'select', 'a'],
+      ]);
+    });
+  });
+
+  describe('Bound text nodes', () => {
+    it('should parse bound text nodes', () => {
+      expectFromHtml('{{a}}').toEqual([
+        ['BoundText', '{{ a }}'],
+      ]);
+    });
+  });
+
+  describe('Bound attributes', () => {
+    it('should parse mixed case bound properties', () => {
+      expectFromHtml('<div [someProp]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'someProp', 'v'],
+      ]);
+    });
+
+    it('should parse bound properties via bind- ', () => {
+      expectFromHtml('<div bind-prop="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'prop', 'v'],
+      ]);
+    });
+
+    it('should parse bound properties via {{...}}', () => {
+      expectFromHtml('<div prop="{{v}}"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'prop', '{{ v }}'],
+      ]);
+    });
+
+    it('should parse dash case bound properties', () => {
+      expectFromHtml('<div [some-prop]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'some-prop', 'v'],
+      ]);
+    });
+
+    it('should parse dotted name bound properties', () => {
+      expectFromHtml('<div [d.ot]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'd.ot', 'v'],
+      ]);
+    });
+
+    it('should normalize property names via the element schema', () => {
+      expectFromHtml('<div [mappedAttr]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'mappedProp', 'v'],
+      ]);
+    });
+
+    it('should parse mixed case bound attributes', () => {
+      expectFromHtml('<div [attr.someAttr]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Attribute, 'someAttr', 'v'],
+      ]);
+    });
+
+    it('should parse and dash case bound classes', () => {
+      expectFromHtml('<div [class.some-class]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Class, 'some-class', 'v'],
+      ]);
+    });
+
+    it('should parse mixed case bound classes', () => {
+      expectFromHtml('<div [class.someClass]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Class, 'someClass', 'v'],
+      ]);
+    });
+
+    it('should parse mixed case bound styles', () => {
+      expectFromHtml('<div [style.someStyle]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Style, 'someStyle', 'v'],
+      ]);
+    });
+  });
+
+  describe('templates', () => {
+    it('should support * directives', () => {
+      expectFromHtml('<div *ngIf></div>').toEqual([
+        ['Template'],
+        ['TextAttribute', 'ngIf', ''],
+        ['Element', 'div'],
+      ]);
+    });
+
+    it('should support <ng-template>', () => {
+      expectFromHtml('<ng-template></ng-template>').toEqual([
+        ['Template'],
+      ]);
+    });
+
+    it('should support <ng-template> regardless the namespace', () => {
+      expectFromHtml('<svg><ng-template></ng-template></svg>').toEqual([
+        ['Element', ':svg:svg'],
+        ['Template'],
+      ]);
+    });
+
+    it('should support reference via #...', () => {
+      expectFromHtml('<ng-template #a></ng-template>').toEqual([
+        ['Template'],
+        ['Reference', 'a', ''],
+      ]);
+    });
+
+    it('should support reference via ref-...', () => {
+      expectFromHtml('<ng-template ref-a></ng-template>').toEqual([
+        ['Template'],
+        ['Reference', 'a', ''],
+      ]);
+    });
+
+    it('should parse variables via let-...', () => {
+      expectFromHtml('<ng-template let-a="b"></ng-template>').toEqual([
+        ['Template'],
+        ['Variable', 'a', 'b'],
+      ]);
+    });
+  });
+
+  describe('inline templates', () => {
+    it('should parse variables via let ...', () => {
+      expectFromHtml('<div *ngIf="let a=b"></div>').toEqual([
+        ['Template'],
+        ['TextAttribute', 'ngIf', ''],
+        ['Variable', 'a', 'b'],
+        ['Element', 'div'],
+      ]);
+    });
+
+    it('should parse variables via as ...', () => {
+      expectFromHtml('<div *ngIf="expr as local"></div>').toEqual([
+        ['Template'],
+        ['TextAttribute', 'ngIf', 'expr '],
+        ['BoundAttribute', BindingType.Property, 'ngIf', 'expr'],
+        ['Variable', 'local', 'ngIf'],
+        ['Element', 'div'],
+      ]);
+    });
+  });
+
+  describe('events', () => {
+    it('should parse bound events with a target', () => {
+      expectFromHtml('<div (window:event)="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundEvent', 'event', 'window', 'v'],
+      ]);
+    });
+
+    it('should parse event names case sensitive', () => {
+      expectFromHtml('<div (some-event)="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundEvent', 'some-event', null, 'v'],
+      ]);
+      expectFromHtml('<div (someEvent)="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundEvent', 'someEvent', null, 'v'],
+      ]);
+    });
+
+    it('should parse bound events via on-', () => {
+      expectFromHtml('<div on-event="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundEvent', 'event', null, 'v'],
+      ]);
+    });
+
+    it('should parse bound events and properties via [(...)]', () => {
+      expectFromHtml('<div [(prop)]="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'prop', 'v'],
+        ['BoundEvent', 'propChange', null, 'v = $event'],
+      ]);
+    });
+
+    it('should parse bound events and properties via bindon-', () => {
+      expectFromHtml('<div bindon-prop="v"></div>').toEqual([
+        ['Element', 'div'],
+        ['BoundAttribute', BindingType.Property, 'prop', 'v'],
+        ['BoundEvent', 'propChange', null, 'v = $event'],
+      ]);
+    });
+
+    // TODO(vicb): Should Error
+    xit('should report an error on empty expression', () => {
+      expect(() => parse('<div (event)="">')).toThrowError(/Empty expressions are not allowed/);
+
+      expect(() => parse('<div (event)="   ">')).toThrowError(/Empty expressions are not allowed/);
+    });
+  });
+
+  describe('references', () => {
+    it('should parse references via #...', () => {
+      expectFromHtml('<div #a></div>').toEqual([
+        ['Element', 'div'],
+        ['Reference', 'a', ''],
+      ]);
+    });
+
+    it('should parse references via ref-', () => {
+      expectFromHtml('<div ref-a></div>').toEqual([
+        ['Element', 'div'],
+        ['Reference', 'a', ''],
+      ]);
+    });
+
+    it('should parse camel case references', () => {
+      expectFromHtml('<div #someA></div>').toEqual([
+        ['Element', 'div'],
+        ['Reference', 'someA', ''],
+      ]);
+    });
+  });
+
+  // TODO(vicb): Add ng-content test
+  describe('ng-content', () => {});
+
+  describe('Ignored elements', () => {
+    it('should ignore <script> elements', () => {
+      expectFromHtml('<script></script>a').toEqual([
+        ['Text', 'a'],
+      ]);
+    });
+
+    it('should ignore <style> elements', () => {
+      expectFromHtml('<style></style>a').toEqual([
+        ['Text', 'a'],
+      ]);
+    });
+  });
+
+  describe('<link rel="stylesheet">', () => {
+    it('should keep <link rel="stylesheet"> elements if they have an absolute url', () => {
+      expectFromHtml('<link rel="stylesheet" href="http://someurl">').toEqual([
+        ['Element', 'link'],
+        ['TextAttribute', 'rel', 'stylesheet'],
+        ['TextAttribute', 'href', 'http://someurl'],
+      ]);
+      expectFromHtml('<link REL="stylesheet" href="http://someurl">').toEqual([
+        ['Element', 'link'],
+        ['TextAttribute', 'REL', 'stylesheet'],
+        ['TextAttribute', 'href', 'http://someurl'],
+      ]);
+    });
+
+    it('should keep <link rel="stylesheet"> elements if they have no uri', () => {
+      expectFromHtml('<link rel="stylesheet">').toEqual([
+        ['Element', 'link'],
+        ['TextAttribute', 'rel', 'stylesheet'],
+      ]);
+      expectFromHtml('<link REL="stylesheet">').toEqual([
+        ['Element', 'link'],
+        ['TextAttribute', 'REL', 'stylesheet'],
+      ]);
+    });
+
+    it('should ignore <link rel="stylesheet"> elements if they have a relative uri', () => {
+      expectFromHtml('<link rel="stylesheet" href="./other.css">').toEqual([]);
+      expectFromHtml('<link REL="stylesheet" HREF="./other.css">').toEqual([]);
+    });
+  });
+
+  describe('ngNonBindable', () => {
+    it('should ignore bindings on children of elements with ngNonBindable', () => {
+      expectFromHtml('<div ngNonBindable>{{b}}</div>').toEqual([
+        ['Element', 'div'],
+        ['TextAttribute', 'ngNonBindable', ''],
+        ['Text', '{{b}}'],
+      ]);
+    });
+
+    it('should keep nested children of elements with ngNonBindable', () => {
+      expectFromHtml('<div ngNonBindable><span>{{b}}</span></div>').toEqual([
+        ['Element', 'div'],
+        ['TextAttribute', 'ngNonBindable', ''],
+        ['Element', 'span'],
+        ['Text', '{{b}}'],
+      ]);
+    });
+
+    it('should ignore <script> elements inside of elements with ngNonBindable', () => {
+      expectFromHtml('<div ngNonBindable><script></script>a</div>').toEqual([
+        ['Element', 'div'],
+        ['TextAttribute', 'ngNonBindable', ''],
+        ['Text', 'a'],
+      ]);
+    });
+
+    it('should ignore <style> elements inside of elements with ngNonBindable', () => {
+      expectFromHtml('<div ngNonBindable><style></style>a</div>').toEqual([
+        ['Element', 'div'],
+        ['TextAttribute', 'ngNonBindable', ''],
+        ['Text', 'a'],
+      ]);
+    });
+
+    it('should ignore <link rel="stylesheet"> elements inside of elements with ngNonBindable',
+       () => {
+         expectFromHtml('<div ngNonBindable><link rel="stylesheet">a</div>').toEqual([
+           ['Element', 'div'],
+           ['TextAttribute', 'ngNonBindable', ''],
+           ['Text', 'a'],
+         ]);
+       });
+  });
+});
\ No newline at end of file
diff --git a/packages/compiler/test/template_parser/template_parser_spec.ts b/packages/compiler/test/template_parser/template_parser_spec.ts
index 527db692ef..fc0834d9d9 100644
--- a/packages/compiler/test/template_parser/template_parser_spec.ts
+++ b/packages/compiler/test/template_parser/template_parser_spec.ts
@@ -21,7 +21,7 @@ import {Identifiers, createTokenForExternalReference, createTokenForReference} f
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/ml_parser/interpolation_config';
 import {noUndefined} from '../../src/util';
 import {MockSchemaRegistry} from '../../testing';
-import {unparse} from '../expression_parser/unparser';
+import {unparse} from '../expression_parser/utils/unparser';
 import {TEST_COMPILER_PROVIDERS} from '../test_bindings';
 
 const someModuleUrl = 'package:someModule';
@@ -139,12 +139,12 @@ class TemplateHumanizer implements TemplateAstVisitor {
 
   visitNgContent(ast: NgContentAst, context: any): any {
     const res = [NgContentAst];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitEmbeddedTemplate(ast: EmbeddedTemplateAst, context: any): any {
     const res = [EmbeddedTemplateAst];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     templateVisitAll(this, ast.attrs);
     templateVisitAll(this, ast.outputs);
     templateVisitAll(this, ast.references);
@@ -155,7 +155,7 @@ class TemplateHumanizer implements TemplateAstVisitor {
   }
   visitElement(ast: ElementAst, context: any): any {
     const res = [ElementAst, ast.name];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     templateVisitAll(this, ast.attrs);
     templateVisitAll(this, ast.inputs);
     templateVisitAll(this, ast.outputs);
@@ -166,18 +166,18 @@ class TemplateHumanizer implements TemplateAstVisitor {
   }
   visitReference(ast: ReferenceAst, context: any): any {
     const res = [ReferenceAst, ast.name, ast.value];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitVariable(ast: VariableAst, context: any): any {
     const res = [VariableAst, ast.name, ast.value];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitEvent(ast: BoundEventAst, context: any): any {
     const res =
         [BoundEventAst, ast.name, ast.target, unparse(ast.handler, this.interpolationConfig)];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitElementProperty(ast: BoundElementPropertyAst, context: any): any {
@@ -185,27 +185,27 @@ class TemplateHumanizer implements TemplateAstVisitor {
       BoundElementPropertyAst, ast.type, ast.name, unparse(ast.value, this.interpolationConfig),
       ast.unit
     ];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitAttr(ast: AttrAst, context: any): any {
     const res = [AttrAst, ast.name, ast.value];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitBoundText(ast: BoundTextAst, context: any): any {
     const res = [BoundTextAst, unparse(ast.value, this.interpolationConfig)];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitText(ast: TextAst, context: any): any {
     const res = [TextAst, ast.value];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
   visitDirective(ast: DirectiveAst, context: any): any {
     const res = [DirectiveAst, ast.directive];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     templateVisitAll(this, ast.inputs);
     templateVisitAll(this, ast.hostProperties);
     templateVisitAll(this, ast.hostEvents);
@@ -215,11 +215,11 @@ class TemplateHumanizer implements TemplateAstVisitor {
     const res = [
       BoundDirectivePropertyAst, ast.directiveName, unparse(ast.value, this.interpolationConfig)
     ];
-    this.result.push(this._appendContext(ast, res));
+    this.result.push(this._appendSourceSpan(ast, res));
     return null;
   }
 
-  private _appendContext(ast: TemplateAst, input: any[]): any[] {
+  private _appendSourceSpan(ast: TemplateAst, input: any[]): any[] {
     if (!this.includeSourceSpan) return input;
     input.push(ast.sourceSpan !.toString());
     return input;
@@ -1965,14 +1965,13 @@ Property binding a not used by any directive on an embedded template. Make sure
 
       describe('<link rel="stylesheet">', () => {
 
-        it('should keep <link rel="stylesheet"> elements if they have an absolute non package: url',
-           () => {
-             expect(humanizeTplAst(parse('<link rel="stylesheet" href="http://someurl">a', [])))
-                 .toEqual([
-                   [ElementAst, 'link'], [AttrAst, 'rel', 'stylesheet'],
-                   [AttrAst, 'href', 'http://someurl'], [TextAst, 'a']
-                 ]);
-           });
+        it('should keep <link rel="stylesheet"> elements if they have an absolute url', () => {
+          expect(humanizeTplAst(parse('<link rel="stylesheet" href="http://someurl">a', [])))
+              .toEqual([
+                [ElementAst, 'link'], [AttrAst, 'rel', 'stylesheet'],
+                [AttrAst, 'href', 'http://someurl'], [TextAst, 'a']
+              ]);
+        });
 
         it('should keep <link rel="stylesheet"> elements if they have no uri', () => {
           expect(humanizeTplAst(parse('<link rel="stylesheet">a', [

From 08e7efc69e16ca76d9b15300e84ae7728eb6a6f1 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 27 Apr 2018 14:39:07 -0700
Subject: [PATCH 022/582] feat(ivy): add error reporting to the html to ivy
 transformer (#23546)

PR Close #23546
---
 packages/compiler/src/aot/compiler.ts         | 11 +--
 .../src/render3/r3_template_transform.ts      | 39 +++++++-
 .../compiler/src/render3/view/compiler.ts     | 18 ++--
 .../src/template_parser/binding_parser.ts     |  5 +-
 .../src/template_parser/template_parser.ts    | 12 ---
 .../compiler/test/render3/mock_compile.ts     | 12 ++-
 .../render3/r3_template_transform_spec.ts     | 88 ++++++++++++++-----
 7 files changed, 121 insertions(+), 64 deletions(-)

diff --git a/packages/compiler/src/aot/compiler.ts b/packages/compiler/src/aot/compiler.ts
index 829691e6e8..af87fc8db7 100644
--- a/packages/compiler/src/aot/compiler.ts
+++ b/packages/compiler/src/aot/compiler.ts
@@ -24,7 +24,7 @@ import * as o from '../output/output_ast';
 import {ParseError} from '../parse_util';
 import {compileNgModule as compileIvyModule} from '../render3/r3_module_compiler';
 import {compilePipe as compileIvyPipe} from '../render3/r3_pipe_compiler';
-import {HtmlToTemplateTransform} from '../render3/r3_template_transform';
+import {htmlAstToRender3Ast} from '../render3/r3_template_transform';
 import {compileComponentFromRender2 as compileIvyComponent, compileDirectiveFromRender2 as compileIvyDirective} from '../render3/view/compiler';
 import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
 import {CompiledStylesheet, StyleCompiler} from '../style_compiler';
@@ -391,10 +391,7 @@ export class AotCompiler {
         if (!preserveWhitespaces) {
           htmlAst = removeWhitespaces(htmlAst);
         }
-        const transform = new HtmlToTemplateTransform(hostBindingParser);
-        const nodes = html.visitAll(transform, htmlAst.rootNodes, null);
-        const hasNgContent = transform.hasNgContent;
-        const ngContentSelectors = transform.ngContentSelectors;
+        const render3Ast = htmlAstToRender3Ast(htmlAst.rootNodes, hostBindingParser);
 
         // Map of StaticType by directive selectors
         const directiveTypeBySel = new Map<string, any>();
@@ -417,8 +414,8 @@ export class AotCompiler {
         pipes.forEach(pipe => { pipeTypeByName.set(pipe.name, pipe.type.reference); });
 
         compileIvyComponent(
-            context, directiveMetadata, nodes, hasNgContent, ngContentSelectors, this.reflector,
-            hostBindingParser, directiveTypeBySel, pipeTypeByName);
+            context, directiveMetadata, render3Ast, this.reflector, hostBindingParser,
+            directiveTypeBySel, pipeTypeByName);
       } else {
         compileIvyDirective(context, directiveMetadata, this.reflector, hostBindingParser);
       }
diff --git a/packages/compiler/src/render3/r3_template_transform.ts b/packages/compiler/src/render3/r3_template_transform.ts
index 44a4b92e8b..6de81d5b5a 100644
--- a/packages/compiler/src/render3/r3_template_transform.ts
+++ b/packages/compiler/src/render3/r3_template_transform.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ParsedEvent, ParsedProperty, ParsedVariable} from '../expression_parser/ast';
+import {ParsedEvent, ParsedProperty, ParsedVariable, ParserError} from '../expression_parser/ast';
 import * as html from '../ml_parser/ast';
 import {replaceNgsp} from '../ml_parser/html_whitespaces';
 import {isNgTemplate} from '../ml_parser/tags';
@@ -14,9 +14,10 @@ import {ParseError, ParseErrorLevel, ParseSourceSpan} from '../parse_util';
 import {isStyleUrlResolvable} from '../style_url_resolver';
 import {BindingParser} from '../template_parser/binding_parser';
 import {PreparsedElementType, preparseElement} from '../template_parser/template_preparser';
-
+import {syntaxError} from '../util';
 import * as t from './r3_ast';
 
+
 const BIND_NAME_REGEXP =
     /^(?:(?:(?:(bind-)|(let-)|(ref-|#)|(on-)|(bindon-)|(@))(.+))|\[\(([^\)]+)\)\]|\[([^\]]+)\]|\(([^\)]+)\))$/;
 
@@ -46,9 +47,39 @@ const CLASS_ATTR = 'class';
 // Default selector used by `<ng-content>` if none specified
 const DEFAULT_CONTENT_SELECTOR = '*';
 
-export class HtmlToTemplateTransform implements html.Visitor {
-  errors: ParseError[];
+// Result of the html AST to Ivy AST transformation
+export type Render3ParseResult = {
+  nodes: t.Node[]; errors: ParseError[];
+  // Any non default (empty or '*') selector found in the template
+  ngContentSelectors: string[];
+  // Wether the template contains any `<ng-content>`
+  hasNgContent: boolean;
+};
 
+export function htmlAstToRender3Ast(
+    htmlNodes: html.Node[], bindingParser: BindingParser): Render3ParseResult {
+  const transformer = new HtmlAstToIvyAst(bindingParser);
+  const ivyNodes = html.visitAll(transformer, htmlNodes);
+
+  // Errors might originate in either the binding parser or the html to ivy transformer
+  const allErrors = bindingParser.errors.concat(transformer.errors);
+  const errors: ParseError[] = allErrors.filter(e => e.level === ParseErrorLevel.ERROR);
+
+  if (errors.length > 0) {
+    const errorString = errors.join('\n');
+    throw syntaxError(`Template parse errors:\n${errorString}`, errors);
+  }
+
+  return {
+    nodes: ivyNodes,
+    errors: allErrors,
+    ngContentSelectors: transformer.ngContentSelectors,
+    hasNgContent: transformer.hasNgContent,
+  };
+}
+
+class HtmlAstToIvyAst implements html.Visitor {
+  errors: ParseError[] = [];
   // Selectors for the `ng-content` tags. Only non `*` selectors are recorded here
   ngContentSelectors: string[] = [];
   // Any `<ng-content>` in the template ?
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index cba9e7be1f..c43bbec1f2 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -12,7 +12,7 @@ import {CompileReflector} from '../../compile_reflector';
 import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, convertPropertyBinding} from '../../compiler_util/expression_converter';
 import {ConstantPool, DefinitionKind} from '../../constant_pool';
 import * as core from '../../core';
-import {AST, AstMemoryEfficientTransformer, BindingPipe, BoundElementBindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
+import {AST, AstMemoryEfficientTransformer, BindingPipe, BindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
 import {Identifiers} from '../../identifiers';
 import {LifecycleHooks} from '../../lifecycle_reflector';
 import * as o from '../../output/output_ast';
@@ -21,9 +21,10 @@ import {CssSelector, SelectorMatcher} from '../../selector';
 import {BindingParser} from '../../template_parser/binding_parser';
 import {OutputContext, error} from '../../util';
 
-import * as t from './../r3_ast';
-import {R3DependencyMetadata, R3ResolvedDependencyType, compileFactoryFunction, dependenciesFromGlobalMetadata} from './../r3_factory';
-import {Identifiers as R3} from './../r3_identifiers';
+import * as t from '../r3_ast';
+import {R3DependencyMetadata, R3ResolvedDependencyType, compileFactoryFunction, dependenciesFromGlobalMetadata} from '../r3_factory';
+import {Identifiers as R3} from '../r3_identifiers';
+import {Render3ParseResult} from '../r3_template_transform';
 import {R3ComponentDef, R3ComponentMetadata, R3DirectiveDef, R3DirectiveMetadata, R3QueryMetadata} from './api';
 import {BindingScope, TemplateDefinitionBuilder} from './template';
 import {CONTEXT_NAME, DefinitionMap, ID_SEPARATOR, MEANING_SEPARATOR, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, temporaryAllocator, unsupported} from './util';
@@ -191,9 +192,8 @@ export function compileDirectiveFromRender2(
  * information.
  */
 export function compileComponentFromRender2(
-    outputCtx: OutputContext, component: CompileDirectiveMetadata, nodes: t.Node[],
-    hasNgContent: boolean, ngContentSelectors: string[], reflector: CompileReflector,
-    bindingParser: BindingParser, directiveTypeBySel: Map<string, any>,
+    outputCtx: OutputContext, component: CompileDirectiveMetadata, render3Ast: Render3ParseResult,
+    reflector: CompileReflector, bindingParser: BindingParser, directiveTypeBySel: Map<string, any>,
     pipeTypeByName: Map<string, any>) {
   const name = identifierName(component.type) !;
   name || error(`Cannot resolver the name of ${component.type}`);
@@ -207,7 +207,9 @@ export function compileComponentFromRender2(
     ...directiveMetadataFromGlobalMetadata(component, outputCtx, reflector),
     selector: component.selector,
     template: {
-        nodes, hasNgContent, ngContentSelectors,
+      nodes: render3Ast.nodes,
+      hasNgContent: render3Ast.hasNgContent,
+      ngContentSelectors: render3Ast.ngContentSelectors,
     },
     lifecycle: {
       usesOnChanges:
diff --git a/packages/compiler/src/template_parser/binding_parser.ts b/packages/compiler/src/template_parser/binding_parser.ts
index 90b71d08eb..04aa7ba9f7 100644
--- a/packages/compiler/src/template_parser/binding_parser.ts
+++ b/packages/compiler/src/template_parser/binding_parser.ts
@@ -29,12 +29,13 @@ const ANIMATE_PROP_PREFIX = 'animate-';
  */
 export class BindingParser {
   pipesByName: Map<string, CompilePipeSummary>|null = null;
+
   private _usedPipes: Map<string, CompilePipeSummary> = new Map();
 
   constructor(
       private _exprParser: Parser, private _interpolationConfig: InterpolationConfig,
       private _schemaRegistry: ElementSchemaRegistry, pipes: CompilePipeSummary[]|null,
-      private _targetErrors: ParseError[]) {
+      public errors: ParseError[]) {
     // When the `pipes` parameter is `null`, do not check for used pipes
     // This is used in IVY when we might not know the available pipes at compile time
     if (pipes) {
@@ -364,7 +365,7 @@ export class BindingParser {
   private _reportError(
       message: string, sourceSpan: ParseSourceSpan,
       level: ParseErrorLevel = ParseErrorLevel.ERROR) {
-    this._targetErrors.push(new ParseError(sourceSpan, message, level));
+    this.errors.push(new ParseError(sourceSpan, message, level));
   }
 
   private _reportExpressionParserErrors(errors: ParserError[], sourceSpan: ParseSourceSpan) {
diff --git a/packages/compiler/src/template_parser/template_parser.ts b/packages/compiler/src/template_parser/template_parser.ts
index e3d18553ae..e7a26c865f 100644
--- a/packages/compiler/src/template_parser/template_parser.ts
+++ b/packages/compiler/src/template_parser/template_parser.ts
@@ -59,18 +59,6 @@ const CLASS_ATTR = 'class';
 
 const TEXT_CSS_SELECTOR = CssSelector.parse('*')[0];
 
-let warningCounts: {[warning: string]: number} = {};
-
-function warnOnlyOnce(warnings: string[]): (warning: ParseError) => boolean {
-  return (error: ParseError) => {
-    if (warnings.indexOf(error.msg) !== -1) {
-      warningCounts[error.msg] = (warningCounts[error.msg] || 0) + 1;
-      return warningCounts[error.msg] <= 1;
-    }
-    return true;
-  };
-}
-
 export class TemplateParseError extends ParseError {
   constructor(message: string, span: ParseSourceSpan, level: ParseErrorLevel) {
     super(span, message, level);
diff --git a/packages/compiler/test/render3/mock_compile.ts b/packages/compiler/test/render3/mock_compile.ts
index d74aa6d304..d7ec3bdad0 100644
--- a/packages/compiler/test/render3/mock_compile.ts
+++ b/packages/compiler/test/render3/mock_compile.ts
@@ -16,7 +16,7 @@ import * as html from '../../src/ml_parser/ast';
 import {removeWhitespaces} from '../../src/ml_parser/html_whitespaces';
 import * as o from '../../src/output/output_ast';
 import {compilePipe} from '../../src/render3/r3_pipe_compiler';
-import {HtmlToTemplateTransform} from '../../src/render3/r3_template_transform';
+import {htmlAstToRender3Ast} from '../../src/render3/r3_template_transform';
 import {compileComponentFromRender2, compileDirectiveFromRender2} from '../../src/render3/view/compiler';
 import {BindingParser} from '../../src/template_parser/binding_parser';
 import {OutputContext, escapeRegExp} from '../../src/util';
@@ -308,14 +308,12 @@ export function compile(
               if (!preserveWhitespaces) {
                 htmlAst = removeWhitespaces(htmlAst);
               }
-              const transform = new HtmlToTemplateTransform(hostBindingParser);
-              const nodes = html.visitAll(transform, htmlAst.rootNodes, null);
-              const hasNgContent = transform.hasNgContent;
-              const ngContentSelectors = transform.ngContentSelectors;
+
+              const render3Ast = htmlAstToRender3Ast(htmlAst.rootNodes, hostBindingParser);
 
               compileComponentFromRender2(
-                  outputCtx, directive, nodes, hasNgContent, ngContentSelectors, reflector,
-                  hostBindingParser, directiveTypeBySel, pipeTypeByName);
+                  outputCtx, directive, render3Ast, reflector, hostBindingParser,
+                  directiveTypeBySel, pipeTypeByName);
             } else {
               compileDirectiveFromRender2(outputCtx, directive, reflector, hostBindingParser);
             }
diff --git a/packages/compiler/test/render3/r3_template_transform_spec.ts b/packages/compiler/test/render3/r3_template_transform_spec.ts
index 8880d5b584..f172257929 100644
--- a/packages/compiler/test/render3/r3_template_transform_spec.ts
+++ b/packages/compiler/test/render3/r3_template_transform_spec.ts
@@ -14,13 +14,14 @@ import {HtmlParser} from '../../src/ml_parser/html_parser';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../src/ml_parser/interpolation_config';
 import {ParseError} from '../../src/parse_util';
 import * as t from '../../src/render3/r3_ast';
-import {HtmlToTemplateTransform} from '../../src/render3/r3_template_transform';
+import {Render3ParseResult, htmlAstToRender3Ast} from '../../src/render3/r3_template_transform';
 import {BindingParser} from '../../src/template_parser/binding_parser';
 import {MockSchemaRegistry} from '../../testing';
 import {unparse} from '../expression_parser/utils/unparser';
 
+
 // Parse an html string to IVY specific info
-function parse(html: string) {
+function parse(html: string): Render3ParseResult {
   const htmlParser = new HtmlParser();
 
   const parseResult = htmlParser.parse(html, 'path:://to/template', true);
@@ -31,27 +32,13 @@ function parse(html: string) {
   }
 
   const htmlNodes = parseResult.rootNodes;
-  const expressionErrors: ParseError[] = [];
   const expressionParser = new Parser(new Lexer());
   const schemaRegistry = new MockSchemaRegistry(
       {'invalidProp': false}, {'mappedAttr': 'mappedProp'}, {'unknown': false, 'un-known': false},
       ['onEvent'], ['onEvent']);
-  const bindingParser = new BindingParser(
-      expressionParser, DEFAULT_INTERPOLATION_CONFIG, schemaRegistry, null, expressionErrors);
-  const r3Transform = new HtmlToTemplateTransform(bindingParser);
-
-  const r3Nodes = visitAll(r3Transform, htmlNodes);
-
-  if (r3Transform.errors) {
-    const msg = r3Transform.errors.map(e => e.toString()).join('\n');
-    throw new Error(msg);
-  }
-
-  return {
-    nodes: r3Nodes,
-    hasNgContent: r3Transform.hasNgContent,
-    ngContentSelectors: r3Transform.ngContentSelectors,
-  };
+  const bindingParser =
+      new BindingParser(expressionParser, DEFAULT_INTERPOLATION_CONFIG, schemaRegistry, null, []);
+  return htmlAstToRender3Ast(htmlNodes, bindingParser);
 }
 
 // Transform an IVY AST to a flat list of nodes to ease testing
@@ -361,10 +348,8 @@ describe('R3 template transform', () => {
       ]);
     });
 
-    // TODO(vicb): Should Error
-    xit('should report an error on empty expression', () => {
+    it('should report an error on empty expression', () => {
       expect(() => parse('<div (event)="">')).toThrowError(/Empty expressions are not allowed/);
-
       expect(() => parse('<div (event)="   ">')).toThrowError(/Empty expressions are not allowed/);
     });
   });
@@ -392,8 +377,63 @@ describe('R3 template transform', () => {
     });
   });
 
-  // TODO(vicb): Add ng-content test
-  describe('ng-content', () => {});
+  describe('ng-content', () => {
+    it('should parse ngContent without selector', () => {
+      const res = parse('<ng-content></ng-content>');
+      expect(res.hasNgContent).toEqual(true);
+      expect(res.ngContentSelectors).toEqual([]);
+      expectFromR3Nodes(res.nodes).toEqual([
+        ['Content', 0],
+      ]);
+    });
+
+    it('should parse ngContent with a * selector', () => {
+      const res = parse('<ng-content></ng-content>');
+      const selectors = [''];
+      expect(res.hasNgContent).toEqual(true);
+      expect(res.ngContentSelectors).toEqual([]);
+      expectFromR3Nodes(res.nodes).toEqual([
+        ['Content', 0],
+      ]);
+    });
+
+    it('should parse ngContent with a specific selector', () => {
+      const res = parse('<ng-content select="tag[attribute]"></ng-content>');
+      const selectors = ['', 'tag[attribute]'];
+      expect(res.hasNgContent).toEqual(true);
+      expect(res.ngContentSelectors).toEqual(['tag[attribute]']);
+      expectFromR3Nodes(res.nodes).toEqual([
+        ['Content', 1],
+        ['TextAttribute', 'select', selectors[1]],
+      ]);
+    });
+
+    it('should parse ngContent with a selector', () => {
+      const res = parse(
+          '<ng-content select="a"></ng-content><ng-content></ng-content><ng-content select="b"></ng-content>');
+      const selectors = ['', 'a', 'b'];
+      expect(res.hasNgContent).toEqual(true);
+      expect(res.ngContentSelectors).toEqual(['a', 'b']);
+      expectFromR3Nodes(res.nodes).toEqual([
+        ['Content', 1],
+        ['TextAttribute', 'select', selectors[1]],
+        ['Content', 0],
+        ['Content', 2],
+        ['TextAttribute', 'select', selectors[2]],
+      ]);
+    });
+
+    it('should parse ngProjectAs as an attribute', () => {
+      const res = parse('<ng-content ngProjectAs="a"></ng-content>');
+      const selectors = [''];
+      expect(res.hasNgContent).toEqual(true);
+      expect(res.ngContentSelectors).toEqual([]);
+      expectFromR3Nodes(res.nodes).toEqual([
+        ['Content', 0],
+        ['TextAttribute', 'ngProjectAs', 'a'],
+      ]);
+    });
+  });
 
   describe('Ignored elements', () => {
     it('should ignore <script> elements', () => {

From d1abf4e897195f2eb9a7cc8b7ed3f94c362887f7 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 1 May 2018 01:12:31 +0300
Subject: [PATCH 023/582] test(service-worker): improve adding clients in
 `SwTestHarness` (#23625)

This commits changes how clients are added in `SwTestHarness`, so that
the behavior in tests closer mimics what would happen in an actual
ServiceWorker.
It also removes auto-adding clients when calling `clients.get()`, which
could hide bugs related to non-existing clients.

PR Close #23625
---
 packages/service-worker/worker/test/happy_spec.ts | 4 +---
 packages/service-worker/worker/testing/scope.ts   | 9 +++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts
index 87a57c67e7..19cf19b2d8 100644
--- a/packages/service-worker/worker/test/happy_spec.ts
+++ b/packages/service-worker/worker/test/happy_spec.ts
@@ -483,7 +483,6 @@ const manifestUpdateHash = sha1(JSON.stringify(manifestUpdate));
     async_it('shows notifications for push notifications', async() => {
       expect(await makeRequest(scope, '/foo.txt')).toEqual('this is foo');
       await driver.initialized;
-      scope.clients.add('default');
       await scope.handlePush({
         notification: {
           title: 'This is a test',
@@ -665,7 +664,7 @@ const manifestUpdateHash = sha1(JSON.stringify(manifestUpdate));
         server.assertSawRequestFor('/baz');
       });
 
-      async_it('does not redirect to index on a request that does not expect HTML', async() => {
+      async_it('does not redirect to index on a request that does not accept HTML', async() => {
         expect(await navRequest('/baz', {headers: {}})).toBeNull();
         server.assertSawRequestFor('/baz');
 
@@ -793,7 +792,6 @@ async function makeRequest(
   const [resPromise, done] = scope.handleFetch(new MockRequest(url, init), clientId);
   await done;
   const res = await resPromise;
-  scope.clients.add(clientId);
   if (res !== undefined && res.ok) {
     return res.text();
   }
diff --git a/packages/service-worker/worker/testing/scope.ts b/packages/service-worker/worker/testing/scope.ts
index e280041d18..3eb800bbc4 100644
--- a/packages/service-worker/worker/testing/scope.ts
+++ b/packages/service-worker/worker/testing/scope.ts
@@ -62,10 +62,7 @@ export class MockClients implements Clients {
 
   remove(clientId: string): void { this.clients.delete(clientId); }
 
-  async get(id: string): Promise<Client> {
-    this.add(id);
-    return this.clients.get(id) !as any as Client;
-  }
+  async get(id: string): Promise<Client> { return this.clients.get(id) !as any as Client; }
 
   getMock(id: string): MockClient|undefined { return this.clients.get(id); }
 
@@ -197,6 +194,10 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
     const event = new MockFetchEvent(req, clientId || null);
     this.eventHandlers.get('fetch') !.call(this, event);
 
+    if (clientId) {
+      this.clients.add(clientId);
+    }
+
     return [event.response, event.ready];
   }
 

From d6b1466c81c18954ef384e0a0f8323712a6fe404 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 1 May 2018 01:19:31 +0300
Subject: [PATCH 024/582] test(service-worker): support mock requests with
 null/empty client ID (#23625)

PR Close #23625
---
 packages/service-worker/worker/test/happy_spec.ts | 3 ++-
 packages/service-worker/worker/testing/scope.ts   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts
index 19cf19b2d8..75275e91a0 100644
--- a/packages/service-worker/worker/test/happy_spec.ts
+++ b/packages/service-worker/worker/test/happy_spec.ts
@@ -788,7 +788,8 @@ const manifestUpdateHash = sha1(JSON.stringify(manifestUpdate));
 })();
 
 async function makeRequest(
-    scope: SwTestHarness, url: string, clientId = 'default', init?: Object): Promise<string|null> {
+    scope: SwTestHarness, url: string, clientId: string | null = 'default',
+    init?: Object): Promise<string|null> {
   const [resPromise, done] = scope.handleFetch(new MockRequest(url, init), clientId);
   await done;
   const res = await resPromise;
diff --git a/packages/service-worker/worker/testing/scope.ts b/packages/service-worker/worker/testing/scope.ts
index 3eb800bbc4..cb647c76dd 100644
--- a/packages/service-worker/worker/testing/scope.ts
+++ b/packages/service-worker/worker/testing/scope.ts
@@ -187,11 +187,12 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
 
   waitUntil(promise: Promise<void>): void {}
 
-  handleFetch(req: Request, clientId?: string): [Promise<Response|undefined>, Promise<void>] {
+  handleFetch(req: Request, clientId: string|null = null):
+      [Promise<Response|undefined>, Promise<void>] {
     if (!this.eventHandlers.has('fetch')) {
       throw new Error('No fetch handler registered');
     }
-    const event = new MockFetchEvent(req, clientId || null);
+    const event = new MockFetchEvent(req, clientId);
     this.eventHandlers.get('fetch') !.call(this, event);
 
     if (clientId) {
@@ -210,7 +211,7 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
       event = new MockMessageEvent(data, null);
     } else {
       this.clients.add(clientId);
-      event = new MockMessageEvent(data, this.clients.getMock(clientId) as any);
+      event = new MockMessageEvent(data, this.clients.getMock(clientId) || null);
     }
     this.eventHandlers.get('message') !.call(this, event);
     return event.ready;

From e0ed59e55f8740303fc93784548d81c2de210e7e Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 1 May 2018 01:55:32 +0300
Subject: [PATCH 025/582] fix(service-worker): correctly handle requests with
 empty `clientId` (#23625)

Requests from clients that are not assigned a client ID by the browser
will produce `fetch` events with `null` or empty (`''`) `clientId`s.

Previously, the ServiceWorker only handled `null` values correctly. Yet
empty strings are also valid (see for example [here][1] and [there][2]).
With this commit, the SW will interpret _all_ falsy `clientId` values
the same (i.e. "no client ID assigned") and handle them appropriately.

Related Chromium issue/discussion: [#832105][3]

[1]: https://github.com/w3c/ServiceWorker/blob/4cc72bd0f13359f16cc733d88bed4ea52ee063c0/docs/index.bs#L1392
[2]: https://w3c.github.io/ServiceWorker/#fetchevent-interface
[3]: https://bugs.chromium.org/p/chromium/issues/detail?id=832105

Fixes #23526

PR Close #23625
---
 packages/service-worker/worker/src/driver.ts  |  4 ++--
 .../service-worker/worker/test/happy_spec.ts  | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/service-worker/worker/src/driver.ts b/packages/service-worker/worker/src/driver.ts
index d09045e066..6814053df9 100644
--- a/packages/service-worker/worker/src/driver.ts
+++ b/packages/service-worker/worker/src/driver.ts
@@ -543,10 +543,10 @@ export class Driver implements Debuggable, UpdateSource {
    * Decide which version of the manifest to use for the event.
    */
   private async assignVersion(event: FetchEvent): Promise<AppVersion|null> {
-    // First, check whether the event has a client ID. If it does, the version may
+    // First, check whether the event has a (non empty) client ID. If it does, the version may
     // already be associated.
     const clientId = event.clientId;
-    if (clientId !== null) {
+    if (clientId) {
       // Check if there is an assigned client id.
       if (this.clientVersionMap.has(clientId)) {
         // There is an assignment for this client already.
diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts
index 75275e91a0..e444ca1502 100644
--- a/packages/service-worker/worker/test/happy_spec.ts
+++ b/packages/service-worker/worker/test/happy_spec.ts
@@ -320,6 +320,27 @@ const manifestUpdateHash = sha1(JSON.stringify(manifestUpdate));
       expect(await makeRequest(scope, '/foo.txt')).toEqual('this is foo v2');
     });
 
+    async_it('handles empty client ID', async() => {
+      const navRequest = (url: string, clientId: string | null) =>
+          makeRequest(scope, url, clientId, {
+            headers: {Accept: 'text/plain, text/html, text/css'},
+            mode: 'navigate',
+          });
+
+      // Initialize the SW.
+      expect(await navRequest('/foo/file1', '')).toEqual('this is foo');
+      expect(await navRequest('/bar/file2', null)).toEqual('this is foo');
+      await driver.initialized;
+
+      // Update to a new version.
+      scope.updateServerState(serverUpdate);
+      expect(await driver.checkForUpdate()).toEqual(true);
+
+      // Correctly handle navigation requests, even if `clientId` is null/empty.
+      expect(await navRequest('/foo/file1', '')).toEqual('this is foo v2');
+      expect(await navRequest('/bar/file2', null)).toEqual('this is foo v2');
+    });
+
     async_it('checks for updates on restart', async() => {
       expect(await makeRequest(scope, '/foo.txt')).toEqual('this is foo');
       await driver.initialized;

From f1e4a153f0f36572c82604a8bbc4b401af94d7c8 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 28 Apr 2018 02:18:35 +0300
Subject: [PATCH 026/582] refactor(service-worker): sort manifest
 `url`/`hashTable` entries (#23586)

This makes it easier to quickly check whether a specific file ended up
in the manifest, for example when debugging.

PR Close #23586
---
 .../service-worker/config/src/generator.ts    | 32 +++++++++++--------
 .../config/test/generator_spec.ts             |  6 ++--
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/packages/service-worker/config/src/generator.ts b/packages/service-worker/config/src/generator.ts
index 228ea858ed..399d733e67 100644
--- a/packages/service-worker/config/src/generator.ts
+++ b/packages/service-worker/config/src/generator.ts
@@ -27,13 +27,15 @@ export class Generator {
   constructor(readonly fs: Filesystem, private baseHref: string) {}
 
   async process(config: Config): Promise<Object> {
-    const hashTable = {};
+    const unorderedHashTable = {};
+    const assetGroups = await this.processAssetGroups(config, unorderedHashTable);
+
     return {
       configVersion: 1,
       appData: config.appData,
-      index: joinUrls(this.baseHref, config.index),
-      assetGroups: await this.processAssetGroups(config, hashTable),
-      dataGroups: this.processDataGroups(config), hashTable,
+      index: joinUrls(this.baseHref, config.index), assetGroups,
+      dataGroups: this.processDataGroups(config),
+      hashTable: withOrderedKeys(unorderedHashTable),
       navigationUrls: processNavigationUrls(this.baseHref, config.navigationUrls),
     };
   }
@@ -45,16 +47,17 @@ export class Generator {
       const fileMatcher = globListToMatcher(group.resources.files || []);
       const versionedMatcher = globListToMatcher(group.resources.versionedFiles || []);
 
-      const allFiles = (await this.fs.list('/'));
-
-      const versionedFiles = allFiles.filter(versionedMatcher).filter(file => !seenMap.has(file));
-      versionedFiles.forEach(file => seenMap.add(file));
+      const allFiles = await this.fs.list('/');
 
       const plainFiles = allFiles.filter(fileMatcher).filter(file => !seenMap.has(file));
       plainFiles.forEach(file => seenMap.add(file));
 
+      const versionedFiles = allFiles.filter(versionedMatcher).filter(file => !seenMap.has(file));
+      versionedFiles.forEach(file => seenMap.add(file));
+
       // Add the hashes.
-      await[...versionedFiles, ...plainFiles].reduce(async(previous, file) => {
+      const matchedFiles = [...plainFiles, ...versionedFiles].sort();
+      await matchedFiles.reduce(async(previous, file) => {
         await previous;
         const hash = await this.fs.hash(file);
         hashTable[joinUrls(this.baseHref, file)] = hash;
@@ -64,10 +67,7 @@ export class Generator {
         name: group.name,
         installMode: group.installMode || 'prefetch',
         updateMode: group.updateMode || group.installMode || 'prefetch',
-        urls: ([] as string[])
-                  .concat(plainFiles)
-                  .concat(versionedFiles)
-                  .map(url => joinUrls(this.baseHref, url)),
+        urls: matchedFiles.map(url => joinUrls(this.baseHref, url)),
         patterns: (group.resources.urls || []).map(url => urlToRegex(url, this.baseHref)),
       };
     }));
@@ -141,3 +141,9 @@ function joinUrls(a: string, b: string): string {
   }
   return a + b;
 }
+
+function withOrderedKeys<T extends{[key: string]: any}>(unorderedObj: T): T {
+  const orderedObj = {} as T;
+  Object.keys(unorderedObj).sort().forEach(key => orderedObj[key] = unorderedObj[key]);
+  return orderedObj;
+}
diff --git a/packages/service-worker/config/test/generator_spec.ts b/packages/service-worker/config/test/generator_spec.ts
index d7252af471..d4fabf98f9 100644
--- a/packages/service-worker/config/test/generator_spec.ts
+++ b/packages/service-worker/config/test/generator_spec.ts
@@ -74,8 +74,8 @@ import {MockFilesystem} from '../testing/mock';
                installMode: 'prefetch',
                updateMode: 'prefetch',
                urls: [
-                 '/test/index.html',
                  '/test/foo/test.html',
+                 '/test/index.html',
                  '/test/test.txt',
                ],
                patterns: [
@@ -102,9 +102,9 @@ import {MockFilesystem} from '../testing/mock';
                {positive: false, regex: '^http:\\/\\/example\\.com\\/excluded$'},
              ],
              hashTable: {
-               '/test/test.txt': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643',
+               '/test/foo/test.html': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643',
                '/test/index.html': 'a54d88e06612d820bc3be72877c74f257b561b19',
-               '/test/foo/test.html': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643'
+               '/test/test.txt': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643'
              }
            });
            done();

From e942d8b681f0ad6a870f914446241ae2b841abf8 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 20 Mar 2018 15:45:09 +0100
Subject: [PATCH 027/582] fix(aio): fix error in import after RxJS 6 migration
 (#22886)

PR Close #22886
---
 aio/content/examples/pipes/src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/pipes/src/app/app.module.ts b/aio/content/examples/pipes/src/app/app.module.ts
index 325a32e4b2..f1d75597fc 100644
--- a/aio/content/examples/pipes/src/app/app.module.ts
+++ b/aio/content/examples/pipes/src/app/app.module.ts
@@ -2,7 +2,7 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular//common/http';
+import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 import {

From 858e48a7944e938a47ac12ca481d057d4e73b325 Mon Sep 17 00:00:00 2001
From: Fabian Wiles <fabianwiles@live.com>
Date: Thu, 3 May 2018 20:46:20 +1200
Subject: [PATCH 028/582] ci: add config for size plugin of the github rebot
 (#23665)

PR Close #23665
---
 .circleci/config.yml      | 14 +++++++++-----
 .github/angular-robot.yml |  8 ++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 236e4d1bc2..c49a2cc944 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,19 +89,23 @@ jobs:
 
       # CircleCI will allow us to go back and view/download these artifacts from past builds.
       # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
+      # The destination keys need be format {projectName}/{context}/{fileName} so that the github-robot can process them for size calculations
+      # projectName should remain consistant to group files
+      # context and fileName can be almost anything (within usual URI rules)
+      # There should only be exactly 2 forward slashes in the path
+      # This is so they're backwards compatiable with the existing data we have on bundle sizes
       - store_artifacts:
           path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js
-          destination: packages/core/test/bundling/hello_world/bundle.min.js
+          destination: core/hello_world/bundle
       - store_artifacts:
           path: dist/bin/packages/core/test/bundling/todo/bundle.min.js
-          destination: packages/core/test/bundling/todo/bundle.min.js
+          destination: core/todo/bundle
       - store_artifacts:
           path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.br
-          destination: packages/core/test/bundling/hello_world/bundle.min.js.br
+          destination: core/hello_world/bundle.br
       - store_artifacts:
           path: dist/bin/packages/core/test/bundling/todo/bundle.min.js.br
-          destination: packages/core/test/bundling/todo/bundle.min.js.br
-
+          destination: core/todo/bundle.br
       - save_cache:
           key: *cache_key
           paths:
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index a7cddb3aa9..0f7e06119d 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -1,5 +1,13 @@
 # Configuration for angular-robot
 
+#options for the size plugin
+size:
+  disabled: false
+  maxSizeIncrease: 1000
+  status:
+    disabled: false
+    context: "ci/angular: size"
+
 # options for the merge plugin
 merge:
   # the status will be added to your pull requests

From 553a6808171650f6ca8a9902c588817ce9f48163 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Thu, 3 May 2018 12:03:13 -0700
Subject: [PATCH 029/582] fix(router): correct the segment parsing so it won't
 break on ampersand (#23684)

PR Close #23684
---
 packages/router/src/url_tree.ts             | 2 +-
 packages/router/test/url_serializer.spec.ts | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/router/src/url_tree.ts b/packages/router/src/url_tree.ts
index 0b06fd5fc4..c9b4101793 100644
--- a/packages/router/src/url_tree.ts
+++ b/packages/router/src/url_tree.ts
@@ -406,7 +406,7 @@ function serializeQueryParams(params: {[key: string]: any}): string {
   return strParams.length ? `?${strParams.join("&")}` : '';
 }
 
-const SEGMENT_RE = /^[^\/()?;=&#]+/;
+const SEGMENT_RE = /^[^\/()?;=#]+/;
 function matchSegments(str: string): string {
   const match = str.match(SEGMENT_RE);
   return match ? match[0] : '';
diff --git a/packages/router/test/url_serializer.spec.ts b/packages/router/test/url_serializer.spec.ts
index 0b5340feee..1fe0cf3b26 100644
--- a/packages/router/test/url_serializer.spec.ts
+++ b/packages/router/test/url_serializer.spec.ts
@@ -359,6 +359,14 @@ describe('url serializer', () => {
 
       expect(url.serialize(parsed)).toBe(`/${notEncoded}${encoded}`);
     });
+
+    it('should correctly encode ampersand in segments', () => {
+      const testUrl = '/parent&child';
+
+      const parsed = url.parse(testUrl);
+
+      expect(url.serialize(parsed)).toBe(testUrl);
+    });
   });
 
   describe('error handling', () => {

From 89f64e58c30389f9896532bfb65bc4138fc19ed1 Mon Sep 17 00:00:00 2001
From: Zaven Muradyan <voithos@google.com>
Date: Thu, 8 Mar 2018 12:16:01 -0800
Subject: [PATCH 030/582] fix(router): avoid freezing queryParams in-place
 (#22663)

The recognizer code used to call Object.freeze() on queryParams before
using them to construct ActivatedRoutes, with the intent being to help
avoid common invalid usage. Unfortunately, Object.freeze() works
in-place, so this was also freezing the queryParams on the actual
UrlTree object, making it more difficult to manipulate UrlTrees in
things like UrlHandlingStrategy.

This change simply shallow-copies the queryParams before freezing them.

Fixes #22617

PR Close #22663
---
 packages/router/src/recognize.ts       | 9 +++++----
 packages/router/test/recognize.spec.ts | 8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/router/src/recognize.ts b/packages/router/src/recognize.ts
index 74684f78b0..b6eeded31a 100644
--- a/packages/router/src/recognize.ts
+++ b/packages/router/src/recognize.ts
@@ -38,8 +38,9 @@ class Recognizer {
       const children = this.processSegmentGroup(this.config, rootSegmentGroup, PRIMARY_OUTLET);
 
       const root = new ActivatedRouteSnapshot(
-          [], Object.freeze({}), Object.freeze(this.urlTree.queryParams), this.urlTree.fragment !,
-          {}, PRIMARY_OUTLET, this.rootComponentType, null, this.urlTree.root, -1, {});
+          [], Object.freeze({}), Object.freeze({...this.urlTree.queryParams}),
+          this.urlTree.fragment !, {}, PRIMARY_OUTLET, this.rootComponentType, null,
+          this.urlTree.root, -1, {});
 
       const rootNode = new TreeNode<ActivatedRouteSnapshot>(root, children);
       const routeState = new RouterStateSnapshot(this.url, rootNode);
@@ -116,7 +117,7 @@ class Recognizer {
     if (route.path === '**') {
       const params = segments.length > 0 ? last(segments) !.parameters : {};
       snapshot = new ActivatedRouteSnapshot(
-          segments, params, Object.freeze(this.urlTree.queryParams), this.urlTree.fragment !,
+          segments, params, Object.freeze({...this.urlTree.queryParams}), this.urlTree.fragment !,
           getData(route), outlet, route.component !, route, getSourceSegmentGroup(rawSegment),
           getPathIndexShift(rawSegment) + segments.length, getResolve(route));
     } else {
@@ -125,7 +126,7 @@ class Recognizer {
       rawSlicedSegments = segments.slice(result.lastChild);
 
       snapshot = new ActivatedRouteSnapshot(
-          consumedSegments, result.parameters, Object.freeze(this.urlTree.queryParams),
+          consumedSegments, result.parameters, Object.freeze({...this.urlTree.queryParams}),
           this.urlTree.fragment !, getData(route), outlet, route.component !, route,
           getSourceSegmentGroup(rawSegment),
           getPathIndexShift(rawSegment) + consumedSegments.length, getResolve(route));
diff --git a/packages/router/test/recognize.spec.ts b/packages/router/test/recognize.spec.ts
index f224f0e0ab..1db36a1cd1 100644
--- a/packages/router/test/recognize.spec.ts
+++ b/packages/router/test/recognize.spec.ts
@@ -748,6 +748,14 @@ describe('recognize', () => {
         expect(Object.isFrozen(s.root.queryParams)).toBeTruthy();
       });
     });
+
+    it('should not freeze UrlTree query params', () => {
+      const url = tree('a?q=11');
+      recognize(RootComponent, [{path: 'a', component: ComponentA}], url, 'a?q=11')
+          .subscribe((s: RouterStateSnapshot) => {
+            expect(Object.isFrozen(url.queryParams)).toBe(false);
+          });
+    });
   });
 
   describe('fragment', () => {

From 117c7eebc388ccc7a138a468d79adcd314630471 Mon Sep 17 00:00:00 2001
From: Alain Chautard <alain@interstate21.com>
Date: Tue, 8 May 2018 20:48:07 -0700
Subject: [PATCH 031/582] docs(aio): add Alain Chautard in GDE list (#23783)

PR Close #23783
---
 aio/content/images/bios/alainchautard.png | Bin 0 -> 358427 bytes
 aio/content/marketing/contributors.json   |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 aio/content/images/bios/alainchautard.png

diff --git a/aio/content/images/bios/alainchautard.png b/aio/content/images/bios/alainchautard.png
new file mode 100644
index 0000000000000000000000000000000000000000..214cd836dc67c0d1e4111bcc3bda44d3c6ac5b4f
GIT binary patch
literal 358427
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

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 1b473f48d2..73a65bc3ac 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -591,5 +591,14 @@
     "website": "http://ngnir.life/",
     "bio": "Nir is a Principal Frontend Consultant & Head of the Angular department at 500Tech, Google Developer Expert and community leader. He organizes the largest Angular meetup group in Israel (Angular-IL), talks and teaches about front-end technologies around the world. He is also the author of two books about Angular and the founder of the 'Frontend Band'.",
     "group": "GDE"
+  },
+  
+  "achautard": {
+    "name": "Alain Chautard",
+    "picture": "alainchautard.png",
+    "twitter": "AlainChautard",
+    "website": "http://www.angulartraining.com",
+    "bio": "Alain Chautard is a Google Developer Expert in Web Technologies / Angular. He started working with Angular JS in 2011. Since then he has worked with all Angular versions on a daily basis, both as a developer and as a technical trainer. He is the organizer of the Sacramento Angular Meetup group, co-organizer of the Google Developer Group chapter in Sacramento, California, and published author of the Packt video course 'Getting Started with Angular'",
+    "group": "GDE"
   }
 }

From db2d67cc00184915451a983a554895a6826f95e2 Mon Sep 17 00:00:00 2001
From: jenniferfell <jenniferfell.sf@gmail.com>
Date: Wed, 9 May 2018 14:18:11 -0600
Subject: [PATCH 032/582] docs: change release_schedule.md to link to new
 angular release page in docs (#23808)

PR Close #23808
---
 docs/RELEASE_SCHEDULE.md | 73 ++--------------------------------------
 1 file changed, 2 insertions(+), 71 deletions(-)

diff --git a/docs/RELEASE_SCHEDULE.md b/docs/RELEASE_SCHEDULE.md
index 4c988528d4..ee976eb902 100644
--- a/docs/RELEASE_SCHEDULE.md
+++ b/docs/RELEASE_SCHEDULE.md
@@ -1,75 +1,6 @@
 # Angular Release Schedule
 
-This document contains historic record of past Angular releases and future release schedule.
+The Angular release schedule has moved. 
 
-The purpose of this document is to assist coordination among the Angular team, Angular contributors, Angular application teams, and Angular community projects.
+See [Angular releases](https://angular.io/guide/releases "Angular releases") for information about release policies and practices&mdash;including deprecation and support practices&mdash;as well as estimated dates for our next major releases. 
 
-We'll keep this doc up to date when unplanned releases or other schedule changes occur.
-
-
-## Schedule Caveats and Exceptions
-
-The dates listed here are approximate – last minute issues, team or community events, etc. can cause us to release a few days sooner or later.
-
-This page contains only planned and past unplanned releases.
-Due to serious regressions or other important reasons we reserve the right to release an unplanned patch or minor release.
-In such case, we'll update this document accordingly.
-
-The dates are just a guidance and might be adjusted slightly if necessary.
-
-## Tentative Schedule Until April 2018
-
-<!--
-The table below is formatted so that it's easy to read and edit in both markdown and rendered html form.
-
-In order to deal with undesirable line breaks, two special characters are occasionally used:
-
-- non-breaking hyphen: "‑" http://www.fileformat.info/info/unicode/char/2011/index.htm
-- non-breaking space: " " http://www.fileformat.info/info/unicode/char/00a0/index.htm
-
-If you see undesirable wrapping issues in the rendered form, please copy&paste the quoted characters and use them in the table below where needed.
--->
-
-Week Of       | Stable Release<br>(@latest npm tag) | Beta/RC Release<br>(@next npm tag) | Note
-------------- | ----------------------------------- | ---------------------------------- | ---------------------
-2018-01-10	  | 5.2.0                               | -                                  |
-2018-01-17	  | 5.2.1                               | 6.0.0‑beta.0                       |
-2018-01-24	  | 5.2.2                               | 6.0.0‑beta.1                       |
-2018-01-31	  | 5.2.3                               | 6.0.0‑beta.2                       |
-2018-02-07	  | 5.2.4                               | 6.0.0‑beta.3                       |
-2018-02-14	  | 5.2.5                               | 6.0.0‑beta.4                       |
-2018-02-21	  | 5.2.6                               | 6.0.0‑beta.5                       |
-2018-02-28	  | 5.2.7                               | 6.0.0‑beta.6                       |
-2018-03-07	  | 5.2.8                               | 6.0.0‑beta.7                       |
-2018-03-14	  | 5.2.9                               | 6.0.0‑rc.0                         |
-2018-03-21	  | 5.2.10                              | 6.0.0‑rc.1                         |
-2018-03-28	  | 5.2.11                              | 6.0.0‑rc.2                         |
-2018-04-04	  | 6.0.0                               | -                                  | Major Release
-2018-04-11	  | 6.0.1                               | -                                  |
-2018-04-18	  | 6.0.2                               | -                                  | [ng-conf](https://www.ng-conf.org/)
-
-
-## Tentative Schedule After April 2018
-
- Date                   | Stable Release | Compatibility`*`
- ---------------------- | -------------- | ----------------
- September/October 2018 | 7.0.0          | ^6.0.0
- March/April 2019       | 8.0.0          | ^7.0.0
-
- `*` The primary goal of the backwards compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
-
-## Long-Term Supported (LTS) Versions
-
- Version     | LTS Start Date | LTS End Date
- ----------- | -------------- | ------------
- ^4.0.0      | October 2017   | October 2018
- ^6.0.0      | October 2018   | October 2019
-
-In the long-term support state, only the critical fixes and security patches will be merged and released.
-
-## More Info & Resources
-
-In [September 2016 we announced](http://angularjs.blogspot.com/2016/10/versioning-and-releasing-angular.html) that Angular is fully adopting [semantic versioning](http://semver.org/) and that we'll be releasing patch versions on a weekly basis (~50 per year), minor versions monthly for 3 months following a major version release, and every 6 months we'll release a major version that will be backwards compatible with the previous release for most developers, but might remove APIs that have been deprecated two major versions ago (6 or more months ago).
-
-In [December 2016 we clarified this message](http://angularjs.blogspot.com/2016/12/ok-let-me-explain-its-going-to-be.html), and provided additional details about the plans to release Angular 4.0.0 in March 2017.
-This document contains updates to the schedule that happened since then.

From 72eab4d254a39c9f0f7e2f718a1db56bf9508f12 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 9 May 2018 12:42:54 -0700
Subject: [PATCH 033/582] docs(elements): emphasize future direction, update
 link (#23806)

PR Close #23806
---
 aio/content/guide/elements.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/aio/content/guide/elements.md b/aio/content/guide/elements.md
index 2a8c78de0a..35b86d2370 100644
--- a/aio/content/guide/elements.md
+++ b/aio/content/guide/elements.md
@@ -1,6 +1,6 @@
 # Angular Elements Overview
 
-Angular Elements are Angular components packaged as custom elements, a web standard for defining new html elements in a framework-agnostic way.
+_Angular elements_ are Angular components packaged as _custom elements_, a web standard for defining new HTML elements in a framework-agnostic way.
 
 [Custom elements](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Using_custom_elements) are a Web Platform feature currently supported by Chrome, Opera, and Safari, and available in other browsers through polyfills (see [Browser Support](#browser-support)).
 A custom element extends HTML by allowing you to define a tag whose content is created and controlled by JavaScript code. 
@@ -8,7 +8,16 @@ The browser maintains a `CustomElementRegistry` of defined custom elements (also
 
 The `@angular/elements` package exports a `createCustomElement()` API that provides a bridge from Angular's component interface and change detection functionality to the built-in DOM API. 
 
-Transforming a component to a custom element makes all of the required Angular infrastructure available to the browser. Creating a custom element is simple and straightforward, and automatically connects your component-defined view with change detection and data binding, mapping Angular functionality to the corresponding native HTML equivalents. 
+Transforming a component to a custom element makes all of the required Angular infrastructure available to the browser. 
+Creating a custom element is simple and straightforward, and automatically connects your component-defined view with change detection and data binding, mapping Angular functionality to the corresponding native HTML equivalents. 
+
+<div class="l-sub-section">
+
+    We are working on custom elements that can be used by web apps built on other frameworks. 
+    A minimal, self-contained version of the Angular framework will be injected as a service to support the component's change-detection and data-binding functionality. 
+    For more about the direction of development, check out this [video presentation](https://www.youtube.com/watch?v=Z1gLFPLVJjY&t=4s).
+
+</div>
 
 ## Using custom elements
 
@@ -41,14 +50,6 @@ When your custom element is placed on a page, the browser creates an instance of
 
 <hr class="clear">
 
-<div class="l-sub-section">
-
-    We are working on custom elements that can be used by web apps built on other frameworks. 
-    A minimal, self-contained version of the Angular framework will be injected as a service to support the component's change-detection and data-binding functionality. 
-    For more about the direction of development, check out this [video presentation](https://www.youtube.com/watch?v=vHI5C-9vH-E).
-
-</div>
-
 ## Transforming components to custom elements
 
 Angular provides the `createCustomElement()` function for converting an Angular component, 

From fe3679a356275156e9d5fe03ded0068f9db3d58d Mon Sep 17 00:00:00 2001
From: swseverance <swseverance@gmail.com>
Date: Mon, 16 Apr 2018 21:27:16 -0400
Subject: [PATCH 034/582] style: remove empty comments (#23404)

PR Close #23404
---
 .../examples/lifecycle-hooks/src/app/counter.component.ts   | 2 --
 .../examples/lifecycle-hooks/src/app/do-check.component.ts  | 2 --
 .../lifecycle-hooks/src/app/on-changes.component.ts         | 2 --
 packages/animations/src/version.ts                          | 3 ---
 packages/common/http/src/client.ts                          | 3 ---
 packages/common/src/directives/ng_for_of.ts                 | 3 ---
 packages/common/src/directives/ng_if.ts                     | 3 ---
 packages/common/src/version.ts                              | 4 +---
 packages/compiler-cli/src/version.ts                        | 4 +---
 packages/compiler/src/version.ts                            | 4 +---
 packages/core/src/change_detection/change_detector_ref.ts   | 3 ---
 .../src/change_detection/differs/default_iterable_differ.ts | 3 ---
 .../src/change_detection/differs/default_keyvalue_differ.ts | 4 ----
 packages/core/src/linker/component_factory.ts               | 3 ---
 packages/core/src/linker/component_factory_resolver.ts      | 3 ---
 packages/core/src/linker/view_ref.ts                        | 4 ----
 packages/core/src/version.ts                                | 3 ---
 .../core/test/render3/compiler_canonical/injection_spec.ts  | 1 -
 packages/forms/src/directives/validators.ts                 | 6 ------
 packages/forms/src/version.ts                               | 4 +---
 packages/language-service/src/version.ts                    | 4 +---
 .../src/platform-browser-dynamic.ts                         | 3 ---
 packages/platform-browser-dynamic/src/version.ts            | 4 +---
 packages/platform-browser-dynamic/testing/src/testing.ts    | 3 ---
 packages/platform-browser/src/browser.ts                    | 3 ---
 packages/platform-browser/src/dom/events/event_manager.ts   | 6 ------
 packages/platform-browser/src/version.ts                    | 4 +---
 packages/platform-server/src/version.ts                     | 4 +---
 packages/platform-webworker-dynamic/src/version.ts          | 4 +---
 packages/platform-webworker/src/version.ts                  | 4 +---
 packages/router/src/version.ts                              | 4 +---
 packages/upgrade/src/common/version.ts                      | 4 +---
 32 files changed, 12 insertions(+), 99 deletions(-)

diff --git a/aio/content/examples/lifecycle-hooks/src/app/counter.component.ts b/aio/content/examples/lifecycle-hooks/src/app/counter.component.ts
index f9783b844e..4d5198b696 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/counter.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/counter.component.ts
@@ -38,8 +38,6 @@ export class MyCounterComponent implements OnChanges {
   }
 }
 
-/***************************************/
-
 @Component({
   selector: 'counter-parent',
   template: `
diff --git a/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts b/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
index d46b362ab0..4b8a088b9a 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
@@ -72,8 +72,6 @@ export class DoCheckComponent implements DoCheck {
   }
 }
 
-/***************************************/
-
 @Component({
   selector: 'do-check-parent',
   templateUrl: './do-check-parent.component.html',
diff --git a/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts b/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
index e580fffd39..7b9cda05ef 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
@@ -46,8 +46,6 @@ export class OnChangesComponent implements OnChanges {
   reset() { this.changeLog = []; }
 }
 
-/***************************************/
-
 @Component({
   selector: 'on-changes-parent',
   templateUrl: './on-changes-parent.component.html',
diff --git a/packages/animations/src/version.ts b/packages/animations/src/version.ts
index 637cfc2c23..ead04f9164 100644
--- a/packages/animations/src/version.ts
+++ b/packages/animations/src/version.ts
@@ -30,7 +30,4 @@ export class Version {
   }
 }
 
-/**
- *
- */
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/common/http/src/client.ts b/packages/common/http/src/client.ts
index 9a6e79da69..0d26fc0461 100644
--- a/packages/common/http/src/client.ts
+++ b/packages/common/http/src/client.ts
@@ -42,9 +42,6 @@ function addBody<T>(
   };
 }
 
-/**
- *
- */
 export type HttpObserve = 'body' | 'events' | 'response';
 
 /**
diff --git a/packages/common/src/directives/ng_for_of.ts b/packages/common/src/directives/ng_for_of.ts
index eddfdde69c..7bffebc700 100644
--- a/packages/common/src/directives/ng_for_of.ts
+++ b/packages/common/src/directives/ng_for_of.ts
@@ -8,9 +8,6 @@
 
 import {ChangeDetectorRef, Directive, DoCheck, EmbeddedViewRef, Input, IterableChangeRecord, IterableChanges, IterableDiffer, IterableDiffers, NgIterable, OnChanges, SimpleChanges, TemplateRef, TrackByFunction, ViewContainerRef, forwardRef, isDevMode} from '@angular/core';
 
-/**
- *
- */
 export class NgForOfContext<T> {
   constructor(
       public $implicit: T, public ngForOf: NgIterable<T>, public index: number,
diff --git a/packages/common/src/directives/ng_if.ts b/packages/common/src/directives/ng_if.ts
index 053b1b4874..9bcab1d949 100644
--- a/packages/common/src/directives/ng_if.ts
+++ b/packages/common/src/directives/ng_if.ts
@@ -158,9 +158,6 @@ export class NgIf {
   public static ngIfUseIfTypeGuard: void;
 }
 
-/**
- *
- */
 export class NgIfContext {
   public $implicit: any = null;
   public ngIf: any = null;
diff --git a/packages/common/src/version.ts b/packages/common/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/common/src/version.ts
+++ b/packages/common/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/compiler-cli/src/version.ts b/packages/compiler-cli/src/version.ts
index 9d3cd48c2b..0ebdb959fc 100644
--- a/packages/compiler-cli/src/version.ts
+++ b/packages/compiler-cli/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/compiler';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/compiler/src/version.ts b/packages/compiler/src/version.ts
index 565e4676f1..16aee9de05 100644
--- a/packages/compiler/src/version.ts
+++ b/packages/compiler/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from './util';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/core/src/change_detection/change_detector_ref.ts b/packages/core/src/change_detection/change_detector_ref.ts
index b0e647ab4d..89f5244de4 100644
--- a/packages/core/src/change_detection/change_detector_ref.ts
+++ b/packages/core/src/change_detection/change_detector_ref.ts
@@ -6,9 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- *
- */
 export abstract class ChangeDetectorRef {
   /**
    * Marks a view and all of its ancestors dirty.
diff --git a/packages/core/src/change_detection/differs/default_iterable_differ.ts b/packages/core/src/change_detection/differs/default_iterable_differ.ts
index 05d7d02e10..ac917e63f0 100644
--- a/packages/core/src/change_detection/differs/default_iterable_differ.ts
+++ b/packages/core/src/change_detection/differs/default_iterable_differ.ts
@@ -557,9 +557,6 @@ export class DefaultIterableDiffer<V> implements IterableDiffer<V>, IterableChan
   }
 }
 
-/**
- *
- */
 export class IterableChangeRecord_<V> implements IterableChangeRecord<V> {
   currentIndex: number|null = null;
   previousIndex: number|null = null;
diff --git a/packages/core/src/change_detection/differs/default_keyvalue_differ.ts b/packages/core/src/change_detection/differs/default_keyvalue_differ.ts
index b3745d428c..3408c7ad0f 100644
--- a/packages/core/src/change_detection/differs/default_keyvalue_differ.ts
+++ b/packages/core/src/change_detection/differs/default_keyvalue_differ.ts
@@ -259,10 +259,6 @@ export class DefaultKeyValueDiffer<K, V> implements KeyValueDiffer<K, V>, KeyVal
   }
 }
 
-
-/**
- *
- */
 class KeyValueChangeRecord_<K, V> implements KeyValueChangeRecord<K, V> {
   previousValue: V|null = null;
   currentValue: V|null = null;
diff --git a/packages/core/src/linker/component_factory.ts b/packages/core/src/linker/component_factory.ts
index 3deb494bdf..096a89b4f7 100644
--- a/packages/core/src/linker/component_factory.ts
+++ b/packages/core/src/linker/component_factory.ts
@@ -64,9 +64,6 @@ export abstract class ComponentRef<C> {
   abstract onDestroy(callback: Function): void;
 }
 
-/**
- *
- */
 export abstract class ComponentFactory<C> {
   abstract get selector(): string;
   abstract get componentType(): Type<any>;
diff --git a/packages/core/src/linker/component_factory_resolver.ts b/packages/core/src/linker/component_factory_resolver.ts
index e1a4f56b39..a478419c61 100644
--- a/packages/core/src/linker/component_factory_resolver.ts
+++ b/packages/core/src/linker/component_factory_resolver.ts
@@ -33,9 +33,6 @@ class _NullComponentFactoryResolver implements ComponentFactoryResolver {
   }
 }
 
-/**
- *
- */
 export abstract class ComponentFactoryResolver {
   static NULL: ComponentFactoryResolver = new _NullComponentFactoryResolver();
   abstract resolveComponentFactory<T>(component: Type<T>): ComponentFactory<T>;
diff --git a/packages/core/src/linker/view_ref.ts b/packages/core/src/linker/view_ref.ts
index bdaf8e7ce5..47b721a5d8 100644
--- a/packages/core/src/linker/view_ref.ts
+++ b/packages/core/src/linker/view_ref.ts
@@ -9,10 +9,6 @@
 import {ApplicationRef} from '../application_ref';
 import {ChangeDetectorRef} from '../change_detection/change_detector_ref';
 
-
-/**
- *
- */
 export abstract class ViewRef extends ChangeDetectorRef {
   /**
    * Destroys the view and all of the data structures associated with it.
diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
index 12fbcb4467..f095fc9526 100644
--- a/packages/core/src/version.ts
+++ b/packages/core/src/version.ts
@@ -23,7 +23,4 @@ export class Version {
   }
 }
 
-/**
- *
- */
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/core/test/render3/compiler_canonical/injection_spec.ts b/packages/core/test/render3/compiler_canonical/injection_spec.ts
index d8af9c2810..827cd27a77 100644
--- a/packages/core/test/render3/compiler_canonical/injection_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/injection_spec.ts
@@ -151,7 +151,6 @@ describe('injection', () => {
             return new MyApp(
                 $r3$.ɵdirectiveInject(ServiceA), $r3$.ɵdirectiveInject(ServiceB), inject(INJECTOR));
           },
-          /**  */
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {},
           providers: [ServiceA],
           viewProviders: [ServiceB],
diff --git a/packages/forms/src/directives/validators.ts b/packages/forms/src/directives/validators.ts
index 8dfe9f6e3c..791392770d 100644
--- a/packages/forms/src/directives/validators.ts
+++ b/packages/forms/src/directives/validators.ts
@@ -166,14 +166,8 @@ export class EmailValidator implements Validator {
   registerOnValidatorChange(fn: () => void): void { this._onChange = fn; }
 }
 
-/**
- *
- */
 export interface ValidatorFn { (c: AbstractControl): ValidationErrors|null; }
 
-/**
- *
- */
 export interface AsyncValidatorFn {
   (c: AbstractControl): Promise<ValidationErrors|null>|Observable<ValidationErrors|null>;
 }
diff --git a/packages/forms/src/version.ts b/packages/forms/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/forms/src/version.ts
+++ b/packages/forms/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/language-service/src/version.ts b/packages/language-service/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/language-service/src/version.ts
+++ b/packages/language-service/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-browser-dynamic/src/platform-browser-dynamic.ts b/packages/platform-browser-dynamic/src/platform-browser-dynamic.ts
index cd33f06fa6..93641b2e2b 100644
--- a/packages/platform-browser-dynamic/src/platform-browser-dynamic.ts
+++ b/packages/platform-browser-dynamic/src/platform-browser-dynamic.ts
@@ -23,8 +23,5 @@ export {JitCompilerFactory} from './compiler_factory';
 export const RESOURCE_CACHE_PROVIDER: Provider[] =
     [{provide: ResourceLoader, useClass: CachedResourceLoader, deps: []}];
 
-/**
- *
- */
 export const platformBrowserDynamic = createPlatformFactory(
     platformCoreDynamic, 'browserDynamic', INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS);
diff --git a/packages/platform-browser-dynamic/src/version.ts b/packages/platform-browser-dynamic/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/platform-browser-dynamic/src/version.ts
+++ b/packages/platform-browser-dynamic/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-browser-dynamic/testing/src/testing.ts b/packages/platform-browser-dynamic/testing/src/testing.ts
index 7fe80499b6..d849378d81 100644
--- a/packages/platform-browser-dynamic/testing/src/testing.ts
+++ b/packages/platform-browser-dynamic/testing/src/testing.ts
@@ -16,9 +16,6 @@ import {platformCoreDynamicTesting} from './platform_core_dynamic_testing';
 
 export * from './private_export_testing';
 
-/**
- *
- */
 export const platformBrowserDynamicTesting = createPlatformFactory(
     platformCoreDynamicTesting, 'browserDynamicTesting',
     INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS);
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index 7ab1753934..dc13d2bdbb 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -44,9 +44,6 @@ export const BROWSER_SANITIZATION_PROVIDERS: StaticProvider[] = [
   {provide: DomSanitizer, useClass: DomSanitizerImpl, deps: [DOCUMENT]},
 ];
 
-/**
- *
- */
 export const platformBrowser: (extraProviders?: StaticProvider[]) => PlatformRef =
     createPlatformFactory(platformCore, 'browser', INTERNAL_BROWSER_PLATFORM_PROVIDERS);
 
diff --git a/packages/platform-browser/src/dom/events/event_manager.ts b/packages/platform-browser/src/dom/events/event_manager.ts
index 3264bdf065..4f245aa315 100644
--- a/packages/platform-browser/src/dom/events/event_manager.ts
+++ b/packages/platform-browser/src/dom/events/event_manager.ts
@@ -10,15 +10,9 @@ import {Inject, Injectable, InjectionToken, NgZone} from '@angular/core';
 
 import {getDOM} from '../dom_adapter';
 
-/**
- *
- */
 export const EVENT_MANAGER_PLUGINS =
     new InjectionToken<EventManagerPlugin[]>('EventManagerPlugins');
 
-/**
- *
- */
 @Injectable()
 export class EventManager {
   private _plugins: EventManagerPlugin[];
diff --git a/packages/platform-browser/src/version.ts b/packages/platform-browser/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/platform-browser/src/version.ts
+++ b/packages/platform-browser/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-server/src/version.ts b/packages/platform-server/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/platform-server/src/version.ts
+++ b/packages/platform-server/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-webworker-dynamic/src/version.ts b/packages/platform-webworker-dynamic/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/platform-webworker-dynamic/src/version.ts
+++ b/packages/platform-webworker-dynamic/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-webworker/src/version.ts b/packages/platform-webworker/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/platform-webworker/src/version.ts
+++ b/packages/platform-webworker/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/router/src/version.ts b/packages/router/src/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/router/src/version.ts
+++ b/packages/router/src/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/upgrade/src/common/version.ts b/packages/upgrade/src/common/version.ts
index 0957b61dc8..af66f0fa27 100644
--- a/packages/upgrade/src/common/version.ts
+++ b/packages/upgrade/src/common/version.ts
@@ -13,7 +13,5 @@
  */
 
 import {Version} from '@angular/core';
-/**
- *
- */
+
 export const VERSION = new Version('0.0.0-PLACEHOLDER');

From c4221dad11d0170fbad577e7ca70a0954d68c827 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 9 May 2018 13:03:52 -0700
Subject: [PATCH 035/582] docs(elements): add angular element term to glossary
 (#23807)

PR Close #23807
---
 aio/content/guide/glossary.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 73c801c935..93a93d32ae 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -28,6 +28,11 @@ By compiling your application using the `ngc` command-line tool, you can bootstr
 
 Compare [just-in-time (JIT) compilation](guide/glossary#jit).
 
+## Angular element
+
+An Angular [component](guide/glossary#component) that has been packaged as a [custom element](guide/glossary#custom-element). 
+
+Learn more in the [_Angular Elements_](guide/elements) guide.
 
 ## Annotation
 

From b1cda3639fa9c63a74b5bcf0106ed33b204269b5 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewjs@google.com>
Date: Thu, 10 May 2018 13:34:09 -0700
Subject: [PATCH 036/582] fix(elements): always check to create strategy
 (#23825)

PR Close #23825
---
 packages/elements/src/create-custom-element.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/elements/src/create-custom-element.ts b/packages/elements/src/create-custom-element.ts
index 2bf71864c4..34595baa34 100644
--- a/packages/elements/src/create-custom-element.ts
+++ b/packages/elements/src/create-custom-element.ts
@@ -135,16 +135,29 @@ export function createCustomElement<P>(
 
     constructor(injector?: Injector) {
       super();
+
+      // Note that some polyfills (e.g. document-register-element) do not call the constructor.
+      // Do not assume this strategy has been created.
+      // TODO(andrewseguin): Add e2e tests that cover cases where the constructor isn't called. For
+      // now this is tested using a Google internal test suite.
       this.ngElementStrategy = strategyFactory.create(injector || config.injector);
     }
 
     attributeChangedCallback(
         attrName: string, oldValue: string|null, newValue: string, namespace?: string): void {
+      if (!this.ngElementStrategy) {
+        this.ngElementStrategy = strategyFactory.create(config.injector);
+      }
+
       const propName = attributeToPropertyInputs[attrName] !;
       this.ngElementStrategy.setInputValue(propName, newValue);
     }
 
     connectedCallback(): void {
+      if (!this.ngElementStrategy) {
+        this.ngElementStrategy = strategyFactory.create(config.injector);
+      }
+
       this.ngElementStrategy.connect(this);
 
       // Listen for events from the strategy and dispatch them as custom events
@@ -155,7 +168,9 @@ export function createCustomElement<P>(
     }
 
     disconnectedCallback(): void {
-      this.ngElementStrategy.disconnect();
+      if (this.ngElementStrategy) {
+        this.ngElementStrategy.disconnect();
+      }
 
       if (this.ngElementEventsSubscription) {
         this.ngElementEventsSubscription.unsubscribe();

From 089fe83865976d1ad9f4ba39dc99c19643843294 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 10 May 2018 13:12:30 -0700
Subject: [PATCH 037/582] build: update to latest TypeScript rules (#23828)

Fixes #23810

PR Close #23828
---
 WORKSPACE | 120 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 44 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index c3964d26bd..263151e343 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,5 +1,9 @@
 workspace(name = "angular")
 
+#
+# Download Bazel toolchain dependencies as needed by build actions
+#
+
 http_archive(
     name = "build_bazel_rules_nodejs",
     url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip",
@@ -7,44 +11,24 @@ http_archive(
     sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953",
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
-
-check_bazel_version("0.13.0")
-node_repositories(package_json = ["//:package.json"])
-
-yarn_install(
-    name = "ts-api-guardian_runtime_deps",
-    package_json = "//tools/ts-api-guardian:package.json",
-    yarn_lock = "//tools/ts-api-guardian:yarn.lock",
-)
-
-yarn_install(
-    name = "http-server_runtime_deps",
-    package_json = "//tools/http-server:package.json",
-    yarn_lock = "//tools/http-server:yarn.lock",
+http_archive(
+    name = "io_bazel_rules_webtesting",
+    url = "https://github.com/bazelbuild/rules_webtesting/archive/ca7b8062d9cf4ef2fde9193c7d37a0764c4262d7.zip",
+    strip_prefix = "rules_webtesting-ca7b8062d9cf4ef2fde9193c7d37a0764c4262d7",
+    sha256 = "28c73cf9d310fa6dba30e66bdb98071341c99c3feb8662f2d3883a632de97d72",
 )
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.3.zip",
-    strip_prefix = "rules_typescript-0.12.3",
-    sha256 = "967068c3540f59407716fbeb49949c1600dbf387faeeab3089085784dd21f60c",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/v0.13.0.zip",
+    strip_prefix = "rules_typescript-0.13.0",
+    sha256 = "8f2767ff56ad68c80c62e9a1cdc2ba2c2ba0b19d350f713365e5333045df02e3",
 )
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
-local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
-
-# Point to the integration test workspace just so that Bazel doesn't descend into it
-# when expanding the //... pattern
-local_repository(
-    name = "bazel_integration_test",
-    path = "integration/bazel",
+http_archive(
+    name = "io_bazel_rules_go",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.3/rules_go-0.10.3.tar.gz",
+    sha256 = "feba3278c13cde8d67e341a837f69a029f698d7a27ddbb2a202be7a10b22142a",
 )
 
 # This commit matches the version of buildifier in angular/ngcontainer
@@ -59,18 +43,6 @@ http_archive(
     sha256 = "27bb461ade23fd44ba98723ad98f84ee9c83cd3540b773b186a1bc5037f3d862",
 )
 
-http_archive(
-    name = "io_bazel_rules_go",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.3/rules_go-0.10.3.tar.gz",
-    sha256 = "feba3278c13cde8d67e341a837f69a029f698d7a27ddbb2a202be7a10b22142a",
-)
-
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
-
-go_rules_dependencies()
-
-go_register_toolchains()
-
 # Fetching the Bazel source code allows us to compile the Skylark linter
 http_archive(
     name = "io_bazel",
@@ -98,3 +70,63 @@ http_archive(
     strip_prefix = "brotli-c6333e1e79fb62ea088443f192293f964409b04e",
     sha256 = "3f781988dee7dd3bcce2bf238294663cfaaf3b6433505bdb762e24d0a284d1dc",
 )
+
+#
+# Load and install our dependencies downloaded above.
+#
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+
+check_bazel_version("0.13.0")
+node_repositories(package_json = ["//:package.json"])
+
+load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+
+go_rules_dependencies()
+go_register_toolchains()
+
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
+
+web_test_repositories()
+browser_repositories(
+    chromium = True,
+    firefox = True,
+)
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+
+ts_setup_workspace()
+
+#
+# Point Bazel to WORKSPACEs that live in subdirectories
+#
+
+local_repository(
+    name = "rxjs",
+    path = "node_modules/rxjs/src",
+)
+
+# Point to the integration test workspace just so that Bazel doesn't descend into it
+# when expanding the //... pattern
+local_repository(
+    name = "bazel_integration_test",
+    path = "integration/bazel",
+)
+
+#
+# Ask Bazel to manage these toolchain dependencies for us.
+# Bazel will run `yarn install` when one of these toolchains is requested during
+# a build.
+#
+
+yarn_install(
+    name = "ts-api-guardian_runtime_deps",
+    package_json = "//tools/ts-api-guardian:package.json",
+    yarn_lock = "//tools/ts-api-guardian:yarn.lock",
+)
+
+yarn_install(
+    name = "http-server_runtime_deps",
+    package_json = "//tools/http-server:package.json",
+    yarn_lock = "//tools/http-server:yarn.lock",
+)

From 5e307d5ba74fba6cc7b7a98c7654c07f5c30de50 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Thu, 10 May 2018 22:22:49 -0700
Subject: [PATCH 038/582] release: cut the v6.0.1 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d79ae3ccc..d2bd4b2ce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="6.0.1"></a>
+# [6.0.1](https://github.com/angular/angular/compare/6.0.0...6.0.1) (2018-05-11)
+
+
+### Bug Fixes
+
+* **animations:** properly clean up queried element styles in safari/edge ([#23686](https://github.com/angular/angular/issues/23686)) ([3824e3f](https://github.com/angular/angular/commit/3824e3f))
+* **animations:** retain state styling for nodes that are moved around ([#23686](https://github.com/angular/angular/issues/23686)) ([05aa5e0](https://github.com/angular/angular/commit/05aa5e0))
+* **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([5581e97](https://github.com/angular/angular/commit/5581e97)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
+* **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([d280077](https://github.com/angular/angular/commit/d280077))
+* **router:** avoid freezing queryParams in-place ([#22663](https://github.com/angular/angular/issues/22663)) ([3d8799b](https://github.com/angular/angular/commit/3d8799b)), closes [#22617](https://github.com/angular/angular/issues/22617)
+* **router:** correct the segment parsing so it won't break on ampersand ([#23684](https://github.com/angular/angular/issues/23684)) ([8733843](https://github.com/angular/angular/commit/8733843))
+* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([2254ac2](https://github.com/angular/angular/commit/2254ac2)), closes [#23526](https://github.com/angular/angular/issues/23526)
+
+
+
 <a name="6.0.0"></a>
 # [6.0.0](https://github.com/angular/angular/compare/6.0.0-beta.0...6.0.0) (2018-05-03)
 
diff --git a/package.json b/package.json
index bc78e62ec7..d59fc77785 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 4ecae6449e459e638215a193b6c20aa37587eeec Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Thu, 10 May 2018 23:01:22 -0700
Subject: [PATCH 039/582] build: replace the old publish script with a new
 bazel-based one

---
 scripts/release/publish        |  6 ------
 scripts/release/publish-latest | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)
 delete mode 100755 scripts/release/publish
 create mode 100755 scripts/release/publish-latest

diff --git a/scripts/release/publish b/scripts/release/publish
deleted file mode 100755
index 204be53eee..0000000000
--- a/scripts/release/publish
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Use for PATCH releases
-# Publish all packages in `dist/packages-dist` to npm
-
-(cd dist/packages-dist; for p in `ls .`; do npm publish --access public $p; done)
\ No newline at end of file
diff --git a/scripts/release/publish-latest b/scripts/release/publish-latest
new file mode 100755
index 0000000000..58842dd910
--- /dev/null
+++ b/scripts/release/publish-latest
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -u -e -o pipefail
+
+# Use for BETA and RC releases
+# Query Bazel for npm_package and ng_package rules with tags=["release-with-framework"]
+# Publish them to npm (tagged next)
+
+# query for all npm packages to be released as part of the framework release
+NPM_PACKAGE_LABELS=`bazel query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
+# build all npm packages in parallel
+bazel build $NPM_PACKAGE_LABELS
+# publish all packages in sequence to make it easier to spot any errors or warnings
+for packageLabel in $NPM_PACKAGE_LABELS; do
+  echo "publishing $packageLabel"
+  bazel run -- ${packageLabel}.publish --access public --tag latest
+done
+

From 8a27a034c40f69072e6f6716f07097d681d4a5d3 Mon Sep 17 00:00:00 2001
From: panakour <lefta4klik@gmail.com>
Date: Thu, 10 May 2018 11:18:08 +0300
Subject: [PATCH 040/582] docs: update version to 6 in language-service
 (#20795)

PR Close #20795
---
 aio/content/guide/language-service.md | 93 +++++++++++++--------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/aio/content/guide/language-service.md b/aio/content/guide/language-service.md
index b4d397c214..3f805dc1d8 100644
--- a/aio/content/guide/language-service.md
+++ b/aio/content/guide/language-service.md
@@ -1,33 +1,33 @@
 # Angular Language Service
 
-The Angular Language Service is a way to get completions, errors, 
-hints, and navigation inside your Angular templates whether they 
-are external in an HTML file or embedded in annotations/decorators 
-in a string. The Angular Language Service autodetects that you are 
-opening an Angular file, reads your `tsconfig.json` file, finds all the 
-templates you have in your application, and then provides language 
+The Angular Language Service is a way to get completions, errors,
+hints, and navigation inside your Angular templates whether they
+are external in an HTML file or embedded in annotations/decorators
+in a string. The Angular Language Service autodetects that you are
+opening an Angular file, reads your `tsconfig.json` file, finds all the
+templates you have in your application, and then provides language
 services for any templates that you open.
 
 
 ## Autocompletion
 
-Autocompletion can speed up your development time by providing you with 
-contextual possibilities and hints as you type. This example shows 
-autocomplete in an interpolation. As you type it out, 
+Autocompletion can speed up your development time by providing you with
+contextual possibilities and hints as you type. This example shows
+autocomplete in an interpolation. As you type it out,
 you can hit tab to complete.
 
 <figure>
   <img src="generated/images/guide/language-service/language-completion.gif" alt="autocompletion">
 </figure>
 
-There are also completions within 
-elements. Any elements you have as a component selector will 
+There are also completions within
+elements. Any elements you have as a component selector will
 show up in the completion list.
 
 ## Error checking
 
-The Angular Language Service can also forewarn you of mistakes in your code. 
-In this example, Angular doesn't know what `orders` is or where it comes from. 
+The Angular Language Service can also forewarn you of mistakes in your code.
+In this example, Angular doesn't know what `orders` is or where it comes from.
 
 <figure>
   <img src="generated/images/guide/language-service/language-error.gif" alt="error checking">
@@ -35,8 +35,8 @@ In this example, Angular doesn't know what `orders` is or where it comes from.
 
 ## Navigation
 
-Navigation allows you to hover to 
-see where a component, directive, module, etc. is from and then 
+Navigation allows you to hover to
+see where a component, directive, module, etc. is from and then
 click and press F12 to go directly to its definition.
 
 <figure>
@@ -46,53 +46,52 @@ click and press F12 to go directly to its definition.
 
 ## Angular Language Service in your editor
 
-Angular Language Service is currently available for [Visual Studio Code](https://code.visualstudio.com/) and 
-[WebStorm](https://www.jetbrains.com/webstorm). 
+Angular Language Service is currently available for [Visual Studio Code](https://code.visualstudio.com/) and
+[WebStorm](https://www.jetbrains.com/webstorm).
 
 ### Visual Studio Code
 
-In Visual Studio Code, install Angular Language Service from the store, 
-which is accessible from the bottom icon on the left menu pane. 
-You can also use the VS Quick Open (⌘+P) to search for the extension. When you've opened it, 
-enter the following command: 
+In Visual Studio Code, install Angular Language Service from the store,
+which is accessible from the bottom icon on the left menu pane.
+You can also use the VS Quick Open (⌘+P) to search for the extension. When you've opened it,
+enter the following command:
 
 ```sh
 ext install Angular.ng-template
 ```
 
-Then click the install button to install the Angular Language Service. 
+Then click the install button to install the Angular Language Service.
 
 
 ### WebStorm
 
-In webstorm, you have to install the language service as a dev dependency. 
-When Angular sees this dev dependency, it provides the 
-language service inside of WebStorm. Webstorm then gives you 
+In webstorm, you have to install the language service as a dev dependency.
+When Angular sees this dev dependency, it provides the
+language service inside of WebStorm. Webstorm then gives you
 colorization inside the template and autocomplete in addition to the Angular Language Service.
 
-Here's the dev dependency 
+Here's the dev dependency
 you need to have in `package.json`:
 
 ```json
-
 devDependencies {
-	"@angular/language-service": "^4.0.0"
+  "@angular/language-service": "^6.0.0"
 }
 ```
 
-Then in the terminal window at the root of your project, 
-install the `devDependencies` with `npm` or `yarn`: 
+Then in the terminal window at the root of your project,
+install the `devDependencies` with `npm` or `yarn`:
 
 ```sh
-npm install 
+npm install
 ```
-*OR* 
+*OR*
 
 ```sh
 yarn
 ```
 
-*OR* 
+*OR*
 
 ```sh
 yarn install
@@ -101,7 +100,7 @@ yarn install
 
 ### Sublime Text
 
-In [Sublime Text](https://www.sublimetext.com/), you first need an extension to allow Typescript. 
+In [Sublime Text](https://www.sublimetext.com/), you first need an extension to allow Typescript.
 Install the latest version of typescript in a local `node_modules` directory:
 
 ```sh
@@ -113,7 +112,7 @@ Then install the Angular Language Service in the same location:
 npm install --save-dev @angular/language-service
 ```
 
-Starting with TypeScript 2.3, TypeScript has a language service plugin model that the language service can use. 
+Starting with TypeScript 2.3, TypeScript has a language service plugin model that the language service can use.
 
 Next, in your user preferences (`Cmd+,` or `Ctrl+,`), add:
 
@@ -124,13 +123,13 @@ Next, in your user preferences (`Cmd+,` or `Ctrl+,`), add:
 
 ## Installing in your project
 
-You can also install Angular Language Service in your project with the 
+You can also install Angular Language Service in your project with the
 following `npm` command:
 
 ```sh
 npm install --save-dev @angular/language-service
 ```
-Additionally, add the following to the `"compilerOptions"` section of 
+Additionally, add the following to the `"compilerOptions"` section of
 your project's `tsconfig.json`.
 
 ```json
@@ -138,25 +137,25 @@ your project's `tsconfig.json`.
       {"name": "@angular/language-service"}
   ]
 ```
-Note that this only provides diagnostics and completions in `.ts` 
-files. You need a custom sublime plugin (or modifications to the current plugin) 
+Note that this only provides diagnostics and completions in `.ts`
+files. You need a custom sublime plugin (or modifications to the current plugin)
 for completions in HTML files.
 
 
 ## How the Language Service works
 
-When you use an editor with a language service, there's an 
-editor process which starts a separate language process/service 
-to which it speaks through an [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call). 
-Any time you type inside of the editor, it sends information to the other process to 
-track the state of your project. When you trigger a completion list within a template, the editor process first parses the template into an HTML AST, or [abstract syntax tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree). Then the Angular compiler interprets 
-what module the template is part of, the scope you're in, and the component selector. Then it figures out where in the template AST your cursor is. When it determines the 
+When you use an editor with a language service, there's an
+editor process which starts a separate language process/service
+to which it speaks through an [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call).
+Any time you type inside of the editor, it sends information to the other process to
+track the state of your project. When you trigger a completion list within a template, the editor process first parses the template into an HTML AST, or [abstract syntax tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree). Then the Angular compiler interprets
+what module the template is part of, the scope you're in, and the component selector. Then it figures out where in the template AST your cursor is. When it determines the
 context, it can then determine what the children can be.
 
 It's a little more involved if you are in an interpolation. If you have an interpolation of `{{data.---}}` inside a `div` and need the completion list after `data.---`, the compiler can't use the HTML AST to find the answer. The HTML AST can only tell the compiler that there is some text with the characters "`{{data.---}}`". That's when the template parser produces an expression AST, which resides within the template AST. The Angular Language Services then looks at `data.---` within its context and asks the TypeScript Language Service what the members of data are. TypeScript then returns the list of possibilities.
 
 
-For more in-depth information, see the 
+For more in-depth information, see the
 [Angular Language Service API](https://github.com/angular/angular/blob/master/packages/language-service/src/types.ts)
 
 
@@ -170,7 +169,7 @@ For more in-depth information, see the
 
 ## More on Information
 
-For more information, see [Chuck Jazdzewski's presentation](https://www.youtube.com/watch?v=ez3R0Gi4z5A&t=368s) on the Angular Language 
+For more information, see [Chuck Jazdzewski's presentation](https://www.youtube.com/watch?v=ez3R0Gi4z5A&t=368s) on the Angular Language
 Service from [ng-conf](https://www.ng-conf.org/) 2017.
 
 

From e129b18d17a5aeb2a7d0f7890930b738a49aac4c Mon Sep 17 00:00:00 2001
From: Cory Rylan <splintercode.cb@gmail.com>
Date: Thu, 10 May 2018 19:27:05 -0500
Subject: [PATCH 041/582] docs(aio): add Cory Rylan to GDE resources (#23840)

PR Close #23840
---
 aio/content/images/bios/cory-rylan.jpg  | Bin 0 -> 8510 bytes
 aio/content/marketing/contributors.json |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 aio/content/images/bios/cory-rylan.jpg

diff --git a/aio/content/images/bios/cory-rylan.jpg b/aio/content/images/bios/cory-rylan.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c9410f3241b935e4857185e27e3f22be096436b8
GIT binary patch
literal 8510
zcmb7pWl$VW@a5vV_~P!a0fM``EKU+M=mvL!ySv-si)C>qI0Q&=_W%Kc2M888e*deh
zyRX+%HD7vqYNo2^P4{~*%P-piJXJ*%MF0W<0D$m10559*IRG-!t0De3BO@cDpkkt;
zqM)E+qhp|9;$Y+A;9vuRxcJ0`xOgCZAdrxp5JW;sMn;B9KtV-8N<~acM*80-2(O{2
zD5zMds92<UKs?g_Z+jU4;G+Yo0Aol9_y9zF1SEWfmmvVv>p78;{yXmfF%%?ZR5S!c
zbO6Syn;Ze~>imD*00cy&*E_td0<e(~0El=<c&~wbM2nVH<|W6uHOdMgdiv1GIoIQ@
z<VitCZtM<YxPa?JdU#dQd<B=4;dhk|+dL-!gm!%5KgIf~Wk=}KWreb^7W>E4=J13F
zX}|nRI;I-xpEV|SShR-?h?YDBqxJ7f9?EAehZT2tzk`vbv(ei(%LG+pa^<|48W(sK
z<`kK6<uy4SK;@i2l<b=jX~WPfa4JOiWrU<P=+q{ixzdCpk67#E{{q7l*O1$|WJU5m
zw(Lx7#@VGc$*pc6veWxnN|uCW+ve~t;p?}l@0BgDdR$oZb46CE2&|!Zi*)(P70vn*
zcOSRNg5vDv{gdmh{)P*`^JA!t>^<JYccf#Obok};cP!Jbh98}UYr@;1{`=>($Gq+e
zb9Um>QJ7AiayY0|oBRGAt!cdS(Fd@;$Ji)9*nO*kk)WDx+*w`WCl+P9vosU%93Mwr
zslZ7d=JJP71CG={t#x);{ka$YJ3O3PR@Ok!O9C&|j&^r?uQ|v4^1&P}%GhpY&@rQV
zvuY(8gWn32MC(T_=)Lf3#LGxk21#4d(}f~Vr-5YinP*+EN0LcnY47GQO<njl4q^ud
z#XFyyth`A3jE`+ZE!9I?6rR4*n&-S4oCxFO&6`4FPngjoe*cg!daor5KZ^dnGdCPP
z=1=%7!58~!lykJcf3$opx5kO%)aQWgRK%frj=9wxw{qKIa3w*8bf(`#Ku46s$EVL;
z>>Dhxh<$3Jtn4_{N>!TVlRN9BsrWTwJ#B_(o01fV-xkjS&7>W6#n{wArSx<l;jhOH
zt^O04PVo-wLwCu_3ESBI>UU|Ek=m}g=tA8(Z%=onKK+D>?QBbA&y#(um}jNH{i-W?
z-azx)#Qv)~j@9}RgiBggV+5?cqf%+}iI-$}s-XJ~Ny&CxQ$Ovb1Gf7dHaLeS%*9`D
z`8f#AlTha4IUG!7yAp1b&<=rl7O5c8c3oWxH~q0+v@}jmmfiqX>JNu-8Yop|XmyMK
zaAHzl!)afUo#JGh@3H*qnVjPLZ8JdZBw+8O`nO;Yo2We*AcHzXe|g>P*Da0*j=ew>
zwzfAhb{{1wMZB;AuSmv3j8G76{v18`iRJynWeh|~X3NGPLNCeS<hc5*2p!uucD}Y6
zf54njhXwMw>$q8Lev(YVRj6q073C=nE9{}6Rm_1`bBADGC>JYW3nws_hh|Ph2IFs0
zN@iL6Zg#od2bD$w`>48#6#6F)(-XqxbtT@tm-KXz_3NPI%fnRWPC^bv-cQ)Xo;WmB
zp*JpUr9rC}+PQxJ=3<(@5VDopwUszMQQ=&8!R1>lYNhRU54Cfly9P;D_%QOaaDO}e
ze$xHT{nnIPtBv{Kx0Bs;|H$keL7w#iKl@d&To!%ir*N@_3r7*yrUUBQJ<`l}igbL@
zE0oCK0T5n65D^Up1q~7HKfrl~4<uxK6aqRvLK##%dVU=XSE4tvZXsw4g1RXnVn%@y
zc)#2XEt9-u=+4FEE8?KP0uh1~0ub3Q4DW*s%%0m#;Ml;NNK|+dl+nn4YmiCkMG=90
z#&AxNwLm@=F&G3BT%{27x4PQ!w_2Z7;yP)c$-C8Cr5;S#g4xmKMrbhGT8o9>aB>EY
z&scX+J{|&-+Ych-GrwsJWCWW|ngdkK+kbr2hF06ptP*i53}kAB6zK*ZC*3DeJ5XHm
z-&L18$*B><C%KBIhA={Bjf;i<7+&@kVr1EWIY|7K(ZQS+czdCdGvzy(!xZf=0%<}M
z`e|dxtn8Ms0d;q?=)31g-&j!cEn=0<JB;oOkglB_{vkguLftBKV{oaN`PN7d(0-TJ
zlH4<@TN)=I&7iBthIDS#JATb$_oLXslgEnpvT+;lVu@u|{EEbD3_jByWxv<Rw+-5G
zg+H)bqr@s*vhauj5&avYit?(vV5Msx#|Q=4zm2ts(f|p~4yOvkLdaR^AJbR_inV(E
zMP$$jWXfLv1LdWtXX6jWBSZZAT~V=<yI7o@C6Vlr`6s}5h;v(RZb8114IKE%e^_s3
zEB1XCDLOSHY+d4Oms&8&_3F`dNBlw`%o<_QexdAWmuSYNypLWP(~EclVwU_QvL&VG
z4K_b~mWK9PvnRA*t>y$K7cvdSKPm5t4~&^W28w8%WO8x7?br$%Y0`|stY!4BeNdyn
z&aSPf%qY38FRmT;c`|;q{~~yMaEkbEJ*Bz9-X6ZB>CjZ#)F08SgTFVDr0-%}OxFY5
z{i<<aC}UtjFo;#!R3LETJVnVaSMa?j+qre0KfY1M>(7S%EXk%MwIR-D_D)1vt0!P$
zbzh{^fgwhjxqeXP6$-%^=1vLu4jqB@>*od|`&-hB1jeFb9ArI7RD)j2#bY>xGDiYM
z=&*QP76zPK(52_95%l%=?HW5uT@1gBIAHI$34OWJ-ANI-QdV+ae<Hf0L`9%50brJv
zx{!uo!+Q&5EPH5nX2`<)BfxV}N({op?Zk#JfGlOHGb%Yxy^W|nj9mIPr?754Cvax4
zL+NLS3e>wwfj6Cjs+9mKtrq|>;!_&D?x1=jmp5{Z85*LgK$Q^y%uPADL^062s9}s5
z{3&#$%R8*4L$)~U`F-0eax0lOvQ7au+{HX`9~zL85E-KPI3Z!+tk!m=KXL}Y*!TeU
zt{N}q(*M-W#gOY@w_pU-7V6v}F72#NohhP)rxoG5j~=i$+XyC11$FnC6@81_)6k*t
zqX(rpa2kCki~$$fRhASQ8J*274@f^0ucf)BZ+>IxNbXKlD>33slRIsZn7B3Fg(5Tn
zu~v_M3I!x|f|3ggw-)^MgK{v)btZC1nt?OPrk<N5Sj0@tZcpVZy0#euf9d{SgU_az
z45MAhxy|*0=y6k!V7RoV9xGFIHltT&pO{eXkF6pSx(c^vj#US@z3`(3qh{Bl2<7<Q
zSaKffv$tmiK)0*Pjg5)~+h`*t6+cy%jW5q_!t`RDh|y0kVD~ULVx6|O`)|2nAa966
ztAP196WGG2B8N}z6Lxq|hMGd$<qLq6F>IrQX2v3|TQ~CC)h~Cp1x5!Cqf8bNZyXH%
z`@72PxU%$xy-vitPZzDXm|+zaDn9N?=?^RhGBGplL)#j)vYfn@Eqp~Gdqlr-=&RDq
z&4jmJ>j}Jon68p4gJT4XBq!2g&hxWT0qW1;ASCxCQLV_Yq3~}$#}+<Tz*9>D!YH-J
znUiy>rQ_@gMbb@Gs0hE8H#l2}$z1oDn~o8CkNySV;YVm#(BMV??(5T{#LxY}nZY}s
zI4Uh$rSHPxd47cdGANLk$suq(JAaA-qU*W0?Fd$mE#FbT7Ga@0%9YJGSldPvXBll$
z);-{XB?3U8!r_?NrfA;;r7Ca1h#hBWjr-B2k0#Y@6>qLdeeQf~EfT6XiSVd-)+#q)
z<m`tT1B*L%*2e(hJ>scr!{e-t;(I^n=CCnwovd|O?x7d$x)Su-{h+Jej3r=dMwE0v
zWH4iRL4pLU0{n?<8F98$BmONL+vxtgiM$zd)>2_wg6dV|Ht=beVjj_xNTXM_Td5MQ
ztzk1>pS27hs`6UJc=`YUNi*a_v#USYS!u+9e``Fjau=VR)nx?F{OQ*{Fv_g(H`>I4
zzsQ@Gfu(oK5jMBxF_H80+l{^J?|b78C|&^aht{bKDce#xm*C?5c(nH0I47`J*fM5x
z(t?{75VEhqp?3Af4`#4#u0=z@Pe{GkE&uv^FNXCb#%v3#v27wlT*a`U$4<DVXEjxx
zxd>I+4_7y0>`$ttB(R1db}fh@(xEt7rD@N1+^kwpTenFAn)i}aF><Dw&YW5}C>}v&
zcM!2CAqU@F#x@8;iM`Q0oNULRa>>C2OxL8W(<53LIi>1e#MhM&nkl0pP{tyl`K(H5
z)N&t&i}MJpg^*TH)bs35$>=+BI>}JLe4|ggJUM&vD!XEz@s{`>wMSxdDKXjni~J?}
zga;&F-+Y47T;1RuDQ+sYgq6-B5w1ToN|L))oJMSIw*<vtMW1KNhR)Pbu;^o4Mdu{<
z1!fnK4M()^shhT?U<NifBtKYp&Ome2Ht^;PLvC3)tc;9$v`;v(6<h~%_0Z{0`~EG`
zz6xzKtQVHpE1I$*QPP%MXxd_UU5WWMhfBe1ia&9J4${Cu*pNju!tRRE^{2c0pD%lm
zd(}1O@!?}Ub%fh7tCyD{T3z@h#c>VWpX+zbKJr^9Uveu&^P0taieMG)bs2kRCm>DI
z)qLG6$J|>?ammiyFT*-U9%o0kDdTcs<4o~jk}d(<TP4&XV>L>+^6YyHXNCHjFHV|h
zMv?8A2ju5_aMd<F1Aoftj&m_$#}~j_tt5G_>Pf2jS~ncCbr5OOjGUAk0*C#8Gz6MI
zo-vv0Jr-yc8&Gp7yZ~g-mS8V{3$q%Sfh&jQhxv}}ApK*@r?&#1hihSsX}H7rlRw7W
zG2`%3y;~KdP#sj<Y#EtGNtJAhZIBD*YZGA<?tA)_c1+E>qAYiA9Jjr+BQ2?lR9S~L
zuBsjDYwhwBlaOjQ(xVOiTl1kq&1aZB1$NWKR2j<by7T-U)-pBr0(l_O=5O3eFi+?F
zQ)%sI8ibqQlMR8Hx~&J1HKiWU3$yE@Sl%$Qe{*P-6J>WUo>DDB{|YZ&0PLCW$hK^@
zKu3+?R`1Ztsw$AB;_C2f{<qL7V$`fC!t!%Z?m%EzH%Z(3Mw83BHuaDAt1Y7k;1=0j
zr1aY;Cevu|$)wq(AG`2;g`1nbEXsrxwX@`Ze$^7IrTbJ?7l)twHh^01FhbPgdgX?<
z75lfoY5WM*^AMc+w7x`Qf2r^+!(LN**Yl>sT#2y|C*BtATC1{<#3qwuB!F_3WTj2X
zp>kv;QH#umlVm6Dxiqn;SYr=l2COO%fRN+cBwB#8<<Cgmt5v$*-xG4EF}wW8=)Qgh
zWpF6Dfy&VI$(jQQs9X^GEAU2<)P0M?1DxShnK*?-Ih<{ocCP8@b^sTbmBm6za`ezI
zJS741JyQpzdnOH*JXHMc{8GzZN<5UKhLgb3!onP(r-BO705Oq`Q<?xFS}`|l8N`sL
zwx)xss^4&ymF7fu6(q4%%q-{|C-?V;blG7ws0kdAV_^&lA$8;cl-le@#2S}7_M;-~
zlgTA4P{K7qXHHTPFo-Hlhx$8p9PSW|_1CTH7h_AFAz}`kQKRMjgKo66z;l?b5KU<r
zar^oiJl{_!zc#Pu`y;bOi%|kllaAM&t=NKLcpn^vxc)WFIkqut!|LHiH)-csQnU4$
z0=HVuGs1(AAhT0=*V&rrZ`Vpb3H~8S-D6&Vw=fe`58lNWI)PCMVTe(lVO9eux1525
zl`h66-r1G-k9>DWXv7aGCdTNezEj^og1VSO;M9pbZ^xebGwNxL#O?H703V5fK^HA)
zga7n8(HP7t*qC}iB(jHe)w}Z|bL})qpJps`*jOnjIf;1?2XpHOT-J57g(^}S?MuX-
zyI@;QcQo14`n>|}j*oKx7J?L9JMD6}tOeHcS%jbG=l{&93|2*4N?rAoft1c}q*zRY
zu%qwO=U}fL1T)@i$AE~4fQ<Nm2nz%NJ{_Nojs>1;NJ$F3f97K6|F#KuU;I+y{&MAp
z6d&mR!r+QRA6hb)EXE<rX#0hb9-+g}cOaNeB=a_r7PSgFt7;6fTS+)A<3I|~ZGn?-
zriRjObEOI)z`{zy`|vK|jB}TOeRI+qf0Vx5n(3Vu?bpMw))l_0b->UfdYB$6pLFFZ
zF@{h1d=KfHb3y?-2!t=HStTw+QM-ojOZrlGsj)@g$L9ee>Bd^aP;%y`CTtn$Ly949
z0?ydH2Y=PrZ3Urz@1uEXvv2VsWXxlg;lX%XmgGl<fs?L9iZCJU$nMcSc0KPC^_9ls
zx;UG4%|uBnT7FZaN<QF;iQAA|v=c?$mQwQ+G>y$>tB6oC)%(jXsw%k~JH|Jz)pic=
z8x(lL+}ESq*aRJW6yx-uY_zV@qxcg2wX}}<pB4lbs*R{-1+HvDVws{22&xSq6L)%$
zu_?m*YB2lK{$euQ6dQ?+u6IVnmS^708#_UNkv5F-Ldr`a)kTo|A-q(ed%f#+kHM58
zhpq&Wy)wW01|KVUyB_C0CxG6<S}I>UQHOT?d@jaDmA_{Wj87qS#T3wdV-8<H?1y^w
z$neV>EK(XqYt}QL6v$_Mz<W~$VzJz?Ye!KNT6h8cCQD6C;47V2x1)3QWfshd^%@{@
z4J-0tbvS0Nh^zTbD|sF~P+os@MtruvYN#?@xhwG<z{%8cSoV~{;efg9NWGGjL1f?W
ztL0`&3*eJcl`{To@y40VcrUoAv?#_<fWsSw+8!Vh8PXojR$Uk^smx}wJbXr~W9Pac
zV@pCqj~5(m@(BrDmv#nujE8xd3x!#chJ{K7ND7(_(gsGRevm%<*=r9@;y>RuF#+`j
z%2^YMe|4wV>qapX(S2h|_X6PFUT_pRtP*hSf_lWIrf+{o<E3N6$%kuM_KD>CT}76^
z`wErlDR*g{)Hf~_$e9pMuQNZU6s~8twCE^9QiP_--wrW%(=TMPG`mKCbHif8^^W*Y
z%12bJznN8Hoa4{nc35`*d`xc#I08|FmV|#B;2^W3?-A)_^+hN0sW1Lqbeph@G9Z`}
z3GWxQ8+x~`%3a)esJP((^h!opg&37AE*J$Zuy=Hv53On>$;Ns;WOMRSI?hd4WV@`7
zz*s|}WcbVcF6)}r8kB~2IS`@4fTfx#1>Hm@J~^T?`X^2Sd|B9~dzM(Vws&4qtfd7$
zUWgp)xc>C&DMai3EqOALaZH?aX#E~<eDo>cLw$JJ!Y{&nTQ`6dr$5y$AdGpKBM=^>
zM{d4subdhD)!DaQbUF?wZ$lThYGPD(jaXjcxB2xlv!~d#HIma;AJ-arKVCa{Ek+Hn
zI@P(Zu|}0MQfW5ZjLHI-+%V=rKy~O3s!G%@@owXj{*V!!kdLV6+o?t#VIP@Yq&mcQ
zt!CdSM^C%n%0K^skcKZCB<;Z+*f`(<D9&U>DfgOqe+yyhVj23T+KLcj=ms>$iT<gO
zC%nRW&*;#o8+~Jjnn5$$nUjkiP&3)fUZcHWgX8R~pSo2oW9F({8O6B9n-fHWW&$zR
zkN)F#AXYszrbhHZ#kz9ZbQ~l;pa^5iSL24GIDJg;Pj5JvMA{c1se{%3!J@jw*DnHr
z8167EWJImz`D&WlkC0mzp|jX9b$*K>q1KYl9Nh*p{s`14tr5$mT3DkbX{<KPDA)34
zS{Rt)DAKTma<Iq$OTd|~C5r@Gs77+XZjr$oUwrps=l;z{MEZEc`>?m7f3u`?Fd%uM
zyhv#}XuwyBri|o1se$eyG(K!nUkGnyb`l*2Jc)$nVy;)Z+!5H2#hy+rPcU=yj@z-A
z$nV!Dt22VSHqHajD%OoQ>I1@xQ-NlWJ2g@zzD~CR1^X<nMQ(|Kr!%IrFg$#$`DUFN
z{}@I9@JTeJcHYq%iGi2GP}|DhUZ9X!yB*6ERn`y`S^^Wh7<~$+BC@$mWiG-xy<tf2
zTi;w2II2za8B+}-O}B{eXtBYmjV?za5e^G#XIc%pTbL635PZg}umTyBYNTH5B-^a#
zF_$50C6SyiG2N(sc90;fMBg0|*50?#Hs~!-Gg*#dkLoU-!k+s9V!rI(A5zt?@pMEB
zh6Z)4QGE@mT0)h|B`bpsO&}!xG~brajv>&mgMHpbM3hm(M3!U<2NLuCoTR!#rdkSm
zAKjtj4vyWg9HM};0X0HnDL5p~NM%|}19nJ9X`4c|{~Gyn0czXcoE)=m2keyf>|&Z%
z?ZV5ejzU)vG8up{!?@7}>H6{NgGXD3c+0J3$$vx-dU_fUNMbSGNaDrec=}%k<?RVI
zSr=uWCYC{{97Vi7E_h09!bLGY+G?rwn*0xfTq6qQN4wUODUdAN56Q-3YAr6Ga#i#b
zmVQd*+{rR+r2i&X`mFF6uDbLBC<8lRuX;%C9P(uiBOh2sm_hkX)0v4SLi^;nl;MKx
zK2*Ww2BXn&b|rejRfhg?Y*qc>!#YJAeM9cwc~1l2u0d;jH<ubInrPXq?kd`i2>oNO
z7I~yFPYrvX?4=kP7x6M9@z0y-b-!+vK2>b&q9IJ`mah+tv3L0+F6GNi^~NIoLI7oV
zn%<%{;@j2F7h!OaBoe!vfQ*At-;;)B=+a{-e-EJi@DP{g4A0smw_{N*MaFA|jYdB(
z@w<^Ib@P7N6Ab&&t&XLD_wzAHxjW(=#<>&bwY~mdl+=~ZpwH<aUjTCp)h<%aU22;W
zJ-|_cB;R)rA|DVtJQGZK=(o0W<Pk;|;tSoL1%UM-zF=R0>v=^#*<Y65wL(clO9A9a
z@?3LH#d(bssxmb=V?j&plI>00=&T5%zY{Uk4Mr*ld3aTAQuBfuhvVN6Q*8+mTouTv
z+u_s+pqtfTs^7fncs}QiY_XI29KK`QXYJ|ml!c~I%RPm;a6DhFzFA`6@Y{Rs4<UVt
zxKKmf2=mv}kBwuJ62X`lnXsNQ52x(q;A!;Sb9J?1xWz<vg5h4+Oy^MLkBrbag9fw^
ziY@e{avw3Ns@u%v%I3Ep&R*#`9c;-7041rBh2UA~g~v&pN?%!WHqzYEMb<j@>>%6v
zf0fd!!t<Z~r_dn%Z(#=k5g(5ZiI0F5Sw@EtC4`>W;(rKLL<9sW05tZdR)k@!gLoo2
zkEl<6Zi2OR^h9Cz;-4r*4;_PAE!?tbx@d0FWynrzrIQN|%(^qS3W_L*gGTpNM(-T-
zl$|Rn%&;+xH5+9w7i5}aYsm-F7(sg^Pj}tRL{9!V{ShA?3zAV!qC3bgw<cFOpLqdH
ze^*qQIS^Vd8#;8ebkchuYLmA;iH~R;jcqpej%5ubRyoXJeEdebQDmfBp=dBB8GVXw
z6Af*$`b{JM0>JP*^64Hv37w%T`Mf)vE98{LXjNe{%Gl~$$o+%(&7#<Klr?p<$CrNx
zM<O^7UFUr91p7pj6)w2IIQ9EGk%s=pvDuTPI7+-yd7<!{8NVwC5W^|1vSj?N(dNhs
zS^3I80wu=X%}k$p)3p*s?5wAE*=0H7V?RMkgZpV&@dfGPJtbn-`(g39BuCyvDxkQB
z0SeBmpz@}qri``HrvRF??9OX7#p$-99Go(p(Z%s3Y_)Ulq05opZ|VDLC%Zq*Ty@^H
z{eH`)P@#!~lQTTS<m6)?=MYQaba<#RD@j7&JoN%-@Vr0XEo%*g*Tu)1itBRGPv@4D
zjVnf<#>KkZD^R*z#3pTD{ehm(9rmP}GKXK=*MNGHD3*7p(@y-AD7{=qN8T7+UHYCZ
zGR?5SosAYsMp70NZnHbcPibb_YFV2?N$9+zvZ6-s-ck#;8np^4F;t0B&^~|p33Y`Y
zz5r}fK$fPZQ3;Cl=eRtabK->Jc6RsTF+8B~qZKk{UF)CL?SG-s17os@+#FuRCEhVM
zNgyk5jQfbh*uni`ZYZJi8i|~2`?XRA_mqkW6X8%eF4JBKfhag)llr|CYi#M>RWFm>
z{yk;tX{z%rSG1afMTyDbbL!!hReoVoY(olP*(0SC3JIke=f~HSX8SLt5ndJ4|Eov7
zrZm#4cz}#2gF;BFL(gx)>ly<8pR9geBL!$&2~6eaDv@cDHOnA?>Z>XiK~?I<E{v<3
zEY<B?9UBc?=uViKOcVYEym#zX!Uq=m)5UIX)VjVspMa+Ob8TP{X_wxDlPod?_r0>L
z`P|-*J}CH-6EyOA*xT?aj?`Glj*_$5DQ7G{(#54FJg&TQNYy|AVlm6%7M+vQWr=cq
zEuaf0Nk1p2kBLNUi~`hQ=IM0QF4Nc!E;-SP{x3OkEsmTBpOptG;Yx`dsxAMetS*V5
zhTqaeWi(yVzwxh#ocdNbxOZl6=!tX#N>3)c?6AB5qa;*RKCuRma}{_8wk!0`>ws27
zy)3resn;^>6f$g_41F(b_HwHO$o}DV4HE5lYws>GAE1AxuPWR%D?BEe;~tuzkX@hX
z&yY~hTMr^9u(Jy{D}#1tKNwjKrJBwxS!f)`R9@*@y^o%wmO6x&{no+eDUknQuR^GC
zp)rL&#VE3pWjihwgz9s)LCTn^+;_~vc*)L^(4}s)IyQrTDm#+Oznh*pdCR!}kJmC&
zP}hrTd&kK({U=2%{0F_)q@Qgy%qlEq?t`&g3zOYVV(eQhG6nFH!Nxs%ViNnr-0(j#
zDp5IbN~@A9#`}~(3)u|#sB;3B#1yELl3^c%TPMrI&%?na>HT-u+wMP?ogW!w1A8c{
zW;ccR>YaWx*N)usaoDDP9XlUqU8VQ8is0byS{{D;A+p1z@4-`KKaU~*=_&0LZp+y?
z%=ESwn{20$9Qpz{S|}@vhor=mkF8#?1tu|m9)6oTmP&iN(w}OIVU}cc+#(n$&i&cR
zG~Go=Q8(%Ma7&eMY-D_|9_Sp)pA{w_Mb>JnDBfC~!<b5<7l%!G@b`g#&pj>g&sF`=
zmIDbx(sr~&yp!YAdSq3X!}Om4sYa-TmxLzIXc~=S68)!8V+O9|R*#QkHigx~&+6-q
z6wL~s--yLmg;%GHyU|JTXqP5&2EAS3Q61SBP?XXbjpZ6&$tb%X)?q96FVHlJ@D19o
z7@A<+Rs^{#Cmz_{bLy=Rzqz&k$od(2T-G7~P_3b>Z=L&2iK|6GNJ)fR(u4kRe#WMN
zm`ubmfS$)qMTIa-q1m#4f!fA2RxOR&LD8($W~w#g8LMz=x}bjg=vUfJ%-n+`m^0}G
zfCi#U?jWj8Ame?1%*1+1Pq_S-BTdNSCxlyf8?uq{$1Lm1%B)4Ay?q+*b#_UoY<VMP
oE8|Je#ClI0W7<lMM6|oyD2<R3ks<o;a-*7))&!f%KQAl)3w7Do`Tzg`

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 73a65bc3ac..27a0fdda58 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -600,5 +600,14 @@
     "website": "http://www.angulartraining.com",
     "bio": "Alain Chautard is a Google Developer Expert in Web Technologies / Angular. He started working with Angular JS in 2011. Since then he has worked with all Angular versions on a daily basis, both as a developer and as a technical trainer. He is the organizer of the Sacramento Angular Meetup group, co-organizer of the Google Developer Group chapter in Sacramento, California, and published author of the Packt video course 'Getting Started with Angular'",
     "group": "GDE"
+  },
+
+  "coryrylan": {
+    "name": "Cory Rylan",
+    "picture": "cory-rylan.jpg",
+    "twitter": "coryrylan",
+    "website": "https://coryrylan.com",
+    "bio": "Cory is a full time front end web developer. He works full time building responsive web applications and progressive web apps. When not building web apps he is busy teaching Angular and other web technologies in workshops and conferences. He loves the web and is optimistic of the places it can take us.",
+    "group": "GDE"
   }
 }

From 474dbf09ecbd2dc4eb6a17cda3b1914f92e96e6d Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 11 May 2018 12:20:13 +0300
Subject: [PATCH 042/582] fix(aio): make background transparent in 144x144 PWA
 icon (#23851)

Fixes #23827

PR Close #23851
---
 .../favicons/apple-touch-icon-144x144.png       | Bin 11318 -> 0 bytes
 .../assets/images/favicons/favicon-144x144.png  | Bin 0 -> 15734 bytes
 aio/src/index.html                              |   4 ++--
 aio/src/pwa-manifest.json                       |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 aio/src/assets/images/favicons/apple-touch-icon-144x144.png
 create mode 100644 aio/src/assets/images/favicons/favicon-144x144.png

diff --git a/aio/src/assets/images/favicons/apple-touch-icon-144x144.png b/aio/src/assets/images/favicons/apple-touch-icon-144x144.png
deleted file mode 100644
index fb45359f5fb4fc735d94072b0b28aab72d0390e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11318
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

diff --git a/aio/src/assets/images/favicons/favicon-144x144.png b/aio/src/assets/images/favicons/favicon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..8488500f26ede5e1bb9cbd533469d463e99f0b60
GIT binary patch
literal 15734
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

literal 0
HcmV?d00001

diff --git a/aio/src/index.html b/aio/src/index.html
index 1af0254c74..7e8e5b6f95 100644
--- a/aio/src/index.html
+++ b/aio/src/index.html
@@ -17,8 +17,8 @@
         sizes="96x96">
   <link rel="icon" type="image/png" href="assets/images/favicons/favicon-16x16.png"
         sizes="16x16">
-  <link rel="apple-touch-icon" sizes="144x144" href="assets/images/favicons/apple-touch-icon-144x144.png">
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/images/favicons/apple-touch-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="assets/images/favicons/favicon-144x144.png">
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/images/favicons/favicon-144x144.png">
 
   <!-- NOTE: These need to be kept in sync with `ngsw-manifest.json`. -->
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
diff --git a/aio/src/pwa-manifest.json b/aio/src/pwa-manifest.json
index 2b4ff5a344..be24c5fc0c 100644
--- a/aio/src/pwa-manifest.json
+++ b/aio/src/pwa-manifest.json
@@ -8,7 +8,7 @@
       "type": "image/png"
     },
     {
-      "src":"assets/images/favicons/apple-touch-icon-144x144.png",
+      "src":"assets/images/favicons/favicon-144x144.png",
       "sizes": "144x144",
       "type": "image/png"
     }

From d2a86872a9c4dc17aad8068746cf55e880b7968c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 10 May 2018 15:57:58 -0700
Subject: [PATCH 043/582] fix(animations): do not throw errors when a destroyed
 component is animated (#23836)

PR Close #23836
---
 .../browser/src/render/transition_animation_engine.ts      | 7 +++++--
 .../test/render/transition_animation_engine_spec.ts        | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index 192c747e87..205f6ecbba 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -649,8 +649,11 @@ export class TransitionAnimationEngine {
 
   trigger(namespaceId: string, element: any, name: string, value: any): boolean {
     if (isElementNode(element)) {
-      this._fetchNamespace(namespaceId).trigger(element, name, value);
-      return true;
+      const ns = this._fetchNamespace(namespaceId);
+      if (ns) {
+        ns.trigger(element, name, value);
+        return true;
+      }
     }
     return false;
   }
diff --git a/packages/animations/browser/test/render/transition_animation_engine_spec.ts b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
index 314b262780..5a122e9bd5 100644
--- a/packages/animations/browser/test/render/transition_animation_engine_spec.ts
+++ b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
@@ -616,6 +616,13 @@ const DEFAULT_NAMESPACE_ID = 'id';
         expect(element.contains(child1)).toBe(true);
         expect(element.contains(child2)).toBe(true);
       });
+
+      it('should not throw an error if a missing namespace is used', () => {
+        const engine = makeEngine();
+        const ID = 'foo';
+        const TRIGGER = 'fooTrigger';
+        expect(() => { engine.trigger(ID, element, TRIGGER, 'something'); }).not.toThrow();
+      });
     });
   });
 })();

From 816bc8af17a9e1e6990b5bbb3ce29147dd7d5871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Wed, 9 May 2018 15:30:16 -0700
Subject: [PATCH 044/582] feat(ivy): support injectable sanitization service
 (#23809)

PR Close #23809
---
 packages/core/src/render3/component.ts        |   7 +-
 packages/core/src/render3/instructions.ts     |  37 +--
 packages/core/src/render3/interfaces/view.ts  |   7 +
 .../core/src/sanitization/sanitization.ts     |  22 ++
 .../hello_world/bundle.golden_symbols.json    |   3 +
 .../bundling/todo/bundle.golden_symbols.json  |   3 +
 .../core/test/render3/instructions_spec.ts    | 219 +++++++++++++++++-
 .../core/test/render3/integration_spec.ts     |  63 +++++
 packages/core/test/render3/render_util.ts     |  25 +-
 9 files changed, 363 insertions(+), 23 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index c4f53ac9a9..a0cc5a4602 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -11,6 +11,7 @@
 import {Type} from '../core';
 import {Injector} from '../di/injector';
 import {ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
+import {Sanitizer} from '../sanitization/security';
 
 import {assertComponentType, assertNotNull} from './assert';
 import {queueInitHooks, queueLifecycleHooks} from './hooks';
@@ -29,6 +30,9 @@ export interface CreateComponentOptions {
   /** Which renderer factory to use. */
   rendererFactory?: RendererFactory3;
 
+  /** A custom sanitizer instance */
+  sanitizer?: Sanitizer;
+
   /**
    * Host element on which the component will be bootstrapped. If not specified,
    * the component definition's `tag` is used to query the existing DOM for the
@@ -120,6 +124,7 @@ export function renderComponent<T>(
     opts: CreateComponentOptions = {}): T {
   ngDevMode && assertComponentType(componentType);
   const rendererFactory = opts.rendererFactory || domRendererFactory3;
+  const sanitizer = opts.sanitizer || null;
   const componentDef = (componentType as ComponentType<T>).ngComponentDef as ComponentDef<T>;
   if (componentDef.type != componentType) componentDef.type = componentType;
   let component: T;
@@ -144,7 +149,7 @@ export function renderComponent<T>(
     if (rendererFactory.begin) rendererFactory.begin();
 
     // Create element node at index 0 in data array
-    elementNode = hostElement(componentTag, hostNode, componentDef);
+    elementNode = hostElement(componentTag, hostNode, componentDef, sanitizer);
 
     // Create directive instance with factory() and store at index 0 in directives array
     component = rootContext.component =
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 86b4ea07ea..8f2162cca5 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -25,6 +25,7 @@ import {isDifferent, stringify} from './util';
 import {executeHooks, queueLifecycleHooks, queueInitHooks, executeInitHooks} from './hooks';
 import {ViewRef} from './view_ref';
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
+import {Sanitizer} from '../sanitization/security';
 
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
@@ -42,7 +43,7 @@ const _CLEAN_PROMISE = Promise.resolve(null);
 /**
  * Function used to sanitize the value before writing it into the renderer.
  */
-export type Sanitizer = (value: any) => string;
+export type SanitizerFn = (value: any) => string;
 
 /**
  * Directive and element indices for top-level directive.
@@ -84,6 +85,10 @@ export function getRenderer(): Renderer3 {
   return renderer;
 }
 
+export function getCurrentSanitizer(): Sanitizer|null {
+  return currentView && currentView.sanitizer;
+}
+
 /** Used to set the parent property when nodes are created. */
 let previousOrParentNode: LNode;
 
@@ -298,7 +303,7 @@ export function executeInitAndContentHooks(): void {
 
 export function createLView<T>(
     viewId: number, renderer: Renderer3, tView: TView, template: ComponentTemplate<T>| null,
-    context: T | null, flags: LViewFlags): LView {
+    context: T | null, flags: LViewFlags, sanitizer?: Sanitizer | null): LView {
   const newView = {
     parent: currentView,
     id: viewId,  // -1 for component views
@@ -320,6 +325,7 @@ export function createLView<T>(
     lifecycleStage: LifecycleStage.Init,
     queries: null,
     injector: currentView && currentView.injector,
+    sanitizer: sanitizer || null
   };
 
   return newView;
@@ -450,8 +456,8 @@ function resetApplicationState() {
 export function renderTemplate<T>(
     hostNode: RElement, template: ComponentTemplate<T>, context: T,
     providedRendererFactory: RendererFactory3, host: LElementNode | null,
-    directives?: DirectiveDefListOrFactory | null,
-    pipes?: PipeDefListOrFactory | null): LElementNode {
+    directives?: DirectiveDefListOrFactory | null, pipes?: PipeDefListOrFactory | null,
+    sanitizer?: Sanitizer | null): LElementNode {
   if (host == null) {
     resetApplicationState();
     rendererFactory = providedRendererFactory;
@@ -460,7 +466,7 @@ export function renderTemplate<T>(
         null, LNodeType.Element, hostNode,
         createLView(
             -1, providedRendererFactory.createRenderer(null, null), tView, null, {},
-            LViewFlags.CheckAlways));
+            LViewFlags.CheckAlways, sanitizer));
   }
   const hostView = host.data !;
   ngDevMode && assertNotNull(hostView, 'Host node should have an LView defined in host.data.');
@@ -491,7 +497,8 @@ export function renderEmbeddedTemplate<T>(
     previousOrParentNode = null !;
 
     if (viewNode == null) {
-      const lView = createLView(-1, renderer, tView, template, context, LViewFlags.CheckAlways);
+      const lView = createLView(
+          -1, renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
       viewNode = createLNode(null, LNodeType.View, null, lView);
       rf = RenderFlags.Create;
@@ -859,13 +866,14 @@ export function locateHostElement(
  * @returns LElementNode created
  */
 export function hostElement(
-    tag: string, rNode: RElement | null, def: ComponentDef<any>): LElementNode {
+    tag: string, rNode: RElement | null, def: ComponentDef<any>,
+    sanitizer?: Sanitizer | null): LElementNode {
   resetApplicationState();
   const node = createLNode(
       0, LNodeType.Element, rNode,
       createLView(
           -1, renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null, null,
-          def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways));
+          def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
     node.tNode = createTNode(tag as string, null, null);
@@ -958,7 +966,7 @@ export function elementEnd() {
  * @param sanitizer An optional function used to sanitize the value.
  */
 export function elementAttribute(
-    index: number, name: string, value: any, sanitizer?: Sanitizer): void {
+    index: number, name: string, value: any, sanitizer?: SanitizerFn): void {
   if (value !== NO_CHANGE) {
     const element: LElementNode = data[index];
     if (value == null) {
@@ -989,7 +997,7 @@ export function elementAttribute(
  */
 
 export function elementProperty<T>(
-    index: number, propName: string, value: T | NO_CHANGE, sanitizer?: Sanitizer): void {
+    index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn): void {
   if (value === NO_CHANGE) return;
   const node = data[index] as LElementNode;
   const tNode = node.tNode !;
@@ -1152,10 +1160,10 @@ export function elementClass<T>(index: number, value: T | NO_CHANGE): void {
 export function elementStyleNamed<T>(
     index: number, styleName: string, value: T | NO_CHANGE, suffix?: string): void;
 export function elementStyleNamed<T>(
-    index: number, styleName: string, value: T | NO_CHANGE, sanitizer?: Sanitizer): void;
+    index: number, styleName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn): void;
 export function elementStyleNamed<T>(
     index: number, styleName: string, value: T | NO_CHANGE,
-    suffixOrSanitizer?: string | Sanitizer): void {
+    suffixOrSanitizer?: string | SanitizerFn): void {
   if (value !== NO_CHANGE) {
     const lElement: LElementNode = data[index];
     if (value == null) {
@@ -1305,7 +1313,8 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
       currentView, createLView(
                        -1, rendererFactory.createRenderer(
                                previousOrParentNode.native as RElement, def.rendererType),
-                       tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways));
+                       tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
+                       getCurrentSanitizer()));
 
   (previousOrParentNode.data as any) = hostView;
   (hostView.node as any) = previousOrParentNode;
@@ -1596,7 +1605,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
     // When we create a new LView, we always reset the state of the instructions.
     const newView = createLView(
         viewBlockId, renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, null,
-        LViewFlags.CheckAlways);
+        LViewFlags.CheckAlways, getCurrentSanitizer());
     if (lContainer.queries) {
       newView.queries = lContainer.queries.enterView(lContainer.nextIndex);
     }
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 24742998ee..1e412140b2 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -7,6 +7,8 @@
  */
 
 import {Injector} from '../../di/injector';
+import {Sanitizer} from '../../sanitization/security';
+
 import {LContainer} from './container';
 import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDef, PipeDefList} from './definition';
 import {LElementNode, LViewNode, TNode} from './node';
@@ -195,6 +197,11 @@ export interface LView {
    * An optional Module Injector to be used as fall back after Element Injectors are consulted.
    */
   injector: Injector|null;
+
+  /**
+   * An optional custom sanitizer
+   */
+  sanitizer: Sanitizer|null;
 }
 
 /** Flags associated with an LView (saved in LView.flags) */
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index 2f647fe640..ecd0203456 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -6,9 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {getCurrentSanitizer} from '../render3/instructions';
 import {stringify} from '../render3/util';
 
 import {_sanitizeHtml as _sanitizeHtml} from './html_sanitizer';
+import {SecurityContext} from './security';
 import {_sanitizeStyle as _sanitizeStyle} from './style_sanitizer';
 import {_sanitizeUrl as _sanitizeUrl} from './url_sanitizer';
 
@@ -79,6 +81,10 @@ export interface TrustedResourceUrlString extends TrustedString {
  * and urls have been removed.
  */
 export function sanitizeHtml(unsafeHtml: any): string {
+  const s = getCurrentSanitizer();
+  if (s) {
+    return s.sanitize(SecurityContext.HTML, unsafeHtml) || '';
+  }
   if (unsafeHtml instanceof String && (unsafeHtml as TrustedHtmlString)[BRAND] === 'Html') {
     return unsafeHtml.toString();
   }
@@ -99,6 +105,10 @@ export function sanitizeHtml(unsafeHtml: any): string {
  * dangerous javascript and urls have been removed.
  */
 export function sanitizeStyle(unsafeStyle: any): string {
+  const s = getCurrentSanitizer();
+  if (s) {
+    return s.sanitize(SecurityContext.STYLE, unsafeStyle) || '';
+  }
   if (unsafeStyle instanceof String && (unsafeStyle as TrustedStyleString)[BRAND] === 'Style') {
     return unsafeStyle.toString();
   }
@@ -120,6 +130,10 @@ export function sanitizeStyle(unsafeStyle: any): string {
  * all of the dangerous javascript has been removed.
  */
 export function sanitizeUrl(unsafeUrl: any): string {
+  const s = getCurrentSanitizer();
+  if (s) {
+    return s.sanitize(SecurityContext.URL, unsafeUrl) || '';
+  }
   if (unsafeUrl instanceof String && (unsafeUrl as TrustedUrlString)[BRAND] === 'Url') {
     return unsafeUrl.toString();
   }
@@ -136,6 +150,10 @@ export function sanitizeUrl(unsafeUrl: any): string {
  * only trusted `url`s have been allowed to pass.
  */
 export function sanitizeResourceUrl(unsafeResourceUrl: any): string {
+  const s = getCurrentSanitizer();
+  if (s) {
+    return s.sanitize(SecurityContext.RESOURCE_URL, unsafeResourceUrl) || '';
+  }
   if (unsafeResourceUrl instanceof String &&
       (unsafeResourceUrl as TrustedResourceUrlString)[BRAND] === 'ResourceUrl') {
     return unsafeResourceUrl.toString();
@@ -153,6 +171,10 @@ export function sanitizeResourceUrl(unsafeResourceUrl: any): string {
  * because only trusted `scripts`s have been allowed to pass.
  */
 export function sanitizeScript(unsafeScript: any): string {
+  const s = getCurrentSanitizer();
+  if (s) {
+    return s.sanitize(SecurityContext.SCRIPT, unsafeScript) || '';
+  }
   if (unsafeScript instanceof String && (unsafeScript as TrustedScriptString)[BRAND] === 'Script') {
     return unsafeScript.toString();
   }
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index a0ad181105..63f67c0bda 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -101,6 +101,9 @@
   {
     "name": "firstTemplatePass"
   },
+  {
+    "name": "getCurrentSanitizer"
+  },
   {
     "name": "getDirectiveInstance"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index b45915deb6..d9f7140cfe 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -383,6 +383,9 @@
   {
     "name": "generatePropertyAliases"
   },
+  {
+    "name": "getCurrentSanitizer"
+  },
   {
     "name": "getDirectiveInstance"
   },
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 224b17c436..18be0225ca 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -13,17 +13,28 @@ import {defineComponent} from '../../src/render3/definition';
 import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
 import {LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
-import {bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
+import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
+import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {NgForOf} from './common_with_def';
 import {ComponentFixture, TemplateFixture} from './render_util';
 
 describe('instructions', () => {
+  function createAnchor() {
+    elementStart(0, 'a');
+    elementEnd();
+  }
+
   function createDiv() {
     elementStart(0, 'div');
     elementEnd();
   }
 
+  function createScript() {
+    elementStart(0, 'script');
+    elementEnd();
+  }
+
   describe('elementAttribute', () => {
     it('should use sanitizer function', () => {
       const t = new TemplateFixture(createDiv);
@@ -177,4 +188,210 @@ describe('instructions', () => {
 
     });
   });
+
+  describe('sanitization injection compatibility', () => {
+    it('should work for url sanitization', () => {
+      const s = new LocalMockSanitizer(value => `${value}-sanitized`);
+      const t = new TemplateFixture(createAnchor, undefined, null, null, s);
+      const inputValue = 'http://foo';
+      const outputValue = 'http://foo-sanitized';
+
+      t.update(() => elementAttribute(0, 'href', inputValue, sanitizeUrl));
+      expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
+      expect(s.lastSanitizedValue).toEqual(outputValue);
+    });
+
+    it('should bypass url sanitization if marked by the service', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createAnchor, undefined, null, null, s);
+      const inputValue = s.bypassSecurityTrustUrl('http://foo');
+      const outputValue = 'http://foo';
+
+      t.update(() => elementAttribute(0, 'href', inputValue, sanitizeUrl));
+      expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should bypass ivy-level url sanitization if a custom sanitizer is used', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createAnchor, undefined, null, null, s);
+      const inputValue = bypassSanitizationTrustUrl('http://foo');
+      const outputValue = 'http://foo-ivy';
+
+      t.update(() => elementAttribute(0, 'href', inputValue, sanitizeUrl));
+      expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should work for style sanitization', () => {
+      const s = new LocalMockSanitizer(value => `color:blue`);
+      const t = new TemplateFixture(createDiv, undefined, null, null, s);
+      const inputValue = 'color:red';
+      const outputValue = 'color:blue';
+
+      t.update(() => elementAttribute(0, 'style', inputValue, sanitizeStyle));
+      expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
+      expect(s.lastSanitizedValue).toEqual(outputValue);
+    });
+
+    it('should bypass style sanitization if marked by the service', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createDiv, undefined, null, null, s);
+      const inputValue = s.bypassSecurityTrustStyle('color:maroon');
+      const outputValue = 'color:maroon';
+
+      t.update(() => elementAttribute(0, 'style', inputValue, sanitizeStyle));
+      expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should bypass ivy-level style sanitization if a custom sanitizer is used', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createDiv, undefined, null, null, s);
+      const inputValue = bypassSanitizationTrustStyle('font-family:foo');
+      const outputValue = 'font-family:foo-ivy';
+
+      t.update(() => elementAttribute(0, 'style', inputValue, sanitizeStyle));
+      expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should work for resourceUrl sanitization', () => {
+      const s = new LocalMockSanitizer(value => `${value}-sanitized`);
+      const t = new TemplateFixture(createScript, undefined, null, null, s);
+      const inputValue = 'http://resource';
+      const outputValue = 'http://resource-sanitized';
+
+      t.update(() => elementAttribute(0, 'src', inputValue, sanitizeResourceUrl));
+      expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
+      expect(s.lastSanitizedValue).toEqual(outputValue);
+    });
+
+    it('should bypass resourceUrl sanitization if marked by the service', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createScript, undefined, null, null, s);
+      const inputValue = s.bypassSecurityTrustResourceUrl('file://all-my-secrets.pdf');
+      const outputValue = 'file://all-my-secrets.pdf';
+
+      t.update(() => elementAttribute(0, 'src', inputValue, sanitizeResourceUrl));
+      expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should bypass ivy-level resourceUrl sanitization if a custom sanitizer is used', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createScript, undefined, null, null, s);
+      const inputValue = bypassSanitizationTrustResourceUrl('file://all-my-secrets.pdf');
+      const outputValue = 'file://all-my-secrets.pdf-ivy';
+
+      t.update(() => elementAttribute(0, 'src', inputValue, sanitizeResourceUrl));
+      expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should work for script sanitization', () => {
+      const s = new LocalMockSanitizer(value => `${value} //sanitized`);
+      const t = new TemplateFixture(createScript, undefined, null, null, s);
+      const inputValue = 'fn();';
+      const outputValue = 'fn(); //sanitized';
+
+      t.update(() => elementProperty(0, 'innerHTML', inputValue, sanitizeScript));
+      expect(t.html).toEqual(`<script>${outputValue}</script>`);
+      expect(s.lastSanitizedValue).toEqual(outputValue);
+    });
+
+    it('should bypass script sanitization if marked by the service', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createScript, undefined, null, null, s);
+      const inputValue = s.bypassSecurityTrustScript('alert("bar")');
+      const outputValue = 'alert("bar")';
+
+      t.update(() => elementProperty(0, 'innerHTML', inputValue, sanitizeScript));
+      expect(t.html).toEqual(`<script>${outputValue}</script>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should bypass ivy-level script sanitization if a custom sanitizer is used', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createScript, undefined, null, null, s);
+      const inputValue = bypassSanitizationTrustScript('alert("bar")');
+      const outputValue = 'alert("bar")-ivy';
+
+      t.update(() => elementProperty(0, 'innerHTML', inputValue, sanitizeScript));
+      expect(t.html).toEqual(`<script>${outputValue}</script>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should work for html sanitization', () => {
+      const s = new LocalMockSanitizer(value => `${value} <!--sanitized-->`);
+      const t = new TemplateFixture(createDiv, undefined, null, null, s);
+      const inputValue = '<header></header>';
+      const outputValue = '<header></header> <!--sanitized-->';
+
+      t.update(() => elementProperty(0, 'innerHTML', inputValue, sanitizeHtml));
+      expect(t.html).toEqual(`<div>${outputValue}</div>`);
+      expect(s.lastSanitizedValue).toEqual(outputValue);
+    });
+
+    it('should bypass html sanitization if marked by the service', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createDiv, undefined, null, null, s);
+      const inputValue = s.bypassSecurityTrustHtml('<div onclick="alert(123)"></div>');
+      const outputValue = '<div onclick="alert(123)"></div>';
+
+      t.update(() => elementProperty(0, 'innerHTML', inputValue, sanitizeHtml));
+      expect(t.html).toEqual(`<div>${outputValue}</div>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+
+    it('should bypass ivy-level script sanitization if a custom sanitizer is used', () => {
+      const s = new LocalMockSanitizer(value => '');
+      const t = new TemplateFixture(createDiv, undefined, null, null, s);
+      const inputValue = bypassSanitizationTrustHtml('<div onclick="alert(123)"></div>');
+      const outputValue = '<div onclick="alert(123)"></div>-ivy';
+
+      t.update(() => elementProperty(0, 'innerHTML', inputValue, sanitizeHtml));
+      expect(t.html).toEqual(`<div>${outputValue}</div>`);
+      expect(s.lastSanitizedValue).toBeFalsy();
+    });
+  });
 });
+
+class LocalSanitizedValue {
+  constructor(public value: any) {}
+
+  toString() { return this.value; }
+}
+
+class LocalMockSanitizer implements Sanitizer {
+  public lastSanitizedValue: string|null;
+
+  constructor(private _interceptor: (value: string|null|any) => string) {}
+
+  sanitize(context: SecurityContext, value: LocalSanitizedValue|string|null|any): string|null {
+    if (value instanceof String) {
+      return value.toString() + '-ivy';
+    }
+
+    if (value instanceof LocalSanitizedValue) {
+      return value.toString();
+    }
+
+    return this.lastSanitizedValue = this._interceptor(value);
+  }
+
+  bypassSecurityTrustHtml(value: string) { return new LocalSanitizedValue(value); }
+
+  bypassSecurityTrustStyle(value: string) { return new LocalSanitizedValue(value); }
+
+  bypassSecurityTrustScript(value: string) { return new LocalSanitizedValue(value); }
+
+  bypassSecurityTrustUrl(value: string) { return new LocalSanitizedValue(value); }
+
+  bypassSecurityTrustResourceUrl(value: string) { return new LocalSanitizedValue(value); }
+}
+
+function stripStyleWsCharacters(value: string): string {
+  // color: blue; => color:blue
+  return value.replace(/;/g, '').replace(/:\s+/g, ':');
+}
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index d1ae1f67a5..50d3a0d0f2 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -11,6 +11,8 @@ import {RenderFlags} from '@angular/core/src/render3';
 import {defineComponent, defineDirective} from '../../src/render3/index';
 import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, elementStyleNamed, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {LViewFlags} from '../../src/render3/interfaces/view';
+import {sanitizeUrl} from '../../src/sanitization/sanitization';
+import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {ComponentFixture, containerEl, renderToHtml} from './render_util';
 
@@ -847,4 +849,65 @@ describe('render3 integration test', () => {
 
   });
 
+  describe('sanitization', () => {
+    it('should sanitize data using the provided sanitization interface', () => {
+      class SanitizationComp {
+        static ngComponentDef = defineComponent({
+          type: SanitizationComp,
+          selectors: [['sanitize-this']],
+          factory: () => new SanitizationComp(),
+          template: (rf: RenderFlags, ctx: SanitizationComp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'a');
+              elementEnd();
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(0, 'href', bind(ctx.href), sanitizeUrl);
+            }
+          }
+        });
+
+        private href = '';
+
+        updateLink(href: any) { this.href = href; }
+      }
+
+      const sanitizer = new LocalSanitizer((value) => { return 'http://bar'; });
+
+      const fixture = new ComponentFixture(SanitizationComp, {sanitizer});
+      fixture.component.updateLink('http://foo');
+      fixture.update();
+
+      const element = fixture.hostElement.querySelector('a') !;
+      expect(element.getAttribute('href')).toEqual('http://bar');
+
+      fixture.component.updateLink(sanitizer.bypassSecurityTrustUrl('http://foo'));
+      fixture.update();
+
+      expect(element.getAttribute('href')).toEqual('http://foo');
+    });
+  });
 });
+
+class LocalSanitizedValue {
+  constructor(public value: any) {}
+  toString() { return this.value; }
+}
+
+class LocalSanitizer implements Sanitizer {
+  constructor(private _interceptor: (value: string|null|any) => string) {}
+
+  sanitize(context: SecurityContext, value: LocalSanitizedValue|string|null): string|null {
+    if (value instanceof LocalSanitizedValue) {
+      return value.toString();
+    }
+    return this._interceptor(value);
+  }
+
+  bypassSecurityTrustHtml(value: string) {}
+  bypassSecurityTrustStyle(value: string) {}
+  bypassSecurityTrustScript(value: string) {}
+  bypassSecurityTrustResourceUrl(value: string) {}
+
+  bypassSecurityTrustUrl(value: string) { return new LocalSanitizedValue(value); }
+}
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 9e523f86bd..655ff053d5 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -16,6 +16,7 @@ import {NG_HOST_SYMBOL, renderTemplate} from '../../src/render3/instructions';
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {LElementNode} from '../../src/render3/interfaces/node';
 import {RElement, RText, Renderer3, RendererFactory3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
+import {Sanitizer} from '../../src/sanitization/security';
 import {Type} from '../../src/type';
 
 import {getRendererFactory2} from './imported_renderer2';
@@ -51,6 +52,8 @@ export class TemplateFixture extends BaseFixture {
   hostNode: LElementNode;
   private _directiveDefs: DirectiveDefList|null;
   private _pipeDefs: PipeDefList|null;
+  private _sanitizer: Sanitizer|null;
+
   /**
    *
    * @param createBlock Instructions which go into the creation block:
@@ -60,10 +63,12 @@ export class TemplateFixture extends BaseFixture {
    */
   constructor(
       private createBlock: () => void, private updateBlock: () => void = noop,
-      directives?: DirectiveTypesOrFactory|null, pipes?: PipeTypesOrFactory|null) {
+      directives?: DirectiveTypesOrFactory|null, pipes?: PipeTypesOrFactory|null,
+      sanitizer?: Sanitizer) {
     super();
     this._directiveDefs = toDefs(directives, extractDirectiveDef);
     this._pipeDefs = toDefs(pipes, extractPipeDef);
+    this._sanitizer = sanitizer || null;
     this.hostNode = renderTemplate(this.hostElement, (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
         this.createBlock();
@@ -71,7 +76,7 @@ export class TemplateFixture extends BaseFixture {
       if (rf & RenderFlags.Update) {
         this.updateBlock();
       }
-    }, null !, domRendererFactory3, null, this._directiveDefs, this._pipeDefs);
+    }, null !, domRendererFactory3, null, this._directiveDefs, this._pipeDefs, sanitizer);
   }
 
   /**
@@ -82,7 +87,7 @@ export class TemplateFixture extends BaseFixture {
   update(updateBlock?: () => void): void {
     renderTemplate(
         this.hostNode.native, updateBlock || this.updateBlock, null !, domRendererFactory3,
-        this.hostNode, this._directiveDefs, this._pipeDefs);
+        this.hostNode, this._directiveDefs, this._pipeDefs, this._sanitizer);
   }
 }
 
@@ -94,7 +99,9 @@ export class ComponentFixture<T> extends BaseFixture {
   component: T;
   requestAnimationFrame: {(fn: () => void): void; flush(): void; queue: (() => void)[];};
 
-  constructor(private componentType: ComponentType<T>, opts: {injector?: Injector} = {}) {
+  constructor(
+      private componentType: ComponentType<T>,
+      opts: {injector?: Injector, sanitizer?: Sanitizer} = {}) {
     super();
     this.requestAnimationFrame = function(fn: () => void) {
       requestAnimationFrame.queue.push(fn);
@@ -106,9 +113,12 @@ export class ComponentFixture<T> extends BaseFixture {
       }
     };
 
-    this.component = _renderComponent(
-        componentType,
-        {host: this.hostElement, scheduler: this.requestAnimationFrame, injector: opts.injector});
+    this.component = _renderComponent(componentType, {
+      host: this.hostElement,
+      scheduler: this.requestAnimationFrame,
+      injector: opts.injector,
+      sanitizer: opts.sanitizer
+    });
   }
 
   update(): void {
@@ -195,6 +205,7 @@ export function renderComponent<T>(type: ComponentType<T>, opts?: CreateComponen
     rendererFactory: opts && opts.rendererFactory || testRendererFactory,
     host: containerEl,
     scheduler: requestAnimationFrame,
+    sanitizer: opts ? opts.sanitizer : undefined,
     hostFeatures: opts && opts.hostFeatures
   });
 }

From d889f57ae2d9a992192115d5b634daadcb0d3430 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 11 May 2018 10:17:43 +0100
Subject: [PATCH 045/582] build(aio): display types of API const docs correctly
 (#23850)

Previously these docs always displayed `any` as the type
of the const export. Now the type is computed correctly from
the declared type or initializer of the constant.

PR Close #23850
---
 aio/package.json                                     | 2 +-
 aio/tools/transforms/templates/api/var.template.html | 2 +-
 aio/yarn.lock                                        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aio/package.json b/aio/package.json
index 28eb70a792..b8bc9757e7 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -112,7 +112,7 @@
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
     "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.26.0",
+    "dgeni-packages": "^0.26.1",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
diff --git a/aio/tools/transforms/templates/api/var.template.html b/aio/tools/transforms/templates/api/var.template.html
index c8e590b96e..5375b8c117 100644
--- a/aio/tools/transforms/templates/api/var.template.html
+++ b/aio/tools/transforms/templates/api/var.template.html
@@ -2,7 +2,7 @@
 
 {% block overview %}
   <code-example language="ts" hideCopy="true" class="no-box api-heading">
-  const {$ doc.name $}: {$ doc.symbolTypeName or 'any' $};
+  const {$ doc.name $}: {$ (doc.type | escape) or 'any' $};
   </code-example>
 {% endblock %}
 
diff --git a/aio/yarn.lock b/aio/yarn.lock
index 012ee1526c..b143e7eff2 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -3086,9 +3086,9 @@ devtools-timeline-model@1.1.6:
     chrome-devtools-frontend "1.0.401423"
     resolve "1.1.7"
 
-dgeni-packages@^0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.26.0.tgz#4311a0631f8459703001a5e65e390a29321a0562"
+dgeni-packages@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.26.1.tgz#34b5ed880be2f91862095b15085c50cc84507aa8"
   dependencies:
     canonical-path "0.0.2"
     catharsis "^0.8.1"

From cfde36da84b5de5248e1cdea932fc75c57ee078c Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Thu, 10 May 2018 15:58:27 -0700
Subject: [PATCH 046/582] fix(compiler): generate constant array for i18n
 attributes (#23837)

PR Close #23837
---
 packages/compiler/src/constant_pool.ts             |  3 ++-
 packages/compiler/src/render3/view/template.ts     | 12 +++---------
 .../test/render3/r3_view_compiler_i18n_spec.ts     | 14 ++++----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/packages/compiler/src/constant_pool.ts b/packages/compiler/src/constant_pool.ts
index bd5a9b60cc..58a40a7eba 100644
--- a/packages/compiler/src/constant_pool.ts
+++ b/packages/compiler/src/constant_pool.ts
@@ -295,8 +295,9 @@ class KeyVisitor implements o.ExpressionVisitor {
                                   `EX:${ast.value.runtime.name}`;
   }
 
+  visitReadVarExpr(node: o.ReadVarExpr) { return `VAR:${node.name}`; }
+
   visitWrappedNodeExpr = invalid;
-  visitReadVarExpr = invalid;
   visitWriteVarExpr = invalid;
   visitWriteKeyExpr = invalid;
   visitWritePropExpr = invalid;
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 9563936249..8faa85963f 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -257,13 +257,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Add the attributes
     const i18nMessages: o.Statement[] = [];
     const attributes: o.Expression[] = [];
-    let hasI18nAttr = false;
 
     Object.getOwnPropertyNames(outputAttrs).forEach(name => {
       const value = outputAttrs[name];
       attributes.push(o.literal(name));
       if (attrI18nMetas.hasOwnProperty(name)) {
-        hasI18nAttr = true;
         const meta = parseI18nMeta(attrI18nMetas[name]);
         const variable = this.constantPool.getTranslation(value, meta);
         attributes.push(variable);
@@ -272,13 +270,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       }
     });
 
-    let attrArg: o.Expression = o.TYPED_NULL_EXPR;
-
-    if (attributes.length > 0) {
-      attrArg = hasI18nAttr ? getLiteralFactory(this.constantPool, o.literalArr(attributes)) :
-                              this.constantPool.getConstLiteral(o.literalArr(attributes), true);
-    }
-
+    const attrArg: o.Expression = attributes.length > 0 ?
+        this.constantPool.getConstLiteral(o.literalArr(attributes), true) :
+        o.TYPED_NULL_EXPR;
     parameters.push(attrArg);
 
     if (element.references && element.references.length > 0) {
diff --git a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
index d11cacc4c2..3839df2615 100644
--- a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
@@ -93,10 +93,7 @@ describe('i18n support in the view compiler', () => {
        * @desc desc
        */
       const $msg_1$ = goog.getMsg('introduction');
-      …
-      const $c1$ = ($a1$:any) => {
-        return ['title', $a1$];
-      };
+      const $c1$ = ['title', $msg_1$];
       …
       /**
        * @desc desc
@@ -106,7 +103,7 @@ describe('i18n support in the view compiler', () => {
       …
       template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
         if (rf & 1) {
-          $r3$.ɵE(0, 'div', $r3$.ɵf1($c1$, $msg_1$));
+          $r3$.ɵE(0, 'div', $c1$);
           $r3$.ɵT(1, $msg_2$);
           $r3$.ɵe();
         }
@@ -147,14 +144,11 @@ describe('i18n support in the view compiler', () => {
        * @meaning m
        */
       const $msg_1$ = goog.getMsg('introduction');
-      …
-      const $c1$ = ($a1$:any) => {
-        return ['id', 'static', 'title', $a1$];
-      };
+      const $c1$ = ['id', 'static', 'title', $msg_1$];
       …
       template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
         if (rf & 1) {
-          $r3$.ɵE(0, 'div', $r3$.ɵf1($c1$, $msg_1$));
+          $r3$.ɵE(0, 'div', $c1$);
           $r3$.ɵe();
         }
       }

From d4b8b2440673049c58d51b0ae4afceb028d62cc0 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 10 May 2018 19:35:19 -0700
Subject: [PATCH 047/582] fix(elements): prevent closure renaming of platform
 properties (#23843)

Closure compiler with type based optimizations has a bug where externs for inherited static fields are not being honored. For Angular Elements this meant that 'observedAttributes' static field which is marked as an extern for the base HTMLElement class was getting renamed.

This commit works around the bug by using quoted access of 'observedAttributes' that explicitly prevents the renaming.

PR Close #23843
---
 packages/elements/src/create-custom-element.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/elements/src/create-custom-element.ts b/packages/elements/src/create-custom-element.ts
index 34595baa34..ce70f3ae7a 100644
--- a/packages/elements/src/create-custom-element.ts
+++ b/packages/elements/src/create-custom-element.ts
@@ -131,7 +131,9 @@ export function createCustomElement<P>(
   const attributeToPropertyInputs = getDefaultAttributeToPropertyInputs(inputs);
 
   class NgElementImpl extends NgElement {
-    static readonly observedAttributes = Object.keys(attributeToPropertyInputs);
+    // Work around a bug in closure typed optimizations(b/79557487) where it is not honoring static
+    // field externs. So using quoted access to explicitly prevent renaming.
+    static readonly['observedAttributes'] = Object.keys(attributeToPropertyInputs);
 
     constructor(injector?: Injector) {
       super();

From a2e8b3a6a80432d139abff64e9ad6baf1eb13dee Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 14 May 2018 17:25:41 +0100
Subject: [PATCH 048/582] build(aio): ensure usageNotes are copied into
 decorator API docs (#23901)

PR Close #23901
---
 .../angular-api-package/processors/mergeDecoratorDocs.js    | 3 +--
 .../processors/mergeDecoratorDocs.spec.js                   | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
index 6227dbb3d8..86571ea5fa 100644
--- a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
+++ b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
@@ -90,8 +90,7 @@ module.exports = function mergeDecoratorDocs(log) {
               callMember.description.substring(0, 50));
           // Merge the documentation found in this call signature into the original decorator
           decoratorDoc.description = callMember.description;
-          decoratorDoc.howToUse = callMember.howToUse;
-          decoratorDoc.whatItDoes = callMember.whatItDoes;
+          decoratorDoc.usageNotes = callMember.usageNotes;
 
           // remove doc from its module doc's exports
           doc.moduleDoc.exports =
diff --git a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js
index be6cff2e4b..77b3f2593d 100644
--- a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js
@@ -32,8 +32,7 @@ describe('mergeDecoratorDocs processor', () => {
         {
           isCallMember: true,
           description: 'The actual description of the call signature',
-          whatItDoes: 'Does something cool...',
-          howToUse: 'Use it like this...'
+          usageNotes: 'Use it like this...'
         },
         {
           description: 'Some other member'
@@ -69,8 +68,7 @@ describe('mergeDecoratorDocs processor', () => {
   it('should copy across properties from the call signature doc', () => {
     processor.$process([decoratorDoc, metadataDoc, otherDoc]);
     expect(decoratorDoc.description).toEqual('The actual description of the call signature');
-    expect(decoratorDoc.whatItDoes).toEqual('Does something cool...');
-    expect(decoratorDoc.howToUse).toEqual('Use it like this...');
+    expect(decoratorDoc.usageNotes).toEqual('Use it like this...');
   });
 
   it('should remove the metadataDoc from the module exports', () => {

From 02acb5e3e582560068d8c48e7331a2bd643d6515 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sat, 12 May 2018 13:30:19 +0100
Subject: [PATCH 049/582] build(aio): improve `enum` API rendering (#23872)

* The member details section is now called "Members", rather
than "Properties".
* The property table now displays appropriate table headings:
"Member", "Value", "Description".
* The "Value" column is not shown if none of the members have
a value.

Closes #22678

PR Close #23872
---
 .../rendering/hasValues.js                    |  9 +++++++++
 .../rendering/hasValues.spec.js               | 19 +++++++++++++++++++
 .../templates/api/enum.template.html          | 15 ++++++++++++++-
 .../templates/api/lib/memberHelpers.html      | 11 ++++++++---
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 aio/tools/transforms/angular-base-package/rendering/hasValues.js
 create mode 100644 aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js

diff --git a/aio/tools/transforms/angular-base-package/rendering/hasValues.js b/aio/tools/transforms/angular-base-package/rendering/hasValues.js
new file mode 100644
index 0000000000..7b15501fa2
--- /dev/null
+++ b/aio/tools/transforms/angular-base-package/rendering/hasValues.js
@@ -0,0 +1,9 @@
+module.exports = function hasValues() {
+  return {
+    name: 'hasValues',
+    process: function(list, property) {
+      if (!list || !Array.isArray(list)) return false;
+      return list.some(item => item[property]);
+    }
+  };
+};
\ No newline at end of file
diff --git a/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js b/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js
new file mode 100644
index 0000000000..7f22c93e9d
--- /dev/null
+++ b/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js
@@ -0,0 +1,19 @@
+const factory = require('./hasValues');
+
+describe('hasValues filter', () => {
+  let filter;
+
+  beforeEach(function() { filter = factory(); });
+
+  it('should be called "hasValues"', function() { expect(filter.name).toEqual('hasValues'); });
+
+  it('should return true if the specified property is truthy on any item in the list', function() {
+    expect(filter.process([], 'a')).toEqual(false);
+    expect(filter.process(0), 'a').toEqual(false);
+    expect(filter.process({}, 'a')).toEqual(false);
+    expect(filter.process([{a: 1}], 'a')).toEqual(true);
+    expect(filter.process([{b: 2}], 'a')).toEqual(false);
+    expect(filter.process([{a: 1, b: 2}], 'a')).toEqual(true);
+    expect(filter.process([{b: 2}, {a: 1}], 'a')).toEqual(true);
+  });
+});
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/enum.template.html b/aio/tools/transforms/templates/api/enum.template.html
index 9c59159b29..0f07f88cbc 100644
--- a/aio/tools/transforms/templates/api/enum.template.html
+++ b/aio/tools/transforms/templates/api/enum.template.html
@@ -1 +1,14 @@
-{% extends 'class.template.html' -%}
\ No newline at end of file
+{% import "lib/memberHelpers.html" as memberHelpers -%}
+{% extends 'export-base.template.html' -%}
+
+{% block details %}
+<section class="enum-overview">
+<code-example language="ts" hideCopy="true">
+enum {$ doc.name $} {{$ memberHelpers.renderMembers(doc) $}
+}
+</code-example>
+</section>
+
+{% include "includes/description.html" %}
+{$ memberHelpers.renderProperties(doc.properties, 'members', 'member', 'Members', ['Member', 'Value']) $}
+{% endblock %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index c278c3c3fc..2fdfb3b6e4 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -135,20 +135,25 @@
 {%- endmacro -%}
 
 
-{%- macro renderProperties(properties, containerClass, propertyClass, headingText) -%}
+{%- macro renderProperties(properties, containerClass, propertyClass, headingText, headings) -%}
 {% set nonInternalProperties = properties | filterByPropertyValue('internal', undefined) %}
+{% set hasTypes = properties | hasValues('type') %}
 {% if nonInternalProperties.length -%}
 <section class="{$ containerClass $}">
   <h2>{$ headingText $}</h2>
   <table class="is-full-width list-table properties-table">
     <thead>
-      <tr><th>Property</th><th>Type</th><th>Description</th></tr>
+      <tr>
+        <th>{$ headings[0] or 'Property' $}</th>
+        {% if hasTypes %}<th>{$ headings[1] or 'Type' $}</th>{% endif %}
+        <th>{$ headings[2] or 'Description' $}</th>
+      </tr>
     </thead>
     <tbody>
     {% for property in nonInternalProperties %}
       <tr class="{$ propertyClass $}">
         <td><a id="{$ property.anchor $}"></a>{$ property.name $}</td>
-        <td><label class="property-type-label"><code>{$ property.type | escape $}</code></label></td>
+        {% if hasTypes %}<td><label class="property-type-label"><code>{$ property.type | escape $}</code></label></td>{% endif %}
         <td>
           {%- if (property.isGetAccessor or property.isReadonly) and not property.isSetAccessor %}<span class='read-only-property'>Read-only.</span>{% endif %}
           {% if property.shortDescription %}{$ property.shortDescription | marked $}{% endif %}

From 67b8d57a8d51655143deeeb819e6a756abfc234b Mon Sep 17 00:00:00 2001
From: Jon Gear <askjon@jongear.io>
Date: Sun, 13 May 2018 19:22:27 -0500
Subject: [PATCH 050/582] docs(aio): use heroesUrl (#23884)

PR Close #23884
---
 aio/content/examples/toh-pt6/src/app/hero.service.ts   | 2 +-
 aio/content/examples/universal/src/app/hero.service.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/examples/toh-pt6/src/app/hero.service.ts b/aio/content/examples/toh-pt6/src/app/hero.service.ts
index 068da510b2..c98030c9d2 100644
--- a/aio/content/examples/toh-pt6/src/app/hero.service.ts
+++ b/aio/content/examples/toh-pt6/src/app/hero.service.ts
@@ -84,7 +84,7 @@ export class HeroService {
       // if not search term, return empty hero array.
       return of([]);
     }
-    return this.http.get<Hero[]>(`api/heroes/?name=${term}`).pipe(
+    return this.http.get<Hero[]>(`${this.heroesUrl}/?name=${term}`).pipe(
       tap(_ => this.log(`found heroes matching "${term}"`)),
       catchError(this.handleError<Hero[]>('searchHeroes', []))
     );
diff --git a/aio/content/examples/universal/src/app/hero.service.ts b/aio/content/examples/universal/src/app/hero.service.ts
index ef490ecff6..18f9b72d2d 100644
--- a/aio/content/examples/universal/src/app/hero.service.ts
+++ b/aio/content/examples/universal/src/app/hero.service.ts
@@ -64,7 +64,7 @@ export class HeroService {
       // if not search term, return empty hero array.
       return of([]);
     }
-    return this.http.get<Hero[]>(`api/heroes/?name=${term}`).pipe(
+    return this.http.get<Hero[]>(`${this.heroesUrl}/?name=${term}`).pipe(
       tap(_ => this.log(`found heroes matching "${term}"`)),
       catchError(this.handleError<Hero[]>('searchHeroes', []))
     );

From 66b2d78305d07ba1ca7f2844696d372bd424c465 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 14 May 2018 09:33:30 -0700
Subject: [PATCH 051/582] build: only match version tags for BUILD_SCM_VERSION
 (#23903)

PR Close #23903
---
 tools/bazel_stamp_vars.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/bazel_stamp_vars.sh b/tools/bazel_stamp_vars.sh
index 2e70a4c1f0..3092f6c6cb 100755
--- a/tools/bazel_stamp_vars.sh
+++ b/tools/bazel_stamp_vars.sh
@@ -26,7 +26,10 @@ if [[ "$(git tag)" == "" ]]; then
   echo ""
 fi
 
-BUILD_SCM_VERSION_RAW=$(git describe --abbrev=7 --tags HEAD)
+# Only match the latest tag that is a version such as 6.0.0, 6.0.0-rc.5, etc...
+# This will ignore non-version tags which would break unit tests expecting a valid version
+# number in the package headers
+BUILD_SCM_VERSION_RAW=$(git describe --match [0-9].[0-9].[0-9]* --abbrev=7 --tags HEAD)
 
 # Find out if there are any uncommitted local changes
 # TODO(i): is it ok to use "--untracked-files=no" to ignore untracked files since they should not affect anything?

From d4b6c41a5f8ca84082f90a5d738b23d3ba71bbb0 Mon Sep 17 00:00:00 2001
From: Omar Griffin <griffin.omar@gmail.com>
Date: Thu, 19 Apr 2018 14:26:48 -0700
Subject: [PATCH 052/582] fix(benchpress): Fix promise chain in
 chrome_driver_extension. (#23458)

Occasionally the promise to clear the chrome buffer resolves after the subsequent call to start the
timer. This problem causes flakiness in our tests that rely on benchpress, usually manifesting
itself as a "Tried too often to get the ending mark: 21" error thrown by this line:

https://github.com/angular/angular/blob/master/packages/benchpress/src/metric/perflog_metric.ts#L162

PR Close #23458
---
 packages/benchpress/src/webdriver/chrome_driver_extension.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/benchpress/src/webdriver/chrome_driver_extension.ts b/packages/benchpress/src/webdriver/chrome_driver_extension.ts
index d1ceba67b1..c255f2ff33 100644
--- a/packages/benchpress/src/webdriver/chrome_driver_extension.ts
+++ b/packages/benchpress/src/webdriver/chrome_driver_extension.ts
@@ -51,12 +51,12 @@ export class ChromeDriverExtension extends WebDriverExtension {
 
   gc() { return this._driver.executeScript('window.gc()'); }
 
-  timeBegin(name: string): Promise<any> {
+  async timeBegin(name: string): Promise<any> {
     if (this._firstRun) {
       this._firstRun = false;
       // Before the first run, read out the existing performance logs
       // so that the chrome buffer does not fill up.
-      this._driver.logs('performance');
+      await this._driver.logs('performance');
     }
     return this._driver.executeScript(`console.time('${name}');`);
   }

From 83631b28cb76dbc16d14010dc105c66f99b135cb Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 13 May 2018 18:24:12 +0200
Subject: [PATCH 053/582] perf(ivy): avoid creating bound function in pipeBind3
 (#23882)

PR Close #23882
---
 packages/core/src/render3/pipe.ts          |  2 +-
 packages/core/src/render3/pure_function.ts | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index 83880d3004..c8f449148a 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -102,7 +102,7 @@ export function pipeBind2(index: number, v1: any, v2: any): any {
  */
 export function pipeBind3(index: number, v1: any, v2: any, v3: any): any {
   const pipeInstance = load<PipeTransform>(index);
-  return isPure(index) ? pureFunction3(pipeInstance.transform.bind(pipeInstance), v1, v2, v3) :
+  return isPure(index) ? pureFunction3(pipeInstance.transform, v1, v2, v3, pipeInstance) :
                          pipeInstance.transform(v1, v2, v3);
 }
 
diff --git a/packages/core/src/render3/pure_function.ts b/packages/core/src/render3/pure_function.ts
index 071c6d2966..dad4424647 100644
--- a/packages/core/src/render3/pure_function.ts
+++ b/packages/core/src/render3/pure_function.ts
@@ -15,6 +15,7 @@ import {bindingUpdated, bindingUpdated2, bindingUpdated4, checkAndUpdateBinding,
  * value. If it has been saved, returns the saved value.
  *
  * @param pureFn Function that returns a value
+ * @param thisArg Optional calling context of pureFn
  * @returns value
  */
 export function pureFunction0<T>(pureFn: () => T, thisArg?: any): T {
@@ -28,6 +29,7 @@ export function pureFunction0<T>(pureFn: () => T, thisArg?: any): T {
  *
  * @param pureFn Function that returns an updated value
  * @param exp Updated expression value
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction1(pureFn: (v: any) => any, exp: any, thisArg?: any): any {
@@ -43,6 +45,7 @@ export function pureFunction1(pureFn: (v: any) => any, exp: any, thisArg?: any):
  * @param pureFn
  * @param exp1
  * @param exp2
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction2(
@@ -60,6 +63,7 @@ export function pureFunction2(
  * @param exp1
  * @param exp2
  * @param exp3
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction3(
@@ -81,6 +85,7 @@ export function pureFunction3(
  * @param exp2
  * @param exp3
  * @param exp4
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction4(
@@ -102,6 +107,7 @@ export function pureFunction4(
  * @param exp3
  * @param exp4
  * @param exp5
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction5(
@@ -126,6 +132,7 @@ export function pureFunction5(
  * @param exp4
  * @param exp5
  * @param exp6
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction6(
@@ -151,6 +158,7 @@ export function pureFunction6(
  * @param exp5
  * @param exp6
  * @param exp7
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction7(
@@ -178,6 +186,7 @@ export function pureFunction7(
  * @param exp6
  * @param exp7
  * @param exp8
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunction8(
@@ -200,7 +209,8 @@ export function pureFunction8(
  *
  * @param pureFn A pure function that takes binding values and builds an object or array
  * containing those values.
- * @param exp An array of binding values
+ * @param exps An array of binding values
+ * @param thisArg Optional calling context of pureFn
  * @returns Updated value
  */
 export function pureFunctionV(pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any {

From 017d67cdf81e05496e4cf73f0f912ecef94e7bb3 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 11 May 2018 09:43:06 -0700
Subject: [PATCH 054/582] test: switch to ts_web_test_suite (#23859)

Unit tests now run on Firefox too

PR Close #23859
---
 WORKSPACE                                           |  6 +++---
 packages/common/test/BUILD.bazel                    |  4 ++--
 packages/compiler-cli/test/BUILD.bazel              |  2 +-
 packages/compiler-cli/test/diagnostics/BUILD.bazel  |  2 +-
 packages/compiler-cli/test/metadata/BUILD.bazel     |  2 +-
 packages/compiler-cli/test/ngtsc/BUILD.bazel        |  2 +-
 packages/compiler-cli/test/transformers/BUILD.bazel |  2 +-
 packages/compiler/test/BUILD.bazel                  |  4 ++--
 packages/compiler/test/render3/BUILD.bazel          |  2 +-
 packages/core/test/BUILD.bazel                      |  4 ++--
 packages/core/test/render3/BUILD.bazel              |  4 ++--
 packages/elements/test/BUILD.bazel                  |  4 ++--
 packages/forms/test/BUILD.bazel                     |  4 ++--
 packages/http/test/BUILD.bazel                      |  4 ++--
 packages/language-service/test/BUILD.bazel          |  2 +-
 packages/platform-browser-dynamic/test/BUILD.bazel  |  4 ++--
 packages/platform-browser/test/BUILD.bazel          |  4 ++--
 packages/platform-webworker/test/BUILD.bazel        |  4 ++--
 packages/router/test/BUILD.bazel                    |  4 ++--
 packages/service-worker/test/BUILD.bazel            |  4 ++--
 packages/upgrade/test/BUILD.bazel                   |  4 ++--
 tools/defaults.bzl                                  | 13 ++++++++++---
 22 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 263151e343..d18ec153e0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -13,9 +13,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_webtesting",
-    url = "https://github.com/bazelbuild/rules_webtesting/archive/ca7b8062d9cf4ef2fde9193c7d37a0764c4262d7.zip",
-    strip_prefix = "rules_webtesting-ca7b8062d9cf4ef2fde9193c7d37a0764c4262d7",
-    sha256 = "28c73cf9d310fa6dba30e66bdb98071341c99c3feb8662f2d3883a632de97d72",
+    url = "https://github.com/bazelbuild/rules_webtesting/archive/cfcaaf98553fee8e7063b5f5c11fd1b77e43d683.zip",
+    strip_prefix = "rules_webtesting-cfcaaf98553fee8e7063b5f5c11fd1b77e43d683",
+    sha256 = "636c7a9ac2ca13a04d982c2f9c874876ecc90a7b9ccfe4188156122b26ada7b3",
 )
 
 http_archive(
diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel
index 2d6f2e59e1..268d0a8bfc 100644
--- a/packages/common/test/BUILD.bazel
+++ b/packages/common/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -29,7 +29,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel
index e6cb2ebf07..f0e842f65b 100644
--- a/packages/compiler-cli/test/BUILD.bazel
+++ b/packages/compiler-cli/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 # Uses separate test rules to allow the tests to run in parallel
diff --git a/packages/compiler-cli/test/diagnostics/BUILD.bazel b/packages/compiler-cli/test/diagnostics/BUILD.bazel
index baa020bf9b..18cc00ffc2 100644
--- a/packages/compiler-cli/test/diagnostics/BUILD.bazel
+++ b/packages/compiler-cli/test/diagnostics/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/compiler-cli/test/metadata/BUILD.bazel b/packages/compiler-cli/test/metadata/BUILD.bazel
index 1b075bb62b..e118490d37 100644
--- a/packages/compiler-cli/test/metadata/BUILD.bazel
+++ b/packages/compiler-cli/test/metadata/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel
index a7bbbb77a3..dfa3f80bfa 100644
--- a/packages/compiler-cli/test/ngtsc/BUILD.bazel
+++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/compiler-cli/test/transformers/BUILD.bazel b/packages/compiler-cli/test/transformers/BUILD.bazel
index 2e4649fe9c..d42c527516 100644
--- a/packages/compiler-cli/test/transformers/BUILD.bazel
+++ b/packages/compiler-cli/test/transformers/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index e7aaa323cf..fb32cbad43 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 # Test that should only be run in node
@@ -80,7 +80,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel
index 82c60a34e3..27bd131ce3 100644
--- a/packages/compiler/test/render3/BUILD.bazel
+++ b/packages/compiler/test/render3/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index dc353d14bc..bf1c7473b0 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -60,7 +60,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
index 091e1506c0..b3c3334c71 100644
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -52,7 +52,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "render3_web",
     deps = [
         ":render3_lib",
diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel
index 68817ebd99..bdf3c5912c 100644
--- a/packages/elements/test/BUILD.bazel
+++ b/packages/elements/test/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_web_test")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -31,7 +31,7 @@ filegroup(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test",
     bootstrap = [
         ":elements_test_bootstrap_scripts",
diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel
index f4023b41be..7daeea9391 100644
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -25,7 +25,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel
index 5359429195..05c83ed83a 100644
--- a/packages/http/test/BUILD.bazel
+++ b/packages/http/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -25,7 +25,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel
index d4e73e9c0d..89e4f08f24 100644
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel
index 234a193ac3..35d9f51d27 100644
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -27,7 +27,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     # disable since tests are running but not yet passing
     tags = ["manual"],
diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel
index 4858aa258e..996e9a29cf 100644
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -33,7 +33,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     # disable since tests are running but not yet passing
     tags = ["manual"],
diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel
index 89b2f0de0a..d0937bdf77 100644
--- a/packages/platform-webworker/test/BUILD.bazel
+++ b/packages/platform-webworker/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -27,7 +27,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel
index 1b20bb54ff..7dfa2b62b4 100644
--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -29,7 +29,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel
index 54fababb35..fcf967139b 100644
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -27,7 +27,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel
index 9e40647ba0..635eef6a57 100644
--- a/packages/upgrade/test/BUILD.bazel
+++ b/packages/upgrade/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -18,7 +18,7 @@ ts_library(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "test_web",
     bootstrap = [
         # "//:angularjs",
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 8c0591f153..8a956ca64f 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -1,6 +1,6 @@
 """Re-export of some bazel rules with repository-wide defaults."""
 load("@build_bazel_rules_nodejs//:defs.bzl", _npm_package = "npm_package")
-load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library", _ts_web_test = "ts_web_test")
+load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library", _ts_web_test_suite = "ts_web_test_suite")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("//packages/bazel/src:ng_module.bzl", _ivy_ng_module = "internal_ivy_ng_module")
 
@@ -68,7 +68,7 @@ def npm_package(name, replacements = {}, **kwargs):
       replacements = dict(replacements, **PKG_GROUP_REPLACEMENTS),
       **kwargs)
 
-def ts_web_test(bootstrap = [], deps = [], **kwargs):
+def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
   if not bootstrap:
     bootstrap = ["//:web_test_bootstrap_scripts"]
   local_deps = [
@@ -76,9 +76,16 @@ def ts_web_test(bootstrap = [], deps = [], **kwargs):
     "//tools/testing:browser",
   ] + deps
 
-  _ts_web_test(
+  _ts_web_test_suite(
       bootstrap = bootstrap,
       deps = local_deps,
+      # Run unit tests on Chromium and Firefox by default.
+      # You can exclude tests based on tags, e.g. to skip Firefox testing,
+      #   `bazel test --test_tag_filters=-browser:firefox-local [targets]`
+      browsers = [
+          "@io_bazel_rules_webtesting//browsers:chromium-local",
+          "@io_bazel_rules_webtesting//browsers:firefox-local",
+      ],
       **kwargs)
 
 def ivy_ng_module(name, tsconfig = None, **kwargs):

From 1d378e298721541eee7477d48cd62fba58044575 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 28 Apr 2018 02:01:28 +0300
Subject: [PATCH 055/582] fix(service-worker): deprecate `versionedFiles` in
 asset-group resources (#23584)

Since `versionedFiles` behaves in the exact same way as `files`, there
is no reaason to have both. Users should use `files` instead.

This commit deprecates the property and prints a warning when coming
across an asset-group that uses it. It should be completely removed in
a future version.

Note, it has also been removed from the default `ngsw-config.json`
template in angular/devkit#754.

PR Close #23584
---
 .../src/ngsw-config.json                              | 11 ++++-------
 aio/content/guide/service-worker-config.md            |  3 ++-
 packages/service-worker/config/src/generator.ts       |  7 +++++++
 packages/service-worker/config/src/in.ts              |  8 +++++++-
 tools/public_api_guard/service-worker/config.d.ts     |  2 +-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/aio/content/examples/service-worker-getting-started/src/ngsw-config.json b/aio/content/examples/service-worker-getting-started/src/ngsw-config.json
index 8b78a4f893..19133dc879 100755
--- a/aio/content/examples/service-worker-getting-started/src/ngsw-config.json
+++ b/aio/content/examples/service-worker-getting-started/src/ngsw-config.json
@@ -7,12 +7,9 @@
     "resources": {
       "files": [
         "/favicon.ico",
-        "/index.html"
-      ],
-      "versionedFiles": [
-        "/*.bundle.css",
-        "/*.bundle.js",
-        "/*.chunk.js"
+        "/index.html",
+        "/*.css",
+        "/*.js"
       ]
     }
   }, {
@@ -25,4 +22,4 @@
       ]
     }
   }]
-}
\ No newline at end of file
+}
diff --git a/aio/content/guide/service-worker-config.md b/aio/content/guide/service-worker-config.md
index 8f7beaeba6..d2293d0e48 100644
--- a/aio/content/guide/service-worker-config.md
+++ b/aio/content/guide/service-worker-config.md
@@ -70,6 +70,7 @@ interface AssetGroup {
   updateMode?: 'prefetch' | 'lazy';
   resources: {
     files?: string[];
+    /** @deprecated As of v6 `versionedFiles` and `files` options have the same behavior. Use `files` instead. */
     versionedFiles?: string[];
     urls?: string[];
   };
@@ -102,7 +103,7 @@ This section describes the resources to cache, broken up into three groups.
 
 * `files` lists patterns that match files in the distribution directory. These can be single files or glob-like patterns that match a number of files.
 
-* `versionedFiles` is like `files` but should be used for build artifacts that already include a hash in the filename, which is used for cache busting. The Angular service worker can optimize some aspects of its operation if it can assume file contents are immutable.
+* `versionedFiles` has been deprecated. As of v6 `versionedFiles` and `files` options have the same behavior. Use `files` instead.
 
 * `urls` includes both URLs and URL patterns that will be matched at runtime. These resources are not fetched directly and do not have content hashes, but they will be cached according to their HTTP headers. This is most useful for CDNs such as the Google Fonts service.<br>
   _(Negative glob patterns are not supported.)_
diff --git a/packages/service-worker/config/src/generator.ts b/packages/service-worker/config/src/generator.ts
index 399d733e67..fc9dfb31a6 100644
--- a/packages/service-worker/config/src/generator.ts
+++ b/packages/service-worker/config/src/generator.ts
@@ -44,6 +44,13 @@ export class Generator {
       Promise<Object[]> {
     const seenMap = new Set<string>();
     return Promise.all((config.assetGroups || []).map(async(group) => {
+      if (group.resources.versionedFiles) {
+        console.warn(
+            `Asset-group '${group.name}' in 'ngsw-config.json' uses the 'versionedFiles' option.\n` +
+            'As of v6 \'versionedFiles\' and \'files\' options have the same behavior. ' +
+            'Use \'files\' instead.');
+      }
+
       const fileMatcher = globListToMatcher(group.resources.files || []);
       const versionedMatcher = globListToMatcher(group.resources.versionedFiles || []);
 
diff --git a/packages/service-worker/config/src/in.ts b/packages/service-worker/config/src/in.ts
index bf3e27a6c3..0328a53356 100644
--- a/packages/service-worker/config/src/in.ts
+++ b/packages/service-worker/config/src/in.ts
@@ -38,7 +38,13 @@ export interface AssetGroup {
   name: string;
   installMode?: 'prefetch'|'lazy';
   updateMode?: 'prefetch'|'lazy';
-  resources: {files?: Glob[]; versionedFiles?: Glob[]; urls?: Glob[];};
+  resources: {
+    files?: Glob[];
+    /** @deprecated As of v6 `versionedFiles` and `files` options have the same behavior. Use
+       `files` instead. */
+    versionedFiles?: Glob[];
+    urls?: Glob[];
+  };
 }
 
 /**
diff --git a/tools/public_api_guard/service-worker/config.d.ts b/tools/public_api_guard/service-worker/config.d.ts
index f1f664af34..6e68fd291e 100644
--- a/tools/public_api_guard/service-worker/config.d.ts
+++ b/tools/public_api_guard/service-worker/config.d.ts
@@ -4,7 +4,7 @@ export interface AssetGroup {
     name: string;
     resources: {
         files?: Glob[];
-        versionedFiles?: Glob[];
+        /** @deprecated */ versionedFiles?: Glob[];
         urls?: Glob[];
     };
     updateMode?: 'prefetch' | 'lazy';

From e5e5c24d48c67e0d2d16308ad65c5bd76351ec97 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 15 May 2018 12:34:04 -0700
Subject: [PATCH 056/582] release: cut the v6.0.2 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2bd4b2ce1..51041a4512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="6.0.2"></a>
+## [6.0.2](https://github.com/angular/angular/compare/6.0.1...6.0.2) (2018-05-15)
+
+
+### Bug Fixes
+
+* **animations:** do not throw errors when a destroyed component is animated ([#23836](https://github.com/angular/angular/issues/23836)) ([752b83a](https://github.com/angular/angular/commit/752b83a))
+* **service-worker:** deprecate `versionedFiles` in asset-group resources ([#23584](https://github.com/angular/angular/issues/23584)) ([c6b618d](https://github.com/angular/angular/commit/c6b618d))
+
+
+
 <a name="6.0.1"></a>
 # [6.0.1](https://github.com/angular/angular/compare/6.0.0...6.0.1) (2018-05-11)
 
diff --git a/package.json b/package.json
index d59fc77785..8da8259111 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 5cf82f8f3fef4dbeb00c63a328334a167d129344 Mon Sep 17 00:00:00 2001
From: Lucas Sloan <lucassloan@google.com>
Date: Tue, 8 May 2018 13:37:54 -0700
Subject: [PATCH 057/582] build: upgrade to TypeScript 2.8 (#23782)

PR Close #23782
---
 integration/typings_test_ts27/package.json    |  2 +-
 integration/typings_test_ts28/include-all.ts  | 47 +++++++++++++++++++
 integration/typings_test_ts28/package.json    | 30 ++++++++++++
 integration/typings_test_ts28/tsconfig.json   | 24 ++++++++++
 package.json                                  |  4 +-
 packages/bazel/package.json                   |  2 +-
 packages/compiler-cli/package.json            |  2 +-
 .../compiler-cli/src/transformers/program.ts  |  2 +-
 .../core/src/sanitization/html_sanitizer.ts   |  4 +-
 packages/core/src/sanitization/inert_body.ts  |  2 +-
 packages/language-service/src/ts_plugin.ts    | 11 +++--
 .../service-worker/worker/testing/cache.ts    |  3 +-
 .../src/common/downgrade_component_adapter.ts |  2 +-
 packages/upgrade/src/common/util.ts           | 13 -----
 yarn.lock                                     | 12 ++---
 15 files changed, 127 insertions(+), 33 deletions(-)
 create mode 100644 integration/typings_test_ts28/include-all.ts
 create mode 100644 integration/typings_test_ts28/package.json
 create mode 100644 integration/typings_test_ts28/tsconfig.json

diff --git a/integration/typings_test_ts27/package.json b/integration/typings_test_ts27/package.json
index 766ba3fec9..cfacf41182 100644
--- a/integration/typings_test_ts27/package.json
+++ b/integration/typings_test_ts27/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-integration",
-  "description": "Assert that users with TypeScript 2.6 can type-check an Angular application",
+  "description": "Assert that users with TypeScript 2.7 can type-check an Angular application",
   "version": "0.0.0",
   "license": "MIT",
   "dependencies": {
diff --git a/integration/typings_test_ts28/include-all.ts b/integration/typings_test_ts28/include-all.ts
new file mode 100644
index 0000000000..78cefe0030
--- /dev/null
+++ b/integration/typings_test_ts28/include-all.ts
@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as compiler from '@angular/compiler';
+import * as compilerTesting from '@angular/compiler/testing';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
+import * as forms from '@angular/forms';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as platformWebworker from '@angular/platform-webworker';
+import * as platformWebworkerDynamic from '@angular/platform-webworker-dynamic';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
+import * as serviceWorker from '@angular/service-worker';
+import * as upgrade from '@angular/upgrade';
+
+export default {
+  compiler,
+  compilerTesting,
+  core,
+  coreTesting,
+  forms,
+  http,
+  httpTesting,
+  platformBrowser,
+  platformBrowserTesting,
+  platformBrowserDynamic,
+  platformServer,
+  platformServerTesting,
+  platformWebworker,
+  platformWebworkerDynamic,
+  router,
+  routerTesting,
+  serviceWorker,
+  upgrade,
+};
diff --git a/integration/typings_test_ts28/package.json b/integration/typings_test_ts28/package.json
new file mode 100644
index 0000000000..8c3ddac65e
--- /dev/null
+++ b/integration/typings_test_ts28/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "angular-integration",
+  "description": "Assert that users with TypeScript 2.8 can type-check an Angular application",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/platform-webworker": "file:../../dist/packages-dist/platform-webworker",
+    "@angular/platform-webworker-dynamic": "file:../../dist/packages-dist/platform-webworker-dynamic",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/service-worker": "file:../../dist/packages-dist/service-worker",
+    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
+    "@types/jasmine": "2.5.41",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "2.8.x",
+    "zone.js": "file:../../node_modules/zone.js"
+  },
+  "scripts": {
+    "test": "tsc"
+  }
+}
diff --git a/integration/typings_test_ts28/tsconfig.json b/integration/typings_test_ts28/tsconfig.json
new file mode 100644
index 0000000000..165bd7a957
--- /dev/null
+++ b/integration/typings_test_ts28/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/typings_test_ts28/",
+    "rootDir": ".",
+    "target": "es5",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.collection",
+      "es2015.iterable",
+      "es2015.promise"
+    ],
+    "types": [],
+    "strictNullChecks": true
+  },
+  "files": [
+    "include-all.ts",
+    "node_modules/@types/jasmine/index.d.ts"
+  ]
+}
diff --git a/package.json b/package.json
index 8da8259111..b38d5d6dbf 100644
--- a/package.json
+++ b/package.json
@@ -110,11 +110,11 @@
     "source-map": "0.5.7",
     "source-map-support": "0.4.18",
     "systemjs": "0.18.10",
-    "tsickle": "^0.27.2",
+    "tsickle": "^0.28.0",
     "tslint": "5.7.0",
     "tslint-eslint-rules": "4.1.1",
     "tsutils": "2.20.0",
-    "typescript": "2.7.x",
+    "typescript": "2.8.x",
     "uglify-es": "^3.3.9",
     "universal-analytics": "0.4.15",
     "vlq": "0.2.2",
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index 19d1fde5c6..820bddaf98 100644
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@@ -13,7 +13,7 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "typescript": ">=2.7.2 <2.8"
+    "typescript": ">=2.7.2 <2.9"
   },
   "repository": {
     "type": "git",
diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json
index 25f420400f..8249b66deb 100644
--- a/packages/compiler-cli/package.json
+++ b/packages/compiler-cli/package.json
@@ -15,7 +15,7 @@
     "chokidar": "^1.4.2"
   },
   "peerDependencies": {
-    "typescript": ">=2.7.2 <2.8",
+    "typescript": ">=2.7.2 <2.9",
     "@angular/compiler": "0.0.0-PLACEHOLDER"
   },
   "engines" : {
diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts
index f58dd7d465..78764efca3 100644
--- a/packages/compiler-cli/src/transformers/program.ts
+++ b/packages/compiler-cli/src/transformers/program.ts
@@ -108,7 +108,7 @@ const MIN_TS_VERSION = '2.7.2';
  * ∀ supported typescript version v, v < MAX_TS_VERSION
  * MAX_TS_VERSION is not considered as a supported TypeScript version
  */
-const MAX_TS_VERSION = '2.8.0';
+const MAX_TS_VERSION = '2.9.0';
 
 class AngularCompilerProgram implements Program {
   private rootNames: string[];
diff --git a/packages/core/src/sanitization/html_sanitizer.ts b/packages/core/src/sanitization/html_sanitizer.ts
index dc49a6d073..cfa7e58035 100644
--- a/packages/core/src/sanitization/html_sanitizer.ts
+++ b/packages/core/src/sanitization/html_sanitizer.ts
@@ -141,13 +141,13 @@ class SanitizingHtmlSerializer {
     const elAttrs = element.attributes;
     for (let i = 0; i < elAttrs.length; i++) {
       const elAttr = elAttrs.item(i);
-      const attrName = elAttr.name;
+      const attrName = elAttr !.name;
       const lower = attrName.toLowerCase();
       if (!VALID_ATTRS.hasOwnProperty(lower)) {
         this.sanitizedSomething = true;
         continue;
       }
-      let value = elAttr.value;
+      let value = elAttr !.value;
       // TODO(martinprobst): Special case image URIs for data:image/...
       if (URI_ATTRS[lower]) value = _sanitizeUrl(value);
       if (SRCSET_ATTRS[lower]) value = sanitizeSrcset(value);
diff --git a/packages/core/src/sanitization/inert_body.ts b/packages/core/src/sanitization/inert_body.ts
index 85463c7c9d..fb90f71a54 100644
--- a/packages/core/src/sanitization/inert_body.ts
+++ b/packages/core/src/sanitization/inert_body.ts
@@ -146,7 +146,7 @@ export class InertBodyHelper {
     // loop backwards so that we can support removals.
     for (let i = elAttrs.length - 1; 0 < i; i--) {
       const attrib = elAttrs.item(i);
-      const attrName = attrib.name;
+      const attrName = attrib !.name;
       if (attrName === 'xmlns:ns1' || attrName.indexOf('ns1:') === 0) {
         el.removeAttribute(attrName);
       }
diff --git a/packages/language-service/src/ts_plugin.ts b/packages/language-service/src/ts_plugin.ts
index b7336d9bbd..6457c4ef52 100644
--- a/packages/language-service/src/ts_plugin.ts
+++ b/packages/language-service/src/ts_plugin.ts
@@ -64,7 +64,7 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
   }
 
   function typescriptOnly(ls: ts.LanguageService): ts.LanguageService {
-    return {
+    const languageService: ts.LanguageService = {
       cleanupSemanticCache: () => ls.cleanupSemanticCache(),
       getSyntacticDiagnostics: tryFilenameCall(ls.getSyntacticDiagnostics),
       getSemanticDiagnostics: tryFilenameCall(ls.getSemanticDiagnostics),
@@ -117,8 +117,13 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
       getDefinitionAndBoundSpan: tryFilenameOneCall(ls.getDefinitionAndBoundSpan),
       getCombinedCodeFix:
           (scope: ts.CombinedCodeFixScope, fixId: {}, formatOptions: ts.FormatCodeSettings) =>
-              tryCall(undefined, () => ls.getCombinedCodeFix(scope, fixId, formatOptions))
-    };
+              tryCall(undefined, () => ls.getCombinedCodeFix(scope, fixId, formatOptions)),
+      // TODO(kyliau): dummy implementation to compile with ts 2.8, create real one
+      getSuggestionDiagnostics: (fileName: string) => [],
+      // TODO(kyliau): dummy implementation to compile with ts 2.8, create real one
+      organizeImports: (scope: ts.CombinedCodeFixScope, formatOptions: ts.FormatCodeSettings) => [],
+    } as ts.LanguageService;
+    return languageService;
   }
 
   oldLS = typescriptOnly(oldLS);
diff --git a/packages/service-worker/worker/testing/cache.ts b/packages/service-worker/worker/testing/cache.ts
index e56c43410a..b24147e2f6 100644
--- a/packages/service-worker/worker/testing/cache.ts
+++ b/packages/service-worker/worker/testing/cache.ts
@@ -156,7 +156,8 @@ export class MockCache {
         headers: {},
       } as DehydratedResponse;
 
-      resp.headers.forEach((value, name) => { dehydratedResp.headers[name] = value; });
+      resp.headers.forEach(
+          (value: string, name: string) => { dehydratedResp.headers[name] = value; });
 
       dehydrated[url] = dehydratedResp;
     });
diff --git a/packages/upgrade/src/common/downgrade_component_adapter.ts b/packages/upgrade/src/common/downgrade_component_adapter.ts
index 7d15d0c4a5..fd20b79e0a 100644
--- a/packages/upgrade/src/common/downgrade_component_adapter.ts
+++ b/packages/upgrade/src/common/downgrade_component_adapter.ts
@@ -11,7 +11,7 @@ import {ApplicationRef, ChangeDetectorRef, ComponentFactory, ComponentRef, Event
 import * as angular from './angular1';
 import {PropertyBinding} from './component_info';
 import {$SCOPE} from './constants';
-import {getAttributesAsArray, getComponentName, hookupNgModel, strictEquals} from './util';
+import {getComponentName, hookupNgModel, strictEquals} from './util';
 
 const INITIAL_VALUE = {
   __UNINITIALIZED__: true
diff --git a/packages/upgrade/src/common/util.ts b/packages/upgrade/src/common/util.ts
index 15213dd986..0407753b10 100644
--- a/packages/upgrade/src/common/util.ts
+++ b/packages/upgrade/src/common/util.ts
@@ -32,19 +32,6 @@ export function directiveNormalize(name: string): string {
       .replace(DIRECTIVE_SPECIAL_CHARS_REGEXP, (_, letter) => letter.toUpperCase());
 }
 
-export function getAttributesAsArray(node: Node): [string, string][] {
-  const attributes = node.attributes;
-  let asArray: [string, string][] = undefined !;
-  if (attributes) {
-    let attrLen = attributes.length;
-    asArray = new Array(attrLen);
-    for (let i = 0; i < attrLen; i++) {
-      asArray[i] = [attributes[i].nodeName, attributes[i].nodeValue !];
-    }
-  }
-  return asArray || [];
-}
-
 export function getComponentName(component: Type<any>): string {
   // Return the name of the component or the first line of its stringified version.
   return (component as any).overriddenName || component.name || component.toString().split('\n')[0];
diff --git a/yarn.lock b/yarn.lock
index 5b87332be0..a04ffc296d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5886,9 +5886,9 @@ trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
-tsickle@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
+tsickle@^0.28.0:
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -5989,9 +5989,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@2.7.x:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+typescript@2.8.x:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
 
 typescript@~2.6.2:
   version "2.6.2"

From 313bdce590ece63a45691bc36b15b624df762250 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@google.com>
Date: Mon, 14 May 2018 18:39:15 -0700
Subject: [PATCH 058/582] feat(platform-browser): allow lazy-loading HammerJS
 (#23906)

PR Close #23906
---
 .../src/dom/events/hammer_gestures.ts         |  57 ++++++-
 .../test/dom/events/hammer_gestures_spec.ts   | 148 ++++++++++++++++--
 2 files changed, 185 insertions(+), 20 deletions(-)

diff --git a/packages/platform-browser/src/dom/events/hammer_gestures.ts b/packages/platform-browser/src/dom/events/hammer_gestures.ts
index c4c6856b95..e51126de6c 100644
--- a/packages/platform-browser/src/dom/events/hammer_gestures.ts
+++ b/packages/platform-browser/src/dom/events/hammer_gestures.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, InjectionToken, ɵConsole as Console} from '@angular/core';
+import {Inject, Injectable, InjectionToken, Optional, ɵConsole as Console} from '@angular/core';
 
 import {DOCUMENT} from '../dom_tokens';
 
@@ -58,6 +58,13 @@ const EVENT_NAMES = {
  */
 export const HAMMER_GESTURE_CONFIG = new InjectionToken<HammerGestureConfig>('HammerGestureConfig');
 
+
+/** Function that loads HammerJS, returning a promise that is resolved once HammerJs is loaded. */
+export type HammerLoader = (() => Promise<void>) | null;
+
+/** Injection token used to provide a {@link HammerLoader} to Angular. */
+export const HAMMER_LOADER = new InjectionToken<HammerLoader>('HammerLoader');
+
 export interface HammerInstance {
   on(eventName: string, callback?: Function): void;
   off(eventName: string, callback?: Function): void;
@@ -99,8 +106,8 @@ export class HammerGestureConfig {
 export class HammerGesturesPlugin extends EventManagerPlugin {
   constructor(
       @Inject(DOCUMENT) doc: any,
-      @Inject(HAMMER_GESTURE_CONFIG) private _config: HammerGestureConfig,
-      private console: Console) {
+      @Inject(HAMMER_GESTURE_CONFIG) private _config: HammerGestureConfig, private console: Console,
+      @Optional() @Inject(HAMMER_LOADER) private loader?: HammerLoader) {
     super(doc);
   }
 
@@ -109,8 +116,10 @@ export class HammerGesturesPlugin extends EventManagerPlugin {
       return false;
     }
 
-    if (!(window as any).Hammer) {
-      this.console.warn(`Hammer.js is not loaded, can not bind '${eventName}' event.`);
+    if (!(window as any).Hammer && !this.loader) {
+      this.console.warn(
+          `The "${eventName}" event cannot be bound because Hammer.JS is not ` +
+          `loaded and no custom loader has been specified.`);
       return false;
     }
 
@@ -121,6 +130,44 @@ export class HammerGesturesPlugin extends EventManagerPlugin {
     const zone = this.manager.getZone();
     eventName = eventName.toLowerCase();
 
+    // If Hammer is not present but a loader is specified, we defer adding the event listener
+    // until Hammer is loaded.
+    if (!(window as any).Hammer && this.loader) {
+      // This `addEventListener` method returns a function to remove the added listener.
+      // Until Hammer is loaded, the returned function needs to *cancel* the registration rather
+      // than remove anything.
+      let cancelRegistration = false;
+      let deregister: Function = () => { cancelRegistration = true; };
+
+      this.loader()
+          .then(() => {
+            // If Hammer isn't actually loaded when the custom loader resolves, give up.
+            if (!(window as any).Hammer) {
+              this.console.warn(
+                  `The custom HAMMER_LOADER completed, but Hammer.JS is not present.`);
+              deregister = () => {};
+              return;
+            }
+
+            if (!cancelRegistration) {
+              // Now that Hammer is loaded and the listener is being loaded for real,
+              // the deregistration function changes from canceling registration to removal.
+              deregister = this.addEventListener(element, eventName, handler);
+            }
+          })
+          .catch(() => {
+            this.console.warn(
+                `The "${eventName}" event cannot be bound because the custom ` +
+                `Hammer.JS loader failed.`);
+            deregister = () => {};
+          });
+
+      // Return a function that *executes* `deregister` (and not `deregister` itself) so that we
+      // can change the behavior of `deregister` once the listener is added. Using a closure in
+      // this way allows us to avoid any additional data structures to track listener removal.
+      return () => { deregister(); };
+    }
+
     return zone.runOutsideAngular(() => {
       // Creating the manager bind events, must be done outside of angular
       const mc = this._config.buildHammer(element);
diff --git a/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts b/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts
index d9d87393da..cf82361a9b 100644
--- a/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts
+++ b/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts
@@ -5,32 +5,150 @@
  * 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 {describe, expect, it} from '@angular/core/testing/src/testing_internal';
-import {HammerGestureConfig, HammerGesturesPlugin} from '@angular/platform-browser/src/dom/events/hammer_gestures';
+import {NgZone} from '@angular/core';
+import {fakeAsync, inject, tick} from '@angular/core/testing';
+import {afterEach, beforeEach, describe, expect, it,} from '@angular/core/testing/src/testing_internal';
+import {EventManager} from '@angular/platform-browser';
+import {HammerGestureConfig, HammerGesturesPlugin,} from '@angular/platform-browser/src/dom/events/hammer_gestures';
 
 {
   describe('HammerGesturesPlugin', () => {
     let plugin: HammerGesturesPlugin;
-    let mockConsole: any;
+    let fakeConsole: any;
     if (isNode) return;
 
-    beforeEach(() => {
-      mockConsole = {warn: () => {}};
-      plugin = new HammerGesturesPlugin(document, new HammerGestureConfig(), mockConsole);
+    beforeEach(() => { fakeConsole = {warn: jasmine.createSpy('console.warn')}; });
+
+    describe('with no custom loader', () => {
+      beforeEach(() => {
+        plugin = new HammerGesturesPlugin(document, new HammerGestureConfig(), fakeConsole);
+      });
+
+      it('should implement addGlobalEventListener', () => {
+        spyOn(plugin, 'addEventListener').and.callFake(() => {});
+
+        expect(() => {
+          plugin.addGlobalEventListener('document', 'swipe', () => {});
+        }).not.toThrowError();
+      });
+
+      it('should warn user and do nothing when Hammer.js not loaded', () => {
+        expect(plugin.supports('swipe')).toBe(false);
+        expect(fakeConsole.warn)
+            .toHaveBeenCalledWith(
+                `The "swipe" event cannot be bound because Hammer.JS is not ` +
+                `loaded and no custom loader has been specified.`);
+      });
     });
 
-    it('should implement addGlobalEventListener', () => {
-      spyOn(plugin, 'addEventListener').and.callFake(() => {});
+    describe('with a custom loader', () => {
+      // Use a fake custom loader for tests, with helper functions to resolve or reject.
+      let loader: () => Promise<void>;
+      let resolveLoader: () => void;
+      let failLoader: () => void;
 
-      expect(() => plugin.addGlobalEventListener('document', 'swipe', () => {})).not.toThrowError();
-    });
+      // Arbitrary element and listener for testing.
+      let someElement: HTMLDivElement;
+      let someListener: () => void;
 
-    it('should warn user and do nothing when Hammer.js not loaeded', () => {
-      spyOn(mockConsole, 'warn');
+      // Keep track of whatever value is in `window.Hammer` before the test so it can be
+      // restored afterwards so that this test doesn't care whether Hammer is actually loaded.
+      let originalHammerGlobal: any;
 
-      expect(plugin.supports('swipe')).toBe(false);
-      expect(mockConsole.warn)
-          .toHaveBeenCalledWith(`Hammer.js is not loaded, can not bind 'swipe' event.`);
+      // Fake Hammer instance ("mc") used to test the underlying event registration.
+      let fakeHammerInstance: {on: () => void, off: () => void};
+
+      // Inject the NgZone so that we can make it available to the plugin through a fake
+      // EventManager.
+      let ngZone: NgZone;
+      beforeEach(inject([NgZone], (z: NgZone) => { ngZone = z; }));
+
+      beforeEach(() => {
+        originalHammerGlobal = (window as any).Hammer;
+        (window as any).Hammer = undefined;
+
+        fakeHammerInstance = {
+          on: jasmine.createSpy('mc.on'),
+          off: jasmine.createSpy('mc.off'),
+        };
+
+        loader = () => new Promise((resolve, reject) => {
+          resolveLoader = resolve;
+          failLoader = reject;
+        });
+
+        // Make the hammer config return a fake hammer instance
+        const hammerConfig = new HammerGestureConfig();
+        spyOn(hammerConfig, 'buildHammer').and.returnValue(fakeHammerInstance);
+
+        plugin = new HammerGesturesPlugin(document, hammerConfig, fakeConsole, loader);
+
+        // Use a fake EventManager that has access to the NgZone.
+        plugin.manager = { getZone: () => ngZone } as EventManager;
+
+        someElement = document.createElement('div');
+        someListener = () => {};
+      });
+
+      afterEach(() => { (window as any).Hammer = originalHammerGlobal; });
+
+      it('should not log a warning when HammerJS is not loaded', () => {
+        plugin.addEventListener(someElement, 'swipe', () => {});
+        expect(fakeConsole.warn).not.toHaveBeenCalled();
+      });
+
+      it('should defer registering an event until Hammer is loaded', fakeAsync(() => {
+           plugin.addEventListener(someElement, 'swipe', someListener);
+           expect(fakeHammerInstance.on).not.toHaveBeenCalled();
+
+           (window as any).Hammer = {};
+           resolveLoader();
+           tick();
+
+           expect(fakeHammerInstance.on).toHaveBeenCalledWith('swipe', jasmine.any(Function));
+         }));
+
+      it('should cancel registration if an event is removed before being added', fakeAsync(() => {
+           const deregister = plugin.addEventListener(someElement, 'swipe', someListener);
+           deregister();
+
+           (window as any).Hammer = {};
+           resolveLoader();
+           tick();
+
+           expect(fakeHammerInstance.on).not.toHaveBeenCalled();
+         }));
+
+      it('should remove a listener after Hammer is loaded', fakeAsync(() => {
+           const removeListener = plugin.addEventListener(someElement, 'swipe', someListener);
+
+           (window as any).Hammer = {};
+           resolveLoader();
+           tick();
+
+           removeListener();
+           expect(fakeHammerInstance.off).toHaveBeenCalledWith('swipe', jasmine.any(Function));
+         }));
+
+      it('should log a warning when the loader fails', fakeAsync(() => {
+           plugin.addEventListener(someElement, 'swipe', () => {});
+           failLoader();
+           tick();
+
+           expect(fakeConsole.warn)
+               .toHaveBeenCalledWith(
+                   `The "swipe" event cannot be bound because the custom Hammer.JS loader failed.`);
+         }));
+
+      it('should load a warning if the loader resolves and Hammer is not present', fakeAsync(() => {
+           plugin.addEventListener(someElement, 'swipe', () => {});
+           resolveLoader();
+           tick();
+
+           expect(fakeConsole.warn)
+               .toHaveBeenCalledWith(
+                   `The custom HAMMER_LOADER completed, but Hammer.JS is not present.`);
+         }));
     });
   });
 }

From b7c417f618f1aa27fe1613129711d1380ce71dce Mon Sep 17 00:00:00 2001
From: Stefanie Fluin <sjtrimble@gmail.com>
Date: Fri, 27 Apr 2018 20:47:23 -0700
Subject: [PATCH 059/582] feat(aio): add brand and concept icons, img style
 class more flexible (#23589)

PR Close #23589
---
 aio/content/marketing/presskit.html           | 434 ++++++++++++++++++
 .../images/logos/concept-icons/animations.png | Bin 0 -> 4660 bytes
 .../images/logos/concept-icons/animations.svg |   1 +
 .../images/logos/concept-icons/augury.png     | Bin 0 -> 5317 bytes
 .../images/logos/concept-icons/augury.svg     |   1 +
 .../assets/images/logos/concept-icons/cdk.png | Bin 0 -> 2966 bytes
 .../assets/images/logos/concept-icons/cdk.svg |   1 +
 .../assets/images/logos/concept-icons/cli.png | Bin 0 -> 3312 bytes
 .../assets/images/logos/concept-icons/cli.svg |   1 +
 .../images/logos/concept-icons/compiler.png   | Bin 0 -> 6288 bytes
 .../images/logos/concept-icons/compiler.svg   |   1 +
 .../images/logos/concept-icons/components.png | Bin 0 -> 4763 bytes
 .../images/logos/concept-icons/components.svg |   1 +
 .../concept-icons/dependency-injection.png    | Bin 0 -> 4366 bytes
 .../concept-icons/dependency-injection.svg    |   1 +
 .../images/logos/concept-icons/forms.png      | Bin 0 -> 3512 bytes
 .../images/logos/concept-icons/forms.svg      |   1 +
 .../images/logos/concept-icons/http.png       | Bin 0 -> 4835 bytes
 .../images/logos/concept-icons/http.svg       |   1 +
 .../images/logos/concept-icons/i18n.png       | Bin 0 -> 7242 bytes
 .../images/logos/concept-icons/i18n.svg       |   1 +
 .../images/logos/concept-icons/karma.png      | Bin 0 -> 5096 bytes
 .../images/logos/concept-icons/karma.svg      |   1 +
 .../images/logos/concept-icons/labs.png       | Bin 0 -> 5775 bytes
 .../images/logos/concept-icons/labs.svg       |   1 +
 .../logos/concept-icons/language-services.png | Bin 0 -> 5360 bytes
 .../logos/concept-icons/language-services.svg |   1 +
 .../logos/concept-icons/lazy-loading.png      | Bin 0 -> 5839 bytes
 .../logos/concept-icons/lazy-loading.svg      |   1 +
 .../images/logos/concept-icons/libraries.png  | Bin 0 -> 4064 bytes
 .../images/logos/concept-icons/libraries.svg  |   1 +
 .../images/logos/concept-icons/material.png   | Bin 0 -> 5278 bytes
 .../images/logos/concept-icons/material.svg   |   1 +
 .../logos/concept-icons/performance.png       | Bin 0 -> 5560 bytes
 .../logos/concept-icons/performance.svg       |   1 +
 .../images/logos/concept-icons/protractor.png | Bin 0 -> 4909 bytes
 .../images/logos/concept-icons/protractor.svg |   1 +
 .../assets/images/logos/concept-icons/pwa.png | Bin 0 -> 5000 bytes
 .../assets/images/logos/concept-icons/pwa.svg |   1 +
 .../images/logos/concept-icons/router.png     | Bin 0 -> 3546 bytes
 .../images/logos/concept-icons/router.svg     |   1 +
 .../images/logos/concept-icons/templates.png  | Bin 0 -> 3046 bytes
 .../images/logos/concept-icons/templates.svg  |   1 +
 .../images/logos/concept-icons/universal.png  | Bin 0 -> 3717 bytes
 .../images/logos/concept-icons/universal.svg  |   1 +
 aio/src/styles/2-modules/_presskit.scss       |   2 +-
 46 files changed, 457 insertions(+), 1 deletion(-)
 create mode 100755 aio/src/assets/images/logos/concept-icons/animations.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/animations.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/augury.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/augury.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/cdk.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/cdk.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/cli.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/cli.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/compiler.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/compiler.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/components.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/components.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/dependency-injection.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/dependency-injection.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/forms.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/forms.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/http.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/http.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/i18n.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/i18n.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/karma.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/karma.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/labs.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/labs.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/language-services.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/language-services.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/lazy-loading.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/lazy-loading.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/libraries.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/libraries.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/material.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/material.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/performance.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/performance.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/protractor.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/protractor.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/pwa.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/pwa.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/router.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/router.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/templates.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/templates.svg
 create mode 100755 aio/src/assets/images/logos/concept-icons/universal.png
 create mode 100644 aio/src/assets/images/logos/concept-icons/universal.svg

diff --git a/aio/content/marketing/presskit.html b/aio/content/marketing/presskit.html
index 0fb8b79500..5d20411d0e 100644
--- a/aio/content/marketing/presskit.html
+++ b/aio/content/marketing/presskit.html
@@ -78,6 +78,440 @@
     </div>
   </div>
 
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div>
+        <h2>BRAND ICONS</h2>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/animations.png" alt="Animations Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">ANIMATIONS</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Animations Icon (png) - <a href="assets/images/logos/concept-icons/animations.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Animations Icon (svg) - <a href="assets/images/logos/concept-icons/animations.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/augury.png" alt="Augury Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">AUGURY</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Augury Icon (png) - <a href="assets/images/logos/concept-icons/augury.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Augury Icon (svg) - <a href="assets/images/logos/concept-icons/augury.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/cdk.png" alt="CDK Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">COMPONENT DEV KIT (CDK)</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>CDK Icon (png) - <a href="assets/images/logos/concept-icons/cdk.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>CDK Icon (svg) - <a href="assets/images/logos/concept-icons/cdk.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/cli.png" alt="CLI Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">CLI</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>CLI Icon (png) - <a href="assets/images/logos/concept-icons/cli.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>CLI Icon (svg) - <a href="assets/images/logos/concept-icons/cli.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/compiler.png" alt="Compiler Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">COMPILER</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Compiler Icon (png) - <a href="assets/images/logos/concept-icons/compiler.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Compiler Icon (svg) - <a href="assets/images/logos/concept-icons/compiler.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/components.png" alt="Components Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">WEB COMPONENTS</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Web Components Icon (png) - <a href="assets/images/logos/concept-icons/components.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Web Components Icon (svg) - <a href="assets/images/logos/concept-icons/components.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/forms.png" alt="Forms Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">FORMS</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Forms Icon (png) - <a href="assets/images/logos/concept-icons/forms.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Forms Icon (svg) - <a href="assets/images/logos/concept-icons/forms.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/http.png" alt="HTTP Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">HTTP</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>HTTP Icon (png) - <a href="assets/images/logos/concept-icons/http.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>HTTP Icon (svg) - <a href="assets/images/logos/concept-icons/http.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/i18n.png" alt="i18n Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">i18n</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>HTTP Icon (png) - <a href="assets/images/logos/concept-icons/i18n.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>HTTP Icon (svg) - <a href="assets/images/logos/concept-icons/i18n.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/karma.png" alt="Karma Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">KARMA</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Karma Icon (png) - <a href="assets/images/logos/concept-icons/karma.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Karma Icon (svg) - <a href="assets/images/logos/concept-icons/karma.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/labs.png" alt="Labs Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">LABS</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Labs Icon (png) - <a href="assets/images/logos/concept-icons/labs.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Labs Icon (svg) - <a href="assets/images/logos/concept-icons/labs.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/language-services.png" alt="Language Services Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">LANGUAGE SERVICES</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Language Services Icon (png) - <a href="assets/images/logos/concept-icons/language-services.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Language Services Icon (svg) - <a href="assets/images/logos/concept-icons/language-services.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/material.png" alt="Material Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">MATERIAL</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Material Icon (png) - <a href="assets/images/logos/concept-icons/material.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Material Icon (svg) - <a href="assets/images/logos/concept-icons/material.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/protractor.png" alt="Protractor Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">PROTRACTOR</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Protractor Icon (png) - <a href="assets/images/logos/concept-icons/protractor.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Protractor Icon (svg) - <a href="assets/images/logos/concept-icons/protractor.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/pwa.png" alt="PWA Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">PWA</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>PWA Icon (png) - <a href="assets/images/logos/concept-icons/pwa.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>PWA Icon (svg) - <a href="assets/images/logos/concept-icons/pwa.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/router.png" alt="Router Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">ROUTER</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Router Icon (png) - <a href="assets/images/logos/concept-icons/router.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Router Icon (svg) - <a href="assets/images/logos/concept-icons/router.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/universal.png" alt="Universal Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">UNIVERSAL</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Universal Icon (png) - <a href="assets/images/logos/concept-icons/universal.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Universal Icon (svg) - <a href="assets/images/logos/concept-icons/universal.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div>
+        <h2>CONCEPT & FEATURE ICONS</h2>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/dependency-injection.png" alt="Dependency Injection Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">DEPENDENCY INJECTION</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Dependency Injection Icon (png) - <a href="assets/images/logos/concept-icons/dependency-injection.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Dependency Injection Icon (svg) - <a href="assets/images/logos/concept-icons/dependency-injection.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/lazy-loading.png" alt="Lazy Loading Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">LAZY LOADING</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Lazy Loading Icon (png) - <a href="assets/images/logos/concept-icons/lazy-loading.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Lazy Loading Icon (svg) - <a href="assets/images/logos/concept-icons/lazy-loading.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/libraries.png" alt="Libraries Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">LIBRARIES</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Libraries Icon (png) - <a href="assets/images/logos/concept-icons/libraries.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Libraries Icon (svg) - <a href="assets/images/logos/concept-icons/libraries.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/performance.png" alt="Performance Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">PERFORMANCE</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Performance Icon (png) - <a href="assets/images/logos/concept-icons/performance.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Performance Icon (svg) - <a href="assets/images/logos/concept-icons/performance.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="presskit-row">
+    <div class="presskit-inner">
+      <div class="presskit-image-container">
+        <img src="assets/images/logos/concept-icons/templates.png" alt="Templates Icon">
+      </div>
+      <div>
+        <h3 class="l-space-left-3">TEMPLATES</h3>
+        <ul class="l-space-left-3">
+          <li>
+            <span>Templates Icon (png) - <a href="assets/images/logos/concept-icons/templates.png" download>Download</a></span>
+          </li>
+          <li>
+            <span>Templates Icon (svg) - <a href="assets/images/logos/concept-icons/templates.svg" download>Download</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
   <div class="presskit-row">
     <div class="presskit-inner">
       <div>
diff --git a/aio/src/assets/images/logos/concept-icons/animations.png b/aio/src/assets/images/logos/concept-icons/animations.png
new file mode 100755
index 0000000000000000000000000000000000000000..85bec902259b83744af6b5b8c7d0b9eaf1df4d8e
GIT binary patch
literal 4660
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
Xp5Nk_J=*~I4Fp2KjbP>44pILD8ASbA

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/animations.svg b/aio/src/assets/images/logos/concept-icons/animations.svg
new file mode 100644
index 0000000000..6e73ef3110
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/animations.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#ff7043;}.cls-2{fill:#f4511e;}.cls-3{fill:#ffb8a1;}.cls-4{fill:#ffc6b4;}.cls-5{fill:#ffe2d9;}.cls-6{fill:#fff;}</style></defs><title>animations</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><rect class="cls-3" x="43" y="71.2" width="68.4" height="68.84" rx="4" ry="4"/><rect class="cls-4" x="57.4" y="62.3" width="68.8" height="68.84" rx="4" ry="4" transform="translate(38.6 -25.6) rotate(20)"/><rect class="cls-5" x="71.3" y="59.2" width="68.8" height="68.84" rx="4" ry="4" transform="translate(66.9 -42.1) rotate(32.5)"/><rect class="cls-6" x="81.6" y="58.3" width="68.8" height="68.84" rx="4" ry="4" transform="translate(99.6 -54.9) rotate(45)"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/augury.png b/aio/src/assets/images/logos/concept-icons/augury.png
new file mode 100755
index 0000000000000000000000000000000000000000..d65dd38c3b1e06f058beee773ca9a15715083e1d
GIT binary patch
literal 5317
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
Kp>;YgvHt^lTpf}C

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/augury.svg b/aio/src/assets/images/logos/concept-icons/augury.svg
new file mode 100644
index 0000000000..6080bea35c
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/augury.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#4a3493;}.cls-2{fill:#311b92;}.cls-3{opacity:0.5;}.cls-4{fill:#fff;}</style></defs><title>augury</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><g id="Group-2"><g id="Group-2-2" class="cls-3"><path id="Combined-Shape" class="cls-4" d="M142.4,90.2A44.1,44.1,0,1,1,92.7,52.8a40.3,40.3,0,0,1,6-.4,44.8,44.8,0,0,1,15.9,2.9,25.8,25.8,0,1,0,27.8,34.9Z"/></g><path id="Combined-Shape-2" class="cls-4" d="M140.6,87.8A44.1,44.1,0,1,1,90.9,50.4a40.3,40.3,0,0,1,6-.4,45.6,45.6,0,0,1,15.9,2.9,25.8,25.8,0,1,0,27.8,34.9Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/cdk.png b/aio/src/assets/images/logos/concept-icons/cdk.png
new file mode 100755
index 0000000000000000000000000000000000000000..03003c5f553111d91fb7a21cc64ecdba1450e4b3
GIT binary patch
literal 2966
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
F{{aNHvVs5r

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/cdk.svg b/aio/src/assets/images/logos/concept-icons/cdk.svg
new file mode 100644
index 0000000000..551cd705bd
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/cdk.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#03a9f4;}.cls-2{fill:#039be5;}.cls-3{fill:#fff;}</style></defs><title>cdk</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><rect class="cls-3" x="117.8" y="45" width="30" height="30" rx="1" ry="1"/><rect class="cls-3" x="117.8" y="85" width="30" height="30" rx="1" ry="1"/><rect class="cls-3" x="117.8" y="125" width="30" height="30" rx="1" ry="1"/><rect class="cls-3" x="77.8" y="125" width="30" height="30" rx="1" ry="1"/><rect class="cls-3" x="37.8" y="125" width="30" height="30" rx="1" ry="1"/><rect class="cls-3" x="37.8" y="85" width="30" height="30" rx="1" ry="1"/><rect class="cls-3" x="77.8" y="85" width="30" height="30" rx="1" ry="1"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/cli.png b/aio/src/assets/images/logos/concept-icons/cli.png
new file mode 100755
index 0000000000000000000000000000000000000000..e4d2b584521f80a04a1950587bc3e8c4fa7112f9
GIT binary patch
literal 3312
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
Hxl;ZQ)rlR4

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/cli.svg b/aio/src/assets/images/logos/concept-icons/cli.svg
new file mode 100644
index 0000000000..1d00bd1f08
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/cli.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#37474f;}.cls-2{fill:#263238;}.cls-3{fill:#fff;}</style></defs><title>cli</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><path class="cls-3" d="M42.8,55v90h100V55ZM138,139.9H47.5V60.1h90.6v79.8Z"/><polygon class="cls-3" points="60.1 111.4 63.5 114.9 82.8 95.5 63.2 75.9 59.8 79.3 76 95.5 60.1 111.4"/><rect class="cls-3" x="82.8" y="117.2" width="30" height="4"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/compiler.png b/aio/src/assets/images/logos/concept-icons/compiler.png
new file mode 100755
index 0000000000000000000000000000000000000000..285031201a6581e842b41fc62cb2b99a066243d0
GIT binary patch
literal 6288
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
Is!w452kX5b+W-In

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/compiler.svg b/aio/src/assets/images/logos/concept-icons/compiler.svg
new file mode 100644
index 0000000000..b1fdbce869
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/compiler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#8bc34a;}.cls-2{fill:#7cb342;}.cls-3{fill:#fff;stroke:#fff;stroke-miterlimit:10;stroke-width:0.08px;}.cls-4{fill:#bed9a1;}</style></defs><title>compiler</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><path class="cls-3" d="M113.9,144.1l-1.5-5.5a7,7,0,0,1,2.7-7.4,26.2,26.2,0,0,0,4.8-4,36,36,0,0,0,4.1-4.8,6.7,6.7,0,0,1,7.4-2.7l5.4,1.4a1.7,1.7,0,0,0,1.4-.1c.5-.3.9-.7.9-1.1l3.7-13.8a1.9,1.9,0,0,0-1.4-2.2l-5.4-1.5a7.2,7.2,0,0,1-5.2-6,38.7,38.7,0,0,0-3.2-12.1,7.1,7.1,0,0,1,1.3-7.9l4-3.9a1.9,1.9,0,0,0,0-2.6l-10-10a1.8,1.8,0,0,0-2.5,0l-4,4a7,7,0,0,1-7.8,1.3A37.4,37.4,0,0,0,96.5,62a7.3,7.3,0,0,1-6.1-5.2L89,51.4a1.9,1.9,0,0,0-2.3-1.3L73,53.7a2.3,2.3,0,0,0-1.1.9,3.4,3.4,0,0,0-.2,1.4l1.5,5.4a6.9,6.9,0,0,1-2.7,7.4,38.3,38.3,0,0,0-4.8,4.1,47.2,47.2,0,0,0-4.1,4.8,6.8,6.8,0,0,1-7.4,2.7L48.8,79a1.7,1.7,0,0,0-1.4.1,1.9,1.9,0,0,0-.9,1.1L42.9,93.9a1.9,1.9,0,0,0,1.3,2.3l5.4,1.4a6.2,6.2,0,0,1,3,1.8,6.8,6.8,0,0,1,2.1,4.2,38.7,38.7,0,0,0,3.2,12.1,6.8,6.8,0,0,1-1.3,7.9l-4,3.9a1.9,1.9,0,0,0,0,2.6l10,10a1.9,1.9,0,0,0,2.6,0l3.9-4a6.8,6.8,0,0,1,7.9-1.3A36.8,36.8,0,0,0,89.1,138a7.2,7.2,0,0,1,6,5.2l1.5,5.4a1.7,1.7,0,0,0,2.2,1.3l13.8-3.5a2.3,2.3,0,0,0,1.1-.9A1.8,1.8,0,0,0,113.9,144.1ZM76.5,116.3a23,23,0,1,1,32.5,0A23.2,23.2,0,0,1,76.5,116.3Z"/><ellipse class="cls-4" cx="92.8" cy="100" rx="13.3" ry="13.3"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/components.png b/aio/src/assets/images/logos/concept-icons/components.png
new file mode 100755
index 0000000000000000000000000000000000000000..2e74e9e719ceb73f8489acbe4b4a671e81d1ff6f
GIT binary patch
literal 4763
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/components.svg b/aio/src/assets/images/logos/concept-icons/components.svg
new file mode 100644
index 0000000000..0c58f21013
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/components.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#448aff;}.cls-2{fill:#2979ff;}.cls-3{fill:#fff;}.cls-4{fill:#a2c5ff;}</style></defs><title>components</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-3" points="73.6 131.4 54.3 98 84.3 46.1 62.8 46.1 32.8 98 62.8 150 84.4 150 73.6 131.4 73.6 131.4"/><polygon class="cls-4" points="152.8 98 122.8 46.1 84.3 46.1 54.3 98 73.6 64.7 112.1 64.7 131.3 98 112.1 131.4 73.6 131.4 84.4 150 122.8 150 152.8 98"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/dependency-injection.png b/aio/src/assets/images/logos/concept-icons/dependency-injection.png
new file mode 100755
index 0000000000000000000000000000000000000000..f1871cd3e91f57c27d1b74acdce22803f3ace180
GIT binary patch
literal 4366
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
Xd|FP?DZY{52L}l6yx-}%Ln!%wuUMXJ

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/dependency-injection.svg b/aio/src/assets/images/logos/concept-icons/dependency-injection.svg
new file mode 100644
index 0000000000..82cdf98dce
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/dependency-injection.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#546e7a;}.cls-2{fill:#455a64;}.cls-3,.cls-4{fill:#fff;}.cls-3{opacity:0.5;}</style></defs><title>dependency-injection</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M0,100A100,100,0,0,0,100,200V0A100,100,0,0,0,0,100Z"/><path class="cls-2" d="M100,0V200A100,100,0,0,0,100,0Z"/><polygon class="cls-3" points="131.2 73.2 151 47.7 125.6 67.5 108.6 61.8 59.1 111.3 87.4 139.6 136.9 90.1 131.2 73.2"/><rect class="cls-4" x="74.5" y="74.3" width="40" height="60" transform="translate(101.4 -36.3) rotate(45)"/><rect class="cls-4" x="66.8" y="107" width="20" height="30" transform="translate(108.7 -18.6) rotate(45)"/><rect class="cls-4" x="42.6" y="131.1" width="40" height="10" transform="translate(114.6 -4.4) rotate(45)"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/forms.png b/aio/src/assets/images/logos/concept-icons/forms.png
new file mode 100755
index 0000000000000000000000000000000000000000..9324696aaf0b4e2532d4b374f30052821fe55c28
GIT binary patch
literal 3512
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/forms.svg b/aio/src/assets/images/logos/concept-icons/forms.svg
new file mode 100644
index 0000000000..b0bf02adb1
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/forms.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#e57373;}.cls-2{fill:#ef5350;}.cls-3{fill:#fff;}</style></defs><title>forms</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><path class="cls-3" d="M138.7,90H47c-2.4,0-4-2.3-4-5.6V55.6c0-3.3,1.6-5.6,4-5.6h92.1c2.3,0,3.9,2.3,3.9,5.6V84.4C142.6,87.7,141,90,138.7,90Z"/><path class="cls-3" d="M139.8,120H96.3c-2,0-3.3-1.4-3.3-3.6V103.6c0-2.2,1.3-3.6,3.3-3.6h43.5c1.9,0,3.2,1.4,3.2,3.6v12.8A3.4,3.4,0,0,1,139.8,120Z"/><path class="cls-3" d="M139.8,150H96.3c-2,0-3.3-1.5-3.3-3.8V133.8c0-2.3,1.3-3.8,3.3-3.8h43.5c1.9,0,3.2,1.5,3.2,3.8v12.4C143,148.1,141.7,150,139.8,150Z"/><rect class="cls-3" x="43" y="100" width="40" height="50" rx="4" ry="4"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/http.png b/aio/src/assets/images/logos/concept-icons/http.png
new file mode 100755
index 0000000000000000000000000000000000000000..ebbf122d6da39c23b9ac37bcf159ceab1e2fb244
GIT binary patch
literal 4835
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/http.svg b/aio/src/assets/images/logos/concept-icons/http.svg
new file mode 100644
index 0000000000..fd099fe52a
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/http.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#2e7d32;}.cls-2{fill:#1b5e20;}.cls-3,.cls-4,.cls-5{fill:#fff;stroke:#fff;stroke-miterlimit:10;}.cls-3{stroke-width:0.24px;}.cls-4{stroke-width:0.27px;}.cls-5{stroke-width:0.27px;}</style></defs><title>http</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-3" points="107.5 150 100.3 148.2 125.7 50 132.9 51.8 107.5 150"/><polygon class="cls-3" points="81.5 150 74.3 148.2 99.7 50 106.8 51.8 81.5 150"/><circle class="cls-4" cx="65.5" cy="82.8" r="7.1"/><circle class="cls-5" cx="65.5" cy="113.1" r="7.1"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/i18n.png b/aio/src/assets/images/logos/concept-icons/i18n.png
new file mode 100755
index 0000000000000000000000000000000000000000..4a6172420aff7770e80c8096aede4f30e8a60752
GIT binary patch
literal 7242
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
P4uX^vROKt6W<mc4x3Cq|

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/i18n.svg b/aio/src/assets/images/logos/concept-icons/i18n.svg
new file mode 100644
index 0000000000..8b8b596375
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/i18n.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#4caf50;}.cls-2{fill:#388e3c;}.cls-3{fill:#fff;}</style></defs><title>i18n</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><path class="cls-3" d="M93,150a50,50,0,0,1-50-50A49.3,49.3,0,0,1,71.4,55.1,43.5,43.5,0,0,1,82,51.3,41.1,41.1,0,0,1,92.6,50c27.4,0,50,22.4,50.4,50a49.5,49.5,0,0,1-17.3,37.7,47.7,47.7,0,0,1-21.7,11A42.5,42.5,0,0,1,93,150Zm-.4-95.9a39,39,0,0,0-9.7,1.1,47.2,47.2,0,0,0-9.7,3.5A45.4,45.4,0,0,0,47.1,100,46,46,0,0,0,93,145.9a45.3,45.3,0,0,0,10.1-1.1A43.1,43.1,0,0,0,123,134.6,45.5,45.5,0,0,0,139,100C138.6,74.7,117.8,54.1,92.6,54.1Z"/><rect class="cls-3" x="90.9" y="54.1" width="3.9" height="91.78"/><path class="cls-3" d="M92.8,147.8c-16.3,0-29.7-21.5-29.7-48s13.4-48,29.7-48,29.7,21.5,29.7,48S109.2,147.8,92.8,147.8Zm0-92.1C78.6,55.7,67,75.5,67,99.8s11.6,44.1,25.8,44.1,25.8-19.8,25.8-44.1S107,55.7,92.8,55.7Z"/><rect class="cls-3" x="47.1" y="97.9" width="91.8" height="3.91"/><rect class="cls-3" x="53" y="76" width="80.5" height="3.91"/><rect class="cls-3" x="53" y="117.8" width="80.5" height="3.91"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/karma.png b/aio/src/assets/images/logos/concept-icons/karma.png
new file mode 100755
index 0000000000000000000000000000000000000000..385a964297c234a47db2a20f19124de26e3bb611
GIT binary patch
literal 5096
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
P(;Y}#LtniDWf%HC>*vX1

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/karma.svg b/aio/src/assets/images/logos/concept-icons/karma.svg
new file mode 100644
index 0000000000..e668f91049
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/karma.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#3dbeae;}.cls-2{fill:#349b8b;}.cls-3,.cls-4{fill:#fff;}.cls-4{opacity:0.5;isolation:isolate;}</style></defs><title>karma</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-3" points="76.6 59.9 99.7 59.9 99.7 82.2 115.5 59.9 140.1 59.9 99.9 119.2 99.9 139.9 92.4 139.9 76.6 84.2 76.6 59.9"/><polygon class="cls-4" points="143 139.9 114.4 97.8 101.8 116.4 118.2 139.9 143 139.9"/><polygon class="cls-3" points="39 84.2 51.3 128.4 69.6 95.6 57.7 106.3 39 84.2"/><polygon class="cls-4" points="80.7 139.1 69.6 95.6 51.3 128.4 62.8 117.3 80.7 139.1"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/labs.png b/aio/src/assets/images/logos/concept-icons/labs.png
new file mode 100755
index 0000000000000000000000000000000000000000..256cd5de4c1c5219d76fe9d4de7fbab1c24e5bcd
GIT binary patch
literal 5775
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
aDi7K-Jlv|ItbqzM=#d6oy&m>F`u_kUuLn#3

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/labs.svg b/aio/src/assets/images/logos/concept-icons/labs.svg
new file mode 100644
index 0000000000..2c0229b705
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/labs.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.2 192.7"><defs><style>.cls-1{fill:#1de9b6;}.cls-2{fill:#00bfa5;}.cls-3{fill:#bbf8e9;}.cls-4{fill:#fff;}</style></defs><title>labs</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="89.4 0 89.4 0 89.4 0 0 32 13.5 150.4 89.4 192.7 89.4 192.7 89.4 192.7 165.4 150.4 179.2 32 89.4 0"/><polygon class="cls-2" points="89.4 0 89.4 21.4 89.4 21.4 89.4 118.7 89.4 118.7 89.4 192.7 89.4 192.7 165.4 150.4 179.2 32 89.4 0"/><path class="cls-3" d="M124.1,75.8l-37-11.5a2.8,2.8,0,0,0-3.5,1.9l-.2.5a2.9,2.9,0,0,0,1.9,3.5l7.1,2.2L85.2,95.5a30.4,30.4,0,0,0,1.7,60.7A30.7,30.7,0,0,0,98,153.8h0l1.5-.7a30.5,30.5,0,0,0,4.8-51.5l7.2-23.3,10.7,3.4a3,3,0,0,0,3.6-1.9v-.5A2.7,2.7,0,0,0,124.1,75.8Z"/><ellipse class="cls-4" cx="90.4" cy="44.1" rx="7.8" ry="7.9"/><ellipse class="cls-4" cx="126.8" cy="60.3" rx="3.8" ry="3.8"/><ellipse class="cls-4" cx="51.5" cy="73.9" rx="4.9" ry="4.9"/><path class="cls-4" d="M111.3,134.2a26.3,26.3,0,1,1-50.2-15.6"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/language-services.png b/aio/src/assets/images/logos/concept-icons/language-services.png
new file mode 100755
index 0000000000000000000000000000000000000000..be46eb8fd5244300d961d40f67299fc6bd6b5455
GIT binary patch
literal 5360
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
BXI=mR

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/language-services.svg b/aio/src/assets/images/logos/concept-icons/language-services.svg
new file mode 100644
index 0000000000..5b3cbe2313
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/language-services.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#5c6bc0;}.cls-2{fill:#3949ab;}.cls-3{fill:#fff;}.cls-4{fill:#aeb5e0;}</style></defs><title>language-services</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><path class="cls-3" d="M93,50a50,50,0,1,0,50,50A50,50,0,0,0,93,50Zm-5.3,80.3L68.9,111.5l6.7-6.7L86,115.2l24-38.8,8,5Z"/><polygon class="cls-4" points="86 115.2 75.6 104.8 68.9 111.5 87.7 130.3 118 81.4 110 76.4 86 115.2"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/lazy-loading.png b/aio/src/assets/images/logos/concept-icons/lazy-loading.png
new file mode 100755
index 0000000000000000000000000000000000000000..b232549430ac9ffd9f14ddd3bf8a80be8fe4f19b
GIT binary patch
literal 5839
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
ZOSuVl5C8q^3pmsSDhf|fm2wuC{{kiX>G=Qv

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/lazy-loading.svg b/aio/src/assets/images/logos/concept-icons/lazy-loading.svg
new file mode 100644
index 0000000000..f71a6484ff
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/lazy-loading.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 240"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#546e7a;}.cls-3{fill:#455a64;}</style></defs><title>lazy-loading</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" width="240" height="240"/><path class="cls-2" d="M20,120A100,100,0,0,0,120,220V20A100,100,0,0,0,20,120Z"/><path class="cls-3" d="M120,20V220a100,100,0,0,0,0-200Z"/><path class="cls-1" d="M140,113.7a24.4,24.4,0,0,0,10.1,2.1,24.9,24.9,0,1,0-20.3-10.6l-10,10.1-9.8-9.8a24.5,24.5,0,0,0,4.7-14.6,24.7,24.7,0,1,0-15,22.9l10.8,10.8L67.7,167.5l3.7,3.8a7.9,7.9,0,0,0,11.2,0L119.8,134l37.6,37.7a7.9,7.9,0,0,0,11.2,0l3.7-3.8-43.2-43.3ZM129.8,90.9a20.4,20.4,0,1,1,20.3,20.4,20.8,20.8,0,0,1-6.6-1.1,20.5,20.5,0,0,1-13.7-19.3ZM96.2,110.3a18.9,18.9,0,0,1-6.3,1,20.4,20.4,0,1,1,20.3-20.4,20.6,20.6,0,0,1-3.4,11.3A20.3,20.3,0,0,1,96.2,110.3Z"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/libraries.png b/aio/src/assets/images/logos/concept-icons/libraries.png
new file mode 100755
index 0000000000000000000000000000000000000000..036ed3ae863e04aa36d89d9d8a10dde31f012e34
GIT binary patch
literal 4064
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/libraries.svg b/aio/src/assets/images/logos/concept-icons/libraries.svg
new file mode 100644
index 0000000000..9f92fa7210
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/libraries.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#546e7a;}.cls-2{fill:#455a64;}.cls-3,.cls-4{fill:#fff;}.cls-4{opacity:0.5;}</style></defs><title>libraries</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M0,100A100,100,0,0,0,100,200V0A100,100,0,0,0,0,100Z"/><path class="cls-2" d="M100,0V200A100,100,0,0,0,100,0Z"/><path class="cls-3" d="M25,63.3v75H58.3v-75Zm25,60H33.3V120H50ZM50,90H33.3V86.6H50Zm0-8.4H33.3V78.3H50Z"/><rect class="cls-4" x="33.3" y="77.9" width="16.7" height="4"/><rect class="cls-4" x="33.3" y="86.6" width="16.7" height="3.34"/><rect class="cls-4" x="33.3" y="120" width="16.7" height="3.34"/><path class="cls-3" d="M65,63.3v75H98.3v-75Zm25,60H73.3V120H90ZM90,90H73.3V86.6H90Zm0-8.4H73.3V78.3H90Z"/><rect class="cls-4" x="73.3" y="78.3" width="16.7" height="3.34"/><rect class="cls-4" x="73.3" y="86.6" width="16.7" height="3.34"/><rect class="cls-4" x="73.3" y="120" width="16.7" height="3.34"/><path class="cls-3" d="M98.3,85.3l53.1,53L175,114.7l-53.1-53ZM158.5,110l-11.8,11.8-2.3-2.3,11.8-11.8ZM134.9,86.4,123.1,98.2l-2.3-2.3,11.8-11.8ZM129,80.5,117.2,92.3,114.9,90l11.8-11.8Z"/><rect class="cls-4" x="113.6" y="83.6" width="16.7" height="3.34" transform="translate(-24.6 111.2) rotate(-45)"/><rect class="cls-4" x="119.5" y="89.5" width="16.7" height="3.34" transform="translate(-27 117.1) rotate(-45)"/><rect class="cls-4" x="143.1" y="113.1" width="16.7" height="3.34" transform="translate(-36.8 140.7) rotate(-45)"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/material.png b/aio/src/assets/images/logos/concept-icons/material.png
new file mode 100755
index 0000000000000000000000000000000000000000..608ca6984b5e65b7930bcd42538580132853313f
GIT binary patch
literal 5278
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
Tw{M@55{>{vT{CdKHZ<mckT3|>

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/material.svg b/aio/src/assets/images/logos/concept-icons/material.svg
new file mode 100644
index 0000000000..9ac2836270
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/material.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.2 192.7"><defs><style>.cls-1{fill:#ffa726;}.cls-2{fill:#fb8c00;}.cls-3{fill:#ffe0b2;}.cls-4{fill:#fff3e0;}.cls-5{fill:#fff;}</style></defs><title>material</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="89.4 0 89.4 0 89.4 0 0 32 13.5 150.4 89.4 192.7 89.4 192.7 89.4 192.7 165.4 150.4 179.2 32 89.4 0"/><polygon class="cls-2" points="89.4 0 89.4 21.4 89.4 21.4 89.4 118.7 89.4 118.7 89.4 192.7 89.4 192.7 165.4 150.4 179.2 32 89.4 0"/><polygon class="cls-3" points="102.9 146.3 39.6 115.8 75.9 93.4 139.6 124 102.9 146.3"/><polygon class="cls-4" points="102.9 122.8 39.6 92.2 75.9 69.9 139.6 100.5 102.9 122.8"/><polygon class="cls-5" points="102.9 99.3 39.6 68.7 75.9 46.3 139.6 76.9 102.9 99.3"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/performance.png b/aio/src/assets/images/logos/concept-icons/performance.png
new file mode 100755
index 0000000000000000000000000000000000000000..01a9622b0cc6d3101a88f200acdf1339048c5de3
GIT binary patch
literal 5560
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/performance.svg b/aio/src/assets/images/logos/concept-icons/performance.svg
new file mode 100644
index 0000000000..057e1b23cb
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/performance.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#546e7a;}.cls-2{fill:#455a64;}.cls-3{fill:#bbc5ca;}.cls-4{fill:#fff;}.cls-5{fill:none;}</style></defs><title>performance</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M0,100A100,100,0,0,0,100,200V0A100,100,0,0,0,0,100Z"/><path class="cls-2" d="M100,0V200A100,100,0,0,0,100,0Z"/><circle class="cls-3" cx="100" cy="100" r="50"/><circle class="cls-4" cx="100" cy="100" r="8.33"/><rect class="cls-4" x="94.82" y="85.42" width="35.36" height="4.17" transform="translate(-28.92 105.18) rotate(-45)"/><path class="cls-5" d="M100,59.09A41,41,0,0,0,59.09,100h81.82A41,41,0,0,0,100,59.09Z"/><path class="cls-5" d="M100,140.91A41,41,0,0,0,140.91,100H59.09A41,41,0,0,0,100,140.91Z"/><path class="cls-4" d="M100,50a50,50,0,0,0-50,50h9.09a40.91,40.91,0,0,1,81.82,0H150A50,50,0,0,0,100,50Z"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/protractor.png b/aio/src/assets/images/logos/concept-icons/protractor.png
new file mode 100755
index 0000000000000000000000000000000000000000..79c32c91a30d620942480e9e3e075b3666bd3551
GIT binary patch
literal 4909
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
UdNR8V{{Mn#z!9)=Wvk%-0qos|CIA2c

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/protractor.svg b/aio/src/assets/images/logos/concept-icons/protractor.svg
new file mode 100644
index 0000000000..545ee9a132
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/protractor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#e13439;}.cls-2{fill:#b52f32;}.cls-3{fill:#fff;}</style></defs><title>protractor</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><path class="cls-3" d="M145.3,117.1v-3.6H158a64.9,64.9,0,0,0-18-43.1L130.4,80l-2.5-2.5,9.5-9.6A64.3,64.3,0,0,0,95.3,50.4V63H91.7V50.3A65,65,0,0,0,48.6,67.9l9.6,9.6L55.6,80,46,70.4a64.8,64.8,0,0,0-17.9,43.1H40.7v3.6H28v14.8H158V117.1Zm-93.5-2.2a41.3,41.3,0,1,1,82.5,0Z"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/pwa.png b/aio/src/assets/images/logos/concept-icons/pwa.png
new file mode 100755
index 0000000000000000000000000000000000000000..c0e42c3feeb13407329dfe4d09582be6b9240a19
GIT binary patch
literal 5000
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/pwa.svg b/aio/src/assets/images/logos/concept-icons/pwa.svg
new file mode 100644
index 0000000000..70e9a79a8f
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/pwa.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#9c27b0;}.cls-2{fill:#7b1fa2;}.cls-3,.cls-4{fill:#fff;}.cls-4{opacity:0.8;}</style></defs><title>pwa</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><path class="cls-3" d="M123.2,115.4l3.7-9.3h10.7L132.5,92l6.4-16L157,124H143.6l-3.1-8.6Z"/><path class="cls-4" d="M111.8,124l19.4-48H118.4l-13.3,31L95.6,76H85.7L75.6,107,68.4,92.9l-6.5,19.9L68.5,124H81.2l9.1-27.8L99.1,124Z"/><path class="cls-3" d="M41.2,107.5h8a21.2,21.2,0,0,0,6.4-.8l2.1-6.3,5.7-17.6a9,9,0,0,0-1.5-1.9C58.9,77.6,54.6,76,49,76H29v48H41.2ZM51.7,87a6.3,6.3,0,0,1,1.8,4.7A6.7,6.7,0,0,1,52,96.3c-1.2,1.3-3.2,1.9-6.2,1.9H41.2V85.3h4.7C48.6,85.3,50.6,85.9,51.7,87Z"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/router.png b/aio/src/assets/images/logos/concept-icons/router.png
new file mode 100755
index 0000000000000000000000000000000000000000..759c500261dee7bd358a3d1a6321b9e87c6e5860
GIT binary patch
literal 3546
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
WCg@294T3*wkh5p(u_frMQU3?jy5&Ux

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/router.svg b/aio/src/assets/images/logos/concept-icons/router.svg
new file mode 100644
index 0000000000..a2ef8b334e
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/router.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 185.6 200"><defs><style>.cls-1{fill:#1565c0;}.cls-2{fill:#0d47a1;}.cls-3{fill:#fff;}.cls-4{fill:#86a3d0;}</style></defs><title>router</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.4 0 92.4 0 92.4 0 0 33.3 14 156.1 92.4 200 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-2" points="92.4 0 92.4 22.2 92.4 22.2 92.4 123.2 92.4 123.2 92.4 200 92.4 200 171.3 156.1 185.6 33.3 92.4 0"/><polygon class="cls-3" points="76.1 128.9 42.8 139.9 42.8 60.9 76.1 49.9 76.1 128.9"/><polygon class="cls-3" points="142.8 128.9 109.5 139.9 109.5 60.9 142.8 49.9 142.8 128.9"/><polygon class="cls-4" points="109.5 139.9 76.1 128.9 76.1 49.9 109.5 60.9 109.5 139.9"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/templates.png b/aio/src/assets/images/logos/concept-icons/templates.png
new file mode 100755
index 0000000000000000000000000000000000000000..ba462715959bb98921d5fc2b4d105a248934c77e
GIT binary patch
literal 3046
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
ROeEZaV>Ty<71rKy{{<&VfTjQd

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/templates.svg b/aio/src/assets/images/logos/concept-icons/templates.svg
new file mode 100644
index 0000000000..fe789d48d6
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/templates.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#546e7a;}.cls-2{fill:#455a64;}.cls-3{fill:#a2adb2;}.cls-4{fill:#e3e6e8;}.cls-5{fill:#fff;}</style></defs><title>templates</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M0,100A100,100,0,0,0,100,200V0A100,100,0,0,0,0,100Z"/><path class="cls-2" d="M100,0V200A100,100,0,0,0,100,0Z"/><rect class="cls-3" x="80" y="70" width="60" height="80"/><rect class="cls-4" x="70" y="60" width="60" height="80"/><rect class="cls-5" x="60" y="50" width="60" height="80"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/assets/images/logos/concept-icons/universal.png b/aio/src/assets/images/logos/concept-icons/universal.png
new file mode 100755
index 0000000000000000000000000000000000000000..7450d9720eb31e6e7017b48d7183bcc357a70df6
GIT binary patch
literal 3717
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

literal 0
HcmV?d00001

diff --git a/aio/src/assets/images/logos/concept-icons/universal.svg b/aio/src/assets/images/logos/concept-icons/universal.svg
new file mode 100644
index 0000000000..6093544f81
--- /dev/null
+++ b/aio/src/assets/images/logos/concept-icons/universal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 186 200"><defs><style>.cls-1{fill:#00acc1;}.cls-2{fill:#00838f;}.cls-3{fill:#fff;}.cls-4{fill:#80d6e0;}</style></defs><title>universal</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="92.8 0 92.8 0 92.8 0 0 33.3 14 156.1 92.8 200 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><polygon class="cls-2" points="92.8 0 92.8 22.2 92.8 22.2 92.8 123.2 92.8 123.2 92.8 200 92.8 200 171.7 156.1 186 33.3 92.8 0"/><path class="cls-3" d="M121,40H65A12,12,0,0,0,53,52v96a12,12,0,0,0,12,12h56a12,12,0,0,0,12-12V52A12,12,0,0,0,121,40ZM93,150a10,10,0,1,1,10-10A10,10,0,0,1,93,150Zm30-44a4,4,0,0,1-4,4H67a4,4,0,0,1-4-4V94a4,4,0,0,1,4-4h52a4,4,0,0,1,4,4Zm0-30a4,4,0,0,1-4,4H67a4,4,0,0,1-4-4V64a4,4,0,0,1,4-4h52a4,4,0,0,1,4,4Z"/><rect class="cls-4" x="63" y="60" width="60" height="20" rx="4" ry="4"/><rect class="cls-4" x="63" y="90" width="60" height="20" rx="4" ry="4"/><circle class="cls-4" cx="93" cy="140" r="10"/></g></g></svg>
\ No newline at end of file
diff --git a/aio/src/styles/2-modules/_presskit.scss b/aio/src/styles/2-modules/_presskit.scss
index 75aeea1097..88921249ce 100644
--- a/aio/src/styles/2-modules/_presskit.scss
+++ b/aio/src/styles/2-modules/_presskit.scss
@@ -67,8 +67,8 @@
       }
 
       img {
-        width: 128px;
         height: 128px;
+        width: auto;
         margin-bottom: 8px * 2;
       }
     }

From 6a24c02d73bf303a5db09b84c6501f0183b970e3 Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Mon, 19 Mar 2018 09:27:24 -0700
Subject: [PATCH 060/582] docs(aio): Remove Intertech with no courses scheduled
 (#22867) PR Close #22867

---
 aio/content/marketing/resources.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index fcb84a5d9a..aa8e079662 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -597,12 +597,6 @@
       "Workshops & Onsite Training": {
         "order": 2,
         "resources": {
-          "-KLIBo3ANF3-1B9wxsoB": {
-            "desc": "Angular Classes from Intertech in Minnesota",
-            "rev": true,
-            "title": "Intertech",
-            "url": "http://www.intertech.com/Training/Web-Dev/AngularJS/AngularJS/Angular-2-Training"
-          },
           "-KLIBoFWStce29UCwkvY": {
             "desc": "Private Angular Training and Mentoring",
             "rev": true,

From 4042a84ad6b96678c6c7660dd180e3b66b4cad00 Mon Sep 17 00:00:00 2001
From: davidstanke <davidstanke@google.com>
Date: Thu, 22 Mar 2018 16:26:29 -0400
Subject: [PATCH 061/582] docs(bazel): add a link to the Bazel doc (#22940)

The developer doc mentions but doesn't link to BAZEL.md. Add link and fix capitalization.
PR Close #22940
---
 docs/DEVELOPER.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index e0120e27c4..395c620e9f 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -29,7 +29,7 @@ following products on your development machine:
 * [Java Development Kit](http://www.oracle.com/technetwork/es/java/javase/downloads/index.html) which is used
   to execute the selenium standalone server for e2e testing.
 
-* (Optional for now) [Bazel](https://bazel.build/), please follow instructions in [Bazel.md]
+* (Optional for now) [Bazel](https://bazel.build/), please follow instructions in [BAZEL.md](https://github.com/angular/angular/blob/master/docs/BAZEL.md)
 
 ## Getting the Sources
 

From 091b11a4ab1ebfd816bb476e7ef50d05d566237b Mon Sep 17 00:00:00 2001
From: Jonathan Sharpe <j.r.sharpe+github@gmail.com>
Date: Sat, 17 Mar 2018 12:50:26 +0000
Subject: [PATCH 062/582] docs(aio): update HTTP error test example (#22844)

Update the example to match the description preceding it, which refers to the
use of the error method and ErrorEvent rather than the flush method with a
non-2xx status as shown previously.

PR Close #22844
---
 aio/content/guide/http.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/http.md b/aio/content/guide/http.md
index 10dd3b6d43..0c6d903f31 100644
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@@ -1034,7 +1034,7 @@ Call `request.flush()` with an error message, as seen in the following example.
 
 <code-example 
   path="http/src/testing/http-client.spec.ts"
-  region="404" 
+  region="network-error"
   linenums="false">
 </code-example>
 

From 547efb5f4d5b115c38173b288d2b25b67d30dac1 Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <suguru.inatomi@gmail.com>
Date: Sat, 12 May 2018 01:40:41 +0900
Subject: [PATCH 063/582] docs(aio): fix path to observables guide (#23858) PR
 Close #23858

---
 aio/content/guide/glossary.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 93a93d32ae..0bf407fccc 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -439,7 +439,7 @@ Observables can deliver single or multiple values of any type to subscribers, ei
 
 Angular uses a third-party library called [Reactive Extensions (RxJS)](http://reactivex.io/rxjs/). 
 
-To learn more, see the [Observables](guide/glossary#observable) guide.
+To learn more, see the [Observables](guide/observables) guide.
 
 
 {@a observer}

From 55103419e9363a09be37827152c0996e8ffaa287 Mon Sep 17 00:00:00 2001
From: Alexander Burakevych <oburakevych@gmail.com>
Date: Thu, 22 Mar 2018 22:16:07 +1100
Subject: [PATCH 064/582] docs(aio): add Angular Conf Australia to events
 (#22929)

Angular Conf Australia 2018 will be held at June 22 in Melbourne, Australia!

https://www.angularconf.com.au/
PR Close #22929
---
 aio/content/marketing/events.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aio/content/marketing/events.html b/aio/content/marketing/events.html
index 60bd069a16..7948a31104 100755
--- a/aio/content/marketing/events.html
+++ b/aio/content/marketing/events.html
@@ -55,6 +55,12 @@
       <td>Tokyo, Japan</td>
       <td>Jun 16, 2018</td>
     </tr>
+    <!-- Angular Conf Australia-->
+    <tr>
+      <th><a href="https://www.angularconf.com.au/" title="Angular Conf Australia">Angular Conf Australia</a></th>
+      <td>Melbourne, Australia</td>
+      <td>Jun 22, 2018</td>
+    </tr>
     <!-- AngularConnect-->
     <tr>
       <th><a href="http://angularconnect.com" title="AngularConnect">AngularConnect</a></th>

From 43597279d691ae784d6f42d85d97d8a39cd64d56 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 16 May 2018 10:10:57 -0700
Subject: [PATCH 065/582] test: don't run unit tests on Firefox (#23942)

PR Close #23942
---
 tools/defaults.bzl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 8a956ca64f..9954668f3d 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -79,12 +79,16 @@ def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
   _ts_web_test_suite(
       bootstrap = bootstrap,
       deps = local_deps,
-      # Run unit tests on Chromium and Firefox by default.
+      # Run unit tests on local Chromium by default.
       # You can exclude tests based on tags, e.g. to skip Firefox testing,
       #   `bazel test --test_tag_filters=-browser:firefox-local [targets]`
       browsers = [
           "@io_bazel_rules_webtesting//browsers:chromium-local",
-          "@io_bazel_rules_webtesting//browsers:firefox-local",
+          # Don't test on local Firefox by default, for faster builds.
+          # We think that bugs in Angular tend to be caught the same in any
+          # evergreen browser.
+          # "@io_bazel_rules_webtesting//browsers:firefox-local",
+          # TODO(alexeagle): add remote browsers on SauceLabs
       ],
       **kwargs)
 

From 8ee25e6b581219f56c7cd8dbd76d0fe6eafdd563 Mon Sep 17 00:00:00 2001
From: Fabian Wiles <fabianwiles@live.com>
Date: Sat, 12 May 2018 07:50:28 +1200
Subject: [PATCH 066/582] ci: ensure github-robot listens on circleci builds
 (#23863) PR Close #23863

---
 .github/angular-robot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 0f7e06119d..fcc1653164 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -4,6 +4,7 @@
 size:
   disabled: false
   maxSizeIncrease: 1000
+  circleCiStatusName: "ci/circleci: build-packages-dist"
   status:
     disabled: false
     context: "ci/angular: size"

From 20d76374edd6ff2610043a80f341f8c0712c0f1a Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 10 May 2018 10:30:55 -0500
Subject: [PATCH 067/582] docs(aio): Expose server and CLI configuration for
 universal in guide (#23842)

Closes #23795

PR Close #23842
---
 aio/content/guide/universal.md                | 74 +++++++++++++++++--
 .../shared/boilerplate/cli/angular.json       |  2 +-
 .../shared/boilerplate/i18n/angular.json      |  2 +-
 .../shared/boilerplate/testing/angular.json   |  2 +-
 4 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/aio/content/guide/universal.md b/aio/content/guide/universal.md
index eb85fa2861..f4653ba73d 100644
--- a/aio/content/guide/universal.md
+++ b/aio/content/guide/universal.md
@@ -180,7 +180,7 @@ npm install --save @angular/platform-server @nguniversal/module-map-ngfactory-lo
 
 {@a transition}
 
-### Modify the client app
+## Modify the client app
 
 A Universal app can act as a dynamic, content-rich "splash screen" that engages the user.
 It gives the appearance of a near-instant application.
@@ -190,7 +190,9 @@ Once loaded, Angular transitions from the static server-rendered page to the dyn
 
 You must make a few changes to your application code to support both server-side rendering and the transition to the client app.
 
-#### The root `AppModule`
+{@a root-app-module}
+
+### The root `AppModule`
 
 Open file `src/app/app.module.ts` and find the `BrowserModule` import in the `NgModule` metadata.
 Replace that import with this one:
@@ -206,9 +208,29 @@ You can get runtime information about the current platform and the `appId` by in
 <code-example path="universal/src/app/app.module.ts" region="platform-detection" title="src/app/app.module.ts (platform detection)">
 </code-example>
 
+{@a cli-output}
+
+### Build Destination
+
+A Universal app is distributed in two parts: the server-side code that serves up the initial application, and the client-side code that's loaded in dynamically. 
+
+The Angular CLI outputs the client-side code in the `dist` directory by default, so you modify the `outputPath` for the __build__ target in the `angular.json` to keep the client-side build outputs separate from the server-side code. The client-side build output will be served by the Express server.
+
+```
+...
+"build": {
+  "builder": "@angular-devkit/build-angular:browser",
+  "options": {
+    "outputPath": "dist/browser",
+    ...
+  } 
+}
+...
+```
+
 {@a http-urls}
 
-#### Absolute HTTP URLs
+### Absolute HTTP URLs
 
 The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
 These services send requests to _relative_ URLs such as `api/heroes`.
@@ -262,6 +284,19 @@ The `ModuleMapLoaderModule` is a server-side module that allows lazy-loading of
 
 This is also the place to register providers that are specific to running your app under Universal.
 
+{@a app-server-entry-point}
+
+### App server entry point
+
+The `Angular CLI` uses the `AppServerModule` to build the server-side bundle. 
+
+Create a `main.server.ts` file in the `src/` directory that exports the `AppServerModule`:
+
+<code-example path="universal/src/main.server.ts" title="src/main.server.ts">
+</code-example>
+
+The `main.server.ts` will be referenced later to add a `server` target to the `Angular CLI` configuration.
+
 {@a web-server}
 
 ### Universal web server
@@ -421,6 +456,8 @@ This config extends from the root's `tsconfig.json` file. Certain settings are n
 * The `angularCompilerOptions` section guides the AOT compiler:
   * `entryModule` - the root module of the server application, expressed as `path/to/file#ClassName`.
 
+{@a universal-webpack-configuration}
+
 ### Universal Webpack configuration
 
 Universal applications doesn't need any extra Webpack configuration, the CLI takes care of that for you,
@@ -433,13 +470,38 @@ Create a `webpack.server.config.js` file in the project root directory with the
 
 **Webpack configuration** is a rich topic beyond the scope of this guide.
 
+{@a universal-cli-configuration}
+
+### Angular CLI configuration
+
+The CLI provides builders for different types of __targets__. Commonly known targets such as `build` and `serve` already exist in the `angular.json` configuration. To target a server-side build, add a `server` target to the `architect` configuration object.
+
+* The `outputPath` tells where the resulting build will be created.
+* The `main` provides the main entry point to the previously created `main.server.ts`
+* The `tsConfig` uses the `tsconfig.server.json` as configuration for the TypeScript and AOT compilation.
+
+```
+"architect": {
+  ...
+  "server": {
+    "builder": "@angular-devkit/build-angular:server",
+    "options": {
+      "outputPath": "dist/server",
+      "main": "src/main.server.ts",
+      "tsConfig": "src/tsconfig.server.json"
+    }
+  }
+  ...
+}
+```
+
 ## Build and run with universal
 
-Now that you've created the TypeScript and Webpack config files, you can build and run the Universal application.
+Now that you've created the TypeScript and Webpack config files and configured the Angular CLI, you can build and run the Universal application.
 
 First add the _build_ and _serve_ commands to the `scripts` section of the `package.json`:
 
-<code-example format="." language="ts">
+```
 "scripts": {
     ...
     "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
@@ -448,7 +510,7 @@ First add the _build_ and _serve_ commands to the `scripts` section of the `pack
     "webpack:server": "webpack --config webpack.server.config.js --progress --colors"
     ...
 }
-</code-example>
+```
 
 {@a build}
 
diff --git a/aio/tools/examples/shared/boilerplate/cli/angular.json b/aio/tools/examples/shared/boilerplate/cli/angular.json
index 6d46cf39da..5d17ddcf30 100644
--- a/aio/tools/examples/shared/boilerplate/cli/angular.json
+++ b/aio/tools/examples/shared/boilerplate/cli/angular.json
@@ -11,7 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/angular.io-example",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
diff --git a/aio/tools/examples/shared/boilerplate/i18n/angular.json b/aio/tools/examples/shared/boilerplate/i18n/angular.json
index 00ec0bccd1..d8bc38f374 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/angular.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/angular.json
@@ -11,7 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/angular.io-example",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
diff --git a/aio/tools/examples/shared/boilerplate/testing/angular.json b/aio/tools/examples/shared/boilerplate/testing/angular.json
index 9aaab56b56..11ed94218d 100644
--- a/aio/tools/examples/shared/boilerplate/testing/angular.json
+++ b/aio/tools/examples/shared/boilerplate/testing/angular.json
@@ -11,7 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/angular.io-example",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",

From 88ab1d0e553238f45e16fabd208134f836564a63 Mon Sep 17 00:00:00 2001
From: Collin Klopfenstein <collin.klopfenstein@gmail.com>
Date: Thu, 10 May 2018 16:57:59 -0500
Subject: [PATCH 068/582] docs(aio): changed 'onVoted' output property to
 'voted' to be in line with the styleguide (#23832)

PR Close #23832
---
 .../component-interaction/src/app/voter.component.ts | 12 ++++++------
 .../src/app/votetaker.component.ts                   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aio/content/examples/component-interaction/src/app/voter.component.ts b/aio/content/examples/component-interaction/src/app/voter.component.ts
index 9583e74466..845e6fba0e 100644
--- a/aio/content/examples/component-interaction/src/app/voter.component.ts
+++ b/aio/content/examples/component-interaction/src/app/voter.component.ts
@@ -5,18 +5,18 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
   selector: 'app-voter',
   template: `
     <h4>{{name}}</h4>
-    <button (click)="vote(true)"  [disabled]="voted">Agree</button>
-    <button (click)="vote(false)" [disabled]="voted">Disagree</button>
+    <button (click)="vote(true)"  [disabled]="didVote">Agree</button>
+    <button (click)="vote(false)" [disabled]="didVote">Disagree</button>
   `
 })
 export class VoterComponent {
   @Input()  name: string;
-  @Output() onVoted = new EventEmitter<boolean>();
-  voted = false;
+  @Output() voted = new EventEmitter<boolean>();
+  didVote = false;
 
   vote(agreed: boolean) {
-    this.onVoted.emit(agreed);
-    this.voted = true;
+    this.voted.emit(agreed);
+    this.didVote = true;
   }
 }
 // #enddocregion
diff --git a/aio/content/examples/component-interaction/src/app/votetaker.component.ts b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
index 564cb93261..d553af0d7b 100644
--- a/aio/content/examples/component-interaction/src/app/votetaker.component.ts
+++ b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
@@ -8,7 +8,7 @@ import { Component }      from '@angular/core';
     <h3>Agree: {{agreed}}, Disagree: {{disagreed}}</h3>
     <app-voter *ngFor="let voter of voters"
       [name]="voter"
-      (onVoted)="onVoted($event)">
+      (voted)="onVoted($event)">
     </app-voter>
   `
 })

From ea4321d9122eefaaccfefa5f36f9e1b68365a7bc Mon Sep 17 00:00:00 2001
From: Akihito Tamagawa <tama3bb@gmail.com>
Date: Fri, 18 May 2018 17:36:13 +0900
Subject: [PATCH 069/582] docs(aio): fix typo (#23990)

are are -> are
PR Close #23990
---
 aio/content/guide/releases.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/releases.md b/aio/content/guide/releases.md
index cb25524111..0d4854388e 100644
--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@@ -129,6 +129,6 @@ Any changes to the public API surface will be done using the versioning, support
 
 Angular Labs is an initiative to cultivate new features and iterate on them quickly. Angular Labs provides a safe place for exploration and experimentation by the Angular team. 
 
-Angular Labs projects are are not ready for production use, and no commitment is made to bring them to production. The policies and practices that are described in this document do not apply to Angular Labs projects. 
+Angular Labs projects are not ready for production use, and no commitment is made to bring them to production. The policies and practices that are described in this document do not apply to Angular Labs projects. 
 
 Angular Labs projects typically are in separate branches in the Angular repo, clearly separated from the main Angular codebase. 

From 3cdf5afc6e5652151fa9c210cb83478d5f2e806d Mon Sep 17 00:00:00 2001
From: mhartington <mikehartington@gmail.com>
Date: Tue, 8 May 2018 15:07:32 -0400
Subject: [PATCH 070/582] docs(aio): add mhartington to gde (#23777)

PR Close #23777
---
 aio/content/images/bios/mhartington.png | Bin 0 -> 29217 bytes
 aio/content/marketing/contributors.json |  11 ++++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 aio/content/images/bios/mhartington.png

diff --git a/aio/content/images/bios/mhartington.png b/aio/content/images/bios/mhartington.png
new file mode 100644
index 0000000000000000000000000000000000000000..4127ca3534aecfecaca1ca32eda014a59b0a5c18
GIT binary patch
literal 29217
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
P00000NkvXXu0mjfi>8W^

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 27a0fdda58..99c88b9251 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -592,7 +592,7 @@
     "bio": "Nir is a Principal Frontend Consultant & Head of the Angular department at 500Tech, Google Developer Expert and community leader. He organizes the largest Angular meetup group in Israel (Angular-IL), talks and teaches about front-end technologies around the world. He is also the author of two books about Angular and the founder of the 'Frontend Band'.",
     "group": "GDE"
   },
-  
+
   "achautard": {
     "name": "Alain Chautard",
     "picture": "alainchautard.png",
@@ -609,5 +609,14 @@
     "website": "https://coryrylan.com",
     "bio": "Cory is a full time front end web developer. He works full time building responsive web applications and progressive web apps. When not building web apps he is busy teaching Angular and other web technologies in workshops and conferences. He loves the web and is optimistic of the places it can take us.",
     "group": "GDE"
+  },
+
+  "mhartington": {
+    "name": "Mike Hartington",
+    "picture": "mhartington.png",
+    "twitter": "mhartington",
+    "website": "https://mhartington.io",
+    "bio": "Mike is a Developer Advocate for the Ionic Framework and a GDE in Angular. He spends most of his time making fast PWAs and exploring emerging web standards. When not behind a keyboard, you'll probably find him with a guitar and beer.",
+    "group": "GDE"
   }
 }

From 99d330a1b70c5adcee2e4d6c9eb3aa8f1f0553d9 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 17 May 2018 00:10:30 +0300
Subject: [PATCH 071/582] style(aio): remove background from `lazy-loading`
 concept icon (#23950)

Fixes #23938

PR Close #23950
---
 .../logos/concept-icons/lazy-loading.png      | Bin 5839 -> 3820 bytes
 .../logos/concept-icons/lazy-loading.svg      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/src/assets/images/logos/concept-icons/lazy-loading.png b/aio/src/assets/images/logos/concept-icons/lazy-loading.png
index b232549430ac9ffd9f14ddd3bf8a80be8fe4f19b..bbb68345572f44015621aebbec6a6861ba74c3a7 100755
GIT binary patch
literal 3820
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
V#-~{x7atNbh=#s8QPn#9{{Y|7KYsuK

literal 5839
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
ZOSuVl5C8q^3pmsSDhf|fm2wuC{{kiX>G=Qv

diff --git a/aio/src/assets/images/logos/concept-icons/lazy-loading.svg b/aio/src/assets/images/logos/concept-icons/lazy-loading.svg
index f71a6484ff..91f21c7df5 100644
--- a/aio/src/assets/images/logos/concept-icons/lazy-loading.svg
+++ b/aio/src/assets/images/logos/concept-icons/lazy-loading.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 240"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#546e7a;}.cls-3{fill:#455a64;}</style></defs><title>lazy-loading</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" width="240" height="240"/><path class="cls-2" d="M20,120A100,100,0,0,0,120,220V20A100,100,0,0,0,20,120Z"/><path class="cls-3" d="M120,20V220a100,100,0,0,0,0-200Z"/><path class="cls-1" d="M140,113.7a24.4,24.4,0,0,0,10.1,2.1,24.9,24.9,0,1,0-20.3-10.6l-10,10.1-9.8-9.8a24.5,24.5,0,0,0,4.7-14.6,24.7,24.7,0,1,0-15,22.9l10.8,10.8L67.7,167.5l3.7,3.8a7.9,7.9,0,0,0,11.2,0L119.8,134l37.6,37.7a7.9,7.9,0,0,0,11.2,0l3.7-3.8-43.2-43.3ZM129.8,90.9a20.4,20.4,0,1,1,20.3,20.4,20.8,20.8,0,0,1-6.6-1.1,20.5,20.5,0,0,1-13.7-19.3ZM96.2,110.3a18.9,18.9,0,0,1-6.3,1,20.4,20.4,0,1,1,20.3-20.4,20.6,20.6,0,0,1-3.4,11.3A20.3,20.3,0,0,1,96.2,110.3Z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#546e7a;}.cls-2{fill:#455a64;}.cls-3{fill:#fff;}</style></defs><title>lazy-loading</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M0,100A100,100,0,0,0,100,200V0A100,100,0,0,0,0,100Z"/><path class="cls-2" d="M100,0V200A100,100,0,0,0,100,0Z"/><path class="cls-3" d="M120,93.7a24.4,24.4,0,0,0,10.1,2.1,24.9,24.9,0,1,0-20.3-10.6l-10,10.1-9.8-9.8a24.5,24.5,0,0,0,4.7-14.6,24.7,24.7,0,1,0-15,22.9l10.8,10.8L47.7,147.5l3.7,3.8a7.9,7.9,0,0,0,11.2,0L99.8,114l37.6,37.7a7.9,7.9,0,0,0,11.2,0l3.7-3.8-43.2-43.3ZM109.8,70.9a20.4,20.4,0,1,1,20.3,20.4,20.8,20.8,0,0,1-6.6-1.1,20.5,20.5,0,0,1-13.7-19.3ZM76.2,90.3a18.9,18.9,0,0,1-6.3,1,20.4,20.4,0,1,1,20.3-20.4,20.6,20.6,0,0,1-3.4,11.3A20.3,20.3,0,0,1,76.2,90.3Z"/></g></g></svg>
\ No newline at end of file

From 6e7d071c6b572e0e7d579aaf6ceb8b0a5e62becb Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 11 May 2018 20:57:37 -0700
Subject: [PATCH 072/582] fix(ivy): move next property to TNode (#23869)

PR Close #23869
---
 packages/core/src/render3/di.ts               |  3 +-
 packages/core/src/render3/instructions.ts     | 97 ++++++++++---------
 packages/core/src/render3/interfaces/node.ts  | 25 ++---
 .../core/src/render3/node_manipulation.ts     | 54 +++++------
 .../bundling/todo/bundle.golden_symbols.json  |  6 +-
 packages/core/test/render3/di_spec.ts         |  2 +-
 .../core/test/render3/integration_spec.ts     |  2 +-
 .../render3/node_selector_matcher_spec.ts     |  6 +-
 .../test/render3/view_container_ref_spec.ts   |  2 +-
 9 files changed, 102 insertions(+), 95 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index a5b98c2c7c..030afd5ac6 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -20,7 +20,6 @@ import {Type} from '../type';
 
 import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
-import {LContainer} from './interfaces/container';
 import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {LContainerNode, LElementNode, LNode, LNodeType, LViewNode, TNodeFlags} from './interfaces/node';
@@ -573,6 +572,8 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
     const lContainerNode: LContainerNode = createLNodeObject(
         LNodeType.Container, vcRefHost.view, vcRefHost.parent !, undefined, lContainer, null);
 
+    // TODO(kara): Separate into own TNode when moving parent/child properties
+    lContainerNode.tNode = vcRefHost.tNode;
     vcRefHost.dynamicLContainerNode = lContainerNode;
 
     addToViewTree(vcRefHost.view, lContainer);
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 8f2162cca5..9768799c7c 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -17,7 +17,7 @@ import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TDat
 
 import {LContainerNode, LElementNode, LNode, LNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
-import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode} from './node_manipulation';
+import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
@@ -346,7 +346,6 @@ export function createLNodeObject(
     view: currentView,
     parent: parent as any,
     child: null,
-    next: null,
     nodeInjector: parent ? parent.nodeInjector : null,
     data: state,
     queries: queries,
@@ -359,22 +358,31 @@ export function createLNodeObject(
 /**
  * A common way of creating the LNode to make sure that all of them have same shape to
  * keep the execution code monomorphic and fast.
+ *
+ * @param index The index at which the LNode should be saved (null if view, since they are not
+ * saved)
+ * @param type The type of LNode to create
+ * @param native The native element for this LNode, if applicable
+ * @param name The tag name of the associated native element, if applicable
+ * @param attrs Any attrs for the native element, if applicable
+ * @param data Any data that should be saved on the LNode
  */
 export function createLNode(
     index: number | null, type: LNodeType.Element, native: RElement | RText | null,
-    lView?: LView | null): LElementNode;
+    name: string | null, attrs: string[] | null, lView?: LView | null): LElementNode;
 export function createLNode(
-    index: null, type: LNodeType.View, native: null, lView: LView): LViewNode;
+    index: null, type: LNodeType.View, native: null, name: null, attrs: null,
+    lView: LView): LViewNode;
 export function createLNode(
-    index: number, type: LNodeType.Container, native: undefined,
-    lContainer: LContainer): LContainerNode;
+    index: number, type: LNodeType.Container, native: undefined, name: string | null,
+    attrs: string[] | null, lContainer: LContainer): LContainerNode;
 export function createLNode(
-    index: number, type: LNodeType.Projection, native: null,
+    index: number, type: LNodeType.Projection, native: null, name: null, attrs: string[] | null,
     lProjection: LProjection): LProjectionNode;
 export function createLNode(
     index: number | null, type: LNodeType, native: RText | RElement | null | undefined,
-    state?: null | LView | LContainer | LProjection): LElementNode&LTextNode&LViewNode&
-    LContainerNode&LProjectionNode {
+    name: string | null, attrs: string[] | null, state?: null | LView | LContainer |
+        LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
                             previousOrParentNode && previousOrParentNode.parent as LNode;
   let queries =
@@ -397,10 +405,12 @@ export function createLNode(
 
     // Every node adds a value to the static data array to avoid a sparse array
     if (index >= tData.length) {
-      tData[index] = null;
-    } else {
-      node.tNode = tData[index] as TNode;
+      const tNode = tData[index] = createTNode(index, name, attrs, null);
+      if (!isParent && previousOrParentNode) {
+        previousOrParentNode.tNode !.next = tNode;
+      }
     }
+    node.tNode = tData[index] as TNode;
 
     // Now link ourselves into the tree.
     if (isParent) {
@@ -415,14 +425,6 @@ export function createLNode(
       } else {
         // We are adding component view, so we don't link parent node child to this node.
       }
-    } else if (previousOrParentNode) {
-      ngDevMode && assertNull(
-                       previousOrParentNode.next,
-                       `previousOrParentNode's next property should not have been set ${index}.`);
-      previousOrParentNode.next = node;
-      if (previousOrParentNode.dynamicLContainerNode) {
-        previousOrParentNode.dynamicLContainerNode.next = node;
-      }
     }
   }
   previousOrParentNode = node;
@@ -463,7 +465,7 @@ export function renderTemplate<T>(
     rendererFactory = providedRendererFactory;
     const tView = getOrCreateTView(template, directives || null, pipes || null);
     host = createLNode(
-        null, LNodeType.Element, hostNode,
+        null, LNodeType.Element, hostNode, null, null,
         createLView(
             -1, providedRendererFactory.createRenderer(null, null), tView, null, {},
             LViewFlags.CheckAlways, sanitizer));
@@ -500,7 +502,7 @@ export function renderEmbeddedTemplate<T>(
       const lView = createLView(
           -1, renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
-      viewNode = createLNode(null, LNodeType.View, null, lView);
+      viewNode = createLNode(null, LNodeType.View, null, null, null, lView);
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
@@ -585,7 +587,10 @@ export function elementStart(
 
   ngDevMode && ngDevMode.rendererCreateElement++;
   const native: RElement = renderer.createElement(name);
-  const node: LElementNode = createLNode(index, LNodeType.Element, native !, null);
+  ngDevMode && assertDataInRange(index - 1);
+
+  const node: LElementNode =
+      createLNode(index, LNodeType.Element, native !, name, attrs || null, null);
 
   if (attrs) setUpAttributes(native, attrs);
   appendChild(node.parent !, native, currentView);
@@ -608,9 +613,7 @@ function createDirectivesAndLocals(
   const node = previousOrParentNode;
   if (firstTemplatePass) {
     ngDevMode && ngDevMode.firstTemplatePass++;
-    ngDevMode && assertDataInRange(index - 1);
-    node.tNode = tData[index] = createTNode(name, attrs || null, inlineViews ? [] : null);
-    cacheMatchingDirectivesForNode(node.tNode, currentView.tView, localRefs || null);
+    cacheMatchingDirectivesForNode(node.tNode !, currentView.tView, localRefs || null);
   } else {
     instantiateDirectivesDirectly();
   }
@@ -870,14 +873,13 @@ export function hostElement(
     sanitizer?: Sanitizer | null): LElementNode {
   resetApplicationState();
   const node = createLNode(
-      0, LNodeType.Element, rNode,
+      0, LNodeType.Element, rNode, null, null,
       createLView(
           -1, renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null, null,
           def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
-    node.tNode = createTNode(tag as string, null, null);
-    node.tNode.flags = TNodeFlags.isComponent;
+    node.tNode !.flags = TNodeFlags.isComponent;
     if (def.diPublic) def.diPublic(def);
     currentView.tView.directives = [def];
   }
@@ -1028,16 +1030,17 @@ export function elementProperty<T>(
 /**
  * Constructs a TNode object from the arguments.
  *
+ * @param index The index of the TNode in TView.data
  * @param tagName The tag name of the node
- * @param attrs The attributes defined on this ndoe
+ * @param attrs The attributes defined on this node
  * @param tViews Any TViews attached to this node
- * @param localNames A list of local names and their matching indices
  * @returns the TNode object
  */
 function createTNode(
-    tagName: string | null, attrs: string[] | null, tViews: TView[] | null): TNode {
+    index: number, tagName: string | null, attrs: string[] | null, tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
+    index: index,
     flags: 0,
     tagName: tagName,
     attrs: attrs,
@@ -1045,7 +1048,8 @@ function createTNode(
     initialInputs: undefined,
     inputs: undefined,
     outputs: undefined,
-    tViews: tViews
+    tViews: tViews,
+    next: null
   };
 }
 
@@ -1240,7 +1244,8 @@ export function text(index: number, value?: any): void {
           currentView.bindingStartIndex, -1, 'text nodes should be created before bindings');
   ngDevMode && ngDevMode.rendererCreateTextNode++;
   const textNode = createTextNode(value, renderer);
-  const node = createLNode(index, LNodeType.Element, textNode);
+  const node = createLNode(index, LNodeType.Element, textNode, null, null);
+
   // Text nodes are self closing.
   isParent = false;
   appendChild(node.parent !, textNode, currentView);
@@ -1473,7 +1478,10 @@ export function container(
   const currentParent = isParent ? previousOrParentNode : previousOrParentNode.parent !;
   const lContainer = createLContainer(currentParent, currentView, template);
 
-  const node = createLNode(index, LNodeType.Container, undefined, lContainer);
+  const node = createLNode(
+      index, LNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
+
+  if (firstTemplatePass && template == null) node.tNode !.tViews = [];
 
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
@@ -1610,7 +1618,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
       newView.queries = lContainer.queries.enterView(lContainer.nextIndex);
     }
 
-    enterView(newView, viewNode = createLNode(null, LNodeType.View, null, newView));
+    enterView(newView, viewNode = createLNode(null, LNodeType.View, null, null, null, newView));
   }
   return getRenderFlags(viewNode.data);
 }
@@ -1673,7 +1681,7 @@ export function embeddedViewEnd(): void {
 function setRenderParentInProjectedNodes(
     renderParent: LElementNode | null, viewNode: LViewNode): void {
   if (renderParent != null) {
-    let node = viewNode.child;
+    let node: LNode|null = viewNode.child;
     while (node) {
       if (node.type === LNodeType.Projection) {
         let nodeToProject: LNode|null = (node as LProjectionNode).data.head;
@@ -1685,7 +1693,7 @@ function setRenderParentInProjectedNodes(
           nodeToProject = nodeToProject === lastNodeToProject ? null : nodeToProject.pNextOrParent;
         }
       }
-      node = node.next;
+      node = getNextLNode(node);
     }
   }
 }
@@ -1749,8 +1757,8 @@ export function projectionDef(
     distributedNodes[i] = [];
   }
 
-  const componentNode = findComponentHost(currentView);
-  let componentChild = componentNode.child;
+  const componentNode: LElementNode = findComponentHost(currentView);
+  let componentChild: LNode|null = componentNode.child;
 
   while (componentChild !== null) {
     // execute selector matching logic if and only if:
@@ -1763,7 +1771,7 @@ export function projectionDef(
       distributedNodes[0].push(componentChild);
     }
 
-    componentChild = componentChild.next;
+    componentChild = getNextLNode(componentChild);
   }
 
   ngDevMode && assertDataNext(index);
@@ -1810,11 +1818,8 @@ function appendToProjectionNode(
  */
 export function projection(
     nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: string[]): void {
-  const node = createLNode(nodeIndex, LNodeType.Projection, null, {head: null, tail: null});
-
-  if (node.tNode == null) {
-    node.tNode = createTNode(null, attrs || null, null);
-  }
+  const node = createLNode(
+      nodeIndex, LNodeType.Projection, null, null, attrs || null, {head: null, tail: null});
 
   // `<ng-content>` has no content
   isParent = false;
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 0ec9adeb2f..ad323d052f 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -79,12 +79,6 @@ export interface LNode {
    */
   child: LNode|null;
 
-  /**
-   * The next sibling node. Necessary so we can propagate through the root nodes of a view
-   * to insert them or remove them from the DOM.
-   */
-  next: LNode|null;
-
   /**
    * If regular LElementNode, then `data` will be null.
    * If LElementNode with component, then `data` contains LView.
@@ -139,7 +133,6 @@ export interface LElementNode extends LNode {
   readonly native: RElement;
 
   child: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
-  next: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
 
   /** If Component then data has LView (light DOM) */
   readonly data: LView|null;
@@ -153,7 +146,6 @@ export interface LTextNode extends LNode {
   /** The text node associated with this node. */
   native: RText;
   child: null;
-  next: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
 
   /** LTextNodes can be inside LElementNodes or inside LViewNodes. */
   readonly parent: LElementNode|LViewNode;
@@ -165,7 +157,6 @@ export interface LTextNode extends LNode {
 export interface LViewNode extends LNode {
   readonly native: null;
   child: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
-  next: LViewNode|null;
 
   /**  LViewNodes can only be added to LContainerNodes. */
   readonly parent: LContainerNode|null;
@@ -185,7 +176,6 @@ export interface LContainerNode extends LNode {
   native: RElement|RText|null|undefined;
   readonly data: LContainer;
   child: null;
-  next: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
 
   /** Containers can be added to elements or views. */
   readonly parent: LElementNode|LViewNode|null;
@@ -195,7 +185,6 @@ export interface LContainerNode extends LNode {
 export interface LProjectionNode extends LNode {
   readonly native: null;
   child: null;
-  next: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
 
   readonly data: LProjection;
 
@@ -216,6 +205,14 @@ export interface LProjectionNode extends LNode {
  * see: https://en.wikipedia.org/wiki/Flyweight_pattern for more on the Flyweight pattern
  */
 export interface TNode {
+  /**
+   * Index of the TNode in TView.data and corresponding LNode in LView.data.
+   *
+   * This is necessary to get from any TNode to its corresponding LNode when
+   * traversing the node tree.
+   */
+  index: number;
+
   /**
    * This number stores two values using its bits:
    *
@@ -303,6 +300,12 @@ export interface TNode {
    * If this TNode corresponds to an LElementNode, tViews will be null .
    */
   tViews: TView|TView[]|null;
+
+  /**
+   * The next sibling node. Necessary so we can propagate through the root nodes of a view
+   * to insert them or remove them from the DOM.
+   */
+  next: TNode|null;
 }
 
 /** Static data for an LElementNode  */
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index d6ee59f71a..c7c750d364 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -44,13 +44,13 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
       }
       currentNode = pNextOrParent;
     } else {
-      let currentSibling = currentNode.next;
+      let currentSibling = getNextLNode(currentNode);
       while (currentSibling) {
         const nativeNode = findFirstRNode(currentSibling);
         if (nativeNode) {
           return nativeNode;
         }
-        currentSibling = currentSibling.next;
+        currentSibling = getNextLNode(currentSibling);
       }
       const parentNode = currentNode.parent;
       currentNode = null;
@@ -65,6 +65,16 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
   return null;
 }
 
+/** Retrieves the sibling node for the given node. */
+export function getNextLNode(node: LNode): LNode|null {
+  // View nodes don't have TNodes, so their next must be retrieved through their LView.
+  if (node.type === LNodeType.View) {
+    const lView = node.data as LView;
+    return lView.next ? (lView.next as LView).node : null;
+  }
+  return node.tNode !.next ? node.view.data[node.tNode !.next !.index] : null;
+}
+
 /**
  * Get the next node in the LNode tree, taking into account the place where a node is
  * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
@@ -83,7 +93,7 @@ function getNextLNodeWithProjection(node: LNode): LNode|null {
   }
 
   // returns node.next because the the node is not projected
-  return node.next;
+  return getNextLNode(node);
 }
 
 /**
@@ -187,7 +197,7 @@ export function addRemoveViewFromContainer(
           isProceduralRenderer(renderer) ? renderer.removeChild(parent as RElement, node.native !) :
                                            parent.removeChild(node.native !);
         }
-        nextNode = node.next;
+        nextNode = getNextLNode(node);
       } else if (node.type === LNodeType.Container) {
         // if we get to a container, it must be a root node of a view because we are only
         // propagating down into child views / containers and not child elements
@@ -267,32 +277,34 @@ export function destroyViewTree(rootView: LView): void {
  * the container's parent view is added later).
  *
  * @param container The container into which the view should be inserted
- * @param newView The view to insert
+ * @param viewNode The view to insert
  * @param index The index at which to insert the view
  * @returns The inserted view
  */
 export function insertView(
-    container: LContainerNode, newView: LViewNode, index: number): LViewNode {
+    container: LContainerNode, viewNode: LViewNode, index: number): LViewNode {
   const state = container.data;
   const views = state.views;
 
   if (index > 0) {
     // This is a new view, we need to add it to the children.
-    setViewNext(views[index - 1], newView);
+    views[index - 1].data.next = viewNode.data as LView;
   }
 
   if (index < views.length) {
-    setViewNext(newView, views[index]);
-    views.splice(index, 0, newView);
+    viewNode.data.next = views[index].data;
+    views.splice(index, 0, viewNode);
   } else {
-    views.push(newView);
+    views.push(viewNode);
+    viewNode.data.next = null;
   }
 
   // If the container's renderParent is null, we know that it is a root node of its own parent view
   // and we should wait until that parent processes its nodes (otherwise, we will insert this view's
   // nodes twice - once now and once when its parent inserts its views).
   if (container.data.renderParent !== null) {
-    let beforeNode = findNextRNodeSibling(newView, container);
+    let beforeNode = findNextRNodeSibling(viewNode, container);
+
     if (!beforeNode) {
       let containerNextNativeNode = container.native;
       if (containerNextNativeNode === undefined) {
@@ -300,10 +312,10 @@ export function insertView(
       }
       beforeNode = containerNextNativeNode;
     }
-    addRemoveViewFromContainer(container, newView, true, beforeNode);
+    addRemoveViewFromContainer(container, viewNode, true, beforeNode);
   }
 
-  return newView;
+  return viewNode;
 }
 
 /**
@@ -321,10 +333,9 @@ export function removeView(container: LContainerNode, removeIndex: number): LVie
   const views = container.data.views;
   const viewNode = views[removeIndex];
   if (removeIndex > 0) {
-    setViewNext(views[removeIndex - 1], viewNode.next);
+    views[removeIndex - 1].data.next = viewNode.data.next as LView;
   }
   views.splice(removeIndex, 1);
-  viewNode.next = null;
   destroyViewTree(viewNode.data);
   addRemoveViewFromContainer(container, viewNode, false);
   // Notify query that view has been removed
@@ -332,19 +343,6 @@ export function removeView(container: LContainerNode, removeIndex: number): LVie
   return viewNode;
 }
 
-/**
- * Sets a next on the view node, so views in for loops can easily jump from
- * one view to the next to add/remove elements. Also adds the LView (view.data)
- * to the view tree for easy traversal when cleaning up the view.
- *
- * @param view The view to set up
- * @param next The view's new next
- */
-export function setViewNext(view: LViewNode, next: LViewNode | null): void {
-  view.next = next;
-  view.data.next = next ? next.data : null;
-}
-
 /**
  * Determines which LViewOrLContainer to jump to when traversing back up the
  * tree in destroyViewTree.
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index d9f7140cfe..2a9c789e3d 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -389,6 +389,9 @@
   {
     "name": "getDirectiveInstance"
   },
+  {
+    "name": "getNextLNode"
+  },
   {
     "name": "getNextLNodeWithProjection"
   },
@@ -617,9 +620,6 @@
   {
     "name": "setUpAttributes"
   },
-  {
-    "name": "setViewNext"
-  },
   {
     "name": "stringify"
   },
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index ff472f96c3..9ce14e241e 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1367,7 +1367,7 @@ describe('di', () => {
           createLView(-1, null !, createTView(null, null), null, null, LViewFlags.CheckAlways);
       const oldView = enterView(contentView, null !);
       try {
-        const parent = createLNode(0, LNodeType.Element, null, null);
+        const parent = createLNode(0, LNodeType.Element, null, null, null, null);
 
         // Simulate the situation where the previous parent is not initialized.
         // This happens on first bootstrap because we don't init existing values
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 50d3a0d0f2..e0325ab458 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -32,7 +32,7 @@ describe('render3 integration test', () => {
       }
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
-        tNode: 1,
+        tNode: 2,
         tView: 1,
         rendererCreateElement: 1,
       });
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index e47cc4aab8..08a68d8cf3 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -12,14 +12,14 @@ import {getProjectAsAttrValue, isNodeMatchingSelectorList, isNodeMatchingSelecto
 
 function testLStaticData(tagName: string, attrs: string[] | null): TNode {
   return {
-    flags: 0,
-    tagName,
-    attrs,
+    index: 0,
+    flags: 0, tagName, attrs,
     localNames: null,
     initialInputs: undefined,
     inputs: undefined,
     outputs: undefined,
     tViews: null,
+    next: null
   };
 }
 
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 91563976de..3bb2328b21 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -271,7 +271,7 @@ describe('ViewContainerRef', () => {
             * <ng-template directive>A<ng-template>
             * % if (condition) {
             *  B
-            * }
+            * % }
             * |after
             */
            class TestComponent {

From a7b07defe1ee2ea035e59c7bb14110a2095af62e Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 17 May 2018 13:03:01 +0300
Subject: [PATCH 073/582] refactor(aio): clean up `attribute-utils` (#23960)

PR Close #23960
---
 aio/src/app/shared/attribute-utils.spec.ts | 18 +++++------
 aio/src/app/shared/attribute-utils.ts      | 36 ++++++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/aio/src/app/shared/attribute-utils.spec.ts b/aio/src/app/shared/attribute-utils.spec.ts
index e40ff28703..dd0ee2c265 100644
--- a/aio/src/app/shared/attribute-utils.spec.ts
+++ b/aio/src/app/shared/attribute-utils.spec.ts
@@ -1,6 +1,6 @@
 import { ElementRef } from '@angular/core';
 
-import { getAttrs, getAttrValue, getBoolFromAttribute, boolFromValue } from './attribute-utils';
+import { AttrMap, getAttrs, getAttrValue, getBoolFromAttribute, boolFromValue } from './attribute-utils';
 
 describe('Attribute Utilities', () => {
   let testEl: HTMLElement;
@@ -32,17 +32,17 @@ describe('Attribute Utilities', () => {
   });
 
   describe('getAttrValue', () => {
-    let attrMap: { [index: string]: string };
+    let attrMap: AttrMap;
 
     beforeEach(() => {
       attrMap = getAttrs(testEl);
     });
 
-    it('should return empty string value for attribute "a"', () => {
+    it('should return empty string for attribute "a"', () => {
       expect(getAttrValue(attrMap, 'a')).toBe('');
     });
 
-    it('should return empty string value for attribute "A"', () => {
+    it('should return empty string for attribute "A"', () => {
       expect(getAttrValue(attrMap, 'A')).toBe('');
     });
 
@@ -50,7 +50,7 @@ describe('Attribute Utilities', () => {
       expect(getAttrValue(attrMap, 'b')).toBe('true');
     });
 
-    it('should return empty string value for attribute "d-E"', () => {
+    it('should return empty string for attribute "d-E"', () => {
       expect(getAttrValue(attrMap, 'd-E')).toBe('');
     });
 
@@ -68,12 +68,10 @@ describe('Attribute Utilities', () => {
       expect(getAttrValue(attrMap, ['d-e', 'd'])).toBe('');
     });
 
-    it('should return undefined value for non-existent attribute "x"', () => {
+    it('should return undefined for non-existent attributes', () => {
       expect(getAttrValue(attrMap, 'x')).toBeUndefined();
-    });
-
-    it('should return undefined if no argument', () => {
-      expect(getAttrValue(attrMap)).toBeUndefined();
+      expect(getAttrValue(attrMap, '')).toBeUndefined();
+      expect(getAttrValue(attrMap, ['', 'x'])).toBeUndefined();
     });
 
   });
diff --git a/aio/src/app/shared/attribute-utils.ts b/aio/src/app/shared/attribute-utils.ts
index 4340c41b6e..758aaa422a 100644
--- a/aio/src/app/shared/attribute-utils.ts
+++ b/aio/src/app/shared/attribute-utils.ts
@@ -1,17 +1,19 @@
 // Utilities for processing HTML element attributes
 import { ElementRef } from '@angular/core';
 
-interface StringMap { [index: string]: string; }
+export interface AttrMap {
+  [key: string]: string;
+}
 
 /**
  * Get attribute map from element or ElementRef `attributes`.
  * Attribute map keys are forced lowercase for case-insensitive lookup.
- * @param el The source of the attributes
+ * @param el The source of the attributes.
  */
-export function getAttrs(el:  HTMLElement | ElementRef): StringMap {
+export function getAttrs(el:  HTMLElement | ElementRef): AttrMap {
   const attrs: NamedNodeMap = el instanceof ElementRef ? el.nativeElement.attributes : el.attributes;
-  const attrMap: StringMap = {};
-  for (const attr of attrs as any /* cast due to https://github.com/Microsoft/TypeScript/issues/2695 */) {
+  const attrMap: AttrMap = {};
+  for (const attr of attrs as any as Attr[] /* cast due to https://github.com/Microsoft/TypeScript/issues/2695 */) {
     attrMap[attr.name.toLowerCase()] = attr.value;
   }
   return attrMap;
@@ -19,29 +21,29 @@ export function getAttrs(el:  HTMLElement | ElementRef): StringMap {
 
 /**
  * Return the attribute that matches `attr`.
- * @param attr Name of the attribute or a string of candidate attribute names
+ * @param attr Name of the attribute or a string of candidate attribute names.
  */
-export function getAttrValue(attrs: StringMap, attr: string | string[] = ''): string {
-  return attrs[typeof attr === 'string' ?
-    attr.toLowerCase() :
-    attr.find(a => attrs[a.toLowerCase()] !== undefined) || ''
-  ];
+export function getAttrValue(attrs: AttrMap, attr: string | string[]): string | undefined {
+  const key = (typeof attr === 'string')
+      ? attr
+      : attr.find(a => attrs.hasOwnProperty(a.toLowerCase()));
+
+  return (key === undefined) ? undefined : attrs[key.toLowerCase()];
 }
 
 /**
  * Return the boolean state of an attribute value (if supplied)
- * @param attrValue The string value of some attribute (or undefined if attribute not present)
+ * @param attrValue The string value of some attribute (or undefined if attribute not present).
  * @param def Default boolean value when attribute is undefined.
  */
-export function boolFromValue(attrValue: string|undefined, def: boolean = false) {
-  // tslint:disable-next-line:triple-equals
-  return attrValue == undefined ? def :  attrValue.trim() !== 'false';
+export function boolFromValue(attrValue: string | undefined, def: boolean = false) {
+  return attrValue === undefined ? def : attrValue.trim() !== 'false';
 }
 
 /**
  * Return the boolean state of attribute from an element
- * @param el The source of the attributes
- * @param atty Name of the attribute or a string of candidate attribute names
+ * @param el The source of the attributes.
+ * @param atty Name of the attribute or a string of candidate attribute names.
  * @param def Default boolean value when attribute is undefined.
  */
 export function getBoolFromAttribute(

From 41fea84957d4ce12df9da13a9d04f42ccc3bc80e Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 17 May 2018 13:13:47 +0300
Subject: [PATCH 074/582] fix(aio): allow setting live-example title from
 content (#23960)

Previously, it was possible to set the live-example title as content in
the `<live-example>` element. This relied on our custom loader
functionality that extracted the content from the DOM element before
passing it to the Angular compiler and stored it on a property for later
retrieval.
Since we switched to custom elements (and got rid of the custom loader),
the property is no longer populated with the contents. As a result, many
live examples show the default title ("live example") instead of the one
specified as content.

This commit fixes it by projecting the content into an invisible node
for later retrieval  (similar to what we do in other components, such as
the `CodeExampleComponent`).

PR Close #23960
---
 .../live-example/live-example.component.html  |  3 +++
 .../live-example.component.spec.ts            | 19 ++++++++-----------
 .../live-example/live-example.component.ts    | 13 +++++++------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/aio/src/app/custom-elements/live-example/live-example.component.html b/aio/src/app/custom-elements/live-example/live-example.component.html
index b5da2b8c90..a1537bfdc4 100644
--- a/aio/src/app/custom-elements/live-example/live-example.component.html
+++ b/aio/src/app/custom-elements/live-example/live-example.component.html
@@ -1,3 +1,6 @@
+<!-- Content projection is used to get the content HTML provided to the component. -->
+<span #content style="display: none"><ng-content></ng-content></span>
+
 <span [ngSwitch]="mode">
   <span *ngSwitchCase="'disabled'">{{title}} <em>(not available on this device)</em></span>
   <span *ngSwitchCase="'embedded'">
diff --git a/aio/src/app/custom-elements/live-example/live-example.component.spec.ts b/aio/src/app/custom-elements/live-example/live-example.component.spec.ts
index 9879f0e69e..ea6209ebba 100644
--- a/aio/src/app/custom-elements/live-example/live-example.component.spec.ts
+++ b/aio/src/app/custom-elements/live-example/live-example.component.spec.ts
@@ -12,7 +12,6 @@ describe('LiveExampleComponent', () => {
   let liveExampleComponent: LiveExampleComponent;
   let fixture: ComponentFixture<HostComponent>;
   let testPath: string;
-  let liveExampleContent: string|null;
 
   //////// test helpers ////////
 
@@ -41,12 +40,11 @@ describe('LiveExampleComponent', () => {
     liveExampleDe = fixture.debugElement.children[0];
     liveExampleComponent = liveExampleDe.componentInstance;
 
-    // Copy the LiveExample's innerHTML (content)
-    // into the `liveExampleContent` property as the DocViewer does
-    liveExampleDe.nativeElement.liveExampleContent = liveExampleContent;
-
+    // Trigger `ngAfterContentInit()`.
     fixture.detectChanges();
-    liveExampleComponent.onResize(1033); // wide by default
+
+    // Ensure wide-screen by default.
+    liveExampleComponent.onResize(1033);
     fixture.detectChanges();
 
     testFn();
@@ -64,7 +62,6 @@ describe('LiveExampleComponent', () => {
     .overrideComponent(EmbeddedStackblitzComponent, {set: {template: 'NO IFRAME'}});
 
     testPath = defaultTestPath;
-    liveExampleContent = null;
   });
 
   describe('when not embedded', () => {
@@ -196,12 +193,12 @@ describe('LiveExampleComponent', () => {
     });
 
     it('should add title from <live-example> body', () => {
-      liveExampleContent = 'The Greatest Example';
-      setHostTemplate('<live-example title="ignore this title"></live-example>');
+      const expectedTitle = 'The Greatest Example';
+      setHostTemplate(`<live-example title="ignore this title">${expectedTitle}</live-example>`);
       testComponent(() => {
         const anchor = getLiveExampleAnchor();
-        expect(anchor.textContent).toBe(liveExampleContent, 'anchor content');
-        expect(anchor.getAttribute('title')).toBe(liveExampleContent, 'title');
+        expect(anchor.textContent).toBe(expectedTitle, 'anchor content');
+        expect(anchor.getAttribute('title')).toBe(expectedTitle, 'title');
       });
     });
 
diff --git a/aio/src/app/custom-elements/live-example/live-example.component.ts b/aio/src/app/custom-elements/live-example/live-example.component.ts
index 9a19663224..cd4efedf58 100644
--- a/aio/src/app/custom-elements/live-example/live-example.component.ts
+++ b/aio/src/app/custom-elements/live-example/live-example.component.ts
@@ -1,5 +1,5 @@
 /* tslint:disable component-selector */
-import { Component, ElementRef, HostListener, Input, OnInit, AfterViewInit, ViewChild } from '@angular/core';
+import { AfterContentInit, AfterViewInit, Component, ElementRef, HostListener, Input, ViewChild } from '@angular/core';
 import { Location } from '@angular/common';
 import { CONTENT_URL_PREFIX } from 'app/documents/document.service';
 
@@ -54,7 +54,7 @@ const zipBase = CONTENT_URL_PREFIX + 'zips/';
   selector: 'live-example',
   templateUrl: 'live-example.component.html'
 })
-export class LiveExampleComponent implements OnInit {
+export class LiveExampleComponent implements AfterContentInit {
 
   // Will force to embedded-style when viewport width is narrow
   // "narrow" value was picked based on phone dimensions from http://screensiz.es/phone
@@ -71,6 +71,9 @@ export class LiveExampleComponent implements OnInit {
   zip: string;
   zipName: string;
 
+  @ViewChild('content')
+  private content: ElementRef;
+
   constructor(
     private elementRef: ElementRef,
     location: Location ) {
@@ -111,11 +114,9 @@ export class LiveExampleComponent implements OnInit {
     this.stackblitz = `${liveExampleBase}${exampleDir}/${this.stackblitzName}stackblitz.html${urlQuery}`;
   }
 
-  ngOnInit() {
-    // The `liveExampleContent` property is set by the DocViewer when it builds this component.
-    // It is the original innerHTML of the host element.
+  ngAfterContentInit() {
     // Angular will sanitize this title when displayed so should be plain text.
-    const title = this.elementRef.nativeElement.liveExampleContent;
+    const title = this.content.nativeElement.textContent;
     this.title = (title || this.attrs.title || 'live example').trim();
     this.onResize(window.innerWidth);
   }

From f8c694720538f63b3557104f069fbe7e082be030 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 17 May 2018 13:15:03 +0300
Subject: [PATCH 075/582] fix(aio): avoid unnecessary re-calculations in
 live-examples (#23960)

With `plnkrs`, we used to choose a different plnkr mode (normal vs
embedded) based on the size of the screen. This affected the layout of
the plnkr page ("embedded" plnkr mode was usable on small screens, while
"normal" mode wasn't). This is not to be confused with the live-example
mode we use today to determine whether the live-example should be a link
(that open StackBlitz on a new page) or embedded into the document
(using an iframe).

Since we no longer need to change the live-example URL based on the
screen size, there is no need to listen for rezise events on Window. The
necessary properties can be computed once and certain variables are
obsolete.

PR Close #23960
---
 .../live-example/live-example.component.html  |   3 +-
 .../live-example.component.spec.ts            |  48 +---
 .../live-example/live-example.component.ts    | 208 +++++++++---------
 3 files changed, 107 insertions(+), 152 deletions(-)

diff --git a/aio/src/app/custom-elements/live-example/live-example.component.html b/aio/src/app/custom-elements/live-example/live-example.component.html
index a1537bfdc4..6c21e3b6fd 100644
--- a/aio/src/app/custom-elements/live-example/live-example.component.html
+++ b/aio/src/app/custom-elements/live-example/live-example.component.html
@@ -2,7 +2,6 @@
 <span #content style="display: none"><ng-content></ng-content></span>
 
 <span [ngSwitch]="mode">
-  <span *ngSwitchCase="'disabled'">{{title}} <em>(not available on this device)</em></span>
   <span *ngSwitchCase="'embedded'">
     <div title="{{title}}">
       <aio-embedded-stackblitz [src]="stackblitz"></aio-embedded-stackblitz>
@@ -17,7 +16,7 @@
   <span *ngSwitchDefault>
     <a [href]="stackblitz" target="_blank" title="{{title}}">{{title}}</a>
     <span *ngIf="enableDownload">
-      /  <a [href]="zip" download title="Download example">download example</a>
+      / <a [href]="zip" download title="Download example">download example</a>
     </span>
   </span>
 </span>
diff --git a/aio/src/app/custom-elements/live-example/live-example.component.spec.ts b/aio/src/app/custom-elements/live-example/live-example.component.spec.ts
index ea6209ebba..8974c4a5d3 100644
--- a/aio/src/app/custom-elements/live-example/live-example.component.spec.ts
+++ b/aio/src/app/custom-elements/live-example/live-example.component.spec.ts
@@ -43,10 +43,6 @@ describe('LiveExampleComponent', () => {
     // Trigger `ngAfterContentInit()`.
     fixture.detectChanges();
 
-    // Ensure wide-screen by default.
-    liveExampleComponent.onResize(1033);
-    fixture.detectChanges();
-
     testFn();
   }
 
@@ -100,15 +96,6 @@ describe('LiveExampleComponent', () => {
       });
     });
 
-    it('should have expected flat-style stackblitz when has `flat-style`', () => {
-      testPath = '/tutorial/toh-pt1';
-      setHostTemplate('<live-example flat-style></live-example>');
-      testComponent(() => {
-        // The file should be "stackblitz.html", not "stackblitz.html"
-        expect(getLiveExampleAnchor().href).toContain('/stackblitz.html');
-      });
-    });
-
     it('should have expected stackblitz & download hrefs when has example directory (name)', () => {
       testPath = '/guide/somewhere';
       setHostTemplate('<live-example name="toh-pt1"></live-example>');
@@ -147,15 +134,7 @@ describe('LiveExampleComponent', () => {
       });
     });
 
-    it('should be flat style when flat-style requested', () => {
-      setHostTemplate('<live-example flat-style></live-example>');
-      testComponent(() => {
-        const hrefs = getHrefs();
-        expect(hrefs[0]).toContain(defaultTestPath + '/stackblitz.html');
-      });
-    });
-
-    it('should not have a download link when `noDownload` atty present', () => {
+    it('should not have a download link when `noDownload` attr present', () => {
       setHostTemplate('<live-example noDownload></live-example>');
       testComponent(() => {
         const hrefs = getHrefs();
@@ -164,7 +143,7 @@ describe('LiveExampleComponent', () => {
       });
     });
 
-    it('should only have a download link when `downloadOnly` atty present', () => {
+    it('should only have a download link when `downloadOnly` attr present', () => {
       setHostTemplate('<live-example downloadOnly>download this</live-example>');
       testComponent(() => {
         const hrefs = getHrefs();
@@ -248,27 +227,4 @@ describe('LiveExampleComponent', () => {
       });
     });
   });
-
-  describe('when narrow display (mobile)', () => {
-
-    it('should be embedded style when no style defined', () => {
-      setHostTemplate('<live-example></live-example>');
-      testComponent(() => {
-        liveExampleComponent.onResize(600); // narrow
-        fixture.detectChanges();
-        const hrefs = getHrefs();
-        expect(hrefs[0]).toContain(defaultTestPath + '/stackblitz.html');
-      });
-    });
-
-    it('should be embedded style even when flat-style requested', () => {
-      setHostTemplate('<live-example flat-style></live-example>');
-      testComponent(() => {
-        liveExampleComponent.onResize(600); // narrow
-        fixture.detectChanges();
-        const hrefs = getHrefs();
-        expect(hrefs[0]).toContain(defaultTestPath + '/stackblitz.html');
-      });
-    });
-  });
 });
diff --git a/aio/src/app/custom-elements/live-example/live-example.component.ts b/aio/src/app/custom-elements/live-example/live-example.component.ts
index cd4efedf58..bc52ef32d3 100644
--- a/aio/src/app/custom-elements/live-example/live-example.component.ts
+++ b/aio/src/app/custom-elements/live-example/live-example.component.ts
@@ -1,131 +1,131 @@
 /* tslint:disable component-selector */
-import { AfterContentInit, AfterViewInit, Component, ElementRef, HostListener, Input, ViewChild } from '@angular/core';
+import { AfterContentInit, AfterViewInit, Component, ElementRef, Input, ViewChild } from '@angular/core';
 import { Location } from '@angular/common';
 import { CONTENT_URL_PREFIX } from 'app/documents/document.service';
+import { AttrMap, boolFromValue, getAttrs, getAttrValue } from 'app/shared/attribute-utils';
 
-import { boolFromValue, getAttrs, getAttrValue } from 'app/shared/attribute-utils';
 
-const liveExampleBase = CONTENT_URL_PREFIX + 'live-examples/';
-const zipBase = CONTENT_URL_PREFIX + 'zips/';
+const LIVE_EXAMPLE_BASE = CONTENT_URL_PREFIX + 'live-examples/';
+const ZIP_BASE = CONTENT_URL_PREFIX + 'zips/';
 
 /**
-* Angular.io Live Example Embedded Component
-*
-* Renders a link to a live/host example of the doc page.
-*
-* All attributes and the text content are optional
-*
-* Usage:
-*   <live-example
-*      [name="..."]        // name of the example directory
-*      [stackblitz="...""] // name of the stackblitz file (becomes part of zip file name as well)
-*      [embedded]          // embed the stackblitz in the doc page, else display in new browser tab (default)
-*      [noDownload]        // no downloadable zip option
-*      [downloadOnly]      // just the zip
-*      [title="..."]>      // text for live example link and tooltip
-*        text              // higher precedence way to specify text for live example link and tooltip
-*  </live-example>
-* Example:
-*   <p>Run <live-example>Try the live example</live-example></p>.
-*   // ~/resources/live-examples/{page}/stackblitz.json
-*
-*   <p>Run <live-example name="toh-pt1">this example</live-example></p>.
-*   // ~/resources/live-examples/toh-pt1/stackblitz.json
-*
-*   // Link to the default stackblitz in the toh-pt1 sample
-*   // The title overrides default ("live example") with "Tour of Heroes - Part 1"
-*   <p>Run <live-example name="toh-pt1" title="Tour of Heroes - Part 1"></live-example></p>.
-*   // ~/resources/live-examples/toh-pt1/stackblitz.json
-*
-*   <p>Run <live-example stackblitz="minimal"></live-example></p>.
-*   // ~/resources/live-examples/{page}/minimal.stackblitz.json
-*
-*   // Embed the current page's default stackblitz
-*   // Text within tag is "live example"
-*   // No title (no tooltip)
-*   <live-example embedded title=""></live-example>
-*   // ~/resources/live-examples/{page}/stackblitz.json
-*
-*   // Displays within the document page as an embedded style stackblitz editor
-*   <live-example name="toh-pt1" embedded stackblitz="minimal">Tour of Heroes - Part 1</live-example>
-*   // ~/resources/live-examples/toh-pt1/minimal.stackblitz.json
-*/
+ * Angular.io Live Example Embedded Component
+ *
+ * Renders a link to a live/host example of the doc page.
+ *
+ * All attributes and the text content are optional
+ *
+ * Usage:
+ *   <live-example
+ *      [name="..."]        // name of the example directory
+ *      [stackblitz="...""] // name of the stackblitz file (becomes part of zip file name as well)
+ *      [embedded]          // embed the stackblitz in the doc page, else display in new browser tab (default)
+ *      [noDownload]        // no downloadable zip option
+ *      [downloadOnly]      // just the zip
+ *      [title="..."]>      // text for live example link and tooltip
+ *        text              // higher precedence way to specify text for live example link and tooltip
+ *  </live-example>
+ * Example:
+ *   <p>Run <live-example>Try the live example</live-example></p>.
+ *   // ~/resources/live-examples/{page}/stackblitz.json
+ *
+ *   <p>Run <live-example name="toh-pt1">this example</live-example></p>.
+ *   // ~/resources/live-examples/toh-pt1/stackblitz.json
+ *
+ *   // Link to the default stackblitz in the toh-pt1 sample
+ *   // The title overrides default ("live example") with "Tour of Heroes - Part 1"
+ *   <p>Run <live-example name="toh-pt1" title="Tour of Heroes - Part 1"></live-example></p>.
+ *   // ~/resources/live-examples/toh-pt1/stackblitz.json
+ *
+ *   <p>Run <live-example stackblitz="minimal"></live-example></p>.
+ *   // ~/resources/live-examples/{page}/minimal.stackblitz.json
+ *
+ *   // Embed the current page's default stackblitz
+ *   // Text within tag is "live example"
+ *   // No title (no tooltip)
+ *   <live-example embedded title=""></live-example>
+ *   // ~/resources/live-examples/{page}/stackblitz.json
+ *
+ *   // Displays within the document page as an embedded style stackblitz editor
+ *   <live-example name="toh-pt1" embedded stackblitz="minimal">Tour of Heroes - Part 1</live-example>
+ *   // ~/resources/live-examples/toh-pt1/minimal.stackblitz.json
+ */
 @Component({
   selector: 'live-example',
   templateUrl: 'live-example.component.html'
 })
 export class LiveExampleComponent implements AfterContentInit {
 
-  // Will force to embedded-style when viewport width is narrow
-  // "narrow" value was picked based on phone dimensions from http://screensiz.es/phone
-  readonly narrowWidth = 1000;
-
-  attrs: any;
-  enableDownload = true;
-  exampleDir: string;
-  isEmbedded = false;
-  mode = 'disabled';
-  stackblitz: string;
-  stackblitzName: string;
+  readonly mode: 'default' | 'embedded' | 'downloadOnly';
+  readonly enableDownload: boolean;
+  readonly stackblitz: string;
+  readonly zip: string;
   title: string;
-  zip: string;
-  zipName: string;
 
   @ViewChild('content')
   private content: ElementRef;
 
-  constructor(
-    private elementRef: ElementRef,
-    location: Location ) {
+  constructor(elementRef: ElementRef, location: Location) {
+    const attrs = getAttrs(elementRef);
+    const exampleDir = this.getExampleDir(attrs, location.path(false));
+    const stackblitzName = this.getStackblitzName(attrs);
 
-    const attrs = this.attrs = getAttrs(this.elementRef);
-    let exampleDir = attrs.name;
-    if (!exampleDir) {
-      // take last segment, excluding hash fragment and query params
-      exampleDir = (location.path(false).match(/[^\/?\#]+(?=\/?(?:$|\#|\?))/) || [])[0];
-    }
-    this.exampleDir = exampleDir.trim();
-    this.zipName = exampleDir.indexOf('/') === -1 ? this.exampleDir : exampleDir.split('/')[0];
-    this.stackblitzName = attrs.stackblitz ? attrs.stackblitz.trim() + '.' : '';
-    this.zip = `${zipBase}${exampleDir}/${this.stackblitzName}${this.zipName}.zip`;
-
-    this.enableDownload = !boolFromValue(getAttrValue(attrs, 'nodownload'));
-
-    if (boolFromValue(getAttrValue(attrs, 'downloadonly'))) {
-      this.mode = 'downloadOnly';
-    }
-  }
-
-  calcStackblitzLink(width: number) {
-
-    const attrs = this.attrs;
-    const exampleDir = this.exampleDir;
-    let urlQuery = '';
-
-    this.mode = 'default';     // display in another browser tab by default
-
-    this.isEmbedded = boolFromValue(attrs.embedded);
-
-    if (this.isEmbedded) {
-      this.mode = 'embedded'; // display embedded in the doc
-      urlQuery = '?ctl=1';
-    }
-
-    this.stackblitz = `${liveExampleBase}${exampleDir}/${this.stackblitzName}stackblitz.html${urlQuery}`;
+    this.mode = this.getMode(attrs);
+    this.enableDownload = this.getEnableDownload(attrs);
+    this.stackblitz = this.getStackblitz(exampleDir, stackblitzName, this.mode === 'embedded');
+    this.zip = this.getZip(exampleDir, stackblitzName);
+    this.title = this.getTitle(attrs);
   }
 
   ngAfterContentInit() {
-    // Angular will sanitize this title when displayed so should be plain text.
-    const title = this.content.nativeElement.textContent;
-    this.title = (title || this.attrs.title || 'live example').trim();
-    this.onResize(window.innerWidth);
+    // Angular will sanitize this title when displayed, so it should be plain text.
+    const textContent = this.content.nativeElement.textContent.trim();
+    if (textContent) {
+      this.title = textContent;
+    }
   }
 
-  @HostListener('window:resize', ['$event.target.innerWidth'])
-  onResize(width: number) {
-    if (this.mode !== 'downloadOnly') {
-      this.calcStackblitzLink(width);
+  private getEnableDownload(attrs: AttrMap) {
+    const downloadDisabled = boolFromValue(getAttrValue(attrs, 'noDownload'));
+    return !downloadDisabled;
+  }
+
+  private getExampleDir(attrs: AttrMap, path: string) {
+    let exampleDir = getAttrValue(attrs, 'name');
+    if (!exampleDir) {
+      // Take the last path segment, excluding query params and hash fragment.
+      const match = path.match(/[^/?#]+(?=\/?(?:\?|#|$))/);
+      exampleDir = match ? match[0] : 'index';
     }
+    return exampleDir.trim();
+  }
+
+  private getMode(this: LiveExampleComponent, attrs: AttrMap): typeof this.mode {
+    const downloadOnly = boolFromValue(getAttrValue(attrs, 'downloadOnly'));
+    const isEmbedded = boolFromValue(getAttrValue(attrs, 'embedded'));
+
+    return downloadOnly ? 'downloadOnly'
+           : isEmbedded ? 'embedded' :
+                          'default';
+  }
+
+  private getStackblitz(exampleDir: string, stackblitzName: string, isEmbedded: boolean) {
+    const urlQuery = isEmbedded ? '?ctl=1' : '';
+    return `${LIVE_EXAMPLE_BASE}${exampleDir}/${stackblitzName}stackblitz.html${urlQuery}`;
+  }
+
+  private getStackblitzName(attrs: AttrMap) {
+    const attrValue = (getAttrValue(attrs, 'stackblitz') || '').trim();
+    return attrValue && `${attrValue}.`;
+  }
+
+  private getTitle(attrs: AttrMap) {
+    return (getAttrValue(attrs, 'title') || 'live example').trim();
+  }
+
+  private getZip(exampleDir: string, stackblitzName: string) {
+    const zipName = exampleDir.split('/')[0];
+    return `${ZIP_BASE}${exampleDir}/${stackblitzName}${zipName}.zip`;
   }
 }
 
@@ -137,7 +137,7 @@ export class LiveExampleComponent implements AfterContentInit {
 @Component({
   selector: 'aio-embedded-stackblitz',
   template: `<iframe #iframe frameborder="0" width="100%" height="100%"></iframe>`,
-  styles: [ 'iframe { min-height: 400px; }']
+  styles: [ 'iframe { min-height: 400px; }' ]
 })
 export class EmbeddedStackblitzComponent implements AfterViewInit {
   @Input() src: string;

From de267e97c99ffe62b1ad22a2ad23136d7e859174 Mon Sep 17 00:00:00 2001
From: VTHINKXIE <vthinkxie@users.noreply.github.com>
Date: Thu, 17 May 2018 10:24:08 +0800
Subject: [PATCH 076/582] docs(aio): add ant design of angular in resources
 (#23953)

PR Close #23953
---
 aio/content/marketing/resources.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index aa8e079662..52d56d6f1f 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -345,6 +345,12 @@
             "title": "Angular Material",
             "url": "https://github.com/angular/material2"
           },
+          "ngzorro": {
+            "desc": "A set of enterprise-class UI components based on Ant Design and Angular",
+            "rev": true,
+            "title": "Ant Design of Angular (ng-zorro-antd)",
+            "url": "https://ng.ant.design/docs/introduce/en"
+          },
           "aggrid": {
             "desc": "A datagrid for Angular with enterprise style features such as sorting, filtering, custom rendering, editing, grouping, aggregation and pivoting.",
             "rev": true,

From db2329ef6a2892aab4e4e62a8e27417a79937d50 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 16 May 2018 15:30:39 -0500
Subject: [PATCH 077/582] docs(aio): Add missing dependencies and files to
 testing zip file download (#23948)

Closes #23060

PR Close #23948
---
 aio/content/examples/testing/src/tests.sb.ts  | 50 +++++++++----------
 .../customizer/package-json/testing.json      |  1 +
 aio/tools/example-zipper/exampleZipper.js     |  1 +
 aio/tools/examples/shared/package.json        |  3 +-
 aio/tools/examples/shared/yarn.lock           |  6 +++
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/aio/content/examples/testing/src/tests.sb.ts b/aio/content/examples/testing/src/tests.sb.ts
index 3f1c8fe61a..c255cca180 100644
--- a/aio/content/examples/testing/src/tests.sb.ts
+++ b/aio/content/examples/testing/src/tests.sb.ts
@@ -1,26 +1,26 @@
 // Import spec files individually for Stackblitz
-import 'app/about/about.component.spec.ts';
-import 'app/app-initial.component.spec.ts';
-import 'app/app.component.router.spec.ts';
-import 'app/app.component.spec.ts';
-import 'app/banner/banner-initial.component.spec.ts';
-import 'app/banner/banner.component.spec.ts';
-import 'app/banner/banner.component.detect-changes.spec.ts';
-import 'app/banner/banner-external.component.spec.ts';
-import 'app/dashboard/dashboard-hero.component.spec.ts';
-import 'app/dashboard/dashboard.component.no-testbed.spec.ts';
-import 'app/dashboard/dashboard.component.spec.ts';
-import 'app/demo/async-helper.spec.ts';
-import 'app/demo/demo.spec.ts';
-import 'app/demo/demo.testbed.spec.ts';
-import 'app/hero/hero-detail.component.no-testbed.spec.ts';
-import 'app/hero/hero-detail.component.spec.ts';
-import 'app/hero/hero-list.component.spec.ts';
-import 'app/model/hero.service.spec.ts';
-import 'app/model/http-hero.service.spec.ts';
-import 'app/model/testing/http-client.spec.ts';
-import 'app/shared/highlight.directive.spec.ts';
-import 'app/shared/title-case.pipe.spec.ts';
-import 'app/twain/twain.component.spec.ts';
-import 'app/twain/twain.component.marbles.spec.ts';
-import 'app/welcome/welcome.component.spec.ts';
+import './app/about/about.component.spec.ts';
+import './app/app-initial.component.spec.ts';
+import './app/app.component.router.spec.ts';
+import './app/app.component.spec.ts';
+import './app/banner/banner-initial.component.spec.ts';
+import './app/banner/banner.component.spec.ts';
+import './app/banner/banner.component.detect-changes.spec.ts';
+import './app/banner/banner-external.component.spec.ts';
+import './app/dashboard/dashboard-hero.component.spec.ts';
+import './app/dashboard/dashboard.component.no-testbed.spec.ts';
+import './app/dashboard/dashboard.component.spec.ts';
+import './app/demo/async-helper.spec.ts';
+import './app/demo/demo.spec.ts';
+import './app/demo/demo.testbed.spec.ts';
+import './app/hero/hero-detail.component.no-testbed.spec.ts';
+import './app/hero/hero-detail.component.spec.ts';
+import './app/hero/hero-list.component.spec.ts';
+import './app/model/hero.service.spec.ts';
+import './app/model/http-hero.service.spec.ts';
+import './app/model/testing/http-client.spec.ts';
+import './app/shared/highlight.directive.spec.ts';
+import './app/shared/title-case.pipe.spec.ts';
+import './app/twain/twain.component.spec.ts';
+import './app/twain/twain.component.marbles.spec.ts';
+import './app/welcome/welcome.component.spec.ts';
diff --git a/aio/tools/example-zipper/customizer/package-json/testing.json b/aio/tools/example-zipper/customizer/package-json/testing.json
index 92f1609f1a..5ce4c4788f 100644
--- a/aio/tools/example-zipper/customizer/package-json/testing.json
+++ b/aio/tools/example-zipper/customizer/package-json/testing.json
@@ -11,6 +11,7 @@
   "devDependencies": [
     "@angular/cli",
     "@types/jasminewd2",
+    "jasmine-marbles",
     "jasmine-spec-reporter",
     "karma-coverage-istanbul-reporter",
     "ts-node"
diff --git a/aio/tools/example-zipper/exampleZipper.js b/aio/tools/example-zipper/exampleZipper.js
index fedcebb1ba..996f38a008 100644
--- a/aio/tools/example-zipper/exampleZipper.js
+++ b/aio/tools/example-zipper/exampleZipper.js
@@ -98,6 +98,7 @@ class ExampleZipper {
       'src/favicon.ico',
       'src/karma.conf.js',
       'src/polyfills.ts',
+      'src/test.ts',
       'src/typings.d.ts',
       'src/environments/**/*',
       'src/tsconfig.*',
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 90e2ff8e32..d3f27b9ee5 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -40,11 +40,11 @@
     "zone.js": "^0.8.24"
   },
   "devDependencies": {
+    "@angular-devkit/build-angular": "~0.6.0",
     "@angular/cli": "^6.0.0",
     "@angular/compiler-cli": "^6.0.0",
     "@angular/language-service": "^6.0.0",
     "@angular/platform-server": "^6.0.0",
-    "@angular-devkit/build-angular": "~0.6.0",
     "@types/angular": "^1.5.16",
     "@types/angular-animate": "^1.5.5",
     "@types/angular-cookies": "^1.4.2",
@@ -66,6 +66,7 @@
     "html-webpack-plugin": "^2.16.1",
     "http-server": "^0.9.0",
     "jasmine-core": "~2.99.1",
+    "jasmine-marbles": "^0.3.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~1.7.1",
     "karma-chrome-launcher": "~2.2.0",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index fcde5b4085..b85cf758e4 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -4986,6 +4986,12 @@ jasmine-core@~2.99.1:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
 
+jasmine-marbles@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.3.1.tgz#ef65edecb41b8dd62fc6bda40448222042e32043"
+  dependencies:
+    lodash "^4.5.0"
+
 jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"

From 1b6b936ef4a3143443fabb5aacd3993c400f1d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Thu, 3 May 2018 10:40:31 -0700
Subject: [PATCH 078/582] test(ivy): Add bazel flag to control building
 ViewEngine or Ivy (#23833)

PR Close #23833
---
 packages/core/BUILD.bazel                | 22 ++++++++++++++-
 packages/core/src/core_private_export.ts |  1 +
 packages/core/src/ivy_switch.ts          | 34 ++++++++++++++++++++++++
 packages/core/src/ivy_switch_false.ts    |  9 +++++++
 packages/core/src/ivy_switch_true.ts     |  9 +++++++
 tools/bazel.rc                           |  7 +++++
 6 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/src/ivy_switch.ts
 create mode 100644 packages/core/src/ivy_switch_false.ts
 create mode 100644 packages/core/src/ivy_switch_true.ts

diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index 80550ecf11..7bbfa1911e 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -9,7 +9,10 @@ ng_module(
             "*.ts",
             "src/**/*.ts",
         ],
-    ),
+        exclude = ["src/ivy_switch.ts"],
+    ) + [
+        ":ivy_switch",
+    ],
     module_name = "@angular/core",
     deps = [
         "//packages:types",
@@ -30,3 +33,20 @@ ng_package(
         "//packages/core/testing",
     ],
 )
+
+## Controls if Ivy is enabled. (Temporary target until we permanently switch over to Ivy)
+##
+## This file generates `src/ivy_switch.ts` file which reexports symbols for `ViewEngine` or `Ivy.`
+## - append `--define=ivy=false` (default) to `bazel` command to reexport `./ivy_switch_false`
+##   and use `ViewEngine`;
+## - append `--define=ivy=true` to `bazel` command to rexport `./ivy_switch_true` and use `Ivy`;
+##
+## NOTE: `--define=ivy=true` works with any `bazel` command or target across the repo.
+##
+## See: `//tools/bazel.rc` where `--define=ivy=false` is defined as default.
+## See: `./src/ivy_switch.ts` for more details.
+genrule(
+    name = "ivy_switch",
+    outs = ["src/ivy_switch.ts"],
+    cmd = "echo export '*' from \"'./ivy_switch_$(ivy)';\" > $@",
+)
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 7b6101355e..f56c13e4e5 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -15,6 +15,7 @@ export {ChangeDetectorStatus as ɵChangeDetectorStatus, isDefaultChangeDetection
 export {Console as ɵConsole} from './console';
 export {inject as ɵinject, setCurrentInjector as ɵsetCurrentInjector} from './di/injector';
 export {APP_ROOT as ɵAPP_ROOT} from './di/scope';
+export {ivyEnabled as ɵivyEnabled} from './ivy_switch';
 export {ComponentFactory as ɵComponentFactory} from './linker/component_factory';
 export {CodegenComponentFactoryResolver as ɵCodegenComponentFactoryResolver} from './linker/component_factory_resolver';
 export {ReflectionCapabilities as ɵReflectionCapabilities} from './reflection/reflection_capabilities';
diff --git a/packages/core/src/ivy_switch.ts b/packages/core/src/ivy_switch.ts
new file mode 100644
index 0000000000..a584e99587
--- /dev/null
+++ b/packages/core/src/ivy_switch.ts
@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * This file is used to control if the default rendering pipeline should be `ViewEngine` or `Ivy`.
+ *
+ * Reexport from:
+ * - `./ivy_switch_false` => Use `ViewEngine`.
+ * - `./ivy_switch_true` => Use `Ivy`.
+ *
+ * This file is here for your IDE as well as for `google3`. The `bazel` build system
+ * specifically excludes this file and instead generates a new file which is controlled by
+ * command line:
+ *
+ * - `bazel build packages/core` => Use `ViewEngine`
+ * - `bazel build packages/core --define=ivy=true` => Use `Ivy`
+ *
+ * See: `bazel build packages/core:ivy_switch` for more details.
+ *
+ * ## How to use this
+ *
+ * Use this mechanism to have the same symbol be aliased to different implementation.
+ * 1) Create two implementations of a symbol (most likely a `function` or a `class`).
+ * 2) Export the two implementation under same name in `./ivy_switch_false` and `./ivy_switch_false`
+ *    respectively.
+ * 3) Import the symbol from `./ivy_switch`. The imported symbol will that point to either the
+ *    symbol in `./ivy_switch_false` and `./ivy_switch_false` depending on the compilation mode.
+ */
+export * from './ivy_switch_false';
diff --git a/packages/core/src/ivy_switch_false.ts b/packages/core/src/ivy_switch_false.ts
new file mode 100644
index 0000000000..599a11d63e
--- /dev/null
+++ b/packages/core/src/ivy_switch_false.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export const ivyEnabled = false;
\ No newline at end of file
diff --git a/packages/core/src/ivy_switch_true.ts b/packages/core/src/ivy_switch_true.ts
new file mode 100644
index 0000000000..fc5c97d002
--- /dev/null
+++ b/packages/core/src/ivy_switch_true.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export const ivyEnabled = true;
\ No newline at end of file
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 1d0f39dfd2..52af863bea 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -53,3 +53,10 @@ test --experimental_ui
 ################################
 
 # Bazel flags for CircleCI are in /.circleci/bazel.rc
+
+################################
+# Temporary Settings for Ivy   #
+################################
+# to determine if the compiler used should be Ivy or ViewEngine one can use `--define=ivy=true` on 
+# any bazel target. This is a temporary flag until codebase is permanently switched to ViewEngine.
+build --define=ivy=false
\ No newline at end of file

From 919f42fea1df4b9e38b7d688aef5f2de668e9d3e Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 9 May 2018 08:35:25 -0700
Subject: [PATCH 079/582] feat(ivy): first steps towards JIT compilation
 (#23833)

This commit adds a mechanism by which the @angular/core annotations
for @Component, @Injectable, and @NgModule become decorators which,
when executed at runtime, trigger just-in-time compilation of their
associated types. The activation of these decorators is configured
by the ivy_switch mechanism, ensuring that the Ivy JIT engine does
not get included in Angular bundles unless specifically requested.

PR Close #23833
---
 .../src/ngtsc/transform/src/injectable.ts     |  45 ++---
 .../src/ngtsc/transform/src/transform.ts      |   2 +-
 packages/compiler/src/aot/compiler.ts         |  14 +-
 packages/compiler/src/compiler.ts             |   7 +
 packages/compiler/src/identifiers.ts          |   1 +
 .../compiler/src/injectable_compiler_2.ts     | 141 ++++++++-------
 .../compiler/src/output/abstract_emitter.ts   |   2 +-
 .../src/output/abstract_js_emitter.ts         |   3 +-
 packages/compiler/src/output/output_jit.ts    |  27 ++-
 .../compiler/src/render3/r3_identifiers.ts    |   2 +
 packages/compiler/src/render3/r3_jit.ts       |  78 ++++++++
 .../src/render3/r3_module_compiler.ts         |  83 +++++++--
 packages/compiler/src/render3/util.ts         |  38 ++++
 .../compiler/src/render3/view/template.ts     |  42 ++++-
 packages/core/BUILD.bazel                     |   1 +
 packages/core/rollup.config.js                |   3 +-
 packages/core/src/application_module.ts       |   5 +-
 packages/core/src/di/injectable.ts            |  32 ++--
 packages/core/src/ivy_switch.ts               |   2 +
 packages/core/src/ivy_switch_false.ts         |   5 +-
 packages/core/src/ivy_switch_true.ts          |   9 +-
 packages/core/src/metadata.ts                 |   2 +-
 packages/core/src/metadata/directives.ts      |   5 +-
 packages/core/src/metadata/ng_module.ts       |  48 +++--
 packages/core/src/render3/jit/directive.ts    |  97 ++++++++++
 packages/core/src/render3/jit/environment.ts  |  39 ++++
 packages/core/src/render3/jit/injectable.ts   | 114 ++++++++++++
 packages/core/src/render3/jit/module.ts       |  94 ++++++++++
 packages/core/src/render3/jit/util.ts         |  86 +++++++++
 .../test/bundling/hello_world_jit/BUILD.bazel |  58 ++++++
 .../test/bundling/hello_world_jit/index.html  |  31 ++++
 .../test/bundling/hello_world_jit/index.ts    |  38 ++++
 .../hello_world_jit/integration_spec.ts       |  23 +++
 .../hello_world_r2/bundle.golden_symbols.json |   6 +
 packages/core/test/render3/BUILD.bazel        |  14 +-
 packages/core/test/render3/ivy/BUILD.bazel    |  41 +++++
 packages/core/test/render3/ivy/jit_spec.ts    | 166 ++++++++++++++++++
 37 files changed, 1248 insertions(+), 156 deletions(-)
 create mode 100644 packages/compiler/src/render3/r3_jit.ts
 create mode 100644 packages/compiler/src/render3/util.ts
 create mode 100644 packages/core/src/render3/jit/directive.ts
 create mode 100644 packages/core/src/render3/jit/environment.ts
 create mode 100644 packages/core/src/render3/jit/injectable.ts
 create mode 100644 packages/core/src/render3/jit/module.ts
 create mode 100644 packages/core/src/render3/jit/util.ts
 create mode 100644 packages/core/test/bundling/hello_world_jit/BUILD.bazel
 create mode 100644 packages/core/test/bundling/hello_world_jit/index.html
 create mode 100644 packages/core/test/bundling/hello_world_jit/index.ts
 create mode 100644 packages/core/test/bundling/hello_world_jit/integration_spec.ts
 create mode 100644 packages/core/test/render3/ivy/BUILD.bazel
 create mode 100644 packages/core/test/render3/ivy/jit_spec.ts

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts b/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
index a97ffe38a1..d6444bc584 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, IvyInjectableDep, IvyInjectableMetadata, LiteralExpr, WrappedNodeExpr, compileIvyInjectable} from '@angular/compiler';
+import {Expression, LiteralExpr, R3DependencyMetadata, R3InjectableMetadata, R3ResolvedDependencyType, WrappedNodeExpr, compileInjectable as compileIvyInjectable} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Decorator} from '../../metadata';
@@ -18,20 +18,20 @@ import {AddStaticFieldInstruction, AnalysisOutput, CompilerAdapter} from './api'
 /**
  * Adapts the `compileIvyInjectable` compiler for `@Injectable` decorators to the Ivy compiler.
  */
-export class InjectableCompilerAdapter implements CompilerAdapter<IvyInjectableMetadata> {
+export class InjectableCompilerAdapter implements CompilerAdapter<R3InjectableMetadata> {
   constructor(private checker: ts.TypeChecker) {}
 
   detect(decorator: Decorator[]): Decorator|undefined {
     return decorator.find(dec => dec.name === 'Injectable' && dec.from === '@angular/core');
   }
 
-  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<IvyInjectableMetadata> {
+  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3InjectableMetadata> {
     return {
       analysis: extractInjectableMetadata(node, decorator, this.checker),
     };
   }
 
-  compile(node: ts.ClassDeclaration, analysis: IvyInjectableMetadata): AddStaticFieldInstruction {
+  compile(node: ts.ClassDeclaration, analysis: R3InjectableMetadata): AddStaticFieldInstruction {
     const res = compileIvyInjectable(analysis);
     return {
       field: 'ngInjectableDef',
@@ -47,7 +47,7 @@ export class InjectableCompilerAdapter implements CompilerAdapter<IvyInjectableM
  */
 function extractInjectableMetadata(
     clazz: ts.ClassDeclaration, decorator: Decorator,
-    checker: ts.TypeChecker): IvyInjectableMetadata {
+    checker: ts.TypeChecker): R3InjectableMetadata {
   if (clazz.name === undefined) {
     throw new Error(`@Injectables must have names`);
   }
@@ -58,7 +58,7 @@ function extractInjectableMetadata(
       name,
       type,
       providedIn: new LiteralExpr(null),
-      useType: getUseType(clazz, checker),
+      deps: getConstructorDependencies(clazz, checker),
     };
   } else if (decorator.args.length === 1) {
     const metaNode = decorator.args[0];
@@ -84,7 +84,7 @@ function extractInjectableMetadata(
     } else if (meta.has('useFactory')) {
       // useFactory is special - the 'deps' property must be analyzed.
       const factory = new WrappedNodeExpr(meta.get('useFactory') !);
-      const deps: IvyInjectableDep[] = [];
+      const deps: R3DependencyMetadata[] = [];
       if (meta.has('deps')) {
         const depsExpr = meta.get('deps') !;
         if (!ts.isArrayLiteralExpression(depsExpr)) {
@@ -95,18 +95,19 @@ function extractInjectableMetadata(
         }
         deps.push(...depsExpr.elements.map(dep => getDep(dep, checker)));
       }
-      return {name, type, providedIn, useFactory: {factory, deps}};
+      return {name, type, providedIn, useFactory: factory, deps};
     } else {
-      const useType = getUseType(clazz, checker);
-      return {name, type, providedIn, useType};
+      const deps = getConstructorDependencies(clazz, checker);
+      return {name, type, providedIn, deps};
     }
   } else {
     throw new Error(`Too many arguments to @Injectable`);
   }
 }
 
-function getUseType(clazz: ts.ClassDeclaration, checker: ts.TypeChecker): IvyInjectableDep[] {
-  const useType: IvyInjectableDep[] = [];
+function getConstructorDependencies(
+    clazz: ts.ClassDeclaration, checker: ts.TypeChecker): R3DependencyMetadata[] {
+  const useType: R3DependencyMetadata[] = [];
   const ctorParams = (reflectConstructorParameters(clazz, checker) || []);
   ctorParams.forEach(param => {
     let tokenExpr = param.typeValueExpr;
@@ -131,18 +132,20 @@ function getUseType(clazz: ts.ClassDeclaration, checker: ts.TypeChecker): IvyInj
       }
     });
     const token = new WrappedNodeExpr(tokenExpr);
-    useType.push({token, optional, self, skipSelf, attribute: false});
+    useType.push(
+        {token, optional, self, skipSelf, host: false, resolved: R3ResolvedDependencyType.Token});
   });
   return useType;
 }
 
-function getDep(dep: ts.Expression, checker: ts.TypeChecker): IvyInjectableDep {
-  const depObj = {
+function getDep(dep: ts.Expression, checker: ts.TypeChecker): R3DependencyMetadata {
+  const meta: R3DependencyMetadata = {
     token: new WrappedNodeExpr(dep),
+    host: false,
+    resolved: R3ResolvedDependencyType.Token,
     optional: false,
     self: false,
     skipSelf: false,
-    attribute: false,
   };
 
   function maybeUpdateDecorator(dec: ts.Identifier, token?: ts.Expression): void {
@@ -153,17 +156,17 @@ function getDep(dep: ts.Expression, checker: ts.TypeChecker): IvyInjectableDep {
     switch (source.name) {
       case 'Inject':
         if (token !== undefined) {
-          depObj.token = new WrappedNodeExpr(token);
+          meta.token = new WrappedNodeExpr(token);
         }
         break;
       case 'Optional':
-        depObj.optional = true;
+        meta.optional = true;
         break;
       case 'SkipSelf':
-        depObj.skipSelf = true;
+        meta.skipSelf = true;
         break;
       case 'Self':
-        depObj.self = true;
+        meta.self = true;
         break;
     }
   }
@@ -178,5 +181,5 @@ function getDep(dep: ts.Expression, checker: ts.TypeChecker): IvyInjectableDep {
       }
     });
   }
-  return depObj;
+  return meta;
 }
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index 161369cc4b..85d6fcb9c1 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {WrappedNodeExpr, compileIvyInjectable} from '@angular/compiler';
+import {WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {IvyCompilation} from './compilation';
diff --git a/packages/compiler/src/aot/compiler.ts b/packages/compiler/src/aot/compiler.ts
index af87fc8db7..45d80a6206 100644
--- a/packages/compiler/src/aot/compiler.ts
+++ b/packages/compiler/src/aot/compiler.ts
@@ -22,10 +22,10 @@ import {NgModuleCompiler} from '../ng_module_compiler';
 import {OutputEmitter} from '../output/abstract_emitter';
 import * as o from '../output/output_ast';
 import {ParseError} from '../parse_util';
-import {compileNgModule as compileIvyModule} from '../render3/r3_module_compiler';
-import {compilePipe as compileIvyPipe} from '../render3/r3_pipe_compiler';
+import {compileNgModuleFromRender2 as compileR3Module} from '../render3/r3_module_compiler';
+import {compilePipe as compileR3Pipe} from '../render3/r3_pipe_compiler';
 import {htmlAstToRender3Ast} from '../render3/r3_template_transform';
-import {compileComponentFromRender2 as compileIvyComponent, compileDirectiveFromRender2 as compileIvyDirective} from '../render3/view/compiler';
+import {compileComponentFromRender2 as compileR3Component, compileDirectiveFromRender2 as compileR3Directive} from '../render3/view/compiler';
 import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
 import {CompiledStylesheet, StyleCompiler} from '../style_compiler';
 import {SummaryResolver} from '../summary_resolver';
@@ -362,7 +362,7 @@ export class AotCompiler {
   private _compileShallowModules(
       fileName: string, shallowModules: CompileShallowModuleMetadata[],
       context: OutputContext): void {
-    shallowModules.forEach(module => compileIvyModule(context, module, this._injectableCompiler));
+    shallowModules.forEach(module => compileR3Module(context, module, this._injectableCompiler));
   }
 
   private _compilePartialModule(
@@ -413,18 +413,18 @@ export class AotCompiler {
 
         pipes.forEach(pipe => { pipeTypeByName.set(pipe.name, pipe.type.reference); });
 
-        compileIvyComponent(
+        compileR3Component(
             context, directiveMetadata, render3Ast, this.reflector, hostBindingParser,
             directiveTypeBySel, pipeTypeByName);
       } else {
-        compileIvyDirective(context, directiveMetadata, this.reflector, hostBindingParser);
+        compileR3Directive(context, directiveMetadata, this.reflector, hostBindingParser);
       }
     });
 
     pipes.forEach(pipeType => {
       const pipeMetadata = this._metadataResolver.getPipeMetadata(pipeType);
       if (pipeMetadata) {
-        compileIvyPipe(context, pipeMetadata, this.reflector);
+        compileR3Pipe(context, pipeMetadata, this.reflector);
       }
     });
 
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index a0f1c7cbe3..88303c3d46 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -50,6 +50,7 @@ export {JitCompiler} from './jit/compiler';
 export * from './compile_reflector';
 export * from './url_resolver';
 export * from './resource_loader';
+export {ConstantPool} from './constant_pool';
 export {DirectiveResolver} from './directive_resolver';
 export {PipeResolver} from './pipe_resolver';
 export {NgModuleResolver} from './ng_module_resolver';
@@ -79,4 +80,10 @@ export {ViewCompiler} from './view_compiler/view_compiler';
 export {getParseErrors, isSyntaxError, syntaxError, Version} from './util';
 export {SourceMap} from './output/source_map';
 export * from './injectable_compiler_2';
+export * from './render3/view/api';
+export {jitPatchDefinition} from './render3/r3_jit';
+export {R3DependencyMetadata, R3FactoryMetadata, R3ResolvedDependencyType} from './render3/r3_factory';
+export {compileNgModule, R3NgModuleMetadata} from './render3/r3_module_compiler';
+export {makeBindingParser, parseTemplate} from './render3/view/template';
+export {compileComponent, compileDirective} from './render3/view/compiler';
 // This file only reexports content of the `src` folder. Keep it that way.
\ No newline at end of file
diff --git a/packages/compiler/src/identifiers.ts b/packages/compiler/src/identifiers.ts
index 9c85cae1e9..dcfc98598e 100644
--- a/packages/compiler/src/identifiers.ts
+++ b/packages/compiler/src/identifiers.ts
@@ -65,6 +65,7 @@ export class Identifiers {
   static INJECTOR: o.ExternalReference = {name: 'INJECTOR', moduleName: CORE};
   static Injector: o.ExternalReference = {name: 'Injector', moduleName: CORE};
   static defineInjectable: o.ExternalReference = {name: 'defineInjectable', moduleName: CORE};
+  static InjectableDef: o.ExternalReference = {name: 'InjectableDef', moduleName: CORE};
   static ViewEncapsulation: o.ExternalReference = {
     name: 'ViewEncapsulation',
     moduleName: CORE,
diff --git a/packages/compiler/src/injectable_compiler_2.ts b/packages/compiler/src/injectable_compiler_2.ts
index 0f01f881b0..083d2217f4 100644
--- a/packages/compiler/src/injectable_compiler_2.ts
+++ b/packages/compiler/src/injectable_compiler_2.ts
@@ -7,96 +7,107 @@
  */
 
 import {InjectFlags} from './core';
+import {Identifiers} from './identifiers';
 import * as o from './output/output_ast';
-import {Identifiers} from './render3/r3_identifiers';
-
-
-type MapEntry = {
-  key: string; quoted: boolean; value: o.Expression;
-};
-
-function mapToMapExpression(map: {[key: string]: o.Expression}): o.LiteralMapExpr {
-  const result = Object.keys(map).map(key => ({key, value: map[key], quoted: false}));
-  return o.literalMap(result);
-}
+import {R3DependencyMetadata, compileFactoryFunction} from './render3/r3_factory';
+import {mapToMapExpression} from './render3/util';
 
 export interface InjectableDef {
   expression: o.Expression;
   type: o.Type;
 }
 
-export interface IvyInjectableDep {
-  token: o.Expression;
-  optional: boolean;
-  self: boolean;
-  skipSelf: boolean;
-  attribute: boolean;
-}
-
-export interface IvyInjectableMetadata {
+export interface R3InjectableMetadata {
   name: string;
   type: o.Expression;
   providedIn: o.Expression;
-  useType?: IvyInjectableDep[];
   useClass?: o.Expression;
-  useFactory?: {factory: o.Expression; deps: IvyInjectableDep[];};
+  useFactory?: o.Expression;
   useExisting?: o.Expression;
   useValue?: o.Expression;
+  deps?: R3DependencyMetadata[];
 }
 
-export function compileIvyInjectable(meta: IvyInjectableMetadata): InjectableDef {
-  let ret: o.Expression = o.NULL_EXPR;
-  if (meta.useType !== undefined) {
-    const args = meta.useType.map(dep => injectDep(dep));
-    ret = new o.InstantiateExpr(meta.type, args);
-  } else if (meta.useClass !== undefined) {
-    const factory =
-        new o.ReadPropExpr(new o.ReadPropExpr(meta.useClass, 'ngInjectableDef'), 'factory');
-    ret = new o.InvokeFunctionExpr(factory, []);
+export function compileInjectable(meta: R3InjectableMetadata): InjectableDef {
+  let factory: o.Expression = o.NULL_EXPR;
+
+  function makeFn(ret: o.Expression): o.Expression {
+    return o.fn([], [new o.ReturnStatement(ret)], undefined, undefined, `${meta.name}_Factory`);
+  }
+
+  if (meta.useClass !== undefined || meta.useFactory !== undefined) {
+    // First, handle useClass and useFactory together, since both involve a similar call to
+    // `compileFactoryFunction`. Either dependencies are explicitly specified, in which case
+    // a factory function call is generated, or they're not specified and the calls are special-
+    // cased.
+    if (meta.deps !== undefined) {
+      // Either call `new meta.useClass(...)` or `meta.useFactory(...)`.
+      const fnOrClass: o.Expression = meta.useClass || meta.useFactory !;
+
+      // useNew: true if meta.useClass, false for meta.useFactory.
+      const useNew = meta.useClass !== undefined;
+
+      factory = compileFactoryFunction({
+        name: meta.name,
+        fnOrClass,
+        useNew,
+        injectFn: Identifiers.inject,
+        useOptionalParam: true,
+        deps: meta.deps,
+      });
+    } else if (meta.useClass !== undefined) {
+      // Special case for useClass where the factory from the class's ngInjectableDef is used.
+      if (meta.useClass.isEquivalent(meta.type)) {
+        // For the injectable compiler, useClass represents a foreign type that should be
+        // instantiated to satisfy construction of the given type. It's not valid to specify
+        // useClass === type, since the useClass type is expected to already be compiled.
+        throw new Error(
+            `useClass is the same as the type, but no deps specified, which is invalid.`);
+      }
+      factory =
+          makeFn(new o.ReadPropExpr(new o.ReadPropExpr(meta.useClass, 'ngInjectableDef'), 'factory')
+                     .callFn([]));
+    } else if (meta.useFactory !== undefined) {
+      // Special case for useFactory where no arguments are passed.
+      factory = meta.useFactory.callFn([]);
+    } else {
+      // Can't happen - outer conditional guards against both useClass and useFactory being
+      // undefined.
+      throw new Error('Reached unreachable block in injectable compiler.');
+    }
   } else if (meta.useValue !== undefined) {
-    ret = meta.useValue;
+    // Note: it's safe to use `meta.useValue` instead of the `USE_VALUE in meta` check used for
+    // client code because meta.useValue is an Expression which will be defined even if the actual
+    // value is undefined.
+    factory = makeFn(meta.useValue);
   } else if (meta.useExisting !== undefined) {
-    ret = o.importExpr(Identifiers.inject).callFn([meta.useExisting]);
-  } else if (meta.useFactory !== undefined) {
-    const args = meta.useFactory.deps.map(dep => injectDep(dep));
-    ret = new o.InvokeFunctionExpr(meta.useFactory.factory, args);
+    // useExisting is an `inject` call on the existing token.
+    factory = makeFn(o.importExpr(Identifiers.inject).callFn([meta.useExisting]));
   } else {
-    throw new Error('No instructions for injectable compiler!');
+    // A strict type is compiled according to useClass semantics, except the dependencies are
+    // required.
+    if (meta.deps === undefined) {
+      throw new Error(`Type compilation of an injectable requires dependencies.`);
+    }
+    factory = compileFactoryFunction({
+      name: meta.name,
+      fnOrClass: meta.type,
+      useNew: true,
+      injectFn: Identifiers.inject,
+      useOptionalParam: true,
+      deps: meta.deps,
+    });
   }
 
   const token = meta.type;
   const providedIn = meta.providedIn;
-  const factory =
-      o.fn([], [new o.ReturnStatement(ret)], undefined, undefined, `${meta.name}_Factory`);
 
-  const expression = o.importExpr({
-                        moduleName: '@angular/core',
-                        name: 'defineInjectable',
-                      }).callFn([mapToMapExpression({token, factory, providedIn})]);
-  const type = new o.ExpressionType(o.importExpr(
-      {
-        moduleName: '@angular/core',
-        name: 'InjectableDef',
-      },
-      [new o.ExpressionType(meta.type)]));
+  const expression = o.importExpr(Identifiers.defineInjectable).callFn([mapToMapExpression(
+      {token, factory, providedIn})]);
+  const type = new o.ExpressionType(
+      o.importExpr(Identifiers.InjectableDef, [new o.ExpressionType(meta.type)]));
 
   return {
       expression, type,
   };
 }
-
-function injectDep(dep: IvyInjectableDep): o.Expression {
-  const defaultValue = dep.optional ? o.NULL_EXPR : o.literal(undefined);
-  const flags = o.literal(
-      InjectFlags.Default | (dep.self && InjectFlags.Self || 0) |
-      (dep.skipSelf && InjectFlags.SkipSelf || 0));
-  if (!dep.optional && !dep.skipSelf && !dep.self) {
-    return o.importExpr(Identifiers.inject).callFn([dep.token]);
-  } else {
-    return o.importExpr(Identifiers.inject).callFn([
-      dep.token,
-      defaultValue,
-      flags,
-    ]);
-  }
-}
diff --git a/packages/compiler/src/output/abstract_emitter.ts b/packages/compiler/src/output/abstract_emitter.ts
index e168a5a28f..9780ded14f 100644
--- a/packages/compiler/src/output/abstract_emitter.ts
+++ b/packages/compiler/src/output/abstract_emitter.ts
@@ -312,7 +312,7 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex
     ctx.print(expr, `)`);
     return null;
   }
-  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: EmitterVisitorContext): never {
+  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: EmitterVisitorContext): any {
     throw new Error('Abstract emitter cannot visit WrappedNodeExpr.');
   }
   visitReadVarExpr(ast: o.ReadVarExpr, ctx: EmitterVisitorContext): any {
diff --git a/packages/compiler/src/output/abstract_js_emitter.ts b/packages/compiler/src/output/abstract_js_emitter.ts
index 943fab81e1..621a67af40 100644
--- a/packages/compiler/src/output/abstract_js_emitter.ts
+++ b/packages/compiler/src/output/abstract_js_emitter.ts
@@ -70,9 +70,10 @@ export abstract class AbstractJsEmitterVisitor extends AbstractEmitterVisitor {
     ctx.println(stmt, `};`);
   }
 
-  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: EmitterVisitorContext): never {
+  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: EmitterVisitorContext): any {
     throw new Error('Cannot emit a WrappedNodeExpr in Javascript.');
   }
+
   visitReadVarExpr(ast: o.ReadVarExpr, ctx: EmitterVisitorContext): string|null {
     if (ast.builtin === o.BuiltinVar.This) {
       ctx.print(ast, 'self');
diff --git a/packages/compiler/src/output/output_jit.ts b/packages/compiler/src/output/output_jit.ts
index 7fb32a64cc..3c077aa911 100644
--- a/packages/compiler/src/output/output_jit.ts
+++ b/packages/compiler/src/output/output_jit.ts
@@ -68,15 +68,12 @@ export class JitEmitterVisitor extends AbstractJsEmitterVisitor {
   }
 
   visitExternalExpr(ast: o.ExternalExpr, ctx: EmitterVisitorContext): any {
-    const value = this.reflector.resolveExternalReference(ast.value);
-    let id = this._evalArgValues.indexOf(value);
-    if (id === -1) {
-      id = this._evalArgValues.length;
-      this._evalArgValues.push(value);
-      const name = identifierName({reference: value}) || 'val';
-      this._evalArgNames.push(`jit_${name}_${id}`);
-    }
-    ctx.print(ast, this._evalArgNames[id]);
+    this._emitReferenceToExternal(ast, this.reflector.resolveExternalReference(ast.value), ctx);
+    return null;
+  }
+
+  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: EmitterVisitorContext): any {
+    this._emitReferenceToExternal(ast, ast.node, ctx);
     return null;
   }
 
@@ -100,4 +97,16 @@ export class JitEmitterVisitor extends AbstractJsEmitterVisitor {
     }
     return super.visitDeclareClassStmt(stmt, ctx);
   }
+
+  private _emitReferenceToExternal(ast: o.Expression, value: any, ctx: EmitterVisitorContext):
+      void {
+    let id = this._evalArgValues.indexOf(value);
+    if (id === -1) {
+      id = this._evalArgValues.length;
+      this._evalArgValues.push(value);
+      const name = identifierName({reference: value}) || 'val';
+      this._evalArgNames.push(`jit_${name}_${id}`);
+    }
+    ctx.print(ast, this._evalArgNames[id]);
+  }
 }
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 030a2b9b94..bbde7f2f02 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -110,6 +110,8 @@ export class Identifiers {
     moduleName: CORE,
   };
 
+  static defineNgModule: o.ExternalReference = {name: 'ɵdefineNgModule', moduleName: CORE};
+
   static definePipe: o.ExternalReference = {name: 'ɵdefinePipe', moduleName: CORE};
 
   static query: o.ExternalReference = {name: 'ɵQ', moduleName: CORE};
diff --git a/packages/compiler/src/render3/r3_jit.ts b/packages/compiler/src/render3/r3_jit.ts
new file mode 100644
index 0000000000..5d1a93e3d9
--- /dev/null
+++ b/packages/compiler/src/render3/r3_jit.ts
@@ -0,0 +1,78 @@
+/**
+ * @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 {CompileReflector} from '../compile_reflector';
+import {ConstantPool} from '../constant_pool';
+import * as o from '../output/output_ast';
+import {jitStatements} from '../output/output_jit';
+
+/**
+ * Implementation of `CompileReflector` which resolves references to @angular/core
+ * symbols at runtime, according to a consumer-provided mapping.
+ *
+ * Only supports `resolveExternalReference`, all other methods throw.
+ */
+class R3JitReflector implements CompileReflector {
+  constructor(private context: {[key: string]: any}) {}
+
+  resolveExternalReference(ref: o.ExternalReference): any {
+    // This reflector only handles @angular/core imports.
+    if (ref.moduleName !== '@angular/core') {
+      throw new Error(
+          `Cannot resolve external reference to ${ref.moduleName}, only references to @angular/core are supported.`);
+    }
+    if (!this.context.hasOwnProperty(ref.name !)) {
+      throw new Error(`No value provided for @angular/core symbol '${ref.name!}'.`);
+    }
+    return this.context[ref.name !];
+  }
+
+  parameters(typeOrFunc: any): any[][] { throw new Error('Not implemented.'); }
+
+  annotations(typeOrFunc: any): any[] { throw new Error('Not implemented.'); }
+
+  shallowAnnotations(typeOrFunc: any): any[] { throw new Error('Not implemented.'); }
+
+  tryAnnotations(typeOrFunc: any): any[] { throw new Error('Not implemented.'); }
+
+  propMetadata(typeOrFunc: any): {[key: string]: any[];} { throw new Error('Not implemented.'); }
+
+  hasLifecycleHook(type: any, lcProperty: string): boolean { throw new Error('Not implemented.'); }
+
+  guards(typeOrFunc: any): {[key: string]: any;} { throw new Error('Not implemented.'); }
+
+  componentModuleUrl(type: any, cmpMetadata: any): string { throw new Error('Not implemented.'); }
+}
+
+/**
+ * JIT compiles an expression and monkey-patches the result of executing the expression onto a given
+ * type.
+ *
+ * @param type the type which will receive the monkey-patched result
+ * @param field name of the field on the type to monkey-patch
+ * @param def the definition which will be compiled and executed to get the value to patch
+ * @param context an object map of @angular/core symbol names to symbols which will be available in
+ * the context of the compiled expression
+ * @param constantPool an optional `ConstantPool` which contains constants used in the expression
+ */
+export function jitPatchDefinition(
+    type: any, field: string, def: o.Expression, context: {[key: string]: any},
+    constantPool?: ConstantPool): void {
+  // The ConstantPool may contain Statements which declare variables used in the final expression.
+  // Therefore, its statements need to precede the actual JIT operation. The final statement is a
+  // declaration of $def which is set to the expression being compiled.
+  const statements: o.Statement[] = [
+    ...(constantPool !== undefined ? constantPool.statements : []),
+    new o.DeclareVarStmt('$def', def, undefined, [o.StmtModifier.Exported]),
+  ];
+
+  // Monkey patch the field on the given type with the result of compilation.
+  // TODO(alxhub): consider a better source url.
+  type[field] = jitStatements(
+      `ng://${type && type.name}/${field}`, statements, new R3JitReflector(context), false)['$def'];
+}
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index f0d2c93a83..91a365a3dc 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -14,22 +14,72 @@ import * as o from '../output/output_ast';
 import {OutputContext} from '../util';
 
 import {Identifiers as R3} from './r3_identifiers';
+import {convertMetaToOutput, mapToMapExpression} from './util';
 
-function convertMetaToOutput(meta: any, ctx: OutputContext): o.Expression {
-  if (Array.isArray(meta)) {
-    return o.literalArr(meta.map(entry => convertMetaToOutput(entry, ctx)));
-  }
-  if (meta instanceof StaticSymbol) {
-    return ctx.importExpr(meta);
-  }
-  if (meta == null) {
-    return o.literal(meta);
-  }
-
-  throw new Error(`Internal error: Unsupported or unknown metadata: ${meta}`);
+export interface R3NgModuleDef {
+  expression: o.Expression;
+  type: o.Type;
+  additionalStatements: o.Statement[];
 }
 
-export function compileNgModule(
+/**
+ * Metadata required by the module compiler to generate a `ngModuleDef` for a type.
+ */
+export interface R3NgModuleMetadata {
+  /**
+   * An expression representing the module type being compiled.
+   */
+  type: o.Expression;
+
+  /**
+   * An array of expressions representing the bootstrap components specified by the module.
+   */
+  bootstrap: o.Expression[];
+
+  /**
+   * An array of expressions representing the directives and pipes declared by the module.
+   */
+  declarations: o.Expression[];
+
+  /**
+   * An array of expressions representing the imports of the module.
+   */
+  imports: o.Expression[];
+
+  /**
+   * An array of expressions representing the exports of the module.
+   */
+  exports: o.Expression[];
+
+  /**
+   * Whether to emit the selector scope values (declarations, imports, exports) inline into the
+   * module definition, or to generate additional statements which patch them on. Inline emission
+   * does not allow components to be tree-shaken, but is useful for JIT mode.
+   */
+  emitInline: boolean;
+}
+
+/**
+ * Construct an `R3NgModuleDef` for the given `R3NgModuleMetadata`.
+ */
+export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
+  const {type: moduleType, bootstrap, declarations, imports, exports} = meta;
+  const expression = o.importExpr(R3.defineNgModule).callFn([mapToMapExpression({
+    type: moduleType,
+    bootstrap: o.literalArr(bootstrap),
+    declarations: o.literalArr(declarations),
+    imports: o.literalArr(imports),
+    exports: o.literalArr(exports),
+  })]);
+
+  // TODO(alxhub): write a proper type reference when AOT compilation of @NgModule is implemented.
+  const type = new o.ExpressionType(o.NULL_EXPR);
+  const additionalStatements: o.Statement[] = [];
+  return {expression, type, additionalStatements};
+}
+
+// TODO(alxhub): integrate this with `compileNgModule`. Currently the two are separate operations.
+export function compileNgModuleFromRender2(
     ctx: OutputContext, ngModule: CompileShallowModuleMetadata,
     injectableCompiler: InjectableCompiler): void {
   const className = identifierName(ngModule.type) !;
@@ -57,4 +107,9 @@ export function compileNgModule(
       /* getters */[],
       /* constructorMethod */ new o.ClassMethod(null, [], []),
       /* methods */[]));
-}
\ No newline at end of file
+}
+
+function accessExportScope(module: o.Expression): o.Expression {
+  const selectorScope = new o.ReadPropExpr(module, 'ngModuleDef');
+  return new o.ReadPropExpr(selectorScope, 'exported');
+}
diff --git a/packages/compiler/src/render3/util.ts b/packages/compiler/src/render3/util.ts
new file mode 100644
index 0000000000..dd5fe5214e
--- /dev/null
+++ b/packages/compiler/src/render3/util.ts
@@ -0,0 +1,38 @@
+/**
+ * @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 {StaticSymbol} from '../aot/static_symbol';
+import * as o from '../output/output_ast';
+import {OutputContext} from '../util';
+
+/**
+ * Convert an object map with `Expression` values into a `LiteralMapExpr`.
+ */
+export function mapToMapExpression(map: {[key: string]: o.Expression}): o.LiteralMapExpr {
+  const result = Object.keys(map).map(key => ({key, value: map[key], quoted: false}));
+  return o.literalMap(result);
+}
+
+/**
+ * Convert metadata into an `Expression` in the given `OutputContext`.
+ *
+ * This operation will handle arrays, references to symbols, or literal `null` or `undefined`.
+ */
+export function convertMetaToOutput(meta: any, ctx: OutputContext): o.Expression {
+  if (Array.isArray(meta)) {
+    return o.literalArr(meta.map(entry => convertMetaToOutput(entry, ctx)));
+  }
+  if (meta instanceof StaticSymbol) {
+    return ctx.importExpr(meta);
+  }
+  if (meta == null) {
+    return o.literal(meta);
+  }
+
+  throw new Error(`Internal error: Unsupported or unknown metadata: ${meta}`);
+}
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 8faa85963f..e79e802377 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -12,12 +12,20 @@ import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, c
 import {ConstantPool} from '../../constant_pool';
 import * as core from '../../core';
 import {AST, AstMemoryEfficientTransformer, BindingPipe, BindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
+import {Lexer} from '../../expression_parser/lexer';
+import {Parser} from '../../expression_parser/parser';
+import * as html from '../../ml_parser/ast';
+import {HtmlParser} from '../../ml_parser/html_parser';
+import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
 import * as o from '../../output/output_ast';
-import {ParseSourceSpan} from '../../parse_util';
+import {ParseError, ParseSourceSpan} from '../../parse_util';
+import {DomElementSchemaRegistry} from '../../schema/dom_element_schema_registry';
 import {CssSelector, SelectorMatcher} from '../../selector';
+import {BindingParser} from '../../template_parser/binding_parser';
 import {OutputContext, error} from '../../util';
 import * as t from '../r3_ast';
 import {Identifiers as R3} from '../r3_identifiers';
+import {htmlAstToRender3Ast} from '../r3_template_transform';
 
 import {R3QueryMetadata} from './api';
 import {CONTEXT_NAME, I18N_ATTR, I18N_ATTR_PREFIX, ID_SEPARATOR, IMPLICIT_REFERENCE, MEANING_SEPARATOR, REFERENCE_PREFIX, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, getQueryPredicate, invalid, mapToExpression, noop, temporaryAllocator, trimTrailingNulls, unsupported} from './util';
@@ -713,3 +721,35 @@ function interpolate(args: o.Expression[]): o.Expression {
       error(`Invalid interpolation argument length ${args.length}`);
   return o.importExpr(R3.interpolationV).callFn([o.literalArr(args)]);
 }
+
+/**
+ * Parse a template into render3 `Node`s and additional metadata, with no other dependencies.
+ *
+ * @param template text of the template to parse
+ * @param templateUrl URL to use for source mapping of the parsed template
+ */
+export function parseTemplate(template: string, templateUrl: string):
+    {errors?: ParseError[], nodes: t.Node[], hasNgContent: boolean, ngContentSelectors: string[]} {
+  const bindingParser = makeBindingParser();
+  const htmlParser = new HtmlParser();
+  const parseResult = htmlParser.parse(template, templateUrl);
+  if (parseResult.errors && parseResult.errors.length > 0) {
+    return {errors: parseResult.errors, nodes: [], hasNgContent: false, ngContentSelectors: []};
+  }
+  const {nodes, hasNgContent, ngContentSelectors, errors} =
+      htmlAstToRender3Ast(parseResult.rootNodes, bindingParser);
+  if (errors && errors.length > 0) {
+    return {errors, nodes: [], hasNgContent: false, ngContentSelectors: []};
+  }
+
+  return {nodes, hasNgContent, ngContentSelectors};
+}
+
+/**
+ * Construct a `BindingParser` with a default configuration.
+ */
+export function makeBindingParser(): BindingParser {
+  return new BindingParser(
+      new Parser(new Lexer()), DEFAULT_INTERPOLATION_CONFIG, new DomElementSchemaRegistry(), [],
+      []);
+}
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index 7bbfa1911e..68a4cea600 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -16,6 +16,7 @@ ng_module(
     module_name = "@angular/core",
     deps = [
         "//packages:types",
+        "//packages/compiler",
         "@rxjs",
     ],
 )
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
index 35c4334b89..93e50a2578 100644
--- a/packages/core/rollup.config.js
+++ b/packages/core/rollup.config.js
@@ -10,8 +10,9 @@ const resolve = require('rollup-plugin-node-resolve');
 const sourcemaps = require('rollup-plugin-sourcemaps');
 
 const globals = {
+  '@angular/compiler': 'ng.compiler',
   'rxjs': 'rxjs',
-  'rxjs/operators': 'rxjs.operators'
+  'rxjs/operators': 'rxjs.operators',
 };
 
 module.exports = {
diff --git a/packages/core/src/application_module.ts b/packages/core/src/application_module.ts
index affd64c99c..55caa5d9b7 100644
--- a/packages/core/src/application_module.ts
+++ b/packages/core/src/application_module.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus} from './application_init';
+import {APP_INITIALIZER, ApplicationInitStatus} from './application_init';
 import {ApplicationRef} from './application_ref';
 import {APP_ID_RANDOM_PROVIDER} from './application_tokens';
 import {IterableDiffers, KeyValueDiffers, defaultIterableDiffers, defaultKeyValueDiffers} from './change_detection/change_detection';
+import {forwardRef} from './di/forward_ref';
 import {Inject, Optional, SkipSelf} from './di/metadata';
 import {LOCALE_ID} from './i18n/tokens';
 import {Compiler} from './linker/compiler';
@@ -46,7 +47,7 @@ export function _localeFactory(locale?: string): string {
       useFactory: _localeFactory,
       deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
     },
-  ]
+  ],
 })
 export class ApplicationModule {
   // Inject ApplicationRef to make it eager...
diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
index 507623051a..740878d3bf 100644
--- a/packages/core/src/di/injectable.ts
+++ b/packages/core/src/di/injectable.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {R3_COMPILE_INJECTABLE} from '../ivy_switch';
 import {ReflectionCapabilities} from '../reflection/reflection_capabilities';
 import {Type} from '../type';
 import {makeDecorator, makeParamDecorator} from '../util/decorators';
@@ -67,10 +68,7 @@ export interface InjectableDecorator {
  *
  * @experimental
  */
-export interface Injectable {
-  providedIn?: Type<any>|'root'|null;
-  factory: () => any;
-}
+export interface Injectable { providedIn?: Type<any>|'root'|null; }
 
 const EMPTY_ARRAY: any[] = [];
 
@@ -110,6 +108,20 @@ export function convertInjectableProviderToFactory(
   }
 }
 
+/**
+ * Supports @Injectable() in JIT mode for Render2.
+ */
+function preR3InjectableCompile(
+    injectableType: InjectableType<any>,
+    options: {providedIn?: Type<any>| 'root' | null} & InjectableProvider): void {
+  if (options && options.providedIn !== undefined && injectableType.ngInjectableDef === undefined) {
+    injectableType.ngInjectableDef = defineInjectable({
+      providedIn: options.providedIn,
+      factory: convertInjectableProviderToFactory(injectableType, options),
+    });
+  }
+}
+
 /**
 * Injectable decorator and metadata.
 *
@@ -118,16 +130,8 @@ export function convertInjectableProviderToFactory(
 */
 export const Injectable: InjectableDecorator = makeDecorator(
     'Injectable', undefined, undefined, undefined,
-    (injectableType: InjectableType<any>,
-     options: {providedIn?: Type<any>| 'root' | null} & InjectableProvider) => {
-      if (options && options.providedIn !== undefined &&
-          injectableType.ngInjectableDef === undefined) {
-        injectableType.ngInjectableDef = defineInjectable({
-          providedIn: options.providedIn,
-          factory: convertInjectableProviderToFactory(injectableType, options)
-        });
-      }
-    });
+    (type: Type<any>, meta: Injectable) =>
+        (R3_COMPILE_INJECTABLE || preR3InjectableCompile)(type, meta));
 
 /**
  * Type representing injectable service.
diff --git a/packages/core/src/ivy_switch.ts b/packages/core/src/ivy_switch.ts
index a584e99587..e461fc900a 100644
--- a/packages/core/src/ivy_switch.ts
+++ b/packages/core/src/ivy_switch.ts
@@ -32,3 +32,5 @@
  *    symbol in `./ivy_switch_false` and `./ivy_switch_false` depending on the compilation mode.
  */
 export * from './ivy_switch_false';
+
+// TODO(alxhub): debug why metadata doesn't properly propagate through this file.
diff --git a/packages/core/src/ivy_switch_false.ts b/packages/core/src/ivy_switch_false.ts
index 599a11d63e..b3d9427670 100644
--- a/packages/core/src/ivy_switch_false.ts
+++ b/packages/core/src/ivy_switch_false.ts
@@ -6,4 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export const ivyEnabled = false;
\ No newline at end of file
+export const ivyEnabled = false;
+export const R3_COMPILE_COMPONENT: ((type: any, meta: any) => void)|null = null;
+export const R3_COMPILE_INJECTABLE: ((type: any, meta: any) => void)|null = null;
+export const R3_COMPILE_NGMODULE: ((type: any, meta: any) => void)|null = null;
diff --git a/packages/core/src/ivy_switch_true.ts b/packages/core/src/ivy_switch_true.ts
index fc5c97d002..0dfe7be6ee 100644
--- a/packages/core/src/ivy_switch_true.ts
+++ b/packages/core/src/ivy_switch_true.ts
@@ -6,4 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export const ivyEnabled = true;
\ No newline at end of file
+import {compileComponentDecorator} from './render3/jit/directive';
+import {compileInjectable} from './render3/jit/injectable';
+import {compileNgModule} from './render3/jit/module';
+
+export const ivyEnabled = true;
+export const R3_COMPILE_COMPONENT = compileComponentDecorator;
+export const R3_COMPILE_INJECTABLE = compileInjectable;
+export const R3_COMPILE_NGMODULE = compileNgModule;
diff --git a/packages/core/src/metadata.ts b/packages/core/src/metadata.ts
index e606c12fa4..2866829128 100644
--- a/packages/core/src/metadata.ts
+++ b/packages/core/src/metadata.ts
@@ -13,7 +13,7 @@
 
 import {Attribute, ContentChild, ContentChildren, Query, ViewChild, ViewChildren} from './metadata/di';
 import {Component, Directive, HostBinding, HostListener, Input, Output, Pipe} from './metadata/directives';
-import {ModuleWithProviders, NgModule, SchemaMetadata} from './metadata/ng_module';
+import {ModuleWithProviders, NgModule, NgModuleDef, SchemaMetadata, defineNgModule} from './metadata/ng_module';
 import {ViewEncapsulation} from './metadata/view';
 
 export {ANALYZE_FOR_ENTRY_COMPONENTS, Attribute, ContentChild, ContentChildDecorator, ContentChildren, ContentChildrenDecorator, Query, ViewChild, ViewChildDecorator, ViewChildren, ViewChildrenDecorator} from './metadata/di';
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 145f5ed18f..34bb977191 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -8,9 +8,9 @@
 
 import {ChangeDetectionStrategy} from '../change_detection/constants';
 import {Provider} from '../di';
+import {R3_COMPILE_COMPONENT} from '../ivy_switch';
 import {Type} from '../type';
 import {TypeDecorator, makeDecorator, makePropDecorator} from '../util/decorators';
-
 import {ViewEncapsulation} from './view';
 
 
@@ -754,7 +754,8 @@ export interface Component extends Directive {
  */
 export const Component: ComponentDecorator = makeDecorator(
     'Component', (c: Component = {}) => ({changeDetection: ChangeDetectionStrategy.Default, ...c}),
-    Directive);
+    Directive, undefined,
+    (type: Type<any>, meta: Component) => (R3_COMPILE_COMPONENT || (() => {}))(type, meta));
 
 /**
  * Type of the Pipe decorator / constructor function.
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 60e9986efb..4ab8d8744a 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -9,9 +9,31 @@
 import {InjectorDef, InjectorType, defineInjector} from '../di/defs';
 import {convertInjectableProviderToFactory} from '../di/injectable';
 import {Provider} from '../di/provider';
+import {R3_COMPILE_NGMODULE} from '../ivy_switch';
 import {Type} from '../type';
 import {TypeDecorator, makeDecorator} from '../util/decorators';
 
+export interface NgModuleDef<T> {
+  type: T;
+  bootstrap: Type<any>[];
+  declarations: Type<any>[];
+  imports: Type<any>[];
+  exports: Type<any>[];
+
+  transitiveCompileScope: {directives: any[]; pipes: any[];}|undefined;
+}
+
+export function defineNgModule<T>(def: {type: T} & Partial<NgModuleDef<T>>): never {
+  const res: NgModuleDef<T> = {
+    type: def.type,
+    bootstrap: def.bootstrap || [],
+    declarations: def.declarations || [],
+    imports: def.imports || [],
+    exports: def.exports || [],
+    transitiveCompileScope: undefined,
+  };
+  return res as never;
+}
 
 /**
  * A wrapper around a module that also includes the providers.
@@ -187,6 +209,19 @@ export interface NgModule {
   id?: string;
 }
 
+function preR3NgModuleCompile(moduleType: InjectorType<any>, metadata: NgModule): void {
+  let imports = (metadata && metadata.imports) || [];
+  if (metadata && metadata.exports) {
+    imports = [...imports, metadata.exports];
+  }
+
+  moduleType.ngInjectorDef = defineInjector({
+    factory: convertInjectableProviderToFactory(moduleType, {useClass: moduleType}),
+    providers: metadata && metadata.providers,
+    imports: imports,
+  });
+}
+
 /**
  * NgModule decorator and metadata.
  *
@@ -195,15 +230,4 @@ export interface NgModule {
  */
 export const NgModule: NgModuleDecorator = makeDecorator(
     'NgModule', (ngModule: NgModule) => ngModule, undefined, undefined,
-    (moduleType: InjectorType<any>, metadata: NgModule) => {
-      let imports = (metadata && metadata.imports) || [];
-      if (metadata && metadata.exports) {
-        imports = [...imports, metadata.exports];
-      }
-
-      moduleType.ngInjectorDef = defineInjector({
-        factory: convertInjectableProviderToFactory(moduleType, {useClass: moduleType}),
-        providers: metadata && metadata.providers,
-        imports: imports,
-      });
-    });
+    (type: Type<any>, meta: NgModule) => (R3_COMPILE_NGMODULE || preR3NgModuleCompile)(type, meta));
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
new file mode 100644
index 0000000000..7cabe4f363
--- /dev/null
+++ b/packages/core/src/render3/jit/directive.ts
@@ -0,0 +1,97 @@
+/**
+ * @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 {compileComponent as compileIvyComponent, parseTemplate, ConstantPool, makeBindingParser, WrappedNodeExpr, jitPatchDefinition,} from '@angular/compiler';
+
+import {Component} from '../../metadata/directives';
+import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
+import {Type} from '../../type';
+
+import {angularCoreEnv} from './environment';
+import {reflectDependencies} from './util';
+
+let _pendingPromises: Promise<void>[] = [];
+
+/**
+ * Compile an Angular component according to its decorator metadata, and patch the resulting
+ * ngComponentDef onto the component type.
+ *
+ * Compilation may be asynchronous (due to the need to resolve URLs for the component template or
+ * other resources, for example). In the event that compilation is not immediate, `compileComponent`
+ * will return a `Promise` which will resolve when compilation completes and the component becomes
+ * usable.
+ */
+export function compileComponent(type: Type<any>, metadata: Component): Promise<void>|null {
+  // TODO(alxhub): implement ResourceLoader support for template compilation.
+  if (!metadata.template) {
+    throw new Error('templateUrl not yet supported');
+  }
+
+  // Parse the template and check for errors.
+  const template = parseTemplate(metadata.template !, `ng://${type.name}/template.html`);
+  if (template.errors !== undefined) {
+    const errors = template.errors.map(err => err.toString()).join(', ');
+    throw new Error(`Errors during JIT compilation of template for ${type.name}: ${errors}`);
+  }
+
+  // The ConstantPool is a requirement of the JIT'er.
+  const constantPool = new ConstantPool();
+
+  // Compile the component metadata, including template, into an expression.
+  // TODO(alxhub): implement inputs, outputs, queries, etc.
+  const res = compileIvyComponent(
+      {
+        name: type.name,
+        type: new WrappedNodeExpr(type),
+        selector: metadata.selector !, template,
+        deps: reflectDependencies(type),
+        directives: new Map(),
+        pipes: new Map(),
+        host: {
+          attributes: {},
+          listeners: {},
+          properties: {},
+        },
+        inputs: {},
+        outputs: {},
+        lifecycle: {
+          usesOnChanges: false,
+        },
+        queries: [],
+        typeSourceSpan: null !,
+        viewQueries: [],
+      },
+      constantPool, makeBindingParser());
+
+  // Patch the generated expression as ngComponentDef on the type.
+  jitPatchDefinition(type, 'ngComponentDef', res.expression, angularCoreEnv, constantPool);
+  return null;
+}
+
+/**
+ * A wrapper around `compileComponent` which is intended to be used for the `@Component` decorator.
+ *
+ * This wrapper keeps track of the `Promise` returned by `compileComponent` and will cause
+ * `awaitCurrentlyCompilingComponents` to wait on the compilation to be finished.
+ */
+export function compileComponentDecorator(type: Type<any>, metadata: Component): void {
+  const res = compileComponent(type, metadata);
+  if (res !== null) {
+    _pendingPromises.push(res);
+  }
+}
+
+/**
+ * Returns a promise which will await the compilation of any `@Component`s which have been defined
+ * since the last time `awaitCurrentlyCompilingComponents` was called.
+ */
+export function awaitCurrentlyCompilingComponents(): Promise<void> {
+  const res = Promise.all(_pendingPromises).then(() => undefined);
+  _pendingPromises = [];
+  return res;
+}
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
new file mode 100644
index 0000000000..a5068eee8c
--- /dev/null
+++ b/packages/core/src/render3/jit/environment.ts
@@ -0,0 +1,39 @@
+/**
+ * @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 {defineInjectable} from '../../di/defs';
+import {inject} from '../../di/injector';
+import {defineNgModule} from '../../metadata/ng_module';
+import * as r3 from '../index';
+
+
+/**
+ * A mapping of the @angular/core API surface used in generated expressions to the actual symbols.
+ *
+ * This should be kept up to date with the public exports of @angular/core.
+ */
+export const angularCoreEnv = {
+  'ɵdefineComponent': r3.defineComponent,
+  'defineInjectable': defineInjectable,
+  'ɵdefineNgModule': defineNgModule,
+  'ɵdirectiveInject': r3.directiveInject,
+  'inject': inject,
+  'ɵC': r3.C,
+  'ɵE': r3.E,
+  'ɵe': r3.e,
+  'ɵi1': r3.i1,
+  'ɵi2': r3.i2,
+  'ɵi3': r3.i3,
+  'ɵi4': r3.i4,
+  'ɵi5': r3.i5,
+  'ɵi6': r3.i6,
+  'ɵi7': r3.i7,
+  'ɵi8': r3.i8,
+  'ɵT': r3.T,
+  'ɵt': r3.t,
+};
diff --git a/packages/core/src/render3/jit/injectable.ts b/packages/core/src/render3/jit/injectable.ts
new file mode 100644
index 0000000000..e0b4bc1a26
--- /dev/null
+++ b/packages/core/src/render3/jit/injectable.ts
@@ -0,0 +1,114 @@
+/**
+ * @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 {Expression, LiteralExpr, R3DependencyMetadata, WrappedNodeExpr, compileInjectable as compileIvyInjectable, jitPatchDefinition} from '@angular/compiler';
+
+import {Injectable} from '../../di/injectable';
+import {ClassSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from '../../di/provider';
+import {Type} from '../../type';
+import {getClosureSafeProperty} from '../../util/property';
+
+import {angularCoreEnv} from './environment';
+import {convertDependencies, reflectDependencies} from './util';
+
+
+/**
+ * Compile an Angular injectable according to its `Injectable` metadata, and patch the resulting
+ * `ngInjectableDef` onto the injectable type.
+ */
+export function compileInjectable(type: Type<any>, meta?: Injectable): void {
+  // TODO(alxhub): handle JIT of bare @Injectable().
+  if (!meta) {
+    return;
+  }
+
+  // Check whether the injectable metadata includes a provider specification.
+  const hasAProvider = isUseClassProvider(meta) || isUseFactoryProvider(meta) ||
+      isUseValueProvider(meta) || isUseExistingProvider(meta);
+
+  let deps: R3DependencyMetadata[]|undefined = undefined;
+  if (!hasAProvider || (isUseClassProvider(meta) && type === meta.useClass)) {
+    deps = reflectDependencies(type);
+  } else if (isUseClassProvider(meta)) {
+    deps = meta.deps && convertDependencies(meta.deps);
+  } else if (isUseFactoryProvider(meta)) {
+    deps = meta.deps && convertDependencies(meta.deps) || [];
+  }
+
+  // Decide which flavor of factory to generate, based on the provider specified.
+  // Only one of the use* fields should be set.
+  let useClass: Expression|undefined = undefined;
+  let useFactory: Expression|undefined = undefined;
+  let useValue: Expression|undefined = undefined;
+  let useExisting: Expression|undefined = undefined;
+
+  if (!hasAProvider) {
+    // In the case the user specifies a type provider, treat it as {provide: X, useClass: X}.
+    // The deps will have been reflected above, causing the factory to create the class by calling
+    // its constructor with injected deps.
+    useClass = new WrappedNodeExpr(type);
+  } else if (isUseClassProvider(meta)) {
+    // The user explicitly specified useClass, and may or may not have provided deps.
+    useClass = new WrappedNodeExpr(meta.useClass);
+  } else if (isUseValueProvider(meta)) {
+    // The user explicitly specified useValue.
+    useValue = new WrappedNodeExpr(meta.useValue);
+  } else if (isUseFactoryProvider(meta)) {
+    // The user explicitly specified useFactory.
+    useFactory = new WrappedNodeExpr(meta.useFactory);
+  } else if (isUseExistingProvider(meta)) {
+    // The user explicitly specified useExisting.
+    useExisting = new WrappedNodeExpr(meta.useExisting);
+  } else {
+    // Can't happen - either hasAProvider will be false, or one of the providers will be set.
+    throw new Error(`Unreachable state.`);
+  }
+
+  const {expression} = compileIvyInjectable({
+    name: type.name,
+    type: new WrappedNodeExpr(type),
+    providedIn: computeProvidedIn(meta.providedIn),
+    useClass,
+    useFactory,
+    useValue,
+    useExisting,
+    deps,
+  });
+
+  jitPatchDefinition(type, 'ngInjectableDef', expression, angularCoreEnv);
+}
+
+function computeProvidedIn(providedIn: Type<any>| string | null | undefined): Expression {
+  if (providedIn == null || typeof providedIn === 'string') {
+    return new LiteralExpr(providedIn);
+  } else {
+    return new WrappedNodeExpr(providedIn);
+  }
+}
+
+type UseClassProvider = Injectable & ClassSansProvider & {deps?: any[]};
+
+function isUseClassProvider(meta: Injectable): meta is UseClassProvider {
+  return (meta as UseClassProvider).useClass !== undefined;
+}
+
+const GET_PROPERTY_NAME = {} as any;
+const USE_VALUE = getClosureSafeProperty<ValueProvider>(
+    {provide: String, useValue: GET_PROPERTY_NAME}, GET_PROPERTY_NAME);
+
+function isUseValueProvider(meta: Injectable): meta is Injectable&ValueSansProvider {
+  return USE_VALUE in meta;
+}
+
+function isUseFactoryProvider(meta: Injectable): meta is Injectable&FactorySansProvider {
+  return (meta as FactorySansProvider).useFactory !== undefined;
+}
+
+function isUseExistingProvider(meta: Injectable): meta is Injectable&ExistingSansProvider {
+  return (meta as ExistingSansProvider).useExisting !== undefined;
+}
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
new file mode 100644
index 0000000000..991faf2913
--- /dev/null
+++ b/packages/core/src/render3/jit/module.ts
@@ -0,0 +1,94 @@
+/**
+ * @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 {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileIvyNgModule, jitPatchDefinition} from '@angular/compiler';
+
+import {ModuleWithProviders, NgModule, NgModuleDef} from '../../metadata/ng_module';
+import {Type} from '../../type';
+import {ComponentDef} from '../interfaces/definition';
+import {flatten} from '../util';
+
+import {angularCoreEnv} from './environment';
+
+const EMPTY_ARRAY: Type<any>[] = [];
+
+export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
+  const meta: R3NgModuleMetadata = {
+    type: wrap(type),
+    bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(wrap),
+    declarations: flatten(ngModule.declarations || EMPTY_ARRAY).map(wrap),
+    imports: flatten(ngModule.imports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
+    exports: flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
+    emitInline: true,
+  };
+  const res = compileIvyNgModule(meta);
+
+  // Compute transitiveCompileScope
+  const transitiveCompileScope = {
+    directives: [] as any[],
+    pipes: [] as any[],
+  };
+  flatten(ngModule.declarations || EMPTY_ARRAY).forEach(decl => {
+    if (decl.ngPipeDef) {
+      transitiveCompileScope.pipes.push(decl);
+    } else if (decl.ngComponentDef) {
+      transitiveCompileScope.directives.push(decl);
+      patchComponentWithScope(decl, type as any);
+    } else {
+      transitiveCompileScope.directives.push(decl);
+      decl.ngSelectorScope = type;
+    }
+  });
+
+  function addExportsFrom(module: Type<any>& {ngModuleDef: NgModuleDef<any>}): void {
+    module.ngModuleDef.exports.forEach((exp: any) => {
+      if (isNgModule(exp)) {
+        addExportsFrom(exp);
+      } else if (exp.ngPipeDef) {
+        transitiveCompileScope.pipes.push(exp);
+      } else {
+        transitiveCompileScope.directives.push(exp);
+      }
+    });
+  }
+
+  flatten([(ngModule.imports || EMPTY_ARRAY), (ngModule.exports || EMPTY_ARRAY)])
+      .filter(importExport => isNgModule(importExport))
+      .forEach(mod => addExportsFrom(mod));
+  jitPatchDefinition(type, 'ngModuleDef', res.expression, angularCoreEnv);
+  ((type as any).ngModuleDef as NgModuleDef<any>).transitiveCompileScope = transitiveCompileScope;
+}
+
+export function patchComponentWithScope<C, M>(
+    component: Type<C>& {ngComponentDef: ComponentDef<C>},
+    module: Type<M>& {ngModuleDef: NgModuleDef<M>}) {
+  component.ngComponentDef.directiveDefs = () =>
+      module.ngModuleDef.transitiveCompileScope !.directives.map(
+          dir => dir.ngDirectiveDef || dir.ngComponentDef);
+  component.ngComponentDef.pipeDefs = () =>
+      module.ngModuleDef.transitiveCompileScope !.pipes.map(pipe => pipe.ngPipeDef);
+}
+
+function expandModuleWithProviders(value: Type<any>| ModuleWithProviders): Type<any> {
+  if (isModuleWithProviders(value)) {
+    return value.ngModule;
+  }
+  return value;
+}
+
+function wrap(value: Type<any>): Expression {
+  return new WrappedNodeExpr(value);
+}
+
+function isModuleWithProviders(value: any): value is ModuleWithProviders {
+  return value.ngModule !== undefined;
+}
+
+function isNgModule(value: any): value is Type<any>&{ngModuleDef: NgModuleDef<any>} {
+  return value.ngModuleDef !== undefined;
+}
diff --git a/packages/core/src/render3/jit/util.ts b/packages/core/src/render3/jit/util.ts
new file mode 100644
index 0000000000..3c07880c82
--- /dev/null
+++ b/packages/core/src/render3/jit/util.ts
@@ -0,0 +1,86 @@
+/**
+ * @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 {LiteralExpr, R3DependencyMetadata, R3ResolvedDependencyType, WrappedNodeExpr} from '@angular/compiler';
+
+import {Injector} from '../../di/injector';
+import {Host, Inject, Optional, Self, SkipSelf} from '../../di/metadata';
+import {ElementRef} from '../../linker/element_ref';
+import {TemplateRef} from '../../linker/template_ref';
+import {ViewContainerRef} from '../../linker/view_container_ref';
+import {Attribute} from '../../metadata/di';
+import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
+import {Type} from '../../type';
+
+let _reflect: ReflectionCapabilities|null = null;
+
+export function reflectDependencies(type: Type<any>): R3DependencyMetadata[] {
+  _reflect = _reflect || new ReflectionCapabilities();
+  return convertDependencies(_reflect.parameters(type));
+}
+
+export function convertDependencies(deps: any[]): R3DependencyMetadata[] {
+  return deps.map(dep => reflectDependency(dep));
+}
+
+function reflectDependency(dep: any | any[]): R3DependencyMetadata {
+  const meta: R3DependencyMetadata = {
+    token: new LiteralExpr(null),
+    host: false,
+    optional: false,
+    resolved: R3ResolvedDependencyType.Token,
+    self: false,
+    skipSelf: false,
+  };
+
+  function setTokenAndResolvedType(token: any): void {
+    if (token === ElementRef) {
+      meta.resolved = R3ResolvedDependencyType.ElementRef;
+    } else if (token === Injector) {
+      meta.resolved = R3ResolvedDependencyType.Injector;
+    } else if (token === TemplateRef) {
+      meta.resolved = R3ResolvedDependencyType.TemplateRef;
+    } else if (token === ViewContainerRef) {
+      meta.resolved = R3ResolvedDependencyType.ViewContainerRef;
+    } else {
+      meta.resolved = R3ResolvedDependencyType.Token;
+    }
+    meta.token = new WrappedNodeExpr(token);
+  }
+
+  if (Array.isArray(dep)) {
+    if (dep.length === 0) {
+      throw new Error('Dependency array must have arguments.');
+    }
+    for (let j = 0; j < dep.length; j++) {
+      const param = dep[j];
+      if (param instanceof Optional || param.__proto__.ngMetadataName === 'Optional') {
+        meta.optional = true;
+      } else if (param instanceof SkipSelf || param.__proto__.ngMetadataName === 'SkipSelf') {
+        meta.skipSelf = true;
+      } else if (param instanceof Self || param.__proto__.ngMetadataName === 'Self') {
+        meta.self = true;
+      } else if (param instanceof Host || param.__proto__.ngMetadataName === 'Host') {
+        meta.host = true;
+      } else if (param instanceof Inject) {
+        meta.token = new WrappedNodeExpr(param.token);
+      } else if (param instanceof Attribute) {
+        if (param.attributeName === undefined) {
+          throw new Error(`Attribute name must be defined.`);
+        }
+        meta.token = new LiteralExpr(param.attributeName);
+        meta.resolved = R3ResolvedDependencyType.Attribute;
+      } else {
+        setTokenAndResolvedType(param);
+      }
+    }
+  } else {
+    setTokenAndResolvedType(dep);
+  }
+  return meta;
+}
diff --git a/packages/core/test/bundling/hello_world_jit/BUILD.bazel b/packages/core/test/bundling/hello_world_jit/BUILD.bazel
new file mode 100644
index 0000000000..bd6acab2b3
--- /dev/null
+++ b/packages/core/test/bundling/hello_world_jit/BUILD.bazel
@@ -0,0 +1,58 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
+load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "rollup_bundle")
+load("//tools/http-server:http_server.bzl", "http_server")
+
+ts_library(
+    name = "hello_world_jit",
+    srcs = ["index.ts"],
+    deps = [
+        "//packages/core",
+    ],
+)
+
+rollup_bundle(
+    name = "bundle",
+    # TODO(alexeagle): This is inconsistent.
+    # We try to teach users to always have their workspace at the start of a
+    # path, to disambiguate from other workspaces.
+    # Here, the rule implementation is looking in an execroot where the layout
+    # has an "external" directory for external dependencies.
+    # This should probably start with "angular/" and let the rule deal with it.
+    entry_point = "packages/core/test/bundling/hello_world_jit/index.js",
+    deps = [
+        ":hello_world_jit",
+        "//packages/core",
+    ],
+)
+
+ts_library(
+    name = "test_lib",
+    testonly = 1,
+    srcs = glob(["*_spec.ts"]),
+    deps = [
+        "//packages:types",
+        "//packages/core",
+        "//packages/core/testing",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    data = [
+        ":bundle",
+        ":bundle.js",
+    ],
+    deps = [":test_lib"],
+)
+
+http_server(
+    name = "devserver",
+    data = [
+        "index.html",
+        ":bundle.min.js",
+        ":bundle.min_debug.js",
+    ],
+)
diff --git a/packages/core/test/bundling/hello_world_jit/index.html b/packages/core/test/bundling/hello_world_jit/index.html
new file mode 100644
index 0000000000..c5c7bb3e0b
--- /dev/null
+++ b/packages/core/test/bundling/hello_world_jit/index.html
@@ -0,0 +1,31 @@
+<!doctype html>
+
+<html>
+  <head>
+    <title>Angular Hello World Example</title>
+  </head>
+  <body>
+    <!-- The Angular application will be bootstrapped into this element. -->
+    <hello-world></hello-world>
+
+    <!-- 
+      Script tag which bootstraps the application. Use `?debug` in URL to select
+      the debug version of the script.
+      
+      There are two scripts sources: `bundle.min.js` and `bundle.min_debug.js` You can 
+      switch between which bundle the browser loads to experiment with the application.
+
+      - `bundle.min.js`: Is what the site would serve to their users. It has gone
+        through rollup, build-optimizer, and uglify with tree shaking.
+      - `bundle.min_debug.js`: Is what the developer would like to see when debugging
+        the application. It has also done through full pipeline of rollup, build-optimizer,
+        and uglify, however special flags were passed to uglify to prevent inlining and
+        property renaming.
+    -->
+    <script>
+        document.write('<script src="' + 
+          (document.location.search.endsWith('debug') ? '/bundle.min_debug.js' : '/bundle.min.js') + 
+          '"></' + 'script>');
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/packages/core/test/bundling/hello_world_jit/index.ts b/packages/core/test/bundling/hello_world_jit/index.ts
new file mode 100644
index 0000000000..af6817a05e
--- /dev/null
+++ b/packages/core/test/bundling/hello_world_jit/index.ts
@@ -0,0 +1,38 @@
+/**
+ * @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 'reflect-metadata';
+
+import {Component, NgModule, ɵrenderComponent as renderComponent} from '@angular/core';
+
+@Component({
+  selector: 'greeting-cmp',
+  template: 'Hello World!',
+})
+export class Greeting {
+}
+
+@NgModule({
+  declarations: [Greeting],
+  exports: [Greeting],
+})
+export class GreetingModule {
+}
+
+@Component({selector: 'hello-world', template: '<greeting-cmp></greeting-cmp>'})
+export class HelloWorld {
+}
+
+@NgModule({
+  declarations: [HelloWorld],
+  imports: [GreetingModule],
+})
+export class HelloWorldModule {
+}
+
+renderComponent(HelloWorld);
diff --git a/packages/core/test/bundling/hello_world_jit/integration_spec.ts b/packages/core/test/bundling/hello_world_jit/integration_spec.ts
new file mode 100644
index 0000000000..ee349da0a6
--- /dev/null
+++ b/packages/core/test/bundling/hello_world_jit/integration_spec.ts
@@ -0,0 +1,23 @@
+/**
+ * @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 {ɵivyEnabled as ivyEnabled} from '@angular/core';
+import {withBody} from '@angular/core/testing';
+import * as fs from 'fs';
+import * as path from 'path';
+
+const PACKAGE = 'angular/packages/core/test/bundling/hello_world_jit';
+
+ivyEnabled && describe('Ivy JIT hello world', () => {
+  it('should render hello world', withBody('<hello-world></hello-world>', () => {
+       require(path.join(PACKAGE, 'bundle.js'));
+       expect(document.body.textContent).toEqual('Hello World!');
+     }));
+});
+
+xit('ensure at least one spec exists', () => {});
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index 1c925c3984..c792f20640 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -1325,6 +1325,9 @@
   {
     "name": "Quote"
   },
+  {
+    "name": "R3_COMPILE_INJECTABLE"
+  },
   {
     "name": "REMOVE_EVENT_LISTENER"
   },
@@ -3620,6 +3623,9 @@
   {
     "name": "platformCoreDynamic"
   },
+  {
+    "name": "preR3InjectableCompile"
+  },
   {
     "name": "preparseElement"
   },
diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
index b3c3334c71..a3f89ee72f 100644
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@@ -12,6 +12,7 @@ ts_library(
             "**/*_perf.ts",
             "domino.d.ts",
             "load_domino.ts",
+            "jit_spec.ts",
         ],
     ),
     deps = [
@@ -29,19 +30,28 @@ ts_library(
 )
 
 ts_library(
-    name = "render3_node_lib",
+    name = "domino",
     testonly = 1,
     srcs = [
         "domino.d.ts",
         "load_domino.ts",
     ],
     deps = [
-        ":render3_lib",
         "//packages/platform-browser",
         "//packages/platform-server",
     ],
 )
 
+ts_library(
+    name = "render3_node_lib",
+    testonly = 1,
+    srcs = [],
+    deps = [
+        ":domino",
+        ":render3_lib",
+    ],
+)
+
 jasmine_node_test(
     name = "render3",
     bootstrap = [
diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel
new file mode 100644
index 0000000000..0a14e7d6d7
--- /dev/null
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@@ -0,0 +1,41 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "ivy_lib",
+    testonly = 1,
+    srcs = glob(["**/*.ts"]),
+    deps = [
+        "//packages:types",
+        "//packages/core",
+    ],
+)
+
+ts_library(
+    name = "ivy_node_lib",
+    testonly = 1,
+    srcs = [],
+    deps = [
+        ":ivy_lib",
+        "//packages/core/test/render3:domino",
+    ],
+)
+
+jasmine_node_test(
+    name = "ivy",
+    bootstrap = [
+        "angular/packages/core/test/render3/load_domino",
+    ],
+    deps = [
+        ":ivy_node_lib",
+    ],
+)
+
+ts_web_test(
+    name = "ivy_web",
+    deps = [
+        ":ivy_lib",
+    ],
+)
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
new file mode 100644
index 0000000000..f09edbe042
--- /dev/null
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -0,0 +1,166 @@
+/**
+ * @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 {Injectable} from '@angular/core/src/di/injectable';
+import {inject, setCurrentInjector} from '@angular/core/src/di/injector';
+import {ivyEnabled} from '@angular/core/src/ivy_switch';
+import {Component} from '@angular/core/src/metadata/directives';
+import {NgModule, NgModuleDef} from '@angular/core/src/metadata/ng_module';
+import {ComponentDef} from '@angular/core/src/render3/interfaces/definition';
+
+ivyEnabled && describe('render3 jit', () => {
+  let injector: any;
+  beforeAll(() => { injector = setCurrentInjector(null); });
+
+  afterAll(() => { setCurrentInjector(injector); });
+
+  it('compiles a component', () => {
+    @Component({
+      template: 'test',
+      selector: 'test-cmp',
+    })
+    class SomeCmp {
+    }
+    const SomeCmpAny = SomeCmp as any;
+
+    expect(SomeCmpAny.ngComponentDef).toBeDefined();
+    expect(SomeCmpAny.ngComponentDef.factory() instanceof SomeCmp).toBe(true);
+  });
+
+  it('compiles an injectable with a type provider', () => {
+    @Injectable({providedIn: 'root'})
+    class Service {
+    }
+    const ServiceAny = Service as any;
+
+    expect(ServiceAny.ngInjectableDef).toBeDefined();
+    expect(ServiceAny.ngInjectableDef.providedIn).toBe('root');
+    expect(inject(Service) instanceof Service).toBe(true);
+  });
+
+  it('compiles an injectable with a useValue provider', () => {
+    @Injectable({providedIn: 'root', useValue: 'test'})
+    class Service {
+    }
+
+    expect(inject(Service)).toBe('test');
+  });
+
+  it('compiles an injectable with a useExisting provider', () => {
+    @Injectable({providedIn: 'root', useValue: 'test'})
+    class Existing {
+    }
+
+    @Injectable({providedIn: 'root', useExisting: Existing})
+    class Service {
+    }
+
+    expect(inject(Service)).toBe('test');
+  });
+
+  it('compiles an injectable with a useFactory provider, without deps', () => {
+
+    @Injectable({providedIn: 'root', useFactory: () => 'test'})
+    class Service {
+    }
+
+    expect(inject(Service)).toBe('test');
+  });
+
+  it('compiles an injectable with a useFactory provider, with deps', () => {
+    @Injectable({providedIn: 'root', useValue: 'test'})
+    class Existing {
+    }
+
+    @Injectable({providedIn: 'root', useFactory: (existing: any) => existing, deps: [Existing]})
+    class Service {
+    }
+
+    expect(inject(Service)).toBe('test');
+  });
+
+  it('compiles an injectable with a useClass provider, with deps', () => {
+    @Injectable({providedIn: 'root', useValue: 'test'})
+    class Existing {
+    }
+
+    class Other {
+      constructor(public value: any) {}
+    }
+
+    @Injectable({providedIn: 'root', useClass: Other, deps: [Existing]})
+    class Service {
+      get value(): any { return null; }
+    }
+    const ServiceAny = Service as any;
+
+    expect(inject(Service).value).toBe('test');
+  });
+
+  it('compiles an injectable with a useClass provider, without deps', () => {
+    let _value = 1;
+    @Injectable({providedIn: 'root'})
+    class Existing {
+      readonly value = _value++;
+    }
+
+    @Injectable({providedIn: 'root', useClass: Existing})
+    class Service {
+      get value(): number { return 0; }
+    }
+
+    expect(inject(Existing).value).toBe(1);
+    const injected = inject(Service);
+    expect(injected instanceof Existing).toBe(true);
+    expect(injected.value).toBe(2);
+  });
+
+  it('compiles a module to a definition', () => {
+    @Component({
+      template: 'foo',
+      selector: 'foo',
+    })
+    class Cmp {
+    }
+
+    @NgModule({
+      declarations: [Cmp],
+    })
+    class Module {
+    }
+
+    const moduleDef: NgModuleDef<Module> = (Module as any).ngModuleDef;
+    expect(moduleDef).toBeDefined();
+    expect(moduleDef.declarations.length).toBe(1);
+    expect(moduleDef.declarations[0]).toBe(Cmp);
+  });
+
+  it('patches a module onto the component', () => {
+    @Component({
+      template: 'foo',
+      selector: 'foo',
+    })
+    class Cmp {
+    }
+    const cmpDef: ComponentDef<Cmp> = (Cmp as any).ngComponentDef;
+
+    expect(cmpDef.directiveDefs).toBeNull();
+
+    @NgModule({
+      declarations: [Cmp],
+    })
+    class Module {
+    }
+
+    const moduleDef: NgModuleDef<Module> = (Module as any).ngModuleDef;
+    expect(cmpDef.directiveDefs instanceof Function).toBe(true);
+    expect((cmpDef.directiveDefs as Function)()).toEqual([cmpDef]);
+  });
+});
+
+it('ensure at least one spec exists', () => {});

From 6d8c847e7b7356f269ce1444657974dd6e14885c Mon Sep 17 00:00:00 2001
From: Patrick McDonald <patrickmcd@users.noreply.github.com>
Date: Fri, 18 May 2018 12:49:09 -0400
Subject: [PATCH 080/582] docs: fix typo (#23998)

"Made" doesn't make sense (redoing and closing #23940)
PR Close #23998
---
 aio/content/guide/router.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/router.md b/aio/content/guide/router.md
index f50fc0f2af..d32f8ba9c5 100644
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@@ -3656,7 +3656,7 @@ Lazy loading has multiple benefits.
 * You can speed up load time for users that only visit certain areas of the application.
 * You can continue expanding lazy loaded feature areas without increasing the size of the initial load bundle.
 
-You're already made part way there.
+You're already part of the way there.
 By organizing the application into modules&mdash;`AppModule`,
 `HeroesModule`, `AdminModule` and `CrisisCenterModule`&mdash;you
 have natural candidates for lazy loading.

From 608c3748e870b7ccdb38502aa1f43b603422820a Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 16 May 2018 15:04:27 -0500
Subject: [PATCH 081/582] docs(aio): Remove outdated README.md from
 cli-quickstart zip (#23947)

Closes #23936

PR Close #23947
---
 aio/content/examples/cli-quickstart/README.md | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 aio/content/examples/cli-quickstart/README.md

diff --git a/aio/content/examples/cli-quickstart/README.md b/aio/content/examples/cli-quickstart/README.md
deleted file mode 100644
index efe9ec67ae..0000000000
--- a/aio/content/examples/cli-quickstart/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# MasterProject
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0-rc.0.
-
-## Development server
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

From 26fbf1d13c6116f686d33b41390de94a7214dd5a Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@google.com>
Date: Wed, 16 May 2018 10:00:33 -0700
Subject: [PATCH 082/582] feat(platform-browser): add HammerJS lazy-loader
 symbols to public API (#23943)

PR Close #23943
---
 packages/platform-browser/src/platform-browser.ts             | 3 ++-
 tools/public_api_guard/platform-browser/platform-browser.d.ts | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/platform-browser/src/platform-browser.ts b/packages/platform-browser/src/platform-browser.ts
index 6587f011d8..28cee18de7 100644
--- a/packages/platform-browser/src/platform-browser.ts
+++ b/packages/platform-browser/src/platform-browser.ts
@@ -14,7 +14,8 @@ export {BrowserTransferStateModule, StateKey, TransferState, makeStateKey} from
 export {By} from './dom/debug/by';
 export {DOCUMENT} from './dom/dom_tokens';
 export {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
-export {HAMMER_GESTURE_CONFIG, HammerGestureConfig} from './dom/events/hammer_gestures';
+export {HAMMER_GESTURE_CONFIG, HAMMER_LOADER, HammerGestureConfig, HammerLoader} from './dom/events/hammer_gestures';
 export {DomSanitizer, SafeHtml, SafeResourceUrl, SafeScript, SafeStyle, SafeUrl, SafeValue} from './security/dom_sanitization_service';
+
 export * from './private_export';
 export {VERSION} from './version';
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
index 4c4d8afca5..d56b6164c4 100644
--- a/tools/public_api_guard/platform-browser/platform-browser.d.ts
+++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts
@@ -46,6 +46,8 @@ export declare class EventManager {
 /** @experimental */
 export declare const HAMMER_GESTURE_CONFIG: InjectionToken<HammerGestureConfig>;
 
+export declare const HAMMER_LOADER: InjectionToken<HammerLoader>;
+
 /** @experimental */
 export declare class HammerGestureConfig {
     events: string[];
@@ -65,6 +67,8 @@ export declare class HammerGestureConfig {
     buildHammer(element: HTMLElement): HammerInstance;
 }
 
+export declare type HammerLoader = (() => Promise<void>) | null;
+
 /** @experimental */
 export declare function makeStateKey<T = void>(key: string): StateKey<T>;
 

From 373fa78d7fbf10d22cd9f9c829720189e04daf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Tue, 22 May 2018 10:54:37 -0700
Subject: [PATCH 083/582] fix: merge collision (#24054)

PR Close #24054
---
 packages/core/test/render3/ivy/BUILD.bazel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel
index 0a14e7d6d7..57a2439653 100644
--- a/packages/core/test/render3/ivy/BUILD.bazel
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -33,7 +33,7 @@ jasmine_node_test(
     ],
 )
 
-ts_web_test(
+ts_web_test_suite(
     name = "ivy_web",
     deps = [
         ":ivy_lib",

From 0bdd30e34f87305085afc2825749ea2dc04a9409 Mon Sep 17 00:00:00 2001
From: Heo Sangmin <heo@mapiacompany.com>
Date: Thu, 10 May 2018 00:11:43 +0900
Subject: [PATCH 084/582] fix(service-worker): check platformBrowser before
 accessing navigator.serviceWorker (#21231)

PR Close #21231
---
 packages/service-worker/src/low_level.ts      |   9 +-
 packages/service-worker/src/module.ts         |   4 +-
 packages/service-worker/test/comm_spec.ts     | 103 ++++++++++++++++--
 .../service-worker/test/integration_spec.ts   |   2 +-
 4 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/packages/service-worker/src/low_level.ts b/packages/service-worker/src/low_level.ts
index fbb201d078..6929c90d22 100644
--- a/packages/service-worker/src/low_level.ts
+++ b/packages/service-worker/src/low_level.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isPlatformBrowser} from '@angular/common';
-import {Inject, PLATFORM_ID} from '@angular/core';
 import {ConnectableObservable, Observable, concat, defer, fromEvent, of , throwError} from 'rxjs';
 import {filter, map, publish, switchMap, take, tap} from 'rxjs/operators';
 
@@ -71,11 +69,8 @@ export class NgswCommChannel {
    */
   readonly events: Observable<TypedEvent>;
 
-  constructor(
-      private serviceWorker: ServiceWorkerContainer|undefined,
-      @Inject(PLATFORM_ID) platformId: string) {
-    if (!serviceWorker || !isPlatformBrowser(platformId)) {
-      this.serviceWorker = undefined;
+  constructor(private serviceWorker: ServiceWorkerContainer|undefined) {
+    if (!serviceWorker) {
       this.worker = this.events = this.registration = errorObservable(ERR_SW_NOT_SUPPORTED);
     } else {
       const controllerChangeEvents =
diff --git a/packages/service-worker/src/module.ts b/packages/service-worker/src/module.ts
index fd38a8a136..1947582891 100644
--- a/packages/service-worker/src/module.ts
+++ b/packages/service-worker/src/module.ts
@@ -8,7 +8,6 @@
 
 import {isPlatformBrowser} from '@angular/common';
 import {APP_INITIALIZER, ApplicationRef, InjectionToken, Injector, ModuleWithProviders, NgModule, PLATFORM_ID} from '@angular/core';
-import {Observable} from 'rxjs';
 import {filter, take} from 'rxjs/operators';
 
 import {NgswCommChannel} from './low_level';
@@ -53,7 +52,8 @@ export function ngswAppInitializer(
 export function ngswCommChannelFactory(
     opts: RegistrationOptions, platformId: string): NgswCommChannel {
   return new NgswCommChannel(
-      opts.enabled !== false ? navigator.serviceWorker : undefined, platformId);
+      isPlatformBrowser(platformId) && opts.enabled !== false ? navigator.serviceWorker :
+                                                                undefined);
 }
 
 /**
diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts
index 46400c4242..49a5a312fb 100644
--- a/packages/service-worker/test/comm_spec.ts
+++ b/packages/service-worker/test/comm_spec.ts
@@ -6,9 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {PLATFORM_ID} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 
 import {NgswCommChannel} from '../src/low_level';
+import {RegistrationOptions, ngswCommChannelFactory} from '../src/module';
 import {SwPush} from '../src/push';
 import {SwUpdate} from '../src/update';
 import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../testing/mock';
@@ -19,12 +21,12 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
     let comm: NgswCommChannel;
     beforeEach(() => {
       mock = new MockServiceWorkerContainer();
-      comm = new NgswCommChannel(mock as any, 'browser');
+      comm = new NgswCommChannel(mock as any);
     });
     describe('NgswCommsChannel', () => {
       it('can access the registration when it comes before subscription', (done: DoneFn) => {
         const mock = new MockServiceWorkerContainer();
-        const comm = new NgswCommChannel(mock as any, 'browser');
+        const comm = new NgswCommChannel(mock as any);
         const regPromise = mock.getRegistration() as any as MockServiceWorkerRegistration;
 
         mock.setupSw();
@@ -33,18 +35,101 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
       });
       it('can access the registration when it comes after subscription', (done: DoneFn) => {
         const mock = new MockServiceWorkerContainer();
-        const comm = new NgswCommChannel(mock as any, 'browser');
+        const comm = new NgswCommChannel(mock as any);
         const regPromise = mock.getRegistration() as any as MockServiceWorkerRegistration;
 
         (comm as any).registration.subscribe((reg: any) => { done(); });
 
         mock.setupSw();
       });
-      it('is disabled for platform-server', () => {
-        const mock = new MockServiceWorkerContainer();
-        const comm = new NgswCommChannel(mock as any, 'server');
-        expect(comm.isEnabled).toEqual(false);
+    });
+    describe('ngswCommChannelFactory', () => {
+      it('gives disabled NgswCommChannel for platform-server', () => {
+        TestBed.configureTestingModule({
+          providers: [
+            {provide: PLATFORM_ID, useValue: 'server'},
+            {provide: RegistrationOptions, useValue: {enabled: true}}, {
+              provide: NgswCommChannel,
+              useFactory: ngswCommChannelFactory,
+              deps: [RegistrationOptions, PLATFORM_ID]
+            }
+          ]
+        });
+
+        expect(TestBed.get(NgswCommChannel).isEnabled).toEqual(false);
       });
+      it('gives disabled NgswCommChannel when \'enabled\' option is false', () => {
+        TestBed.configureTestingModule({
+          providers: [
+            {provide: PLATFORM_ID, useValue: 'browser'},
+            {provide: RegistrationOptions, useValue: {enabled: false}}, {
+              provide: NgswCommChannel,
+              useFactory: ngswCommChannelFactory,
+              deps: [RegistrationOptions, PLATFORM_ID]
+            }
+          ]
+        });
+
+        expect(TestBed.get(NgswCommChannel).isEnabled).toEqual(false);
+      });
+      it('gives disabled NgswCommChannel when navigator.serviceWorker is undefined', () => {
+        TestBed.configureTestingModule({
+          providers: [
+            {provide: PLATFORM_ID, useValue: 'browser'},
+            {provide: RegistrationOptions, useValue: {enabled: true}},
+            {
+              provide: NgswCommChannel,
+              useFactory: ngswCommChannelFactory,
+              deps: [RegistrationOptions, PLATFORM_ID],
+            },
+          ],
+        });
+
+        const context: any = global || window;
+        const originalDescriptor = Object.getOwnPropertyDescriptor(context, 'navigator');
+        const patchedDescriptor = {value: {serviceWorker: undefined}, configurable: true};
+
+        try {
+          // Set `navigator` to `{serviceWorker: undefined}`.
+          Object.defineProperty(context, 'navigator', patchedDescriptor);
+          expect(TestBed.get(NgswCommChannel).isEnabled).toBe(false);
+        } finally {
+          if (originalDescriptor) {
+            Object.defineProperty(context, 'navigator', originalDescriptor);
+          } else {
+            delete context.navigator;
+          }
+        }
+      });
+      it('gives enabled NgswCommChannel when browser supports SW and enabled option is true',
+         () => {
+           TestBed.configureTestingModule({
+             providers: [
+               {provide: PLATFORM_ID, useValue: 'browser'},
+               {provide: RegistrationOptions, useValue: {enabled: true}}, {
+                 provide: NgswCommChannel,
+                 useFactory: ngswCommChannelFactory,
+                 deps: [RegistrationOptions, PLATFORM_ID]
+               }
+             ]
+           });
+
+           const context: any = global || window;
+           const originalDescriptor = Object.getOwnPropertyDescriptor(context, 'navigator');
+           const patchedDescriptor = {value: {serviceWorker: mock}, configurable: true};
+
+           try {
+             // Set `navigator` to `{serviceWorker: mock}`.
+             Object.defineProperty(context, 'navigator', patchedDescriptor);
+             expect(TestBed.get(NgswCommChannel).isEnabled).toBe(true);
+           } finally {
+             if (originalDescriptor) {
+               Object.defineProperty(context, 'navigator', originalDescriptor);
+             } else {
+               delete context.navigator;
+             }
+           }
+         });
     });
     describe('SwPush', () => {
       let push: SwPush;
@@ -76,7 +161,7 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
         expect(() => TestBed.get(SwPush)).not.toThrow();
       });
       describe('with no SW', () => {
-        beforeEach(() => { comm = new NgswCommChannel(undefined, 'browser'); });
+        beforeEach(() => { comm = new NgswCommChannel(undefined); });
         it('can be instantiated', () => { push = new SwPush(comm); });
         it('does not crash on subscription to observables', () => {
           push = new SwPush(comm);
@@ -170,7 +255,7 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
         expect(() => TestBed.get(SwUpdate)).not.toThrow();
       });
       describe('with no SW', () => {
-        beforeEach(() => { comm = new NgswCommChannel(undefined, 'browser'); });
+        beforeEach(() => { comm = new NgswCommChannel(undefined); });
         it('can be instantiated', () => { update = new SwUpdate(comm); });
         it('does not crash on subscription to observables', () => {
           update = new SwUpdate(comm);
diff --git a/packages/service-worker/test/integration_spec.ts b/packages/service-worker/test/integration_spec.ts
index f4ff957fa4..acd1ed0b81 100644
--- a/packages/service-worker/test/integration_spec.ts
+++ b/packages/service-worker/test/integration_spec.ts
@@ -80,7 +80,7 @@ const serverUpdate =
     async_beforeEach(async() => {
       // Fire up the client.
       mock = new MockServiceWorkerContainer();
-      comm = new NgswCommChannel(mock as any, 'browser');
+      comm = new NgswCommChannel(mock as any);
       scope = new SwTestHarnessBuilder().withServerState(server).build();
       driver = new Driver(scope, scope, new CacheDatabase(scope, scope));
 

From fb906a87e88401bdaabaf3216300c4848b8b0888 Mon Sep 17 00:00:00 2001
From: thebyteman <thebyteman256@gmail.com>
Date: Tue, 15 May 2018 16:28:42 -0400
Subject: [PATCH 085/582] docs(aio): fix typo (#23925)

PR Close #23925
---
 .../shared/boilerplate/cli/src/environments/environment.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts b/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
index 012182efa3..bed42878cd 100644
--- a/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
@@ -1,5 +1,5 @@
 // This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {

From bd149e5d674fd15971f80d81d2871b4a94d48c48 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Tue, 15 May 2018 21:07:59 +0200
Subject: [PATCH 086/582] fix(ivy): compile interpolated bindings without
 superfluous bind instruction (#23923)

This fixes the case where the compiler would generate a bind(interpolation#())
instruction.

PR Close #23923
---
 .../compiler/src/render3/r3_identifiers.ts    |   2 +-
 .../compiler/src/render3/view/template.ts     |  27 ++--
 .../render3/r3_view_compiler_binding_spec.ts  | 123 ++++++++++++++++++
 3 files changed, 141 insertions(+), 11 deletions(-)
 create mode 100644 packages/compiler/test/render3/r3_view_compiler_binding_spec.ts

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index bbde7f2f02..80db996ec2 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -33,7 +33,7 @@ export class Identifiers {
 
   static text: o.ExternalReference = {name: 'ɵT', moduleName: CORE};
 
-  static textCreateBound: o.ExternalReference = {name: 'ɵt', moduleName: CORE};
+  static textBinding: o.ExternalReference = {name: 'ɵt', moduleName: CORE};
 
   static bind: o.ExternalReference = {name: 'ɵb', moduleName: CORE};
 
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index e79e802377..91e2f4b8b9 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -11,7 +11,7 @@ import {CompileReflector} from '../../compile_reflector';
 import {BindingForm, BuiltinFunctionCall, LocalResolver, convertActionBinding, convertPropertyBinding} from '../../compiler_util/expression_converter';
 import {ConstantPool} from '../../constant_pool';
 import * as core from '../../core';
-import {AST, AstMemoryEfficientTransformer, BindingPipe, BindingType, FunctionCall, ImplicitReceiver, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
+import {AST, AstMemoryEfficientTransformer, BindingPipe, BindingType, FunctionCall, ImplicitReceiver, Interpolation, LiteralArray, LiteralMap, LiteralPrimitive, PropertyRead} from '../../expression_parser/ast';
 import {Lexer} from '../../expression_parser/lexer';
 import {Parser} from '../../expression_parser/parser';
 import * as html from '../../ml_parser/ast';
@@ -340,10 +340,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       const instruction = BINDING_INSTRUCTION_MAP[input.type];
       if (instruction) {
         // TODO(chuckj): runtime: security context?
-        const value = o.importExpr(R3.bind).callFn([convertedBinding]);
         this.instruction(
             this._bindingCode, input.sourceSpan, instruction, o.literal(elementIndex),
-            o.literal(input.name), value);
+            o.literal(input.name), convertedBinding);
       } else {
         this._unsupported(`binding type ${input.type}`);
       }
@@ -418,7 +417,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       const convertedBinding = this.convertPropertyBinding(context, input.value);
       this.instruction(
           this._bindingCode, template.sourceSpan, R3.elementProperty, o.literal(templateIndex),
-          o.literal(input.name), o.importExpr(R3.bind).callFn([convertedBinding]));
+          o.literal(input.name), convertedBinding);
     });
 
     // Create the template function
@@ -443,7 +442,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     this.instruction(this._creationCode, text.sourceSpan, R3.text, o.literal(nodeIndex));
 
     this.instruction(
-        this._bindingCode, text.sourceSpan, R3.textCreateBound, o.literal(nodeIndex),
+        this._bindingCode, text.sourceSpan, R3.textBinding, o.literal(nodeIndex),
         this.convertPropertyBinding(o.variable(CONTEXT_NAME), text.value));
   }
 
@@ -483,11 +482,19 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
   private convertPropertyBinding(implicit: o.Expression, value: AST): o.Expression {
     const pipesConvertedValue = value.visit(this._valueConverter);
-    const convertedPropertyBinding = convertPropertyBinding(
-        this, implicit, pipesConvertedValue, this.bindingContext(), BindingForm.TrySimple,
-        interpolate);
-    this._bindingCode.push(...convertedPropertyBinding.stmts);
-    return convertedPropertyBinding.currValExpr;
+    if (pipesConvertedValue instanceof Interpolation) {
+      const convertedPropertyBinding = convertPropertyBinding(
+          this, implicit, pipesConvertedValue, this.bindingContext(), BindingForm.TrySimple,
+          interpolate);
+      this._bindingCode.push(...convertedPropertyBinding.stmts);
+      return convertedPropertyBinding.currValExpr;
+    } else {
+      const convertedPropertyBinding = convertPropertyBinding(
+          this, implicit, pipesConvertedValue, this.bindingContext(), BindingForm.TrySimple,
+          () => error('Unexpected interpolation'));
+      this._bindingCode.push(...convertedPropertyBinding.stmts);
+      return o.importExpr(R3.bind).callFn([convertedPropertyBinding.currValExpr]);
+    }
   }
 }
 
diff --git a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
new file mode 100644
index 0000000000..8b0a9edcbe
--- /dev/null
+++ b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
@@ -0,0 +1,123 @@
+/**
+ * @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 {MockDirectory, setup} from '../aot/test_util';
+import {compile, expectEmit} from './mock_compile';
+
+describe('compiler compliance: bindings', () => {
+  const angularFiles = setup({
+    compileAngular: true,
+    compileAnimations: false,
+    compileCommon: false,
+  });
+
+  describe('text bindings', () => {
+    it('should generate interpolation instruction', () => {
+      const files: MockDirectory = {
+        app: {
+          'example.ts': `
+          import {Component, NgModule} from '@angular/core';
+          @Component({
+            selector: 'my-component',
+            template: \`
+              <div>Hello {{ name }}</div>\`
+          })
+          export class MyComponent {
+            name = 'World';
+          }
+          @NgModule({declarations: [MyComponent]})
+          export class MyModule {}
+          `
+        }
+      };
+
+      const template = `
+      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+        if (rf & 1) {
+          $i0$.ɵE(0, 'div');
+          $i0$.ɵT(1);
+          $i0$.ɵe();
+        }
+        if (rf & 2) {
+          $i0$.ɵt(1, $i0$.ɵi1('Hello ', $ctx$.name, ''));
+        }
+      }`;
+      const result = compile(files, angularFiles);
+      expectEmit(result.source, template, 'Incorrect interpolated text binding');
+    });
+  });
+
+  describe('property bindings', () => {
+    it('should generate bind instruction', () => {
+      const files: MockDirectory = {
+        app: {
+          'example.ts': `
+          import {Component, NgModule} from '@angular/core';
+
+          @Component({
+            selector: 'my-app',
+            template: '<a [title]="title"></a>'
+          })
+          export class MyComponent {
+            title = 'Hello World';
+          }
+
+          @NgModule({declarations: [MyComponent]})
+          export class MyModule {}`
+        }
+      };
+
+      const template = `
+      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+        if (rf & 1) {
+          $i0$.ɵE(0, 'a');
+          $i0$.ɵe();
+        }
+        if (rf & 2) {
+          $i0$.ɵp(0, 'title', $i0$.ɵb($ctx$.title));
+        }
+      }`;
+      const result = compile(files, angularFiles);
+      expectEmit(result.source, template, 'Incorrect property binding');
+    });
+
+    it('should generate interpolation instruction for {{...}} bindings', () => {
+      const files: MockDirectory = {
+        app: {
+          'example.ts': `
+          import {Component, NgModule} from '@angular/core';
+          @Component({
+            selector: 'my-component',
+            template: \`
+              <a title="Hello {{name}}"></a>\`
+          })
+          export class MyComponent {
+            name = 'World';
+          }
+          @NgModule({declarations: [MyComponent]})
+          export class MyModule {}
+          `
+        }
+      };
+
+      const template = `
+      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+        if (rf & 1) {
+          $i0$.ɵE(0, 'a');
+          $i0$.ɵe();
+        }
+        if (rf & 2) {
+          $i0$.ɵp(0, 'title', $i0$.ɵi1('Hello ', $ctx$.name, ''));
+        }
+      }`;
+      const result = compile(files, angularFiles);
+      expectEmit(result.source, template, 'Incorrect interpolated property binding');
+    });
+  });
+
+});

From 23a98b9e5134df3b96dd932173ce86384d72ada0 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 2 May 2018 14:45:19 -0700
Subject: [PATCH 087/582] docs: add doc to event-management api (#23656)

PR Close #23656
---
 .../src/dom/events/event_manager.ts           | 31 +++++++++++++
 .../src/dom/events/hammer_gestures.ts         | 45 +++++++++++++++++--
 .../src/dom/events/key_events.ts              | 32 +++++++++++++
 3 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/packages/platform-browser/src/dom/events/event_manager.ts b/packages/platform-browser/src/dom/events/event_manager.ts
index 4f245aa315..42217b304f 100644
--- a/packages/platform-browser/src/dom/events/event_manager.ts
+++ b/packages/platform-browser/src/dom/events/event_manager.ts
@@ -10,29 +10,60 @@ import {Inject, Injectable, InjectionToken, NgZone} from '@angular/core';
 
 import {getDOM} from '../dom_adapter';
 
+/**
+ * The injection token for the event-manager plug-in service.
+ */
 export const EVENT_MANAGER_PLUGINS =
     new InjectionToken<EventManagerPlugin[]>('EventManagerPlugins');
 
+/**
+ * An injectable service that provides event management for Angular
+ * through a browser plug-in.
+ */
 @Injectable()
 export class EventManager {
   private _plugins: EventManagerPlugin[];
   private _eventNameToPlugin = new Map<string, EventManagerPlugin>();
 
+  /**
+   * Initializes an instance of the event-manager service.
+   */
   constructor(@Inject(EVENT_MANAGER_PLUGINS) plugins: EventManagerPlugin[], private _zone: NgZone) {
     plugins.forEach(p => p.manager = this);
     this._plugins = plugins.slice().reverse();
   }
 
+  /**
+   * Registers a handler for a specific element and event.
+   *
+   * @param element The HTML element to receive event notifications.
+   * @param eventName The name of the event to listen for.
+   * @param handler A function to call when the notification occurs. Receives the
+   * event object as an argument.
+   * @returns  A callback function that can be used to remove the handler.
+   */
   addEventListener(element: HTMLElement, eventName: string, handler: Function): Function {
     const plugin = this._findPluginFor(eventName);
     return plugin.addEventListener(element, eventName, handler);
   }
 
+  /**
+   * Registers a global handler for an event in a target view.
+   *
+   * @param target A target for global event notifications. One of "window", "document", or "body".
+   * @param eventName The name of the event to listen for.
+   * @param handler A function to call when the notification occurs. Receives the
+   * event object as an argument.
+   * @returns A callback function that can be used to remove the handler.
+   */
   addGlobalEventListener(target: string, eventName: string, handler: Function): Function {
     const plugin = this._findPluginFor(eventName);
     return plugin.addGlobalEventListener(target, eventName, handler);
   }
 
+  /**
+   * Retrieves the compilation zone in which event listeners are registered.
+   */
   getZone(): NgZone { return this._zone; }
 
   /** @internal */
diff --git a/packages/platform-browser/src/dom/events/hammer_gestures.ts b/packages/platform-browser/src/dom/events/hammer_gestures.ts
index e51126de6c..f4f4b9c09c 100644
--- a/packages/platform-browser/src/dom/events/hammer_gestures.ts
+++ b/packages/platform-browser/src/dom/events/hammer_gestures.ts
@@ -12,6 +12,9 @@ import {DOCUMENT} from '../dom_tokens';
 
 import {EventManagerPlugin} from './event_manager';
 
+/**
+ * Supported HammerJS recognizer event names.
+ */
 const EVENT_NAMES = {
   // pan
   'pan': true,
@@ -51,8 +54,8 @@ const EVENT_NAMES = {
 };
 
 /**
- * A DI token that you can use to provide{@link HammerGestureConfig} to Angular. Use it to configure
- * Hammer gestures.
+ * DI token for providing [HammerJS](http://hammerjs.github.io/) support to Angular.
+ * @see `HammerGestureConfig`
  *
  * @experimental
  */
@@ -71,14 +74,44 @@ export interface HammerInstance {
 }
 
 /**
+ * An injectable [HammerJS Manager](http://hammerjs.github.io/api/#hammer.manager)
+ * for gesture recognition. Configures specific event recognition.
  * @experimental
  */
 @Injectable()
 export class HammerGestureConfig {
+  /**
+   * A set of supported event names for gestures to be used in Angular.
+   * Angular supports all built-in recognizers, as listed in
+   * [HammerJS documentation](http://hammerjs.github.io/).
+   */
   events: string[] = [];
 
+  /**
+  * Maps gesture event names to a set of configuration options
+  * that specify overrides to the default values for specific properties.
+  *
+  * The key is a supported event name to be configured,
+  * and the options object contains a set of properties, with override values
+  * to be applied to the named recognizer event.
+  * For example, to disable recognition of the rotate event, specify
+  *  `{"rotate": {"enable": false}}`.
+  *
+  * Properties that are not present take the HammerJS default values.
+  * For information about which properties are supported for which events,
+  * and their allowed and default values, see
+  * [HammerJS documentation](http://hammerjs.github.io/).
+  *
+  */
   overrides: {[key: string]: Object} = {};
 
+  /**
+   * Properties whose default values can be overridden for a given event.
+   * Different sets of properties apply to different events.
+   * For information about which properties are supported for which events,
+   * and their allowed and default values, see
+   * [HammerJS documentation](http://hammerjs.github.io/).
+   */
   options?: {
     cssProps?: any; domEvents?: boolean; enable?: boolean | ((manager: any) => boolean);
     preset?: any[];
@@ -88,8 +121,14 @@ export class HammerGestureConfig {
     inputTarget?: EventTarget;
   };
 
+  /**
+   * Creates a [HammerJS Manager](http://hammerjs.github.io/api/#hammer.manager)
+   * and attaches it to a given HTML element.
+   * @param element The element that will recognize gestures.
+   * @returns A HammerJS event-manager object.
+   */
   buildHammer(element: HTMLElement): HammerInstance {
-    const mc = new Hammer(element, this.options);
+    const mc = new Hammer !(element, this.options);
 
     mc.get('pinch').set({enable: true});
     mc.get('rotate').set({enable: true});
diff --git a/packages/platform-browser/src/dom/events/key_events.ts b/packages/platform-browser/src/dom/events/key_events.ts
index 5d0d7f2faf..bcf26c9ec9 100644
--- a/packages/platform-browser/src/dom/events/key_events.ts
+++ b/packages/platform-browser/src/dom/events/key_events.ts
@@ -13,7 +13,14 @@ import {DOCUMENT} from '../dom_tokens';
 
 import {EventManagerPlugin} from './event_manager';
 
+/**
+ * Defines supported modifiers for key events.
+ */
 const MODIFIER_KEYS = ['alt', 'control', 'meta', 'shift'];
+
+/**
+ * Retrieves modifiers from key-event objects.
+ */
 const MODIFIER_KEY_GETTERS: {[key: string]: (event: KeyboardEvent) => boolean} = {
   'alt': (event: KeyboardEvent) => event.altKey,
   'control': (event: KeyboardEvent) => event.ctrlKey,
@@ -23,13 +30,31 @@ const MODIFIER_KEY_GETTERS: {[key: string]: (event: KeyboardEvent) => boolean} =
 
 /**
  * @experimental
+ * A browser plug-in that provides support for handling of key events in Angular.
  */
 @Injectable()
 export class KeyEventsPlugin extends EventManagerPlugin {
+  /**
+   * Initializes an instance of the browser plug-in.
+   * @param doc The document in which key events will be detected.
+   */
   constructor(@Inject(DOCUMENT) doc: any) { super(doc); }
 
+  /**
+    * Reports whether a named key event is supported.
+    * @param eventName The event name to query.
+    * @return True if the named key event is supported.
+   */
   supports(eventName: string): boolean { return KeyEventsPlugin.parseEventName(eventName) != null; }
 
+  /**
+   * Registers a handler for a specific element and key event.
+   * @param element The HTML element to receive event notifications.
+   * @param eventName The name of the key event to listen for.
+   * @param handler A function to call when the notification occurs. Receives the
+   * event object as an argument.
+   * @returns The key event that was registered.
+  */
   addEventListener(element: HTMLElement, eventName: string, handler: Function): Function {
     const parsedEvent = KeyEventsPlugin.parseEventName(eventName) !;
 
@@ -93,6 +118,13 @@ export class KeyEventsPlugin extends EventManagerPlugin {
     return fullKey;
   }
 
+  /**
+   * Configures a handler callback for a key event.
+   * @param fullKey The event name that combines all simultaneous keystrokes.
+   * @param handler The function that responds to the key event.
+   * @param zone The zone in which the event occurred.
+   * @returns A callback function.
+   */
   static eventCallback(fullKey: any, handler: Function, zone: NgZone): Function {
     return (event: any /** TODO #9100 */) => {
       if (KeyEventsPlugin.getEventFullKey(event) === fullKey) {

From 13cb75da8b02ed7aa60508dbb5ecd9065809fd12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Tue, 22 May 2018 16:16:26 -0700
Subject: [PATCH 088/582] release: cut the v6.0.3 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51041a4512..efd682c40f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="6.0.3"></a>
+## [6.0.3](https://github.com/angular/angular/compare/6.0.2...6.0.3) (2018-05-22)
+
+
+### Bug Fixes
+
+* **service-worker:** check platformBrowser before accessing navigator.serviceWorker ([#21231](https://github.com/angular/angular/issues/21231)) ([0ee5b7e](https://github.com/angular/angular/commit/0ee5b7e))
+
+
+
 <a name="6.0.2"></a>
 ## [6.0.2](https://github.com/angular/angular/compare/6.0.1...6.0.2) (2018-05-15)
 
diff --git a/package.json b/package.json
index b38d5d6dbf..1b0123cf83 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 821665768186a78837671975c26f67ed37cb82eb Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 16 May 2018 05:56:01 -0700
Subject: [PATCH 089/582] refactor(ivy): add tNodes for view nodes and hosts
 (#24113)

PR Close #24113
---
 packages/core/src/render3/component.ts        |  2 +-
 packages/core/src/render3/di.ts               | 20 +++--
 packages/core/src/render3/instructions.ts     | 79 +++++++++++--------
 packages/core/src/render3/interfaces/node.ts  | 12 ++-
 packages/core/src/render3/interfaces/view.ts  | 12 +++
 .../core/src/render3/node_manipulation.ts     |  2 +-
 packages/core/src/render3/query.ts            |  5 +-
 .../core/test/render3/instructions_spec.ts    |  6 +-
 .../core/test/render3/integration_spec.ts     |  2 +-
 .../render3/node_selector_matcher_spec.ts     |  3 +-
 10 files changed, 92 insertions(+), 51 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index a0cc5a4602..53f7d15565 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -187,7 +187,7 @@ export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): v
 
   // Root component is always created at dir index 0
   queueInitHooks(0, def.onInit, def.doCheck, elementNode.view.tView);
-  queueLifecycleHooks(elementNode.tNode !.flags, elementNode.view);
+  queueLifecycleHooks(elementNode.tNode.flags, elementNode.view);
 }
 
 /**
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 030afd5ac6..a62b8a17d7 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -19,7 +19,7 @@ import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_Vie
 import {Type} from '../type';
 
 import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
-import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
+import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {LContainerNode, LElementNode, LNode, LNodeType, LViewNode, TNodeFlags} from './interfaces/node';
@@ -254,7 +254,7 @@ export function injectAttribute(attrName: string): string|undefined {
   ngDevMode && assertPreviousIsParent();
   const lElement = getPreviousOrParentNode() as LElementNode;
   ngDevMode && assertNodeType(lElement, LNodeType.Element);
-  const tElement = lElement.tNode !;
+  const tElement = lElement.tNode;
   ngDevMode && assertNotNull(tElement, 'expecting tNode');
   const attrs = tElement.attrs;
   if (attrs) {
@@ -278,7 +278,7 @@ export function getOrCreateChangeDetectorRef(
   if (di.changeDetectorRef) return di.changeDetectorRef;
 
   const currentNode = di.node;
-  if (isComponent(currentNode.tNode !)) {
+  if (isComponent(currentNode.tNode)) {
     return di.changeDetectorRef = createViewRef(currentNode.data as LView, context);
   } else if (currentNode.type === LNodeType.Element) {
     return di.changeDetectorRef = getOrCreateHostChangeDetector(currentNode.view.node);
@@ -298,7 +298,7 @@ function getOrCreateHostChangeDetector(currentNode: LViewNode | LElementNode):
       createViewRef(
           hostNode.data as LView,
           hostNode.view
-              .directives ![hostNode.tNode !.flags >> TNodeFlags.DirectiveStartingIndexShift]);
+              .directives ![hostNode.tNode.flags >> TNodeFlags.DirectiveStartingIndexShift]);
 }
 
 /**
@@ -361,7 +361,7 @@ export function getOrCreateInjectable<T>(
       // At this point, we have an injector which *may* contain the token, so we step through the
       // directives associated with the injector's corresponding node to get the directive instance.
       const node = injector.node;
-      const nodeFlags = node.tNode !.flags;
+      const nodeFlags = node.tNode.flags;
       const count = nodeFlags & TNodeFlags.DirectiveCountMask;
 
       if (count !== 0) {
@@ -572,8 +572,12 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
     const lContainerNode: LContainerNode = createLNodeObject(
         LNodeType.Container, vcRefHost.view, vcRefHost.parent !, undefined, lContainer, null);
 
-    // TODO(kara): Separate into own TNode when moving parent/child properties
-    lContainerNode.tNode = vcRefHost.tNode;
+    const hostTNode = vcRefHost.tNode;
+    if (!hostTNode.dynamicContainerNode) {
+      hostTNode.dynamicContainerNode = createTNode(hostTNode.index, null, null, null);
+    }
+
+    lContainerNode.tNode = hostTNode.dynamicContainerNode;
     vcRefHost.dynamicLContainerNode = lContainerNode;
 
     addToViewTree(vcRefHost.view, lContainer);
@@ -699,7 +703,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
   if (!di.templateRef) {
     ngDevMode && assertNodeType(di.node, LNodeType.Container);
     const hostNode = di.node as LContainerNode;
-    const hostTNode = hostNode.tNode !;
+    const hostTNode = hostNode.tNode;
     const hostTView = hostNode.view.tView;
     if (!hostTNode.tViews) {
       hostTNode.tViews = createTView(hostTView.directiveRegistry, hostTView.pipeRegistry);
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 9768799c7c..4ee9a40b64 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -349,7 +349,7 @@ export function createLNodeObject(
     nodeInjector: parent ? parent.nodeInjector : null,
     data: state,
     queries: queries,
-    tNode: null,
+    tNode: null !,
     pNextOrParent: null,
     dynamicLContainerNode: null
   };
@@ -371,7 +371,7 @@ export function createLNode(
     index: number | null, type: LNodeType.Element, native: RElement | RText | null,
     name: string | null, attrs: string[] | null, lView?: LView | null): LElementNode;
 export function createLNode(
-    index: null, type: LNodeType.View, native: null, name: null, attrs: null,
+    index: number | null, type: LNodeType.View, native: null, name: null, attrs: null,
     lView: LView): LViewNode;
 export function createLNode(
     index: number, type: LNodeType.Container, native: undefined, name: string | null,
@@ -392,14 +392,12 @@ export function createLNode(
   const node =
       createLNodeObject(type, currentView, parent, native, isState ? state as any : null, queries);
 
-  if ((type & LNodeType.ViewOrElement) === LNodeType.ViewOrElement && isState) {
-    // Bit of a hack to bust through the readonly because there is a circular dep between
-    // LView and LNode.
-    ngDevMode && assertNull((state as LView).node, 'LView.node should not have been initialized');
-    (state as LView as{node: LNode}).node = node;
-  }
-  if (index != null) {
-    // We are Element or Container
+  if (index === null || type === LNodeType.View) {
+    // View nodes are not stored in data because they can be added / removed at runtime (which
+    // would cause indices to change). Their TNodes are instead stored in TView.node.
+    node.tNode = (state as LView).tView.node || createTNode(index, null, null, null);
+  } else {
+    // This is an element or container or projection node
     ngDevMode && assertDataNext(index);
     data[index] = node;
 
@@ -407,7 +405,9 @@ export function createLNode(
     if (index >= tData.length) {
       const tNode = tData[index] = createTNode(index, name, attrs, null);
       if (!isParent && previousOrParentNode) {
-        previousOrParentNode.tNode !.next = tNode;
+        const previousTNode = previousOrParentNode.tNode;
+        previousTNode.next = tNode;
+        if (previousTNode.dynamicContainerNode) previousTNode.dynamicContainerNode.next = tNode;
       }
     }
     node.tNode = tData[index] as TNode;
@@ -427,6 +427,16 @@ export function createLNode(
       }
     }
   }
+
+  // View nodes and host elements need to set their host node (components set host nodes later)
+  if ((type & LNodeType.ViewOrElement) === LNodeType.ViewOrElement && isState) {
+    // Bit of a hack to bust through the readonly because there is a circular dep between
+    // LView and LNode.
+    ngDevMode && assertNull((state as LView).node, 'LView.node should not have been initialized');
+    (state as{node: LNode}).node = node;
+    if (firstTemplatePass) (state as LView).tView.node = node.tNode;
+  }
+
   previousOrParentNode = node;
   isParent = true;
   return node;
@@ -613,7 +623,7 @@ function createDirectivesAndLocals(
   const node = previousOrParentNode;
   if (firstTemplatePass) {
     ngDevMode && ngDevMode.firstTemplatePass++;
-    cacheMatchingDirectivesForNode(node.tNode !, currentView.tView, localRefs || null);
+    cacheMatchingDirectivesForNode(node.tNode, currentView.tView, localRefs || null);
   } else {
     instantiateDirectivesDirectly();
   }
@@ -708,7 +718,7 @@ export function isComponent(tNode: TNode): boolean {
  * This function instantiates the given directives.
  */
 function instantiateDirectivesDirectly() {
-  const tNode = previousOrParentNode.tNode !;
+  const tNode = previousOrParentNode.tNode;
   const count = tNode.flags & TNodeFlags.DirectiveCountMask;
 
   if (count > 0) {
@@ -758,7 +768,7 @@ function saveNameToExportMap(
  * to data[] in the same order as they are loaded in the template with load().
  */
 function saveResolvedLocalsInData(): void {
-  const localNames = previousOrParentNode.tNode !.localNames;
+  const localNames = previousOrParentNode.tNode.localNames;
   if (localNames) {
     for (let i = 0; i < localNames.length; i += 2) {
       const index = localNames[i + 1] as number;
@@ -796,6 +806,7 @@ export function createTView(
     defs: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null): TView {
   ngDevMode && ngDevMode.tView++;
   return {
+    node: null !,
     data: [],
     directives: null,
     firstTemplatePass: true,
@@ -879,7 +890,7 @@ export function hostElement(
           def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
-    node.tNode !.flags = TNodeFlags.isComponent;
+    node.tNode.flags = TNodeFlags.isComponent;
     if (def.diPublic) def.diPublic(def);
     currentView.tView.directives = [def];
   }
@@ -918,11 +929,11 @@ export function listener(
     cleanupFns.push(eventName, native, wrappedListener, useCapture);
   }
 
-  let tNode: TNode|null = node.tNode !;
+  let tNode: TNode|null = node.tNode;
   if (tNode.outputs === undefined) {
     // if we create TNode here, inputs must be undefined so we know they still need to be
     // checked
-    tNode.outputs = generatePropertyAliases(node.tNode !.flags, BindingDirection.Output);
+    tNode.outputs = generatePropertyAliases(node.tNode.flags, BindingDirection.Output);
   }
 
   const outputs = tNode.outputs;
@@ -955,7 +966,7 @@ export function elementEnd() {
   ngDevMode && assertNodeType(previousOrParentNode, LNodeType.Element);
   const queries = previousOrParentNode.queries;
   queries && queries.addNode(previousOrParentNode);
-  queueLifecycleHooks(previousOrParentNode.tNode !.flags, currentView);
+  queueLifecycleHooks(previousOrParentNode.tNode.flags, currentView);
 }
 
 /**
@@ -1002,12 +1013,12 @@ export function elementProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn): void {
   if (value === NO_CHANGE) return;
   const node = data[index] as LElementNode;
-  const tNode = node.tNode !;
+  const tNode = node.tNode;
   // if tNode.inputs is undefined, a listener has created outputs, but inputs haven't
   // yet been checked
   if (tNode && tNode.inputs === undefined) {
     // mark inputs as checked
-    tNode.inputs = generatePropertyAliases(node.tNode !.flags, BindingDirection.Input);
+    tNode.inputs = generatePropertyAliases(node.tNode.flags, BindingDirection.Input);
   }
 
   const inputData = tNode && tNode.inputs;
@@ -1036,8 +1047,9 @@ export function elementProperty<T>(
  * @param tViews Any TViews attached to this node
  * @returns the TNode object
  */
-function createTNode(
-    index: number, tagName: string | null, attrs: string[] | null, tViews: TView[] | null): TNode {
+export function createTNode(
+    index: number | null, tagName: string | null, attrs: string[] | null,
+    tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
     index: index,
@@ -1049,7 +1061,8 @@ function createTNode(
     inputs: undefined,
     outputs: undefined,
     tViews: tViews,
-    next: null
+    next: null,
+    dynamicContainerNode: null
   };
 }
 
@@ -1321,8 +1334,11 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
                        tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
                        getCurrentSanitizer()));
 
-  (previousOrParentNode.data as any) = hostView;
-  (hostView.node as any) = previousOrParentNode;
+  // We need to set the host node/data here because when the component LNode was created,
+  // we didn't yet know it was a component (just an element).
+  (previousOrParentNode as{data: LView}).data = hostView;
+  (hostView as{node: LNode}).node = previousOrParentNode;
+  if (firstTemplatePass) tView.node = previousOrParentNode.tNode;
 
   initChangeDetectorIfExisting(previousOrParentNode.nodeInjector, instance, hostView);
 
@@ -1351,19 +1367,19 @@ export function baseDirectiveCreate<T>(
   directives[index] = directive;
 
   if (firstTemplatePass) {
-    const flags = previousOrParentNode.tNode !.flags;
+    const flags = previousOrParentNode.tNode.flags;
     if ((flags & TNodeFlags.DirectiveCountMask) === 0) {
       // When the first directive is created:
       // - save the index,
       // - set the number of directives to 1
-      previousOrParentNode.tNode !.flags =
+      previousOrParentNode.tNode.flags =
           index << TNodeFlags.DirectiveStartingIndexShift | flags & TNodeFlags.isComponent | 1;
     } else {
       // Only need to bump the size when subsequent directives are created
       ngDevMode && assertNotEqual(
                        flags & TNodeFlags.DirectiveCountMask, TNodeFlags.DirectiveCountMask,
                        'Reached the max number of directives');
-      previousOrParentNode.tNode !.flags++;
+      previousOrParentNode.tNode.flags++;
     }
   } else {
     const diPublic = directiveDef !.diPublic;
@@ -1481,7 +1497,7 @@ export function container(
   const node = createLNode(
       index, LNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
 
-  if (firstTemplatePass && template == null) node.tNode !.tViews = [];
+  if (firstTemplatePass && template == null) node.tNode.tViews = [];
 
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
@@ -1618,7 +1634,8 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
       newView.queries = lContainer.queries.enterView(lContainer.nextIndex);
     }
 
-    enterView(newView, viewNode = createLNode(null, LNodeType.View, null, null, null, newView));
+    enterView(
+        newView, viewNode = createLNode(viewBlockId, LNodeType.View, null, null, null, newView));
   }
   return getRenderFlags(viewNode.data);
 }
@@ -2027,7 +2044,7 @@ export function getRootView(component: any): LView {
 export function detectChanges<T>(component: T): void {
   const hostNode = _getComponentHostLElementNode(component);
   ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
-  const componentIndex = hostNode.tNode !.flags >> TNodeFlags.DirectiveStartingIndexShift;
+  const componentIndex = hostNode.tNode.flags >> TNodeFlags.DirectiveStartingIndexShift;
   const def = hostNode.view.tView.directives ![componentIndex] as ComponentDef<T>;
   detectChangesInternal(hostNode.data as LView, hostNode, def, component);
 }
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index ad323d052f..1775469c51 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -118,11 +118,12 @@ export interface LNode {
    * Pointer to the corresponding TNode object, which stores static
    * data about this node.
    */
-  tNode: TNode|null;
+  tNode: TNode;
 
   /**
    * A pointer to a LContainerNode created by directives requesting ViewContainerRef
    */
+  // TODO(kara): Remove when removing LNodes
   dynamicLContainerNode: LContainerNode|null;
 }
 
@@ -210,8 +211,10 @@ export interface TNode {
    *
    * This is necessary to get from any TNode to its corresponding LNode when
    * traversing the node tree.
+   *
+   * If null, this is a view node created from a dynamically created view.
    */
-  index: number;
+  index: number|null;
 
   /**
    * This number stores two values using its bits:
@@ -306,6 +309,11 @@ export interface TNode {
    * to insert them or remove them from the DOM.
    */
   next: TNode|null;
+
+  /**
+   * A pointer to a LContainerNode created by directives requesting ViewContainerRef
+   */
+  dynamicContainerNode: TNode|null;
 }
 
 /** Static data for an LElementNode  */
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 1e412140b2..a405cdde93 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -46,6 +46,7 @@ export interface LView {
    *
    * If `LElementNode`, this is the LView of a component.
    */
+  // TODO(kara): Remove when we have parent/child on TNodes
   readonly node: LViewNode|LElementNode;
 
   /**
@@ -241,6 +242,17 @@ export interface LViewOrLContainer {
  * Stored on the template function as ngPrivateData.
  */
 export interface TView {
+  /**
+   * Pointer to the `TNode` that represents the root of the view.
+   *
+   * If this is a `TNode` for an `LViewNode`, this is an embedded view of a container.
+   * We need this pointer to be able to efficiently find this node when inserting the view
+   * into an anchor.
+   *
+   * If this is a `TNode` for an `LElementNode`, this is the TView of a component.
+   */
+  node: TNode;
+
   /** Whether or not this template has been processed. */
   firstTemplatePass: boolean;
 
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index c7c750d364..8a797bfb4e 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -72,7 +72,7 @@ export function getNextLNode(node: LNode): LNode|null {
     const lView = node.data as LView;
     return lView.next ? (lView.next as LView).node : null;
   }
-  return node.tNode !.next ? node.view.data[node.tNode !.next !.index] : null;
+  return node.tNode.next ? node.view.data[node.tNode.next !.index as number] : null;
 }
 
 /**
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index e81fcaf1f9..4502b47b9c 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -195,7 +195,7 @@ function getIdxOfMatchingSelector(tNode: TNode, selector: string): number|null {
  */
 function getIdxOfMatchingDirective(node: LNode, type: Type<any>): number|null {
   const defs = node.view.tView.directives !;
-  const flags = node.tNode !.flags;
+  const flags = node.tNode.flags;
   const count = flags & TNodeFlags.DirectiveCountMask;
   const start = flags >> TNodeFlags.DirectiveStartingIndexShift;
   const end = start + count;
@@ -241,8 +241,7 @@ function add(query: LQuery<any>| null, node: LNode) {
     } else {
       const selector = predicate.selector !;
       for (let i = 0; i < selector.length; i++) {
-        ngDevMode && assertNotNull(node.tNode, 'node.tNode');
-        const directiveIdx = getIdxOfMatchingSelector(node.tNode !, selector[i]);
+        const directiveIdx = getIdxOfMatchingSelector(node.tNode, selector[i]);
         if (directiveIdx !== null) {
           // a node is matching a predicate - determine what to read
           // note that queries using name selector must specify read strategy
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 18be0225ca..43a0de4031 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -48,7 +48,7 @@ describe('instructions', () => {
       expect(t.html).toEqual('<div title="javascript:true"></div>');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
-        tNode: 1,
+        tNode: 2,  // 1 for div, 1 for host element
         tView: 1,
         rendererCreateElement: 1,
         rendererSetAttribute: 2
@@ -69,7 +69,7 @@ describe('instructions', () => {
       expect(t.html).toEqual('<div title="javascript:false"></div>');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
-        tNode: 1,
+        tNode: 2,  // 1 for div, 1 for host element
         tView: 1,
         rendererCreateElement: 1,
       });
@@ -83,7 +83,7 @@ describe('instructions', () => {
       expect((t.hostNode.native as HTMLElement).querySelector('div') !.hidden).toEqual(false);
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
-        tNode: 1,
+        tNode: 2,  // 1 for div, 1 for host element
         tView: 1,
         rendererCreateElement: 1,
         rendererSetProperty: 1
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index e0325ab458..7fea1a24f3 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -32,7 +32,7 @@ describe('render3 integration test', () => {
       }
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
-        tNode: 2,
+        tNode: 3,  // 1 for div, 1 for text, 1 for host element
         tView: 1,
         rendererCreateElement: 1,
       });
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 08a68d8cf3..e03deec396 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -19,7 +19,8 @@ function testLStaticData(tagName: string, attrs: string[] | null): TNode {
     inputs: undefined,
     outputs: undefined,
     tViews: null,
-    next: null
+    next: null,
+    dynamicContainerNode: null
   };
 }
 

From 68bf8c36c67929818bce52ec3f308f2eca6dfe18 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 17 May 2018 12:54:57 -0700
Subject: [PATCH 090/582] refactor(ivy): move type from LNode to TNode (#24113)

PR Close #24113
---
 packages/core/src/render3/di.ts               | 27 +++---
 packages/core/src/render3/instructions.ts     | 83 ++++++++++---------
 packages/core/src/render3/interfaces/node.ts  | 14 ++--
 packages/core/src/render3/node_assert.ts      | 20 ++---
 .../core/src/render3/node_manipulation.ts     | 34 ++++----
 packages/core/test/render3/di_spec.ts         |  4 +-
 .../render3/node_selector_matcher_spec.ts     |  4 +-
 7 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index a62b8a17d7..05e4205888 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -22,7 +22,7 @@ import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
-import {LContainerNode, LElementNode, LNode, LNodeType, LViewNode, TNodeFlags} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {LView, TView} from './interfaces/view';
@@ -253,7 +253,7 @@ export function injectChangeDetectorRef(): viewEngine_ChangeDetectorRef {
 export function injectAttribute(attrName: string): string|undefined {
   ngDevMode && assertPreviousIsParent();
   const lElement = getPreviousOrParentNode() as LElementNode;
-  ngDevMode && assertNodeType(lElement, LNodeType.Element);
+  ngDevMode && assertNodeType(lElement, TNodeType.Element);
   const tElement = lElement.tNode;
   ngDevMode && assertNotNull(tElement, 'expecting tNode');
   const attrs = tElement.attrs;
@@ -280,7 +280,7 @@ export function getOrCreateChangeDetectorRef(
   const currentNode = di.node;
   if (isComponent(currentNode.tNode)) {
     return di.changeDetectorRef = createViewRef(currentNode.data as LView, context);
-  } else if (currentNode.type === LNodeType.Element) {
+  } else if (currentNode.tNode.type === TNodeType.Element) {
     return di.changeDetectorRef = getOrCreateHostChangeDetector(currentNode.view.node);
   }
   return null !;
@@ -307,7 +307,7 @@ function getOrCreateHostChangeDetector(currentNode: LViewNode | LElementNode):
  * returns itself.
  */
 function getClosestComponentAncestor(node: LViewNode | LElementNode): LElementNode {
-  while (node.type === LNodeType.View) {
+  while (node.tNode.type === TNodeType.View) {
     node = node.view.node;
   }
   return node as LElementNode;
@@ -523,7 +523,7 @@ export class ReadFromInjectorFn<T> {
  */
 export function getOrCreateElementRef(di: LInjector): viewEngine_ElementRef {
   return di.elementRef || (di.elementRef = new ElementRef(
-                               di.node.type === LNodeType.Container ? null : di.node.native));
+                               di.node.tNode.type === TNodeType.Container ? null : di.node.native));
 }
 
 export const QUERY_READ_TEMPLATE_REF = <QueryReadType<viewEngine_TemplateRef<any>>>(
@@ -540,12 +540,12 @@ export const QUERY_READ_ELEMENT_REF =
 
 export const QUERY_READ_FROM_NODE =
     (new ReadFromInjectorFn<any>((injector: LInjector, node: LNode, directiveIdx: number) => {
-      ngDevMode && assertNodeOfPossibleTypes(node, LNodeType.Container, LNodeType.Element);
+      ngDevMode && assertNodeOfPossibleTypes(node, TNodeType.Container, TNodeType.Element);
       if (directiveIdx > -1) {
         return node.view.directives ![directiveIdx];
-      } else if (node.type === LNodeType.Element) {
+      } else if (node.tNode.type === TNodeType.Element) {
         return getOrCreateElementRef(injector);
-      } else if (node.type === LNodeType.Container) {
+      } else if (node.tNode.type === TNodeType.Container) {
         return getOrCreateTemplateRef(injector);
       }
       throw new Error('fail');
@@ -567,14 +567,15 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
   if (!di.viewContainerRef) {
     const vcRefHost = di.node;
 
-    ngDevMode && assertNodeOfPossibleTypes(vcRefHost, LNodeType.Container, LNodeType.Element);
+    ngDevMode && assertNodeOfPossibleTypes(vcRefHost, TNodeType.Container, TNodeType.Element);
     const lContainer = createLContainer(vcRefHost.parent !, vcRefHost.view);
     const lContainerNode: LContainerNode = createLNodeObject(
-        LNodeType.Container, vcRefHost.view, vcRefHost.parent !, undefined, lContainer, null);
+        TNodeType.Container, vcRefHost.view, vcRefHost.parent !, undefined, lContainer, null);
 
     const hostTNode = vcRefHost.tNode;
     if (!hostTNode.dynamicContainerNode) {
-      hostTNode.dynamicContainerNode = createTNode(hostTNode.index, null, null, null);
+      hostTNode.dynamicContainerNode =
+          createTNode(TNodeType.Container, hostTNode.index, null, null, null);
     }
 
     lContainerNode.tNode = hostTNode.dynamicContainerNode;
@@ -650,7 +651,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
       // Look for the parent node and increment its dynamic view count.
       if (this._lContainerNode.parent !== null && this._lContainerNode.parent.data !== null) {
         ngDevMode && assertNodeOfPossibleTypes(
-                         this._lContainerNode.parent, LNodeType.View, LNodeType.Element);
+                         this._lContainerNode.parent, TNodeType.View, TNodeType.Element);
         this._lContainerNode.parent.data.dynamicViewCount++;
       }
     }
@@ -701,7 +702,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
  */
 export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef<T> {
   if (!di.templateRef) {
-    ngDevMode && assertNodeType(di.node, LNodeType.Container);
+    ngDevMode && assertNodeType(di.node, TNodeType.Container);
     const hostNode = di.node as LContainerNode;
     const hostTNode = hostNode.tNode;
     const hostTView = hostNode.view.tView;
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 4ee9a40b64..d1196f92ca 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -15,7 +15,7 @@ import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interface
 import {LQueries} from './interfaces/query';
 import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TData, TView} from './interfaces/view';
 
-import {LContainerNode, LElementNode, LNode, LNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue,} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
@@ -337,11 +337,10 @@ export function createLView<T>(
  * (same properties assigned in the same order).
  */
 export function createLNodeObject(
-    type: LNodeType, currentView: LView, parent: LNode, native: RText | RElement | null | undefined,
+    type: TNodeType, currentView: LView, parent: LNode, native: RText | RElement | null | undefined,
     state: any,
     queries: LQueries | null): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   return {
-    type: type,
     native: native as any,
     view: currentView,
     parent: parent as any,
@@ -368,19 +367,19 @@ export function createLNodeObject(
  * @param data Any data that should be saved on the LNode
  */
 export function createLNode(
-    index: number | null, type: LNodeType.Element, native: RElement | RText | null,
+    index: number | null, type: TNodeType.Element, native: RElement | RText | null,
     name: string | null, attrs: string[] | null, lView?: LView | null): LElementNode;
 export function createLNode(
-    index: number | null, type: LNodeType.View, native: null, name: null, attrs: null,
+    index: number | null, type: TNodeType.View, native: null, name: null, attrs: null,
     lView: LView): LViewNode;
 export function createLNode(
-    index: number, type: LNodeType.Container, native: undefined, name: string | null,
+    index: number, type: TNodeType.Container, native: undefined, name: string | null,
     attrs: string[] | null, lContainer: LContainer): LContainerNode;
 export function createLNode(
-    index: number, type: LNodeType.Projection, native: null, name: null, attrs: string[] | null,
+    index: number, type: TNodeType.Projection, native: null, name: null, attrs: string[] | null,
     lProjection: LProjection): LProjectionNode;
 export function createLNode(
-    index: number | null, type: LNodeType, native: RText | RElement | null | undefined,
+    index: number | null, type: TNodeType, native: RText | RElement | null | undefined,
     name: string | null, attrs: string[] | null, state?: null | LView | LContainer |
         LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
@@ -392,10 +391,10 @@ export function createLNode(
   const node =
       createLNodeObject(type, currentView, parent, native, isState ? state as any : null, queries);
 
-  if (index === null || type === LNodeType.View) {
+  if (index === null || type === TNodeType.View) {
     // View nodes are not stored in data because they can be added / removed at runtime (which
     // would cause indices to change). Their TNodes are instead stored in TView.node.
-    node.tNode = (state as LView).tView.node || createTNode(index, null, null, null);
+    node.tNode = (state as LView).tView.node || createTNode(type, index, null, null, null);
   } else {
     // This is an element or container or projection node
     ngDevMode && assertDataNext(index);
@@ -403,7 +402,7 @@ export function createLNode(
 
     // Every node adds a value to the static data array to avoid a sparse array
     if (index >= tData.length) {
-      const tNode = tData[index] = createTNode(index, name, attrs, null);
+      const tNode = tData[index] = createTNode(type, index, name, attrs, null);
       if (!isParent && previousOrParentNode) {
         const previousTNode = previousOrParentNode.tNode;
         previousTNode.next = tNode;
@@ -416,7 +415,7 @@ export function createLNode(
     if (isParent) {
       currentQueries = null;
       if (previousOrParentNode.view === currentView ||
-          previousOrParentNode.type === LNodeType.View) {
+          previousOrParentNode.tNode.type === TNodeType.View) {
         // We are in the same view, which means we are adding content node to the parent View.
         ngDevMode && assertNull(
                          previousOrParentNode.child,
@@ -429,7 +428,7 @@ export function createLNode(
   }
 
   // View nodes and host elements need to set their host node (components set host nodes later)
-  if ((type & LNodeType.ViewOrElement) === LNodeType.ViewOrElement && isState) {
+  if ((type & TNodeType.ViewOrElement) === TNodeType.ViewOrElement && isState) {
     // Bit of a hack to bust through the readonly because there is a circular dep between
     // LView and LNode.
     ngDevMode && assertNull((state as LView).node, 'LView.node should not have been initialized');
@@ -475,7 +474,7 @@ export function renderTemplate<T>(
     rendererFactory = providedRendererFactory;
     const tView = getOrCreateTView(template, directives || null, pipes || null);
     host = createLNode(
-        null, LNodeType.Element, hostNode, null, null,
+        null, TNodeType.Element, hostNode, null, null,
         createLView(
             -1, providedRendererFactory.createRenderer(null, null), tView, null, {},
             LViewFlags.CheckAlways, sanitizer));
@@ -512,7 +511,7 @@ export function renderEmbeddedTemplate<T>(
       const lView = createLView(
           -1, renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
-      viewNode = createLNode(null, LNodeType.View, null, null, null, lView);
+      viewNode = createLNode(null, TNodeType.View, null, null, null, lView);
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
@@ -600,7 +599,7 @@ export function elementStart(
   ngDevMode && assertDataInRange(index - 1);
 
   const node: LElementNode =
-      createLNode(index, LNodeType.Element, native !, name, attrs || null, null);
+      createLNode(index, TNodeType.Element, native !, name, attrs || null, null);
 
   if (attrs) setUpAttributes(native, attrs);
   appendChild(node.parent !, native, currentView);
@@ -884,7 +883,7 @@ export function hostElement(
     sanitizer?: Sanitizer | null): LElementNode {
   resetApplicationState();
   const node = createLNode(
-      0, LNodeType.Element, rNode, null, null,
+      0, TNodeType.Element, rNode, null, null,
       createLView(
           -1, renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null, null,
           def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
@@ -963,7 +962,7 @@ export function elementEnd() {
     ngDevMode && assertHasParent();
     previousOrParentNode = previousOrParentNode.parent !;
   }
-  ngDevMode && assertNodeType(previousOrParentNode, LNodeType.Element);
+  ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Element);
   const queries = previousOrParentNode.queries;
   queries && queries.addNode(previousOrParentNode);
   queueLifecycleHooks(previousOrParentNode.tNode.flags, currentView);
@@ -1041,6 +1040,7 @@ export function elementProperty<T>(
 /**
  * Constructs a TNode object from the arguments.
  *
+ * @param type The type of the node
  * @param index The index of the TNode in TView.data
  * @param tagName The tag name of the node
  * @param attrs The attributes defined on this node
@@ -1048,10 +1048,11 @@ export function elementProperty<T>(
  * @returns the TNode object
  */
 export function createTNode(
-    index: number | null, tagName: string | null, attrs: string[] | null,
+    type: TNodeType, index: number | null, tagName: string | null, attrs: string[] | null,
     tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
+    type: type,
     index: index,
     flags: 0,
     tagName: tagName,
@@ -1257,7 +1258,7 @@ export function text(index: number, value?: any): void {
           currentView.bindingStartIndex, -1, 'text nodes should be created before bindings');
   ngDevMode && ngDevMode.rendererCreateTextNode++;
   const textNode = createTextNode(value, renderer);
-  const node = createLNode(index, LNodeType.Element, textNode, null, null);
+  const node = createLNode(index, TNodeType.Element, textNode, null, null);
 
   // Text nodes are self closing.
   isParent = false;
@@ -1386,7 +1387,7 @@ export function baseDirectiveCreate<T>(
     if (diPublic) diPublic(directiveDef !);
   }
 
-  if (directiveDef !.attributes != null && previousOrParentNode.type == LNodeType.Element) {
+  if (directiveDef !.attributes != null && previousOrParentNode.tNode.type == TNodeType.Element) {
     setUpAttributes(
         (previousOrParentNode as LElementNode).native, directiveDef !.attributes as string[]);
   }
@@ -1495,7 +1496,7 @@ export function container(
   const lContainer = createLContainer(currentParent, currentView, template);
 
   const node = createLNode(
-      index, LNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
+      index, TNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
 
   if (firstTemplatePass && template == null) node.tNode.tViews = [];
 
@@ -1505,7 +1506,7 @@ export function container(
   createDirectivesAndLocals(index, tagName || null, attrs, localRefs, template == null);
 
   isParent = false;
-  ngDevMode && assertNodeType(previousOrParentNode, LNodeType.Container);
+  ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   const queries = node.queries;
   if (queries) {
     // check if a given container node matches
@@ -1523,7 +1524,7 @@ export function container(
 export function containerRefreshStart(index: number): void {
   ngDevMode && assertDataInRange(index);
   previousOrParentNode = data[index] as LNode;
-  ngDevMode && assertNodeType(previousOrParentNode, LNodeType.Container);
+  ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   isParent = true;
   (previousOrParentNode as LContainerNode).data.nextIndex = 0;
   ngDevMode && assertSame(
@@ -1546,14 +1547,14 @@ export function containerRefreshEnd(): void {
   if (isParent) {
     isParent = false;
   } else {
-    ngDevMode && assertNodeType(previousOrParentNode, LNodeType.View);
+    ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
     ngDevMode && assertHasParent();
     previousOrParentNode = previousOrParentNode.parent !;
   }
-  ngDevMode && assertNodeType(previousOrParentNode, LNodeType.Container);
+  ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   const container = previousOrParentNode as LContainerNode;
   container.native = undefined;
-  ngDevMode && assertNodeType(container, LNodeType.Container);
+  ngDevMode && assertNodeType(container, TNodeType.Container);
   const nextIndex = container.data.nextIndex;
 
   // remove extra views at the end of the container
@@ -1616,13 +1617,13 @@ function scanForView(
 export function embeddedViewStart(viewBlockId: number): RenderFlags {
   const container =
       (isParent ? previousOrParentNode : previousOrParentNode.parent !) as LContainerNode;
-  ngDevMode && assertNodeType(container, LNodeType.Container);
+  ngDevMode && assertNodeType(container, TNodeType.Container);
   const lContainer = container.data;
   let viewNode: LViewNode|null = scanForView(container, lContainer.nextIndex, viewBlockId);
 
   if (viewNode) {
     previousOrParentNode = viewNode;
-    ngDevMode && assertNodeType(previousOrParentNode, LNodeType.View);
+    ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
     isParent = true;
     enterView(viewNode.data, viewNode);
   } else {
@@ -1635,7 +1636,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
     }
 
     enterView(
-        newView, viewNode = createLNode(viewBlockId, LNodeType.View, null, null, null, newView));
+        newView, viewNode = createLNode(viewBlockId, TNodeType.View, null, null, null, newView));
   }
   return getRenderFlags(viewNode.data);
 }
@@ -1652,7 +1653,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
  * @returns TView
  */
 function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TView {
-  ngDevMode && assertNodeType(parent, LNodeType.Container);
+  ngDevMode && assertNodeType(parent, TNodeType.Container);
   const containerTViews = (parent !.tNode as TContainerNode).tViews as TView[];
   ngDevMode && assertNotNull(containerTViews, 'TView expected');
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
@@ -1670,8 +1671,8 @@ export function embeddedViewEnd(): void {
   const viewNode = previousOrParentNode = currentView.node as LViewNode;
   const containerNode = previousOrParentNode.parent as LContainerNode;
   if (containerNode) {
-    ngDevMode && assertNodeType(viewNode, LNodeType.View);
-    ngDevMode && assertNodeType(containerNode, LNodeType.Container);
+    ngDevMode && assertNodeType(viewNode, TNodeType.View);
+    ngDevMode && assertNodeType(containerNode, TNodeType.Container);
     const lContainer = containerNode.data;
 
     if (creationMode) {
@@ -1686,7 +1687,7 @@ export function embeddedViewEnd(): void {
   }
   leaveView(currentView !.parent !);
   ngDevMode && assertEqual(isParent, false, 'isParent');
-  ngDevMode && assertNodeType(previousOrParentNode, LNodeType.View);
+  ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
 }
 
 /**
@@ -1700,7 +1701,7 @@ function setRenderParentInProjectedNodes(
   if (renderParent != null) {
     let node: LNode|null = viewNode.child;
     while (node) {
-      if (node.type === LNodeType.Projection) {
+      if (node.tNode.type === TNodeType.Projection) {
         let nodeToProject: LNode|null = (node as LProjectionNode).data.head;
         const lastNodeToProject = (node as LProjectionNode).data.tail;
         while (nodeToProject) {
@@ -1726,7 +1727,7 @@ function setRenderParentInProjectedNodes(
 export function componentRefresh<T>(directiveIndex: number, elementIndex: number): void {
   ngDevMode && assertDataInRange(elementIndex);
   const element = data ![elementIndex] as LElementNode;
-  ngDevMode && assertNodeType(element, LNodeType.Element);
+  ngDevMode && assertNodeType(element, TNodeType.Element);
   ngDevMode && assertNotNull(element.data, `Component's host node should have an LView attached.`);
   const hostView = element.data !;
 
@@ -1836,7 +1837,7 @@ function appendToProjectionNode(
 export function projection(
     nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: string[]): void {
   const node = createLNode(
-      nodeIndex, LNodeType.Projection, null, null, attrs || null, {head: null, tail: null});
+      nodeIndex, TNodeType.Projection, null, null, attrs || null, {head: null, tail: null});
 
   // `<ng-content>` has no content
   isParent = false;
@@ -1850,7 +1851,7 @@ export function projection(
   // build the linked list of projected nodes:
   for (let i = 0; i < nodesForSelector.length; i++) {
     const nodeToProject = nodesForSelector[i];
-    if (nodeToProject.type === LNodeType.Projection) {
+    if (nodeToProject.tNode.type === TNodeType.Projection) {
       // Reprojecting a projection -> append the list of previously projected nodes
       const previouslyProjected = (nodeToProject as LProjectionNode).data;
       appendToProjectionNode(node, previouslyProjected.head, previouslyProjected.tail);
@@ -1863,7 +1864,7 @@ export function projection(
   }
 
   if (canInsertNativeNode(currentParent, currentView)) {
-    ngDevMode && assertNodeType(currentParent, LNodeType.Element);
+    ngDevMode && assertNodeType(currentParent, TNodeType.Element);
     // process each node in the list of projected nodes:
     let nodeToProject: LNode|null = node.data.head;
     const lastNodeToProject = node.data.tail;
@@ -1884,13 +1885,13 @@ export function projection(
  */
 function findComponentHost(lView: LView): LElementNode {
   let viewRootLNode = lView.node;
-  while (viewRootLNode.type === LNodeType.View) {
+  while (viewRootLNode.tNode.type === TNodeType.View) {
     ngDevMode && assertNotNull(lView.parent, 'lView.parent');
     lView = lView.parent !;
     viewRootLNode = lView.node;
   }
 
-  ngDevMode && assertNodeType(viewRootLNode, LNodeType.Element);
+  ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
   ngDevMode && assertNotNull(viewRootLNode.data, 'node.data');
 
   return viewRootLNode as LElementNode;
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 1775469c51..4608572a15 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -16,10 +16,10 @@ import {LView, TData, TView} from './view';
 
 
 /**
- * LNodeType corresponds to the LNode.type property. It contains information
+ * TNodeType corresponds to the TNode.type property. It contains information
  * on how to map a particular set of bits in LNode.flags to the node type.
  */
-export const enum LNodeType {
+export const enum TNodeType {
   Container = 0b00,
   Projection = 0b01,
   View = 0b10,
@@ -58,9 +58,6 @@ export const enum TNodeFlags {
  * instructions.
  */
 export interface LNode {
-  /** The type of the node (see LNodeFlags) */
-  type: LNodeType;
-
   /**
    * The associated DOM node. Storing this allows us to:
    *  - append children to their element parents in the DOM (e.g. `parent.native.appendChild(...)`)
@@ -121,7 +118,7 @@ export interface LNode {
   tNode: TNode;
 
   /**
-   * A pointer to a LContainerNode created by directives requesting ViewContainerRef
+   * A pointer to an LContainerNode created by directives requesting ViewContainerRef
    */
   // TODO(kara): Remove when removing LNodes
   dynamicLContainerNode: LContainerNode|null;
@@ -206,6 +203,9 @@ export interface LProjectionNode extends LNode {
  * see: https://en.wikipedia.org/wiki/Flyweight_pattern for more on the Flyweight pattern
  */
 export interface TNode {
+  /** The type of the TNode. See TNodeType. */
+  type: TNodeType;
+
   /**
    * Index of the TNode in TView.data and corresponding LNode in LView.data.
    *
@@ -311,7 +311,7 @@ export interface TNode {
   next: TNode|null;
 
   /**
-   * A pointer to a LContainerNode created by directives requesting ViewContainerRef
+   * A pointer to a TContainerNode created by directives requesting ViewContainerRef
    */
   dynamicContainerNode: TNode|null;
 }
diff --git a/packages/core/src/render3/node_assert.ts b/packages/core/src/render3/node_assert.ts
index b6200a4ad8..73bf9b6997 100644
--- a/packages/core/src/render3/node_assert.ts
+++ b/packages/core/src/render3/node_assert.ts
@@ -7,23 +7,23 @@
  */
 
 import {assertEqual, assertNotNull} from './assert';
-import {LNode, LNodeType} from './interfaces/node';
+import {LNode, TNodeType} from './interfaces/node';
 
-export function assertNodeType(node: LNode, type: LNodeType) {
+export function assertNodeType(node: LNode, type: TNodeType) {
   assertNotNull(node, 'should be called with a node');
-  assertEqual(node.type, type, `should be a ${typeName(type)}`);
+  assertEqual(node.tNode.type, type, `should be a ${typeName(type)}`);
 }
 
-export function assertNodeOfPossibleTypes(node: LNode, ...types: LNodeType[]) {
+export function assertNodeOfPossibleTypes(node: LNode, ...types: TNodeType[]) {
   assertNotNull(node, 'should be called with a node');
-  const found = types.some(type => node.type === type);
+  const found = types.some(type => node.tNode.type === type);
   assertEqual(found, true, `Should be one of ${types.map(typeName).join(', ')}`);
 }
 
-function typeName(type: LNodeType): string {
-  if (type == LNodeType.Projection) return 'Projection';
-  if (type == LNodeType.Container) return 'Container';
-  if (type == LNodeType.View) return 'View';
-  if (type == LNodeType.Element) return 'Element';
+function typeName(type: TNodeType): string {
+  if (type == TNodeType.Projection) return 'Projection';
+  if (type == TNodeType.Container) return 'Container';
+  if (type == TNodeType.View) return 'View';
+  if (type == TNodeType.Element) return 'Element';
   return '<unknown>';
 }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 8a797bfb4e..b1a5b3fa17 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -9,7 +9,7 @@
 import {assertNotNull} from './assert';
 import {callHooks} from './hooks';
 import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, LNodeType, LProjectionNode, LTextNode, LViewNode, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {HookData, LView, LViewOrLContainer, TView, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
@@ -35,7 +35,7 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
   while (currentNode && currentNode !== stopNode) {
     let pNextOrParent = currentNode.pNextOrParent;
     if (pNextOrParent) {
-      while (pNextOrParent.type !== LNodeType.Projection) {
+      while (pNextOrParent.tNode.type !== TNodeType.Projection) {
         const nativeNode = findFirstRNode(pNextOrParent);
         if (nativeNode) {
           return nativeNode;
@@ -55,8 +55,8 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
       const parentNode = currentNode.parent;
       currentNode = null;
       if (parentNode) {
-        const parentType = parentNode.type;
-        if (parentType === LNodeType.Container || parentType === LNodeType.View) {
+        const parentType = parentNode.tNode.type;
+        if (parentType === TNodeType.Container || parentType === TNodeType.View) {
           currentNode = parentNode;
         }
       }
@@ -68,7 +68,7 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
 /** Retrieves the sibling node for the given node. */
 export function getNextLNode(node: LNode): LNode|null {
   // View nodes don't have TNodes, so their next must be retrieved through their LView.
-  if (node.type === LNodeType.View) {
+  if (node.tNode.type === TNodeType.View) {
     const lView = node.data as LView;
     return lView.next ? (lView.next as LView).node : null;
   }
@@ -87,7 +87,7 @@ function getNextLNodeWithProjection(node: LNode): LNode|null {
 
   if (pNextOrParent) {
     // The node is projected
-    const isLastProjectedNode = pNextOrParent.type === LNodeType.Projection;
+    const isLastProjectedNode = pNextOrParent.tNode.type === TNodeType.Projection;
     // returns pNextOrParent if we are not at the end of the list, null otherwise
     return isLastProjectedNode ? null : pNextOrParent;
   }
@@ -132,16 +132,16 @@ function findFirstRNode(rootNode: LNode): RElement|RText|null {
   let node: LNode|null = rootNode;
   while (node) {
     let nextNode: LNode|null = null;
-    if (node.type === LNodeType.Element) {
+    if (node.tNode.type === TNodeType.Element) {
       // A LElementNode has a matching RNode in LElementNode.native
       return (node as LElementNode).native;
-    } else if (node.type === LNodeType.Container) {
+    } else if (node.tNode.type === TNodeType.Container) {
       const lContainerNode: LContainerNode = (node as LContainerNode);
       const childContainerData: LContainer = lContainerNode.dynamicLContainerNode ?
           lContainerNode.dynamicLContainerNode.data :
           lContainerNode.data;
       nextNode = childContainerData.views.length ? childContainerData.views[0].child : null;
-    } else if (node.type === LNodeType.Projection) {
+    } else if (node.tNode.type === TNodeType.Projection) {
       // For Projection look at the first projected node
       nextNode = (node as LProjectionNode).data.head;
     } else {
@@ -179,8 +179,8 @@ export function addRemoveViewFromContainer(
 export function addRemoveViewFromContainer(
     container: LContainerNode, rootNode: LViewNode, insertMode: boolean,
     beforeNode?: RNode | null): void {
-  ngDevMode && assertNodeType(container, LNodeType.Container);
-  ngDevMode && assertNodeType(rootNode, LNodeType.View);
+  ngDevMode && assertNodeType(container, TNodeType.Container);
+  ngDevMode && assertNodeType(rootNode, TNodeType.View);
   const parentNode = container.data.renderParent;
   const parent = parentNode ? parentNode.native : null;
   let node: LNode|null = rootNode.child;
@@ -188,7 +188,7 @@ export function addRemoveViewFromContainer(
     while (node) {
       let nextNode: LNode|null = null;
       const renderer = container.view.renderer;
-      if (node.type === LNodeType.Element) {
+      if (node.tNode.type === TNodeType.Element) {
         if (insertMode) {
           isProceduralRenderer(renderer) ?
               renderer.insertBefore(parent, node.native !, beforeNode as RNode | null) :
@@ -198,13 +198,13 @@ export function addRemoveViewFromContainer(
                                            parent.removeChild(node.native !);
         }
         nextNode = getNextLNode(node);
-      } else if (node.type === LNodeType.Container) {
+      } else if (node.tNode.type === TNodeType.Container) {
         // if we get to a container, it must be a root node of a view because we are only
         // propagating down into child views / containers and not child elements
         const childContainerData: LContainer = (node as LContainerNode).data;
         childContainerData.renderParent = parentNode;
         nextNode = childContainerData.views.length ? childContainerData.views[0].child : null;
-      } else if (node.type === LNodeType.Projection) {
+      } else if (node.tNode.type === TNodeType.Projection) {
         nextNode = (node as LProjectionNode).data.head;
       } else {
         nextNode = (node as LViewNode).child;
@@ -357,7 +357,7 @@ export function removeView(container: LContainerNode, removeIndex: number): LVie
  */
 export function getParentState(state: LViewOrLContainer, rootView: LView): LViewOrLContainer|null {
   let node;
-  if ((node = (state as LView) !.node) && node.type === LNodeType.View) {
+  if ((node = (state as LView) !.node) && node.tNode.type === TNodeType.View) {
     // if it's an embedded view, the state needs to go up to the container, in case the
     // container has a next
     return node.parent !.data as any;
@@ -429,7 +429,7 @@ function executePipeOnDestroys(view: LView): void {
  * @return boolean Whether the child element should be inserted.
  */
 export function canInsertNativeNode(parent: LNode, currentView: LView): boolean {
-  const parentIsElement = parent.type === LNodeType.Element;
+  const parentIsElement = parent.tNode.type === TNodeType.Element;
 
   return parentIsElement &&
       (parent.view !== currentView || parent.data === null /* Regular Element. */);
@@ -486,7 +486,7 @@ export function insertChild(node: LNode, currentView: LView): void {
 export function appendProjectedNode(
     node: LElementNode | LTextNode | LContainerNode, currentParent: LElementNode,
     currentView: LView): void {
-  if (node.type !== LNodeType.Container) {
+  if (node.tNode.type !== TNodeType.Container) {
     appendChild(currentParent, (node as LElementNode | LTextNode).native, currentView);
   } else {
     // The node we are adding is a Container and we are adding it to Element which
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 9ce14e241e..cc3bded98b 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -14,7 +14,7 @@ import {bloomAdd, bloomFindPossibleInjector, getOrCreateNodeInjector, injectAttr
 import {NgOnChangesFeature, PublicFeature, defineDirective, directiveInject, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, createLNode, createLView, createTView, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, load, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {LInjector} from '../../src/render3/interfaces/injector';
-import {LNodeType} from '../../src/render3/interfaces/node';
+import {TNodeType} from '../../src/render3/interfaces/node';
 import {LViewFlags} from '../../src/render3/interfaces/view';
 import {ViewRef} from '../../src/render3/view_ref';
 
@@ -1367,7 +1367,7 @@ describe('di', () => {
           createLView(-1, null !, createTView(null, null), null, null, LViewFlags.CheckAlways);
       const oldView = enterView(contentView, null !);
       try {
-        const parent = createLNode(0, LNodeType.Element, null, null, null, null);
+        const parent = createLNode(0, TNodeType.Element, null, null, null, null);
 
         // Simulate the situation where the previous parent is not initialized.
         // This happens on first bootstrap because we don't init existing values
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index e03deec396..638d73b58c 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -6,12 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TNode} from '../../src/render3/interfaces/node';
+import {TNode, TNodeType} from '../../src/render3/interfaces/node';
+
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags,} from '../../src/render3/interfaces/projection';
 import {getProjectAsAttrValue, isNodeMatchingSelectorList, isNodeMatchingSelector} from '../../src/render3/node_selector_matcher';
 
 function testLStaticData(tagName: string, attrs: string[] | null): TNode {
   return {
+    type: TNodeType.Element,
     index: 0,
     flags: 0, tagName, attrs,
     localNames: null,

From 609e6b97878f01f5aaac42d0121df5b34cdd9c2b Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 24 May 2018 13:13:51 -0700
Subject: [PATCH 091/582] refactor(ivy): move child from LNode to TNode
 (#24113)

PR Close #24113
---
 packages/core/src/render3/instructions.ts     | 17 +++----
 packages/core/src/render3/interfaces/node.ts  | 47 ++++++++++++++-----
 .../core/src/render3/node_manipulation.ts     | 21 +++++++--
 .../bundling/todo/bundle.golden_symbols.json  |  3 ++
 .../render3/node_selector_matcher_spec.ts     |  1 +
 5 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index d1196f92ca..0a23c5b424 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -17,7 +17,7 @@ import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TDat
 
 import {LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
-import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode} from './node_manipulation';
+import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
@@ -344,7 +344,6 @@ export function createLNodeObject(
     native: native as any,
     view: currentView,
     parent: parent as any,
-    child: null,
     nodeInjector: parent ? parent.nodeInjector : null,
     data: state,
     queries: queries,
@@ -414,15 +413,10 @@ export function createLNode(
     // Now link ourselves into the tree.
     if (isParent) {
       currentQueries = null;
-      if (previousOrParentNode.view === currentView ||
+      if (previousOrParentNode.tNode.child == null && previousOrParentNode.view === currentView ||
           previousOrParentNode.tNode.type === TNodeType.View) {
         // We are in the same view, which means we are adding content node to the parent View.
-        ngDevMode && assertNull(
-                         previousOrParentNode.child,
-                         `previousOrParentNode's child should not have been set.`);
-        previousOrParentNode.child = node;
-      } else {
-        // We are adding component view, so we don't link parent node child to this node.
+        previousOrParentNode.tNode.child = node.tNode;
       }
     }
   }
@@ -1063,6 +1057,7 @@ export function createTNode(
     outputs: undefined,
     tViews: tViews,
     next: null,
+    child: null,
     dynamicContainerNode: null
   };
 }
@@ -1699,7 +1694,7 @@ export function embeddedViewEnd(): void {
 function setRenderParentInProjectedNodes(
     renderParent: LElementNode | null, viewNode: LViewNode): void {
   if (renderParent != null) {
-    let node: LNode|null = viewNode.child;
+    let node: LNode|null = getChildLNode(viewNode);
     while (node) {
       if (node.tNode.type === TNodeType.Projection) {
         let nodeToProject: LNode|null = (node as LProjectionNode).data.head;
@@ -1776,7 +1771,7 @@ export function projectionDef(
   }
 
   const componentNode: LElementNode = findComponentHost(currentView);
-  let componentChild: LNode|null = componentNode.child;
+  let componentChild: LNode|null = getChildLNode(componentNode);
 
   while (componentChild !== null) {
     // execute selector matching logic if and only if:
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 4608572a15..0701f960eb 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -71,11 +71,6 @@ export interface LNode {
    */
   readonly parent: LNode|null;
 
-  /**
-   * First child of the current node.
-   */
-  child: LNode|null;
-
   /**
    * If regular LElementNode, then `data` will be null.
    * If LElementNode with component, then `data` contains LView.
@@ -130,8 +125,6 @@ export interface LElementNode extends LNode {
   /** The DOM element associated with this node. */
   readonly native: RElement;
 
-  child: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
-
   /** If Component then data has LView (light DOM) */
   readonly data: LView|null;
 
@@ -143,7 +136,6 @@ export interface LElementNode extends LNode {
 export interface LTextNode extends LNode {
   /** The text node associated with this node. */
   native: RText;
-  child: null;
 
   /** LTextNodes can be inside LElementNodes or inside LViewNodes. */
   readonly parent: LElementNode|LViewNode;
@@ -154,7 +146,6 @@ export interface LTextNode extends LNode {
 /** Abstract node which contains root nodes of a view. */
 export interface LViewNode extends LNode {
   readonly native: null;
-  child: LContainerNode|LElementNode|LTextNode|LProjectionNode|null;
 
   /**  LViewNodes can only be added to LContainerNodes. */
   readonly parent: LContainerNode|null;
@@ -173,7 +164,6 @@ export interface LContainerNode extends LNode {
    */
   native: RElement|RText|null|undefined;
   readonly data: LContainer;
-  child: null;
 
   /** Containers can be added to elements or views. */
   readonly parent: LElementNode|LViewNode|null;
@@ -182,7 +172,6 @@ export interface LContainerNode extends LNode {
 
 export interface LProjectionNode extends LNode {
   readonly native: null;
-  child: null;
 
   readonly data: LProjection;
 
@@ -310,6 +299,14 @@ export interface TNode {
    */
   next: TNode|null;
 
+  /**
+   * First child of the current node.
+   *
+   * For component nodes, the child will always be a ContentChild (in same view).
+   * For embedded view nodes, the child will be in their child view.
+   */
+  child: TNode|null;
+
   /**
    * A pointer to a TContainerNode created by directives requesting ViewContainerRef
    */
@@ -317,10 +314,34 @@ export interface TNode {
 }
 
 /** Static data for an LElementNode  */
-export interface TElementNode extends TNode { tViews: null; }
+export interface TElementNode extends TNode {
+  child: TContainerNode|TElementNode|TProjectionNode|null;
+  tViews: null;
+}
+
+/** Static data for an LTextNode  */
+export interface TTextNode extends TNode {
+  child: null;
+  tViews: null;
+}
 
 /** Static data for an LContainerNode */
-export interface TContainerNode extends TNode { tViews: TView|TView[]|null; }
+export interface TContainerNode extends TNode {
+  child: null;
+  tViews: TView|TView[]|null;
+}
+
+/** Static data for an LViewNode  */
+export interface TViewNode extends TNode {
+  child: TContainerNode|TElementNode|TProjectionNode|null;
+  tViews: null;
+}
+
+/** Static data for an LProjectionNode  */
+export interface TProjectionNode extends TNode {
+  child: null;
+  tViews: null;
+}
 
 /**
  * This mapping is necessary so we can set input properties and output listeners
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index b1a5b3fa17..3ae554dd92 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -75,6 +75,15 @@ export function getNextLNode(node: LNode): LNode|null {
   return node.tNode.next ? node.view.data[node.tNode.next !.index as number] : null;
 }
 
+/** Retrieves the first child of a given node */
+export function getChildLNode(node: LNode): LNode|null {
+  if (node.tNode.child) {
+    const view = node.tNode.type === TNodeType.View ? node.data as LView : node.view;
+    return view.data[node.tNode.child.index as number];
+  }
+  return null;
+}
+
 /**
  * Get the next node in the LNode tree, taking into account the place where a node is
  * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
@@ -140,13 +149,14 @@ function findFirstRNode(rootNode: LNode): RElement|RText|null {
       const childContainerData: LContainer = lContainerNode.dynamicLContainerNode ?
           lContainerNode.dynamicLContainerNode.data :
           lContainerNode.data;
-      nextNode = childContainerData.views.length ? childContainerData.views[0].child : null;
+      nextNode =
+          childContainerData.views.length ? getChildLNode(childContainerData.views[0]) : null;
     } else if (node.tNode.type === TNodeType.Projection) {
       // For Projection look at the first projected node
       nextNode = (node as LProjectionNode).data.head;
     } else {
       // Otherwise look at the first child
-      nextNode = (node as LViewNode).child;
+      nextNode = getChildLNode(node as LViewNode);
     }
 
     node = nextNode === null ? getNextOrParentSiblingNode(node, rootNode) : nextNode;
@@ -183,7 +193,7 @@ export function addRemoveViewFromContainer(
   ngDevMode && assertNodeType(rootNode, TNodeType.View);
   const parentNode = container.data.renderParent;
   const parent = parentNode ? parentNode.native : null;
-  let node: LNode|null = rootNode.child;
+  let node: LNode|null = getChildLNode(rootNode);
   if (parent) {
     while (node) {
       let nextNode: LNode|null = null;
@@ -203,11 +213,12 @@ export function addRemoveViewFromContainer(
         // propagating down into child views / containers and not child elements
         const childContainerData: LContainer = (node as LContainerNode).data;
         childContainerData.renderParent = parentNode;
-        nextNode = childContainerData.views.length ? childContainerData.views[0].child : null;
+        nextNode =
+            childContainerData.views.length ? getChildLNode(childContainerData.views[0]) : null;
       } else if (node.tNode.type === TNodeType.Projection) {
         nextNode = (node as LProjectionNode).data.head;
       } else {
-        nextNode = (node as LViewNode).child;
+        nextNode = getChildLNode(node as LViewNode);
       }
       if (nextNode === null) {
         node = getNextOrParentSiblingNode(node, rootNode);
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 2a9c789e3d..7cdd8fb784 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -383,6 +383,9 @@
   {
     "name": "generatePropertyAliases"
   },
+  {
+    "name": "getChildLNode"
+  },
   {
     "name": "getCurrentSanitizer"
   },
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 638d73b58c..d98944e264 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -22,6 +22,7 @@ function testLStaticData(tagName: string, attrs: string[] | null): TNode {
     outputs: undefined,
     tViews: null,
     next: null,
+    child: null,
     dynamicContainerNode: null
   };
 }

From 186118e684b7e7b95c84a099b7fdaae5a833425e Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Thu, 24 May 2018 09:50:03 -0700
Subject: [PATCH 092/582] docs(aio): remove outdated rangle link (#24108) PR
 Close #24108

---
 aio/content/marketing/resources.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 52d56d6f1f..264fd0c3eb 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -528,13 +528,6 @@
             "title": "Pluralsight",
             "url": "https://www.pluralsight.com/search?q=angular+2&categories=all"
           },
-          "ab": {
-            "desc": "Take this introduction to Angular course, to learn the fundamentals in just two days, free of charge.",
-            "logo": "",
-            "rev": true,
-            "title": "Rangle.io",
-            "url": "https://rangle.io/services/javascript-training/training-angular1-angular2-with-ngupgrade/"
-          },
           "ab3": {
             "desc": "Angular courses hosted by  Udemy",
             "logo": "",

From 01b5acd7cff198c60cb6ab5735e0eea1fcb08be9 Mon Sep 17 00:00:00 2001
From: alexzuza <alexzuza@yandex.ru>
Date: Thu, 24 May 2018 01:07:09 +0400
Subject: [PATCH 093/582] fix(compiler): generate core-compliant hostBindings
 property (#24087)

This makes `hostBindings` code, generated by compiler and used in core package, identical.

Fix #24013

PR Close #24087
---
 packages/compiler/src/render3/r3_identifiers.ts             | 1 +
 packages/compiler/src/render3/view/compiler.ts              | 6 +++---
 .../compiler/test/render3/r3_compiler_compliance_spec.ts    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 80db996ec2..599ec956d8 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -65,6 +65,7 @@ export class Identifiers {
   static pipeBindV: o.ExternalReference = {name: 'ɵpbV', moduleName: CORE};
 
   static load: o.ExternalReference = {name: 'ɵld', moduleName: CORE};
+  static loadDirective: o.ExternalReference = {name: 'ɵd', moduleName: CORE};
 
   static pipe: o.ExternalReference = {name: 'ɵPp', moduleName: CORE};
 
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index c43bbec1f2..6075ef0591 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -359,8 +359,8 @@ function createHostBindingsFunction(
   for (let index = 0; index < meta.queries.length; index++) {
     const query = meta.queries[index];
 
-    // e.g. r3.qR(tmp = r3.ld(dirIndex)[1]) && (r3.ld(dirIndex)[0].someDir = tmp);
-    const getDirectiveMemory = o.importExpr(R3.load).callFn([o.variable('dirIndex')]);
+    // e.g. r3.qR(tmp = r3.d(dirIndex)[1]) && (r3.d(dirIndex)[0].someDir = tmp);
+    const getDirectiveMemory = o.importExpr(R3.loadDirective).callFn([o.variable('dirIndex')]);
     // The query list is at the query index + 1 because the directive itself is in slot 0.
     const getQueryList = getDirectiveMemory.key(o.literal(index + 1));
     const assignToTemporary = temporary().set(getQueryList);
@@ -376,7 +376,7 @@ function createHostBindingsFunction(
 
   // Calculate the host property bindings
   const bindings = bindingParser.createBoundHostProperties(directiveSummary, hostBindingSourceSpan);
-  const bindingContext = o.importExpr(R3.load).callFn([o.variable('dirIndex')]);
+  const bindingContext = o.importExpr(R3.loadDirective).callFn([o.variable('dirIndex')]);
   if (bindings) {
     for (const binding of bindings) {
       const bindingExpr = convertPropertyBinding(
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index fdea13d17a..8dd56318ab 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -291,7 +291,7 @@ describe('compiler compliance', () => {
           factory: function HostBindingDir_Factory() { return new HostBindingDir(); },
           hostBindings: function HostBindingDir_HostBindings(
               dirIndex: $number$, elIndex: $number$) {
-            $r3$.ɵp(elIndex, 'id', $r3$.ɵb($r3$.ɵld(dirIndex).dirId));
+            $r3$.ɵp(elIndex, 'id', $r3$.ɵb($r3$.ɵd(dirIndex).dirId));
           }
         });
       `;
@@ -823,7 +823,7 @@ describe('compiler compliance', () => {
             hostBindings: function ContentQueryComponent_HostBindings(
                 dirIndex: $number$, elIndex: $number$) {
               var $tmp$: $any$;
-              ($r3$.ɵqR(($tmp$ = $r3$.ɵld(dirIndex)[1])) && ($r3$.ɵld(dirIndex)[0].someDir = $tmp$.first));
+              ($r3$.ɵqR(($tmp$ = $r3$.ɵd(dirIndex)[1])) && ($r3$.ɵd(dirIndex)[0].someDir = $tmp$.first));
             },
             template: function ContentQueryComponent_Template(
                 rf: $RenderFlags$, ctx: $ContentQueryComponent$) {

From 36cc72ee5beb97c2e992f938f515d70dcf92ad39 Mon Sep 17 00:00:00 2001
From: Juri <juri.strumpflohner@gmail.com>
Date: Wed, 23 May 2018 23:06:02 +0200
Subject: [PATCH 094/582] docs(aio): add Juri Strumpflohner to GDE resources
 (#24086)

PR Close #24086
---
 aio/content/images/bios/juristr.jpg     | Bin 0 -> 212126 bytes
 aio/content/marketing/contributors.json |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 aio/content/images/bios/juristr.jpg

diff --git a/aio/content/images/bios/juristr.jpg b/aio/content/images/bios/juristr.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..be3df97e0174aa78a78ac7309cf0adbd3e62ae9f
GIT binary patch
literal 212126
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
TMjk5?=6$m+Klc-SdG~(+zG+u#

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 99c88b9251..8823376274 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -618,5 +618,14 @@
     "website": "https://mhartington.io",
     "bio": "Mike is a Developer Advocate for the Ionic Framework and a GDE in Angular. He spends most of his time making fast PWAs and exploring emerging web standards. When not behind a keyboard, you'll probably find him with a guitar and beer.",
     "group": "GDE"
+  },
+
+  "juristr": {
+    "name": "Juri Strumpflohner",
+    "picture": "juristr.png",
+    "twitter": "juristr",
+    "website": "https://juristr.com",
+    "bio": "Juri is a software engineer and freelance trainer and consultant currently mostly focusing on the frontend side using JavaScript, TypeScript and Angular. He has a passion for teaching and sharing his knowledge and experiences with others. This mostly happens by writing tech articles for his personal blog, by creating video courses for Egghead.io, during on-site workshops at companies or by speaking at conferences. In his free time he enjoys practicing Yoseikan Budo, a martial art where he currently owns the 3rd DAN black belt.",
+    "group": "GDE"
   }
 }

From 3e39fef27400dd96e01d4adf4dab96f117b68f58 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 23 May 2018 17:19:30 +0300
Subject: [PATCH 095/582] refactor(aio): improve logging output in
 `update-preview-server.sh` (#24071)

PR Close #24071
---
 aio/aio-builds-setup/scripts/update-preview-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/aio-builds-setup/scripts/update-preview-server.sh b/aio/aio-builds-setup/scripts/update-preview-server.sh
index 42c9ec6029..aa341c4282 100755
--- a/aio/aio-builds-setup/scripts/update-preview-server.sh
+++ b/aio/aio-builds-setup/scripts/update-preview-server.sh
@@ -3,7 +3,7 @@
 set -eux -o pipefail
 exec 3>&1
 
-echo "\n\n[`date`] - Updating the preview server..."
+echo -e "\n\n[`date`] - Updating the preview server..."
 
 # Input
 readonly HOST_REPO_DIR=$1

From 83bb5d19226b1307d413ab9af7f7b5a1e178422b Mon Sep 17 00:00:00 2001
From: Tiago Temporin <tiaguinhocab@gmail.com>
Date: Tue, 22 May 2018 06:44:12 +0100
Subject: [PATCH 096/582] docs(aio): add material community components (#24042)

PR Close #24042
---
 aio/content/marketing/resources.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 264fd0c3eb..f8423a78ae 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -345,6 +345,13 @@
             "title": "Angular Material",
             "url": "https://github.com/angular/material2"
           },
+          "mcc": {
+            "desc": "Material components made by the community",
+            "logo": "",
+            "rev": true,
+            "title": "Material Community Components",
+            "url": "https://github.com/tiaguinho/material-community-components"
+          },
           "ngzorro": {
             "desc": "A set of enterprise-class UI components based on Ant Design and Angular",
             "rev": true,

From 4f36340de7d2c7a4cbeeaaa0a31fc9999de7a159 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 21 May 2018 15:59:25 -0700
Subject: [PATCH 097/582] feat(ivy): add support for short-circuiting (#24039)

Short-circuitable expressions (using ternary & binary operators) could not use
the regular binding mechanism as it relies on the bindings being checked every
single time - the index is incremented as part of checking the bindings.

Then for pure function kind of bindings we use a different mechanism with a
fixed index. As such short circuiting a binding check does not mess with the
expected binding index.

Note that all pure function bindings are handled the same wether or not they
actually are short-circuitable. This allows to keep the compiler and compiled
code simple - and there is no runtime perf cost anyway.

PR Close #24039
---
 .../compiler/src/render3/r3_identifiers.ts    |   3 +
 .../compiler/src/render3/view/template.ts     |  41 ++++--
 .../render3/r3_compiler_compliance_spec.ts    |  69 +++++++++-
 .../core/src/core_render3_private_export.ts   |   1 +
 packages/core/src/render3/index.ts            |   2 +
 packages/core/src/render3/instructions.ts     |  69 +++++++++-
 packages/core/src/render3/pipe.ts             |  32 +++--
 packages/core/src/render3/pure_function.ts    | 122 +++++++++++++-----
 .../component_directives_spec.ts              |  24 ++--
 .../render3/compiler_canonical/pipes_spec.ts  |  13 +-
 packages/core/test/render3/pipe_spec.ts       |  39 ++++--
 .../core/test/render3/pure_function_spec.ts   |  48 ++++---
 .../test/render3/view_container_ref_spec.ts   |  15 ++-
 13 files changed, 362 insertions(+), 116 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 599ec956d8..b9bf96b0d3 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -121,4 +121,7 @@ export class Identifiers {
   static NgOnChangesFeature: o.ExternalReference = {name: 'ɵNgOnChangesFeature', moduleName: CORE};
 
   static listener: o.ExternalReference = {name: 'ɵL', moduleName: CORE};
+
+  // Reserve slots for pure functions
+  static reserveSlots: o.ExternalReference = {name: 'ɵrS', moduleName: CORE};
 }
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 91e2f4b8b9..c6dbadfe54 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -57,6 +57,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   // Maps of placeholder to node indexes for each of the i18n section
   private _phToNodeIdxes: {[phName: string]: number[]}[] = [{}];
 
+  // Number of slots to reserve for pureFunctions
+  private _pureFunctionSlots = 0;
+
   constructor(
       private constantPool: ConstantPool, private contextParameter: string,
       parentBindingScope: BindingScope, private level = 0, private contextName: string|null,
@@ -70,6 +73,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
         });
     this._valueConverter = new ValueConverter(
         constantPool, () => this.allocateDataSlot(),
+        (numSlots: number): number => this._pureFunctionSlots += numSlots,
         (name, localName, slot, value: o.ReadVarExpr) => {
           const pipeType = pipeTypeByName.get(name);
           if (pipeType) {
@@ -139,6 +143,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     t.visitAll(this, nodes);
 
+    if (this._pureFunctionSlots > 0) {
+      this.instruction(
+          this._creationCode, null, R3.reserveSlots, o.literal(this._pureFunctionSlots));
+    }
+
     const creationCode = this._creationCode.length > 0 ?
         [o.ifStmt(
             o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(core.RenderFlags.Create), null, false),
@@ -501,6 +510,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 class ValueConverter extends AstMemoryEfficientTransformer {
   constructor(
       private constantPool: ConstantPool, private allocateSlot: () => number,
+      private allocatePureFunctionSlots: (numSlots: number) => number,
       private definePipe:
           (name: string, localName: string, slot: number, value: o.Expression) => void) {
     super();
@@ -511,14 +521,20 @@ class ValueConverter extends AstMemoryEfficientTransformer {
     // Allocate a slot to create the pipe
     const slot = this.allocateSlot();
     const slotPseudoLocal = `PIPE:${slot}`;
+    // Allocate one slot for the result plus one slot per pipe argument
+    const pureFunctionSlot = this.allocatePureFunctionSlots(2 + pipe.args.length);
     const target = new PropertyRead(pipe.span, new ImplicitReceiver(pipe.span), slotPseudoLocal);
     const bindingId = pipeBinding(pipe.args);
     this.definePipe(pipe.name, slotPseudoLocal, slot, o.importExpr(bindingId));
     const value = pipe.exp.visit(this);
     const args = this.visitAll(pipe.args);
 
-    return new FunctionCall(
-        pipe.span, target, [new LiteralPrimitive(pipe.span, slot), value, ...args]);
+    return new FunctionCall(pipe.span, target, [
+      new LiteralPrimitive(pipe.span, slot),
+      new LiteralPrimitive(pipe.span, pureFunctionSlot),
+      value,
+      ...args,
+    ]);
   }
 
   visitLiteralArray(array: LiteralArray, context: any): AST {
@@ -527,8 +543,9 @@ class ValueConverter extends AstMemoryEfficientTransformer {
       // calls to literal factories that compose the literal and will cache intermediate
       // values. Otherwise, just return an literal array that contains the values.
       const literal = o.literalArr(values);
-      return values.every(a => a.isConstant()) ? this.constantPool.getConstLiteral(literal, true) :
-                                                 getLiteralFactory(this.constantPool, literal);
+      return values.every(a => a.isConstant()) ?
+          this.constantPool.getConstLiteral(literal, true) :
+          getLiteralFactory(this.constantPool, literal, this.allocatePureFunctionSlots);
     });
   }
 
@@ -539,14 +556,13 @@ class ValueConverter extends AstMemoryEfficientTransformer {
       // values. Otherwise, just return an literal array that contains the values.
       const literal = o.literalMap(values.map(
           (value, index) => ({key: map.keys[index].key, value, quoted: map.keys[index].quoted})));
-      return values.every(a => a.isConstant()) ? this.constantPool.getConstLiteral(literal, true) :
-                                                 getLiteralFactory(this.constantPool, literal);
+      return values.every(a => a.isConstant()) ?
+          this.constantPool.getConstLiteral(literal, true) :
+          getLiteralFactory(this.constantPool, literal, this.allocatePureFunctionSlots);
     });
   }
 }
 
-
-
 // Pipes always have at least one parameter, the value they operate on
 const pipeBindingIdentifiers = [R3.pipeBind1, R3.pipeBind2, R3.pipeBind3, R3.pipeBind4];
 
@@ -559,15 +575,20 @@ const pureFunctionIdentifiers = [
   R3.pureFunction5, R3.pureFunction6, R3.pureFunction7, R3.pureFunction8
 ];
 function getLiteralFactory(
-    constantPool: ConstantPool, literal: o.LiteralArrayExpr | o.LiteralMapExpr): o.Expression {
+    constantPool: ConstantPool, literal: o.LiteralArrayExpr | o.LiteralMapExpr,
+    allocateSlots: (numSlots: number) => number): o.Expression {
   const {literalFactory, literalFactoryArguments} = constantPool.getLiteralFactory(literal);
+  // Allocate 1 slot for the result plus 1 per argument
+  const startSlot = allocateSlots(1 + literalFactoryArguments.length);
   literalFactoryArguments.length > 0 || error(`Expected arguments to a literal factory function`);
   let pureFunctionIdent =
       pureFunctionIdentifiers[literalFactoryArguments.length] || R3.pureFunctionV;
 
   // Literal factories are pure functions that only need to be re-invoked when the parameters
   // change.
-  return o.importExpr(pureFunctionIdent).callFn([literalFactory, ...literalFactoryArguments]);
+  return o.importExpr(pureFunctionIdent).callFn([
+    o.literal(startSlot), literalFactory, ...literalFactoryArguments
+  ]);
 }
 
 /**
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 8dd56318ab..127de2a3b4 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -107,6 +107,57 @@ describe('compiler compliance', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
+    it('should reserve slots for pure functions', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+
+              @Component({
+                selector: 'my-component',
+                template: \`<div
+                  [ternary]="cond ? [a] : [0]"
+                  [pipe]="value | pipe:1:2"
+                  [and]="cond && [b]"
+                  [or]="cond || [c]"
+                ></div>\`
+              })
+              export class MyComponent {
+                id = 'one';
+              }
+
+              @NgModule({declarations: [MyComponent]})
+              export class MyModule {}
+          `
+        }
+      };
+
+      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
+      const template = `
+        …
+        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵPp(1,'pipe');
+            $r3$.ɵe();
+            $r3$.ɵrS(10);
+          }
+          if (rf & 2) {
+            $r3$.ɵp(0, 'ternary', $r3$.ɵb((ctx.cond ? $r3$.ɵf1(2, _c0, ctx.a): _c1)));
+            $r3$.ɵp(0, 'pipe', $r3$.ɵb($r3$.ɵpb3(6, 1, ctx.value, 1, 2)));
+            $r3$.ɵp(0, 'and', $r3$.ɵb((ctx.cond && $r3$.ɵf1(4, _c0, ctx.b))));
+            $r3$.ɵp(0, 'or', $r3$.ɵb((ctx.cond || $r3$.ɵf1(6, _c0, ctx.c))));
+          }
+        }
+      `;
+
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, factory, 'Incorrect factory');
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+
     it('should bind to class and style names', () => {
       const files = {
         app: {
@@ -415,9 +466,10 @@ describe('compiler compliance', () => {
               if (rf & 1) {
                 $r3$.ɵE(0, 'my-comp');
                 $r3$.ɵe();
+                $r3$.ɵrS(2);
               }
               if (rf & 2) {
-                $r3$.ɵp(0, 'names', $r3$.ɵb($r3$.ɵf1($e0_ff$, ctx.customName)));
+                $r3$.ɵp(0, 'names', $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.customName)));
               }
             },
            directives: [MyComp]
@@ -494,11 +546,12 @@ describe('compiler compliance', () => {
               if (rf & 1) {
                 $r3$.ɵE(0, 'my-comp');
                 $r3$.ɵe();
+                $r3$.ɵrS(10);
               }
               if (rf & 2) {
                 $r3$.ɵp(
                     0, 'names',
-                    $r3$.ɵb($r3$.ɵfV($e0_ff$, ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8)));
+                    $r3$.ɵb($r3$.ɵfV(10, $e0_ff$, ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8)));
               }
             },
             directives: [MyComp]
@@ -555,9 +608,10 @@ describe('compiler compliance', () => {
               if (rf & 1) {
                 $r3$.ɵE(0, 'object-comp');
                 $r3$.ɵe();
+                $r3$.ɵrS(2);
               }
               if (rf & 2) {
-                $r3$.ɵp(0, 'config', $r3$.ɵb($r3$.ɵf1($e0_ff$, ctx.name)));
+                $r3$.ɵp(0, 'config', $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.name)));
               }
             },
             directives: [ObjectComp]
@@ -620,12 +674,12 @@ describe('compiler compliance', () => {
               if (rf & 1) {
                 $r3$.ɵE(0, 'nested-comp');
                 $r3$.ɵe();
+                $r3$.ɵrS(7);
               }
               if (rf & 2) {
                 $r3$.ɵp(
                     0, 'config',
-                    $r3$.ɵb($r3$.ɵf2(
-                        $e0_ff_2$, ctx.name, $r3$.ɵf1($e0_ff_1$, $r3$.ɵf1($e0_ff$, ctx.duration)))));
+                    $r3$.ɵb($r3$.ɵf2(7, $e0_ff_2$, ctx.name, $r3$.ɵf1(4, $e0_ff_1$, $r3$.ɵf1(2, $e0_ff$, ctx.duration)))));
               }
             },
             directives: [NestedComp]
@@ -912,10 +966,11 @@ describe('compiler compliance', () => {
                   $r3$.ɵT(4);
                   $r3$.ɵPp(5, 'myPurePipe');
                   $r3$.ɵe();
+                  $r3$.ɵrS(9);
                 }
                 if (rf & 2) {
-                  $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, $r3$.ɵpb2(2,ctx.name, ctx.size), ctx.size), ''));
-                  $r3$.ɵt(4, $r3$.ɵi1('', $r3$.ɵpb2(5, ctx.name, ctx.size), ''));
+                  $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, 3, $r3$.ɵpb2(2, 6, ctx.name, ctx.size), ctx.size), ''));
+                  $r3$.ɵt(4, $r3$.ɵi1('', $r3$.ɵpb2(5, 9, ctx.name, ctx.size), ''));
                 }
               },
               pipes: [MyPurePipe, MyPipe]
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 136b4fd3e4..ff8c7449b4 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -65,6 +65,7 @@ export {
   e as ɵe,
   p as ɵp,
   pD as ɵpD,
+  rS as ɵrS,
   a as ɵa,
   s as ɵs,
   sn as ɵsn,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index ea2206fa10..421b421364 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -64,6 +64,8 @@ export {
   text as T,
   textBinding as t,
 
+  reserveSlots as rS,
+
   embeddedViewStart as V,
   embeddedViewEnd as v,
   detectChanges,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 0a23c5b424..345e8730dd 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1446,12 +1446,10 @@ function generateInitialInputs(
   return initialInputData;
 }
 
-
 //////////////////////////
 //// ViewContainer & View
 //////////////////////////
 
-
 export function createLContainer(
     parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>): LContainer {
   ngDevMode && assertNotNull(parentLNode, 'containers should have a parent');
@@ -2146,6 +2144,57 @@ export function bind<T>(value: T | NO_CHANGE): T|NO_CHANGE {
   return changed ? value : NO_CHANGE;
 }
 
+/**
+ * Reserves slots for pure functions (`pureFunctionX` instructions)
+ *
+ * Binding for pure functions are store after the LNodes in the data array but before the binding.
+ *
+ *  ----------------------------------------------------------------------------
+ *  |  LNodes ... | pure function bindings | regular bindings / interpolations |
+ *  ----------------------------------------------------------------------------
+ *                                         ^
+ *                                         LView.bindingStartIndex
+ *
+ * Pure function instructions are given an offset from LView.bindingStartIndex.
+ * Subtracting the offset from LView.bindingStartIndex gives the first index where the bindings
+ * are stored.
+ *
+ * NOTE: reserveSlots instructions are only ever allowed at the very end of the creation block
+ */
+export function reserveSlots(numSlots: number) {
+  // Init the slots with a unique `NO_CHANGE` value so that the first change is always detected
+  // whether is happens or not during the first change detection pass - pure functions checks
+  // might be skipped when short-circuited.
+  data.length += numSlots;
+  data.fill(NO_CHANGE, -numSlots);
+  // We need to initialize the binding in case a `pureFunctionX` kind of binding instruction is
+  // called first in the update section.
+  initBindings();
+}
+
+/**
+ * Sets up the binding index before execute any `pureFunctionX` instructions.
+ *
+ * The index must be restored after the pure function is executed
+ *
+ * {@link reserveSlots}
+ */
+export function moveBindingIndexToReservedSlot(offset: number): number {
+  const currentSlot = currentView.bindingIndex;
+  currentView.bindingIndex = currentView.bindingStartIndex - offset;
+  return currentSlot;
+}
+
+/**
+ * Restores the binding index to the given value.
+ *
+ * This function is typically used to restore the index after a `pureFunctionX` has
+ * been executed.
+ */
+export function restoreBindingIndex(index: number): void {
+  currentView.bindingIndex = index;
+}
+
 /**
  * Create interpolation bindings with a variable number of expressions.
  *
@@ -2378,6 +2427,22 @@ function assertDataNext(index: number, arr?: any[]) {
       arr.length, index, `index ${index} expected to be at the end of arr (length ${arr.length})`);
 }
 
+/**
+ * On the first template pass the reserved slots should be set `NO_CHANGE`.
+ *
+ * If not they might not have been actually reserved.
+ */
+export function assertReservedSlotInitialized(slotOffset: number, numSlots: number) {
+  if (firstTemplatePass) {
+    const startIndex = currentView.bindingStartIndex - slotOffset;
+    for (let i = 0; i < numSlots; i++) {
+      assertEqual(
+          data[startIndex + i], NO_CHANGE,
+          'The reserved slots should be set to `NO_CHANGE` on first template pass');
+    }
+  }
+}
+
 export function _getComponentHostLElementNode<T>(component: T): LElementNode {
   ngDevMode && assertNotNull(component, 'expecting component got null');
   const lElementNode = (component as any)[NG_HOST_SYMBOL] as LElementNode;
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index c8f449148a..fd9031ca07 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -65,11 +65,12 @@ function getPipeDef(name: string, registry: PipeDefList | null): PipeDef<any> {
  * the pipe only when an input to the pipe changes.
  *
  * @param index Pipe index where the pipe was stored on creation.
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param v1 1st argument to {@link PipeTransform#transform}.
  */
-export function pipeBind1(index: number, v1: any): any {
+export function pipeBind1(index: number, slotOffset: number, v1: any): any {
   const pipeInstance = load<PipeTransform>(index);
-  return isPure(index) ? pureFunction1(pipeInstance.transform, v1, pipeInstance) :
+  return isPure(index) ? pureFunction1(slotOffset, pipeInstance.transform, v1, pipeInstance) :
                          pipeInstance.transform(v1);
 }
 
@@ -80,12 +81,13 @@ export function pipeBind1(index: number, v1: any): any {
  * the pipe only when an input to the pipe changes.
  *
  * @param index Pipe index where the pipe was stored on creation.
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param v1 1st argument to {@link PipeTransform#transform}.
  * @param v2 2nd argument to {@link PipeTransform#transform}.
  */
-export function pipeBind2(index: number, v1: any, v2: any): any {
+export function pipeBind2(index: number, slotOffset: number, v1: any, v2: any): any {
   const pipeInstance = load<PipeTransform>(index);
-  return isPure(index) ? pureFunction2(pipeInstance.transform, v1, v2, pipeInstance) :
+  return isPure(index) ? pureFunction2(slotOffset, pipeInstance.transform, v1, v2, pipeInstance) :
                          pipeInstance.transform(v1, v2);
 }
 
@@ -96,14 +98,16 @@ export function pipeBind2(index: number, v1: any, v2: any): any {
  * the pipe only when an input to the pipe changes.
  *
  * @param index Pipe index where the pipe was stored on creation.
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param v1 1st argument to {@link PipeTransform#transform}.
  * @param v2 2nd argument to {@link PipeTransform#transform}.
  * @param v3 4rd argument to {@link PipeTransform#transform}.
  */
-export function pipeBind3(index: number, v1: any, v2: any, v3: any): any {
+export function pipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any {
   const pipeInstance = load<PipeTransform>(index);
-  return isPure(index) ? pureFunction3(pipeInstance.transform, v1, v2, v3, pipeInstance) :
-                         pipeInstance.transform(v1, v2, v3);
+  return isPure(index) ?
+      pureFunction3(slotOffset, pipeInstance.transform, v1, v2, v3, pipeInstance) :
+      pipeInstance.transform(v1, v2, v3);
 }
 
 /**
@@ -113,15 +117,18 @@ export function pipeBind3(index: number, v1: any, v2: any, v3: any): any {
  * the pipe only when an input to the pipe changes.
  *
  * @param index Pipe index where the pipe was stored on creation.
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param v1 1st argument to {@link PipeTransform#transform}.
  * @param v2 2nd argument to {@link PipeTransform#transform}.
  * @param v3 3rd argument to {@link PipeTransform#transform}.
  * @param v4 4th argument to {@link PipeTransform#transform}.
  */
-export function pipeBind4(index: number, v1: any, v2: any, v3: any, v4: any): any {
+export function pipeBind4(
+    index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any {
   const pipeInstance = load<PipeTransform>(index);
-  return isPure(index) ? pureFunction4(pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
-                         pipeInstance.transform(v1, v2, v3, v4);
+  return isPure(index) ?
+      pureFunction4(slotOffset, pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
+      pipeInstance.transform(v1, v2, v3, v4);
 }
 
 /**
@@ -131,11 +138,12 @@ export function pipeBind4(index: number, v1: any, v2: any, v3: any, v4: any): an
  * the pipe only when an input to the pipe changes.
  *
  * @param index Pipe index where the pipe was stored on creation.
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param values Array of arguments to pass to {@link PipeTransform#transform} method.
  */
-export function pipeBindV(index: number, values: any[]): any {
+export function pipeBindV(index: number, slotOffset: number, values: any[]): any {
   const pipeInstance = load<PipeTransform>(index);
-  return isPure(index) ? pureFunctionV(pipeInstance.transform, values, pipeInstance) :
+  return isPure(index) ? pureFunctionV(slotOffset, pipeInstance.transform, values, pipeInstance) :
                          pipeInstance.transform.apply(pipeInstance, values);
 }
 
diff --git a/packages/core/src/render3/pure_function.ts b/packages/core/src/render3/pure_function.ts
index dad4424647..ecf5be9666 100644
--- a/packages/core/src/render3/pure_function.ts
+++ b/packages/core/src/render3/pure_function.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {bindingUpdated, bindingUpdated2, bindingUpdated4, checkAndUpdateBinding, consumeBinding, getCreationMode} from './instructions';
+import {assertReservedSlotInitialized, bindingUpdated, bindingUpdated2, bindingUpdated4, checkAndUpdateBinding, consumeBinding, getCreationMode, moveBindingIndexToReservedSlot, restoreBindingIndex} from './instructions';
 
 
 
@@ -15,92 +15,121 @@ import {bindingUpdated, bindingUpdated2, bindingUpdated4, checkAndUpdateBinding,
  * value. If it has been saved, returns the saved value.
  *
  * @param pureFn Function that returns a value
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param thisArg Optional calling context of pureFn
  * @returns value
  */
-export function pureFunction0<T>(pureFn: () => T, thisArg?: any): T {
-  return getCreationMode() ? checkAndUpdateBinding(thisArg ? pureFn.call(thisArg) : pureFn()) :
-                             consumeBinding();
+export function pureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 1);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
+  const value = getCreationMode() ?
+      checkAndUpdateBinding(thisArg ? pureFn.call(thisArg) : pureFn()) :
+      consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of the provided exp has changed, calls the pure function to return
  * an updated value. Or if the value has not changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn Function that returns an updated value
  * @param exp Updated expression value
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
-export function pureFunction1(pureFn: (v: any) => any, exp: any, thisArg?: any): any {
-  return bindingUpdated(exp) ?
+export function pureFunction1(
+    slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 2);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
+  const value = bindingUpdated(exp) ?
       checkAndUpdateBinding(thisArg ? pureFn.call(thisArg, exp) : pureFn(exp)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction2(
-    pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any {
-  return bindingUpdated2(exp1, exp2) ?
+    slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any,
+    thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 3);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
+  const value = bindingUpdated2(exp1, exp2) ?
       checkAndUpdateBinding(thisArg ? pureFn.call(thisArg, exp1, exp2) : pureFn(exp1, exp2)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
  * @param exp3
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction3(
-    pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any,
+    slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any,
     thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 4);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
   const different = bindingUpdated2(exp1, exp2);
-  return bindingUpdated(exp3) || different ?
+  const value = bindingUpdated(exp3) || different ?
       checkAndUpdateBinding(
           thisArg ? pureFn.call(thisArg, exp1, exp2, exp3) : pureFn(exp1, exp2, exp3)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
  * @param exp3
  * @param exp4
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction4(
-    pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any,
-    thisArg?: any): any {
-  return bindingUpdated4(exp1, exp2, exp3, exp4) ?
+    slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any,
+    exp3: any, exp4: any, thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 5);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
+  const value = bindingUpdated4(exp1, exp2, exp3, exp4) ?
       checkAndUpdateBinding(
           thisArg ? pureFn.call(thisArg, exp1, exp2, exp3, exp4) : pureFn(exp1, exp2, exp3, exp4)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
@@ -108,23 +137,28 @@ export function pureFunction4(
  * @param exp4
  * @param exp5
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction5(
-    pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any,
-    exp4: any, exp5: any, thisArg?: any): any {
+    slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any,
+    exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 6);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
   const different = bindingUpdated4(exp1, exp2, exp3, exp4);
-  return bindingUpdated(exp5) || different ?
+  const value = bindingUpdated(exp5) || different ?
       checkAndUpdateBinding(
           thisArg ? pureFn.call(thisArg, exp1, exp2, exp3, exp4, exp5) :
                     pureFn(exp1, exp2, exp3, exp4, exp5)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
@@ -133,23 +167,28 @@ export function pureFunction5(
  * @param exp5
  * @param exp6
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction6(
-    pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any,
-    exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any {
+    slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any,
+    exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 7);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
   const different = bindingUpdated4(exp1, exp2, exp3, exp4);
-  return bindingUpdated2(exp5, exp6) || different ?
+  const value = bindingUpdated2(exp5, exp6) || different ?
       checkAndUpdateBinding(
           thisArg ? pureFn.call(thisArg, exp1, exp2, exp3, exp4, exp5, exp6) :
                     pureFn(exp1, exp2, exp3, exp4, exp5, exp6)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
@@ -159,24 +198,30 @@ export function pureFunction6(
  * @param exp6
  * @param exp7
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction7(
+    slotOffset: number,
     pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any,
     exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 8);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
   let different = bindingUpdated4(exp1, exp2, exp3, exp4);
   different = bindingUpdated2(exp5, exp6) || different;
-  return bindingUpdated(exp7) || different ?
+  const value = bindingUpdated(exp7) || different ?
       checkAndUpdateBinding(
           thisArg ? pureFn.call(thisArg, exp1, exp2, exp3, exp4, exp5, exp6, exp7) :
                     pureFn(exp1, exp2, exp3, exp4, exp5, exp6, exp7)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn
  * @param exp1
  * @param exp2
@@ -187,18 +232,23 @@ export function pureFunction7(
  * @param exp7
  * @param exp8
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
 export function pureFunction8(
+    slotOffset: number,
     pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any,
     exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any,
     thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, 9);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
   const different = bindingUpdated4(exp1, exp2, exp3, exp4);
-  return bindingUpdated4(exp5, exp6, exp7, exp8) || different ?
+  const value = bindingUpdated4(exp5, exp6, exp7, exp8) || different ?
       checkAndUpdateBinding(
           thisArg ? pureFn.call(thisArg, exp1, exp2, exp3, exp4, exp5, exp6, exp7, exp8) :
                     pureFn(exp1, exp2, exp3, exp4, exp5, exp6, exp7, exp8)) :
       consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
 
 /**
@@ -207,17 +257,23 @@ export function pureFunction8(
  * If the value of any provided exp has changed, calls the pure function to return
  * an updated value. Or if no values have changed, returns cached value.
  *
+ * @param slotOffset the offset in the reserved slot space {@link reserveSlots}
  * @param pureFn A pure function that takes binding values and builds an object or array
  * containing those values.
  * @param exps An array of binding values
  * @param thisArg Optional calling context of pureFn
- * @returns Updated value
+ * @returns Updated or cached value
  */
-export function pureFunctionV(pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any {
-  let different = false;
+export function pureFunctionV(
+    slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any {
+  ngDevMode && assertReservedSlotInitialized(slotOffset, exps.length + 1);
+  const index = moveBindingIndexToReservedSlot(slotOffset);
 
+  let different = false;
   for (let i = 0; i < exps.length; i++) {
     bindingUpdated(exps[i]) && (different = true);
   }
-  return different ? checkAndUpdateBinding(pureFn.apply(thisArg, exps)) : consumeBinding();
+  const value = different ? checkAndUpdateBinding(pureFn.apply(thisArg, exps)) : consumeBinding();
+  restoreBindingIndex(index);
+  return value;
 }
diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index 65a49ecec9..7c1e6a7845 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -502,9 +502,10 @@ describe('components & directives', () => {
             if (rf & 1) {
               $r3$.ɵE(0, 'my-array-comp');
               $r3$.ɵe();
+              $r3$.ɵrS(1);
             }
             if (rf & 2) {
-              $r3$.ɵp(0, 'names', $r3$.ɵb(ctx.someFn($r3$.ɵf0($e0_ff$))));
+              $r3$.ɵp(0, 'names', $r3$.ɵb(ctx.someFn($r3$.ɵf0(1, $e0_ff$))));
             }
           }
         });
@@ -563,9 +564,10 @@ describe('components & directives', () => {
             if (rf & 1) {
               $r3$.ɵE(0, 'my-comp');
               $r3$.ɵe();
+              $r3$.ɵrS(1);
             }
             if (rf & 2) {
-              $r3$.ɵp(0, 'num', $r3$.ɵb($r3$.ɵf0($e0_ff$).length + 1));
+              $r3$.ɵp(0, 'num', $r3$.ɵb($r3$.ɵf0(1, $e0_ff$).length + 1));
             }
           }
         });
@@ -606,9 +608,10 @@ describe('components & directives', () => {
             if (rf & 1) {
               $r3$.ɵE(0, 'my-array-comp');
               $r3$.ɵe();
+              $r3$.ɵrS(2);
             }
             if (rf & 2) {
-              $r3$.ɵp(0, 'names', $r3$.ɵb($r3$.ɵf1($e0_ff$, ctx.customName)));
+              $r3$.ɵp(0, 'names', $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.customName)));
             }
           }
         });
@@ -716,12 +719,13 @@ describe('components & directives', () => {
             if (rf & 1) {
               $r3$.ɵE(0, 'my-comp');
               $r3$.ɵe();
+              $r3$.ɵrS(10);
             }
             if (rf & 2) {
               $r3$.ɵp(
                   0, 'names',
-                  $r3$.ɵb(
-                      $r3$.ɵfV($e0_ff$, [c.n0, c.n1, c.n2, c.n3, c.n4, c.n5, c.n6, c.n7, c.n8])));
+                  $r3$.ɵb($r3$.ɵfV(
+                      10, $e0_ff$, [c.n0, c.n1, c.n2, c.n3, c.n4, c.n5, c.n6, c.n7, c.n8])));
             }
           }
         });
@@ -794,9 +798,10 @@ describe('components & directives', () => {
             if (rf & 1) {
               $r3$.ɵE(0, 'object-comp');
               $r3$.ɵe();
+              $r3$.ɵrS(2);
             }
             if (rf & 2) {
-              $r3$.ɵp(0, 'config', $r3$.ɵb($r3$.ɵf1($e0_ff$, ctx.name)));
+              $r3$.ɵp(0, 'config', $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.name)));
             }
           }
         });
@@ -879,12 +884,13 @@ describe('components & directives', () => {
             if (rf & 1) {
               $r3$.ɵE(0, 'nested-comp');
               $r3$.ɵe();
+              $r3$.ɵrS(7);
             }
             if (rf & 2) {
               $r3$.ɵp(
-                  0, 'config', $r3$.ɵf2(
-                                   $e0_ff_2$, ctx.name,
-                                   $r3$.ɵb($r3$.ɵf1($e0_ff_1$, $r3$.ɵf1($e0_ff$, ctx.duration)))));
+                  0, 'config', $r3$.ɵb($r3$.ɵf2(
+                                   7, $e0_ff_2$, ctx.name,
+                                   $r3$.ɵf1(4, $e0_ff_1$, $r3$.ɵf1(2, $e0_ff$, ctx.duration)))));
             }
           }
         });
diff --git a/packages/core/test/render3/compiler_canonical/pipes_spec.ts b/packages/core/test/render3/compiler_canonical/pipes_spec.ts
index 625b4e2c32..ea6316fdac 100644
--- a/packages/core/test/render3/compiler_canonical/pipes_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/pipes_spec.ts
@@ -88,9 +88,12 @@ describe('pipes', () => {
             $r3$.ɵT(0);
             $r3$.ɵPp(1, 'myPipe');
             $r3$.ɵPp(2, 'myPurePipe');
+            $r3$.ɵrS(6);
           }
           if (rf & 2) {
-            $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, $r3$.ɵpb2(2, ctx.name, ctx.size), ctx.size), ''));
+            $r3$.ɵt(
+                0,
+                $r3$.ɵi1('', $r3$.ɵpb2(1, 6, $r3$.ɵpb2(2, 3, ctx.name, ctx.size), ctx.size), ''));
           }
         }
       });
@@ -166,10 +169,11 @@ describe('pipes', () => {
             $r3$.ɵT(2);
             $r3$.ɵPp(3, 'myPurePipe');
             $r3$.ɵC(4, C4, '', ['oneTimeIf', '']);
+            $r3$.ɵrS(6);
           }
           if (rf & 2) {
-            $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, ctx.name, ctx.size), ''));
-            $r3$.ɵt(2, $r3$.ɵi1('', $r3$.ɵpb2(3, ctx.name, ctx.size), ''));
+            $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, 3, ctx.name, ctx.size), ''));
+            $r3$.ɵt(2, $r3$.ɵi1('', $r3$.ɵpb2(3, 6, ctx.name, ctx.size), ''));
             $r3$.ɵp(4, 'oneTimeIf', $r3$.ɵb(ctx.more));
             $r3$.ɵcR(4);
             $r3$.ɵcr();
@@ -181,9 +185,10 @@ describe('pipes', () => {
               $r3$.ɵT(1);
               $r3$.ɵPp(2, 'myPurePipe');
               $r3$.ɵe();
+              $r3$.ɵrS(3);
             }
             if (rf & 2) {
-              $r3$.ɵt(1, $r3$.ɵi1('', $r3$.ɵpb2(2, ctx.name, ctx.size), ''));
+              $r3$.ɵt(1, $r3$.ɵi1('', $r3$.ɵpb2(2, 3, ctx.name, ctx.size), ''));
             }
           }
         }
diff --git a/packages/core/test/render3/pipe_spec.ts b/packages/core/test/render3/pipe_spec.ts
index 2a49d26b4e..e5da9bbcbe 100644
--- a/packages/core/test/render3/pipe_spec.ts
+++ b/packages/core/test/render3/pipe_spec.ts
@@ -10,7 +10,7 @@ import {Directive, OnChanges, OnDestroy, Pipe, PipeTransform} from '@angular/cor
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 import {defineDirective, definePipe} from '../../src/render3/definition';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, reserveSlots, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {pipe, pipeBind1, pipeBind3, pipeBind4, pipeBindV} from '../../src/render3/pipe';
 
@@ -38,9 +38,10 @@ describe('pipe', () => {
       if (rf & RenderFlags.Create) {
         text(0);
         pipe(1, 'countingPipe');
+        reserveSlots(2);
       }
       if (rf & RenderFlags.Update) {
-        textBinding(0, interpolation1('', pipeBind1(1, person.name), ''));
+        textBinding(0, interpolation1('', pipeBind1(1, 2, person.name), ''));
       }
     }
 
@@ -53,9 +54,10 @@ describe('pipe', () => {
       if (rf & RenderFlags.Create) {
         text(0);
         pipe(1, 'randomPipeName');
+        reserveSlots(2);
       }
       if (rf & RenderFlags.Update) {
-        textBinding(0, interpolation1('', pipeBind1(1, ctx.value), ''));
+        textBinding(0, interpolation1('', pipeBind1(1, 2, ctx.value), ''));
       }
     }, [], pipes);
 
@@ -97,9 +99,10 @@ describe('pipe', () => {
         elementStart(0, 'div', ['myDir', '']);
         pipe(1, 'double');
         elementEnd();
+        reserveSlots(2);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'elprop', bind(pipeBind1(1, ctx)));
+        elementProperty(0, 'elprop', bind(pipeBind1(1, 2, ctx)));
         directive = loadDirective(0);
       }
     }
@@ -112,10 +115,11 @@ describe('pipe', () => {
       if (rf & RenderFlags.Create) {
         text(0);
         pipe(1, 'multiArgPipe');
+        reserveSlots(4);
       }
       if (rf & RenderFlags.Update) {
         textBinding(
-            0, interpolation1('', pipeBind3(1, person.name, 'one', person.address !.city), ''));
+            0, interpolation1('', pipeBind3(1, 4, person.name, 'one', person.address !.city), ''));
       }
     }
 
@@ -129,11 +133,12 @@ describe('pipe', () => {
         text(0);
         pipe(1, 'multiArgPipe');
         pipe(2, 'multiArgPipe');
+        reserveSlots(9);
       }
       if (rf & RenderFlags.Update) {
         textBinding(
-            0,
-            interpolation1('', pipeBind4(2, pipeBindV(1, [person.name, 'a', 'b']), 0, 1, 2), ''));
+            0, interpolation1(
+                   '', pipeBind4(2, 9, pipeBindV(1, 4, [person.name, 'a', 'b']), 0, 1, 2), ''));
       }
     }
 
@@ -158,9 +163,10 @@ describe('pipe', () => {
         elementStart(0, 'div');
         pipe(1, 'identityPipe');
         elementEnd();
+        reserveSlots(2);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'someProp', bind(pipeBind1(1, 'Megatron')));
+        elementProperty(0, 'someProp', bind(pipeBind1(1, 2, 'Megatron')));
       }
     }
 
@@ -178,9 +184,10 @@ describe('pipe', () => {
         if (rf & RenderFlags.Create) {
           text(0);
           pipe(1, 'countingPipe');
+          reserveSlots(2);
         }
         if (rf & RenderFlags.Update) {
-          textBinding(0, interpolation1('', pipeBind1(1, person.name), ''));
+          textBinding(0, interpolation1('', pipeBind1(1, 2, person.name), ''));
         }
       }
 
@@ -207,9 +214,10 @@ describe('pipe', () => {
         if (rf & RenderFlags.Create) {
           text(0);
           pipe(1, 'countingImpurePipe');
+          reserveSlots(2);
         }
         if (rf & RenderFlags.Update) {
-          textBinding(0, interpolation1('', pipeBind1(1, person.name), ''));
+          textBinding(0, interpolation1('', pipeBind1(1, 2, person.name), ''));
         }
       }
 
@@ -228,10 +236,11 @@ describe('pipe', () => {
           pipe(3, 'countingImpurePipe');
           elementEnd();
           container(4);
+          reserveSlots(4);
         }
         if (rf & RenderFlags.Update) {
-          elementProperty(0, 'someProp', bind(pipeBind1(1, true)));
-          elementProperty(2, 'someProp', bind(pipeBind1(3, true)));
+          elementProperty(0, 'someProp', bind(pipeBind1(1, 2, true)));
+          elementProperty(2, 'someProp', bind(pipeBind1(3, 4, true)));
           pipeInstances.push(load<CountingImpurePipe>(1), load(3));
           containerRefreshStart(4);
           {
@@ -242,9 +251,10 @@ describe('pipe', () => {
                   elementStart(0, 'div');
                   pipe(1, 'countingImpurePipe');
                   elementEnd();
+                  reserveSlots(2);
                 }
                 if (rf1 & RenderFlags.Update) {
-                  elementProperty(0, 'someProp', bind(pipeBind1(1, true)));
+                  elementProperty(0, 'someProp', bind(pipeBind1(1, 2, true)));
                   pipeInstances.push(load<CountingImpurePipe>(1));
                 }
               }
@@ -296,9 +306,10 @@ describe('pipe', () => {
                 if (rf1 & RenderFlags.Create) {
                   text(0);
                   pipe(1, 'pipeWithOnDestroy');
+                  reserveSlots(2);
                 }
                 if (rf & RenderFlags.Update) {
-                  textBinding(0, interpolation1('', pipeBind1(1, person.age), ''));
+                  textBinding(0, interpolation1('', pipeBind1(1, 2, person.age), ''));
                 }
               }
               embeddedViewEnd();
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index 4cb71ae428..c3290895f1 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {defineComponent} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective, reserveSlots} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {pureFunction1, pureFunction2, pureFunction3, pureFunction4, pureFunction5, pureFunction6, pureFunction7, pureFunction8, pureFunctionV} from '../../src/render3/pure_function';
 import {renderToHtml} from '../../test/render3/render_util';
@@ -36,9 +36,10 @@ describe('array literals', () => {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'my-comp');
         elementEnd();
+        reserveSlots(2);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'names', bind(pureFunction1(e0_ff, ctx.customName)));
+        elementProperty(0, 'names', bind(pureFunction1(2, e0_ff, ctx.customName)));
       }
     }
 
@@ -90,10 +91,11 @@ describe('array literals', () => {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'many-prop-comp');
         elementEnd();
+        reserveSlots(4);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'names1', bind(pureFunction1(e0_ff, ctx.customName)));
-        elementProperty(0, 'names2', bind(pureFunction1(e0_ff_1, ctx.customName2)));
+        elementProperty(0, 'names1', bind(pureFunction1(2, e0_ff, ctx.customName)));
+        elementProperty(0, 'names2', bind(pureFunction1(4, e0_ff_1, ctx.customName2)));
       }
     }
 
@@ -130,9 +132,10 @@ describe('array literals', () => {
             elementStart(0, 'my-comp');
             myComps.push(loadDirective(0));
             elementEnd();
+            reserveSlots(2);
           }
           if (rf & RenderFlags.Update) {
-            elementProperty(0, 'names', bind(ctx.someFn(pureFunction1(e0_ff, ctx.customName))));
+            elementProperty(0, 'names', bind(ctx.someFn(pureFunction1(2, e0_ff, ctx.customName))));
           }
         },
         directives: directives
@@ -170,9 +173,10 @@ describe('array literals', () => {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'my-comp');
         elementEnd();
+        reserveSlots(3);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'names', bind(pureFunction2(e0_ff, ctx.customName, ctx.customName2)));
+        elementProperty(0, 'names', bind(pureFunction2(3, e0_ff, ctx.customName, ctx.customName2)));
       }
     }
 
@@ -241,17 +245,19 @@ describe('array literals', () => {
         elementStart(5, 'my-comp');
         f8Comp = loadDirective(5);
         elementEnd();
+        reserveSlots(39);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'names', bind(pureFunction3(e0_ff, c[5], c[6], c[7])));
-        elementProperty(1, 'names', bind(pureFunction4(e2_ff, c[4], c[5], c[6], c[7])));
-        elementProperty(2, 'names', bind(pureFunction5(e4_ff, c[3], c[4], c[5], c[6], c[7])));
-        elementProperty(3, 'names', bind(pureFunction6(e6_ff, c[2], c[3], c[4], c[5], c[6], c[7])));
+        elementProperty(0, 'names', bind(pureFunction3(4, e0_ff, c[5], c[6], c[7])));
+        elementProperty(1, 'names', bind(pureFunction4(9, e2_ff, c[4], c[5], c[6], c[7])));
+        elementProperty(2, 'names', bind(pureFunction5(15, e4_ff, c[3], c[4], c[5], c[6], c[7])));
         elementProperty(
-            4, 'names', bind(pureFunction7(e8_ff, c[1], c[2], c[3], c[4], c[5], c[6], c[7])));
+            3, 'names', bind(pureFunction6(22, e6_ff, c[2], c[3], c[4], c[5], c[6], c[7])));
+        elementProperty(
+            4, 'names', bind(pureFunction7(30, e8_ff, c[1], c[2], c[3], c[4], c[5], c[6], c[7])));
         elementProperty(
             5, 'names',
-            bind(pureFunction8(e10_ff, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7])));
+            bind(pureFunction8(39, e10_ff, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7])));
       }
     }
 
@@ -295,11 +301,12 @@ describe('array literals', () => {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'my-comp');
         elementEnd();
+        reserveSlots(12);
       }
       if (rf & RenderFlags.Update) {
         elementProperty(
-            0, 'names', bind(pureFunctionV(e0_ff, [
-              c[0], c[1], c[2], c[3], pureFunction1(e0_ff_1, c[4]), c[5], c[6], c[7], c[8]
+            0, 'names', bind(pureFunctionV(12, e0_ff, [
+              c[0], c[1], c[2], c[3], pureFunction1(2, e0_ff_1, c[4]), c[5], c[6], c[7], c[8]
             ])));
       }
     }
@@ -345,9 +352,10 @@ describe('object literals', () => {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'object-comp');
         elementEnd();
+        reserveSlots(2);
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(0, 'config', bind(pureFunction1(e0_ff, ctx.name)));
+        elementProperty(0, 'config', bind(pureFunction1(2, e0_ff, ctx.name)));
       }
     }
 
@@ -380,12 +388,13 @@ describe('object literals', () => {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'object-comp');
         elementEnd();
+        reserveSlots(7);
       }
       if (rf & RenderFlags.Update) {
         elementProperty(
-            0, 'config',
-            bind(pureFunction2(
-                e0_ff, ctx.name, pureFunction1(e0_ff_1, pureFunction1(e0_ff_2, ctx.duration)))));
+            0, 'config', bind(pureFunction2(
+                             7, e0_ff, ctx.name,
+                             pureFunction1(4, e0_ff_1, pureFunction1(2, e0_ff_2, ctx.duration)))));
       }
     }
 
@@ -451,11 +460,12 @@ describe('object literals', () => {
               elementStart(0, 'object-comp');
               objectComps.push(loadDirective(0));
               elementEnd();
+              reserveSlots(3);
             }
             if (rf1 & RenderFlags.Update) {
               elementProperty(
                   0, 'config',
-                  bind(pureFunction2(e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
+                  bind(pureFunction2(3, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
             }
             embeddedViewEnd();
           }
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 3bb2328b21..8dc809fa6e 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -9,7 +9,7 @@
 import {Component, Directive, Pipe, PipeTransform, TemplateRef, ViewContainerRef} from '../../src/core';
 import {getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
 import {NgOnChangesFeature, defineComponent, defineDirective, definePipe, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, projection, projectionDef, reserveSlots, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {pipe, pipeBind1} from '../../src/render3/pipe';
 
@@ -383,22 +383,25 @@ describe('ViewContainerRef', () => {
                     elementStart(0, 'child');
                     elementEnd();
                     pipe(1, 'starPipe');
+                    reserveSlots(2);
                   }
-                  if (rf & RenderFlags.Create) {
-                    elementProperty(0, 'name', bind(pipeBind1(1, 'C')));
+                  if (rf & RenderFlags.Update) {
+                    elementProperty(0, 'name', bind(pipeBind1(1, 2, 'C')));
                   }
                 });
                 pipe(1, 'starPipe');
                 elementStart(2, 'child', ['vcref', '']);
                 elementEnd();
-                elementStart(3, 'child');
+                pipe(3, 'starPipe');
+                elementStart(4, 'child');
                 elementEnd();
+                reserveSlots(4);
               }
               if (rf & RenderFlags.Update) {
                 const tplRef = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(0)));
                 elementProperty(2, 'tplRef', bind(tplRef));
-                elementProperty(2, 'name', bind(pipeBind1(1, 'A')));
-                elementProperty(3, 'name', bind(pipeBind1(1, 'B')));
+                elementProperty(2, 'name', bind(pipeBind1(1, 2, 'A')));
+                elementProperty(4, 'name', bind(pipeBind1(1, 4, 'B')));
               }
             },
             directives: [Child, DirectiveWithVCRef],

From 280a784fe368e17ef5c35ba11262469615dcb97b Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 22 May 2018 10:43:18 -0700
Subject: [PATCH 098/582] refactor(ivy): remove insignificant '...' in the
 compiler tests (#24039)

PR Close #24039
---
 packages/compiler/test/render3/r3_compiler_compliance_spec.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 127de2a3b4..3c8c9935e9 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -88,7 +88,6 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        …
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div');
@@ -134,7 +133,6 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        …
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div');
@@ -181,7 +179,6 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        …
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div');

From 188ff848d261bee62b828ed94d6772172853b6d5 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 22 May 2018 10:47:50 -0700
Subject: [PATCH 099/582] fix(ivy): `pureFunctionV` takes an array of values
 (#24039)

PR Close #24039
---
 .../compiler/src/render3/view/template.ts     | 27 +++++++++++++++----
 .../render3/r3_compiler_compliance_spec.ts    |  2 +-
 .../hello_world_r2/bundle.golden_symbols.json |  3 +++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index c6dbadfe54..d50dbb1f2c 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -574,6 +574,15 @@ const pureFunctionIdentifiers = [
   R3.pureFunction0, R3.pureFunction1, R3.pureFunction2, R3.pureFunction3, R3.pureFunction4,
   R3.pureFunction5, R3.pureFunction6, R3.pureFunction7, R3.pureFunction8
 ];
+
+function pureFunctionCallInfo(args: o.Expression[]) {
+  const identifier = pureFunctionIdentifiers[args.length];
+  return {
+    identifier: identifier || R3.pureFunctionV,
+    isVarLength: !identifier,
+  };
+}
+
 function getLiteralFactory(
     constantPool: ConstantPool, literal: o.LiteralArrayExpr | o.LiteralMapExpr,
     allocateSlots: (numSlots: number) => number): o.Expression {
@@ -581,14 +590,22 @@ function getLiteralFactory(
   // Allocate 1 slot for the result plus 1 per argument
   const startSlot = allocateSlots(1 + literalFactoryArguments.length);
   literalFactoryArguments.length > 0 || error(`Expected arguments to a literal factory function`);
-  let pureFunctionIdent =
-      pureFunctionIdentifiers[literalFactoryArguments.length] || R3.pureFunctionV;
+  const {identifier, isVarLength} = pureFunctionCallInfo(literalFactoryArguments);
 
   // Literal factories are pure functions that only need to be re-invoked when the parameters
   // change.
-  return o.importExpr(pureFunctionIdent).callFn([
-    o.literal(startSlot), literalFactory, ...literalFactoryArguments
-  ]);
+  const args = [
+    o.literal(startSlot),
+    literalFactory,
+  ];
+
+  if (isVarLength) {
+    args.push(o.literalArr(literalFactoryArguments));
+  } else {
+    args.push(...literalFactoryArguments);
+  }
+
+  return o.importExpr(identifier).callFn(args);
 }
 
 /**
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 3c8c9935e9..44af890457 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -548,7 +548,7 @@ describe('compiler compliance', () => {
               if (rf & 2) {
                 $r3$.ɵp(
                     0, 'names',
-                    $r3$.ɵb($r3$.ɵfV(10, $e0_ff$, ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8)));
+                    $r3$.ɵb($r3$.ɵfV(10, $e0_ff$, [ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8])));
               }
             },
             directives: [MyComp]
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index c792f20640..c35362fae4 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -3662,6 +3662,9 @@
   {
     "name": "pureArrayDef"
   },
+  {
+    "name": "pureFunctionCallInfo"
+  },
   {
     "name": "pureFunctionIdentifiers"
   },

From 729c7978904cec5bf25a939e66f19f2cc1624e90 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 22 May 2018 10:48:11 -0700
Subject: [PATCH 100/582] fix(ivy): `pipeBindV` takes an array of values
 (#24039)

PR Close #24039
---
 .../compiler/src/render3/view/template.ts     | 20 +++++++++++--------
 .../render3/r3_compiler_compliance_spec.ts    | 13 +++++++-----
 .../hello_world_r2/bundle.golden_symbols.json |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index d50dbb1f2c..fc1b2a8513 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -524,16 +524,16 @@ class ValueConverter extends AstMemoryEfficientTransformer {
     // Allocate one slot for the result plus one slot per pipe argument
     const pureFunctionSlot = this.allocatePureFunctionSlots(2 + pipe.args.length);
     const target = new PropertyRead(pipe.span, new ImplicitReceiver(pipe.span), slotPseudoLocal);
-    const bindingId = pipeBinding(pipe.args);
-    this.definePipe(pipe.name, slotPseudoLocal, slot, o.importExpr(bindingId));
-    const value = pipe.exp.visit(this);
-    const args = this.visitAll(pipe.args);
+    const {identifier, isVarLength} = pipeBindingCallInfo(pipe.args);
+    this.definePipe(pipe.name, slotPseudoLocal, slot, o.importExpr(identifier));
+    const args: AST[] = [pipe.exp, ...pipe.args];
+    const convertedArgs: AST[] =
+        isVarLength ? this.visitAll([new LiteralArray(pipe.span, args)]) : this.visitAll(args);
 
     return new FunctionCall(pipe.span, target, [
       new LiteralPrimitive(pipe.span, slot),
       new LiteralPrimitive(pipe.span, pureFunctionSlot),
-      value,
-      ...args,
+      ...convertedArgs,
     ]);
   }
 
@@ -566,8 +566,12 @@ class ValueConverter extends AstMemoryEfficientTransformer {
 // Pipes always have at least one parameter, the value they operate on
 const pipeBindingIdentifiers = [R3.pipeBind1, R3.pipeBind2, R3.pipeBind3, R3.pipeBind4];
 
-function pipeBinding(args: o.Expression[]): o.ExternalReference {
-  return pipeBindingIdentifiers[args.length] || R3.pipeBindV;
+function pipeBindingCallInfo(args: o.Expression[]) {
+  const identifier = pipeBindingIdentifiers[args.length];
+  return {
+    identifier: identifier || R3.pipeBindV,
+    isVarLength: !identifier,
+  };
 }
 
 const pureFunctionIdentifiers = [
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 44af890457..3bd371cb21 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -921,7 +921,7 @@ describe('compiler compliance', () => {
 
               @Component({
                 selector: 'my-app',
-                template: '{{name | myPipe:size | myPurePipe:size }}<p>{{ name | myPurePipe:size }}</p>'
+                template: '{{name | myPipe:size | myPurePipe:size }}<p>{{ name | myPipe:1:2:3:4:5 }}</p>'
               })
               export class MyApp {
                 name = 'World';
@@ -949,7 +949,10 @@ describe('compiler compliance', () => {
             });`;
 
         const MyAppDefinition = `
-            …
+            const $c0$ = ($a0$: any) => {
+              return [$a0$, 1, 2, 3, 4, 5];
+            };
+            // ...
             static ngComponentDef = $r3$.ɵdefineComponent({
               type: MyApp,
               selectors: [['my-app']],
@@ -961,13 +964,13 @@ describe('compiler compliance', () => {
                   $r3$.ɵPp(2, 'myPipe');
                   $r3$.ɵE(3, 'p');
                   $r3$.ɵT(4);
-                  $r3$.ɵPp(5, 'myPurePipe');
+                  $r3$.ɵPp(5, 'myPipe');
                   $r3$.ɵe();
-                  $r3$.ɵrS(9);
+                  $r3$.ɵrS(15);
                 }
                 if (rf & 2) {
                   $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, 3, $r3$.ɵpb2(2, 6, ctx.name, ctx.size), ctx.size), ''));
-                  $r3$.ɵt(4, $r3$.ɵi1('', $r3$.ɵpb2(5, 9, ctx.name, ctx.size), ''));
+                  $r3$.ɵt(4, $r3$.ɵi1('', $r3$.ɵpbV(5, 13 , $r3$.ɵf1(15, $c0$, ctx.name)), ''));
                 }
               },
               pipes: [MyPurePipe, MyPipe]
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index c35362fae4..fe5e7d7bbd 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -3603,7 +3603,7 @@
     "name": "parseIntAutoRadix"
   },
   {
-    "name": "pipeBinding"
+    "name": "pipeBindingCallInfo"
   },
   {
     "name": "pipeBindingIdentifiers"

From 3de80fc7fb47e314abe9d5c102c900a099dae8ce Mon Sep 17 00:00:00 2001
From: Mashhood Rastgar <mashhoodr@gmail.com>
Date: Wed, 9 May 2018 11:07:54 -0700
Subject: [PATCH 101/582] docs(aio): Added Mashhood as GDE in contributors
 (#24157)

PR Close #24157
---
 aio/content/images/bios/mashhood.jpg    | Bin 0 -> 9621 bytes
 aio/content/marketing/contributors.json |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 aio/content/images/bios/mashhood.jpg

diff --git a/aio/content/images/bios/mashhood.jpg b/aio/content/images/bios/mashhood.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0ce1a828b4ff56aeb4c0b5630b056bc1981c2a2e
GIT binary patch
literal 9621
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
D{vf7p

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 8823376274..4e1674e549 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -627,5 +627,14 @@
     "website": "https://juristr.com",
     "bio": "Juri is a software engineer and freelance trainer and consultant currently mostly focusing on the frontend side using JavaScript, TypeScript and Angular. He has a passion for teaching and sharing his knowledge and experiences with others. This mostly happens by writing tech articles for his personal blog, by creating video courses for Egghead.io, during on-site workshops at companies or by speaking at conferences. In his free time he enjoys practicing Yoseikan Budo, a martial art where he currently owns the 3rd DAN black belt.",
     "group": "GDE"
+  },
+
+  "mashhoodr": {
+    "name": "Mashhood Rastgar",
+    "picture": "mashhood.jpg",
+    "twitter": "mashhoodr",
+    "website": "http://imars.info/",
+    "bio": "Mashhood is the principal technical consultant at Recurship and a Google Developer Expert. He  works with different startups in US and EU to helps them crawl through the technical maze and quickly build amazing products focused around the problems they are trying to solve. He specializes in using the latest web technologies available to execute the best possible solutions.",
+    "group": "GDE"
   }
 }

From 76575357183209695ac028bfa1d23c2f57ea4b9a Mon Sep 17 00:00:00 2001
From: Juri <juri.strumpflohner@gmail.com>
Date: Sat, 26 May 2018 21:37:13 +0200
Subject: [PATCH 102/582] docs(aio): fix link to correct bio image (#24150)

PR Close #24150
---
 aio/content/marketing/contributors.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 4e1674e549..25dda612b1 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -622,7 +622,7 @@
 
   "juristr": {
     "name": "Juri Strumpflohner",
-    "picture": "juristr.png",
+    "picture": "juristr.jpg",
     "twitter": "juristr",
     "website": "https://juristr.com",
     "bio": "Juri is a software engineer and freelance trainer and consultant currently mostly focusing on the frontend side using JavaScript, TypeScript and Angular. He has a passion for teaching and sharing his knowledge and experiences with others. This mostly happens by writing tech articles for his personal blog, by creating video courses for Egghead.io, during on-site workshops at companies or by speaking at conferences. In his free time he enjoys practicing Yoseikan Budo, a martial art where he currently owns the 3rd DAN black belt.",

From e43d3fa4b7c4cb07d51d8c79c0e5e3afa4a92e2f Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Tue, 29 May 2018 11:55:59 -0700
Subject: [PATCH 103/582] build: pick up rules_typescript karma fix (#24184)

Error was Cannot find module 'karma/bin/karma'

PR Close #24184
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index d18ec153e0..9d0d875b2b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/v0.13.0.zip",
-    strip_prefix = "rules_typescript-0.13.0",
-    sha256 = "8f2767ff56ad68c80c62e9a1cdc2ba2c2ba0b19d350f713365e5333045df02e3",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/3b86d6d46269fb52d4c6f1416868869e847feac2.zip",
+    strip_prefix = "rules_typescript-3b86d6d46269fb52d4c6f1416868869e847feac2",
+    sha256 = "f67e5fbe4a2b34b3ead9fe56f22b713540c23b501bd24d661d3fb047071dc2c1",
 )
 
 http_archive(

From 96a0e131bf47ef4ae2ca04c49850319563f8df93 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 21 May 2018 12:54:34 +0100
Subject: [PATCH 104/582] feat(aio): render hover status on code-tabs (#24027)

The Material Design spec states that there should be a change
of background when hovering over a tab label.

See https://material.io/design/components/tabs.html#states

Related to #23985

PR Close #24027
---
 aio/src/styles/2-modules/_code.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aio/src/styles/2-modules/_code.scss b/aio/src/styles/2-modules/_code.scss
index b2806bfa25..0e788ae48f 100644
--- a/aio/src/styles/2-modules/_code.scss
+++ b/aio/src/styles/2-modules/_code.scss
@@ -106,6 +106,9 @@ aio-code pre {
 }
 
 .code-tab-group .mat-tab-label {
+  &:hover {
+    background: rgba(black, 0.04);
+  }
   white-space: nowrap;
 }
 

From ddd61248021c3d9344ccae2614c992b24d450d29 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 21 May 2018 12:55:22 +0100
Subject: [PATCH 105/582] feat(aio): display code-tabs in a Material Design
 "card" (#24027)

This helps to connect the "content" of the tab to its label.

Closes #23985

PR Close #24027
---
 .../code/code-tabs.component.ts               | 30 ++++++++++---------
 .../custom-elements/code/code-tabs.module.ts  |  4 +--
 aio/src/styles/2-modules/_code.scss           | 15 ++++++++--
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/aio/src/app/custom-elements/code/code-tabs.component.ts b/aio/src/app/custom-elements/code/code-tabs.component.ts
index fc585e7198..d7759955c2 100644
--- a/aio/src/app/custom-elements/code/code-tabs.component.ts
+++ b/aio/src/app/custom-elements/code/code-tabs.component.ts
@@ -25,20 +25,22 @@ export interface TabInfo {
     <!-- Use content projection so that the provided HTML's code-panes can be split into tabs -->
     <div #content style="display: none"><ng-content></ng-content></div>
 
-    <mat-tab-group class="code-tab-group" disableRipple>
-      <mat-tab style="overflow-y: hidden;" *ngFor="let tab of tabs">
-        <ng-template mat-tab-label>
-          <span class="{{ tab.class }}">{{ tab.title }}</span>
-        </ng-template>
-        <aio-code class="{{ tab.class }}"
-                  [language]="tab.language"
-                  [linenums]="tab.linenums"
-                  [path]="tab.path"
-                  [region]="tab.region"
-                  [title]="tab.title">
-        </aio-code>
-      </mat-tab>
-    </mat-tab-group>
+    <mat-card>
+      <mat-tab-group class="code-tab-group" disableRipple>
+        <mat-tab style="overflow-y: hidden;" *ngFor="let tab of tabs">
+          <ng-template mat-tab-label>
+            <span class="{{ tab.class }}">{{ tab.title }}</span>
+          </ng-template>
+          <aio-code class="{{ tab.class }}"
+                    [language]="tab.language"
+                    [linenums]="tab.linenums"
+                    [path]="tab.path"
+                    [region]="tab.region"
+                    [title]="tab.title">
+          </aio-code>
+        </mat-tab>
+      </mat-tab-group>
+    </mat-card>
   `,
 })
 export class CodeTabsComponent implements OnInit, AfterViewInit {
diff --git a/aio/src/app/custom-elements/code/code-tabs.module.ts b/aio/src/app/custom-elements/code/code-tabs.module.ts
index 7dffaa19b6..eac0e29b37 100644
--- a/aio/src/app/custom-elements/code/code-tabs.module.ts
+++ b/aio/src/app/custom-elements/code/code-tabs.module.ts
@@ -1,12 +1,12 @@
 import { NgModule, Type } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CodeTabsComponent } from './code-tabs.component';
-import { MatTabsModule } from '@angular/material';
+import { MatCardModule, MatTabsModule } from '@angular/material';
 import { CodeModule } from './code.module';
 import { WithCustomElementComponent } from '../element-registry';
 
 @NgModule({
-  imports: [ CommonModule, MatTabsModule, CodeModule ],
+  imports: [ CommonModule, MatCardModule, MatTabsModule, CodeModule ],
   declarations: [ CodeTabsComponent ],
   exports: [ CodeTabsComponent ],
   entryComponents: [ CodeTabsComponent ]
diff --git a/aio/src/styles/2-modules/_code.scss b/aio/src/styles/2-modules/_code.scss
index 0e788ae48f..166b6ef114 100644
--- a/aio/src/styles/2-modules/_code.scss
+++ b/aio/src/styles/2-modules/_code.scss
@@ -3,8 +3,9 @@ code-example, code-tabs {
     display: block;
 }
 
-code-example,
-code-tabs mat-tab-body {
+code-example {
+
+
   &:not(.no-box) {
     background-color: rgba($backgroundgray, 0.2);
     border: 0.5px solid $lightgray;
@@ -27,6 +28,16 @@ code-tabs mat-tab-body {
   }
 }
 
+code-example, code-tabs {
+  .mat-card {
+    padding: 0;
+    border-radius: 5px;
+  }
+  code {
+    overflow: auto;
+  }
+}
+
 // TERMINAL / SHELL TEXT STYLES
 
 code-example.code-shell, code-example[language=sh], code-example[language=bash] {

From d74078fb88f9c523cf7efff04a54c6a7b53e8d4b Mon Sep 17 00:00:00 2001
From: Danny Rademacher <3715737+drademacher@users.noreply.github.com>
Date: Thu, 3 May 2018 11:54:46 +0200
Subject: [PATCH 106/582] docs(http): correct spelling error (#23675)

Correct a spelling error. I changed HttpParms to HttpParams
PR Close #23675
---
 aio/content/guide/http.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/http.md b/aio/content/guide/http.md
index 0c6d903f31..ceee6e1067 100644
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@@ -450,7 +450,7 @@ Here is a `searchHeroes` method that queries for heroes whose names contain the
 
 If there is a search term, the code constructs an options object with an HTML URL-encoded search parameter. If the term were "foo", the GET request URL would be `api/heroes/?name=foo`.
 
-The `HttpParms` are immutable so you'll have to use the `set()` method to update the options.
+The `HttpParams` are immutable so you'll have to use the `set()` method to update the options.
 
 ### Debouncing requests
 
@@ -1044,4 +1044,4 @@ Alternatively, you can call `request.error()` with an `ErrorEvent`.
   path="http/src/testing/http-client.spec.ts"
   region="network-error"
   linenums="false">
-</code-example>
\ No newline at end of file
+</code-example>

From a6f34be9f598bfa45abbb8426dddd46f6ed1e4e3 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 24 May 2018 12:23:43 +0300
Subject: [PATCH 107/582] build(aio): update payload size limits (#23944)

PR Close #23944
---
 aio/scripts/_payload-limits.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
index c6a729d55a..ac9b44a215 100755
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@@ -2,11 +2,11 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime": 2689,
-        "main": 478529,
+        "runtime": 2712,
+        "main": 479417,
         "polyfills": 38453,
         "prettify": 14913
       }
     }
   }
-}
\ No newline at end of file
+}

From ae86cb3be0c413544f8b17cfcd0e29ae21655b4c Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 15 May 2018 19:41:13 +0300
Subject: [PATCH 108/582] fix(aio): do not load custom elements again while
 already loading (#23944)

PR Close #23944
---
 aio/scripts/_payload-limits.json              |   2 +-
 .../custom-elements/elements-loader.spec.ts   | 282 +++++++++++++-----
 .../app/custom-elements/elements-loader.ts    |  64 ++--
 3 files changed, 251 insertions(+), 97 deletions(-)

diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
index ac9b44a215..a3fdfa790d 100755
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime": 2712,
-        "main": 479417,
+        "main": 479729,
         "polyfills": 38453,
         "prettify": 14913
       }
diff --git a/aio/src/app/custom-elements/elements-loader.spec.ts b/aio/src/app/custom-elements/elements-loader.spec.ts
index 1fc4eed22c..906e74283e 100644
--- a/aio/src/app/custom-elements/elements-loader.spec.ts
+++ b/aio/src/app/custom-elements/elements-loader.spec.ts
@@ -4,49 +4,19 @@ import {
   NgModuleRef,
   Type
 } from '@angular/core';
-import {TestBed, fakeAsync, tick} from '@angular/core/testing';
+import { TestBed, fakeAsync, flushMicrotasks } from '@angular/core/testing';
 
 import { ElementsLoader } from './elements-loader';
 import { ELEMENT_MODULE_PATHS_TOKEN, WithCustomElementComponent } from './element-registry';
 
-class FakeComponentFactory extends ComponentFactory<any> {
-  selector: string;
-  componentType: Type<any>;
-  ngContentSelectors: string[];
-  inputs = [{propName: this.identifyingInput, templateName: this.identifyingInput}];
-  outputs = [];
 
-  constructor(private identifyingInput: string) { super(); }
-
-  create(injector: Injector,
-         projectableNodes?: any[][],
-         rootSelectorOrNode?: string | any,
-         ngModule?: NgModuleRef<any>): ComponentRef<any> {
-    return (jasmine.createSpy('ComponentRef') as any) as ComponentRef<any>;
-  };
+interface Deferred {
+  resolve(): void;
+  reject(err: any): void;
 }
 
-const FAKE_COMPONENT_FACTORIES = new Map([
-  ['element-a-module-path', new FakeComponentFactory('element-a-input')],
-  ['element-b-module-path', new FakeComponentFactory('element-b-input')],
-]);
-
 describe('ElementsLoader', () => {
   let elementsLoader: ElementsLoader;
-  let actualCustomElementsDefine;
-  let fakeCustomElementsDefine;
-
-  // ElementsLoader uses the window's customElements API. Provide a fake for this test.
-  beforeEach(() => {
-    actualCustomElementsDefine = window.customElements.define;
-
-    fakeCustomElementsDefine = jasmine.createSpy('define');
-
-    window.customElements.define = fakeCustomElementsDefine;
-  });
-  afterEach(() => {
-    window.customElements.define = actualCustomElementsDefine;
-  });
 
   beforeEach(() => {
     const injector = TestBed.configureTestingModule({
@@ -63,63 +33,196 @@ describe('ElementsLoader', () => {
     elementsLoader = injector.get(ElementsLoader);
   });
 
-  it('should be able to register an element', fakeAsync(() => {
-    // Verify that the elements loader considered `element-a-selector` to be unregistered.
-    expect(elementsLoader.elementsToLoad.has('element-a-selector')).toBeTruthy();
+  describe('loadContainingCustomElements()', () => {
+    let loadCustomElementSpy: jasmine.Spy;
 
-    const hostEl = document.createElement('div');
-    hostEl.innerHTML = `<element-a-selector></element-a-selector>`;
+    beforeEach(() => loadCustomElementSpy = spyOn(elementsLoader, 'loadCustomElement'));
 
-    elementsLoader.loadContainingCustomElements(hostEl);
-    tick();
+    it('should attempt to load and register all contained elements', fakeAsync(() => {
+      expect(loadCustomElementSpy).not.toHaveBeenCalled();
 
-    const defineArgs = fakeCustomElementsDefine.calls.argsFor(0);
-    expect(defineArgs[0]).toBe('element-a-selector');
+      const hostEl = document.createElement('div');
+      hostEl.innerHTML = `
+        <element-a-selector></element-a-selector>
+        <element-b-selector></element-b-selector>
+      `;
 
-    // Verify the right component was loaded/created
-    expect(defineArgs[1].observedAttributes[0]).toBe('element-a-input');
+      elementsLoader.loadContainingCustomElements(hostEl);
+      flushMicrotasks();
 
-    expect(elementsLoader.elementsToLoad.has('element-a-selector')).toBeFalsy();
-  }));
+      expect(loadCustomElementSpy).toHaveBeenCalledTimes(2);
+      expect(loadCustomElementSpy).toHaveBeenCalledWith('element-a-selector');
+      expect(loadCustomElementSpy).toHaveBeenCalledWith('element-b-selector');
+    }));
 
-  it('should be able to register multiple elements', fakeAsync(() => {
-    // Verify that the elements loader considered `element-a-selector` to be unregistered.
-    expect(elementsLoader.elementsToLoad.has('element-a-selector')).toBeTruthy();
+    it('should attempt to load and register only contained elements', fakeAsync(() => {
+      expect(loadCustomElementSpy).not.toHaveBeenCalled();
 
-    const hostEl = document.createElement('div');
-    hostEl.innerHTML = `
-      <element-a-selector></element-a-selector>
-      <element-b-selector></element-b-selector>
-    `;
+      const hostEl = document.createElement('div');
+      hostEl.innerHTML = `
+        <element-b-selector></element-b-selector>
+      `;
 
-    elementsLoader.loadContainingCustomElements(hostEl);
-    tick();
+      elementsLoader.loadContainingCustomElements(hostEl);
+      flushMicrotasks();
 
-    const defineElementA = fakeCustomElementsDefine.calls.argsFor(0);
-    expect(defineElementA[0]).toBe('element-a-selector');
-    expect(defineElementA[1].observedAttributes[0]).toBe('element-a-input');
-    expect(elementsLoader.elementsToLoad.has('element-a-selector')).toBeFalsy();
+      expect(loadCustomElementSpy).toHaveBeenCalledTimes(1);
+      expect(loadCustomElementSpy).toHaveBeenCalledWith('element-b-selector');
+    }));
 
-    const defineElementB = fakeCustomElementsDefine.calls.argsFor(1);
-    expect(defineElementB[0]).toBe('element-b-selector');
-    expect(defineElementB[1].observedAttributes[0]).toBe('element-b-input');
-    expect(elementsLoader.elementsToLoad.has('element-b-selector')).toBeFalsy();
-  }));
+    it('should wait for all contained elements to load and register', fakeAsync(() => {
+      const deferreds = returnPromisesFromSpy(loadCustomElementSpy);
 
-  it('should only register an element one time', fakeAsync(() => {
-    const hostEl = document.createElement('div');
-    hostEl.innerHTML = `<element-a-selector></element-a-selector>`;
+      const hostEl = document.createElement('div');
+      hostEl.innerHTML = `
+        <element-a-selector></element-a-selector>
+        <element-b-selector></element-b-selector>
+      `;
 
-    elementsLoader.loadContainingCustomElements(hostEl);
-    tick(); // Tick for the module factory loader's async `load` function
+      const log: any[] = [];
+      elementsLoader.loadContainingCustomElements(hostEl).subscribe(
+        v => log.push(`emitted: ${v}`),
+        e => log.push(`errored: ${e}`),
+        () => log.push('completed'),
+      );
 
-    // Call again to to check how many times customElements.define was called.
-    elementsLoader.loadContainingCustomElements(hostEl);
-    tick(); // Tick for the module factory loader's async `load` function
+      flushMicrotasks();
+      expect(log).toEqual([]);
 
-    // Should have only been called once, since the second load would not query for element-a
-    expect(window.customElements.define).toHaveBeenCalledTimes(1);
-  }));
+      deferreds[0].resolve();
+      flushMicrotasks();
+      expect(log).toEqual([]);
+
+      deferreds[1].resolve();
+      flushMicrotasks();
+      expect(log).toEqual(['emitted: undefined', 'completed']);
+    }));
+
+    it('should fail if any of the contained elements fails to load and register', fakeAsync(() => {
+      const deferreds = returnPromisesFromSpy(loadCustomElementSpy);
+
+      const hostEl = document.createElement('div');
+      hostEl.innerHTML = `
+        <element-a-selector></element-a-selector>
+        <element-b-selector></element-b-selector>
+      `;
+
+      const log: any[] = [];
+      elementsLoader.loadContainingCustomElements(hostEl).subscribe(
+        v => log.push(`emitted: ${v}`),
+        e => log.push(`errored: ${e}`),
+        () => log.push('completed'),
+      );
+
+      flushMicrotasks();
+      expect(log).toEqual([]);
+
+      deferreds[0].resolve();
+      flushMicrotasks();
+      expect(log).toEqual([]);
+
+      deferreds[1].reject('foo');
+      flushMicrotasks();
+      expect(log).toEqual(['errored: foo']);
+    }));
+  });
+
+  describe('loadCustomElement()', () => {
+    let definedSpy: jasmine.Spy;
+    let whenDefinedSpy: jasmine.Spy;
+    let whenDefinedDeferreds: Deferred[];
+
+    beforeEach(() => {
+      // `loadCustomElement()` uses the `window.customElements` API. Provide mocks for these tests.
+      definedSpy = spyOn(window.customElements, 'define');
+      whenDefinedSpy = spyOn(window.customElements, 'whenDefined');
+      whenDefinedDeferreds = returnPromisesFromSpy(whenDefinedSpy);
+    });
+
+    it('should be able to load and register an element', fakeAsync(() => {
+      elementsLoader.loadCustomElement('element-a-selector');
+      flushMicrotasks();
+
+      expect(definedSpy).toHaveBeenCalledTimes(1);
+      expect(definedSpy).toHaveBeenCalledWith('element-a-selector', jasmine.any(Function));
+
+      // Verify the right component was loaded/registered.
+      const Ctor = definedSpy.calls.argsFor(0)[1];
+      expect(Ctor.observedAttributes).toEqual(['element-a-module-path']);
+    }));
+
+    it('should wait until the element is defined', fakeAsync(() => {
+      let state = 'pending';
+      elementsLoader.loadCustomElement('element-b-selector').then(() => state = 'resolved');
+      flushMicrotasks();
+
+      expect(state).toBe('pending');
+      expect(whenDefinedSpy).toHaveBeenCalledTimes(1);
+      expect(whenDefinedSpy).toHaveBeenCalledWith('element-b-selector');
+
+      whenDefinedDeferreds[0].resolve();
+      flushMicrotasks();
+      expect(state).toBe('resolved');
+    }));
+
+    it('should not load and register the same element more than once', fakeAsync(() => {
+      elementsLoader.loadCustomElement('element-a-selector');
+      flushMicrotasks();
+      expect(definedSpy).toHaveBeenCalledTimes(1);
+
+      definedSpy.calls.reset();
+
+      // While loading/registering is still in progress:
+      elementsLoader.loadCustomElement('element-a-selector');
+      flushMicrotasks();
+      expect(definedSpy).not.toHaveBeenCalled();
+
+      definedSpy.calls.reset();
+      whenDefinedDeferreds[0].resolve();
+
+      // Once loading/registering is already completed:
+      let state = 'pending';
+      elementsLoader.loadCustomElement('element-a-selector').then(() => state = 'resolved');
+      flushMicrotasks();
+      expect(state).toBe('resolved');
+      expect(definedSpy).not.toHaveBeenCalled();
+    }));
+
+    it('should fail if defining the the custom element fails', fakeAsync(() => {
+      let state = 'pending';
+      elementsLoader.loadCustomElement('element-b-selector').catch(e => state = `rejected: ${e}`);
+      flushMicrotasks();
+      expect(state).toBe('pending');
+
+      whenDefinedDeferreds[0].reject('foo');
+      flushMicrotasks();
+      expect(state).toBe('rejected: foo');
+    }));
+
+    it('should be able to load and register an element again if previous attempt failed',
+      fakeAsync(() => {
+        elementsLoader.loadCustomElement('element-a-selector');
+        flushMicrotasks();
+        expect(definedSpy).toHaveBeenCalledTimes(1);
+
+        definedSpy.calls.reset();
+
+        // While loading/registering is still in progress:
+        elementsLoader.loadCustomElement('element-a-selector').catch(() => undefined);
+        flushMicrotasks();
+        expect(definedSpy).not.toHaveBeenCalled();
+
+        whenDefinedDeferreds[0].reject('foo');
+        flushMicrotasks();
+        expect(definedSpy).not.toHaveBeenCalled();
+
+        // Once loading/registering has already failed:
+        elementsLoader.loadCustomElement('element-a-selector');
+        flushMicrotasks();
+        expect(definedSpy).toHaveBeenCalledTimes(1);
+      })
+    );
+  });
 });
 
 // TEST CLASSES/HELPERS
@@ -128,11 +231,28 @@ class FakeCustomElementModule implements WithCustomElementComponent {
   customElementComponent: Type<any>;
 }
 
+class FakeComponentFactory extends ComponentFactory<any> {
+  selector: string;
+  componentType: Type<any>;
+  ngContentSelectors: string[];
+  inputs = [{propName: this.identifyingInput, templateName: this.identifyingInput}];
+  outputs = [];
+
+  constructor(private identifyingInput: string) { super(); }
+
+  create(injector: Injector,
+         projectableNodes?: any[][],
+         rootSelectorOrNode?: string | any,
+         ngModule?: NgModuleRef<any>): ComponentRef<any> {
+    return jasmine.createSpy('ComponentRef') as any;
+  };
+}
+
 class FakeComponentFactoryResolver extends ComponentFactoryResolver {
   constructor(private modulePath) { super(); }
 
   resolveComponentFactory(component: Type<any>): ComponentFactory<any> {
-    return FAKE_COMPONENT_FACTORIES.get(this.modulePath)!;
+    return new FakeComponentFactory(this.modulePath);
   }
 }
 
@@ -168,3 +288,9 @@ class FakeModuleFactoryLoader extends NgModuleFactoryLoader {
     return Promise.resolve(fakeModuleFactory);
   }
 }
+
+function returnPromisesFromSpy(spy: jasmine.Spy): Deferred[] {
+  const deferreds: Deferred[] = [];
+  spy.and.callFake(() => new Promise((resolve, reject) => deferreds.push({resolve, reject})));
+  return deferreds;
+}
diff --git a/aio/src/app/custom-elements/elements-loader.ts b/aio/src/app/custom-elements/elements-loader.ts
index 1316608e50..0dd45a008d 100644
--- a/aio/src/app/custom-elements/elements-loader.ts
+++ b/aio/src/app/custom-elements/elements-loader.ts
@@ -11,11 +11,13 @@ import { createCustomElement } from '@angular/elements';
 @Injectable()
 export class ElementsLoader {
   /** Map of unregistered custom elements and their respective module paths to load. */
-  elementsToLoad: Map<string, string>;
+  private elementsToLoad: Map<string, string>;
+  /** Map of custom elements that are in the process of being loaded and registered. */
+  private elementsLoading = new Map<string, Promise<void>>();
 
   constructor(private moduleFactoryLoader: NgModuleFactoryLoader,
               private moduleRef: NgModuleRef<any>,
-              @Inject(ELEMENT_MODULE_PATHS_TOKEN) elementModulePaths) {
+              @Inject(ELEMENT_MODULE_PATHS_TOKEN) elementModulePaths: Map<string, string>) {
     this.elementsToLoad = new Map(elementModulePaths);
   }
 
@@ -25,30 +27,56 @@ export class ElementsLoader {
    * elements so that they will not be queried in subsequent calls.
    */
   loadContainingCustomElements(element: HTMLElement): Observable<void> {
-    const selectors: any[] = Array.from(this.elementsToLoad.keys())
+    const unregisteredSelectors = Array.from(this.elementsToLoad.keys())
         .filter(s => element.querySelector(s));
 
-    if (!selectors.length) { return of(undefined); }
+    if (!unregisteredSelectors.length) { return of(undefined); }
 
     // Returns observable that completes when all discovered elements have been registered.
-    return fromPromise(Promise.all(selectors.map(s => this.register(s))).then(result => undefined));
+    const allRegistered = Promise.all(unregisteredSelectors.map(s => this.loadCustomElement(s)));
+    return fromPromise(allRegistered.then(() => undefined));
   }
 
-  /** Registers the custom element defined on the WithCustomElement module factory. */
-  private register(selector: string) {
-    const modulePath = this.elementsToLoad.get(selector)!;
-    return this.moduleFactoryLoader.load(modulePath).then(elementModuleFactory => {
-      if (!this.elementsToLoad.has(selector)) { return; }
+  /** Loads and registers the custom element defined on the `WithCustomElement` module factory. */
+  loadCustomElement(selector: string): Promise<void> {
+    if (this.elementsLoading.has(selector)) {
+      // The custom element is in the process of being loaded and registered.
+      return this.elementsLoading.get(selector)!;
+    }
 
-      const elementModuleRef = elementModuleFactory.create(this.moduleRef.injector);
-      const CustomElementComponent = elementModuleRef.instance.customElementComponent;
-      const CustomElement =
-          createCustomElement(CustomElementComponent, {injector: elementModuleRef.injector});
+    if (this.elementsToLoad.has(selector)) {
+      // Load and register the custom element (for the first time).
+      const modulePath = this.elementsToLoad.get(selector)!;
+      const loadedAndRegistered = this.moduleFactoryLoader
+          .load(modulePath)
+          .then(elementModuleFactory => {
+            const elementModuleRef = elementModuleFactory.create(this.moduleRef.injector);
+            const injector = elementModuleRef.injector;
+            const CustomElementComponent = elementModuleRef.instance.customElementComponent;
+            const CustomElement = createCustomElement(CustomElementComponent, {injector});
 
-      customElements!.define(selector, CustomElement);
-      this.elementsToLoad.delete(selector);
+            customElements!.define(selector, CustomElement);
+            return customElements.whenDefined(selector);
+          })
+          .then(() => {
+            // The custom element has been successfully loaded and registered.
+            // Remove from `elementsLoading` and `elementsToLoad`.
+            this.elementsLoading.delete(selector);
+            this.elementsToLoad.delete(selector);
+          })
+          .catch(err => {
+            // The custom element has failed to load and register.
+            // Remove from `elementsLoading`.
+            // (Do not remove from `elementsToLoad` in case it was a temporary error.)
+            this.elementsLoading.delete(selector);
+            return Promise.reject(err);
+          });
 
-      return customElements.whenDefined(selector);
-    });
+      this.elementsLoading.set(selector, loadedAndRegistered);
+      return loadedAndRegistered;
+    }
+
+    // The custom element has already been loaded and registered.
+    return Promise.resolve();
   }
 }

From 7a9c987e560643eea3ff2c65768a2235dcb727be Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 15 May 2018 19:49:50 +0300
Subject: [PATCH 109/582] refactor(aio): order custom elements by selector
 (#23944)

PR Close #23944
---
 .../app/custom-elements/element-registry.ts   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/aio/src/app/custom-elements/element-registry.ts b/aio/src/app/custom-elements/element-registry.ts
index ca7fed36f4..9d07396ed5 100644
--- a/aio/src/app/custom-elements/element-registry.ts
+++ b/aio/src/app/custom-elements/element-registry.ts
@@ -13,8 +13,8 @@ export const ELEMENT_MODULE_PATHS_AS_ROUTES = [
     loadChildren: './api/api-list.module#ApiListModule'
   },
   {
-    selector: 'live-example',
-    loadChildren: './live-example/live-example.module#LiveExampleModule'
+    selector: 'aio-contributor-list',
+    loadChildren: './contributor/contributor-list.module#ContributorListModule'
   },
   {
     selector: 'aio-file-not-found-search',
@@ -25,25 +25,25 @@ export const ELEMENT_MODULE_PATHS_AS_ROUTES = [
     loadChildren: './resource/resource-list.module#ResourceListModule'
   },
   {
-    selector: 'current-location',
-    loadChildren: './current-location/current-location.module#CurrentLocationModule'
-  },
-  {
-    selector: 'aio-contributor-list',
-    loadChildren: './contributor/contributor-list.module#ContributorListModule'
+    selector: 'code-example',
+    loadChildren: './code/code-example.module#CodeExampleModule'
   },
   {
     selector: 'code-tabs',
     loadChildren: './code/code-tabs.module#CodeTabsModule'
   },
   {
-    selector: 'code-example',
-    loadChildren: './code/code-example.module#CodeExampleModule'
+    selector: 'current-location',
+    loadChildren: './current-location/current-location.module#CurrentLocationModule'
   },
   {
     selector: 'expandable-section',
     loadChildren: './expandable-section/expandable-section.module#ExpandableSectionModule'
-  }
+  },
+  {
+    selector: 'live-example',
+    loadChildren: './live-example/live-example.module#LiveExampleModule'
+  },
 ];
 
 /**

From 431a42a238863f4b436e3cc88950eafb9e555595 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 15 May 2018 21:37:16 +0300
Subject: [PATCH 110/582] feat(aio): add component for lazy-loading custom
 element (#23944)

PR Close #23944
---
 .../custom-elements/custom-elements.module.ts |  3 +
 .../lazy-custom-element.component.spec.ts     | 67 +++++++++++++++++++
 .../lazy-custom-element.component.ts          | 27 ++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 aio/src/app/custom-elements/lazy-custom-element.component.spec.ts
 create mode 100644 aio/src/app/custom-elements/lazy-custom-element.component.ts

diff --git a/aio/src/app/custom-elements/custom-elements.module.ts b/aio/src/app/custom-elements/custom-elements.module.ts
index ebc5b3704a..f2000a391f 100644
--- a/aio/src/app/custom-elements/custom-elements.module.ts
+++ b/aio/src/app/custom-elements/custom-elements.module.ts
@@ -6,8 +6,11 @@ import {
   ELEMENT_MODULE_PATHS_AS_ROUTES,
   ELEMENT_MODULE_PATHS_TOKEN
 } from './element-registry';
+import { LazyCustomElementComponent } from './lazy-custom-element.component';
 
 @NgModule({
+  declarations: [ LazyCustomElementComponent ],
+  exports: [ LazyCustomElementComponent ],
   providers: [
     ElementsLoader,
     { provide: NgModuleFactoryLoader, useClass: SystemJsNgModuleLoader },
diff --git a/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts b/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts
new file mode 100644
index 0000000000..3e7c9a5fa5
--- /dev/null
+++ b/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts
@@ -0,0 +1,67 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Logger } from 'app/shared/logger.service';
+import { MockLogger } from 'testing/logger.service';
+import { LazyCustomElementComponent } from './lazy-custom-element.component';
+import { ElementsLoader } from './elements-loader';
+
+describe('LazyCustomElementComponent', () => {
+  let mockElementsLoader: jasmine.SpyObj<ElementsLoader>;
+  let mockLogger: MockLogger;
+  let fixture: ComponentFixture<LazyCustomElementComponent>;
+
+  beforeEach(() => {
+    mockElementsLoader = jasmine.createSpyObj<ElementsLoader>('ElementsLoader', [
+      'loadContainingCustomElements',
+      'loadCustomElement',
+    ]);
+
+    const injector = TestBed.configureTestingModule({
+      declarations: [ LazyCustomElementComponent ],
+      providers: [
+        { provide: ElementsLoader, useValue: mockElementsLoader },
+        { provide: Logger, useClass: MockLogger },
+      ],
+    });
+
+    mockLogger = injector.get(Logger);
+    fixture = TestBed.createComponent(LazyCustomElementComponent);
+  });
+
+  it('should set the HTML content based on the selector', () => {
+    const elem = fixture.nativeElement;
+
+    expect(elem.innerHTML).toBe('');
+
+    fixture.componentInstance.selector = 'foo-bar';
+    fixture.detectChanges();
+
+    expect(elem.innerHTML).toBe('<foo-bar></foo-bar>');
+  });
+
+  it('should load the specified custom element', () => {
+    expect(mockElementsLoader.loadCustomElement).not.toHaveBeenCalled();
+
+    fixture.componentInstance.selector = 'foo-bar';
+    fixture.detectChanges();
+
+    expect(mockElementsLoader.loadCustomElement).toHaveBeenCalledWith('foo-bar');
+  });
+
+  it('should log an error (and abort) if the selector is empty', () => {
+    fixture.detectChanges();
+
+    expect(mockElementsLoader.loadCustomElement).not.toHaveBeenCalled();
+    expect(mockLogger.output.error).toEqual([[jasmine.any(Error)]]);
+    expect(mockLogger.output.error[0][0].message).toBe('Invalid selector for \'aio-lazy-ce\': ');
+  });
+
+  it('should log an error (and abort) if the selector is invalid', () => {
+    fixture.componentInstance.selector = 'foo-bar><script></script><foo-bar';
+    fixture.detectChanges();
+
+    expect(mockElementsLoader.loadCustomElement).not.toHaveBeenCalled();
+    expect(mockLogger.output.error).toEqual([[jasmine.any(Error)]]);
+    expect(mockLogger.output.error[0][0].message).toBe(
+        'Invalid selector for \'aio-lazy-ce\': foo-bar><script></script><foo-bar');
+  });
+});
diff --git a/aio/src/app/custom-elements/lazy-custom-element.component.ts b/aio/src/app/custom-elements/lazy-custom-element.component.ts
new file mode 100644
index 0000000000..1b1f4d4e23
--- /dev/null
+++ b/aio/src/app/custom-elements/lazy-custom-element.component.ts
@@ -0,0 +1,27 @@
+import { Component, ElementRef, Input, OnInit } from '@angular/core';
+import { Logger } from 'app/shared/logger.service';
+import { ElementsLoader } from './elements-loader';
+
+@Component({
+  selector: 'aio-lazy-ce',
+  template: '',
+})
+export class LazyCustomElementComponent implements OnInit {
+  @Input() selector = '';
+
+  constructor(
+    private elementRef: ElementRef,
+    private elementsLoader: ElementsLoader,
+    private logger: Logger,
+  ) {}
+
+  ngOnInit() {
+    if (!this.selector || /[^\w-]/.test(this.selector)) {
+      this.logger.error(new Error(`Invalid selector for 'aio-lazy-ce': ${this.selector}`));
+      return;
+    }
+
+    this.elementRef.nativeElement.innerHTML = `<${this.selector}></${this.selector}>`;
+    this.elementsLoader.loadCustomElement(this.selector);
+  }
+}

From 6e05ae02a2bcc054043f1e3380dd326a08bc65f6 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 16 May 2018 20:24:24 +0300
Subject: [PATCH 111/582] fix(aio): show embedded ToC (#23944)

On narrow screens (where there is not enough room on the right to show
the floating ToC), an embedded ToC is shown (via an `<aio-toc embedded>`
element in the document). Since ToC was not a custom element, the
component was not instantiated for the embedded element.

This commit fixes it by making `aio-toc` a custom element and loading it
manually for the floating ToC (if necessary).

PR Close #23944
---
 aio/scripts/_payload-limits.json              |  4 +-
 aio/src/app/app.component.html                |  2 +-
 aio/src/app/app.component.spec.ts             | 37 ++++++++++++-------
 aio/src/app/app.module.ts                     |  3 --
 .../app/custom-elements/element-registry.ts   |  4 ++
 .../toc/toc.component.html                    |  0
 .../toc/toc.component.spec.ts                 |  2 +-
 .../toc/toc.component.ts                      |  0
 aio/src/app/custom-elements/toc/toc.module.ts | 14 +++++++
 9 files changed, 45 insertions(+), 21 deletions(-)
 rename aio/src/app/{layout => custom-elements}/toc/toc.component.html (100%)
 rename aio/src/app/{layout => custom-elements}/toc/toc.component.spec.ts (100%)
 rename aio/src/app/{layout => custom-elements}/toc/toc.component.ts (100%)
 create mode 100644 aio/src/app/custom-elements/toc/toc.module.ts

diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
index a3fdfa790d..6861676969 100755
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@@ -2,8 +2,8 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime": 2712,
-        "main": 479729,
+        "runtime": 2768,
+        "main": 475857,
         "polyfills": 38453,
         "prettify": 14913
       }
diff --git a/aio/src/app/app.component.html b/aio/src/app/app.component.html
index 1e7ad72a53..7a35fd6884 100644
--- a/aio/src/app/app.component.html
+++ b/aio/src/app/app.component.html
@@ -58,7 +58,7 @@
 </mat-sidenav-container>
 
 <div *ngIf="hasFloatingToc" class="toc-container no-print" [style.max-height.px]="tocMaxHeight" (mousewheel)="restrainScrolling($event)">
-  <aio-toc></aio-toc>
+  <aio-lazy-ce selector="aio-toc"></aio-lazy-ce>
 </div>
 
 <footer class="no-print">
diff --git a/aio/src/app/app.component.spec.ts b/aio/src/app/app.component.spec.ts
index e3c2522063..3597f8acd2 100644
--- a/aio/src/app/app.component.spec.ts
+++ b/aio/src/app/app.component.spec.ts
@@ -6,7 +6,7 @@ import { HttpClient } from '@angular/common/http';
 import { MatProgressBar, MatSidenav } from '@angular/material';
 import { By } from '@angular/platform-browser';
 
-import { timer } from 'rxjs';
+import { of, timer } from 'rxjs';
 import { first, mapTo } from 'rxjs/operators';
 
 import { AppComponent } from './app.component';
@@ -14,6 +14,7 @@ import { AppModule } from './app.module';
 import { DocumentService } from 'app/documents/document.service';
 import { DocViewerComponent } from 'app/layout/doc-viewer/doc-viewer.component';
 import { Deployment } from 'app/shared/deployment.service';
+import { ElementsLoader } from 'app/custom-elements/elements-loader';
 import { GaService } from 'app/shared/ga.service';
 import { LocationService } from 'app/shared/location.service';
 import { Logger } from 'app/shared/logger.service';
@@ -26,7 +27,6 @@ import { SearchBoxComponent } from 'app/search/search-box/search-box.component';
 import { SearchResultsComponent } from 'app/shared/search-results/search-results.component';
 import { SearchService } from 'app/search/search.service';
 import { SelectComponent } from 'app/shared/select/select.component';
-import { TocComponent } from 'app/layout/toc/toc.component';
 import { TocItem, TocService } from 'app/shared/toc.service';
 
 const sideBySideBreakPoint = 992;
@@ -621,53 +621,53 @@ describe('AppComponent', () => {
     });
 
     describe('aio-toc', () => {
-      let tocDebugElement: DebugElement;
-      let tocContainer: DebugElement|null;
+      let tocContainer: HTMLElement|null;
+      let toc: HTMLElement|null;
 
       const setHasFloatingToc = (hasFloatingToc: boolean) => {
         component.hasFloatingToc = hasFloatingToc;
         fixture.detectChanges();
 
-        tocDebugElement = fixture.debugElement.query(By.directive(TocComponent));
-        tocContainer = tocDebugElement && tocDebugElement.parent;
+        tocContainer = fixture.debugElement.nativeElement.querySelector('.toc-container');
+        toc = tocContainer && tocContainer.querySelector('aio-toc');
       };
 
       beforeEach(() => setHasFloatingToc(true));
 
 
       it('should show/hide `<aio-toc>` based on `hasFloatingToc`', () => {
-        expect(tocDebugElement).toBeTruthy();
         expect(tocContainer).toBeTruthy();
+        expect(toc).toBeTruthy();
 
         setHasFloatingToc(false);
-        expect(tocDebugElement).toBeFalsy();
         expect(tocContainer).toBeFalsy();
+        expect(toc).toBeFalsy();
 
         setHasFloatingToc(true);
-        expect(tocDebugElement).toBeTruthy();
         expect(tocContainer).toBeTruthy();
+        expect(toc).toBeTruthy();
       });
 
       it('should have a non-embedded `<aio-toc>` element', () => {
-        expect(tocDebugElement.classes['embedded']).toBeFalsy();
+        expect(toc!.classList.contains('embedded')).toBe(false);
       });
 
       it('should update the TOC container\'s `maxHeight` based on `tocMaxHeight`', () => {
-        expect(tocContainer!.styles['max-height']).toBeNull();
+        expect(tocContainer!.style['max-height']).toBe('');
 
         component.tocMaxHeight = '100';
         fixture.detectChanges();
 
-        expect(tocContainer!.styles['max-height']).toBe('100px');
+        expect(tocContainer!.style['max-height']).toBe('100px');
       });
 
       it('should restrain scrolling inside the ToC container', () => {
         const restrainScrolling = spyOn(component, 'restrainScrolling');
-        const evt = {};
+        const evt = new MouseEvent('mousewheel');
 
         expect(restrainScrolling).not.toHaveBeenCalled();
 
-        tocContainer!.triggerEventHandler('mousewheel', evt);
+        tocContainer!.dispatchEvent(evt);
         expect(restrainScrolling).toHaveBeenCalledWith(evt);
       });
     });
@@ -1280,6 +1280,7 @@ function createTestingModule(initialUrl: string, mode: string = 'stable') {
     imports: [ AppModule ],
     providers: [
       { provide: APP_BASE_HREF, useValue: '/' },
+      { provide: ElementsLoader, useClass: TestElementsLoader },
       { provide: GaService, useClass: TestGaService },
       { provide: HttpClient, useClass: TestHttpClient },
       { provide: LocationService, useFactory: () => mockLocationService },
@@ -1294,6 +1295,14 @@ function createTestingModule(initialUrl: string, mode: string = 'stable') {
   });
 }
 
+class TestElementsLoader {
+  loadContainingCustomElements = jasmine.createSpy('loadContainingCustomElements')
+      .and.returnValue(of(undefined));
+
+  loadCustomElement = jasmine.createSpy('loadCustomElement')
+      .and.returnValue(Promise.resolve());
+}
+
 class TestGaService {
   locationChanged = jasmine.createSpy('locationChanged');
 }
diff --git a/aio/src/app/app.module.ts b/aio/src/app/app.module.ts
index 78fe5b905e..a3e89e24ce 100644
--- a/aio/src/app/app.module.ts
+++ b/aio/src/app/app.module.ts
@@ -32,7 +32,6 @@ import { ScrollService } from 'app/shared/scroll.service';
 import { ScrollSpyService } from 'app/shared/scroll-spy.service';
 import { SearchBoxComponent } from 'app/search/search-box/search-box.component';
 import { NotificationComponent } from 'app/layout/notification/notification.component';
-import { TocComponent } from 'app/layout/toc/toc.component';
 import { TocService } from 'app/shared/toc.service';
 import { CurrentDateToken, currentDateProvider } from 'app/shared/current-date';
 import { WindowToken, windowProvider } from 'app/shared/window';
@@ -111,7 +110,6 @@ export const svgIconProviders = [
     NavItemComponent,
     SearchBoxComponent,
     NotificationComponent,
-    TocComponent,
     TopMenuComponent,
   ],
   providers: [
@@ -133,7 +131,6 @@ export const svgIconProviders = [
     { provide: CurrentDateToken, useFactory: currentDateProvider },
     { provide: WindowToken, useFactory: windowProvider },
   ],
-  entryComponents: [ TocComponent ],
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
diff --git a/aio/src/app/custom-elements/element-registry.ts b/aio/src/app/custom-elements/element-registry.ts
index 9d07396ed5..d8ca727b67 100644
--- a/aio/src/app/custom-elements/element-registry.ts
+++ b/aio/src/app/custom-elements/element-registry.ts
@@ -24,6 +24,10 @@ export const ELEMENT_MODULE_PATHS_AS_ROUTES = [
     selector: 'aio-resource-list',
     loadChildren: './resource/resource-list.module#ResourceListModule'
   },
+  {
+    selector: 'aio-toc',
+    loadChildren: './toc/toc.module#TocModule'
+  },
   {
     selector: 'code-example',
     loadChildren: './code/code-example.module#CodeExampleModule'
diff --git a/aio/src/app/layout/toc/toc.component.html b/aio/src/app/custom-elements/toc/toc.component.html
similarity index 100%
rename from aio/src/app/layout/toc/toc.component.html
rename to aio/src/app/custom-elements/toc/toc.component.html
diff --git a/aio/src/app/layout/toc/toc.component.spec.ts b/aio/src/app/custom-elements/toc/toc.component.spec.ts
similarity index 100%
rename from aio/src/app/layout/toc/toc.component.spec.ts
rename to aio/src/app/custom-elements/toc/toc.component.spec.ts
index a13e2afacf..c7f228724f 100644
--- a/aio/src/app/layout/toc/toc.component.spec.ts
+++ b/aio/src/app/custom-elements/toc/toc.component.spec.ts
@@ -4,8 +4,8 @@ import { By } from '@angular/platform-browser';
 import { asapScheduler as asap, BehaviorSubject } from 'rxjs';
 
 import { ScrollService } from 'app/shared/scroll.service';
-import { TocComponent } from './toc.component';
 import { TocItem, TocService } from 'app/shared/toc.service';
+import { TocComponent } from './toc.component';
 
 describe('TocComponent', () => {
   let tocComponentDe: DebugElement;
diff --git a/aio/src/app/layout/toc/toc.component.ts b/aio/src/app/custom-elements/toc/toc.component.ts
similarity index 100%
rename from aio/src/app/layout/toc/toc.component.ts
rename to aio/src/app/custom-elements/toc/toc.component.ts
diff --git a/aio/src/app/custom-elements/toc/toc.module.ts b/aio/src/app/custom-elements/toc/toc.module.ts
new file mode 100644
index 0000000000..848176261e
--- /dev/null
+++ b/aio/src/app/custom-elements/toc/toc.module.ts
@@ -0,0 +1,14 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatIconModule } from '@angular/material/icon';
+import { WithCustomElementComponent } from '../element-registry';
+import { TocComponent } from './toc.component';
+
+@NgModule({
+  imports: [ CommonModule, MatIconModule ],
+  declarations: [ TocComponent ],
+  entryComponents: [ TocComponent ],
+})
+export class TocModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = TocComponent;
+}

From 7866684f2b7b5de2d911f18934638d8509361c3e Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 16 May 2018 20:37:04 +0300
Subject: [PATCH 112/582] fix(aio): avoid loading the ToC component until it is
 necessary (#23944)

PR Close #23944
---
 aio/src/app/app.component.spec.ts | 28 +++++++++++++++++++---------
 aio/src/app/app.component.ts      |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/aio/src/app/app.component.spec.ts b/aio/src/app/app.component.spec.ts
index 3597f8acd2..6431d9c79c 100644
--- a/aio/src/app/app.component.spec.ts
+++ b/aio/src/app/app.component.spec.ts
@@ -92,11 +92,11 @@ describe('AppComponent', () => {
     });
 
     describe('hasFloatingToc', () => {
-      it('should initially be true', () => {
+      it('should initially be false', () => {
         const fixture2 = TestBed.createComponent(AppComponent);
         const component2 = fixture2.componentInstance;
 
-        expect(component2.hasFloatingToc).toBe(true);
+        expect(component2.hasFloatingToc).toBe(false);
       });
 
       it('should be false on narrow screens', () => {
@@ -632,27 +632,28 @@ describe('AppComponent', () => {
         toc = tocContainer && tocContainer.querySelector('aio-toc');
       };
 
-      beforeEach(() => setHasFloatingToc(true));
-
 
       it('should show/hide `<aio-toc>` based on `hasFloatingToc`', () => {
-        expect(tocContainer).toBeTruthy();
-        expect(toc).toBeTruthy();
-
-        setHasFloatingToc(false);
         expect(tocContainer).toBeFalsy();
         expect(toc).toBeFalsy();
 
         setHasFloatingToc(true);
         expect(tocContainer).toBeTruthy();
         expect(toc).toBeTruthy();
+
+        setHasFloatingToc(false);
+        expect(tocContainer).toBeFalsy();
+        expect(toc).toBeFalsy();
       });
 
       it('should have a non-embedded `<aio-toc>` element', () => {
+        setHasFloatingToc(true);
         expect(toc!.classList.contains('embedded')).toBe(false);
       });
 
       it('should update the TOC container\'s `maxHeight` based on `tocMaxHeight`', () => {
+        setHasFloatingToc(true);
+
         expect(tocContainer!.style['max-height']).toBe('');
 
         component.tocMaxHeight = '100';
@@ -665,11 +666,20 @@ describe('AppComponent', () => {
         const restrainScrolling = spyOn(component, 'restrainScrolling');
         const evt = new MouseEvent('mousewheel');
 
+        setHasFloatingToc(true);
         expect(restrainScrolling).not.toHaveBeenCalled();
 
         tocContainer!.dispatchEvent(evt);
         expect(restrainScrolling).toHaveBeenCalledWith(evt);
       });
+
+      it('should not be loaded/registered until necessary', () => {
+        const loader: TestElementsLoader = fixture.debugElement.injector.get(ElementsLoader);
+        expect(loader.loadCustomElement).not.toHaveBeenCalled();
+
+        setHasFloatingToc(true);
+        expect(loader.loadCustomElement).toHaveBeenCalledWith('aio-toc');
+      });
     });
 
     describe('footer', () => {
@@ -1377,7 +1387,7 @@ class TestHttpClient {
       const id = match[1]!;
       // Make up a title for test purposes
       const title = id.split('/').pop()!.replace(/^([a-z])/, (_, letter) => letter.toUpperCase());
-      const h1 = (id === 'no-title') ? '' : `<h1>${title}</h1>`;
+      const h1 = (id === 'no-title') ? '' : `<h1 class="no-toc">${title}</h1>`;
       const contents = `${h1}<h2 id="#somewhere">Some heading</h2>`;
       data = { id, contents };
     }
diff --git a/aio/src/app/app.component.ts b/aio/src/app/app.component.ts
index 24344af74a..e587d25ad1 100644
--- a/aio/src/app/app.component.ts
+++ b/aio/src/app/app.component.ts
@@ -69,7 +69,7 @@ export class AppComponent implements OnInit {
   topMenuNodes: NavigationNode[];
   topMenuNarrowNodes: NavigationNode[];
 
-  hasFloatingToc = true;
+  hasFloatingToc = false;
   private showFloatingToc = new BehaviorSubject(false);
   private showFloatingTocWidth = 800;
   tocMaxHeight: string;

From c2e131119bedbb9761dcc88fae6c12cbdef25e07 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 22 May 2018 17:31:05 +0300
Subject: [PATCH 113/582] refactor(aio): rename method
 (loadContainingCustomElements --> loadContainedCustomElements) (#23944)

PR Close #23944
---
 aio/scripts/_payload-limits.json                       |  2 +-
 aio/src/app/app.component.spec.ts                      |  2 +-
 aio/src/app/custom-elements/elements-loader.spec.ts    | 10 +++++-----
 aio/src/app/custom-elements/elements-loader.ts         |  2 +-
 .../lazy-custom-element.component.spec.ts              |  2 +-
 .../app/layout/doc-viewer/doc-viewer.component.spec.ts |  2 +-
 aio/src/app/layout/doc-viewer/doc-viewer.component.ts  |  2 +-
 aio/src/testing/doc-viewer-utils.ts                    |  4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
index 6861676969..b02773aeef 100755
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime": 2768,
-        "main": 475857,
+        "main": 475855,
         "polyfills": 38453,
         "prettify": 14913
       }
diff --git a/aio/src/app/app.component.spec.ts b/aio/src/app/app.component.spec.ts
index 6431d9c79c..5b646af0a5 100644
--- a/aio/src/app/app.component.spec.ts
+++ b/aio/src/app/app.component.spec.ts
@@ -1306,7 +1306,7 @@ function createTestingModule(initialUrl: string, mode: string = 'stable') {
 }
 
 class TestElementsLoader {
-  loadContainingCustomElements = jasmine.createSpy('loadContainingCustomElements')
+  loadContainedCustomElements = jasmine.createSpy('loadContainedCustomElements')
       .and.returnValue(of(undefined));
 
   loadCustomElement = jasmine.createSpy('loadCustomElement')
diff --git a/aio/src/app/custom-elements/elements-loader.spec.ts b/aio/src/app/custom-elements/elements-loader.spec.ts
index 906e74283e..817dd71a57 100644
--- a/aio/src/app/custom-elements/elements-loader.spec.ts
+++ b/aio/src/app/custom-elements/elements-loader.spec.ts
@@ -33,7 +33,7 @@ describe('ElementsLoader', () => {
     elementsLoader = injector.get(ElementsLoader);
   });
 
-  describe('loadContainingCustomElements()', () => {
+  describe('loadContainedCustomElements()', () => {
     let loadCustomElementSpy: jasmine.Spy;
 
     beforeEach(() => loadCustomElementSpy = spyOn(elementsLoader, 'loadCustomElement'));
@@ -47,7 +47,7 @@ describe('ElementsLoader', () => {
         <element-b-selector></element-b-selector>
       `;
 
-      elementsLoader.loadContainingCustomElements(hostEl);
+      elementsLoader.loadContainedCustomElements(hostEl);
       flushMicrotasks();
 
       expect(loadCustomElementSpy).toHaveBeenCalledTimes(2);
@@ -63,7 +63,7 @@ describe('ElementsLoader', () => {
         <element-b-selector></element-b-selector>
       `;
 
-      elementsLoader.loadContainingCustomElements(hostEl);
+      elementsLoader.loadContainedCustomElements(hostEl);
       flushMicrotasks();
 
       expect(loadCustomElementSpy).toHaveBeenCalledTimes(1);
@@ -80,7 +80,7 @@ describe('ElementsLoader', () => {
       `;
 
       const log: any[] = [];
-      elementsLoader.loadContainingCustomElements(hostEl).subscribe(
+      elementsLoader.loadContainedCustomElements(hostEl).subscribe(
         v => log.push(`emitted: ${v}`),
         e => log.push(`errored: ${e}`),
         () => log.push('completed'),
@@ -108,7 +108,7 @@ describe('ElementsLoader', () => {
       `;
 
       const log: any[] = [];
-      elementsLoader.loadContainingCustomElements(hostEl).subscribe(
+      elementsLoader.loadContainedCustomElements(hostEl).subscribe(
         v => log.push(`emitted: ${v}`),
         e => log.push(`errored: ${e}`),
         () => log.push('completed'),
diff --git a/aio/src/app/custom-elements/elements-loader.ts b/aio/src/app/custom-elements/elements-loader.ts
index 0dd45a008d..8eef788c5b 100644
--- a/aio/src/app/custom-elements/elements-loader.ts
+++ b/aio/src/app/custom-elements/elements-loader.ts
@@ -26,7 +26,7 @@ export class ElementsLoader {
    * the browser. Custom elements that are registered will be removed from the list of unregistered
    * elements so that they will not be queried in subsequent calls.
    */
-  loadContainingCustomElements(element: HTMLElement): Observable<void> {
+  loadContainedCustomElements(element: HTMLElement): Observable<void> {
     const unregisteredSelectors = Array.from(this.elementsToLoad.keys())
         .filter(s => element.querySelector(s));
 
diff --git a/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts b/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts
index 3e7c9a5fa5..5bb0eeefa5 100644
--- a/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts
+++ b/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts
@@ -11,7 +11,7 @@ describe('LazyCustomElementComponent', () => {
 
   beforeEach(() => {
     mockElementsLoader = jasmine.createSpyObj<ElementsLoader>('ElementsLoader', [
-      'loadContainingCustomElements',
+      'loadContainedCustomElements',
       'loadCustomElement',
     ]);
 
diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts
index 42ba737be3..1f1ae32a71 100644
--- a/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts
+++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts
@@ -300,7 +300,7 @@ describe('DocViewerComponent', () => {
 
     beforeEach(() => {
       const elementsLoader = TestBed.get(ElementsLoader) as MockElementsLoader;
-      loadElementsSpy = elementsLoader.loadContainingCustomElements.and.returnValue(of(undefined));
+      loadElementsSpy = elementsLoader.loadContainedCustomElements.and.returnValue(of(undefined));
       prepareTitleAndTocSpy = spyOn(docViewer, 'prepareTitleAndToc');
       swapViewsSpy = spyOn(docViewer, 'swapViews').and.returnValue(of(undefined));
     });
diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts
index 26a4513c99..a1b5ddabb0 100644
--- a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts
+++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts
@@ -136,7 +136,7 @@ export class DocViewerComponent implements OnDestroy {
         //           and is considered to be safe.
         tap(() => this.nextViewContainer.innerHTML = doc.contents || ''),
         tap(() => addTitleAndToc = this.prepareTitleAndToc(this.nextViewContainer, doc.id)),
-        switchMap(() => this.elementsLoader.loadContainingCustomElements(this.nextViewContainer)),
+        switchMap(() => this.elementsLoader.loadContainedCustomElements(this.nextViewContainer)),
         tap(() => this.docReady.emit()),
         switchMap(() => this.swapViews(addTitleAndToc)),
         tap(() => this.docRendered.emit()),
diff --git a/aio/src/testing/doc-viewer-utils.ts b/aio/src/testing/doc-viewer-utils.ts
index cc7a207805..a078e492ec 100644
--- a/aio/src/testing/doc-viewer-utils.ts
+++ b/aio/src/testing/doc-viewer-utils.ts
@@ -56,8 +56,8 @@ export class MockTocService {
 }
 
 export class MockElementsLoader {
-  loadContainingCustomElements =
-      jasmine.createSpy('MockElementsLoader#loadContainingCustomElements');
+  loadContainedCustomElements =
+      jasmine.createSpy('MockElementsLoader#loadContainedCustomElements');
 }
 
 @NgModule({

From 00c4751f374a561cc980b82adfd5c18747b869ed Mon Sep 17 00:00:00 2001
From: jenniferfell <jenniferfell.sf@gmail.com>
Date: Mon, 14 May 2018 17:38:27 -0600
Subject: [PATCH 114/582] docs: update lts and labs practices (#23922)

PR Close #23922
---
 aio/content/guide/releases.md | 60 +++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/aio/content/guide/releases.md b/aio/content/guide/releases.md
index 0d4854388e..f7a8c4ae63 100644
--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@@ -74,22 +74,58 @@ The following table contains our current target release dates for the next two m
 
 
 {@a lts}
-## Long-term support
+{@a support}
+## Support policy
 
-All of our releases are supported actively for about 6 months (until the next major release), and then they are supported through long-term support (LTS) for another 12 months.
+All of our major releases are supported for 18 months. 
 
-During the LTS period, only critical fixes and security patches will be merged and released.
+* 6 months of active support, during which regularly-scheduled updates and patches are released, as described above in [Release frequency](#frequency "Release frequency").
 
-The LTS state of one major version starts on the day of the next major release. LTS status ends approximately one year later, when we release another major version. 
+* 12 months of long-term support (LTS). During the LTS period, only critical fixes and security patches will be released.
 
+The following table provides the support status and key dates for Angular version 4.0.0 and higher. 
 
+<style>
 
- Version     | LTS Start Date | LTS End Date
- ----------- | -------------- | ------------
- ^4.0.0      | October 2017   | October 2018
- ^5.0.0      | April 2018     | April 2019
- ^6.0.0      | October 2018   | October 2019
+    td, th {vertical-align: top}
 
+</style>
+
+<table>
+
+    <tr>
+        <th>Version</th>
+        <th>Status</th>
+        <th>Release Date</th>
+        <th>LTS Start Date</th>
+        <th>LTS End Date</th>
+    </tr>
+
+    <tr>
+        <td>^4.0.0</td>
+        <td>LTS</td>
+        <td>March 23, 2017</td>
+        <td>September 23, 2017</td>
+        <td>September 23, 2018</td>
+    </tr>
+
+    <tr>
+        <td>^5.0.0</td>
+        <td>LTS</td>
+        <td>November 1, 2017</td>
+        <td>May 1, 2018</td>
+        <td>May 1, 2019</td>
+    </tr>
+
+    <tr>
+        <td>^6.0.0</td>
+        <td>Active</td>
+        <td>May 3, 2018</td>
+        <td>November 3, 2018</td>
+        <td>November 3, 2019</td>
+    </tr>
+
+</table>
 
 
 
@@ -127,8 +163,6 @@ Any changes to the public API surface will be done using the versioning, support
 {@a labs}
 ## Angular Labs
 
-Angular Labs is an initiative to cultivate new features and iterate on them quickly. Angular Labs provides a safe place for exploration and experimentation by the Angular team. 
+Angular Labs is an initiative to cultivate new features and iterate on them quickly. Angular Labs provides a safe place for exploration and experimentation by the Angular team.
 
-Angular Labs projects are not ready for production use, and no commitment is made to bring them to production. The policies and practices that are described in this document do not apply to Angular Labs projects. 
-
-Angular Labs projects typically are in separate branches in the Angular repo, clearly separated from the main Angular codebase. 
+Angular Labs projects are not ready for production use, and no commitment is made to bring them to production. The policies and practices that are described in this document do not apply to Angular Labs projects.

From 1eafd04eb33698b48fc3e9f2bfbfefe7d8005f92 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 21 May 2018 15:48:00 -0700
Subject: [PATCH 115/582] build(ivy): support alternate compilation modes to
 enable Ivy testing (#24056)

Bazel has a restriction that a single output (eg. a compiled version of
//packages/common) can only be produced by a single rule. This precludes
the Angular repo from having multiple rules that build the same code. And
the complexity of having a single rule produce multiple outputs (eg. an
ngc-compiled version of //packages/common and an Ivy-enabled version) is
too high.

Additionally, the Angular repo has lots of existing tests which could be
executed as-is under Ivy. Such testing is very valuable, and it would be
nice to share not only the code, but the dependency graph / build config
as well.

Thus, this change introduces a --define flag 'compile' with three potential
values. When --define=compile=X is set, the entire build system runs in a
particular mode - the behavior of all existing targets is controlled by
the flag. This allows us to reuse our entire build structure for testing
in a variety of different manners. The flag has three possible settings:

* legacy (the default): the traditional View Engine (ngc) build
* local: runs the prototype ngtsc compiler, which does not rely on global
  analysis
* jit: runs ngtsc in a mode which executes tsickle, but excludes the
  Angular related transforms, which approximates the behavior of plain
  tsc. This allows the main packages such as common to be tested with
  the JIT compiler.

Additionally, the ivy_ng_module() rule still exists and runs ngc in a mode
where Ivy-compiled output is produced from global analysis information, as
a stopgap while ngtsc is being developed.

PR Close #24056
---
 .circleci/config.yml                          |   2 +-
 packages/bazel/src/ng_module.bzl              | 158 ++++++++++++++----
 packages/bazel/src/ng_rollup_bundle.bzl       |  57 +++++++
 packages/bazel/src/ngc-wrapped/index.ts       |  15 ++
 .../injector_def/ivy_build/app/BUILD.bazel    |   2 +-
 packages/compiler-cli/src/main.ts             |   4 +-
 packages/compiler-cli/src/transformers/api.ts |  10 +-
 .../src/transformers/compiler_host.ts         |   2 +-
 .../compiler-cli/src/transformers/program.ts  |  41 ++++-
 .../src/transformers/tsc_pass_through.ts      | 107 ++++++++++++
 packages/compiler/src/aot/compiler_options.ts |   2 +-
 packages/core/BUILD.bazel                     |  13 +-
 packages/core/src/ivy_switch.ts               |   2 +-
 packages/core/src/ivy_switch_jit.ts           |   9 +
 ...y_switch_false.ts => ivy_switch_legacy.ts} |   0
 packages/core/src/ivy_switch_local.ts         |   9 +
 .../{ivy_switch_true.ts => ivy_switch_on.ts}  |   0
 .../test/bundling/hello_world/BUILD.bazel     |   5 +-
 .../bundling/hello_world/treeshaking_spec.ts  |   3 +-
 .../test/bundling/hello_world_jit/BUILD.bazel |  58 -------
 .../test/bundling/hello_world_jit/index.html  |  31 ----
 .../test/bundling/hello_world_jit/index.ts    |  38 -----
 .../hello_world_jit/integration_spec.ts       |  23 ---
 packages/core/test/bundling/todo/BUILD.bazel  |   2 +-
 tools/bazel.rc                                |   6 +-
 tools/defaults.bzl                            |  17 +-
 26 files changed, 399 insertions(+), 217 deletions(-)
 create mode 100644 packages/compiler-cli/src/transformers/tsc_pass_through.ts
 create mode 100644 packages/core/src/ivy_switch_jit.ts
 rename packages/core/src/{ivy_switch_false.ts => ivy_switch_legacy.ts} (100%)
 create mode 100644 packages/core/src/ivy_switch_local.ts
 rename packages/core/src/{ivy_switch_true.ts => ivy_switch_on.ts} (100%)
 delete mode 100644 packages/core/test/bundling/hello_world_jit/BUILD.bazel
 delete mode 100644 packages/core/test/bundling/hello_world_jit/index.html
 delete mode 100644 packages/core/test/bundling/hello_world_jit/index.ts
 delete mode 100644 packages/core/test/bundling/hello_world_jit/integration_spec.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c49a2cc944..4aabb53b68 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -85,7 +85,7 @@ jobs:
       # This avoids waiting for the slowest build target to finish before running the first test
       # See https://github.com/bazelbuild/bazel/issues/4257
       # NOTE: Angular developers should typically just bazel build //packages/... or bazel test //packages/...
-      - run: bazel query --output=label //... | xargs bazel test
+      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only --test_tag_filters=-manual,-ivy-only
 
       # CircleCI will allow us to go back and view/download these artifacts from past builds.
       # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index afeeccc845..0daa736273 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -14,6 +14,90 @@ load(":rules_typescript.bzl",
     "ts_providers_dict_to_struct",
 )
 
+def _compile_strategy(ctx):
+  """Detect which strategy should be used to implement ng_module.
+
+  Depending on the value of the 'compile' define flag or the '_global_mode' attribute, ng_module
+  can be implemented in various ways. This function reads the configuration passed by the user and
+  determines which mode is active.
+
+  Args:
+    ctx: skylark rule execution context
+
+  Returns:
+    one of 'legacy', 'local', 'jit', or 'global' depending on the configuration in ctx
+  """
+
+  strategy = 'legacy'
+  if 'compile' in ctx.var:
+    strategy = ctx.var['compile']
+
+  if strategy not in ['legacy', 'local', 'jit']:
+    fail("Unknown --define=compile value '%s'" % strategy)
+
+  if strategy == 'legacy' and hasattr(ctx.attr, '_global_mode') and ctx.attr._global_mode:
+    strategy = 'global'
+
+  return strategy
+
+def _compiler_name(ctx):
+  """Selects a user-visible name depending on the current compilation strategy.
+
+  Args:
+    ctx: skylark rule execution context
+
+  Returns:
+    the name of the current compiler to be displayed in build output
+  """
+
+  strategy = _compile_strategy(ctx)
+  if strategy == 'legacy':
+    return 'ngc'
+  elif strategy == 'global':
+    return 'ngc.ivy'
+  elif strategy == 'local':
+    return 'ngtsc'
+  elif strategy == 'jit':
+    return 'tsc'
+  else:
+    fail('unreachable')
+
+def _enable_ivy_value(ctx):
+  """Determines the value of the enableIvy option in the generated tsconfig.
+
+  Args:
+    ctx: skylark rule execution context
+
+  Returns:
+    the value of enableIvy that needs to be set in angularCompilerOptions in the generated tsconfig
+  """
+
+  strategy = _compile_strategy(ctx)
+  if strategy == 'legacy':
+    return False
+  elif strategy == 'global':
+    return True
+  elif strategy == 'local':
+    return 'ngtsc'
+  elif strategy == 'jit':
+    return 'tsc'
+  else:
+    fail('unreachable')
+
+def _include_ng_files(ctx):
+  """Determines whether Angular outputs will be produced by the current compilation strategy.
+
+  Args:
+    ctx: skylark rule execution context
+
+  Returns:
+    true iff the current compilation strategy will produce View Engine compilation outputs (such as
+    factory files), false otherwise
+  """
+
+  strategy = _compile_strategy(ctx)
+  return strategy == 'legacy' or strategy == 'global'
+
 def _basename_of(ctx, file):
   ext_len = len(".ts")
   if file.short_path.endswith(".ng.html"):
@@ -61,6 +145,8 @@ def _should_produce_flat_module_outs(ctx):
 # in the library. Most of these will be produced as empty files but it is
 # unknown, without parsing, which will be empty.
 def _expected_outs(ctx):
+  include_ng_files = _include_ng_files(ctx)
+
   devmode_js_files = []
   closure_js_files = []
   declaration_files = []
@@ -78,7 +164,7 @@ def _expected_outs(ctx):
 
     if short_path.endswith(".ts") and not short_path.endswith(".d.ts"):
       basename = short_path[len(package_prefix):-len(".ts")]
-      if len(factory_basename_set) == 0 or basename in factory_basename_set:
+      if include_ng_files and (len(factory_basename_set) == 0 or basename in factory_basename_set):
         devmode_js = [
             ".ngfactory.js",
             ".ngsummary.js",
@@ -90,7 +176,7 @@ def _expected_outs(ctx):
         devmode_js = [".js"]
         summaries = []
         metadata = []
-    elif short_path.endswith(".css"):
+    elif include_ng_files and short_path.endswith(".css"):
       basename = short_path[len(package_prefix):-len(".css")]
       devmode_js = [
           ".css.shim.ngstyle.js",
@@ -113,7 +199,7 @@ def _expected_outs(ctx):
       metadata_files  += [ctx.actions.declare_file(basename + ext) for ext in metadata]
 
   # We do this just when producing a flat module index for a publishable ng_module
-  if _should_produce_flat_module_outs(ctx):
+  if include_ng_files and _should_produce_flat_module_outs(ctx):
     flat_module_out = _flat_module_out_file(ctx)
     devmode_js_files.append(ctx.actions.declare_file("%s.js" % flat_module_out))
     closure_js_files.append(ctx.actions.declare_file("%s.closure.js" % flat_module_out))
@@ -123,7 +209,12 @@ def _expected_outs(ctx):
   else:
     bundle_index_typings = None
 
-  i18n_messages_files = [ctx.new_file(ctx.genfiles_dir, ctx.label.name + "_ngc_messages.xmb")]
+  # TODO(alxhub): i18n is only produced by the legacy compiler currently. This should be re-enabled
+  # when ngtsc can extract messages
+  if include_ng_files:
+    i18n_messages_files = [ctx.new_file(ctx.genfiles_dir, ctx.label.name + "_ngc_messages.xmb")]
+  else:
+    i18n_messages_files = []
 
   return struct(
     closure_js = closure_js_files,
@@ -135,14 +226,9 @@ def _expected_outs(ctx):
     i18n_messages = i18n_messages_files,
   )
 
-def _ivy_tsconfig(ctx, files, srcs, **kwargs):
-  return _ngc_tsconfig_helper(ctx, files, srcs, True, **kwargs)
-
 def _ngc_tsconfig(ctx, files, srcs, **kwargs):
-  return _ngc_tsconfig_helper(ctx, files, srcs, False, **kwargs)
-
-def _ngc_tsconfig_helper(ctx, files, srcs, enable_ivy, **kwargs):
   outs = _expected_outs(ctx)
+  include_ng_files = _include_ng_files(ctx)
   if "devmode_manifest" in kwargs:
     expected_outs = outs.devmode_js + outs.declarations + outs.summaries + outs.metadata
   else:
@@ -152,8 +238,9 @@ def _ngc_tsconfig_helper(ctx, files, srcs, enable_ivy, **kwargs):
       "enableResourceInlining": ctx.attr.inline_resources,
       "generateCodeForLibraries": False,
       "allowEmptyCodegenFiles": True,
-      "enableSummariesForJit": True,
-      "enableIvy": enable_ivy,
+      # Summaries are only enabled if Angular outputs are to be produced.
+      "enableSummariesForJit": include_ng_files,
+      "enableIvy": _enable_ivy_value(ctx),
       "fullTemplateTypeCheck": ctx.attr.type_check,
       # FIXME: wrong place to de-dupe
       "expectedOut": depset([o.path for o in expected_outs]).to_list()
@@ -216,8 +303,10 @@ def ngc_compile_action(ctx, label, inputs, outputs, messages_out, tsconfig_file,
     the parameters of the compilation which will be used to replay the ngc action for i18N.
   """
 
+  include_ng_files = _include_ng_files(ctx)
+
   mnemonic = "AngularTemplateCompile"
-  progress_message = "Compiling Angular templates (ngc) %s" % label
+  progress_message = "Compiling Angular templates (%s) %s" % (_compiler_name(ctx), label)
 
   if locale:
     mnemonic = "AngularI18NMerging"
@@ -251,7 +340,7 @@ def ngc_compile_action(ctx, label, inputs, outputs, messages_out, tsconfig_file,
       },
   )
 
-  if messages_out != None:
+  if include_ng_files and messages_out != None:
     ctx.actions.run(
         inputs = list(inputs),
         outputs = messages_out,
@@ -313,7 +402,7 @@ def _ts_expected_outs(ctx, label):
   _ignored = [label]
   return _expected_outs(ctx)
 
-def ng_module_impl(ctx, ts_compile_actions, ivy = False):
+def ng_module_impl(ctx, ts_compile_actions):
   """Implementation function for the ng_module rule.
 
   This is exposed so that google3 can have its own entry point that re-uses this
@@ -322,29 +411,30 @@ def ng_module_impl(ctx, ts_compile_actions, ivy = False):
   Args:
     ctx: the skylark rule context
     ts_compile_actions: generates all the actions to run an ngc compilation
-    ivy: if True, run the compiler in Ivy mode (internal only)
 
   Returns:
     the result of the ng_module rule as a dict, suitable for
     conversion by ts_providers_dict_to_struct
   """
 
-  tsconfig = _ngc_tsconfig if not ivy else _ivy_tsconfig
+  include_ng_files = _include_ng_files(ctx)
 
   providers = ts_compile_actions(
       ctx, is_library=True, compile_action=_prodmode_compile_action,
       devmode_compile_action=_devmode_compile_action,
-      tsc_wrapped_tsconfig=tsconfig,
+      tsc_wrapped_tsconfig=_ngc_tsconfig,
       outputs = _ts_expected_outs)
 
   outs = _expected_outs(ctx)
-  providers["angular"] = {
-    "summaries": outs.summaries,
-    "metadata": outs.metadata
-  }
-  providers["ngc_messages"] = outs.i18n_messages
 
-  if _should_produce_flat_module_outs(ctx):
+  if include_ng_files:
+    providers["angular"] = {
+      "summaries": outs.summaries,
+      "metadata": outs.metadata
+    }
+    providers["ngc_messages"] = outs.i18n_messages
+
+  if include_ng_files and _should_produce_flat_module_outs(ctx):
     if len(outs.metadata) > 1:
       fail("expecting exactly one metadata output for " + str(ctx.label))
 
@@ -360,9 +450,6 @@ def ng_module_impl(ctx, ts_compile_actions, ivy = False):
 def _ng_module_impl(ctx):
   return ts_providers_dict_to_struct(ng_module_impl(ctx, compile_ts))
 
-def _ivy_module_impl(ctx):
-  return ts_providers_dict_to_struct(ng_module_impl(ctx, compile_ts, True))
-
 NG_MODULE_ATTRIBUTES = {
     "srcs": attr.label_list(allow_files = [".ts"]),
 
@@ -429,11 +516,16 @@ ng_module = rule(
     outputs = COMMON_OUTPUTS,
 )
 
-# TODO(alxhub): this rule exists to allow early testing of the Ivy compiler within angular/angular,
-# and should not be made public. When ng_module() supports Ivy-mode outputs, this rule should be
-# removed and its usages refactored to use ng_module() directly.
-internal_ivy_ng_module = rule(
-    implementation = _ivy_module_impl,
-    attrs = NG_MODULE_RULE_ATTRS,
+
+# TODO(alxhub): this rule causes legacy ngc to produce Ivy outputs from global analysis information.
+# It to facilitate testing of the Ivy runtime until ngtsc is mature enough to be used instead, and
+# should be removed once ngtsc is capable of fulfilling the same requirements.
+internal_global_ng_module = rule(
+    implementation = _ng_module_impl,
+    attrs = dict(NG_MODULE_RULE_ATTRS, **{
+        "_global_mode": attr.bool(
+            default = True,
+        ),
+    }),
     outputs = COMMON_OUTPUTS,
 )
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index 8a4b375d53..e4584d6133 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -27,6 +27,29 @@ PLUGIN_CONFIG="{sideEffectFreeModules: [\n%s]}" % ",\n".join(
 BO_ROLLUP="angular_devkit/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.js"
 BO_PLUGIN="require('%s').default(%s)" % (BO_ROLLUP, PLUGIN_CONFIG)
 
+def _use_plain_rollup(ctx):
+  """Determine whether to use the Angular or upstream versions of the rollup_bundle rule.
+
+  In legacy mode, the Angular version of rollup is used. This runs build optimizer as part of its
+  processing, which affects decorators and annotations.
+
+  In other modes, an emulation of the upstream rollup_bundle rule is used. This avoids running
+  build optimizer on code which isn't designed to be optimized by it.
+
+  Args:
+    ctx: skylark rule execution context
+
+  Returns:
+    true iff the Angular version of rollup with build optimizer should be used, false otherwise
+  """
+
+  if 'compile' not in ctx.var:
+    return False
+
+  strategy = ctx.var['compile']
+  return strategy != 'legacy'
+  
+
 def run_brotli(ctx, input, output):
   ctx.actions.run(
       executable = ctx.executable._brotli,
@@ -35,7 +58,41 @@ def run_brotli(ctx, input, output):
       arguments = ["--output=%s" % output.path, input.path],
   )
 
+# Borrowed from bazelbuild/rules_nodejs
+def _run_tsc(ctx, input, output):
+  args = ctx.actions.args()
+  args.add(["--target", "es5"])
+  args.add("--allowJS")
+  args.add(input.path)
+  args.add(["--outFile", output.path])
+
+  ctx.action(
+      executable = ctx.executable._tsc,
+      inputs = [input],
+      outputs = [output],
+      arguments = [args]
+  )
+
+# Borrowed from bazelbuild/rules_nodejs, with the addition of brotli compression output
+def _plain_rollup_bundle(ctx):
+  rollup_config = write_rollup_config(ctx)
+  run_rollup(ctx, collect_es2015_sources(ctx), rollup_config, ctx.outputs.build_es6)
+  _run_tsc(ctx, ctx.outputs.build_es6, ctx.outputs.build_es5)
+  source_map = run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min)
+  run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, debug = True)
+  umd_rollup_config = write_rollup_config(ctx, filename = "_%s_umd.rollup.conf.js", output_format = "umd")
+  run_rollup(ctx, collect_es2015_sources(ctx), umd_rollup_config, ctx.outputs.build_umd)
+  run_sourcemapexplorer(ctx, ctx.outputs.build_es5_min, source_map, ctx.outputs.explore_html)
+
+  run_brotli(ctx, ctx.outputs.build_es5_min, ctx.outputs.build_es5_min_compressed)
+  files = [ctx.outputs.build_es5_min, source_map]
+  return DefaultInfo(files = depset(files), runfiles = ctx.runfiles(files))
+
 def _ng_rollup_bundle(ctx):
+  # Escape and use the plain rollup rule if the compilation strategy requires it
+  if _use_plain_rollup(ctx):
+    return _plain_rollup_bundle(ctx)
+
   # We don't expect anyone to make use of this bundle yet, but it makes this rule
   # compatible with rollup_bundle which allows them to be easily swapped back and
   # forth.
diff --git a/packages/bazel/src/ngc-wrapped/index.ts b/packages/bazel/src/ngc-wrapped/index.ts
index 02b9b14b04..a787b4026c 100644
--- a/packages/bazel/src/ngc-wrapped/index.ts
+++ b/packages/bazel/src/ngc-wrapped/index.ts
@@ -119,6 +119,15 @@ export function compile({allowNonHermeticReads, allDepsCompiledWithBazel = true,
     compilerOpts.annotationsAs = 'static fields';
   }
 
+  // Detect from compilerOpts whether the entrypoint is being invoked in Ivy mode.
+  const isInIvyMode = compilerOpts.enableIvy === 'ngtsc' || compilerOpts.enableIvy === 'tsc';
+
+  // Disable downleveling and Closure annotation if in Ivy mode.
+  if (isInIvyMode) {
+    compilerOpts.annotateForClosureCompiler = false;
+    compilerOpts.annotationsAs = 'decorators';
+  }
+
   if (!compilerOpts.rootDirs) {
     throw new Error('rootDirs is not set!');
   }
@@ -172,6 +181,12 @@ export function compile({allowNonHermeticReads, allDepsCompiledWithBazel = true,
   const bazelHost = new CompilerHost(
       files, compilerOpts, bazelOpts, tsHost, fileLoader, allowNonHermeticReads,
       generatedFileModuleResolver);
+
+  // Also need to disable decorator downleveling in the BazelHost in Ivy mode.
+  if (isInIvyMode) {
+    bazelHost.transformDecorators = false;
+  }
+
   // Prevent tsickle adding any types at all if we don't want closure compiler annotations.
   bazelHost.transformTypesToClosure = compilerOpts.annotateForClosureCompiler;
   const origBazelHostFileExist = bazelHost.fileExists;
diff --git a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
index 8cbf1b54a4..15a6b28c75 100644
--- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ivy_ng_module", "ts_library")
+load("//tools:defaults.bzl", "ivy_ng_module")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 
 ivy_ng_module(
diff --git a/packages/compiler-cli/src/main.ts b/packages/compiler-cli/src/main.ts
index 25dcd54281..1e17fc9d62 100644
--- a/packages/compiler-cli/src/main.ts
+++ b/packages/compiler-cli/src/main.ts
@@ -40,8 +40,8 @@ export function main(
 
 
 function createEmitCallback(options: api.CompilerOptions): api.TsEmitCallback|undefined {
-  const transformDecorators =
-      options.enableIvy !== 'ngtsc' && options.annotationsAs !== 'decorators';
+  const transformDecorators = options.enableIvy !== 'ngtsc' && options.enableIvy !== 'tsc' &&
+      options.annotationsAs !== 'decorators';
   const transformTypesToClosure = options.annotateForClosureCompiler;
   if (!transformDecorators && !transformTypesToClosure) {
     return undefined;
diff --git a/packages/compiler-cli/src/transformers/api.ts b/packages/compiler-cli/src/transformers/api.ts
index ce1cd4e233..b37033443d 100644
--- a/packages/compiler-cli/src/transformers/api.ts
+++ b/packages/compiler-cli/src/transformers/api.ts
@@ -182,9 +182,17 @@ export interface CompilerOptions extends ts.CompilerOptions {
    * Not all features are supported with this option enabled. It is only supported
    * for experimentation and testing of Render3 style code generation.
    *
+   * Acceptable values are as follows:
+   *
+   * `false` - run ngc normally
+   * `true` - run ngc with its usual global analysis, but compile decorators to Ivy fields instead
+   *  of running the View Engine compilers
+   * `ngtsc` - run the ngtsc compiler instead of the normal ngc compiler
+   * `tsc` - behave like plain tsc as much as possible (used for testing JIT code)
+   *
    * @experimental
    */
-  enableIvy?: boolean|'ngtsc';
+  enableIvy?: boolean|'ngtsc'|'tsc';
 
   /** @internal */
   collectAllErrors?: boolean;
diff --git a/packages/compiler-cli/src/transformers/compiler_host.ts b/packages/compiler-cli/src/transformers/compiler_host.ts
index 972313ddd8..a91d056320 100644
--- a/packages/compiler-cli/src/transformers/compiler_host.ts
+++ b/packages/compiler-cli/src/transformers/compiler_host.ts
@@ -24,7 +24,7 @@ const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;
 export function createCompilerHost(
     {options, tsHost = ts.createCompilerHost(options, true)}:
         {options: CompilerOptions, tsHost?: ts.CompilerHost}): CompilerHost {
-  if (options.enableIvy) {
+  if (options.enableIvy === 'ngtsc' || options.enableIvy === 'tsc') {
     return new NgtscCompilerHost(tsHost);
   }
   return tsHost;
diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts
index 78764efca3..5b9f4c67fc 100644
--- a/packages/compiler-cli/src/transformers/program.ts
+++ b/packages/compiler-cli/src/transformers/program.ts
@@ -26,6 +26,7 @@ import {getAngularEmitterTransformFactory} from './node_emitter_transform';
 import {PartialModuleMetadataTransformer} from './r3_metadata_transform';
 import {StripDecoratorsMetadataTransformer, getDecoratorStripTransformerFactory} from './r3_strip_decorators';
 import {getAngularClassTransformerFactory} from './r3_transform';
+import {TscPassThroughProgram} from './tsc_pass_through';
 import {DTS, GENERATED_FILES, StructureIsReused, TS, createMessageDiagnostic, isInRootDir, ngToTsDiagnostic, tsStructureIsReused, userError} from './util';
 
 
@@ -287,7 +288,7 @@ class AngularCompilerProgram implements Program {
     emitCallback?: TsEmitCallback,
     mergeEmitResultsCallback?: TsMergeEmitResultsCallback,
   } = {}): ts.EmitResult {
-    if (this.options.enableIvy === 'ngtsc') {
+    if (this.options.enableIvy === 'ngtsc' || this.options.enableIvy === 'tsc') {
       throw new Error('Cannot run legacy compiler in ngtsc mode');
     }
     return this.options.enableIvy === true ? this._emitRender3(parameters) :
@@ -337,14 +338,34 @@ class AngularCompilerProgram implements Program {
         /* genFiles */ undefined, /* partialModules */ modules,
         /* stripDecorators */ this.reifiedDecorators, customTransformers);
 
-    const emitResult = emitCallback({
-      program: this.tsProgram,
-      host: this.host,
-      options: this.options,
-      writeFile: writeTsFile, emitOnlyDtsFiles,
-      customTransformers: tsCustomTransformers
-    });
-    return emitResult;
+
+    // Restore the original references before we emit so TypeScript doesn't emit
+    // a reference to the .d.ts file.
+    const augmentedReferences = new Map<ts.SourceFile, ReadonlyArray<ts.FileReference>>();
+    for (const sourceFile of this.tsProgram.getSourceFiles()) {
+      const originalReferences = getOriginalReferences(sourceFile);
+      if (originalReferences) {
+        augmentedReferences.set(sourceFile, sourceFile.referencedFiles);
+        sourceFile.referencedFiles = originalReferences;
+      }
+    }
+
+    try {
+      return emitCallback({
+        program: this.tsProgram,
+        host: this.host,
+        options: this.options,
+        writeFile: writeTsFile, emitOnlyDtsFiles,
+        customTransformers: tsCustomTransformers
+      });
+    } finally {
+      // Restore the references back to the augmented value to ensure that the
+      // checks that TypeScript makes for project structure reuse will succeed.
+      for (const [sourceFile, references] of Array.from(augmentedReferences)) {
+        // TODO(chuckj): Remove any cast after updating build to 2.6
+        (sourceFile as any).referencedFiles = references;
+      }
+    }
   }
 
   private _emitRender2(
@@ -909,6 +930,8 @@ export function createProgram({rootNames, options, host, oldProgram}: {
 }): Program {
   if (options.enableIvy === 'ngtsc') {
     return new NgtscProgram(rootNames, options, host, oldProgram);
+  } else if (options.enableIvy === 'tsc') {
+    return new TscPassThroughProgram(rootNames, options, host, oldProgram);
   }
   return new AngularCompilerProgram(rootNames, options, host, oldProgram);
 }
diff --git a/packages/compiler-cli/src/transformers/tsc_pass_through.ts b/packages/compiler-cli/src/transformers/tsc_pass_through.ts
new file mode 100644
index 0000000000..fde85062b4
--- /dev/null
+++ b/packages/compiler-cli/src/transformers/tsc_pass_through.ts
@@ -0,0 +1,107 @@
+/**
+ * @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 {GeneratedFile} from '@angular/compiler';
+import * as path from 'path';
+import * as ts from 'typescript';
+
+import * as api from '../transformers/api';
+
+/**
+ * An implementation of the `Program` API which behaves like plain `tsc` and does not include any
+ * Angular-specific behavior whatsoever.
+ *
+ * This allows `ngc` to behave like `tsc` in cases where JIT code needs to be tested.
+ */
+export class TscPassThroughProgram implements api.Program {
+  private tsProgram: ts.Program;
+
+  constructor(
+      rootNames: ReadonlyArray<string>, private options: api.CompilerOptions,
+      private host: api.CompilerHost, oldProgram?: api.Program) {
+    this.tsProgram =
+        ts.createProgram(rootNames, options, host, oldProgram && oldProgram.getTsProgram());
+  }
+
+  getTsProgram(): ts.Program { return this.tsProgram; }
+
+  getTsOptionDiagnostics(cancellationToken?: ts.CancellationToken|
+                         undefined): ReadonlyArray<ts.Diagnostic> {
+    return this.tsProgram.getOptionsDiagnostics(cancellationToken);
+  }
+
+  getNgOptionDiagnostics(cancellationToken?: ts.CancellationToken|
+                         undefined): ReadonlyArray<api.Diagnostic> {
+    return [];
+  }
+
+  getTsSyntacticDiagnostics(
+      sourceFile?: ts.SourceFile|undefined,
+      cancellationToken?: ts.CancellationToken|undefined): ReadonlyArray<ts.Diagnostic> {
+    return this.tsProgram.getSyntacticDiagnostics(sourceFile, cancellationToken);
+  }
+
+  getNgStructuralDiagnostics(cancellationToken?: ts.CancellationToken|
+                             undefined): ReadonlyArray<api.Diagnostic> {
+    return [];
+  }
+
+  getTsSemanticDiagnostics(
+      sourceFile?: ts.SourceFile|undefined,
+      cancellationToken?: ts.CancellationToken|undefined): ReadonlyArray<ts.Diagnostic> {
+    return this.tsProgram.getSemanticDiagnostics(sourceFile, cancellationToken);
+  }
+
+  getNgSemanticDiagnostics(
+      fileName?: string|undefined,
+      cancellationToken?: ts.CancellationToken|undefined): ReadonlyArray<api.Diagnostic> {
+    return [];
+  }
+
+  loadNgStructureAsync(): Promise<void> { return Promise.resolve(); }
+
+  listLazyRoutes(entryRoute?: string|undefined): api.LazyRoute[] {
+    throw new Error('Method not implemented.');
+  }
+
+  getLibrarySummaries(): Map<string, api.LibrarySummary> {
+    throw new Error('Method not implemented.');
+  }
+
+  getEmittedGeneratedFiles(): Map<string, GeneratedFile> {
+    throw new Error('Method not implemented.');
+  }
+
+  getEmittedSourceFiles(): Map<string, ts.SourceFile> {
+    throw new Error('Method not implemented.');
+  }
+
+  emit(opts?: {
+    emitFlags?: api.EmitFlags,
+    cancellationToken?: ts.CancellationToken,
+    customTransformers?: api.CustomTransformers,
+    emitCallback?: api.TsEmitCallback,
+    mergeEmitResultsCallback?: api.TsMergeEmitResultsCallback
+  }): ts.EmitResult {
+    const emitCallback = opts && opts.emitCallback || defaultEmitCallback;
+
+    const emitResult = emitCallback({
+      program: this.tsProgram,
+      host: this.host,
+      options: this.options,
+      emitOnlyDtsFiles: false,
+    });
+    return emitResult;
+  }
+}
+
+const defaultEmitCallback: api.TsEmitCallback =
+    ({program, targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles,
+      customTransformers}) =>
+        program.emit(
+            targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
diff --git a/packages/compiler/src/aot/compiler_options.ts b/packages/compiler/src/aot/compiler_options.ts
index 10f87a333c..e4d7d1682e 100644
--- a/packages/compiler/src/aot/compiler_options.ts
+++ b/packages/compiler/src/aot/compiler_options.ts
@@ -18,5 +18,5 @@ export interface AotCompilerOptions {
   fullTemplateTypeCheck?: boolean;
   allowEmptyCodegenFiles?: boolean;
   strictInjectionParameters?: boolean;
-  enableIvy?: boolean|'ngtsc';
+  enableIvy?: boolean|'ngtsc'|'tsc';
 }
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index 68a4cea600..6da82e9b34 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -18,6 +18,7 @@ ng_module(
         "//packages:types",
         "//packages/compiler",
         "@rxjs",
+        "@rxjs//operators",
     ],
 )
 
@@ -38,16 +39,18 @@ ng_package(
 ## Controls if Ivy is enabled. (Temporary target until we permanently switch over to Ivy)
 ##
 ## This file generates `src/ivy_switch.ts` file which reexports symbols for `ViewEngine` or `Ivy.`
-## - append `--define=ivy=false` (default) to `bazel` command to reexport `./ivy_switch_false`
-##   and use `ViewEngine`;
-## - append `--define=ivy=true` to `bazel` command to rexport `./ivy_switch_true` and use `Ivy`;
+## - append `--define=compile=legacy` (default) to `bazel` command to reexport `./ivy_switch_legacy`
+##   and use `ViewEngine`
+## - append `--define=compile=jit` to `bazel` command to rexport `./ivy_switch_jit` and use `Ivy`
+## - append `--define=compile=local` to `bazel` command to rexport `./ivy_switch_jit` and use `Ivy`
+##   in the local analysis mode. (run as part of `ngtsc`)
 ##
-## NOTE: `--define=ivy=true` works with any `bazel` command or target across the repo.
+## NOTE: `--define=compile=jit` works with any `bazel` command or target across the repo.
 ##
 ## See: `//tools/bazel.rc` where `--define=ivy=false` is defined as default.
 ## See: `./src/ivy_switch.ts` for more details.
 genrule(
     name = "ivy_switch",
     outs = ["src/ivy_switch.ts"],
-    cmd = "echo export '*' from \"'./ivy_switch_$(ivy)';\" > $@",
+    cmd = "echo export '*' from \"'./ivy_switch_$(compile)';\" > $@",
 )
diff --git a/packages/core/src/ivy_switch.ts b/packages/core/src/ivy_switch.ts
index e461fc900a..6a03ff8c7f 100644
--- a/packages/core/src/ivy_switch.ts
+++ b/packages/core/src/ivy_switch.ts
@@ -31,6 +31,6 @@
  * 3) Import the symbol from `./ivy_switch`. The imported symbol will that point to either the
  *    symbol in `./ivy_switch_false` and `./ivy_switch_false` depending on the compilation mode.
  */
-export * from './ivy_switch_false';
+export * from './ivy_switch_legacy';
 
 // TODO(alxhub): debug why metadata doesn't properly propagate through this file.
diff --git a/packages/core/src/ivy_switch_jit.ts b/packages/core/src/ivy_switch_jit.ts
new file mode 100644
index 0000000000..60cf825342
--- /dev/null
+++ b/packages/core/src/ivy_switch_jit.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './ivy_switch_on';
\ No newline at end of file
diff --git a/packages/core/src/ivy_switch_false.ts b/packages/core/src/ivy_switch_legacy.ts
similarity index 100%
rename from packages/core/src/ivy_switch_false.ts
rename to packages/core/src/ivy_switch_legacy.ts
diff --git a/packages/core/src/ivy_switch_local.ts b/packages/core/src/ivy_switch_local.ts
new file mode 100644
index 0000000000..60cf825342
--- /dev/null
+++ b/packages/core/src/ivy_switch_local.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './ivy_switch_on';
\ No newline at end of file
diff --git a/packages/core/src/ivy_switch_true.ts b/packages/core/src/ivy_switch_on.ts
similarity index 100%
rename from packages/core/src/ivy_switch_true.ts
rename to packages/core/src/ivy_switch_on.ts
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index afe5cbd8a9..66549bedb6 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -44,9 +44,12 @@ jasmine_node_test(
     data = [
         ":bundle",
         ":bundle.js",
-        ":bundle.min.js.br",
+        ":bundle.min.js",
         ":bundle.min_debug.js",
     ],
+    tags = [
+        "ivy-jit",
+    ],
     deps = [":test_lib"],
 )
 
diff --git a/packages/core/test/bundling/hello_world/treeshaking_spec.ts b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
index fc7e758315..90b309c27b 100644
--- a/packages/core/test/bundling/hello_world/treeshaking_spec.ts
+++ b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
@@ -29,7 +29,8 @@ describe('treeshaking with uglify', () => {
     expect(content).not.toContain('createCommonjsModule');
   });
 
-  it('should not contain zone.js', () => { expect(content).not.toContain('scheduleMicroTask'); });
+  it('should not contain zone.js',
+     () => { expect(content).not.toContain('global[\'Zone\'] = Zone'); });
 
   describe('functional test in domino', () => {
     it('should render hello world when not minified',
diff --git a/packages/core/test/bundling/hello_world_jit/BUILD.bazel b/packages/core/test/bundling/hello_world_jit/BUILD.bazel
deleted file mode 100644
index bd6acab2b3..0000000000
--- a/packages/core/test/bundling/hello_world_jit/BUILD.bazel
+++ /dev/null
@@ -1,58 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
-load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "rollup_bundle")
-load("//tools/http-server:http_server.bzl", "http_server")
-
-ts_library(
-    name = "hello_world_jit",
-    srcs = ["index.ts"],
-    deps = [
-        "//packages/core",
-    ],
-)
-
-rollup_bundle(
-    name = "bundle",
-    # TODO(alexeagle): This is inconsistent.
-    # We try to teach users to always have their workspace at the start of a
-    # path, to disambiguate from other workspaces.
-    # Here, the rule implementation is looking in an execroot where the layout
-    # has an "external" directory for external dependencies.
-    # This should probably start with "angular/" and let the rule deal with it.
-    entry_point = "packages/core/test/bundling/hello_world_jit/index.js",
-    deps = [
-        ":hello_world_jit",
-        "//packages/core",
-    ],
-)
-
-ts_library(
-    name = "test_lib",
-    testonly = 1,
-    srcs = glob(["*_spec.ts"]),
-    deps = [
-        "//packages:types",
-        "//packages/core",
-        "//packages/core/testing",
-    ],
-)
-
-jasmine_node_test(
-    name = "test",
-    data = [
-        ":bundle",
-        ":bundle.js",
-    ],
-    deps = [":test_lib"],
-)
-
-http_server(
-    name = "devserver",
-    data = [
-        "index.html",
-        ":bundle.min.js",
-        ":bundle.min_debug.js",
-    ],
-)
diff --git a/packages/core/test/bundling/hello_world_jit/index.html b/packages/core/test/bundling/hello_world_jit/index.html
deleted file mode 100644
index c5c7bb3e0b..0000000000
--- a/packages/core/test/bundling/hello_world_jit/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-
-<html>
-  <head>
-    <title>Angular Hello World Example</title>
-  </head>
-  <body>
-    <!-- The Angular application will be bootstrapped into this element. -->
-    <hello-world></hello-world>
-
-    <!-- 
-      Script tag which bootstraps the application. Use `?debug` in URL to select
-      the debug version of the script.
-      
-      There are two scripts sources: `bundle.min.js` and `bundle.min_debug.js` You can 
-      switch between which bundle the browser loads to experiment with the application.
-
-      - `bundle.min.js`: Is what the site would serve to their users. It has gone
-        through rollup, build-optimizer, and uglify with tree shaking.
-      - `bundle.min_debug.js`: Is what the developer would like to see when debugging
-        the application. It has also done through full pipeline of rollup, build-optimizer,
-        and uglify, however special flags were passed to uglify to prevent inlining and
-        property renaming.
-    -->
-    <script>
-        document.write('<script src="' + 
-          (document.location.search.endsWith('debug') ? '/bundle.min_debug.js' : '/bundle.min.js') + 
-          '"></' + 'script>');
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/packages/core/test/bundling/hello_world_jit/index.ts b/packages/core/test/bundling/hello_world_jit/index.ts
deleted file mode 100644
index af6817a05e..0000000000
--- a/packages/core/test/bundling/hello_world_jit/index.ts
+++ /dev/null
@@ -1,38 +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 'reflect-metadata';
-
-import {Component, NgModule, ɵrenderComponent as renderComponent} from '@angular/core';
-
-@Component({
-  selector: 'greeting-cmp',
-  template: 'Hello World!',
-})
-export class Greeting {
-}
-
-@NgModule({
-  declarations: [Greeting],
-  exports: [Greeting],
-})
-export class GreetingModule {
-}
-
-@Component({selector: 'hello-world', template: '<greeting-cmp></greeting-cmp>'})
-export class HelloWorld {
-}
-
-@NgModule({
-  declarations: [HelloWorld],
-  imports: [GreetingModule],
-})
-export class HelloWorldModule {
-}
-
-renderComponent(HelloWorld);
diff --git a/packages/core/test/bundling/hello_world_jit/integration_spec.ts b/packages/core/test/bundling/hello_world_jit/integration_spec.ts
deleted file mode 100644
index ee349da0a6..0000000000
--- a/packages/core/test/bundling/hello_world_jit/integration_spec.ts
+++ /dev/null
@@ -1,23 +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 {ɵivyEnabled as ivyEnabled} from '@angular/core';
-import {withBody} from '@angular/core/testing';
-import * as fs from 'fs';
-import * as path from 'path';
-
-const PACKAGE = 'angular/packages/core/test/bundling/hello_world_jit';
-
-ivyEnabled && describe('Ivy JIT hello world', () => {
-  it('should render hello world', withBody('<hello-world></hello-world>', () => {
-       require(path.join(PACKAGE, 'bundle.js'));
-       expect(document.body.textContent).toEqual('Hello World!');
-     }));
-});
-
-xit('ensure at least one spec exists', () => {});
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index c979e1c49e..f8d5684cbb 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -47,7 +47,7 @@ jasmine_node_test(
     data = [
         ":bundle",
         ":bundle.js",
-        ":bundle.min.js.br",
+        ":bundle.min.js",
         ":bundle.min_debug.js",
     ],
     deps = [":test_lib"],
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 52af863bea..d9f63f2da3 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -57,6 +57,6 @@ test --experimental_ui
 ################################
 # Temporary Settings for Ivy   #
 ################################
-# to determine if the compiler used should be Ivy or ViewEngine one can use `--define=ivy=true` on 
-# any bazel target. This is a temporary flag until codebase is permanently switched to ViewEngine.
-build --define=ivy=false
\ No newline at end of file
+# to determine if the compiler used should be Ivy or ViewEngine one can use `--define=compile=local` on 
+# any bazel target. This is a temporary flag until codebase is permanently switched to Ivy.
+build --define=compile=legacy
\ No newline at end of file
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 9954668f3d..c58c92b0e9 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -2,7 +2,7 @@
 load("@build_bazel_rules_nodejs//:defs.bzl", _npm_package = "npm_package")
 load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library", _ts_web_test_suite = "ts_web_test_suite")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
-load("//packages/bazel/src:ng_module.bzl", _ivy_ng_module = "internal_ivy_ng_module")
+load("//packages/bazel/src:ng_module.bzl", _internal_global_ng_module = "internal_global_ng_module")
 
 DEFAULT_TSCONFIG = "//packages:tsconfig-build.json"
 
@@ -49,6 +49,16 @@ def ng_module(name, tsconfig = None, entry_point = None, **kwargs):
     entry_point = "public_api.ts"
   _ng_module(name = name, flat_module_out_file = name, tsconfig = tsconfig, entry_point = entry_point, **kwargs)
 
+# ivy_ng_module behaves like ng_module, and under --define=compile=legacy it runs ngc with global
+# analysis but produces Ivy outputs. Under other compile modes, it behaves as ng_module.
+# TODO(alxhub): remove when ngtsc supports the same use cases.
+def ivy_ng_module(name, tsconfig = None, entry_point = None, **kwargs):
+  if not tsconfig:
+    tsconfig = DEFAULT_TSCONFIG
+  if not entry_point:
+    entry_point = "public_api.ts"
+  _internal_global_ng_module(name = name, flat_module_out_file = name, tsconfig = tsconfig, entry_point = entry_point, **kwargs)
+
 def ng_package(name, readme_md = None, license_banner = None, **kwargs):
   if not readme_md:
     readme_md = "//packages:README.md"
@@ -91,8 +101,3 @@ def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
           # TODO(alexeagle): add remote browsers on SauceLabs
       ],
       **kwargs)
-
-def ivy_ng_module(name, tsconfig = None, **kwargs):
-  if not tsconfig:
-    tsconfig = DEFAULT_TSCONFIG
-  _ivy_ng_module(name = name, tsconfig = tsconfig, **kwargs)

From 3fd3c2ac4c12b052f3503ced07d8b34f3bb62c6a Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Fri, 25 May 2018 13:52:58 -0700
Subject: [PATCH 116/582] test(animations): fix Node.js detection in animation
 tests (#24139)

PR Close #24139
---
 packages/animations/browser/test/dsl/animation_spec.ts        | 2 +-
 .../animations/browser/test/dsl/animation_trigger_spec.ts     | 2 +-
 .../test/render/css_keyframes/css_keyframes_driver_spec.ts    | 4 +---
 .../test/render/css_keyframes/direct_style_player_spec.ts     | 2 +-
 .../css_keyframes/element_animation_style_handler_spec.ts     | 4 +---
 .../browser/test/render/timeline_animation_engine_spec.ts     | 2 +-
 .../browser/test/render/transition_animation_engine_spec.ts   | 2 +-
 .../test/render/web_animations/web_animations_driver_spec.ts  | 2 +-
 packages/core/test/animation/animation_integration_spec.ts    | 2 +-
 .../core/test/animation/animation_query_integration_spec.ts   | 2 +-
 .../core/test/animation/animation_router_integration_spec.ts  | 2 +-
 ...imations_with_css_keyframes_animations_integration_spec.ts | 2 +-
 .../animations_with_web_animations_integration_spec.ts        | 2 +-
 .../test/animation/animation_renderer_spec.ts                 | 2 +-
 14 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/packages/animations/browser/test/dsl/animation_spec.ts b/packages/animations/browser/test/dsl/animation_spec.ts
index 2104968b8f..21071dec8f 100644
--- a/packages/animations/browser/test/dsl/animation_spec.ts
+++ b/packages/animations/browser/test/dsl/animation_spec.ts
@@ -20,7 +20,7 @@ function createDiv() {
 {
   describe('Animation', () => {
     // these tests are only mean't to be run within the DOM (for now)
-    if (typeof Element == 'undefined') return;
+    if (isNode) return;
 
     let rootElement: any;
     let subElement1: any;
diff --git a/packages/animations/browser/test/dsl/animation_trigger_spec.ts b/packages/animations/browser/test/dsl/animation_trigger_spec.ts
index a702a1ddb9..5482075fc6 100644
--- a/packages/animations/browser/test/dsl/animation_trigger_spec.ts
+++ b/packages/animations/browser/test/dsl/animation_trigger_spec.ts
@@ -17,7 +17,7 @@ import {makeTrigger} from '../shared';
 {
   describe('AnimationTrigger', () => {
     // these tests are only mean't to be run within the DOM (for now)
-    if (typeof Element == 'undefined') return;
+    if (isNode) return;
 
     let element: any;
     beforeEach(() => {
diff --git a/packages/animations/browser/test/render/css_keyframes/css_keyframes_driver_spec.ts b/packages/animations/browser/test/render/css_keyframes/css_keyframes_driver_spec.ts
index 00adf6e8ee..747a389575 100644
--- a/packages/animations/browser/test/render/css_keyframes/css_keyframes_driver_spec.ts
+++ b/packages/animations/browser/test/render/css_keyframes/css_keyframes_driver_spec.ts
@@ -16,9 +16,7 @@ import {assertElementExistsInDom, createElement, findKeyframeDefinition, forceRe
 const CSS_KEYFRAME_RULE_TYPE = 7;
 
 describe('CssKeyframesDriver tests', () => {
-  if (typeof Element == 'undefined' || typeof document == 'undefined' ||
-      typeof(window as any)['AnimationEvent'] == 'undefined')
-    return;
+  if (isNode || typeof(window as any)['AnimationEvent'] == 'undefined') return;
 
   describe('building keyframes', () => {
     it('should build CSS keyframe style object containing the keyframe styles', () => {
diff --git a/packages/animations/browser/test/render/css_keyframes/direct_style_player_spec.ts b/packages/animations/browser/test/render/css_keyframes/direct_style_player_spec.ts
index f11ad293d0..c04ae07783 100644
--- a/packages/animations/browser/test/render/css_keyframes/direct_style_player_spec.ts
+++ b/packages/animations/browser/test/render/css_keyframes/direct_style_player_spec.ts
@@ -14,7 +14,7 @@ import {assertStyle, createElement} from './shared';
 const CSS_KEYFRAME_RULE_TYPE = 7;
 
 describe('DirectStylePlayer tests', () => {
-  if (typeof Element == 'undefined' || typeof document == 'undefined') return;
+  if (isNode) return;
 
   it('should apply the styling to the given element when the animation starts and remove when destroyed',
      () => {
diff --git a/packages/animations/browser/test/render/css_keyframes/element_animation_style_handler_spec.ts b/packages/animations/browser/test/render/css_keyframes/element_animation_style_handler_spec.ts
index 76d5a6e5d4..d5b64b5758 100644
--- a/packages/animations/browser/test/render/css_keyframes/element_animation_style_handler_spec.ts
+++ b/packages/animations/browser/test/render/css_keyframes/element_animation_style_handler_spec.ts
@@ -13,9 +13,7 @@ import {assertStyle, createElement, makeAnimationEvent, supportsAnimationEventCr
 const EMPTY_FN = () => {};
 {
   describe('ElementAnimationStyleHandler', () => {
-    if (typeof Element == 'undefined' || typeof document == 'undefined' ||
-        typeof(window as any)['AnimationEvent'] == 'undefined')
-      return;
+    if (isNode || typeof(window as any)['AnimationEvent'] == 'undefined') return;
 
     it('should add and remove an animation on to an element\'s styling', () => {
       const element = createElement();
diff --git a/packages/animations/browser/test/render/timeline_animation_engine_spec.ts b/packages/animations/browser/test/render/timeline_animation_engine_spec.ts
index 5842fae27f..a7c188133c 100644
--- a/packages/animations/browser/test/render/timeline_animation_engine_spec.ts
+++ b/packages/animations/browser/test/render/timeline_animation_engine_spec.ts
@@ -21,7 +21,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
   }
 
   // these tests are only mean't to be run within the DOM
-  if (typeof Element == 'undefined') return;
+  if (isNode) return;
 
   describe('TimelineAnimationEngine', () => {
     let element: any;
diff --git a/packages/animations/browser/test/render/transition_animation_engine_spec.ts b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
index 5a122e9bd5..a76398d2e2 100644
--- a/packages/animations/browser/test/render/transition_animation_engine_spec.ts
+++ b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
@@ -20,7 +20,7 @@ const DEFAULT_NAMESPACE_ID = 'id';
   const driver = new MockAnimationDriver();
 
   // these tests are only mean't to be run within the DOM
-  if (typeof Element == 'undefined') return;
+  if (isNode) return;
 
   describe('TransitionAnimationEngine', () => {
     let element: any;
diff --git a/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts b/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts
index 49bb118f13..f66043f58b 100644
--- a/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts
+++ b/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts
@@ -12,7 +12,7 @@ import {WebAnimationsPlayer} from '../../../src/render/web_animations/web_animat
 
 {
   describe('WebAnimationsDriver', () => {
-    if (typeof Element == 'undefined' || typeof document == 'undefined') return;
+    if (isNode) return;
 
     describe('when web-animations are not supported natively', () => {
       it('should return an instance of a CssKeyframePlayer if scrubbing is not requested', () => {
diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts
index 4980722a36..a1dcb50b60 100644
--- a/packages/core/test/animation/animation_integration_spec.ts
+++ b/packages/core/test/animation/animation_integration_spec.ts
@@ -20,7 +20,7 @@ const DEFAULT_COMPONENT_ID = '1';
 
 (function() {
   // these tests are only mean't to be run within the DOM (for now)
-  if (typeof Element == 'undefined') return;
+  if (isNode) return;
 
   describe('animation tests', function() {
     function getLog(): MockAnimationPlayer[] {
diff --git a/packages/core/test/animation/animation_query_integration_spec.ts b/packages/core/test/animation/animation_query_integration_spec.ts
index 3f14f78b7a..14278b3f81 100644
--- a/packages/core/test/animation/animation_query_integration_spec.ts
+++ b/packages/core/test/animation/animation_query_integration_spec.ts
@@ -21,7 +21,7 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
 
 (function() {
   // these tests are only mean't to be run within the DOM (for now)
-  if (typeof Element == 'undefined') return;
+  if (isNode) return;
 
   describe('animation query tests', function() {
     function getLog(): MockAnimationPlayer[] {
diff --git a/packages/core/test/animation/animation_router_integration_spec.ts b/packages/core/test/animation/animation_router_integration_spec.ts
index 012adb3a55..3225a8727f 100644
--- a/packages/core/test/animation/animation_router_integration_spec.ts
+++ b/packages/core/test/animation/animation_router_integration_spec.ts
@@ -16,7 +16,7 @@ import {RouterTestingModule} from '@angular/router/testing';
 
 (function() {
   // these tests are only mean't to be run within the DOM (for now)
-  if (typeof Element == 'undefined') return;
+  if (isNode) return;
 
   describe('Animation Router Tests', function() {
     function getLog(): MockAnimationPlayer[] {
diff --git a/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts b/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts
index 4b9201d811..22c1c498c5 100644
--- a/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts
+++ b/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts
@@ -17,7 +17,7 @@ import {TestBed} from '../../testing';
 (function() {
   // these tests are only mean't to be run within the DOM (for now)
   // Buggy in Chromium 39, see https://github.com/angular/angular/issues/15793
-  if (typeof Element == 'undefined') return;
+  if (isNode) return;
 
   describe('animation integration tests using css keyframe animations', function() {
 
diff --git a/packages/core/test/animation/animations_with_web_animations_integration_spec.ts b/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
index c5b00adce8..6067815255 100644
--- a/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
+++ b/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
@@ -18,7 +18,7 @@ import {TestBed} from '../../testing';
 (function() {
   // these tests are only mean't to be run within the DOM (for now)
   // Buggy in Chromium 39, see https://github.com/angular/angular/issues/15793
-  if (typeof Element == 'undefined' || !ɵsupportsWebAnimations()) return;
+  if (isNode || !ɵsupportsWebAnimations()) return;
 
   describe('animation integration tests using web animations', function() {
 
diff --git a/packages/platform-browser/test/animation/animation_renderer_spec.ts b/packages/platform-browser/test/animation/animation_renderer_spec.ts
index 05a0c0d8e9..8373cb1e93 100644
--- a/packages/platform-browser/test/animation/animation_renderer_spec.ts
+++ b/packages/platform-browser/test/animation/animation_renderer_spec.ts
@@ -117,7 +117,7 @@ import {el} from '../../testing/src/browser_util';
 
     describe('flushing animations', () => {
       // these tests are only mean't to be run within the DOM
-      if (typeof Element == 'undefined') return;
+      if (isNode) return;
 
       it('should flush and fire callbacks when the zone becomes stable', (async) => {
         @Component({

From 41cd8f3efbd66696660dd9896afa5ad42e660144 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Thu, 24 May 2018 15:49:07 +0200
Subject: [PATCH 117/582] refactor(core): use Partial<T> for MetadataOverride
 (#24103)

Allows to write:

const fixture = TestBed
      .overridePipe(DisplayNamePipe, { set: { pure: false } })
      .createComponent(MenuComponent);

when you only want to set the `pure` metadata,
instead of currently:

const fixture = TestBed
      .overridePipe(DisplayNamePipe, { set: { name: 'displayName', pure: false } })
      .createComponent(MenuComponent);

which forces you to redefine the name of the pipe even if it is useless.

Fixes #24102

PR Close #24103
---
 aio/content/guide/testing.md                         | 12 ++++++------
 packages/core/testing/src/metadata_override.ts       |  6 +++---
 .../platform-browser/test/testing_public_spec.ts     |  3 ++-
 tools/public_api_guard/core/testing.d.ts             |  6 +++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index 41f6d9bcf8..0acff26bf1 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -2367,9 +2367,9 @@ The [override metadata object](#metadata-override-object) is a generic defined a
 
 <code-example format="." language="javascript">
   type MetadataOverride<T> = {
-    add?: T;
-    remove?: T;
-    set?: T;
+    add?: Partial<T>;
+    remove?: Partial<T>;
+    set?: Partial<T>;
   };
 </code-example>
 
@@ -2725,9 +2725,9 @@ appropriate to the method, that is, the parameter of an `@NgModule`,
 
 <code-example format="." language="javascript">
   type MetadataOverride<T> = {
-    add?: T;
-    remove?: T;
-    set?: T;
+    add?: Partial<T>;
+    remove?: Partial<T>;
+    set?: Partial<T>;
   };
 </code-example>
 
diff --git a/packages/core/testing/src/metadata_override.ts b/packages/core/testing/src/metadata_override.ts
index 7e2d1d6467..7773cbbf25 100644
--- a/packages/core/testing/src/metadata_override.ts
+++ b/packages/core/testing/src/metadata_override.ts
@@ -12,7 +12,7 @@
  * @experimental
  */
 export type MetadataOverride<T> = {
-  add?: T,
-  remove?: T,
-  set?: T
+  add?: Partial<T>,
+  remove?: Partial<T>,
+  set?: Partial<T>
 };
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index f20b78a0c7..cf33d392f0 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -376,7 +376,8 @@ class CompWithUrlTemplate {
             TestBed
                 .overrideComponent(
                     SomeComponent, {set: {selector: 'comp', template: `{{'hello' | somePipe}}`}})
-                .overridePipe(SomePipe, {set: {name: 'somePipe'}});
+                .overridePipe(SomePipe, {set: {name: 'somePipe'}})
+                .overridePipe(SomePipe, {add: {pure: false}});
           });
           it('should work', () => {
             const compFixture = TestBed.createComponent(SomeComponent);
diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
index b25ae5069d..c7df004ea6 100644
--- a/tools/public_api_guard/core/testing.d.ts
+++ b/tools/public_api_guard/core/testing.d.ts
@@ -55,9 +55,9 @@ export declare class InjectSetupWrapper {
 
 /** @experimental */
 export declare type MetadataOverride<T> = {
-    add?: T;
-    remove?: T;
-    set?: T;
+    add?: Partial<T>;
+    remove?: Partial<T>;
+    set?: Partial<T>;
 };
 
 /** @experimental */

From 31795b620f8a574d729ea4caecaaa319585cecd5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 6 May 2018 17:50:35 +0200
Subject: [PATCH 118/582] style(compiler): fix typo and formatting (#23729)

PR Close #23729
---
 packages/compiler/src/aot/static_symbol_resolver.ts       | 5 ++---
 packages/compiler/test/aot/static_symbol_resolver_spec.ts | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/compiler/src/aot/static_symbol_resolver.ts b/packages/compiler/src/aot/static_symbol_resolver.ts
index 9e2c1a1641..65f0e8a049 100644
--- a/packages/compiler/src/aot/static_symbol_resolver.ts
+++ b/packages/compiler/src/aot/static_symbol_resolver.ts
@@ -12,7 +12,6 @@ import {ValueTransformer, visitValue} from '../util';
 import {StaticSymbol, StaticSymbolCache} from './static_symbol';
 import {isGeneratedFile, stripSummaryForJitFileSuffix, stripSummaryForJitNameSuffix, summaryForJitFileName, summaryForJitName} from './util';
 
-const DTS = /\.d\.ts$/;
 const TS = /^(?!.*\.d\.ts$).*\.ts$/;
 
 export class ResolvedStaticSymbol {
@@ -334,7 +333,7 @@ export class StaticSymbolResolver {
     }
 
     // handle the actual metadata. Has to be after the exports
-    // as there migth be collisions in the names, and we want the symbols
+    // as there might be collisions in the names, and we want the symbols
     // of the current module to win ofter reexports.
     if (metadata['metadata']) {
       // handle direct declarations of the symbol
@@ -387,7 +386,7 @@ export class StaticSymbolResolver {
     let _originalFileMemo: string|undefined;
     const getOriginalName: () => string = () => {
       if (!_originalFileMemo) {
-        // Guess what hte original file name is from the reference. If it has a `.d.ts` extension
+        // Guess what the original file name is from the reference. If it has a `.d.ts` extension
         // replace it with `.ts`. If it already has `.ts` just leave it in place. If it doesn't have
         // .ts or .d.ts, append `.ts'. Also, if it is in `node_modules`, trim the `node_module`
         // location as it is not important to finding the file.
diff --git a/packages/compiler/test/aot/static_symbol_resolver_spec.ts b/packages/compiler/test/aot/static_symbol_resolver_spec.ts
index dd8dafbe22..1c30215e70 100644
--- a/packages/compiler/test/aot/static_symbol_resolver_spec.ts
+++ b/packages/compiler/test/aot/static_symbol_resolver_spec.ts
@@ -11,8 +11,6 @@ import {CollectorOptions, METADATA_VERSION} from '@angular/compiler-cli';
 import {MetadataCollector} from '@angular/compiler-cli/src/metadata/collector';
 import * as ts from 'typescript';
 
-
-
 // This matches .ts files but not .d.ts files.
 const TS_EXT = /(^.|(?!\.d)..)\.ts$/;
 

From e53179ef8c14f98b3cda01c553934f5e90516803 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 29 May 2018 15:08:30 -0700
Subject: [PATCH 119/582] refactor(ivy): move parent from LNode to TNode
 (#24189)

PR Close #24189
---
 packages/core/src/render3/di.ts               | 22 ++---
 packages/core/src/render3/instructions.ts     | 41 +++++----
 packages/core/src/render3/interfaces/node.ts  | 85 +++++++++++++------
 .../core/src/render3/node_manipulation.ts     | 19 ++++-
 .../hello_world/bundle.golden_symbols.json    |  3 +
 .../bundling/todo/bundle.golden_symbols.json  |  3 +
 packages/core/test/render3/di_spec.ts         |  2 +-
 .../render3/node_selector_matcher_spec.ts     |  1 +
 8 files changed, 117 insertions(+), 59 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 05e4205888..7d66fca500 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -27,7 +27,7 @@ import {QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {LView, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
-import {insertView, removeView} from './node_manipulation';
+import {getParentLNode, insertView, removeView} from './node_manipulation';
 import {notImplemented, stringify} from './util';
 import {EmbeddedViewRef, ViewRef, addDestroyable, createViewRef} from './view_ref';
 
@@ -102,7 +102,8 @@ export function getOrCreateNodeInjector(): LInjector {
  */
 export function getOrCreateNodeInjectorForNode(node: LElementNode | LContainerNode): LInjector {
   const nodeInjector = node.nodeInjector;
-  const parentInjector = node.parent && node.parent.nodeInjector;
+  const parent = getParentLNode(node);
+  const parentInjector = parent && parent.nodeInjector;
   if (nodeInjector != parentInjector) {
     return nodeInjector !;
   }
@@ -568,14 +569,15 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
     const vcRefHost = di.node;
 
     ngDevMode && assertNodeOfPossibleTypes(vcRefHost, TNodeType.Container, TNodeType.Element);
-    const lContainer = createLContainer(vcRefHost.parent !, vcRefHost.view);
+    const hostParent = getParentLNode(vcRefHost) !;
+    const lContainer = createLContainer(hostParent, vcRefHost.view);
     const lContainerNode: LContainerNode = createLNodeObject(
-        TNodeType.Container, vcRefHost.view, vcRefHost.parent !, undefined, lContainer, null);
+        TNodeType.Container, vcRefHost.view, hostParent, undefined, lContainer, null);
 
     const hostTNode = vcRefHost.tNode;
     if (!hostTNode.dynamicContainerNode) {
       hostTNode.dynamicContainerNode =
-          createTNode(TNodeType.Container, hostTNode.index, null, null, null);
+          createTNode(TNodeType.Container, null, null, null, null, null);
     }
 
     lContainerNode.tNode = hostTNode.dynamicContainerNode;
@@ -640,8 +642,6 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
 
-    (lViewNode as{parent: LNode}).parent = this._lContainerNode;
-
     // If the view is dynamic (has a template), it needs to be counted both at the container
     // level and at the node above the container.
     if (lViewNode.data.template !== null) {
@@ -649,10 +649,10 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
       this._lContainerNode.data.dynamicViewCount++;
 
       // Look for the parent node and increment its dynamic view count.
-      if (this._lContainerNode.parent !== null && this._lContainerNode.parent.data !== null) {
-        ngDevMode && assertNodeOfPossibleTypes(
-                         this._lContainerNode.parent, TNodeType.View, TNodeType.Element);
-        this._lContainerNode.parent.data.dynamicViewCount++;
+      const containerParent = getParentLNode(this._lContainerNode) as LElementNode;
+      if (containerParent !== null && containerParent.data !== null) {
+        ngDevMode && assertNodeOfPossibleTypes(containerParent, TNodeType.View, TNodeType.Element);
+        containerParent.data.dynamicViewCount++;
       }
     }
     return viewRef;
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 345e8730dd..cc90d6c24d 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -15,9 +15,9 @@ import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interface
 import {LQueries} from './interfaces/query';
 import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TData, TView} from './interfaces/view';
 
-import {LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue,} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
-import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode} from './node_manipulation';
+import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
@@ -337,13 +337,12 @@ export function createLView<T>(
  * (same properties assigned in the same order).
  */
 export function createLNodeObject(
-    type: TNodeType, currentView: LView, parent: LNode, native: RText | RElement | null | undefined,
-    state: any,
+    type: TNodeType, currentView: LView, parent: LNode | null,
+    native: RText | RElement | null | undefined, state: any,
     queries: LQueries | null): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   return {
     native: native as any,
     view: currentView,
-    parent: parent as any,
     nodeInjector: parent ? parent.nodeInjector : null,
     data: state,
     queries: queries,
@@ -382,7 +381,11 @@ export function createLNode(
     name: string | null, attrs: string[] | null, state?: null | LView | LContainer |
         LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
-                            previousOrParentNode && previousOrParentNode.parent as LNode;
+                            previousOrParentNode && getParentLNode(previousOrParentNode) !as LNode;
+  // Parents cannot cross component boundaries because components will be used in multiple places,
+  // so it's only set if the view is the same.
+  const tParent =
+      parent && parent.view === currentView ? parent.tNode as TElementNode | TContainerNode : null;
   let queries =
       (isParent ? currentQueries : previousOrParentNode && previousOrParentNode.queries) ||
       parent && parent.queries && parent.queries.child();
@@ -393,7 +396,7 @@ export function createLNode(
   if (index === null || type === TNodeType.View) {
     // View nodes are not stored in data because they can be added / removed at runtime (which
     // would cause indices to change). Their TNodes are instead stored in TView.node.
-    node.tNode = (state as LView).tView.node || createTNode(type, index, null, null, null);
+    node.tNode = (state as LView).tView.node || createTNode(type, index, null, null, tParent, null);
   } else {
     // This is an element or container or projection node
     ngDevMode && assertDataNext(index);
@@ -401,7 +404,7 @@ export function createLNode(
 
     // Every node adds a value to the static data array to avoid a sparse array
     if (index >= tData.length) {
-      const tNode = tData[index] = createTNode(type, index, name, attrs, null);
+      const tNode = tData[index] = createTNode(type, index, name, attrs, tParent, null);
       if (!isParent && previousOrParentNode) {
         const previousTNode = previousOrParentNode.tNode;
         previousTNode.next = tNode;
@@ -596,7 +599,7 @@ export function elementStart(
       createLNode(index, TNodeType.Element, native !, name, attrs || null, null);
 
   if (attrs) setUpAttributes(native, attrs);
-  appendChild(node.parent !, native, currentView);
+  appendChild(getParentLNode(node), native, currentView);
   createDirectivesAndLocals(index, name, attrs, localRefs, false);
   return native;
 }
@@ -954,7 +957,7 @@ export function elementEnd() {
     isParent = false;
   } else {
     ngDevMode && assertHasParent();
-    previousOrParentNode = previousOrParentNode.parent !;
+    previousOrParentNode = getParentLNode(previousOrParentNode) as LElementNode;
   }
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Element);
   const queries = previousOrParentNode.queries;
@@ -1038,12 +1041,13 @@ export function elementProperty<T>(
  * @param index The index of the TNode in TView.data
  * @param tagName The tag name of the node
  * @param attrs The attributes defined on this node
+ * @param parent The parent of this node
  * @param tViews Any TViews attached to this node
  * @returns the TNode object
  */
 export function createTNode(
     type: TNodeType, index: number | null, tagName: string | null, attrs: string[] | null,
-    tViews: TView[] | null): TNode {
+    parent: TElementNode | TContainerNode | null, tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
     type: type,
@@ -1058,6 +1062,7 @@ export function createTNode(
     tViews: tViews,
     next: null,
     child: null,
+    parent: parent,
     dynamicContainerNode: null
   };
 }
@@ -1257,7 +1262,7 @@ export function text(index: number, value?: any): void {
 
   // Text nodes are self closing.
   isParent = false;
-  appendChild(node.parent !, textNode, currentView);
+  appendChild(getParentLNode(node), textNode, currentView);
 }
 
 /**
@@ -1485,7 +1490,7 @@ export function container(
                    currentView.bindingStartIndex, -1,
                    'container nodes should be created before any bindings');
 
-  const currentParent = isParent ? previousOrParentNode : previousOrParentNode.parent !;
+  const currentParent = isParent ? previousOrParentNode : getParentLNode(previousOrParentNode) !;
   const lContainer = createLContainer(currentParent, currentView, template);
 
   const node = createLNode(
@@ -1542,7 +1547,7 @@ export function containerRefreshEnd(): void {
   } else {
     ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
     ngDevMode && assertHasParent();
-    previousOrParentNode = previousOrParentNode.parent !;
+    previousOrParentNode = getParentLNode(previousOrParentNode) !;
   }
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   const container = previousOrParentNode as LContainerNode;
@@ -1609,7 +1614,7 @@ function scanForView(
  */
 export function embeddedViewStart(viewBlockId: number): RenderFlags {
   const container =
-      (isParent ? previousOrParentNode : previousOrParentNode.parent !) as LContainerNode;
+      (isParent ? previousOrParentNode : getParentLNode(previousOrParentNode)) as LContainerNode;
   ngDevMode && assertNodeType(container, TNodeType.Container);
   const lContainer = container.data;
   let viewNode: LViewNode|null = scanForView(container, lContainer.nextIndex, viewBlockId);
@@ -1662,7 +1667,7 @@ export function embeddedViewEnd(): void {
   refreshView();
   isParent = false;
   const viewNode = previousOrParentNode = currentView.node as LViewNode;
-  const containerNode = previousOrParentNode.parent as LContainerNode;
+  const containerNode = getParentLNode(previousOrParentNode) as LContainerNode;
   if (containerNode) {
     ngDevMode && assertNodeType(viewNode, TNodeType.View);
     ngDevMode && assertNodeType(containerNode, TNodeType.Container);
@@ -1834,7 +1839,6 @@ export function projection(
 
   // `<ng-content>` has no content
   isParent = false;
-  const currentParent = node.parent;
 
   // re-distribution of projectable nodes is memorized on a component's view level
   const componentNode = findComponentHost(currentView);
@@ -1856,6 +1860,7 @@ export function projection(
     }
   }
 
+  const currentParent = getParentLNode(node);
   if (canInsertNativeNode(currentParent, currentView)) {
     ngDevMode && assertNodeType(currentParent, TNodeType.Element);
     // process each node in the list of projected nodes:
@@ -2413,7 +2418,7 @@ export function assertPreviousIsParent() {
 }
 
 function assertHasParent() {
-  assertNotNull(previousOrParentNode.parent, 'previousOrParentNode should have a parent');
+  assertNotNull(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
 }
 
 function assertDataInRange(index: number, arr?: any[]) {
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 0701f960eb..c7d316ab92 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -65,12 +65,6 @@ export interface LNode {
    */
   readonly native: RElement|RText|null|undefined;
 
-  /**
-   * We need a reference to a node's parent so we can append the node to its parent's native
-   * element at the appropriate time.
-   */
-  readonly parent: LNode|null;
-
   /**
    * If regular LElementNode, then `data` will be null.
    * If LElementNode with component, then `data` contains LView.
@@ -127,18 +121,12 @@ export interface LElementNode extends LNode {
 
   /** If Component then data has LView (light DOM) */
   readonly data: LView|null;
-
-  /** LElementNodes can be inside other LElementNodes or inside LViewNodes. */
-  readonly parent: LElementNode|LViewNode;
 }
 
 /** LNode representing a #text node. */
 export interface LTextNode extends LNode {
   /** The text node associated with this node. */
   native: RText;
-
-  /** LTextNodes can be inside LElementNodes or inside LViewNodes. */
-  readonly parent: LElementNode|LViewNode;
   readonly data: null;
   dynamicLContainerNode: null;
 }
@@ -146,9 +134,6 @@ export interface LTextNode extends LNode {
 /** Abstract node which contains root nodes of a view. */
 export interface LViewNode extends LNode {
   readonly native: null;
-
-  /**  LViewNodes can only be added to LContainerNodes. */
-  readonly parent: LContainerNode|null;
   readonly data: LView;
   dynamicLContainerNode: null;
 }
@@ -164,19 +149,12 @@ export interface LContainerNode extends LNode {
    */
   native: RElement|RText|null|undefined;
   readonly data: LContainer;
-
-  /** Containers can be added to elements or views. */
-  readonly parent: LElementNode|LViewNode|null;
 }
 
 
 export interface LProjectionNode extends LNode {
   readonly native: null;
-
   readonly data: LProjection;
-
-  /** Projections can be added to elements or views. */
-  readonly parent: LElementNode|LViewNode;
   dynamicLContainerNode: null;
 }
 
@@ -201,7 +179,7 @@ export interface TNode {
    * This is necessary to get from any TNode to its corresponding LNode when
    * traversing the node tree.
    *
-   * If null, this is a view node created from a dynamically created view.
+   * If null, this is a dynamically created container node or embedded view node.
    */
   index: number|null;
 
@@ -307,6 +285,22 @@ export interface TNode {
    */
   child: TNode|null;
 
+  /**
+   * Parent node (in the same view only).
+   *
+   * We need a reference to a node's parent so we can append the node to its parent's native
+   * element at the appropriate time.
+   *
+   * If the parent would be in a different view (e.g. component host), this property will be null.
+   * It's important that we don't try to cross component boundaries when retrieving the parent
+   * because the parent will change (e.g. index, attrs) depending on where the component was
+   * used (and thus shouldn't be stored on TNode). In these cases, we retrieve the parent through
+   * LView.node instead (which will be instance-specific).
+   *
+   * If this is an inline view node (V), the parent will be its container.
+   */
+  parent: TElementNode|TContainerNode|null;
+
   /**
    * A pointer to a TContainerNode created by directives requesting ViewContainerRef
    */
@@ -315,31 +309,72 @@ export interface TNode {
 
 /** Static data for an LElementNode  */
 export interface TElementNode extends TNode {
-  child: TContainerNode|TElementNode|TProjectionNode|null;
+  /** Index in the data[] array */
+  index: number;
+  child: TElementNode|TTextNode|TContainerNode|TProjectionNode|null;
+  /**
+   * Element nodes will have parents unless they are the first node of a component or
+   * embedded view (which means their parent is in a different view and must be
+   * retrieved using LView.node).
+   */
+  parent: TElementNode|null;
   tViews: null;
 }
 
 /** Static data for an LTextNode  */
 export interface TTextNode extends TNode {
+  /** Index in the data[] array */
+  index: number;
   child: null;
+  /**
+   * Text nodes will have parents unless they are the first node of a component or
+   * embedded view (which means their parent is in a different view and must be
+   * retrieved using LView.node).
+   */
+  parent: TElementNode|null;
   tViews: null;
 }
 
 /** Static data for an LContainerNode */
 export interface TContainerNode extends TNode {
+  /**
+   * If number, index in the data[] array.
+   *
+   * If null, this is a dynamically created container node that isn't stored in
+   * data[] (e.g. when you inject ViewContainerRef) .
+   */
+  index: number|null;
   child: null;
+
+  /**
+   * Container nodes will have parents unless:
+   *
+   * - They are the first node of a component or embedded view
+   * - They are dynamically created
+   */
+  parent: TElementNode|null;
   tViews: TView|TView[]|null;
 }
 
 /** Static data for an LViewNode  */
 export interface TViewNode extends TNode {
-  child: TContainerNode|TElementNode|TProjectionNode|null;
+  /** If null, it's a dynamically created view*/
+  index: number|null;
+  child: TElementNode|TTextNode|TContainerNode|TProjectionNode|null;
+  parent: TContainerNode|null;
   tViews: null;
 }
 
 /** Static data for an LProjectionNode  */
 export interface TProjectionNode extends TNode {
+  /** Index in the data[] array */
   child: null;
+  /**
+   * Projection nodes will have parents unless they are the first node of a component
+   * or embedded view (which means their parent is in a different view and must be
+   * retrieved using LView.node).
+   */
+  parent: TElementNode|null;
   tViews: null;
 }
 
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 3ae554dd92..cb0bc5bdee 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -52,7 +52,7 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
         }
         currentSibling = getNextLNode(currentSibling);
       }
-      const parentNode = currentNode.parent;
+      const parentNode = getParentLNode(currentNode);
       currentNode = null;
       if (parentNode) {
         const parentType = parentNode.tNode.type;
@@ -84,6 +84,17 @@ export function getChildLNode(node: LNode): LNode|null {
   return null;
 }
 
+/** Retrieves the parent LNode of a given node. */
+export function getParentLNode(node: LElementNode | LTextNode | LProjectionNode): LElementNode|
+    LViewNode;
+export function getParentLNode(node: LViewNode): LContainerNode|null;
+export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null;
+export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null {
+  if (node.tNode.index === null) return null;
+  const parent = node.tNode.parent;
+  return parent ? node.view.data[parent.index as number] : node.view.node;
+}
+
 /**
  * Get the next node in the LNode tree, taking into account the place where a node is
  * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
@@ -122,7 +133,7 @@ function getNextOrParentSiblingNode(initialNode: LNode, rootNode: LNode): LNode|
   while (node && !nextNode) {
     // if node.pNextOrParent is not null here, it is not the next node
     // (because, at this point, nextNode is null, so it is the parent)
-    node = node.pNextOrParent || node.parent;
+    node = node.pNextOrParent || getParentLNode(node);
     if (node === rootNode) {
       return null;
     }
@@ -371,7 +382,7 @@ export function getParentState(state: LViewOrLContainer, rootView: LView): LView
   if ((node = (state as LView) !.node) && node.tNode.type === TNodeType.View) {
     // if it's an embedded view, the state needs to go up to the container, in case the
     // container has a next
-    return node.parent !.data as any;
+    return getParentLNode(node) !.data as any;
   } else {
     // otherwise, use parent view for containers or component views
     return state.parent === rootView ? null : state.parent;
@@ -476,7 +487,7 @@ export function appendChild(parent: LNode, child: RNode | null, currentView: LVi
  * @param currentView Current LView
  */
 export function insertChild(node: LNode, currentView: LView): void {
-  const parent = node.parent !;
+  const parent = getParentLNode(node) !;
   if (canInsertNativeNode(parent, currentView)) {
     let nativeSibling: RNode|null = findNextRNodeSibling(node, null);
     const renderer = currentView.renderer;
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 63f67c0bda..3a97e3864e 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -110,6 +110,9 @@
   {
     "name": "getOrCreateTView"
   },
+  {
+    "name": "getParentLNode"
+  },
   {
     "name": "getRenderFlags"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 7cdd8fb784..34d33906bc 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -422,6 +422,9 @@
   {
     "name": "getOrCreateTemplateRef"
   },
+  {
+    "name": "getParentLNode"
+  },
   {
     "name": "getParentState"
   },
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index cc3bded98b..73dc163330 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1372,7 +1372,7 @@ describe('di', () => {
         // Simulate the situation where the previous parent is not initialized.
         // This happens on first bootstrap because we don't init existing values
         // so that we have smaller HelloWorld.
-        (parent as{parent: any}).parent = undefined;
+        (parent.tNode as{parent: any}).parent = undefined;
 
         const injector = getOrCreateNodeInjector();
         expect(injector).not.toBe(null);
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index d98944e264..53b432ea56 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -23,6 +23,7 @@ function testLStaticData(tagName: string, attrs: string[] | null): TNode {
     tViews: null,
     next: null,
     child: null,
+    parent: null,
     dynamicContainerNode: null
   };
 }

From b87d650da28333aacf5d04333b0ed80804693d5f Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 13 May 2018 18:29:45 +0200
Subject: [PATCH 120/582] refactor(ivy): rename `PipeDef.n` to
 `PipeDef.factory` (#23883)

The original reason for this property to be short no longer holds true,
as pipes always need to be defined using `definePipe`.

PR Close #23883
---
 packages/core/src/render3/definition.ts            | 2 +-
 packages/core/src/render3/interfaces/definition.ts | 7 ++-----
 packages/core/src/render3/pipe.ts                  | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index da3c36e1c5..dbe6f53663 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -431,7 +431,7 @@ export function definePipe<T>(pipeDef: {
 }): never {
   return (<PipeDef<T>>{
     name: pipeDef.name,
-    n: pipeDef.factory,
+    factory: pipeDef.factory,
     pure: pipeDef.pure !== false,
     onDestroy: pipeDef.type.prototype.ngOnDestroy || null
   }) as never;
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 4395efdca8..dc41b96f33 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -204,12 +204,9 @@ export interface PipeDef<T> {
   name: string;
 
   /**
-   * factory function used to create a new directive instance.
-   *
-   * NOTE: this property is short (1 char) because it is used in
-   * component templates which is sensitive to size.
+   * Factory function used to create a new pipe instance.
    */
-  n: () => T;
+  factory: () => T;
 
   /**
    * Whether or not the pipe is pure.
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index fd9031ca07..7f736721f7 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -33,7 +33,7 @@ export function pipe(index: number, pipeName: string): any {
     pipeDef = tView.data[index] as PipeDef<any>;
   }
 
-  const pipeInstance = pipeDef.n();
+  const pipeInstance = pipeDef.factory();
   store(index, pipeInstance);
   return pipeInstance;
 }

From 90bf5d8961979469e39ad27a9cdce4ec132ef11c Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Fri, 4 May 2018 15:58:42 +0200
Subject: [PATCH 121/582] feat(ivy): separate attributes for directive matching
 purposes (#23991)

In ngIvy directives matching (determining which directives are active based
on a CSS seletor) happens at runtime. This means that runtime needs to have
enough context to match directives. This PR takes care of cases where a directive's
selector should match bindings (ex. [foo]="exp") and event handlers (ex. (out)="do()").
In the mentioned cases we need to have binding / output "attributes" for directive's
CSS selector matching purposes. At the same time those are not regular attributes and
as such should not  be reflected in the DOM.

Closes #23706

PR Close #23991
---
 packages/core/src/render3/di.ts               |  10 +-
 packages/core/src/render3/index.ts            |   4 +
 packages/core/src/render3/instructions.ts     |  46 ++---
 packages/core/src/render3/interfaces/node.ts  |  41 ++++-
 .../core/src/render3/node_selector_matcher.ts |  22 ++-
 packages/core/test/render3/content_spec.ts    |  44 ++++-
 packages/core/test/render3/di_spec.ts         |  68 ++++++--
 packages/core/test/render3/directive_spec.ts  | 160 ++++++++++++++++--
 .../render3/node_selector_matcher_spec.ts     |  28 ++-
 9 files changed, 349 insertions(+), 74 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 7d66fca500..b57926f254 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -22,7 +22,7 @@ import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
-import {LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
+import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {LView, TView} from './interfaces/view';
@@ -251,7 +251,7 @@ export function injectChangeDetectorRef(): viewEngine_ChangeDetectorRef {
  *
  * @experimental
  */
-export function injectAttribute(attrName: string): string|undefined {
+export function injectAttribute(attrNameToInject: string): string|undefined {
   ngDevMode && assertPreviousIsParent();
   const lElement = getPreviousOrParentNode() as LElementNode;
   ngDevMode && assertNodeType(lElement, TNodeType.Element);
@@ -260,8 +260,10 @@ export function injectAttribute(attrName: string): string|undefined {
   const attrs = tElement.attrs;
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
-      if (attrs[i] == attrName) {
-        return attrs[i + 1];
+      const attrName = attrs[i];
+      if (attrName === AttributeMarker.SELECT_ONLY) break;
+      if (attrName == attrNameToInject) {
+        return attrs[i + 1] as string;
       }
     }
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 421b421364..0e8e091bc3 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -73,6 +73,10 @@ export {
   tick,
 } from './instructions';
 
+export {
+    AttributeMarker
+} from './interfaces/node';
+
 export {
   pipe as Pp,
   pipeBind1 as pb1,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index cc90d6c24d..20752d436a 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -15,7 +15,7 @@ import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interface
 import {LQueries} from './interfaces/query';
 import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TData, TView} from './interfaces/view';
 
-import {LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
+import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
@@ -366,19 +366,19 @@ export function createLNodeObject(
  */
 export function createLNode(
     index: number | null, type: TNodeType.Element, native: RElement | RText | null,
-    name: string | null, attrs: string[] | null, lView?: LView | null): LElementNode;
+    name: string | null, attrs: TAttributes | null, lView?: LView | null): LElementNode;
 export function createLNode(
     index: number | null, type: TNodeType.View, native: null, name: null, attrs: null,
     lView: LView): LViewNode;
 export function createLNode(
     index: number, type: TNodeType.Container, native: undefined, name: string | null,
-    attrs: string[] | null, lContainer: LContainer): LContainerNode;
+    attrs: TAttributes | null, lContainer: LContainer): LContainerNode;
 export function createLNode(
-    index: number, type: TNodeType.Projection, native: null, name: null, attrs: string[] | null,
+    index: number, type: TNodeType.Projection, native: null, name: null, attrs: TAttributes | null,
     lProjection: LProjection): LProjectionNode;
 export function createLNode(
     index: number | null, type: TNodeType, native: RText | RElement | null | undefined,
-    name: string | null, attrs: string[] | null, state?: null | LView | LContainer |
+    name: string | null, attrs: TAttributes | null, state?: null | LView | LContainer |
         LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
                             previousOrParentNode && getParentLNode(previousOrParentNode) !as LNode;
@@ -586,7 +586,8 @@ function getRenderFlags(view: LView): RenderFlags {
  * ['id', 'warning5', 'class', 'alert']
  */
 export function elementStart(
-    index: number, name: string, attrs?: string[] | null, localRefs?: string[] | null): RElement {
+    index: number, name: string, attrs?: TAttributes | null,
+    localRefs?: string[] | null): RElement {
   ngDevMode &&
       assertEqual(
           currentView.bindingStartIndex, -1, 'elements should be created before any bindings');
@@ -600,23 +601,18 @@ export function elementStart(
 
   if (attrs) setUpAttributes(native, attrs);
   appendChild(getParentLNode(node), native, currentView);
-  createDirectivesAndLocals(index, name, attrs, localRefs, false);
+  createDirectivesAndLocals(localRefs);
   return native;
 }
 
 /**
  * Creates directive instances and populates local refs.
  *
- * @param index Index of the current node (to create TNode)
- * @param name Tag name of the current node
- * @param attrs Attrs of the current node
  * @param localRefs Local refs of the current node
- * @param inlineViews Whether or not this node will create inline views
  */
-function createDirectivesAndLocals(
-    index: number, name: string | null, attrs: string[] | null | undefined,
-    localRefs: string[] | null | undefined, inlineViews: boolean) {
+function createDirectivesAndLocals(localRefs?: string[] | null) {
   const node = previousOrParentNode;
+
   if (firstTemplatePass) {
     ngDevMode && ngDevMode.firstTemplatePass++;
     cacheMatchingDirectivesForNode(node.tNode, currentView.tView, localRefs || null);
@@ -822,17 +818,18 @@ export function createTView(
   };
 }
 
-function setUpAttributes(native: RElement, attrs: string[]): void {
-  ngDevMode && assertEqual(attrs.length % 2, 0, 'each attribute should have a key and a value');
-
+function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
     const attrName = attrs[i];
+    if (attrName === AttributeMarker.SELECT_ONLY) break;
     if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
       const attrVal = attrs[i + 1];
       ngDevMode && ngDevMode.rendererSetAttribute++;
-      isProc ? (renderer as ProceduralRenderer3).setAttribute(native, attrName, attrVal) :
-               native.setAttribute(attrName, attrVal);
+      isProc ?
+          (renderer as ProceduralRenderer3)
+              .setAttribute(native, attrName as string, attrVal as string) :
+          native.setAttribute(attrName as string, attrVal as string);
     }
   }
 }
@@ -1046,7 +1043,7 @@ export function elementProperty<T>(
  * @returns the TNode object
  */
 export function createTNode(
-    type: TNodeType, index: number | null, tagName: string | null, attrs: string[] | null,
+    type: TNodeType, index: number | null, tagName: string | null, attrs: TAttributes | null,
     parent: TElementNode | TContainerNode | null, tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
@@ -1442,10 +1439,13 @@ function generateInitialInputs(
   for (let i = 0; i < attrs.length; i += 2) {
     const attrName = attrs[i];
     const minifiedInputName = inputs[attrName];
+    const attrValue = attrs[i + 1];
+
+    if (attrName === AttributeMarker.SELECT_ONLY) break;
     if (minifiedInputName !== undefined) {
       const inputsToStore: InitialInputs =
           initialInputData[directiveIndex] || (initialInputData[directiveIndex] = []);
-      inputsToStore.push(minifiedInputName, attrs[i + 1]);
+      inputsToStore.push(minifiedInputName, attrValue as string);
     }
   }
   return initialInputData;
@@ -1484,7 +1484,7 @@ export function createLContainer(
  * @param localRefs A set of local reference bindings on the element.
  */
 export function container(
-    index: number, template?: ComponentTemplate<any>, tagName?: string | null, attrs?: string[],
+    index: number, template?: ComponentTemplate<any>, tagName?: string | null, attrs?: TAttributes,
     localRefs?: string[] | null): void {
   ngDevMode && assertEqual(
                    currentView.bindingStartIndex, -1,
@@ -1501,7 +1501,7 @@ export function container(
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
   addToViewTree(currentView, node.data);
-  createDirectivesAndLocals(index, tagName || null, attrs, localRefs, template == null);
+  createDirectivesAndLocals(localRefs);
 
   isParent = false;
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index c7d316ab92..80b04fecbe 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -158,6 +158,29 @@ export interface LProjectionNode extends LNode {
   dynamicLContainerNode: null;
 }
 
+/**
+ * A set of marker values to be used in the attributes arrays. Those markers indicate that some
+ * items are not regular attributes and the processing should be adapted accordingly.
+ */
+export const enum AttributeMarker {
+  NS = 0,  // namespace. Has to be repeated.
+
+  /**
+   * This marker indicates that the following attribute names were extracted from bindings (ex.:
+   * [foo]="exp") and / or event handlers (ex. (bar)="doSth()").
+   * Taking the above bindings and outputs as an example an attributes array could look as follows:
+   * ['class', 'fade in', AttributeMarker.SELECT_ONLY, 'foo', 'bar']
+   */
+  SELECT_ONLY = 1
+}
+
+/**
+ * A combination of:
+ * - attribute names and values
+ * - special markers acting as flags to alter attributes processing.
+ */
+export type TAttributes = (string | AttributeMarker)[];
+
 /**
  * LNode binding data (flyweight) for a particular node that is shared between all templates
  * of a specific type.
@@ -198,18 +221,20 @@ export interface TNode {
   tagName: string|null;
 
   /**
-   * Static attributes associated with an element. We need to store
-   * static attributes to support content projection with selectors.
-   * Attributes are stored statically because reading them from the DOM
-   * would be way too slow for content projection and queries.
+   * Attributes associated with an element. We need to store attributes to support various use-cases
+   * (attribute injection, content projection with selectors, directives matching).
+   * Attributes are stored statically because reading them from the DOM would be way too slow for
+   * content projection and queries.
    *
-   * Since attrs will always be calculated first, they will never need
-   * to be marked undefined by other instructions.
+   * Since attrs will always be calculated first, they will never need to be marked undefined by
+   * other instructions.
    *
-   * The name of the attribute and its value alternate in the array.
+   * For regular attributes a name of an attribute and its value alternate in the array.
    * e.g. ['role', 'checkbox']
+   * This array can contain flags that will indicate "special attributes" (attributes with
+   * namespaces, attributes extracted from bindings and outputs).
    */
-  attrs: string[]|null;
+  attrs: TAttributes|null;
 
   /**
    * A set of local names under which a given element is exported in a template and
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index e92e3f287d..73f2ab55ec 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -9,7 +9,7 @@
 import './ng_dev_mode';
 
 import {assertNotNull} from './assert';
-import {TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
+import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
 const unusedValueToPlacateAjd = unused1 + unused2;
@@ -40,6 +40,7 @@ export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boo
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
+  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SELECT_ONLY) : -1;
 
   // When processing ":not" selectors, we skip to the next ":not" if the
   // current one doesn't match
@@ -80,9 +81,11 @@ export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boo
 
       const selectorAttrValue = mode & SelectorFlags.CLASS ? current : selector[++i];
       if (selectorAttrValue !== '') {
-        const nodeAttrValue = nodeAttrs[attrIndexInNode + 1];
+        const nodeAttrValue = selectOnlyMarkerIdx > -1 && attrIndexInNode > selectOnlyMarkerIdx ?
+            '' :
+            nodeAttrs[attrIndexInNode + 1];
         if (mode & SelectorFlags.CLASS &&
-                !isCssClassMatching(nodeAttrValue, selectorAttrValue as string) ||
+                !isCssClassMatching(nodeAttrValue as string, selectorAttrValue as string) ||
             mode & SelectorFlags.ATTRIBUTE && selectorAttrValue !== nodeAttrValue) {
           if (isPositive(mode)) return false;
           skipToNextSelector = true;
@@ -98,10 +101,15 @@ function isPositive(mode: SelectorFlags): boolean {
   return (mode & SelectorFlags.NOT) === 0;
 }
 
-function findAttrIndexInNode(name: string, attrs: string[] | null): number {
+function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
+  let step = 2;
   if (attrs === null) return -1;
-  for (let i = 0; i < attrs.length; i += 2) {
-    if (attrs[i] === name) return i;
+  for (let i = 0; i < attrs.length; i += step) {
+    const attrName = attrs[i];
+    if (attrName === name) return i;
+    if (attrName === AttributeMarker.SELECT_ONLY) {
+      step = 1;
+    }
   }
   return -1;
 }
@@ -123,7 +131,7 @@ export function getProjectAsAttrValue(tNode: TNode): string|null {
     // only check for ngProjectAs in attribute names, don't accidentally match attribute's value
     // (attribute names are stored at even indexes)
     if ((ngProjectAsAttrIdx & 1) === 0) {
-      return nodeAttrs[ngProjectAsAttrIdx + 1];
+      return nodeAttrs[ngProjectAsAttrIdx + 1] as string;
     }
   }
   return null;
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 45469996af..71d7dda90b 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -8,10 +8,11 @@
 
 import {SelectorFlags} from '@angular/core/src/render3/interfaces/projection';
 
-import {detectChanges} from '../../src/render3/index';
-import {container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective, projection, projectionDef, text} from '../../src/render3/instructions';
+import {AttributeMarker, detectChanges} from '../../src/render3/index';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, loadDirective, projection, projectionDef, text} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {createComponent, renderComponent, toHtml} from './render_util';
+
+import {ComponentFixture, createComponent, renderComponent, toHtml} from './render_util';
 
 describe('content projection', () => {
   it('should project content', () => {
@@ -583,6 +584,43 @@ describe('content projection', () => {
               '<child><div id="first"><span title="toFirst">1</span></div><div id="second"><span title="toSecond">2</span></div></child>');
     });
 
+    // https://stackblitz.com/edit/angular-psokum?file=src%2Fapp%2Fapp.module.ts
+    it('should project nodes where attribute selector matches a binding', () => {
+      /**
+       *  <ng-content select="[title]"></ng-content>
+       */
+      const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+        if (rf & RenderFlags.Create) {
+          projectionDef(0, [[['', 'title', '']]], ['[title]']);
+          { projection(1, 0, 1); }
+        }
+      });
+
+      /**
+       * <child>
+       *  <span [title]="'Some title'">Has title</span>
+       * </child>
+       */
+      const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'child');
+          {
+            elementStart(1, 'span', [AttributeMarker.SELECT_ONLY, 'title']);
+            { text(2, 'Has title'); }
+            elementEnd();
+          }
+          elementEnd();
+        }
+        if (rf & RenderFlags.Update) {
+          elementProperty(1, 'title', bind('Some title'));
+        }
+      }, [Child]);
+
+      const fixture = new ComponentFixture(Parent);
+      expect(fixture.html).toEqual('<child><span title="Some title">Has title</span></child>');
+
+    });
+
     it('should project nodes using class selectors', () => {
       /**
        *  <div id="first"><ng-content select="span.toFirst"></ng-content></div>
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 73dc163330..c5bceace20 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -12,9 +12,9 @@ import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
 import {defineComponent} from '../../src/render3/definition';
 import {bloomAdd, bloomFindPossibleInjector, getOrCreateNodeInjector, injectAttribute} from '../../src/render3/di';
 import {NgOnChangesFeature, PublicFeature, defineDirective, directiveInject, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, createLNode, createLView, createTView, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, load, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, createLNode, createLView, createTView, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, load, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {LInjector} from '../../src/render3/interfaces/injector';
-import {TNodeType} from '../../src/render3/interfaces/node';
+import {AttributeMarker, TNodeType} from '../../src/render3/interfaces/node';
 import {LViewFlags} from '../../src/render3/interfaces/view';
 import {ViewRef} from '../../src/render3/view_ref';
 
@@ -1199,21 +1199,61 @@ describe('di', () => {
     });
   });
 
-  it('should injectAttribute', () => {
-    let exist: string|undefined = 'wrong';
-    let nonExist: string|undefined = 'wrong';
+  describe('@Attribute', () => {
 
-    const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        elementStart(0, 'div', ['exist', 'existValue', 'other', 'ignore']);
-        exist = injectAttribute('exist');
-        nonExist = injectAttribute('nonExist');
-      }
+    it('should inject attribute', () => {
+      let exist: string|undefined = 'wrong';
+      let nonExist: string|undefined = 'wrong';
+
+      const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'div', ['exist', 'existValue', 'other', 'ignore']);
+          exist = injectAttribute('exist');
+          nonExist = injectAttribute('nonExist');
+        }
+      });
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(exist).toEqual('existValue');
+      expect(nonExist).toEqual(undefined);
     });
 
-    const app = renderComponent(MyApp);
-    expect(exist).toEqual('existValue');
-    expect(nonExist).toEqual(undefined);
+    // https://stackblitz.com/edit/angular-8ytqkp?file=src%2Fapp%2Fapp.component.ts
+    it('should not inject attributes representing bindings and outputs', () => {
+      let exist: string|undefined = 'wrong';
+      let nonExist: string|undefined = 'wrong';
+
+      const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SELECT_ONLY, 'nonExist']);
+          exist = injectAttribute('exist');
+          nonExist = injectAttribute('nonExist');
+        }
+      });
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(exist).toEqual('existValue');
+      expect(nonExist).toEqual(undefined);
+    });
+
+    it('should not accidentally inject attributes representing bindings and outputs', () => {
+      let exist: string|undefined = 'wrong';
+      let nonExist: string|undefined = 'wrong';
+
+      const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'div', [
+            'exist', 'existValue', AttributeMarker.SELECT_ONLY, 'binding1', 'nonExist', 'binding2'
+          ]);
+          exist = injectAttribute('exist');
+          nonExist = injectAttribute('nonExist');
+        }
+      });
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(exist).toEqual('existValue');
+      expect(nonExist).toEqual(undefined);
+    });
   });
 
   describe('inject', () => {
diff --git a/packages/core/test/render3/directive_spec.ts b/packages/core/test/render3/directive_spec.ts
index d088989ea1..58f0c22349 100644
--- a/packages/core/test/render3/directive_spec.ts
+++ b/packages/core/test/render3/directive_spec.ts
@@ -6,10 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {defineDirective} from '../../src/render3/index';
-import {bind, elementEnd, elementProperty, elementStart, loadDirective} from '../../src/render3/instructions';
-import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {renderToHtml} from './render_util';
+import {EventEmitter} from '@angular/core';
+
+import {AttributeMarker, defineDirective} from '../../src/render3/index';
+import {bind, elementEnd, elementProperty, elementStart, listener, loadDirective} from '../../src/render3/instructions';
+
+import {TemplateFixture} from './render_util';
 
 describe('directive', () => {
 
@@ -31,17 +33,151 @@ describe('directive', () => {
         });
       }
 
-      function Template(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          elementStart(0, 'span', ['dir', '']);
-          elementEnd();
+      function Template() {
+        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'dir']);
+        elementEnd();
+      }
+
+      const fixture = new TemplateFixture(Template, () => {}, [Directive]);
+      expect(fixture.html).toEqual('<span class="foo"></span>');
+
+      directiveInstance !.klass = 'bar';
+      fixture.update();
+      expect(fixture.html).toEqual('<span class="bar"></span>');
+    });
+
+  });
+
+  describe('selectors', () => {
+
+    it('should match directives with attribute selectors on bindings', () => {
+      let directiveInstance: Directive;
+
+      class Directive {
+        static ngDirectiveDef = defineDirective({
+          type: Directive,
+          selectors: [['', 'test', '']],
+          factory: () => directiveInstance = new Directive,
+          inputs: {test: 'test', other: 'other'}
+        });
+
+        testValue: boolean;
+        other: boolean;
+
+        /**
+         * A setter to assert that a binding is not invoked with stringified attribute value
+         */
+        set test(value: any) {
+          // if a binding is processed correctly we should only be invoked with a false Boolean
+          // and never with the "false" string literal
+          this.testValue = value;
+          if (value !== false) {
+            fail('Should only be called with a false Boolean value, got a non-falsy value');
+          }
         }
       }
 
-      const defs = [Directive];
-      expect(renderToHtml(Template, {}, defs)).toEqual('<span class="foo" dir=""></span>');
-      directiveInstance !.klass = 'bar';
-      expect(renderToHtml(Template, {}, defs)).toEqual('<span class="bar" dir=""></span>');
+      /**
+       * <span [test]="false" [other]="true"></span>
+       */
+      function createTemplate() {
+        // using 2 bindings to show example shape of attributes array
+        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'test', 'other']);
+        elementEnd();
+      }
+
+      function updateTemplate() { elementProperty(0, 'test', bind(false)); }
+
+      const fixture = new TemplateFixture(createTemplate, updateTemplate, [Directive]);
+
+      // the "test" attribute should not be reflected in the DOM as it is here only for directive
+      // matching purposes
+      expect(fixture.html).toEqual('<span class="fade"></span>');
+      expect(directiveInstance !.testValue).toBe(false);
+    });
+
+    it('should not accidentally set inputs from attributes extracted from bindings / outputs',
+       () => {
+         let directiveInstance: Directive;
+
+         class Directive {
+           static ngDirectiveDef = defineDirective({
+             type: Directive,
+             selectors: [['', 'test', '']],
+             factory: () => directiveInstance = new Directive,
+             inputs: {test: 'test', prop1: 'prop1', prop2: 'prop2'}
+           });
+
+           prop1: boolean;
+           prop2: boolean;
+           testValue: boolean;
+
+
+           /**
+            * A setter to assert that a binding is not invoked with stringified attribute value
+            */
+           set test(value: any) {
+             // if a binding is processed correctly we should only be invoked with a false Boolean
+             // and never with the "false" string literal
+             this.testValue = value;
+             if (value !== false) {
+               fail('Should only be called with a false Boolean value, got a non-falsy value');
+             }
+           }
+         }
+
+         /**
+          * <span [prop1]="true" [test]="false" [prop2]="true"></span>
+          */
+         function createTemplate() {
+           // putting name (test) in the "usual" value position
+           elementStart(
+               0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'prop1', 'test', 'prop2']);
+           elementEnd();
+         }
+
+         function updateTemplate() {
+           elementProperty(0, 'prop1', bind(true));
+           elementProperty(0, 'test', bind(false));
+           elementProperty(0, 'prop2', bind(true));
+         }
+
+         const fixture = new TemplateFixture(createTemplate, updateTemplate, [Directive]);
+
+         // the "test" attribute should not be reflected in the DOM as it is here only for directive
+         // matching purposes
+         expect(fixture.html).toEqual('<span class="fade"></span>');
+         expect(directiveInstance !.testValue).toBe(false);
+       });
+
+    it('should match directives with attribute selectors on outputs', () => {
+      let directiveInstance: Directive;
+
+      class Directive {
+        static ngDirectiveDef = defineDirective({
+          type: Directive,
+          selectors: [['', 'out', '']],
+          factory: () => directiveInstance = new Directive,
+          outputs: {out: 'out'}
+        });
+
+        out = new EventEmitter();
+      }
+
+      /**
+       * <span (out)="someVar = true"></span>
+       */
+      function createTemplate() {
+        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'out']);
+        { listener('out', () => {}); }
+        elementEnd();
+      }
+
+      const fixture = new TemplateFixture(createTemplate, () => {}, [Directive]);
+
+      // "out" should not be part of reflected attributes
+      expect(fixture.html).toEqual('<span></span>');
+      expect(directiveInstance !).not.toBeUndefined();
     });
 
   });
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 53b432ea56..3a143bcadf 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TNode, TNodeType} from '../../src/render3/interfaces/node';
+import {AttributeMarker, TAttributes, TNode, TNodeType} from '../../src/render3/interfaces/node';
 
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags,} from '../../src/render3/interfaces/projection';
 import {getProjectAsAttrValue, isNodeMatchingSelectorList, isNodeMatchingSelector} from '../../src/render3/node_selector_matcher';
 
-function testLStaticData(tagName: string, attrs: string[] | null): TNode {
+function testLStaticData(tagName: string, attrs: TAttributes | null): TNode {
   return {
     type: TNodeType.Element,
     index: 0,
@@ -29,7 +29,7 @@ function testLStaticData(tagName: string, attrs: string[] | null): TNode {
 }
 
 describe('css selector matching', () => {
-  function isMatching(tagName: string, attrs: string[] | null, selector: CssSelector): boolean {
+  function isMatching(tagName: string, attrs: TAttributes | null, selector: CssSelector): boolean {
     return isNodeMatchingSelector(testLStaticData(tagName, attrs), selector);
   }
 
@@ -177,6 +177,28 @@ describe('css selector matching', () => {
           '', 'class', 'foo'
         ])).toBeTruthy(`Selector '[class="foo"]' should match <span class="foo">`);
       });
+
+      it('should take optional binding attribute names into account', () => {
+        expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
+          '', 'directive', ''
+        ])).toBeTruthy(`Selector '[directive]' should match <span [directive]="exp">`);
+      });
+
+      it('should not match optional binding attribute names if attribute selector has value',
+         () => {
+           expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
+             '', 'directive', 'value'
+           ])).toBeFalsy(`Selector '[directive=value]' should not match <span [directive]="exp">`);
+         });
+
+      it('should not match optional binding attribute names if attribute selector has value and next name equals to value',
+         () => {
+           expect(isMatching(
+                      'span', [AttributeMarker.SELECT_ONLY, 'directive', 'value'],
+                      ['', 'directive', 'value']))
+               .toBeFalsy(
+                   `Selector '[directive=value]' should not match <span [directive]="exp" [value]="otherExp">`);
+         });
     });
 
     describe('class matching', () => {

From f6f44edcc03f3ccba1f132a8d691e3c499536a19 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 21 May 2018 20:50:29 +0200
Subject: [PATCH 122/582] docs: update ivy perf notes (#24035)

PR Close #24035
---
 packages/core/src/render3/PERF_NOTES.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/core/src/render3/PERF_NOTES.md b/packages/core/src/render3/PERF_NOTES.md
index d031899025..9a75641e00 100644
--- a/packages/core/src/render3/PERF_NOTES.md
+++ b/packages/core/src/render3/PERF_NOTES.md
@@ -64,3 +64,10 @@ for (var i = 0, keys = Object.keys(obj); i < keys.length; i++) {
   const key = keys[i];
 }
 ```
+
+## Recursive functions
+Avoid recursive functions when possible because they cannot be inlined.
+
+## Loops
+Don't use foreach, it can cause megamorphic function calls (depending on the browser) and function allocations.
+It is [a lot slower than regular `for` loops](https://jsperf.com/for-vs-foreach-misko)

From 2e21690c664a6c038c0e26638e37b2a610513011 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Tue, 22 May 2018 17:40:59 +0200
Subject: [PATCH 123/582] feat(ivy): support renderer.destroy and
 renderer.destroyNode hooks (#24049)

PR Close #24049
---
 packages/core/src/render3/STATUS.md           |  33 +++++-
 packages/core/src/render3/ng_dev_mode.ts      |   4 +
 .../core/src/render3/node_manipulation.ts     |  18 ++-
 packages/core/test/render3/render_util.ts     |   8 +-
 .../test/render3/renderer_factory_spec.ts     | 111 +++++++++++++++++-
 5 files changed, 162 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index a96a211e99..3f492db4f0 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -228,10 +228,10 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 ### View Encapsulation
 | Feature                             | Runtime | Spec     | Compiler |
 | ----------------------------------- | ------- | -------- | -------- |
-| Render3.None                        |  ✅     |  ✅       |  ✅      |
-| Render2.None                        |  ✅     |  ✅       |  ✅      |
-| Render2.Emulated                    |  ❌     |  ❌       |  ❌      |
-| Render2.Native                      |  ❌     |  ❌       |  ❌      |
+| Renderer3.None                        |  ✅     |  ✅       |  ✅      |
+| Renderer2.None                        |  ✅     |  ✅       |  ✅      |
+| Renderer2.Emulated                    |  ❌     |  ❌       |  ❌      |
+| Renderer2.Native                      |  ❌     |  ❌       |  ❌      |
 
 
 
@@ -254,3 +254,28 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `checkNoChanges()`     | n/a                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
 | `reattach()`           | n/a                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
 | `nativeElement()`      | n/a                | n/a          | n/a              | n/a      |  ✅         | n/a                  |
+
+### Renderer2
+| Method                              | Runtime |
+| ----------------------------------- | ------- |
+| `data()`                            |  n/a    |
+| `destroy()`                         |  ✅     |
+| `createElement()`                   |  ✅     |
+| `createComment()`                   |  n/a    |
+| `createText()`                      |  ✅     |
+| `destroyNode()`                     |  ✅     |
+| `appendChild()`                     |  ✅     |
+| `insertBefore()`                    |  ✅     |
+| `removeChild()`                     |  ✅     |
+| `selectRootElement()`               |  ✅     |
+| `parentNode()`                      |  ❌     |
+| `nextSibling()`                     |  ❌     |
+| `setAttribute()`                    |  ✅     |
+| `removeAttribute()`                 |  ✅     |
+| `addClass()`                        |  ✅     |
+| `removeClass()`                     |  ✅     |
+| `setStyle()`                        |  ✅     |
+| `removeStyle()`                     |  ✅     |
+| `setProperty()`                     |  ✅     |
+| `setValue()`                        |  ✅     |
+| `listen()`                          |  ✅     |
\ No newline at end of file
diff --git a/packages/core/src/render3/ng_dev_mode.ts b/packages/core/src/render3/ng_dev_mode.ts
index 3580605386..e3a2d7188b 100644
--- a/packages/core/src/render3/ng_dev_mode.ts
+++ b/packages/core/src/render3/ng_dev_mode.ts
@@ -25,6 +25,8 @@ declare global {
     rendererRemoveClass: number;
     rendererSetStyle: number;
     rendererRemoveStyle: number;
+    rendererDestroy: number;
+    rendererDestroyNode: number;
   }
 }
 
@@ -50,6 +52,8 @@ export const ngDevModeResetPerfCounters: () => void =
            rendererRemoveClass: 0,
            rendererSetStyle: 0,
            rendererRemoveStyle: 0,
+           rendererDestroy: 0,
+           rendererDestroyNode: 0,
          };
        }
        ngDevModeResetPerfCounters();
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index cb0bc5bdee..1000197b31 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -9,7 +9,7 @@
 import {assertNotNull} from './assert';
 import {callHooks} from './hooks';
 import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {HookData, LView, LViewOrLContainer, TView, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
@@ -215,8 +215,15 @@ export function addRemoveViewFromContainer(
               renderer.insertBefore(parent, node.native !, beforeNode as RNode | null) :
               parent.insertBefore(node.native !, beforeNode as RNode | null, true);
         } else {
-          isProceduralRenderer(renderer) ? renderer.removeChild(parent as RElement, node.native !) :
-                                           parent.removeChild(node.native !);
+          if (isProceduralRenderer(renderer)) {
+            renderer.removeChild(parent as RElement, node.native !);
+            if (renderer.destroyNode) {
+              ngDevMode && ngDevMode.rendererDestroyNode++;
+              renderer.destroyNode(node.native !);
+            }
+          } else {
+            parent.removeChild(node.native !);
+          }
         }
         nextNode = getNextLNode(node);
       } else if (node.tNode.type === TNodeType.Container) {
@@ -398,6 +405,11 @@ function cleanUpView(view: LView): void {
   removeListeners(view);
   executeOnDestroys(view);
   executePipeOnDestroys(view);
+  // For component views only, the local renderer is destroyed as clean up time.
+  if (view.id === -1 && isProceduralRenderer(view.renderer)) {
+    ngDevMode && ngDevMode.rendererDestroy++;
+    view.renderer.destroy();
+  }
 }
 
 /** Removes listeners and unsubscribes from output subscriptions */
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 655ff053d5..7bb954e2cd 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -53,6 +53,7 @@ export class TemplateFixture extends BaseFixture {
   private _directiveDefs: DirectiveDefList|null;
   private _pipeDefs: PipeDefList|null;
   private _sanitizer: Sanitizer|null;
+  private _rendererFactory: RendererFactory3;
 
   /**
    *
@@ -64,11 +65,12 @@ export class TemplateFixture extends BaseFixture {
   constructor(
       private createBlock: () => void, private updateBlock: () => void = noop,
       directives?: DirectiveTypesOrFactory|null, pipes?: PipeTypesOrFactory|null,
-      sanitizer?: Sanitizer) {
+      sanitizer?: Sanitizer|null, rendererFactory?: RendererFactory3) {
     super();
     this._directiveDefs = toDefs(directives, extractDirectiveDef);
     this._pipeDefs = toDefs(pipes, extractPipeDef);
     this._sanitizer = sanitizer || null;
+    this._rendererFactory = rendererFactory || domRendererFactory3;
     this.hostNode = renderTemplate(this.hostElement, (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
         this.createBlock();
@@ -76,7 +78,7 @@ export class TemplateFixture extends BaseFixture {
       if (rf & RenderFlags.Update) {
         this.updateBlock();
       }
-    }, null !, domRendererFactory3, null, this._directiveDefs, this._pipeDefs, sanitizer);
+    }, null !, this._rendererFactory, null, this._directiveDefs, this._pipeDefs, sanitizer);
   }
 
   /**
@@ -86,7 +88,7 @@ export class TemplateFixture extends BaseFixture {
    */
   update(updateBlock?: () => void): void {
     renderTemplate(
-        this.hostNode.native, updateBlock || this.updateBlock, null !, domRendererFactory3,
+        this.hostNode.native, updateBlock || this.updateBlock, null !, this._rendererFactory,
         this.hostNode, this._directiveDefs, this._pipeDefs, this._sanitizer);
   }
 }
diff --git a/packages/core/test/render3/renderer_factory_spec.ts b/packages/core/test/render3/renderer_factory_spec.ts
index 68cbe30ba5..c2d8200a15 100644
--- a/packages/core/test/render3/renderer_factory_spec.ts
+++ b/packages/core/test/render3/renderer_factory_spec.ts
@@ -11,12 +11,12 @@ import {MockAnimationDriver, MockAnimationPlayer} from '@angular/animations/brow
 
 import {RendererType2, ViewEncapsulation} from '../../src/core';
 import {defineComponent, detectChanges} from '../../src/render3/index';
-import {bind, elementEnd, elementProperty, elementStart, listener, text, tick} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, listener, text, tick} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {createRendererType2} from '../../src/view/index';
 
 import {getAnimationRendererFactory2, getRendererFactory2} from './imported_renderer2';
-import {containerEl, document, renderComponent, renderToHtml, toHtml} from './render_util';
+import {TemplateFixture, containerEl, document, renderComponent, renderToHtml, toHtml} from './render_util';
 
 describe('renderer factory lifecycle', () => {
   let logs: string[] = [];
@@ -206,3 +206,110 @@ describe('animation renderer factory', () => {
     });
   });
 });
+
+describe('Renderer2 destruction hooks', () => {
+  const rendererFactory = getRendererFactory2(document);
+  const origCreateRenderer = rendererFactory.createRenderer;
+  rendererFactory.createRenderer = function() {
+    const renderer = origCreateRenderer.apply(this, arguments);
+    renderer.destroyNode = () => {};
+    return renderer;
+  };
+
+  it('should call renderer.destroyNode for each node destroyed', () => {
+    let condition = true;
+
+    function createTemplate() {
+      elementStart(0, 'div');
+      { container(1); }
+      elementEnd();
+    }
+
+    function updateTemplate() {
+      containerRefreshStart(1);
+      {
+        if (condition) {
+          let rf1 = embeddedViewStart(1);
+          {
+            if (rf1 & RenderFlags.Create) {
+              elementStart(0, 'span');
+              elementEnd();
+              elementStart(1, 'span');
+              elementEnd();
+              elementStart(2, 'span');
+              elementEnd();
+            }
+          }
+          embeddedViewEnd();
+        }
+      }
+      containerRefreshEnd();
+    }
+
+    const t =
+        new TemplateFixture(createTemplate, updateTemplate, null, null, null, rendererFactory);
+
+    expect(t.html).toEqual('<div><span></span><span></span><span></span></div>');
+
+    condition = false;
+    t.update();
+    expect(t.html).toEqual('<div></div>');
+    expect(ngDevMode).toHaveProperties({rendererDestroy: 0, rendererDestroyNode: 3});
+  });
+
+  it('should call renderer.destroy for each component destroyed', () => {
+    class SimpleComponent {
+      static ngComponentDef = defineComponent({
+        type: SimpleComponent,
+        selectors: [['simple']],
+        template: function(rf: RenderFlags, ctx: SimpleComponent) {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'span');
+            elementEnd();
+          }
+        },
+        factory: () => new SimpleComponent,
+      });
+    }
+
+    let condition = true;
+
+    function createTemplate() {
+      elementStart(0, 'div');
+      { container(1); }
+      elementEnd();
+    }
+
+    function updateTemplate() {
+      containerRefreshStart(1);
+      {
+        if (condition) {
+          let rf1 = embeddedViewStart(1);
+          {
+            if (rf1 & RenderFlags.Create) {
+              elementStart(0, 'simple');
+              elementEnd();
+              elementStart(1, 'span');
+              elementEnd();
+              elementStart(2, 'simple');
+              elementEnd();
+            }
+          }
+          embeddedViewEnd();
+        }
+      }
+      containerRefreshEnd();
+    }
+
+    const t = new TemplateFixture(
+        createTemplate, updateTemplate, [SimpleComponent], null, null, rendererFactory);
+
+    expect(t.html).toEqual(
+        '<div><simple><span></span></simple><span></span><simple><span></span></simple></div>');
+
+    condition = false;
+    t.update();
+    expect(t.html).toEqual('<div></div>');
+    expect(ngDevMode).toHaveProperties({rendererDestroy: 2, rendererDestroyNode: 3});
+  });
+});

From 7c1bd7170e77ebea0a266615da31498151e20548 Mon Sep 17 00:00:00 2001
From: gjdev <gjdev@the.src.zone>
Date: Tue, 22 May 2018 13:44:36 +0200
Subject: [PATCH 124/582] docs(aio): add blox material library to resources
 (#20539)

PR Close #20539
---
 aio/content/marketing/resources.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index f8423a78ae..eac77391b0 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -377,6 +377,13 @@
             "url": "http://www.amexio.tech/",
             "logo": "http://www.amexio.org/amexio-logo.png"
           },
+          "bm": {
+            "desc": "A lightweight Material Design library for Angular, based upon Google's Material Components for the Web",
+            "logo": "https://blox.src.zone/assets/bloxmaterial.03ecfe4fa0147a781487749dc1cc4580.svg",
+            "rev": true,
+            "title": "Blox Material",
+            "url": "https://github.com/src-zone/material"
+          },
           "essentialjs2": {
             "desc": "Essential JS 2 for Angular is a collection modern TypeScript based true Angular Components. It has support for Ahead Of Time (AOT) compilation and Tree-Shaking. All the components are developed from the ground up to be lightweight, responsive, modular and touch friendly.",
             "rev": true,

From 3ed7fc668641e62767eb3bcf61e0f5e08a1875cc Mon Sep 17 00:00:00 2001
From: Aaron Gussman <agussman@thehumangeo.com>
Date: Tue, 13 Mar 2018 01:53:27 -0400
Subject: [PATCH 125/582] docs: update docs to use HttpClientModule instead of
 HttpModule (#22727)

Updated most examples to use HttpClientModule instead of deprecated HttpModule

fix #19280

PR Close #22727
---
 .../examples/bootstrapping/src/app/app.module.ts      |  4 ++--
 .../src/app/app.module.ts                             |  4 ++--
 .../examples/feature-modules/src/app/app.module.ts    |  4 ++--
 .../lazy-loading-ngmodules/src/app/app.module.ts      |  4 ++--
 aio/content/examples/ngmodules/src/app/app.module.ts  |  2 +-
 aio/content/examples/styleguide/src/app/app.module.ts |  6 +++---
 aio/content/guide/bootstrapping.md                    | 11 ++++-------
 aio/content/guide/entry-components.md                 |  2 +-
 8 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/aio/content/examples/bootstrapping/src/app/app.module.ts b/aio/content/examples/bootstrapping/src/app/app.module.ts
index 58c78b33ac..9b8a4fcaef 100644
--- a/aio/content/examples/bootstrapping/src/app/app.module.ts
+++ b/aio/content/examples/bootstrapping/src/app/app.module.ts
@@ -5,7 +5,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 // #docregion directive-import
@@ -24,7 +24,7 @@ import { ItemDirective } from './item.directive';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule
+    HttpClientModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
index a240e21f7c..490670a71c 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
@@ -1,7 +1,7 @@
 // #docregion
 import { BrowserModule }                from '@angular/platform-browser';
 import { FormsModule }                  from '@angular/forms';
-import { HttpModule }                   from '@angular/http';
+import { HttpClientModule }             from '@angular/common/http';
 
 // import { AppRoutingModule }             from './app-routing.module';
 import { LocationStrategy,
@@ -54,7 +54,7 @@ const c_components = [
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     InMemoryWebApiModule.forRoot(HeroData)
     // AppRoutingModule TODO: add routes
   ],
diff --git a/aio/content/examples/feature-modules/src/app/app.module.ts b/aio/content/examples/feature-modules/src/app/app.module.ts
index 503d6a46a1..e74c19377a 100644
--- a/aio/content/examples/feature-modules/src/app/app.module.ts
+++ b/aio/content/examples/feature-modules/src/app/app.module.ts
@@ -3,7 +3,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 // import the feature module here so you can add it to the imports array below
@@ -17,7 +17,7 @@ import { CustomerDashboardModule } from './customer-dashboard/customer-dashboard
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     CustomerDashboardModule // add the feature module here
   ],
   providers: [],
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts
index fa3ee4def3..d8d65b4404 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 import { AppRoutingModule } from './app-routing.module';
 
 import { AppComponent } from './app.component';
@@ -13,7 +13,7 @@ import { AppComponent } from './app.component';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     AppRoutingModule
   ],
   providers: [],
diff --git a/aio/content/examples/ngmodules/src/app/app.module.ts b/aio/content/examples/ngmodules/src/app/app.module.ts
index a19fbbae52..a2bae93468 100644
--- a/aio/content/examples/ngmodules/src/app/app.module.ts
+++ b/aio/content/examples/ngmodules/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 
 /* App Root */
 import { AppComponent } from './app.component';
diff --git a/aio/content/examples/styleguide/src/app/app.module.ts b/aio/content/examples/styleguide/src/app/app.module.ts
index 1e974baf5f..2420170d4f 100644
--- a/aio/content/examples/styleguide/src/app/app.module.ts
+++ b/aio/content/examples/styleguide/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
-import { BrowserModule }            from '@angular/platform-browser';
+import { BrowserModule } from '@angular/platform-browser';
 
-import { HttpModule }           from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
 
 import { RouterModule } from '@angular/router';
@@ -44,7 +44,7 @@ import * as s0901 from '../09-01/app/app.module';
 @NgModule({
   imports: [
     BrowserModule,
-    HttpModule,
+    HttpClientModule,
     InMemoryWebApiModule.forRoot(HeroData),
 
     s0101.AppModule,
diff --git a/aio/content/guide/bootstrapping.md b/aio/content/guide/bootstrapping.md
index dc5b873d29..42c0ffe7ae 100644
--- a/aio/content/guide/bootstrapping.md
+++ b/aio/content/guide/bootstrapping.md
@@ -18,8 +18,7 @@ If you use the CLI to generate an app, the default `AppModule` is as follows:
 /* JavaScript imports */
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+
 
 import { AppComponent } from './app.component';
 
@@ -29,9 +28,7 @@ import { AppComponent } from './app.component';
     AppComponent
   ],
   imports: [
-    BrowserModule,
-    FormsModule,
-    HttpModule
+    BrowserModule
   ],
   providers: [],
   bootstrap: [AppComponent]
@@ -137,8 +134,8 @@ It tells Angular about other NgModules that this particular module needs to func
 
 This list of modules are those that export components, directives, or pipes
 that the component templates in this module reference. In this case, the component is
-`AppComponent`, which references components, directives, or pipes in `BrowserModule`,
-`FormsModule`, or  `HttpModule`.
+`AppComponent`, which references components, directives, or pipes in `BrowserModule`.
+Other common components in the examples are `FormsModule` and `HttpClientModule`.
 A component template can reference another component, directive,
 or pipe when the referenced class is declared in this module or
 the class was imported from another module.
diff --git a/aio/content/guide/entry-components.md b/aio/content/guide/entry-components.md
index d57654218d..990c8ae84a 100644
--- a/aio/content/guide/entry-components.md
+++ b/aio/content/guide/entry-components.md
@@ -36,7 +36,7 @@ The following is an example of specifying a bootstrapped component,
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     AppRoutingModule
   ],
   providers: [],

From 5b25c07795b137fd01e7588f9d2ab5977ab1b2d4 Mon Sep 17 00:00:00 2001
From: Fabian <fabianwiles@live.com>
Date: Sat, 24 Mar 2018 07:37:54 +1300
Subject: [PATCH 126/582] docs(bazel): improve error message for ng_package
 with no metadata (#22964)

PR Close #22964
---
 packages/bazel/src/ng_package/packager.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/bazel/src/ng_package/packager.ts b/packages/bazel/src/ng_package/packager.ts
index 649f79aa9f..603d8c5ef9 100644
--- a/packages/bazel/src/ng_package/packager.ts
+++ b/packages/bazel/src/ng_package/packager.ts
@@ -274,6 +274,8 @@ function main(args: string[]): number {
       // So ignore package.json files when we are missing data.
       console.error('WARNING: no module metadata for package', packageName);
       console.error('   Not updating the package.json file to point to it');
+      console.error(
+          '   The ng_module for this package is possibly missing the module_name attribute ');
       return JSON.stringify(parsedPackage, null, 2);
     }
 

From d6595ebd39ecf7554abb20406c43e9b438b96cce Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Fri, 25 May 2018 07:22:05 -0700
Subject: [PATCH 127/582] feat(platform-server): use EventManagerPlugin on the
 server (#24132)

Previously event handlers on the server were setup directly. This change makes it so that the event registration on the server go through EventManagerPlugin just like on client. This allows us to add custom event registration handlers on the server which allows us to hook up preboot event handlers cleanly.

PR Close #24132
---
 .../src/dom/events/dom_events.ts              |  2 +-
 packages/platform-server/src/server.ts        |  4 +-
 packages/platform-server/src/server_events.ts | 30 ++++++++++++
 .../platform-server/src/server_renderer.ts    | 49 ++++++++++++-------
 4 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 packages/platform-server/src/server_events.ts

diff --git a/packages/platform-browser/src/dom/events/dom_events.ts b/packages/platform-browser/src/dom/events/dom_events.ts
index 42d44d2acc..6c1138d30e 100644
--- a/packages/platform-browser/src/dom/events/dom_events.ts
+++ b/packages/platform-browser/src/dom/events/dom_events.ts
@@ -110,7 +110,7 @@ export class DomEventsPlugin extends EventManagerPlugin {
   }
 
   private patchEvent() {
-    if (!Event || !Event.prototype) {
+    if (typeof Event === 'undefined' || !Event || !Event.prototype) {
       return;
     }
     if ((Event.prototype as any)[stopMethodSymbol]) {
diff --git a/packages/platform-server/src/server.ts b/packages/platform-server/src/server.ts
index 46dbd9707a..1b0febf54c 100644
--- a/packages/platform-server/src/server.ts
+++ b/packages/platform-server/src/server.ts
@@ -11,7 +11,7 @@ import {PlatformLocation, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@ang
 import {HttpClientModule} from '@angular/common/http';
 import {Injectable, InjectionToken, Injector, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, StaticProvider, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core';
 import {HttpModule} from '@angular/http';
-import {BrowserModule, DOCUMENT, ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID, ɵgetDOM as getDOM} from '@angular/platform-browser';
+import {BrowserModule, DOCUMENT, EVENT_MANAGER_PLUGINS, ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID, ɵgetDOM as getDOM} from '@angular/platform-browser';
 import {ɵplatformCoreDynamic as platformCoreDynamic} from '@angular/platform-browser-dynamic';
 import {NoopAnimationsModule, ɵAnimationRendererFactory} from '@angular/platform-browser/animations';
 
@@ -19,6 +19,7 @@ import {DominoAdapter, parseDocument} from './domino_adapter';
 import {SERVER_HTTP_PROVIDERS} from './http';
 import {ServerPlatformLocation} from './location';
 import {PlatformState} from './platform_state';
+import {ServerEventManagerPlugin} from './server_events';
 import {ServerRendererFactory2} from './server_renderer';
 import {ServerStylesHost} from './styles_host';
 import {INITIAL_CONFIG, PlatformConfig} from './tokens';
@@ -58,6 +59,7 @@ export const SERVER_RENDER_PROVIDERS: Provider[] = [
   },
   ServerStylesHost,
   {provide: SharedStylesHost, useExisting: ServerStylesHost},
+  {provide: EVENT_MANAGER_PLUGINS, multi: true, useClass: ServerEventManagerPlugin},
 ];
 
 /**
diff --git a/packages/platform-server/src/server_events.ts b/packages/platform-server/src/server_events.ts
new file mode 100644
index 0000000000..25598633a9
--- /dev/null
+++ b/packages/platform-server/src/server_events.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Inject, Injectable} from '@angular/core';
+import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/platform-browser';
+
+@Injectable()
+export class ServerEventManagerPlugin /* extends EventManagerPlugin which is private */ {
+  constructor(@Inject(DOCUMENT) private doc: any) {}
+
+  // Handle all events on the server.
+  supports(eventName: string) { return true; }
+
+  addEventListener(element: HTMLElement, eventName: string, handler: Function): Function {
+    return getDOM().onAndCancel(element, eventName, handler);
+  }
+
+  addGlobalEventListener(element: string, eventName: string, handler: Function): Function {
+    const target: HTMLElement = getDOM().getGlobalEventTarget(this.doc, element);
+    if (!target) {
+      throw new Error(`Unsupported event target ${target} for event ${eventName}`);
+    }
+    return this.addEventListener(target, eventName, handler);
+  }
+}
diff --git a/packages/platform-server/src/server_renderer.ts b/packages/platform-server/src/server_renderer.ts
index 77bcc16ccf..67c48be90a 100644
--- a/packages/platform-server/src/server_renderer.ts
+++ b/packages/platform-server/src/server_renderer.ts
@@ -8,7 +8,7 @@
 
 import {DomElementSchemaRegistry} from '@angular/compiler';
 import {APP_ID, Inject, Injectable, NgZone, RenderComponentType, Renderer, Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2, RootRenderer, ViewEncapsulation, ɵstringify as stringify} from '@angular/core';
-import {DOCUMENT, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵgetDOM as getDOM, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute} from '@angular/platform-browser';
+import {DOCUMENT, EventManager, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵgetDOM as getDOM, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute} from '@angular/platform-browser';
 
 const EMPTY_ARRAY: any[] = [];
 
@@ -19,9 +19,9 @@ export class ServerRendererFactory2 implements RendererFactory2 {
   private schema = new DomElementSchemaRegistry();
 
   constructor(
-      private ngZone: NgZone, @Inject(DOCUMENT) private document: any,
-      private sharedStylesHost: SharedStylesHost) {
-    this.defaultRenderer = new DefaultServerRenderer2(document, ngZone, this.schema);
+      private eventManager: EventManager, private ngZone: NgZone,
+      @Inject(DOCUMENT) private document: any, private sharedStylesHost: SharedStylesHost) {
+    this.defaultRenderer = new DefaultServerRenderer2(eventManager, document, ngZone, this.schema);
   }
 
   createRenderer(element: any, type: RendererType2|null): Renderer2 {
@@ -34,7 +34,8 @@ export class ServerRendererFactory2 implements RendererFactory2 {
         let renderer = this.rendererByCompId.get(type.id);
         if (!renderer) {
           renderer = new EmulatedEncapsulationServerRenderer2(
-              this.document, this.ngZone, this.sharedStylesHost, this.schema, type);
+              this.eventManager, this.document, this.ngZone, this.sharedStylesHost, this.schema,
+              type);
           this.rendererByCompId.set(type.id, renderer);
         }
         (<EmulatedEncapsulationServerRenderer2>renderer).applyToHost(element);
@@ -61,7 +62,8 @@ class DefaultServerRenderer2 implements Renderer2 {
   data: {[key: string]: any} = Object.create(null);
 
   constructor(
-      private document: any, private ngZone: NgZone, private schema: DomElementSchemaRegistry) {}
+      private eventManager: EventManager, protected document: any, private ngZone: NgZone,
+      private schema: DomElementSchemaRegistry) {}
 
   destroy(): void {}
 
@@ -69,10 +71,10 @@ class DefaultServerRenderer2 implements Renderer2 {
 
   createElement(name: string, namespace?: string, debugInfo?: any): any {
     if (namespace) {
-      return getDOM().createElementNS(NAMESPACE_URIS[namespace], name);
+      return getDOM().createElementNS(NAMESPACE_URIS[namespace], name, this.document);
     }
 
-    return getDOM().createElement(name);
+    return getDOM().createElement(name, this.document);
   }
 
   createComment(value: string, debugInfo?: any): any { return getDOM().createComment(value); }
@@ -166,14 +168,25 @@ class DefaultServerRenderer2 implements Renderer2 {
   listen(
       target: 'document'|'window'|'body'|any, eventName: string,
       callback: (event: any) => boolean): () => void {
-    // Note: We are not using the EventsPlugin here as this is not needed
-    // to run our tests.
     checkNoSyntheticProp(eventName, 'listener');
-    const el =
-        typeof target === 'string' ? getDOM().getGlobalEventTarget(this.document, target) : target;
-    const outsideHandler = (event: any) => this.ngZone.runGuarded(() => callback(event));
-    return this.ngZone.runOutsideAngular(
-        () => getDOM().onAndCancel(el, eventName, outsideHandler) as any);
+    if (typeof target === 'string') {
+      return <() => void>this.eventManager.addGlobalEventListener(
+          target, eventName, this.decoratePreventDefault(callback));
+    }
+    return <() => void>this.eventManager.addEventListener(
+               target, eventName, this.decoratePreventDefault(callback)) as() => void;
+  }
+
+  private decoratePreventDefault(eventHandler: Function): Function {
+    return (event: any) => {
+      // Run the event handler inside the ngZone because event handlers are not patched
+      // by Zone on the server. This is required only for tests.
+      const allowDefaultBehavior = this.ngZone.runGuarded(() => eventHandler(event));
+      if (allowDefaultBehavior === false) {
+        event.preventDefault();
+        event.returnValue = false;
+      }
+    };
   }
 }
 
@@ -190,9 +203,9 @@ class EmulatedEncapsulationServerRenderer2 extends DefaultServerRenderer2 {
   private hostAttr: string;
 
   constructor(
-      document: any, ngZone: NgZone, sharedStylesHost: SharedStylesHost,
+      eventManager: EventManager, document: any, ngZone: NgZone, sharedStylesHost: SharedStylesHost,
       schema: DomElementSchemaRegistry, private component: RendererType2) {
-    super(document, ngZone, schema);
+    super(eventManager, document, ngZone, schema);
     const styles = flattenStyles(component.id, component.styles, []);
     sharedStylesHost.addStyles(styles);
 
@@ -203,7 +216,7 @@ class EmulatedEncapsulationServerRenderer2 extends DefaultServerRenderer2 {
   applyToHost(element: any) { super.setAttribute(element, this.hostAttr, ''); }
 
   createElement(parent: any, name: string): Element {
-    const el = super.createElement(parent, name);
+    const el = super.createElement(parent, name, this.document);
     super.setAttribute(el, this.contentAttr, '');
     return el;
   }

From c73196eb5921d30667d53b37e3ec052f39be71e1 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 24 May 2018 16:04:04 -0700
Subject: [PATCH 128/582] fix(platform-server): provide Domino DOM types
 globally (#24116)

Fixes #23280, #23133.

This fix lets code access DOM types like Node, HTMLElement in the code. These are invariant across requests and the corresponding classes from Domino can be safely provided during platform initialization.

This is needed for the current sanitizer to work properly on platform-server. Also allows HTML types in injection - Ex. `@inject(DOCUMENT) doc: Document`.

PR Close #24116
---
 .../platform-server/src/domino_adapter.ts     | 11 ++++++-
 .../platform-server/test/integration_spec.ts  | 29 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/packages/platform-server/src/domino_adapter.ts b/packages/platform-server/src/domino_adapter.ts
index 8ea4035c80..17bf3c4fc9 100644
--- a/packages/platform-server/src/domino_adapter.ts
+++ b/packages/platform-server/src/domino_adapter.ts
@@ -13,6 +13,12 @@ function _notImplemented(methodName: string) {
   return new Error('This method is not implemented in DominoAdapter: ' + methodName);
 }
 
+function setDomTypes() {
+  // Make all Domino types available as types in the global env.
+  Object.assign(global, domino.impl);
+  (global as any)['KeyboardEvent'] = domino.impl.Event;
+}
+
 /**
  * Parses a document string to a Document object.
  */
@@ -33,7 +39,10 @@ export function serializeDocument(doc: Document): string {
  * DOM Adapter for the server platform based on https://github.com/fgnass/domino.
  */
 export class DominoAdapter extends BrowserDomAdapter {
-  static makeCurrent() { setRootDomAdapter(new DominoAdapter()); }
+  static makeCurrent() {
+    setDomTypes();
+    setRootDomAdapter(new DominoAdapter());
+  }
 
   private static defaultDoc: Document;
 
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 092e135153..bc27c9d856 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -10,7 +10,7 @@ import {AnimationBuilder, animate, style, transition, trigger} from '@angular/an
 import {APP_BASE_HREF, PlatformLocation, isPlatformServer} from '@angular/common';
 import {HttpClient, HttpClientModule} from '@angular/common/http';
 import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
-import {ApplicationRef, CompilerFactory, Component, HostListener, Input, NgModule, NgModuleRef, NgZone, PLATFORM_ID, PlatformRef, ViewEncapsulation, destroyPlatform, getPlatform} from '@angular/core';
+import {ApplicationRef, CompilerFactory, Component, HostListener, Inject, Input, NgModule, NgModuleRef, NgZone, PLATFORM_ID, PlatformRef, ViewEncapsulation, destroyPlatform, getPlatform} from '@angular/core';
 import {TestBed, async, inject} from '@angular/core/testing';
 import {Http, HttpModule, Response, ResponseOptions, XHRBackend} from '@angular/http';
 import {MockBackend, MockConnection} from '@angular/http/testing';
@@ -254,6 +254,20 @@ class MyInputComponent {
 class NameModule {
 }
 
+@Component({selector: 'app', template: '<div [innerHTML]="html"></div>'})
+class HTMLTypesApp {
+  html = '<b>foo</b> bar';
+  constructor(@Inject(DOCUMENT) doc: Document) {}
+}
+
+@NgModule({
+  declarations: [HTMLTypesApp],
+  imports: [BrowserModule.withServerTransition({appId: 'inner-html'}), ServerModule],
+  bootstrap: [HTMLTypesApp]
+})
+class HTMLTypesModule {
+}
+
 const TEST_KEY = makeStateKey<number>('test');
 const STRING_KEY = makeStateKey<string>('testString');
 
@@ -552,6 +566,19 @@ class EscapedTransferStoreModule {
            });
          }));
 
+      it('should work with sanitizer to handle "innerHTML"', async(() => {
+           // Clear out any global states. These should be set when platform-server
+           // is initialized.
+           (global as any).Node = undefined;
+           (global as any).Document = undefined;
+           renderModule(HTMLTypesModule, {document: doc}).then(output => {
+             expect(output).toBe(
+                 '<html><head></head><body><app ng-version="0.0.0-PLACEHOLDER">' +
+                 '<div innerhtml="<b>foo</b> bar"><b>foo</b> bar</div></app></body></html>');
+             called = true;
+           });
+         }));
+
       it('should call render hook', async(() => {
            renderModule(RenderHookModule, {document: doc}).then(output => {
              // title should be added by the render hook.

From aafb46a8fe729b1d1aaa232bd827b6fd88196396 Mon Sep 17 00:00:00 2001
From: John Papa <johnpapa@users.noreply.github.com>
Date: Tue, 13 Mar 2018 15:56:33 -0400
Subject: [PATCH 129/582] style(compiler): fix up grammar in error message
 (#24201)

closes #22746

PR Close #24201
---
 packages/compiler/src/metadata_resolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler/src/metadata_resolver.ts b/packages/compiler/src/metadata_resolver.ts
index db4c7decf0..d43556f56d 100644
--- a/packages/compiler/src/metadata_resolver.ts
+++ b/packages/compiler/src/metadata_resolver.ts
@@ -993,7 +993,7 @@ export class CompileMetadataResolver {
           providerMeta = new cpl.ProviderMeta(provider, {useClass: provider});
         } else if (provider === void 0) {
           this._reportError(syntaxError(
-              `Encountered undefined provider! Usually this means you have a circular dependencies (might be caused by using 'barrel' index.ts files.`));
+              `Encountered undefined provider! Usually this means you have a circular dependencies. This might be caused by using 'barrel' index.ts files.`));
           return;
         } else {
           const providersInfo =

From 223882aeb63e77109b7306689b2bbc22161364bf Mon Sep 17 00:00:00 2001
From: Aditya Bhardwaj <aditya2204@gmail.com>
Date: Fri, 11 May 2018 17:57:49 +0530
Subject: [PATCH 130/582] docs: fix typo (#24201)

closes #23853

PR Close #24201
---
 aio/content/guide/testing.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index 0acff26bf1..1efa71d480 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -204,8 +204,7 @@ The test consumes that spy in the same way it did earlier.
 Most test suites in this guide call `beforeEach()` to set the preconditions for each `it()` test
 and rely on the `TestBed` to create classes and inject services.
 
-There's another school of testing that never calls `beforeEach()` and
-and prefers to create classes explicitly rather than use the `TestBed`.
+There's another school of testing that never calls `beforeEach()` and prefers to create classes explicitly rather than use the `TestBed`.
 
 Here's how you might rewrite one of the `MasterService` tests in that style.
 
@@ -3400,4 +3399,4 @@ accidental corruption of remote resources.
 It can even be hard to navigate to the component you want to test.
 
 Because of these many obstacles, you should test DOM interaction
-with unit testing techniques as much as possible.
\ No newline at end of file
+with unit testing techniques as much as possible.

From 7c392160835da85dfb500b0395ae7696a49c4a30 Mon Sep 17 00:00:00 2001
From: Kyle Liu <kyle116@yahoo.com>
Date: Thu, 17 May 2018 13:29:50 -0700
Subject: [PATCH 131/582] docs(aio): fix typo for @NgModuledecorator to
 @NgModule decorator (#24201)

closes #23974

PR Close #24201
---
 aio/content/tutorial/toh-pt1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/tutorial/toh-pt1.md b/aio/content/tutorial/toh-pt1.md
index 0be72e9311..b581fc2fea 100644
--- a/aio/content/tutorial/toh-pt1.md
+++ b/aio/content/tutorial/toh-pt1.md
@@ -175,7 +175,7 @@ This information is called _metadata_
 Some of the metadata is in the `@Component` decorators that you added to your component classes.
 Other critical metadata is in [`@NgModule`](guide/ngmodules) decorators.
 
-The most important `@NgModule`decorator annotates the top-level **AppModule** class.
+The most important `@NgModule` decorator annotates the top-level **AppModule** class.
 
 The Angular CLI generated an `AppModule` class in `src/app/app.module.ts` when it created the project.
 This is where you _opt-in_ to the `FormsModule`.

From 42a7295203f887e28f4c847b817467b2b3830205 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Thu, 17 May 2018 16:19:44 +0200
Subject: [PATCH 132/582] refactor(ivy): remove dynamicViewCount from
 LContainer (#23963)

PR Close #23963
---
 packages/core/src/render3/di.ts               | 15 +-------
 packages/core/src/render3/instructions.ts     | 34 +++++++++++++------
 .../core/src/render3/interfaces/container.ts  | 11 +++---
 packages/core/src/render3/interfaces/view.ts  |  8 -----
 .../hello_world/bundle.golden_symbols.json    |  3 ++
 .../bundling/todo/bundle.golden_symbols.json  |  3 ++
 6 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index b57926f254..f5a0f82c1e 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -572,7 +572,7 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
 
     ngDevMode && assertNodeOfPossibleTypes(vcRefHost, TNodeType.Container, TNodeType.Element);
     const hostParent = getParentLNode(vcRefHost) !;
-    const lContainer = createLContainer(hostParent, vcRefHost.view);
+    const lContainer = createLContainer(hostParent, vcRefHost.view, undefined, true);
     const lContainerNode: LContainerNode = createLNodeObject(
         TNodeType.Container, vcRefHost.view, hostParent, undefined, lContainer, null);
 
@@ -644,19 +644,6 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
 
-    // If the view is dynamic (has a template), it needs to be counted both at the container
-    // level and at the node above the container.
-    if (lViewNode.data.template !== null) {
-      // Increment the container view count.
-      this._lContainerNode.data.dynamicViewCount++;
-
-      // Look for the parent node and increment its dynamic view count.
-      const containerParent = getParentLNode(this._lContainerNode) as LElementNode;
-      if (containerParent !== null && containerParent.data !== null) {
-        ngDevMode && assertNodeOfPossibleTypes(containerParent, TNodeType.View, TNodeType.Element);
-        containerParent.data.dynamicViewCount++;
-      }
-    }
     return viewRef;
   }
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 20752d436a..cc178c2eb0 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -321,7 +321,6 @@ export function createLView<T>(
     bindingIndex: -1,
     template: template,
     context: context,
-    dynamicViewCount: 0,
     lifecycleStage: LifecycleStage.Init,
     queries: null,
     injector: currentView && currentView.injector,
@@ -1455,19 +1454,28 @@ function generateInitialInputs(
 //// ViewContainer & View
 //////////////////////////
 
+/**
+ * Creates a LContainer, either from a container instruction, or for a ViewContainerRef.
+ *
+ * @param parentLNode the LNode in which the container's content will be rendered
+ * @param currentView The parent view of the LContainer
+ * @param template Optional the inline template (ng-template instruction case)
+ * @param isForViewContainerRef Optional a flag indicating the ViewContainerRef case
+ * @returns LContainer
+ */
 export function createLContainer(
-    parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>): LContainer {
+    parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>,
+    isForViewContainerRef?: boolean): LContainer {
   ngDevMode && assertNotNull(parentLNode, 'containers should have a parent');
   return <LContainer>{
     views: [],
-    nextIndex: 0,
+    nextIndex: isForViewContainerRef ? null : 0,
     // If the direct parent of the container is a view, its views will need to be added
     // through insertView() when its parent view is being inserted:
     renderParent: canInsertNativeNode(parentLNode, currentView) ? parentLNode : null,
     template: template == null ? null : template,
     next: null,
     parent: currentView,
-    dynamicViewCount: 0,
     queries: null
   };
 }
@@ -1553,7 +1561,7 @@ export function containerRefreshEnd(): void {
   const container = previousOrParentNode as LContainerNode;
   container.native = undefined;
   ngDevMode && assertNodeType(container, TNodeType.Container);
-  const nextIndex = container.data.nextIndex;
+  const nextIndex = container.data.nextIndex !;
 
   // remove extra views at the end of the container
   while (nextIndex < container.data.views.length) {
@@ -1563,7 +1571,9 @@ export function containerRefreshEnd(): void {
 
 function refreshDynamicChildren() {
   for (let current = currentView.child; current !== null; current = current.next) {
-    if (current.dynamicViewCount !== 0 && (current as LContainer).views) {
+    // Note: current can be a LView or a LContainer, but here we are only interested in LContainer.
+    // The distinction is made because nextIndex and views do not exist on LView.
+    if (isLContainer(current)) {
       const container = current as LContainer;
       for (let i = 0; i < container.views.length; i++) {
         const lViewNode = container.views[i];
@@ -1577,6 +1587,10 @@ function refreshDynamicChildren() {
   }
 }
 
+function isLContainer(node: LView | LContainer): node is LContainer {
+  return (node as LContainer).nextIndex == null && (node as LContainer).views != null;
+}
+
 /**
  * Looks for a view with a given view block id inside a provided LContainer.
  * Removes views that need to be deleted in the process.
@@ -1617,7 +1631,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
       (isParent ? previousOrParentNode : getParentLNode(previousOrParentNode)) as LContainerNode;
   ngDevMode && assertNodeType(container, TNodeType.Container);
   const lContainer = container.data;
-  let viewNode: LViewNode|null = scanForView(container, lContainer.nextIndex, viewBlockId);
+  let viewNode: LViewNode|null = scanForView(container, lContainer.nextIndex !, viewBlockId);
 
   if (viewNode) {
     previousOrParentNode = viewNode;
@@ -1630,7 +1644,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
         viewBlockId, renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, null,
         LViewFlags.CheckAlways, getCurrentSanitizer());
     if (lContainer.queries) {
-      newView.queries = lContainer.queries.enterView(lContainer.nextIndex);
+      newView.queries = lContainer.queries.enterView(lContainer.nextIndex !);
     }
 
     enterView(
@@ -1678,10 +1692,10 @@ export function embeddedViewEnd(): void {
       // used by the ViewContainerRef must be set.
       setRenderParentInProjectedNodes(lContainer.renderParent, viewNode);
       // it is a new view, insert it into collection of views for a given container
-      insertView(containerNode, viewNode, lContainer.nextIndex);
+      insertView(containerNode, viewNode, lContainer.nextIndex !);
     }
 
-    lContainer.nextIndex++;
+    lContainer.nextIndex !++;
   }
   leaveView(currentView !.parent !);
   ngDevMode && assertEqual(isParent, false, 'isParent');
diff --git a/packages/core/src/render3/interfaces/container.ts b/packages/core/src/render3/interfaces/container.ts
index be4fedb11b..54cb538d7d 100644
--- a/packages/core/src/render3/interfaces/container.ts
+++ b/packages/core/src/render3/interfaces/container.ts
@@ -18,8 +18,11 @@ export interface LContainer {
   /**
    * The next active index in the views array to read or write to. This helps us
    * keep track of where we are in the views array.
+   * In the case the LContainer is created for a ViewContainerRef,
+   * it is set to null to identify this scenario, as indices are "absolute" in that case,
+   * i.e. provided directly by the user of the ViewContainerRef API.
    */
-  nextIndex: number;
+  nextIndex: number|null;
 
   /**
    * This allows us to jump from a container to a sibling container or
@@ -69,12 +72,6 @@ export interface LContainer {
    */
   readonly template: ComponentTemplate<any>|null;
 
-  /**
-   * A count of dynamic views rendered into this container. If this is non-zero, the `views` array
-   * will be traversed when refreshing dynamic views on this container.
-   */
-  dynamicViewCount: number;
-
   /**
    * Queries active for this container - all the views inserted to / removed from
    * this container are reported to queries referenced here.
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index a405cdde93..a234389f4a 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -181,14 +181,6 @@ export interface LView {
    */
   context: {}|RootContext|null;
 
-  /**
-   * A count of dynamic views that are children of this view (indirectly via containers).
-   *
-   * This is used to decide whether to scan children of this view when refreshing dynamic views
-   * after refreshing the view itself.
-   */
-  dynamicViewCount: number;
-
   /**
    * Queries active for this view - nodes from a view are reported to those queries
    */
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 3a97e3864e..77abaff7ae 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -125,6 +125,9 @@
   {
     "name": "invertObject"
   },
+  {
+    "name": "isLContainer"
+  },
   {
     "name": "isProceduralRenderer"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 34d33906bc..11389750f7 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -494,6 +494,9 @@
   {
     "name": "isJsObject"
   },
+  {
+    "name": "isLContainer"
+  },
   {
     "name": "isListLikeIterable"
   },

From 24e5c5b425e68baf5f26d4be8f5dc2aca95517d3 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@google.com>
Date: Wed, 23 May 2018 10:46:18 -0700
Subject: [PATCH 133/582] refactor(platform-browser): make HAMMER_LOADER
 non-nullable (#24077)

PR Close #24077
---
 packages/platform-browser/src/dom/events/hammer_gestures.ts   | 4 ++--
 tools/public_api_guard/platform-browser/platform-browser.d.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/platform-browser/src/dom/events/hammer_gestures.ts b/packages/platform-browser/src/dom/events/hammer_gestures.ts
index f4f4b9c09c..7e2a5db227 100644
--- a/packages/platform-browser/src/dom/events/hammer_gestures.ts
+++ b/packages/platform-browser/src/dom/events/hammer_gestures.ts
@@ -63,7 +63,7 @@ export const HAMMER_GESTURE_CONFIG = new InjectionToken<HammerGestureConfig>('Ha
 
 
 /** Function that loads HammerJS, returning a promise that is resolved once HammerJs is loaded. */
-export type HammerLoader = (() => Promise<void>) | null;
+export type HammerLoader = () => Promise<void>;
 
 /** Injection token used to provide a {@link HammerLoader} to Angular. */
 export const HAMMER_LOADER = new InjectionToken<HammerLoader>('HammerLoader');
@@ -146,7 +146,7 @@ export class HammerGesturesPlugin extends EventManagerPlugin {
   constructor(
       @Inject(DOCUMENT) doc: any,
       @Inject(HAMMER_GESTURE_CONFIG) private _config: HammerGestureConfig, private console: Console,
-      @Optional() @Inject(HAMMER_LOADER) private loader?: HammerLoader) {
+      @Optional() @Inject(HAMMER_LOADER) private loader?: HammerLoader|null) {
     super(doc);
   }
 
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
index d56b6164c4..e1c07cbe9b 100644
--- a/tools/public_api_guard/platform-browser/platform-browser.d.ts
+++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts
@@ -67,7 +67,7 @@ export declare class HammerGestureConfig {
     buildHammer(element: HTMLElement): HammerInstance;
 }
 
-export declare type HammerLoader = (() => Promise<void>) | null;
+export declare type HammerLoader = () => Promise<void>;
 
 /** @experimental */
 export declare function makeStateKey<T = void>(key: string): StateKey<T>;

From 646b42a11353a12bd0bd08789f24bfb47f5785cc Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 21 May 2018 08:15:19 -0700
Subject: [PATCH 134/582] feat(ivy): JIT renders the TODO app (#24138)

This commit builds out enough of the JIT compiler to render
//packages/core/test/bundling/todo, and allows the tests to run in
JIT mode.

To play with the app, run:

bazel run --define=compile=jit //packages/core/test/bundling/todo:prodserver

PR Close #24138
---
 packages/bazel/src/ng_module.bzl              |   4 +-
 packages/compiler/src/compiler.ts             |   4 +-
 .../src/ml_parser/html_whitespaces.ts         |   2 +-
 packages/compiler/src/render3/r3_jit.ts       |  18 +--
 packages/compiler/src/render3/view/api.ts     |  22 +--
 .../compiler/src/render3/view/compiler.ts     |  34 ++---
 .../compiler/src/render3/view/template.ts     |  13 +-
 .../render3/r3_compiler_compliance_spec.ts    |   4 +-
 packages/core/src/ivy_switch_legacy.ts        |   1 +
 packages/core/src/ivy_switch_on.ts            |   3 +-
 packages/core/src/metadata/directives.ts      |   7 +-
 packages/core/src/render3/jit/directive.ts    | 144 +++++++++++++-----
 packages/core/src/render3/jit/environment.ts  |  41 ++++-
 packages/core/src/render3/jit/injectable.ts   | 109 +++++++------
 packages/core/src/render3/jit/module.ts       |  54 +++++--
 packages/core/src/render3/jit/util.ts         |   7 +-
 packages/core/src/util.ts                     |   5 +-
 .../test/bundling/hello_world/BUILD.bazel     |   2 +-
 .../hello_world_r2/bundle.golden_symbols.json |   3 -
 packages/core/test/bundling/todo/BUILD.bazel  |   2 +
 .../bundling/todo/bundle.golden_symbols.json  |   3 -
 packages/core/test/bundling/todo/index.ts     |  60 ++++----
 22 files changed, 348 insertions(+), 194 deletions(-)

diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index 0daa736273..8defd2ff4e 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -518,8 +518,8 @@ ng_module = rule(
 
 
 # TODO(alxhub): this rule causes legacy ngc to produce Ivy outputs from global analysis information.
-# It to facilitate testing of the Ivy runtime until ngtsc is mature enough to be used instead, and
-# should be removed once ngtsc is capable of fulfilling the same requirements.
+# It exists to facilitate testing of the Ivy runtime until ngtsc is mature enough to be used
+# instead, and should be removed once ngtsc is capable of fulfilling the same requirements.
 internal_global_ng_module = rule(
     implementation = _ng_module_impl,
     attrs = dict(NG_MODULE_RULE_ATTRS, **{
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index 88303c3d46..b64abc6716 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -81,9 +81,9 @@ export {getParseErrors, isSyntaxError, syntaxError, Version} from './util';
 export {SourceMap} from './output/source_map';
 export * from './injectable_compiler_2';
 export * from './render3/view/api';
-export {jitPatchDefinition} from './render3/r3_jit';
+export {jitExpression} from './render3/r3_jit';
 export {R3DependencyMetadata, R3FactoryMetadata, R3ResolvedDependencyType} from './render3/r3_factory';
 export {compileNgModule, R3NgModuleMetadata} from './render3/r3_module_compiler';
 export {makeBindingParser, parseTemplate} from './render3/view/template';
-export {compileComponent, compileDirective} from './render3/view/compiler';
+export {compileComponentFromMetadata, compileDirectiveFromMetadata} from './render3/view/compiler';
 // This file only reexports content of the `src` folder. Keep it that way.
\ No newline at end of file
diff --git a/packages/compiler/src/ml_parser/html_whitespaces.ts b/packages/compiler/src/ml_parser/html_whitespaces.ts
index c9302a7288..f948a8481d 100644
--- a/packages/compiler/src/ml_parser/html_whitespaces.ts
+++ b/packages/compiler/src/ml_parser/html_whitespaces.ts
@@ -49,7 +49,7 @@ export function replaceNgsp(value: string): string {
  * whitespace removal. The default option for whitespace removal will be revisited in Angular 6
  * and might be changed to "on" by default.
  */
-class WhitespaceVisitor implements html.Visitor {
+export class WhitespaceVisitor implements html.Visitor {
   visitElement(element: html.Element, context: any): any {
     if (SKIP_WS_TRIM_TAGS.has(element.name) || hasPreserveWhitespacesAttr(element.attrs)) {
       // don't descent into elements where we need to preserve whitespaces
diff --git a/packages/compiler/src/render3/r3_jit.ts b/packages/compiler/src/render3/r3_jit.ts
index 5d1a93e3d9..17ccd0e186 100644
--- a/packages/compiler/src/render3/r3_jit.ts
+++ b/packages/compiler/src/render3/r3_jit.ts
@@ -50,19 +50,17 @@ class R3JitReflector implements CompileReflector {
 }
 
 /**
- * JIT compiles an expression and monkey-patches the result of executing the expression onto a given
- * type.
+ * JIT compiles an expression and returns the result of executing that expression.
  *
- * @param type the type which will receive the monkey-patched result
- * @param field name of the field on the type to monkey-patch
  * @param def the definition which will be compiled and executed to get the value to patch
  * @param context an object map of @angular/core symbol names to symbols which will be available in
  * the context of the compiled expression
+ * @param sourceUrl a URL to use for the source map of the compiled expression
  * @param constantPool an optional `ConstantPool` which contains constants used in the expression
  */
-export function jitPatchDefinition(
-    type: any, field: string, def: o.Expression, context: {[key: string]: any},
-    constantPool?: ConstantPool): void {
+export function jitExpression(
+    def: o.Expression, context: {[key: string]: any}, sourceUrl: string,
+    constantPool?: ConstantPool): any {
   // The ConstantPool may contain Statements which declare variables used in the final expression.
   // Therefore, its statements need to precede the actual JIT operation. The final statement is a
   // declaration of $def which is set to the expression being compiled.
@@ -71,8 +69,6 @@ export function jitPatchDefinition(
     new o.DeclareVarStmt('$def', def, undefined, [o.StmtModifier.Exported]),
   ];
 
-  // Monkey patch the field on the given type with the result of compilation.
-  // TODO(alxhub): consider a better source url.
-  type[field] = jitStatements(
-      `ng://${type && type.name}/${field}`, statements, new R3JitReflector(context), false)['$def'];
+  const res = jitStatements(sourceUrl, statements, new R3JitReflector(context), false);
+  return res['$def'];
 }
diff --git a/packages/compiler/src/render3/view/api.ts b/packages/compiler/src/render3/view/api.ts
index 71f1624a69..495ccf8976 100644
--- a/packages/compiler/src/render3/view/api.ts
+++ b/packages/compiler/src/render3/view/api.ts
@@ -66,6 +66,17 @@ export interface R3DirectiveMetadata {
     properties: {[key: string]: string};
   };
 
+  /**
+   * Information about usage of specific lifecycle events which require special treatment in the
+   * code generator.
+   */
+  lifecycle: {
+    /**
+     * Whether the directive uses NgOnChanges.
+     */
+    usesOnChanges: boolean;
+  };
+
   /**
    * A mapping of input field names to the property names.
    */
@@ -101,17 +112,6 @@ export interface R3ComponentMetadata extends R3DirectiveMetadata {
     ngContentSelectors: string[];
   };
 
-  /**
-   * Information about usage of specific lifecycle events which require special treatment in the
-   * code generator.
-   */
-  lifecycle: {
-    /**
-     * Whether the component uses NgOnChanges.
-     */
-    usesOnChanges: boolean;
-  };
-
   /**
    * Information about the view queries made by the component.
    */
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 6075ef0591..a057d83826 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -65,13 +65,22 @@ function baseDirectiveFields(
   // e.g 'outputs: {a: 'a'}`
   definitionMap.set('outputs', conditionallyCreateMapObjectLiteral(meta.outputs));
 
+  // e.g. `features: [NgOnChangesFeature(MyComponent)]`
+  const features: o.Expression[] = [];
+  if (meta.lifecycle.usesOnChanges) {
+    features.push(o.importExpr(R3.NgOnChangesFeature, null, null).callFn([meta.type]));
+  }
+  if (features.length) {
+    definitionMap.set('features', o.literalArr(features));
+  }
+
   return definitionMap;
 }
 
 /**
  * Compile a directive for the render3 runtime as defined by the `R3DirectiveMetadata`.
  */
-export function compileDirective(
+export function compileDirectiveFromMetadata(
     meta: R3DirectiveMetadata, constantPool: ConstantPool,
     bindingParser: BindingParser): R3DirectiveDef {
   const definitionMap = baseDirectiveFields(meta, constantPool, bindingParser);
@@ -84,7 +93,7 @@ export function compileDirective(
 /**
  * Compile a component for the render3 runtime as defined by the `R3ComponentMetadata`.
  */
-export function compileComponent(
+export function compileComponentFromMetadata(
     meta: R3ComponentMetadata, constantPool: ConstantPool,
     bindingParser: BindingParser): R3ComponentDef {
   const definitionMap = baseDirectiveFields(meta, constantPool, bindingParser);
@@ -143,15 +152,6 @@ export function compileComponent(
     definitionMap.set('pipes', o.literalArr(Array.from(pipesUsed)));
   }
 
-  // e.g. `features: [NgOnChangesFeature(MyComponent)]`
-  const features: o.Expression[] = [];
-  if (meta.lifecycle.usesOnChanges) {
-    features.push(o.importExpr(R3.NgOnChangesFeature, null, null).callFn([meta.type]));
-  }
-  if (features.length) {
-    definitionMap.set('features', o.literalArr(features));
-  }
-
   const expression = o.importExpr(R3.defineComponent).callFn([definitionMap.toLiteralMap()]);
   const type =
       new o.ExpressionType(o.importExpr(R3.ComponentDef, [new o.ExpressionType(meta.type)]));
@@ -175,7 +175,7 @@ export function compileDirectiveFromRender2(
   const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Directive);
 
   const meta = directiveMetadataFromGlobalMetadata(directive, outputCtx, reflector);
-  const res = compileDirective(meta, outputCtx.constantPool, bindingParser);
+  const res = compileDirectiveFromMetadata(meta, outputCtx.constantPool, bindingParser);
 
   // Create the partial class to be merged with the actual class.
   outputCtx.statements.push(new o.ClassStmt(
@@ -211,15 +211,11 @@ export function compileComponentFromRender2(
       hasNgContent: render3Ast.hasNgContent,
       ngContentSelectors: render3Ast.ngContentSelectors,
     },
-    lifecycle: {
-      usesOnChanges:
-          component.type.lifecycleHooks.some(lifecycle => lifecycle == LifecycleHooks.OnChanges),
-    },
     directives: typeMapToExpressionMap(directiveTypeBySel, outputCtx),
     pipes: typeMapToExpressionMap(pipeTypeByName, outputCtx),
     viewQueries: queriesFromGlobalMetadata(component.viewQueries, outputCtx),
   };
-  const res = compileComponent(meta, outputCtx.constantPool, bindingParser);
+  const res = compileComponentFromMetadata(meta, outputCtx.constantPool, bindingParser);
 
   // Create the partial class to be merged with the actual class.
   outputCtx.statements.push(new o.ClassStmt(
@@ -251,6 +247,10 @@ function directiveMetadataFromGlobalMetadata(
       listeners: summary.hostListeners,
       properties: summary.hostProperties,
     },
+    lifecycle: {
+      usesOnChanges:
+          directive.type.lifecycleHooks.some(lifecycle => lifecycle == LifecycleHooks.OnChanges),
+    },
     inputs: directive.inputs,
     outputs: directive.outputs,
   };
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index fc1b2a8513..b0d21a9a11 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -16,6 +16,7 @@ import {Lexer} from '../../expression_parser/lexer';
 import {Parser} from '../../expression_parser/parser';
 import * as html from '../../ml_parser/ast';
 import {HtmlParser} from '../../ml_parser/html_parser';
+import {WhitespaceVisitor} from '../../ml_parser/html_whitespaces';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
 import * as o from '../../output/output_ast';
 import {ParseError, ParseSourceSpan} from '../../parse_util';
@@ -777,16 +778,24 @@ function interpolate(args: o.Expression[]): o.Expression {
  * @param template text of the template to parse
  * @param templateUrl URL to use for source mapping of the parsed template
  */
-export function parseTemplate(template: string, templateUrl: string):
+export function parseTemplate(
+    template: string, templateUrl: string, options: {preserveWhitespace?: boolean} = {}):
     {errors?: ParseError[], nodes: t.Node[], hasNgContent: boolean, ngContentSelectors: string[]} {
   const bindingParser = makeBindingParser();
   const htmlParser = new HtmlParser();
   const parseResult = htmlParser.parse(template, templateUrl);
+
   if (parseResult.errors && parseResult.errors.length > 0) {
     return {errors: parseResult.errors, nodes: [], hasNgContent: false, ngContentSelectors: []};
   }
+
+  let rootNodes: html.Node[] = parseResult.rootNodes;
+  if (!options.preserveWhitespace) {
+    rootNodes = html.visitAll(new WhitespaceVisitor(), rootNodes);
+  }
+
   const {nodes, hasNgContent, ngContentSelectors, errors} =
-      htmlAstToRender3Ast(parseResult.rootNodes, bindingParser);
+      htmlAstToRender3Ast(rootNodes, bindingParser);
   if (errors && errors.length > 0) {
     return {errors, nodes: [], hasNgContent: false, ngContentSelectors: []};
   }
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 3bd371cb21..a60ccb687c 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -1078,8 +1078,8 @@ describe('compiler compliance', () => {
             selectors: [['lifecycle-comp']],
             factory: function LifecycleComp_Factory() { return new LifecycleComp(); },
             inputs: {nameMin: 'name'},
-            template: function LifecycleComp_Template(rf: IDENT, ctx: IDENT) {},
-            features: [$r3$.ɵNgOnChangesFeature(LifecycleComp)]
+            features: [$r3$.ɵNgOnChangesFeature(LifecycleComp)],
+            template: function LifecycleComp_Template(rf: IDENT, ctx: IDENT) {}
           });`;
 
         const SimpleLayoutDefinition = `
diff --git a/packages/core/src/ivy_switch_legacy.ts b/packages/core/src/ivy_switch_legacy.ts
index b3d9427670..0da653c104 100644
--- a/packages/core/src/ivy_switch_legacy.ts
+++ b/packages/core/src/ivy_switch_legacy.ts
@@ -8,5 +8,6 @@
 
 export const ivyEnabled = false;
 export const R3_COMPILE_COMPONENT: ((type: any, meta: any) => void)|null = null;
+export const R3_COMPILE_DIRECTIVE: ((type: any, meta: any) => void)|null = null;
 export const R3_COMPILE_INJECTABLE: ((type: any, meta: any) => void)|null = null;
 export const R3_COMPILE_NGMODULE: ((type: any, meta: any) => void)|null = null;
diff --git a/packages/core/src/ivy_switch_on.ts b/packages/core/src/ivy_switch_on.ts
index 0dfe7be6ee..7b2d79214a 100644
--- a/packages/core/src/ivy_switch_on.ts
+++ b/packages/core/src/ivy_switch_on.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {compileComponentDecorator} from './render3/jit/directive';
+import {compileComponentDecorator, compileDirective} from './render3/jit/directive';
 import {compileInjectable} from './render3/jit/injectable';
 import {compileNgModule} from './render3/jit/module';
 
 export const ivyEnabled = true;
 export const R3_COMPILE_COMPONENT = compileComponentDecorator;
+export const R3_COMPILE_DIRECTIVE = compileDirective;
 export const R3_COMPILE_INJECTABLE = compileInjectable;
 export const R3_COMPILE_NGMODULE = compileNgModule;
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 34bb977191..ddc1756b63 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy} from '../change_detection/constants';
 import {Provider} from '../di';
-import {R3_COMPILE_COMPONENT} from '../ivy_switch';
+import {R3_COMPILE_COMPONENT, R3_COMPILE_DIRECTIVE} from '../ivy_switch';
 import {Type} from '../type';
 import {TypeDecorator, makeDecorator, makePropDecorator} from '../util/decorators';
 import {ViewEncapsulation} from './view';
@@ -400,8 +400,9 @@ export interface Directive {
  *
  * @Annotation
  */
-export const Directive: DirectiveDecorator =
-    makeDecorator('Directive', (dir: Directive = {}) => dir);
+export const Directive: DirectiveDecorator = makeDecorator(
+    'Directive', (dir: Directive = {}) => dir, undefined, undefined,
+    (type: Type<any>, meta: Directive) => (R3_COMPILE_DIRECTIVE || (() => {}))(type, meta));
 
 /**
  * Type of the Component decorator / constructor function.
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index 7cabe4f363..c3551ed9cc 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {compileComponent as compileIvyComponent, parseTemplate, ConstantPool, makeBindingParser, WrappedNodeExpr, jitPatchDefinition,} from '@angular/compiler';
+import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata as compileIvyComponent, compileDirectiveFromMetadata as compileIvyDirective, jitExpression, makeBindingParser, parseTemplate} from '@angular/compiler';
 
-import {Component} from '../../metadata/directives';
+import {Component, Directive, HostBinding, Input, Output} from '../../metadata/directives';
 import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
 import {Type} from '../../type';
 
 import {angularCoreEnv} from './environment';
-import {reflectDependencies} from './util';
+import {getReflect, reflectDependencies} from './util';
 
 let _pendingPromises: Promise<void>[] = [];
 
@@ -31,45 +31,65 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
   if (!metadata.template) {
     throw new Error('templateUrl not yet supported');
   }
+  const templateStr = metadata.template;
 
-  // Parse the template and check for errors.
-  const template = parseTemplate(metadata.template !, `ng://${type.name}/template.html`);
-  if (template.errors !== undefined) {
-    const errors = template.errors.map(err => err.toString()).join(', ');
-    throw new Error(`Errors during JIT compilation of template for ${type.name}: ${errors}`);
-  }
+  let def: any = null;
+  Object.defineProperty(type, 'ngComponentDef', {
+    get: () => {
+      if (def === null) {
+        // The ConstantPool is a requirement of the JIT'er.
+        const constantPool = new ConstantPool();
 
-  // The ConstantPool is a requirement of the JIT'er.
-  const constantPool = new ConstantPool();
+        // Parse the template and check for errors.
+        const template = parseTemplate(templateStr, `ng://${type.name}/template.html`);
+        if (template.errors !== undefined) {
+          const errors = template.errors.map(err => err.toString()).join(', ');
+          throw new Error(`Errors during JIT compilation of template for ${type.name}: ${errors}`);
+        }
 
-  // Compile the component metadata, including template, into an expression.
-  // TODO(alxhub): implement inputs, outputs, queries, etc.
-  const res = compileIvyComponent(
-      {
-        name: type.name,
-        type: new WrappedNodeExpr(type),
-        selector: metadata.selector !, template,
-        deps: reflectDependencies(type),
-        directives: new Map(),
-        pipes: new Map(),
-        host: {
-          attributes: {},
-          listeners: {},
-          properties: {},
-        },
-        inputs: {},
-        outputs: {},
-        lifecycle: {
-          usesOnChanges: false,
-        },
-        queries: [],
-        typeSourceSpan: null !,
-        viewQueries: [],
-      },
-      constantPool, makeBindingParser());
+        // Compile the component metadata, including template, into an expression.
+        // TODO(alxhub): implement inputs, outputs, queries, etc.
+        const res = compileIvyComponent(
+            {
+              ...directiveMetadata(type, metadata),
+              template,
+              directives: new Map(),
+              pipes: new Map(),
+              viewQueries: [],
+            },
+            constantPool, makeBindingParser());
 
-  // Patch the generated expression as ngComponentDef on the type.
-  jitPatchDefinition(type, 'ngComponentDef', res.expression, angularCoreEnv, constantPool);
+        def = jitExpression(
+            res.expression, angularCoreEnv, `ng://${type.name}/ngComponentDef.js`, constantPool);
+      }
+      return def;
+    },
+  });
+
+  return null;
+}
+
+/**
+ * Compile an Angular directive according to its decorator metadata, and patch the resulting
+ * ngDirectiveDef onto the component type.
+ *
+ * In the event that compilation is not immediate, `compileDirective` will return a `Promise` which
+ * will resolve when compilation completes and the directive becomes usable.
+ */
+export function compileDirective(type: Type<any>, directive: Directive): Promise<void>|null {
+  let def: any = null;
+  Object.defineProperty(type, 'ngDirectiveDef', {
+    get: () => {
+      if (def === null) {
+        const constantPool = new ConstantPool();
+        const sourceMapUrl = `ng://${type && type.name}/ngDirectiveDef.js`;
+        const res = compileIvyDirective(
+            directiveMetadata(type, directive), constantPool, makeBindingParser());
+        def = jitExpression(res.expression, angularCoreEnv, sourceMapUrl, constantPool);
+      }
+      return def;
+    },
+  });
   return null;
 }
 
@@ -95,3 +115,51 @@ export function awaitCurrentlyCompilingComponents(): Promise<void> {
   _pendingPromises = [];
   return res;
 }
+
+/**
+ * Extract the `R3DirectiveMetadata` for a particular directive (either a `Directive` or a
+ * `Component`).
+ */
+function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMetadata {
+  // Reflect inputs and outputs.
+  const props = getReflect().propMetadata(type);
+  const inputs: {[key: string]: string} = {};
+  const outputs: {[key: string]: string} = {};
+
+  for (let field in props) {
+    props[field].forEach(ann => {
+      if (isInput(ann)) {
+        inputs[field] = ann.bindingPropertyName || field;
+      } else if (isOutput(ann)) {
+        outputs[field] = ann.bindingPropertyName || field;
+      }
+    });
+  }
+
+  return {
+    name: type.name,
+    type: new WrappedNodeExpr(type),
+    selector: metadata.selector !,
+    deps: reflectDependencies(type),
+    host: {
+      attributes: {},
+      listeners: {},
+      properties: {},
+    },
+    inputs,
+    outputs,
+    queries: [],
+    lifecycle: {
+      usesOnChanges: type.prototype.ngOnChanges !== undefined,
+    },
+    typeSourceSpan: null !,
+  };
+}
+
+function isInput(value: any): value is Input {
+  return value.ngMetadataName === 'Input';
+}
+
+function isOutput(value: any): value is Output {
+  return value.ngMetadataName === 'Output';
+}
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index a5068eee8c..4714697558 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -17,15 +17,37 @@ import * as r3 from '../index';
  *
  * This should be kept up to date with the public exports of @angular/core.
  */
-export const angularCoreEnv = {
+export const angularCoreEnv: {[name: string]: Function} = {
   'ɵdefineComponent': r3.defineComponent,
+  'ɵdefineDirective': r3.defineDirective,
   'defineInjectable': defineInjectable,
   'ɵdefineNgModule': defineNgModule,
   'ɵdirectiveInject': r3.directiveInject,
   'inject': inject,
+  'ɵinjectAttribute': r3.injectAttribute,
+  'ɵinjectChangeDetectorRef': r3.injectChangeDetectorRef,
+  'ɵinjectElementRef': r3.injectElementRef,
+  'ɵinjectTemplateRef': r3.injectTemplateRef,
+  'ɵinjectViewContainerRef': r3.injectViewContainerRef,
+  'ɵNgOnChangesFeature': r3.NgOnChangesFeature,
+  'ɵa': r3.a,
+  'ɵb': r3.b,
   'ɵC': r3.C,
+  'ɵcR': r3.cR,
+  'ɵcr': r3.cr,
+  'ɵd': r3.d,
   'ɵE': r3.E,
   'ɵe': r3.e,
+  'ɵf0': r3.f0,
+  'ɵf1': r3.f1,
+  'ɵf2': r3.f2,
+  'ɵf3': r3.f3,
+  'ɵf4': r3.f4,
+  'ɵf5': r3.f5,
+  'ɵf6': r3.f6,
+  'ɵf7': r3.f7,
+  'ɵf8': r3.f8,
+  'ɵfV': r3.fV,
   'ɵi1': r3.i1,
   'ɵi2': r3.i2,
   'ɵi3': r3.i3,
@@ -34,6 +56,23 @@ export const angularCoreEnv = {
   'ɵi6': r3.i6,
   'ɵi7': r3.i7,
   'ɵi8': r3.i8,
+  'ɵk': r3.k,
+  'ɵkn': r3.kn,
+  'ɵL': r3.L,
+  'ɵld': r3.ld,
+  'ɵp': r3.p,
+  'ɵpb1': r3.pb1,
+  'ɵpb2': r3.pb2,
+  'ɵpb3': r3.pb3,
+  'ɵpb4': r3.pb4,
+  'ɵpbV': r3.pbV,
+  'ɵQ': r3.Q,
+  'ɵqR': r3.qR,
+  'ɵs': r3.s,
+  'ɵsn': r3.sn,
+  'ɵst': r3.st,
   'ɵT': r3.T,
   'ɵt': r3.t,
+  'ɵV': r3.V,
+  'ɵv': r3.v,
 };
diff --git a/packages/core/src/render3/jit/injectable.ts b/packages/core/src/render3/jit/injectable.ts
index e0b4bc1a26..eaf199c6a5 100644
--- a/packages/core/src/render3/jit/injectable.ts
+++ b/packages/core/src/render3/jit/injectable.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, LiteralExpr, R3DependencyMetadata, WrappedNodeExpr, compileInjectable as compileIvyInjectable, jitPatchDefinition} from '@angular/compiler';
+import {Expression, LiteralExpr, R3DependencyMetadata, WrappedNodeExpr, compileInjectable as compileIvyInjectable, jitExpression} from '@angular/compiler';
 
 import {Injectable} from '../../di/injectable';
 import {ClassSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from '../../di/provider';
@@ -27,60 +27,69 @@ export function compileInjectable(type: Type<any>, meta?: Injectable): void {
     return;
   }
 
-  // Check whether the injectable metadata includes a provider specification.
-  const hasAProvider = isUseClassProvider(meta) || isUseFactoryProvider(meta) ||
-      isUseValueProvider(meta) || isUseExistingProvider(meta);
+  let def: any = null;
+  Object.defineProperty(type, 'ngInjectableDef', {
+    get: () => {
+      if (def === null) {
+        // Check whether the injectable metadata includes a provider specification.
+        const hasAProvider = isUseClassProvider(meta) || isUseFactoryProvider(meta) ||
+            isUseValueProvider(meta) || isUseExistingProvider(meta);
 
-  let deps: R3DependencyMetadata[]|undefined = undefined;
-  if (!hasAProvider || (isUseClassProvider(meta) && type === meta.useClass)) {
-    deps = reflectDependencies(type);
-  } else if (isUseClassProvider(meta)) {
-    deps = meta.deps && convertDependencies(meta.deps);
-  } else if (isUseFactoryProvider(meta)) {
-    deps = meta.deps && convertDependencies(meta.deps) || [];
-  }
+        let deps: R3DependencyMetadata[]|undefined = undefined;
+        if (!hasAProvider || (isUseClassProvider(meta) && type === meta.useClass)) {
+          deps = reflectDependencies(type);
+        } else if (isUseClassProvider(meta)) {
+          deps = meta.deps && convertDependencies(meta.deps);
+        } else if (isUseFactoryProvider(meta)) {
+          deps = meta.deps && convertDependencies(meta.deps) || [];
+        }
 
-  // Decide which flavor of factory to generate, based on the provider specified.
-  // Only one of the use* fields should be set.
-  let useClass: Expression|undefined = undefined;
-  let useFactory: Expression|undefined = undefined;
-  let useValue: Expression|undefined = undefined;
-  let useExisting: Expression|undefined = undefined;
+        // Decide which flavor of factory to generate, based on the provider specified.
+        // Only one of the use* fields should be set.
+        let useClass: Expression|undefined = undefined;
+        let useFactory: Expression|undefined = undefined;
+        let useValue: Expression|undefined = undefined;
+        let useExisting: Expression|undefined = undefined;
 
-  if (!hasAProvider) {
-    // In the case the user specifies a type provider, treat it as {provide: X, useClass: X}.
-    // The deps will have been reflected above, causing the factory to create the class by calling
-    // its constructor with injected deps.
-    useClass = new WrappedNodeExpr(type);
-  } else if (isUseClassProvider(meta)) {
-    // The user explicitly specified useClass, and may or may not have provided deps.
-    useClass = new WrappedNodeExpr(meta.useClass);
-  } else if (isUseValueProvider(meta)) {
-    // The user explicitly specified useValue.
-    useValue = new WrappedNodeExpr(meta.useValue);
-  } else if (isUseFactoryProvider(meta)) {
-    // The user explicitly specified useFactory.
-    useFactory = new WrappedNodeExpr(meta.useFactory);
-  } else if (isUseExistingProvider(meta)) {
-    // The user explicitly specified useExisting.
-    useExisting = new WrappedNodeExpr(meta.useExisting);
-  } else {
-    // Can't happen - either hasAProvider will be false, or one of the providers will be set.
-    throw new Error(`Unreachable state.`);
-  }
+        if (!hasAProvider) {
+          // In the case the user specifies a type provider, treat it as {provide: X, useClass: X}.
+          // The deps will have been reflected above, causing the factory to create the class by
+          // calling
+          // its constructor with injected deps.
+          useClass = new WrappedNodeExpr(type);
+        } else if (isUseClassProvider(meta)) {
+          // The user explicitly specified useClass, and may or may not have provided deps.
+          useClass = new WrappedNodeExpr(meta.useClass);
+        } else if (isUseValueProvider(meta)) {
+          // The user explicitly specified useValue.
+          useValue = new WrappedNodeExpr(meta.useValue);
+        } else if (isUseFactoryProvider(meta)) {
+          // The user explicitly specified useFactory.
+          useFactory = new WrappedNodeExpr(meta.useFactory);
+        } else if (isUseExistingProvider(meta)) {
+          // The user explicitly specified useExisting.
+          useExisting = new WrappedNodeExpr(meta.useExisting);
+        } else {
+          // Can't happen - either hasAProvider will be false, or one of the providers will be set.
+          throw new Error(`Unreachable state.`);
+        }
 
-  const {expression} = compileIvyInjectable({
-    name: type.name,
-    type: new WrappedNodeExpr(type),
-    providedIn: computeProvidedIn(meta.providedIn),
-    useClass,
-    useFactory,
-    useValue,
-    useExisting,
-    deps,
+        const {expression} = compileIvyInjectable({
+          name: type.name,
+          type: new WrappedNodeExpr(type),
+          providedIn: computeProvidedIn(meta.providedIn),
+          useClass,
+          useFactory,
+          useValue,
+          useExisting,
+          deps,
+        });
+
+        def = jitExpression(expression, angularCoreEnv, `ng://${type.name}/ngInjectableDef.js`);
+      }
+      return def;
+    },
   });
-
-  jitPatchDefinition(type, 'ngInjectableDef', expression, angularCoreEnv);
 }
 
 function computeProvidedIn(providedIn: Type<any>| string | null | undefined): Expression {
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 991faf2913..51df46a86b 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileIvyNgModule, jitPatchDefinition} from '@angular/compiler';
+import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileIvyNgModule, jitExpression} from '@angular/compiler';
 
 import {ModuleWithProviders, NgModule, NgModuleDef} from '../../metadata/ng_module';
 import {Type} from '../../type';
@@ -33,17 +33,6 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
     directives: [] as any[],
     pipes: [] as any[],
   };
-  flatten(ngModule.declarations || EMPTY_ARRAY).forEach(decl => {
-    if (decl.ngPipeDef) {
-      transitiveCompileScope.pipes.push(decl);
-    } else if (decl.ngComponentDef) {
-      transitiveCompileScope.directives.push(decl);
-      patchComponentWithScope(decl, type as any);
-    } else {
-      transitiveCompileScope.directives.push(decl);
-      decl.ngSelectorScope = type;
-    }
-  });
 
   function addExportsFrom(module: Type<any>& {ngModuleDef: NgModuleDef<any>}): void {
     module.ngModuleDef.exports.forEach((exp: any) => {
@@ -60,16 +49,49 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
   flatten([(ngModule.imports || EMPTY_ARRAY), (ngModule.exports || EMPTY_ARRAY)])
       .filter(importExport => isNgModule(importExport))
       .forEach(mod => addExportsFrom(mod));
-  jitPatchDefinition(type, 'ngModuleDef', res.expression, angularCoreEnv);
-  ((type as any).ngModuleDef as NgModuleDef<any>).transitiveCompileScope = transitiveCompileScope;
+
+  flatten(ngModule.declarations || EMPTY_ARRAY).forEach(decl => {
+    if (decl.ngPipeDef) {
+      transitiveCompileScope.pipes.push(decl);
+    } else if (decl.ngComponentDef) {
+      transitiveCompileScope.directives.push(decl);
+      patchComponentWithScope(decl, type as any);
+    } else {
+      transitiveCompileScope.directives.push(decl);
+      decl.ngSelectorScope = type;
+    }
+  });
+
+  let def: any = null;
+  Object.defineProperty(type, 'ngModuleDef', {
+    get: () => {
+      if (def === null) {
+        const meta: R3NgModuleMetadata = {
+          type: wrap(type),
+          bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(wrap),
+          declarations: flatten(ngModule.declarations || EMPTY_ARRAY).map(wrap),
+          imports:
+              flatten(ngModule.imports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
+          exports:
+              flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
+          emitInline: true,
+        };
+        const res = compileIvyNgModule(meta);
+        def = jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngModuleDef.js`);
+        def.transitiveCompileScope = transitiveCompileScope;
+      }
+      return def;
+    },
+  });
 }
 
 export function patchComponentWithScope<C, M>(
     component: Type<C>& {ngComponentDef: ComponentDef<C>},
     module: Type<M>& {ngModuleDef: NgModuleDef<M>}) {
   component.ngComponentDef.directiveDefs = () =>
-      module.ngModuleDef.transitiveCompileScope !.directives.map(
-          dir => dir.ngDirectiveDef || dir.ngComponentDef);
+      module.ngModuleDef.transitiveCompileScope !.directives
+          .map(dir => dir.ngDirectiveDef || dir.ngComponentDef)
+          .filter(def => !!def);
   component.ngComponentDef.pipeDefs = () =>
       module.ngModuleDef.transitiveCompileScope !.pipes.map(pipe => pipe.ngPipeDef);
 }
diff --git a/packages/core/src/render3/jit/util.ts b/packages/core/src/render3/jit/util.ts
index 3c07880c82..485ebd5dc9 100644
--- a/packages/core/src/render3/jit/util.ts
+++ b/packages/core/src/render3/jit/util.ts
@@ -19,9 +19,12 @@ import {Type} from '../../type';
 
 let _reflect: ReflectionCapabilities|null = null;
 
+export function getReflect(): ReflectionCapabilities {
+  return (_reflect = _reflect || new ReflectionCapabilities());
+}
+
 export function reflectDependencies(type: Type<any>): R3DependencyMetadata[] {
-  _reflect = _reflect || new ReflectionCapabilities();
-  return convertDependencies(_reflect.parameters(type));
+  return convertDependencies(getReflect().parameters(type));
 }
 
 export function convertDependencies(deps: any[]): R3DependencyMetadata[] {
diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
index 3ff5b2ae6a..df27d9a748 100644
--- a/packages/core/src/util.ts
+++ b/packages/core/src/util.ts
@@ -20,7 +20,10 @@ const __window = typeof window !== 'undefined' && window;
 const __self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' &&
     self instanceof WorkerGlobalScope && self;
 const __global = typeof global !== 'undefined' && global;
-const _global: {[name: string]: any} = __window || __global || __self;
+
+// Check __global first, because in Node tests both __global and __window may be defined and _global
+// should be __global in that case.
+const _global: {[name: string]: any} = __global || __window || __self;
 
 const promise: Promise<any> = Promise.resolve(0);
 /**
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index 66549bedb6..786a215b92 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -44,7 +44,7 @@ jasmine_node_test(
     data = [
         ":bundle",
         ":bundle.js",
-        ":bundle.min.js",
+        ":bundle.min.js.br",
         ":bundle.min_debug.js",
     ],
     tags = [
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index fe5e7d7bbd..8d96a81a46 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -2072,9 +2072,6 @@
   {
     "name": "__extends$7"
   },
-  {
-    "name": "__global"
-  },
   {
     "name": "__read"
   },
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index f8d5684cbb..e3fd43ba1a 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -27,6 +27,7 @@ ng_rollup_bundle(
     entry_point = "packages/core/test/bundling/todo/index.js",
     deps = [
         ":todo",
+        "//packages/common",
         "//packages/core",
     ],
 )
@@ -50,6 +51,7 @@ jasmine_node_test(
         ":bundle.min.js",
         ":bundle.min_debug.js",
     ],
+    tags = ["ivy-jit"],
     deps = [":test_lib"],
 )
 
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 11389750f7..6b487a0142 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -119,9 +119,6 @@
   {
     "name": "__extends"
   },
-  {
-    "name": "__global"
-  },
   {
     "name": "__read"
   },
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index 86e355f953..d5694a3407 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import 'reflect-metadata';
+
 import {CommonModule, NgForOf, NgIf} from '@angular/common';
 import {Component, Injectable, IterableDiffers, NgModule, defineInjector, ɵNgOnChangesFeature as NgOnChangesFeature, ɵdefineDirective as defineDirective, ɵdirectiveInject as directiveInject, ɵinjectTemplateRef as injectTemplateRef, ɵinjectViewContainerRef as injectViewContainerRef, ɵrenderComponent as renderComponent} from '@angular/core';
 
@@ -145,35 +147,39 @@ export class ToDoAppComponent {
   }
 }
 
-// TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
-(CommonModule as any).ngInjectorDef = defineInjector({factory: () => new CommonModule});
+// In JIT mode the @Directive decorators in //packages/common will compile the Ivy fields. When
+// running under --define=compile=legacy, //packages/common is not compiled with Ivy fields, so they
+// must be monkey-patched on.
+if (!(NgIf as any).ngDirectiveDef) {
+  // TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
+  (CommonModule as any).ngInjectorDef = defineInjector({factory: () => new CommonModule});
 
-// TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
-(NgForOf as any).ngDirectiveDef = defineDirective({
-  type: NgForOf,
-  selectors: [['', 'ngFor', '', 'ngForOf', '']],
-  factory: () => new NgForOf(
-               injectViewContainerRef(), injectTemplateRef(), directiveInject(IterableDiffers)),
-  features: [NgOnChangesFeature({
-    ngForOf: 'ngForOf',
-    ngForTrackBy: 'ngForTrackBy',
-    ngForTemplate: 'ngForTemplate',
-  })],
-  inputs: {
-    ngForOf: 'ngForOf',
-    ngForTrackBy: 'ngForTrackBy',
-    ngForTemplate: 'ngForTemplate',
-  }
-});
-
-// TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
-(NgIf as any).ngDirectiveDef = defineDirective({
-  type: NgIf,
-  selectors: [['', 'ngIf', '']],
-  factory: () => new NgIf(injectViewContainerRef(), injectTemplateRef()),
-  inputs: {ngIf: 'ngIf', ngIfThen: 'ngIfThen', ngIfElse: 'ngIfElse'}
-});
+  // TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
+  (NgForOf as any).ngDirectiveDef = defineDirective({
+    type: NgForOf,
+    selectors: [['', 'ngFor', '', 'ngForOf', '']],
+    factory: () => new NgForOf(
+                 injectViewContainerRef(), injectTemplateRef(), directiveInject(IterableDiffers)),
+    features: [NgOnChangesFeature({
+      ngForOf: 'ngForOf',
+      ngForTrackBy: 'ngForTrackBy',
+      ngForTemplate: 'ngForTemplate',
+    })],
+    inputs: {
+      ngForOf: 'ngForOf',
+      ngForTrackBy: 'ngForTrackBy',
+      ngForTemplate: 'ngForTemplate',
+    }
+  });
 
+  // TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
+  (NgIf as any).ngDirectiveDef = defineDirective({
+    type: NgIf,
+    selectors: [['', 'ngIf', '']],
+    factory: () => new NgIf(injectViewContainerRef(), injectTemplateRef()),
+    inputs: {ngIf: 'ngIf', ngIfThen: 'ngIfThen', ngIfElse: 'ngIfElse'}
+  });
+}
 
 @NgModule({declarations: [ToDoAppComponent, ToDoAppComponent], imports: [CommonModule]})
 export class ToDoAppModule {

From 62f751cd8777b13f30484dcd428d001762d2edad Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 30 May 2018 11:04:26 +0300
Subject: [PATCH 135/582] build: update brotli version in WORKSPACE (#24194)

The updated version includes the fix for google/brotli#671.

PR Close #24194
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 9d0d875b2b..99988ed805 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -66,9 +66,9 @@ http_archive(
 
 http_archive(
     name = "org_brotli",
-    url = "https://github.com/google/brotli/archive/c6333e1e79fb62ea088443f192293f964409b04e.zip",
-    strip_prefix = "brotli-c6333e1e79fb62ea088443f192293f964409b04e",
-    sha256 = "3f781988dee7dd3bcce2bf238294663cfaaf3b6433505bdb762e24d0a284d1dc",
+    url = "https://github.com/google/brotli/archive/f9b8c02673c576a3e807edbf3a9328e9e7af6d7c.zip",
+    strip_prefix = "brotli-f9b8c02673c576a3e807edbf3a9328e9e7af6d7c",
+    sha256 = "8a517806d2b7c8505ba5c53934e7d7c70d341b68ffd268e9044d35b564a48828",
 )
 
 #

From 49d97f1ba0168952c869d98cf217b59e116cac46 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 30 May 2018 08:48:45 -0700
Subject: [PATCH 136/582] build: update rules_webtesting (#24198)

this includes a fix for spammy browser installs that makes our CI logs hard to read

PR Close #24198
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 99988ed805..579ba2935c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -13,9 +13,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_webtesting",
-    url = "https://github.com/bazelbuild/rules_webtesting/archive/cfcaaf98553fee8e7063b5f5c11fd1b77e43d683.zip",
-    strip_prefix = "rules_webtesting-cfcaaf98553fee8e7063b5f5c11fd1b77e43d683",
-    sha256 = "636c7a9ac2ca13a04d982c2f9c874876ecc90a7b9ccfe4188156122b26ada7b3",
+    url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
+    strip_prefix = "rules_webtesting-0.2.0",
+    sha256 = "cecc12f07e95740750a40d38e8b14b76fefa1551bef9332cb432d564d693723c",
 )
 
 http_archive(

From 855d9c00e09c5e6df1cdca2ae337734d9bf034b6 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 30 May 2018 09:27:15 -0700
Subject: [PATCH 137/582] build: replace hard-coded master branch with the
 variable (#24199)

PR Close #24199
---
 scripts/github/merge-pr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/github/merge-pr b/scripts/github/merge-pr
index 0204d6e56f..faa8aa4528 100755
--- a/scripts/github/merge-pr
+++ b/scripts/github/merge-pr
@@ -72,7 +72,7 @@ fi
 if [[ "$STATUS" != "All checks passed!" ]]; then
   echo PR $PR_NUMBER is failing with: $STATUS
   if [[ $FORCE == 1 ]]; then
-    echo FORCING: --force flag used to ignor PR status.
+    echo FORCING: --force flag used to ignore PR status.
   else
     echo Exting...
     exit 1
@@ -100,11 +100,11 @@ CHECKOUT_MASTER="git checkout merge_pr_master"
 CHECKOUT_PATCH="git checkout merge_pr_patch"
 RESTORE_BRANCH="git checkout $CURRENT_BRANCH"
 
-FETCH_PR="git fetch git@github.com:angular/angular.git pull/$PR_NUMBER/head:merge_pr heads/master:merge_pr_master heads/$PATCH_BRANCH:merge_pr_patch -f"
+FETCH_PR="git fetch git@github.com:angular/angular.git pull/$PR_NUMBER/head:merge_pr heads/$MASTER_BRANCH:merge_pr_master heads/$PATCH_BRANCH:merge_pr_patch -f"
 BASE_PR="git checkout merge_pr~$PR_SHA_COUNT -B merge_pr_base"
 SQUASH_PR="git rebase --autosquash --interactive merge_pr_base merge_pr"
 REWRITE_MESSAGE="git filter-branch -f --msg-filter \"$BASEDIR/utils/github_closes.js $PR_NUMBER\" merge_pr_base..merge_pr"
-PUSH_BRANCHES="git push git@github.com:angular/angular.git merge_pr_master:master merge_pr_patch:$PATCH_BRANCH"
+PUSH_BRANCHES="git push git@github.com:angular/angular.git merge_pr_master:$MASTER_BRANCH merge_pr_patch:$PATCH_BRANCH"
 CHERRY_PICK_PR="git cherry-pick merge_pr_base..merge_pr"
 
 echo "======================"

From 1cd9e6c2ebc2cfadb65d28846c7b56548529b495 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Mon, 28 May 2018 11:57:36 +0200
Subject: [PATCH 138/582] feat(ivy): support queries with views inserted
 through ViewContainerRef (#24179)

This PR tackles a simple case where ViewRef definition point (<ng-template>) is the
same as the insertion point (ViewContainerRef requested on the said <ng-template>).
For this particular case we can assume that we know a container into which a given
view will be inserted when a view is created. This is not true fall all the possible
cases so follow-up PR will be needed to extend this basic implementation.

PR Close #24179
---
 packages/core/src/render3/di.ts               |  15 +-
 packages/core/src/render3/instructions.ts     |  10 +-
 packages/core/src/render3/interfaces/query.ts |  18 +-
 .../core/src/render3/node_manipulation.ts     |  13 +-
 packages/core/src/render3/query.ts            |  47 +-
 packages/core/test/render3/query_spec.ts      | 660 ++++++++++--------
 6 files changed, 460 insertions(+), 303 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index f5a0f82c1e..450fe9afcd 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -20,10 +20,10 @@ import {Type} from '../type';
 
 import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
-import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
+import {ComponentTemplate, DirectiveDef} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
-import {QueryReadType} from './interfaces/query';
+import {LQueries, QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {LView, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
@@ -576,6 +576,11 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
     const lContainerNode: LContainerNode = createLNodeObject(
         TNodeType.Container, vcRefHost.view, hostParent, undefined, lContainer, null);
 
+
+    if (vcRefHost.queries) {
+      lContainerNode.queries = vcRefHost.queries.container();
+    }
+
     const hostTNode = vcRefHost.tNode;
     if (!hostTNode.dynamicContainerNode) {
       hostTNode.dynamicContainerNode =
@@ -701,7 +706,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
     ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
         getOrCreateElementRef(di), hostTNode.tViews as TView, hostNode.data.template !,
-        getRenderer(), hostTView.directiveRegistry, hostTView.pipeRegistry);
+        getRenderer(), hostNode.queries);
   }
   return di.templateRef;
 }
@@ -712,13 +717,13 @@ class TemplateRef<T> implements viewEngine_TemplateRef<T> {
   constructor(
       elementRef: viewEngine_ElementRef, private _tView: TView,
       private _template: ComponentTemplate<T>, private _renderer: Renderer3,
-      private _directives: DirectiveDefList|null, private _pipes: PipeDefList|null) {
+      private _queries: LQueries|null) {
     this.elementRef = elementRef;
   }
 
   createEmbeddedView(context: T): viewEngine_EmbeddedViewRef<T> {
     const viewNode = renderEmbeddedTemplate(
-        null, this._tView, this._template, context, this._renderer, this._directives, this._pipes);
+        null, this._tView, this._template, context, this._renderer, this._queries);
     return addDestroyable(new EmbeddedViewRef(viewNode, this._template, context));
   }
 }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index cc178c2eb0..ba586dfad2 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -493,8 +493,7 @@ export function renderTemplate<T>(
  */
 export function renderEmbeddedTemplate<T>(
     viewNode: LViewNode | null, tView: TView, template: ComponentTemplate<T>, context: T,
-    renderer: Renderer3, directives?: DirectiveDefList | null,
-    pipes?: PipeDefList | null): LViewNode {
+    renderer: Renderer3, queries?: LQueries | null): LViewNode {
   const _isParent = isParent;
   const _previousOrParentNode = previousOrParentNode;
   let oldView: LView;
@@ -507,6 +506,10 @@ export function renderEmbeddedTemplate<T>(
       const lView = createLView(
           -1, renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
+      if (queries) {
+        lView.queries = queries.createView();
+      }
+
       viewNode = createLNode(null, TNodeType.View, null, null, null, lView);
       rf = RenderFlags.Create;
     }
@@ -1643,8 +1646,9 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
     const newView = createLView(
         viewBlockId, renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, null,
         LViewFlags.CheckAlways, getCurrentSanitizer());
+
     if (lContainer.queries) {
-      newView.queries = lContainer.queries.enterView(lContainer.nextIndex !);
+      newView.queries = lContainer.queries.createView();
     }
 
     enterView(
diff --git a/packages/core/src/render3/interfaces/query.ts b/packages/core/src/render3/interfaces/query.ts
index 2ab94de136..57822a0815 100644
--- a/packages/core/src/render3/interfaces/query.ts
+++ b/packages/core/src/render3/interfaces/query.ts
@@ -28,19 +28,25 @@ export interface LQueries {
   addNode(node: LNode): void;
 
   /**
-   * Notify `LQueries` that a  `LNode` has been created and needs to be added to query results
-   * if matching query predicate.
+   * Notify `LQueries` that a new LContainer was added to ivy data structures. As a result we need
+   * to prepare room for views that might be inserted into this container.
    */
   container(): LQueries|null;
 
   /**
-   * Notify `LQueries` that a new view was created and is being entered in the creation mode.
-   * This allow queries to prepare space for matching nodes from views.
+   * Notify `LQueries` that a new `LView` has been created. As a result we need to prepare room
+   * and collect nodes that match query predicate.
    */
-  enterView(newViewIndex: number): LQueries|null;
+  createView(): LQueries|null;
 
   /**
-   * Notify `LQueries` that an `LViewNode` has been removed from `LContainerNode`. As a result all
+   * Notify `LQueries` that a new `LView` has been added to `LContainer`. As a result all
+   * the matching nodes from this view should be added to container's queries.
+   */
+  insertView(newViewIndex: number): void;
+
+  /**
+   * Notify `LQueries` that an `LView` has been removed from `LContainer`. As a result all
    * the matching nodes from this view should be removed from container's queries.
    */
   removeView(removeIndex: number): void;
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 1000197b31..95633efbea 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -328,6 +328,12 @@ export function insertView(
     viewNode.data.next = null;
   }
 
+  // Notify query that a new view has been added
+  const lView = viewNode.data;
+  if (lView.queries) {
+    lView.queries.insertView(index);
+  }
+
   // If the container's renderParent is null, we know that it is a root node of its own parent view
   // and we should wait until that parent processes its nodes (otherwise, we will insert this view's
   // nodes twice - once now and once when its parent inserts its views).
@@ -367,8 +373,13 @@ export function removeView(container: LContainerNode, removeIndex: number): LVie
   views.splice(removeIndex, 1);
   destroyViewTree(viewNode.data);
   addRemoveViewFromContainer(container, viewNode, false);
+
   // Notify query that view has been removed
-  container.data.queries && container.data.queries.removeView(removeIndex);
+  const removedLview = viewNode.data;
+  if (removedLview.queries) {
+    removedLview.queries.removeView(removeIndex);
+  }
+
   return viewNode;
 }
 
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 4502b47b9c..21a69f8ff3 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -76,6 +76,12 @@ export interface LQuery<T> {
    * This is what builds up the `QueryList._valuesTree`.
    */
   values: any[];
+
+  /**
+   * A pointer to an array that stores collected values from views. This is necessary so we know a
+   * container into which to insert nodes collected from views.
+   */
+  containerValues: any[]|null;
 }
 
 export class LQueries_ implements LQueries {
@@ -118,8 +124,13 @@ export class LQueries_ implements LQueries {
     while (query) {
       const containerValues: any[] = [];  // prepare room for views
       query.values.push(containerValues);
-      const clonedQuery: LQuery<any> =
-          {next: null, list: query.list, predicate: query.predicate, values: containerValues};
+      const clonedQuery: LQuery<any> = {
+        next: null,
+        list: query.list,
+        predicate: query.predicate,
+        values: containerValues,
+        containerValues: null
+      };
       clonedQuery.next = result;
       result = clonedQuery;
       query = query.next;
@@ -128,15 +139,18 @@ export class LQueries_ implements LQueries {
     return result ? new LQueries_(result) : null;
   }
 
-  enterView(index: number): LQueries|null {
+  createView(): LQueries|null {
     let result: LQuery<any>|null = null;
     let query = this.deep;
 
     while (query) {
-      const viewValues: any[] = [];  // prepare room for view nodes
-      query.values.splice(index, 0, viewValues);
-      const clonedQuery: LQuery<any> =
-          {next: null, list: query.list, predicate: query.predicate, values: viewValues};
+      const clonedQuery: LQuery<any> = {
+        next: null,
+        list: query.list,
+        predicate: query.predicate,
+        values: [],
+        containerValues: query.values
+      };
       clonedQuery.next = result;
       result = clonedQuery;
       query = query.next;
@@ -145,6 +159,17 @@ export class LQueries_ implements LQueries {
     return result ? new LQueries_(result) : null;
   }
 
+  insertView(index: number): void {
+    let query = this.deep;
+    while (query) {
+      ngDevMode &&
+          assertNotNull(
+              query.containerValues, 'View queries need to have a pointer to container values.');
+      query.containerValues !.splice(index, 0, query.values);
+      query = query.next;
+    }
+  }
+
   addNode(node: LNode): void {
     add(this.shallow, node);
     add(this.deep, node);
@@ -153,7 +178,10 @@ export class LQueries_ implements LQueries {
   removeView(index: number): void {
     let query = this.deep;
     while (query) {
-      const removed = query.values.splice(index, 1);
+      ngDevMode &&
+          assertNotNull(
+              query.containerValues, 'View queries need to have a pointer to container values.');
+      const removed = query.containerValues !.splice(index, 1);
 
       // mark a query as dirty only when removed view had matching modes
       ngDevMode && assertEqual(removed.length, 1, 'removed.length');
@@ -279,7 +307,8 @@ function createQuery<T>(
     next: previous,
     list: queryList,
     predicate: createPredicate(predicate, read),
-    values: (queryList as any as QueryList_<T>)._valuesTree
+    values: (queryList as any as QueryList_<T>)._valuesTree,
+    containerValues: null
   };
 }
 
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index e31fbd02d7..9309ec5022 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -5,14 +5,17 @@
  * 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 {NgForOfContext} from '@angular/common';
+
 import {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF} from '../../src/render3/di';
 import {QueryList, defineComponent, detectChanges} from '../../src/render3/index';
-import {container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, queryRefresh} from '../../src/render3/query';
 
-import {createComponent, createDirective, renderComponent} from './render_util';
-
+import {NgForOf, NgIf} from './common_with_def';
+import {ComponentFixture, createComponent, createDirective, renderComponent} from './render_util';
 
 
 /**
@@ -685,307 +688,406 @@ describe('query', () => {
 
   describe('view boundaries', () => {
 
-    it('should report results in embedded views', () => {
-      let firstEl;
-      /**
-       * <ng-template [ngIf]="exp">
-       *    <div #foo></div>
-       * </ng-template>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          container(1);
-        }
-        if (rf & RenderFlags.Update) {
-          containerRefreshStart(1);
-          {
-            if (ctx.exp) {
-              let rf1 = embeddedViewStart(1);
-              {
-                if (rf1 & RenderFlags.Create) {
-                  firstEl = elementStart(0, 'div', null, ['foo', '']);
-                  elementEnd();
-                }
+    describe('ViewContainerRef', () => {
+
+      it('should report results in views inserted / removed by ngIf', () => {
+
+        /**
+         * <ng-template [ngIf]="value">
+         *    <div #foo></div>
+         * </ng-template>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+          let tmp: any;
+          if (rf & RenderFlags.Create) {
+            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+            container(1, (rf1: RenderFlags, ctx1: any) => {
+              if (rf1 & RenderFlags.Create) {
+                elementStart(0, 'div', null, ['foo', '']);
+                elementEnd();
               }
-              embeddedViewEnd();
-            }
+            }, null, ['ngIf', '']);
           }
-          containerRefreshEnd();
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+          if (rf & RenderFlags.Update) {
+            elementProperty(1, 'ngIf', bind(ctx.value));
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+          }
+        }, [NgIf]);
+
+        const fixture = new ComponentFixture(Cmpt);
+        const qList = fixture.component.query;
+        expect(qList.length).toBe(0);
+
+        fixture.component.value = true;
+        fixture.update();
+        expect(qList.length).toBe(1);
+
+        fixture.component.value = false;
+        fixture.update();
+        expect(qList.length).toBe(0);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as any);
-      expect(qList.length).toBe(0);
+      it('should report results in views inserted / removed by ngFor', () => {
 
-      cmptInstance.exp = true;
-      detectChanges(cmptInstance);
-      expect(qList.length).toBe(1);
-      expect(qList.first.nativeElement).toBe(firstEl);
+        /**
+         * <ng-template ngFor let-item [ngForOf]="value">
+         *    <div #foo [id]="item"></div>
+         * </ng-template>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+          let tmp: any;
+          if (rf & RenderFlags.Create) {
+            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+            container(1, (rf1: RenderFlags, row: NgForOfContext<string>) => {
+              if (rf1 & RenderFlags.Create) {
+                elementStart(0, 'div', null, ['foo', '']);
+                elementEnd();
+              }
+              if (rf1 & RenderFlags.Update) {
+                elementProperty(0, 'id', bind(row.$implicit));
+              }
+            }, null, ['ngForOf', '']);
+          }
+          if (rf & RenderFlags.Update) {
+            elementProperty(1, 'ngForOf', bind(ctx.value));
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+          }
+        }, [NgForOf]);
+
+        const fixture = new ComponentFixture(Cmpt);
+        const qList = fixture.component.query;
+        expect(qList.length).toBe(0);
+
+        fixture.component.value = ['a', 'b', 'c'];
+        fixture.update();
+        fixture
+            .update();  // invoking CD twice due to https://github.com/angular/angular/issues/23707
+        expect(qList.length).toBe(3);
+
+        fixture.component.value.splice(1, 1);  // remove "b"
+        fixture.update();
+        fixture
+            .update();  // invoking CD twice due to https://github.com/angular/angular/issues/23707
+        expect(qList.length).toBe(2);
+
+        // make sure that a proper element was removed from query results
+        expect(qList.first.nativeElement.id).toBe('a');
+        expect(qList.last.nativeElement.id).toBe('c');
+
+      });
 
-      cmptInstance.exp = false;
-      detectChanges(cmptInstance);
-      expect(qList.length).toBe(0);
     });
 
-    it('should add results from embedded views in the correct order - views and elements mix',
-       () => {
-         let firstEl, lastEl, viewEl;
-         /**
-          * <span #foo></span>
-          * <ng-template [ngIf]="exp">
-          *    <div #foo></div>
-          * </ng-template>
-          * <span #foo></span>
-          * class Cmpt {
-          *  @ViewChildren('foo') query;
-          * }
-          */
-         const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-           let tmp: any;
-           if (rf & RenderFlags.Create) {
-             query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-             firstEl = elementStart(1, 'span', null, ['foo', '']);
-             elementEnd();
-             container(3);
-             lastEl = elementStart(4, 'span', null, ['foo', '']);
-             elementEnd();
-           }
-           if (rf & RenderFlags.Update) {
-             containerRefreshStart(3);
-             {
-               if (ctx.exp) {
-                 let rf1 = embeddedViewStart(1);
-                 {
-                   if (rf1 & RenderFlags.Create) {
-                     viewEl = elementStart(0, 'div', null, ['foo', '']);
-                     elementEnd();
-                   }
-                 }
-                 embeddedViewEnd();
-               }
+    describe('JS blocks', () => {
+
+      it('should report results in embedded views', () => {
+        let firstEl;
+        /**
+         * % if (exp) {
+         *    <div #foo></div>
+         * % }
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+          let tmp: any;
+          if (rf & RenderFlags.Create) {
+            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+            container(1);
+          }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(1);
+            {
+              if (ctx.exp) {
+                let rf1 = embeddedViewStart(1);
+                {
+                  if (rf1 & RenderFlags.Create) {
+                    firstEl = elementStart(0, 'div', null, ['foo', '']);
+                    elementEnd();
+                  }
+                }
+                embeddedViewEnd();
+              }
+            }
+            containerRefreshEnd();
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+          }
+        });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as any);
+        expect(qList.length).toBe(0);
+
+        cmptInstance.exp = true;
+        detectChanges(cmptInstance);
+        expect(qList.length).toBe(1);
+        expect(qList.first.nativeElement).toBe(firstEl);
+
+        cmptInstance.exp = false;
+        detectChanges(cmptInstance);
+        expect(qList.length).toBe(0);
+      });
+
+      it('should add results from embedded views in the correct order - views and elements mix',
+         () => {
+           let firstEl, lastEl, viewEl;
+           /**
+            * <span #foo></span>
+            * % if (exp) {
+            *    <div #foo></div>
+            * % }
+            * <span #foo></span>
+            * class Cmpt {
+            *  @ViewChildren('foo') query;
+            * }
+            */
+           const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+             let tmp: any;
+             if (rf & RenderFlags.Create) {
+               query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+               firstEl = elementStart(1, 'span', null, ['foo', '']);
+               elementEnd();
+               container(3);
+               lastEl = elementStart(4, 'span', null, ['foo', '']);
+               elementEnd();
              }
-             containerRefreshEnd();
-             queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-           }
+             if (rf & RenderFlags.Update) {
+               containerRefreshStart(3);
+               {
+                 if (ctx.exp) {
+                   let rf1 = embeddedViewStart(1);
+                   {
+                     if (rf1 & RenderFlags.Create) {
+                       viewEl = elementStart(0, 'div', null, ['foo', '']);
+                       elementEnd();
+                     }
+                   }
+                   embeddedViewEnd();
+                 }
+               }
+               containerRefreshEnd();
+               queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+             }
+           });
+
+           const cmptInstance = renderComponent(Cmpt);
+           const qList = (cmptInstance.query as any);
+           expect(qList.length).toBe(2);
+           expect(qList.first.nativeElement).toBe(firstEl);
+           expect(qList.last.nativeElement).toBe(lastEl);
+
+           cmptInstance.exp = true;
+           detectChanges(cmptInstance);
+           expect(qList.length).toBe(3);
+           expect(qList.toArray()[0].nativeElement).toBe(firstEl);
+           expect(qList.toArray()[1].nativeElement).toBe(viewEl);
+           expect(qList.toArray()[2].nativeElement).toBe(lastEl);
+
+           cmptInstance.exp = false;
+           detectChanges(cmptInstance);
+           expect(qList.length).toBe(2);
+           expect(qList.first.nativeElement).toBe(firstEl);
+           expect(qList.last.nativeElement).toBe(lastEl);
          });
 
-         const cmptInstance = renderComponent(Cmpt);
-         const qList = (cmptInstance.query as any);
-         expect(qList.length).toBe(2);
-         expect(qList.first.nativeElement).toBe(firstEl);
-         expect(qList.last.nativeElement).toBe(lastEl);
-
-         cmptInstance.exp = true;
-         detectChanges(cmptInstance);
-         expect(qList.length).toBe(3);
-         expect(qList.toArray()[0].nativeElement).toBe(firstEl);
-         expect(qList.toArray()[1].nativeElement).toBe(viewEl);
-         expect(qList.toArray()[2].nativeElement).toBe(lastEl);
-
-         cmptInstance.exp = false;
-         detectChanges(cmptInstance);
-         expect(qList.length).toBe(2);
-         expect(qList.first.nativeElement).toBe(firstEl);
-         expect(qList.last.nativeElement).toBe(lastEl);
-       });
-
-    it('should add results from embedded views in the correct order - views side by side', () => {
-      let firstEl, lastEl;
-      /**
-       * <ng-template [ngIf]="exp1">
-       *    <div #foo></div>
-       * </ng-template>
-       * <ng-template [ngIf]="exp2">
-       *    <span #foo></span>
-       * </ng-template>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          container(1);
-        }
-        if (rf & RenderFlags.Update) {
-          containerRefreshStart(1);
-          {
-            if (ctx.exp1) {
-              let rf0 = embeddedViewStart(0);
-              {
-                if (rf0 & RenderFlags.Create) {
-                  firstEl = elementStart(0, 'div', null, ['foo', '']);
-                  elementEnd();
-                }
-              }
-              embeddedViewEnd();
-            }
-            if (ctx.exp2) {
-              let rf1 = embeddedViewStart(1);
-              {
-                if (rf1 & RenderFlags.Create) {
-                  lastEl = elementStart(0, 'span', null, ['foo', '']);
-                  elementEnd();
-                }
-              }
-              embeddedViewEnd();
-            }
+      it('should add results from embedded views in the correct order - views side by side', () => {
+        let firstEl, lastEl;
+        /**
+         * % if (exp1) {
+         *    <div #foo></div>
+         * % } if (exp2) {
+         *    <span #foo></span>
+         * % }
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+          let tmp: any;
+          if (rf & RenderFlags.Create) {
+            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+            container(1);
           }
-          containerRefreshEnd();
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      });
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as any);
-      expect(qList.length).toBe(0);
-
-      cmptInstance.exp2 = true;
-      detectChanges(cmptInstance);
-      expect(qList.length).toBe(1);
-      expect(qList.last.nativeElement).toBe(lastEl);
-
-      cmptInstance.exp1 = true;
-      detectChanges(cmptInstance);
-      expect(qList.length).toBe(2);
-      expect(qList.first.nativeElement).toBe(firstEl);
-      expect(qList.last.nativeElement).toBe(lastEl);
-    });
-
-    it('should add results from embedded views in the correct order - nested views', () => {
-      let firstEl, lastEl;
-      /**
-       * <ng-template [ngIf]="exp1">
-       *    <div #foo></div>
-       *    <ng-template [ngIf]="exp2">
-       *      <span #foo></span>
-       *    </ng-template>
-       * </ng-template>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          container(1);
-        }
-        if (rf & RenderFlags.Update) {
-          containerRefreshStart(1);
-          {
-            if (ctx.exp1) {
-              let rf0 = embeddedViewStart(0);
-              {
-                if (rf0 & RenderFlags.Create) {
-                  firstEl = elementStart(0, 'div', null, ['foo', '']);
-                  elementEnd();
-                  container(2);
-                }
-                if (rf0 & RenderFlags.Update) {
-                  containerRefreshStart(2);
-                  {
-                    if (ctx.exp2) {
-                      let rf2 = embeddedViewStart(0);
-                      {
-                        if (rf2) {
-                          lastEl = elementStart(0, 'span', null, ['foo', '']);
-                          elementEnd();
-                        }
-                      }
-                      embeddedViewEnd();
-                    }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(1);
+            {
+              if (ctx.exp1) {
+                let rf0 = embeddedViewStart(0);
+                {
+                  if (rf0 & RenderFlags.Create) {
+                    firstEl = elementStart(0, 'div', null, ['foo', '']);
+                    elementEnd();
                   }
-                  containerRefreshEnd();
                 }
+                embeddedViewEnd();
+              }
+              if (ctx.exp2) {
+                let rf1 = embeddedViewStart(1);
+                {
+                  if (rf1 & RenderFlags.Create) {
+                    lastEl = elementStart(0, 'span', null, ['foo', '']);
+                    elementEnd();
+                  }
+                }
+                embeddedViewEnd();
               }
-              embeddedViewEnd();
             }
+            containerRefreshEnd();
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
           }
-          containerRefreshEnd();
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as any);
+        expect(qList.length).toBe(0);
+
+        cmptInstance.exp2 = true;
+        detectChanges(cmptInstance);
+        expect(qList.length).toBe(1);
+        expect(qList.last.nativeElement).toBe(lastEl);
+
+        cmptInstance.exp1 = true;
+        detectChanges(cmptInstance);
+        expect(qList.length).toBe(2);
+        expect(qList.first.nativeElement).toBe(firstEl);
+        expect(qList.last.nativeElement).toBe(lastEl);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as any);
-      expect(qList.length).toBe(0);
-
-      cmptInstance.exp1 = true;
-      detectChanges(cmptInstance);
-      expect(qList.length).toBe(1);
-      expect(qList.first.nativeElement).toBe(firstEl);
-
-      cmptInstance.exp2 = true;
-      detectChanges(cmptInstance);
-      expect(qList.length).toBe(2);
-      expect(qList.first.nativeElement).toBe(firstEl);
-      expect(qList.last.nativeElement).toBe(lastEl);
-    });
-
-    it('should support combination of deep and shallow queries', () => {
-      /**
-       * <ng-template [ngIf]="exp">
-       *    <div #foo></div>
-       * </ng-template>
-       * <span #foo></span>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          query(1, ['foo'], false, QUERY_READ_FROM_NODE);
-          container(2);
-          elementStart(3, 'span', null, ['foo', '']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          containerRefreshStart(2);
-          {
-            if (ctx.exp) {
-              let rf0 = embeddedViewStart(0);
-              {
-                if (rf0 & RenderFlags.Create) {
-                  elementStart(0, 'div', null, ['foo', '']);
-                  elementEnd();
-                }
-              }
-              embeddedViewEnd();
-            }
+      it('should add results from embedded views in the correct order - nested views', () => {
+        let firstEl, lastEl;
+        /**
+         * % if (exp1) {
+         *    <div #foo></div>
+         *    % if (exp2) {
+         *      <span #foo></span>
+         *    }
+         * % }
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+          let tmp: any;
+          if (rf & RenderFlags.Create) {
+            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+            container(1);
           }
-          containerRefreshEnd();
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.deep = tmp as QueryList<any>);
-          queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.shallow = tmp as QueryList<any>);
-        }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(1);
+            {
+              if (ctx.exp1) {
+                let rf0 = embeddedViewStart(0);
+                {
+                  if (rf0 & RenderFlags.Create) {
+                    firstEl = elementStart(0, 'div', null, ['foo', '']);
+                    elementEnd();
+                    container(2);
+                  }
+                  if (rf0 & RenderFlags.Update) {
+                    containerRefreshStart(2);
+                    {
+                      if (ctx.exp2) {
+                        let rf2 = embeddedViewStart(0);
+                        {
+                          if (rf2) {
+                            lastEl = elementStart(0, 'span', null, ['foo', '']);
+                            elementEnd();
+                          }
+                        }
+                        embeddedViewEnd();
+                      }
+                    }
+                    containerRefreshEnd();
+                  }
+                }
+                embeddedViewEnd();
+              }
+            }
+            containerRefreshEnd();
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+          }
+        });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as any);
+        expect(qList.length).toBe(0);
+
+        cmptInstance.exp1 = true;
+        detectChanges(cmptInstance);
+        expect(qList.length).toBe(1);
+        expect(qList.first.nativeElement).toBe(firstEl);
+
+        cmptInstance.exp2 = true;
+        detectChanges(cmptInstance);
+        expect(qList.length).toBe(2);
+        expect(qList.first.nativeElement).toBe(firstEl);
+        expect(qList.last.nativeElement).toBe(lastEl);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const deep = (cmptInstance.deep as any);
-      const shallow = (cmptInstance.shallow as any);
-      expect(deep.length).toBe(1);
-      expect(shallow.length).toBe(1);
+      it('should support combination of deep and shallow queries', () => {
+        /**
+         * <ng-template [ngIf]="exp">
+         *    <div #foo></div>
+         * </ng-template>
+         * <span #foo></span>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+          let tmp: any;
+          if (rf & RenderFlags.Create) {
+            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+            query(1, ['foo'], false, QUERY_READ_FROM_NODE);
+            container(2);
+            elementStart(3, 'span', null, ['foo', '']);
+            elementEnd();
+          }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(2);
+            {
+              if (ctx.exp) {
+                let rf0 = embeddedViewStart(0);
+                {
+                  if (rf0 & RenderFlags.Create) {
+                    elementStart(0, 'div', null, ['foo', '']);
+                    elementEnd();
+                  }
+                }
+                embeddedViewEnd();
+              }
+            }
+            containerRefreshEnd();
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.deep = tmp as QueryList<any>);
+            queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.shallow = tmp as QueryList<any>);
+          }
+        });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const deep = (cmptInstance.deep as any);
+        const shallow = (cmptInstance.shallow as any);
+        expect(deep.length).toBe(1);
+        expect(shallow.length).toBe(1);
 
 
-      cmptInstance.exp = true;
-      detectChanges(cmptInstance);
-      expect(deep.length).toBe(2);
-      expect(shallow.length).toBe(1);
+        cmptInstance.exp = true;
+        detectChanges(cmptInstance);
+        expect(deep.length).toBe(2);
+        expect(shallow.length).toBe(1);
+
+        cmptInstance.exp = false;
+        detectChanges(cmptInstance);
+        expect(deep.length).toBe(1);
+        expect(shallow.length).toBe(1);
+      });
 
-      cmptInstance.exp = false;
-      detectChanges(cmptInstance);
-      expect(deep.length).toBe(1);
-      expect(shallow.length).toBe(1);
     });
 
   });

From 95074ca3033bb4a45a0d9e4e16a7b4b4cabfe0d6 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Tue, 15 May 2018 22:07:20 +0200
Subject: [PATCH 139/582] fix(ivy): fix performance counter for textBinding
 instruction (#23924)

PR Close #23924
---
 packages/core/src/render3/instructions.ts      | 17 +++++++++--------
 packages/core/test/render3/integration_spec.ts | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index ba586dfad2..c577aa5200 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1272,14 +1272,15 @@ export function text(index: number, value?: any): void {
  * @param value Stringified value to write.
  */
 export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
-  ngDevMode && assertDataInRange(index);
-  let existingNode = data[index] as LTextNode;
-  ngDevMode && assertNotNull(existingNode, 'LNode should exist');
-  ngDevMode && assertNotNull(existingNode.native, 'native element should exist');
-  ngDevMode && ngDevMode.rendererSetText++;
-  value !== NO_CHANGE &&
-      (isProceduralRenderer(renderer) ? renderer.setValue(existingNode.native, stringify(value)) :
-                                        existingNode.native.textContent = stringify(value));
+  if (value !== NO_CHANGE) {
+    ngDevMode && assertDataInRange(index);
+    const existingNode = data[index] as LTextNode;
+    ngDevMode && assertNotNull(existingNode, 'LNode should exist');
+    ngDevMode && assertNotNull(existingNode.native, 'native element should exist');
+    ngDevMode && ngDevMode.rendererSetText++;
+    isProceduralRenderer(renderer) ? renderer.setValue(existingNode.native, stringify(value)) :
+                                     existingNode.native.textContent = stringify(value);
+  }
 }
 
 //////////////////////////
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 7fea1a24f3..257abc1938 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -68,6 +68,12 @@ describe('render3 integration test', () => {
 
       expect(renderToHtml(Template, 'benoit')).toEqual('benoit');
       expect(renderToHtml(Template, undefined)).toEqual('');
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 0,
+        tNode: 0,
+        tView: 1,
+        rendererSetText: 2,
+      });
     });
 
     it('should render "null" as "" when used with `bind()`', () => {
@@ -82,6 +88,12 @@ describe('render3 integration test', () => {
 
       expect(renderToHtml(Template, 'benoit')).toEqual('benoit');
       expect(renderToHtml(Template, null)).toEqual('');
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 0,
+        tNode: 0,
+        tView: 1,
+        rendererSetText: 2,
+      });
     });
 
     it('should support creation-time values in text nodes', () => {
@@ -95,6 +107,12 @@ describe('render3 integration test', () => {
       }
       expect(renderToHtml(Template, 'once')).toEqual('once');
       expect(renderToHtml(Template, 'twice')).toEqual('once');
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 0,
+        tNode: 0,
+        tView: 1,
+        rendererSetText: 1,
+      });
     });
 
   });

From 2a78d5e6fee26a6a43804f39da578cd9d79172ea Mon Sep 17 00:00:00 2001
From: Martin Probst <martin@probst.io>
Date: Fri, 18 May 2018 12:50:52 +0200
Subject: [PATCH 140/582] refactor(core): clean up dupe'd imports in reflector
 (#24203)

Closure Compiler in some configurations complains about duplicate
imports. This change replaces the export-with-import with an export of
the imported symbol.

closes #23993

PR Close #24203
---
 packages/core/src/reflection/reflector.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/reflection/reflector.ts b/packages/core/src/reflection/reflector.ts
index 8115a14e33..678941f442 100644
--- a/packages/core/src/reflection/reflector.ts
+++ b/packages/core/src/reflection/reflector.ts
@@ -10,8 +10,8 @@ import {Type} from '../type';
 import {PlatformReflectionCapabilities} from './platform_reflection_capabilities';
 import {GetterFn, MethodFn, SetterFn} from './types';
 
-export {PlatformReflectionCapabilities} from './platform_reflection_capabilities';
-export {GetterFn, MethodFn, SetterFn} from './types';
+export {PlatformReflectionCapabilities};
+export {GetterFn, MethodFn, SetterFn};
 
 /**
  * Provides access to reflection data about symbols. Used internally by Angular

From c917e5b5bb84edebdb79980d8cdc913c397856b3 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 30 May 2018 13:53:48 -0700
Subject: [PATCH 141/582] test(ivy): update TNode counts to reflect changes in
 #24113 (#24208)

After #24113 there is 2 `TNode` in those tests:
- 1 for the host,
- 1 for the text node.

The PR #23924 status was green because it branched off master before #24113 was
merged in.

PR Close #24208
---
 packages/core/test/render3/integration_spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 257abc1938..fce716580d 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -70,7 +70,7 @@ describe('render3 integration test', () => {
       expect(renderToHtml(Template, undefined)).toEqual('');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 0,
-        tNode: 0,
+        tNode: 2,
         tView: 1,
         rendererSetText: 2,
       });
@@ -90,7 +90,7 @@ describe('render3 integration test', () => {
       expect(renderToHtml(Template, null)).toEqual('');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 0,
-        tNode: 0,
+        tNode: 2,
         tView: 1,
         rendererSetText: 2,
       });
@@ -109,7 +109,7 @@ describe('render3 integration test', () => {
       expect(renderToHtml(Template, 'twice')).toEqual('once');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 0,
-        tNode: 0,
+        tNode: 2,
         tView: 1,
         rendererSetText: 1,
       });

From b96a3c8def377ce393341ecea8bfd7bbd61d3e47 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Mon, 28 May 2018 00:20:53 -0700
Subject: [PATCH 142/582] fix(platform-server): avoid clash between server and
 client style encapsulation attributes (#24158)

Previously the style encapsulation attributes(_nghost-* and _ngcontent-*) created on the server could overlap with the attributes and styles created by the client side app when it botstraps. In case the client is bootstrapping a lazy route, the client side styles are added before the server-side styles are removed. If the components on the client are bootstrapped in a different order than on the server, the styles generated by the client will cause the elements on the server to have the wrong styles.

The fix puts the styles and attributes generated on the server in a completely differemt space so that they are not affected by the client generated styles. The client generated styles will only affect elements bootstrapped on the client.

PR Close #24158
---
 .../platform-browser/src/dom/events/dom_events.ts | 13 ++++++++++---
 .../test/dom/events/event_manager_spec.ts         |  2 +-
 packages/platform-server/src/server_renderer.ts   |  8 +++++---
 packages/platform-server/test/integration_spec.ts | 15 ++++++++++++++-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/packages/platform-browser/src/dom/events/dom_events.ts b/packages/platform-browser/src/dom/events/dom_events.ts
index 6c1138d30e..5b4c6acaac 100644
--- a/packages/platform-browser/src/dom/events/dom_events.ts
+++ b/packages/platform-browser/src/dom/events/dom_events.ts
@@ -6,7 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, NgZone} from '@angular/core';
+import {isPlatformServer} from '@angular/common';
+import {Inject, Injectable, NgZone, Optional, PLATFORM_ID} from '@angular/core';
+
+
 // Import zero symbols from zone.js. This causes the zone ambient type to be
 // added to the type-checker, without emitting any runtime module load statement
 import {} from 'zone.js';
@@ -103,10 +106,14 @@ const globalListener = function(event: Event) {
 
 @Injectable()
 export class DomEventsPlugin extends EventManagerPlugin {
-  constructor(@Inject(DOCUMENT) doc: any, private ngZone: NgZone) {
+  constructor(
+      @Inject(DOCUMENT) doc: any, private ngZone: NgZone,
+      @Optional() @Inject(PLATFORM_ID) platformId: {}|null) {
     super(doc);
 
-    this.patchEvent();
+    if (!platformId || !isPlatformServer(platformId)) {
+      this.patchEvent();
+    }
   }
 
   private patchEvent() {
diff --git a/packages/platform-browser/test/dom/events/event_manager_spec.ts b/packages/platform-browser/test/dom/events/event_manager_spec.ts
index 185bf98822..b294e4e5c0 100644
--- a/packages/platform-browser/test/dom/events/event_manager_spec.ts
+++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts
@@ -24,7 +24,7 @@ import {el} from '../../../testing/src/browser_util';
     beforeEach(() => {
       doc = getDOM().supportsDOMEvents() ? document : getDOM().createHtmlDocument();
       zone = new NgZone({});
-      domEventPlugin = new DomEventsPlugin(doc, zone);
+      domEventPlugin = new DomEventsPlugin(doc, zone, null);
     });
 
     it('should delegate event bindings to plugins that are passed in from the most generic one to the most specific one',
diff --git a/packages/platform-server/src/server_renderer.ts b/packages/platform-server/src/server_renderer.ts
index 67c48be90a..6b8d1dfc34 100644
--- a/packages/platform-server/src/server_renderer.ts
+++ b/packages/platform-server/src/server_renderer.ts
@@ -206,11 +206,13 @@ class EmulatedEncapsulationServerRenderer2 extends DefaultServerRenderer2 {
       eventManager: EventManager, document: any, ngZone: NgZone, sharedStylesHost: SharedStylesHost,
       schema: DomElementSchemaRegistry, private component: RendererType2) {
     super(eventManager, document, ngZone, schema);
-    const styles = flattenStyles(component.id, component.styles, []);
+    // Add a 's' prefix to style attributes to indicate server.
+    const componentId = 's' + component.id;
+    const styles = flattenStyles(componentId, component.styles, []);
     sharedStylesHost.addStyles(styles);
 
-    this.contentAttr = shimContentAttribute(component.id);
-    this.hostAttr = shimHostAttribute(component.id);
+    this.contentAttr = shimContentAttribute(componentId);
+    this.hostAttr = shimHostAttribute(componentId);
   }
 
   applyToHost(element: any) { super.setAttribute(element, this.hostAttr, ''); }
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index bc27c9d856..435f2a5765 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -154,7 +154,11 @@ class MyAnimationApp {
 class AnimationServerModule {
 }
 
-@Component({selector: 'app', template: `Works!`, styles: [':host { color: red; }']})
+@Component({
+  selector: 'app',
+  template: `<div>Works!</div>`,
+  styles: ['div {color: blue; } :host { color: red; }']
+})
 class MyStylesApp {
 }
 
@@ -548,6 +552,15 @@ class EscapedTransferStoreModule {
            });
          }));
 
+
+      it('sets a prefix for the _nghost and _ngcontent attributes', async(() => {
+           renderModule(ExampleStylesModule, {document: doc}).then(output => {
+             expect(output).toMatch(
+                 /<html><head><style ng-transition="example-styles">div\[_ngcontent-sc\d+\] {color: blue; } \[_nghost-sc\d+\] { color: red; }<\/style><\/head><body><app _nghost-sc\d+="" ng-version="0.0.0-PLACEHOLDER"><div _ngcontent-sc\d+="">Works!<\/div><\/app><\/body><\/html>/);
+             called = true;
+           });
+         }));
+
       it('should handle false values on attributes', async(() => {
            renderModule(FalseAttributesModule, {document: doc}).then(output => {
              expect(output).toBe(

From c25e6142d2d7bd4edec088fe0474a09f39b31349 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 9 May 2018 10:05:16 -0700
Subject: [PATCH 143/582] docs: remove unfinished observables file (#23801)

PR Close #23801
---
 aio/content/guide/testing-observables.md | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 aio/content/guide/testing-observables.md

diff --git a/aio/content/guide/testing-observables.md b/aio/content/guide/testing-observables.md
deleted file mode 100644
index bb498d8736..0000000000
--- a/aio/content/guide/testing-observables.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Testing
-
-TBD. Original content [here](https://docs.google.com/document/d/1gGP5sqWNCHAWWV_GLdZQ1XyMO4K-CHksUxux0BFtVxk/edit#heading=h.ohqykkhzdhb2).
\ No newline at end of file

From accda00190d8098e8da5f46cb9fb91c01cba8ee3 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 30 May 2018 15:02:22 -0700
Subject: [PATCH 144/582] test(platform-server): update the symbol lists
 (#24209)

PR Close #24209
---
 .../test/bundling/hello_world_r2/bundle.golden_symbols.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index 8d96a81a46..688f862721 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -1202,6 +1202,9 @@
   {
     "name": "PLATFORM_INITIALIZER"
   },
+  {
+    "name": "PLATFORM_SERVER_ID"
+  },
   {
     "name": "PLURAL_CASES"
   },
@@ -3347,6 +3350,9 @@
   {
     "name": "isObservable"
   },
+  {
+    "name": "isPlatformServer"
+  },
   {
     "name": "isPrefixEnd"
   },

From 27d811a7ce3dc85e645d862cc0d4ba47e92f8c72 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 30 May 2018 16:12:49 -0700
Subject: [PATCH 145/582] Revert "docs: update docs to use HttpClientModule
 instead of HttpModule (#22727)"

This reverts commit 3ed7fc668641e62767eb3bcf61e0f5e08a1875cc.
---
 .../examples/bootstrapping/src/app/app.module.ts      |  4 ++--
 .../src/app/app.module.ts                             |  4 ++--
 .../examples/feature-modules/src/app/app.module.ts    |  4 ++--
 .../lazy-loading-ngmodules/src/app/app.module.ts      |  4 ++--
 aio/content/examples/ngmodules/src/app/app.module.ts  |  2 +-
 aio/content/examples/styleguide/src/app/app.module.ts |  6 +++---
 aio/content/guide/bootstrapping.md                    | 11 +++++++----
 aio/content/guide/entry-components.md                 |  2 +-
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/aio/content/examples/bootstrapping/src/app/app.module.ts b/aio/content/examples/bootstrapping/src/app/app.module.ts
index 9b8a4fcaef..58c78b33ac 100644
--- a/aio/content/examples/bootstrapping/src/app/app.module.ts
+++ b/aio/content/examples/bootstrapping/src/app/app.module.ts
@@ -5,7 +5,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 // #docregion directive-import
@@ -24,7 +24,7 @@ import { ItemDirective } from './item.directive';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpClientModule
+    HttpModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
index 490670a71c..a240e21f7c 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
@@ -1,7 +1,7 @@
 // #docregion
 import { BrowserModule }                from '@angular/platform-browser';
 import { FormsModule }                  from '@angular/forms';
-import { HttpClientModule }             from '@angular/common/http';
+import { HttpModule }                   from '@angular/http';
 
 // import { AppRoutingModule }             from './app-routing.module';
 import { LocationStrategy,
@@ -54,7 +54,7 @@ const c_components = [
   imports: [
     BrowserModule,
     FormsModule,
-    HttpClientModule,
+    HttpModule,
     InMemoryWebApiModule.forRoot(HeroData)
     // AppRoutingModule TODO: add routes
   ],
diff --git a/aio/content/examples/feature-modules/src/app/app.module.ts b/aio/content/examples/feature-modules/src/app/app.module.ts
index e74c19377a..503d6a46a1 100644
--- a/aio/content/examples/feature-modules/src/app/app.module.ts
+++ b/aio/content/examples/feature-modules/src/app/app.module.ts
@@ -3,7 +3,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 // import the feature module here so you can add it to the imports array below
@@ -17,7 +17,7 @@ import { CustomerDashboardModule } from './customer-dashboard/customer-dashboard
   imports: [
     BrowserModule,
     FormsModule,
-    HttpClientModule,
+    HttpModule,
     CustomerDashboardModule // add the feature module here
   ],
   providers: [],
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts
index d8d65b4404..fa3ee4def3 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpModule } from '@angular/http';
 import { AppRoutingModule } from './app-routing.module';
 
 import { AppComponent } from './app.component';
@@ -13,7 +13,7 @@ import { AppComponent } from './app.component';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpClientModule,
+    HttpModule,
     AppRoutingModule
   ],
   providers: [],
diff --git a/aio/content/examples/ngmodules/src/app/app.module.ts b/aio/content/examples/ngmodules/src/app/app.module.ts
index a2bae93468..a19fbbae52 100644
--- a/aio/content/examples/ngmodules/src/app/app.module.ts
+++ b/aio/content/examples/ngmodules/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpModule } from '@angular/http';
 
 /* App Root */
 import { AppComponent } from './app.component';
diff --git a/aio/content/examples/styleguide/src/app/app.module.ts b/aio/content/examples/styleguide/src/app/app.module.ts
index 2420170d4f..1e974baf5f 100644
--- a/aio/content/examples/styleguide/src/app/app.module.ts
+++ b/aio/content/examples/styleguide/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
+import { BrowserModule }            from '@angular/platform-browser';
 
-import { HttpClientModule } from '@angular/common/http';
+import { HttpModule }           from '@angular/http';
 import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
 
 import { RouterModule } from '@angular/router';
@@ -44,7 +44,7 @@ import * as s0901 from '../09-01/app/app.module';
 @NgModule({
   imports: [
     BrowserModule,
-    HttpClientModule,
+    HttpModule,
     InMemoryWebApiModule.forRoot(HeroData),
 
     s0101.AppModule,
diff --git a/aio/content/guide/bootstrapping.md b/aio/content/guide/bootstrapping.md
index 42c0ffe7ae..dc5b873d29 100644
--- a/aio/content/guide/bootstrapping.md
+++ b/aio/content/guide/bootstrapping.md
@@ -18,7 +18,8 @@ If you use the CLI to generate an app, the default `AppModule` is as follows:
 /* JavaScript imports */
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-
+import { FormsModule } from '@angular/forms';
+import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 
@@ -28,7 +29,9 @@ import { AppComponent } from './app.component';
     AppComponent
   ],
   imports: [
-    BrowserModule
+    BrowserModule,
+    FormsModule,
+    HttpModule
   ],
   providers: [],
   bootstrap: [AppComponent]
@@ -134,8 +137,8 @@ It tells Angular about other NgModules that this particular module needs to func
 
 This list of modules are those that export components, directives, or pipes
 that the component templates in this module reference. In this case, the component is
-`AppComponent`, which references components, directives, or pipes in `BrowserModule`.
-Other common components in the examples are `FormsModule` and `HttpClientModule`.
+`AppComponent`, which references components, directives, or pipes in `BrowserModule`,
+`FormsModule`, or  `HttpModule`.
 A component template can reference another component, directive,
 or pipe when the referenced class is declared in this module or
 the class was imported from another module.
diff --git a/aio/content/guide/entry-components.md b/aio/content/guide/entry-components.md
index 990c8ae84a..d57654218d 100644
--- a/aio/content/guide/entry-components.md
+++ b/aio/content/guide/entry-components.md
@@ -36,7 +36,7 @@ The following is an example of specifying a bootstrapped component,
   imports: [
     BrowserModule,
     FormsModule,
-    HttpClientModule,
+    HttpModule,
     AppRoutingModule
   ],
   providers: [],

From b99ef2b80a5490a3fc79c2555f024c1d79f8f519 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 13 May 2018 21:01:37 +0200
Subject: [PATCH 146/582] refactor(ivy): simplify bind instruction to reuse
 bindingUpdated logic (#23881)

Added runtime and compiler testcases for interpolated bindings, which verify
that NO_CHANGE is properly handled in `bind`.

PR Close #23881
---
 packages/core/src/render3/instructions.ts     | 19 ++--------
 .../core/test/render3/instructions_spec.ts    | 37 +++++++++++++++++++
 packages/core/test/render3/render_util.ts     |  6 +--
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index c577aa5200..523c605a68 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1266,7 +1266,7 @@ export function text(index: number, value?: any): void {
 
 /**
  * Create text node with binding
- * Bindings should be handled externally with the proper bind(1-8) method
+ * Bindings should be handled externally with the proper interpolation(1-8) method
  *
  * @param index Index of the node in the data array.
  * @param value Stringified value to write.
@@ -2151,21 +2151,8 @@ function initBindings() {
  *
  * @param value Value to diff
  */
-export function bind<T>(value: T | NO_CHANGE): T|NO_CHANGE {
-  if (currentView.bindingStartIndex < 0) {
-    initBindings();
-    return data[currentView.bindingIndex++] = value;
-  }
-
-  const changed: boolean =
-      value !== NO_CHANGE && isDifferent(data[currentView.bindingIndex], value);
-  if (changed) {
-    throwErrorIfNoChangesMode(
-        creationMode, checkNoChangesMode, data[currentView.bindingIndex], value);
-    data[currentView.bindingIndex] = value;
-  }
-  currentView.bindingIndex++;
-  return changed ? value : NO_CHANGE;
+export function bind<T>(value: T): T|NO_CHANGE {
+  return bindingUpdated(value) ? value : NO_CHANGE;
 }
 
 /**
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 43a0de4031..7a59ec8834 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -35,6 +35,43 @@ describe('instructions', () => {
     elementEnd();
   }
 
+  describe('bind', () => {
+    it('should update bindings when value changes', () => {
+      const t = new TemplateFixture(createAnchor);
+
+      t.update(() => elementProperty(0, 'title', bind('Hello')));
+      expect(t.html).toEqual('<a title="Hello"></a>');
+
+      t.update(() => elementProperty(0, 'title', bind('World')));
+      expect(t.html).toEqual('<a title="World"></a>');
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 1,
+        tNode: 2,  // 1 for hostElement + 1 for the template under test
+        tView: 1,
+        rendererCreateElement: 1,
+        rendererSetProperty: 2
+      });
+    });
+
+    it('should not update bindings when value does not change', () => {
+      const idempotentUpdate = () => elementProperty(0, 'title', bind('Hello'));
+      const t = new TemplateFixture(createAnchor, idempotentUpdate);
+
+      t.update();
+      expect(t.html).toEqual('<a title="Hello"></a>');
+
+      t.update();
+      expect(t.html).toEqual('<a title="Hello"></a>');
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 1,
+        tNode: 2,  // 1 for hostElement + 1 for the template under test
+        tView: 1,
+        rendererCreateElement: 1,
+        rendererSetProperty: 1
+      });
+    });
+  });
+
   describe('elementAttribute', () => {
     it('should use sanitizer function', () => {
       const t = new TemplateFixture(createDiv);
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 7bb954e2cd..2486905eae 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -58,9 +58,9 @@ export class TemplateFixture extends BaseFixture {
   /**
    *
    * @param createBlock Instructions which go into the creation block:
-   *          `if (creationMode) { __here__ }`.
-   * @param updateBlock Optional instructions which go after the creation block:
-   *          `if (creationMode) { ... } __here__`.
+   *          `if (rf & RenderFlags.Create) { __here__ }`.
+   * @param updateBlock Optional instructions which go into the update block:
+   *          `if (rf & RenderFlags.Update) { __here__ }`.
    */
   constructor(
       private createBlock: () => void, private updateBlock: () => void = noop,

From b492b9e12bf5df09a729354d6c53ecd62a71a44f Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Tue, 29 May 2018 13:34:10 -0700
Subject: [PATCH 147/582] fix(animations): Fix browser detection logic (#24188)

Element type is being polyfilled on the server now and cannot be used to detect browser environment.

PR Close #24188
---
 packages/animations/browser/src/render/shared.ts            | 6 +++++-
 .../src/render/web_animations/web_animations_driver.ts      | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/animations/browser/src/render/shared.ts b/packages/animations/browser/src/render/shared.ts
index 7836992d17..7cb2f7a033 100644
--- a/packages/animations/browser/src/render/shared.ts
+++ b/packages/animations/browser/src/render/shared.ts
@@ -10,6 +10,10 @@ import {AUTO_STYLE, AnimationEvent, AnimationPlayer, NoopAnimationPlayer, ɵAnim
 import {AnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer';
 import {AnimationDriver} from '../../src/render/animation_driver';
 
+export function isBrowser() {
+  return (typeof window !== 'undefined' && typeof window.document !== 'undefined');
+}
+
 export function optimizeGroupPlayer(players: AnimationPlayer[]): AnimationPlayer {
   switch (players.length) {
     case 0:
@@ -138,7 +142,7 @@ let _query: (element: any, selector: string, multi: boolean) => any[] =
       return [];
     };
 
-if (typeof Element != 'undefined') {
+if (isBrowser()) {
   // this is well supported in all browsers
   _contains = (elm1: any, elm2: any) => { return elm1.contains(elm2) as boolean; };
 
diff --git a/packages/animations/browser/src/render/web_animations/web_animations_driver.ts b/packages/animations/browser/src/render/web_animations/web_animations_driver.ts
index f4063ddf9a..2d2e81c2f9 100644
--- a/packages/animations/browser/src/render/web_animations/web_animations_driver.ts
+++ b/packages/animations/browser/src/render/web_animations/web_animations_driver.ts
@@ -10,7 +10,7 @@ import {AnimationPlayer, ɵStyleData} from '@angular/animations';
 import {allowPreviousPlayerStylesMerge, balancePreviousStylesIntoKeyframes, copyStyles} from '../../util';
 import {AnimationDriver} from '../animation_driver';
 import {CssKeyframesDriver} from '../css_keyframes/css_keyframes_driver';
-import {containsElement, invokeQuery, matchesElement, validateStyleProperty} from '../shared';
+import {containsElement, invokeQuery, isBrowser, matchesElement, validateStyleProperty} from '../shared';
 
 import {WebAnimationsPlayer} from './web_animations_player';
 
@@ -75,5 +75,5 @@ export function supportsWebAnimations() {
 }
 
 function getElementAnimateFn(): any {
-  return (typeof Element !== 'undefined' && (<any>Element).prototype['animate']) || {};
+  return (isBrowser() && (<any>Element).prototype['animate']) || {};
 }

From e79b845a45466ec589776068226498cf204ab115 Mon Sep 17 00:00:00 2001
From: Alec <alec.assaad@gmail.com>
Date: Tue, 20 Mar 2018 11:28:11 -0400
Subject: [PATCH 148/582] docs(ivy): fix typo in STATUS.md

---
 packages/core/src/render3/STATUS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 3f492db4f0..2468ba56be 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -186,7 +186,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `@Query(read)`                  |  ✅     |  ✅      |  n/a      |
 | `@Query(selector)`              |  ✅     |  ✅      |  n/a      |
 | `@Query(Type)`                  |  ✅     |  ✅      |  n/a      |
-| `@ContentChildred`              |  ✅     |  ✅      |  ❌       |
+| `@ContentChildren`              |  ✅     |  ✅      |  ❌       |
 | `@ContentChild`                 |  ✅     |  ✅      |  ✅       |
 | `@ViewChildren`                 |  ✅     |  ✅      |  ❌       |
 | `@ViewChild`                    |  ✅     |  ✅      |  ✅       |
@@ -278,4 +278,4 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `removeStyle()`                     |  ✅     |
 | `setProperty()`                     |  ✅     |
 | `setValue()`                        |  ✅     |
-| `listen()`                          |  ✅     |
\ No newline at end of file
+| `listen()`                          |  ✅     |

From 3b9c5c849cd80f4fcdac25aedff59cd0b0b43d4c Mon Sep 17 00:00:00 2001
From: seklyza <seklyza@users.noreply.github.com>
Date: Tue, 30 Jan 2018 18:23:35 +0200
Subject: [PATCH 149/582] docs: fix WebStorm name (#24210)

closes #21900

PR Close #24210
---
 aio/content/marketing/resources.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index eac77391b0..25403598f6 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -160,7 +160,7 @@
             "desc": "Lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js",
             "logo": "",
             "rev": true,
-            "title": "Webstorm",
+            "title": "WebStorm",
             "url": "https://www.jetbrains.com/webstorm/"
           },
           "ab3": {

From 4247176b6edad016ee79cfef5b3575a1621ad6fc Mon Sep 17 00:00:00 2001
From: Vani <psreep@gmail.com>
Date: Fri, 6 Apr 2018 10:47:38 -0700
Subject: [PATCH 150/582] docs: fix typo if FAQ section (#24210)

closes #22360

PR Close #24210
---
 aio/content/guide/testing.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index 1efa71d480..9dfc7f8e35 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -3378,11 +3378,11 @@ next to their corresponding helper files.
 {@a q-e2e}
 #### Why not rely on E2E tests of DOM integration?
 
-The component DOM tests describe in this guide often require extensive setup and 
-advanced techniques where as the [class-only test](#component-class-testing)
-were comparatively simple.
+The component DOM tests described in this guide often require extensive setup and 
+advanced techniques whereas the [unit tests](#component-class-testing)
+are comparatively simple.
 
-Why not defer DOM integration tests to end-to-end (E2E) testing?
+#### Why not defer DOM integration tests to end-to-end (E2E) testing?
 
 E2E tests are great for high-level validation of the entire system.
 But they can't give you the comprehensive test coverage that you'd expect from unit tests.

From 9d364203a6faf94a1ccbeef1378df15cb9a9d7f8 Mon Sep 17 00:00:00 2001
From: Adam <admosity@users.noreply.github.com>
Date: Mon, 26 Feb 2018 12:58:00 -0500
Subject: [PATCH 151/582] refactor(animations): fix typo (#24210)

closes #22459

PR Close #24210
---
 packages/animations/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/animations/package.json b/packages/animations/package.json
index 8cadce486f..71b6559dad 100644
--- a/packages/animations/package.json
+++ b/packages/animations/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/animations",
   "version": "0.0.0-PLACEHOLDER",
-  "description": "Angular - animations integration with web-animationss",
+  "description": "Angular - animations integration with web-animations",
   "main": "./bundles/animations.umd.js",
   "module": "./fesm5/animations.js",
   "es2015": "./fesm2015/animations.js",

From 9add50129d14d21d940ab830699f9598f490d006 Mon Sep 17 00:00:00 2001
From: Aditya Bhardwaj <aditya2204@gmail.com>
Date: Mon, 14 May 2018 14:54:39 +0530
Subject: [PATCH 152/582] docs: fix typo (#24210)

closes #23891

PR Close #24210
---
 aio/content/guide/testing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index 9dfc7f8e35..a8e87ecdf9 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -346,7 +346,7 @@ It appears within the template of a parent component,
 which binds a _hero_ to the `@Input` property and
 listens for an event raised through the _selected_ `@Output` property.
 
-You can test that the class code works without creating the the `DashboardHeroComponent`
+You can test that the class code works without creating the `DashboardHeroComponent`
 or its parent component.
 
 <code-example 

From b86d4dee4d7aadd5cfd47b2830eb1608276a7843 Mon Sep 17 00:00:00 2001
From: Johnson Lin <konglong_1984@msn.com>
Date: Thu, 24 May 2018 16:02:47 +1000
Subject: [PATCH 153/582] docs(forms): fix API doc (#24210)

closes #24090

PR Close #24210
---
 packages/forms/src/model.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index 71da5b6873..ffaa339d99 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -363,7 +363,7 @@ export abstract class AbstractControl {
    *
    * An event will be emitted by `statusChanges` by default.
    *
-   * Passing `false` for `emitEvent` will cause `statusChanges` to not event an event.
+   * Passing `false` for `emitEvent` will cause `statusChanges` to not emit an event.
    */
   markAsPending(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = PENDING;

From 5d6074eaffc184e7ac51c239be344c99f7ccbca1 Mon Sep 17 00:00:00 2001
From: alberto <alberto.rdrz@gmail.com>
Date: Wed, 30 May 2018 07:33:25 +0200
Subject: [PATCH 154/582] docs: fix typo (#24210)

closes #24191

PR Close #24210
---
 aio/content/guide/releases.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/releases.md b/aio/content/guide/releases.md
index f7a8c4ae63..532cc72320 100644
--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@@ -142,7 +142,7 @@ To make these transitions as easy as possible, we make two commitments to you:
 
 To help ensure that you have sufficient time and a clear path to update, this is our deprecation policy:
 
-* When announce deprecated features in the [change log](https://github.com/angular/angular/blob/master/CHANGELOG.md "Angular change log").
+* We announce deprecated features in the [change log](https://github.com/angular/angular/blob/master/CHANGELOG.md "Angular change log").
 
 * When we announce a deprecation, we also announce a recommended update path.
 

From 4ab70fb93d957f1b47cf5b44cfb5cca2aed4fc91 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 14 May 2018 16:16:42 +0200
Subject: [PATCH 155/582] style(compiler-cli): fix typo error (#23897) PR Close
 #23897

---
 packages/compiler-cli/src/transformers/api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/transformers/api.ts b/packages/compiler-cli/src/transformers/api.ts
index b37033443d..afa15cf20b 100644
--- a/packages/compiler-cli/src/transformers/api.ts
+++ b/packages/compiler-cli/src/transformers/api.ts
@@ -320,7 +320,7 @@ export interface Program {
    * and CSS.
    *
    * Note it is important to displaying TypeScript semantic diagnostics along with Angular
-   * structural diagnostics as an error in the program strucutre might cause errors detected in
+   * structural diagnostics as an error in the program structure might cause errors detected in
    * semantic analysis and a semantic error might cause errors in specifying the program structure.
    *
    * Angular structural information is required to produce these diagnostics.

From 49d5de68f64e89de0947b77b07d8b04abd81cb07 Mon Sep 17 00:00:00 2001
From: Kim Maida <kim.maida@auth0.com>
Date: Wed, 9 May 2018 10:37:04 -0400
Subject: [PATCH 156/582] docs(aio): Add GDE Kim Maida to contributors

---
 aio/content/images/bios/kimmaida.jpg    | Bin 0 -> 77875 bytes
 aio/content/marketing/contributors.json |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 aio/content/images/bios/kimmaida.jpg

diff --git a/aio/content/images/bios/kimmaida.jpg b/aio/content/images/bios/kimmaida.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..735240bc9a883971a0c9817a7ed7589f99b30b86
GIT binary patch
literal 77875
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
b=$S#8QC$4sC2fmvMftuh^NUmrcEA7GdgUw#

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 25dda612b1..d1a4d2bbb1 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -636,5 +636,14 @@
     "website": "http://imars.info/",
     "bio": "Mashhood is the principal technical consultant at Recurship and a Google Developer Expert. He  works with different startups in US and EU to helps them crawl through the technical maze and quickly build amazing products focused around the problems they are trying to solve. He specializes in using the latest web technologies available to execute the best possible solutions.",
     "group": "GDE"
+  },
+
+  "kimmaida": {
+    "name": "Kim Maida",
+    "picture": "kimmaida.jpg",
+    "twitter": "KimMaida",
+    "website": "https://kmaida.io/",
+    "bio": "Kim is an an Angular consultant, developer, speaker, writer, and Google Developer Expert. She is passionate about learning from and sharing knowledge with other developers through blogging, speaking, workshops, and open source.",
+    "group": "GDE"
   }
 }

From 3647cb7f3b641b62e0481b4680707dd492297fb3 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 31 May 2018 09:26:16 -0700
Subject: [PATCH 157/582] build: sync g3 exclude list from copybara to ngbot
 (#24224) PR Close #24224

---
 .github/angular-robot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index fcc1653164..471cba19d1 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -45,10 +45,12 @@ merge:
       - "packages/language-service/**"
       - "**/.gitignore"
       - "**/.gitkeep"
+      - "**/package.json"
       - "**/tsconfig-build.json"
       - "**/tsconfig.json"
       - "**/rollup.config.js"
       - "**/BUILD.bazel"
+      - "packages/**/integrationtest/**"
       - "packages/**/test/**"
 
   # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable

From ec57133b612c55e3c45127324fc30308713c9f2d Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 30 May 2018 18:15:38 -0700
Subject: [PATCH 158/582] build: update to rules_nodejs 0.9.1 and
 rules_typescript 0.15.0 (#24212)

PR Close #24212
---
 .circleci/config.yml        |   4 +-
 BUILD.bazel                 |   2 +-
 WORKSPACE                   |  12 +-
 docs/BAZEL.md               |   2 +-
 integration/bazel/WORKSPACE |  19 +-
 integration/bazel/yarn.lock | 616 +++++++++++-------------------------
 packages/bazel/package.json |   2 +-
 7 files changed, 216 insertions(+), 441 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4aabb53b68..7893208e54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ jobs:
 
       - run: ls /home/circleci/bazel_repository_cache || true
       - run: bazel info release
-      - run: bazel run @yarn//:yarn
+      - run: bazel run @nodejs//:yarn
       # Use bazel query so that we explicitly ask for all buildable targets to be built as well
       # This avoids waiting for the slowest build target to finish before running the first test
       # See https://github.com/bazelbuild/bazel/issues/4257
@@ -131,7 +131,7 @@ jobs:
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
       - *setup-bazel-remote-cache
 
-      - run: bazel run @yarn//:yarn
+      - run: bazel run @nodejs//:yarn
       - run: scripts/build-packages-dist.sh
 
       # Save the npm packages from //packages/... for other workflow jobs to read
diff --git a/BUILD.bazel b/BUILD.bazel
index a6187e772e..d92e4a43a6 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -11,7 +11,7 @@ exports_files([
 # This ensures that package.json in subdirectories get installed as well.
 alias(
     name = "install",
-    actual = "@yarn//:yarn",
+    actual = "@nodejs//:yarn",
 )
 
 node_modules_filegroup(
diff --git a/WORKSPACE b/WORKSPACE
index 579ba2935c..873e9e9b8f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -6,9 +6,9 @@ workspace(name = "angular")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip",
-    strip_prefix = "rules_nodejs-0.8.0",
-    sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
+    strip_prefix = "rules_nodejs-0.9.1",
+    sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
 )
 
 http_archive(
@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/3b86d6d46269fb52d4c6f1416868869e847feac2.zip",
-    strip_prefix = "rules_typescript-3b86d6d46269fb52d4c6f1416868869e847feac2",
-    sha256 = "f67e5fbe4a2b34b3ead9fe56f22b713540c23b501bd24d661d3fb047071dc2c1",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
+    strip_prefix = "rules_typescript-0.15.0",
+    sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
 )
 
 http_archive(
diff --git a/docs/BAZEL.md b/docs/BAZEL.md
index 425fe17837..db4872ea53 100644
--- a/docs/BAZEL.md
+++ b/docs/BAZEL.md
@@ -37,7 +37,7 @@ That repository defines dependencies on specific versions of
 all the tools. You can run the tools Bazel installed, for
 example rather than `yarn install` (which depends on whatever
 version you have installed on your machine), you can
-`bazel run @yarn//:yarn`.
+`bazel run @nodejs//:yarn`.
 
 Bazel accepts a lot of options. We check in some options in the
 `.bazelrc` file. See the [bazelrc doc]. For example, if you don't
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index e91d724fa3..92a288f2b5 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -2,17 +2,26 @@ workspace(name = "bazel_integration_test")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip",
-    strip_prefix = "rules_nodejs-0.8.0",
-    sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
+    strip_prefix = "rules_nodejs-0.9.1",
+    sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
 node_repositories(package_json = ["//:package.json"])
 
-local_repository(
+http_archive(
+    name = "io_bazel_rules_webtesting",
+    url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
+    strip_prefix = "rules_webtesting-0.2.0",
+    sha256 = "cecc12f07e95740750a40d38e8b14b76fefa1551bef9332cb432d564d693723c",
+)
+
+http_archive(
     name = "build_bazel_rules_typescript",
-    path = "node_modules/@bazel/typescript",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
+    strip_prefix = "rules_typescript-0.15.0",
+    sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
 )
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index 4f1084e706..68eaa80d43 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -3,26 +3,25 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/bazel@file:../../dist/packages-dist/bazel":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
-    "@bazel/typescript" "^0.11.1"
     "@types/node" "6.0.84"
     "@types/shelljs" "0.7.7"
     protobufjs "5.0.0"
     shelljs "0.7.8"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
@@ -30,27 +29,23 @@
     tsickle "^0.27.2"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "6.0.0-beta.7-8203e0365a"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
-"@bazel/typescript@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.11.1.tgz#54409d6ed1f43e71fce047fb4e229f9cc8a5ff68"
-
 "@types/events@*":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
 
 "@types/glob@*":
   version "5.0.35"
@@ -65,8 +60,8 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
 
 "@types/node@*":
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
+  version "10.1.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.4.tgz#606651d3f8a8bec08b8cb262161aab9209f4a29d"
 
 "@types/node@6.0.84":
   version "6.0.84"
@@ -87,17 +82,14 @@ abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -110,8 +102,8 @@ aproba@^1.0.3:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
 are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -137,63 +129,21 @@ ascli@~1:
     colour "~0.7.1"
     optjs "~3.2.2"
 
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
 brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -206,6 +156,10 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+buffer-from@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
+
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
@@ -216,10 +170,6 @@ camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
 chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -235,6 +185,10 @@ chokidar@^1.4.2:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
 cliui@^3.0.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -243,10 +197,6 @@ cliui@^3.0.3:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -255,12 +205,6 @@ colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -269,23 +213,11 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@^2.2.0:
+debug@^2.1.2:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -295,13 +227,9 @@ decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
 delegates@^1.0.0:
   version "1.0.0"
@@ -311,12 +239,6 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -329,35 +251,23 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-extend@~3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -371,45 +281,22 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
   dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
+    minipass "^2.2.1"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
 
 gauge@~2.7.3:
   version "2.7.4"
@@ -424,12 +311,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -468,41 +349,21 @@ graceful-fs@^4.1.2:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
-hawk@3.1.3, hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
+    safer-buffer ">= 2.1.2 < 3"
 
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
   dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    minimatch "^3.0.4"
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -511,7 +372,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -561,6 +422,10 @@ is-fullwidth-code-point@^1.0.0:
   dependencies:
     number-is-nan "^1.0.0"
 
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -573,11 +438,9 @@ is-number@^2.1.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  dependencies:
-    kind-of "^3.0.2"
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
@@ -587,10 +450,6 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -601,52 +460,15 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  dependencies:
-    is-buffer "^1.1.5"
+kind-of@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
 lcid@^1.0.0:
   version "1.0.0"
@@ -658,6 +480,10 @@ long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+
 micromatch@^2.1.5:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -676,17 +502,7 @@ micromatch@^2.1.5:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -700,7 +516,20 @@ minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.1:
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -710,25 +539,32 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-nan@^2.3.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
   dependencies:
     detect-libc "^1.0.2"
-    hawk "3.1.3"
     mkdirp "^0.5.1"
+    needle "^2.2.0"
     nopt "^4.0.1"
+    npm-packlist "^1.1.6"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
+    tar "^4"
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -743,6 +579,17 @@ normalize-path@^2.0.0, normalize-path@^2.0.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -756,10 +603,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
 object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -771,7 +614,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-once@^1.3.0, once@^1.3.3:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -796,8 +639,8 @@ os-tmpdir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -819,17 +662,13 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
 protobufjs@5.0.0:
   version "5.0.0"
@@ -840,40 +679,33 @@ protobufjs@5.0.0:
     glob "^5.0.10"
     yargs "^3.10.0"
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 rc@^1.1.7:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+readable-stream@^2.0.2, readable-stream@^2.0.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
     isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
+    process-nextick-args "~2.0.0"
     safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
+    string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
 readdirp@^2.0.0:
@@ -892,8 +724,8 @@ rechoir@^0.6.2:
     resolve "^1.1.6"
 
 reflect-metadata@^0.1.2:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
 
 regex-cache@^0.4.2:
   version "0.4.4"
@@ -913,57 +745,38 @@ repeat-string@^1.5.2:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
 resolve@^1.1.6:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
-rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
+rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
 "rxjs@file:../../node_modules/rxjs":
-  version "6.0.0-alpha.4"
+  version "6.0.0"
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
 semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
 set-blocking@~2.0.0:
   version "2.0.0"
@@ -985,37 +798,18 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
 source-map-support@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
   dependencies:
+    buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
@@ -1023,56 +817,50 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+"string-width@^1.0.2 || 2":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.4:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
+tar@^4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
   dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-tough-cookie@~2.3.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  dependencies:
-    punycode "^1.4.1"
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
 
 tsickle@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
+  version "0.27.5"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.5.tgz#41e1a41a5acf971cbb2b0558a9590779234d591f"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -1080,47 +868,21 @@ tsickle@^0.27.2:
     source-map-support "^0.5.0"
 
 tslib@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
 
 "typescript@file:../../node_modules/typescript":
-  version "2.7.2"
-
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+  version "2.8.3"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-uuid@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   dependencies:
-    string-width "^1.0.2"
+    string-width "^1.0.2 || 2"
 
 window-size@^0.1.4:
   version "0.1.4"
@@ -1141,6 +903,10 @@ y18n@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yargs@^3.10.0:
   version "3.32.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
@@ -1154,4 +920,4 @@ yargs@^3.10.0:
     y18n "^3.2.0"
 
 "zone.js@file:../../node_modules/zone.js":
-  version "0.8.20"
+  version "0.8.26"
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index 820bddaf98..2b6744cadf 100644
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@@ -5,7 +5,7 @@
   "author": "angular",
   "license": "MIT",
   "dependencies": {
-    "@bazel/typescript": "^0.11.1",
+    "@bazel/typescript": "^0.15.0",
     "@types/node": "6.0.84",
     "@types/shelljs": "0.7.7",
     "shelljs": "0.7.8",

From 6a663a407379edd61fe3ed362d5f4f8a32d7c04e Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Wed, 30 May 2018 21:34:09 -0700
Subject: [PATCH 159/582] fix(platform-server): don't reflect innerHTML
 property to attibute (#24213)

Fixes #19278.

innerHTML is conservatively marked as an attribute for security purpose so that it's sanitized when set. However this same mapping is used by the server renderer to decide whether the `innerHTML` property needs to be reflected to the `innerhtml` attribute. The fix is to just skip the property to attribute reflection for `innerHTML`.

PR Close #24213
---
 packages/platform-server/src/server_renderer.ts   | 4 +++-
 packages/platform-server/test/integration_spec.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/platform-server/src/server_renderer.ts b/packages/platform-server/src/server_renderer.ts
index 6b8d1dfc34..9cd29cfa6a 100644
--- a/packages/platform-server/src/server_renderer.ts
+++ b/packages/platform-server/src/server_renderer.ts
@@ -154,9 +154,11 @@ class DefaultServerRenderer2 implements Renderer2 {
     checkNoSyntheticProp(name, 'property');
     getDOM().setProperty(el, name, value);
     // Mirror property values for known HTML element properties in the attributes.
+    // Skip `innerhtml` which is conservatively marked as an attribute for security
+    // purposes but is not actually an attribute.
     const tagName = (el.tagName as string).toLowerCase();
     if (value != null && (typeof value === 'number' || typeof value == 'string') &&
-        this.schema.hasElement(tagName, EMPTY_ARRAY) &&
+        name.toLowerCase() !== 'innerhtml' && this.schema.hasElement(tagName, EMPTY_ARRAY) &&
         this.schema.hasProperty(tagName, name, EMPTY_ARRAY) &&
         this._isSafeToReflectProperty(tagName, name)) {
       this.setAttribute(el, name, value.toString());
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 435f2a5765..11c836bfe3 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -587,7 +587,7 @@ class EscapedTransferStoreModule {
            renderModule(HTMLTypesModule, {document: doc}).then(output => {
              expect(output).toBe(
                  '<html><head></head><body><app ng-version="0.0.0-PLACEHOLDER">' +
-                 '<div innerhtml="<b>foo</b> bar"><b>foo</b> bar</div></app></body></html>');
+                 '<div><b>foo</b> bar</div></app></body></html>');
              called = true;
            });
          }));

From 7e3f8f77a91e20c0554bdb9c65c8b115f51ecdd9 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 30 May 2018 13:43:14 -0700
Subject: [PATCH 160/582] refactor(ivy): replace LView.child with
 TView.childIndex lookup (#24211)

PR Close #24211
---
 packages/core/src/render3/di.ts               |  2 +-
 packages/core/src/render3/instructions.ts     | 30 ++++++++++++-------
 packages/core/src/render3/interfaces/view.ts  | 25 ++++++++--------
 .../core/src/render3/node_manipulation.ts     | 19 ++++++++----
 .../hello_world/bundle.golden_symbols.json    |  3 ++
 .../bundling/todo/bundle.golden_symbols.json  |  3 ++
 6 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 450fe9afcd..a37b93bca8 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -590,7 +590,7 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
     lContainerNode.tNode = hostTNode.dynamicContainerNode;
     vcRefHost.dynamicLContainerNode = lContainerNode;
 
-    addToViewTree(vcRefHost.view, lContainer);
+    addToViewTree(vcRefHost.view, hostTNode.index as number, lContainer);
 
     di.viewContainerRef = new ViewContainerRef(lContainerNode);
   }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 523c605a68..cc6659c7e6 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -17,7 +17,7 @@ import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TDat
 
 import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
-import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode} from './node_manipulation';
+import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
@@ -314,7 +314,6 @@ export function createLView<T>(
     tView: tView,
     cleanup: null,
     renderer: renderer,
-    child: null,
     tail: null,
     next: null,
     bindingStartIndex: -1,
@@ -802,6 +801,7 @@ export function createTView(
   return {
     node: null !,
     data: [],
+    childIndex: -1,  // Children set in addToViewTree(), if any
     directives: null,
     firstTemplatePass: true,
     initHooks: null,
@@ -1329,11 +1329,12 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
   // Only component views should be added to the view tree directly. Embedded views are
   // accessed through their containers because they may be removed / re-added later.
   const hostView = addToViewTree(
-      currentView, createLView(
-                       -1, rendererFactory.createRenderer(
-                               previousOrParentNode.native as RElement, def.rendererType),
-                       tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
-                       getCurrentSanitizer()));
+      currentView, previousOrParentNode.tNode.index as number,
+      createLView(
+          -1,
+          rendererFactory.createRenderer(previousOrParentNode.native as RElement, def.rendererType),
+          tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
+          getCurrentSanitizer()));
 
   // We need to set the host node/data here because when the component LNode was created,
   // we didn't yet know it was a component (just an element).
@@ -1512,7 +1513,7 @@ export function container(
 
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
-  addToViewTree(currentView, node.data);
+  addToViewTree(currentView, index, node.data);
   createDirectivesAndLocals(localRefs);
 
   isParent = false;
@@ -1574,7 +1575,7 @@ export function containerRefreshEnd(): void {
 }
 
 function refreshDynamicChildren() {
-  for (let current = currentView.child; current !== null; current = current.next) {
+  for (let current = getLViewChild(currentView); current !== null; current = current.next) {
     // Note: current can be a LView or a LContainer, but here we are only interested in LContainer.
     // The distinction is made because nextIndex and views do not exist on LView.
     if (isLContainer(current)) {
@@ -1921,11 +1922,18 @@ function findComponentHost(lView: LView): LElementNode {
  * and call onDestroy callbacks.
  *
  * @param currentView The view where LView or LContainer should be added
+ * @param hostIndex Index of the view's host node in data[]
  * @param state The LView or LContainer to add to the view tree
  * @returns The state passed in
  */
-export function addToViewTree<T extends LView|LContainer>(currentView: LView, state: T): T {
-  currentView.tail ? (currentView.tail.next = state) : (currentView.child = state);
+export function addToViewTree<T extends LView|LContainer>(
+    currentView: LView, hostIndex: number, state: T): T {
+  // TODO(kara): move next and tail properties off of LView
+  if (currentView.tail) {
+    currentView.tail.next = state;
+  } else if (firstTemplatePass) {
+    currentView.tView.childIndex = hostIndex;
+  }
   currentView.tail = state;
   return state;
 }
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index a234389f4a..b7c0c3819a 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -112,17 +112,6 @@ export interface LView {
    */
   lifecycleStage: LifecycleStage;
 
-  /**
-   * The first LView or LContainer beneath this LView in the hierarchy.
-   *
-   * Necessary to store this so views can traverse through their nested views
-   * to remove listeners and call onDestroy callbacks.
-   *
-   * For embedded views, we store the LContainer rather than the first ViewState
-   * to avoid managing splicing when views are added/removed.
-   */
-  child: LView|LContainer|null;
-
   /**
    * The last LView or LContainer beneath this LView in the hierarchy.
    *
@@ -222,8 +211,8 @@ export const enum LViewFlags {
 /** Interface necessary to work with view tree traversal */
 export interface LViewOrLContainer {
   next: LView|LContainer|null;
-  child?: LView|LContainer|null;
   views?: LViewNode[];
+  tView?: TView;
   parent: LView|null;
 }
 
@@ -251,6 +240,18 @@ export interface TView {
   /** Static data equivalent of LView.data[]. Contains TNodes. */
   data: TData;
 
+  /**
+   * Index of the host node of the first LView or LContainer beneath this LView in
+   * the hierarchy.
+   *
+   * Necessary to store this so views can traverse through their nested views
+   * to remove listeners and call onDestroy callbacks.
+   *
+   * For embedded views, we store the index of an LContainer's host rather than the first
+   * LView to avoid managing splicing when views are added/removed.
+   */
+  childIndex: number;
+
   /**
    * Selector matches for a node are temporarily cached on the TView so the
    * DI system can eagerly instantiate directives on the same node if they are
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 95633efbea..31f6df401a 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -261,19 +261,19 @@ export function addRemoveViewFromContainer(
  *  @param rootView The view to destroy
  */
 export function destroyViewTree(rootView: LView): void {
-  // A view to cleanup doesn't have children so we should not try to descend down the view tree.
-  if (!rootView.child) {
+  // If the view has no children, we can clean it up and return early.
+  if (rootView.tView.childIndex === -1) {
     return cleanUpView(rootView);
   }
-  let viewOrContainer: LViewOrLContainer|null = rootView.child;
+  let viewOrContainer: LViewOrLContainer|null = getLViewChild(rootView);
 
   while (viewOrContainer) {
     let next: LViewOrLContainer|null = null;
 
     if (viewOrContainer.views && viewOrContainer.views.length) {
       next = viewOrContainer.views[0].data;
-    } else if (viewOrContainer.child) {
-      next = viewOrContainer.child;
+    } else if (viewOrContainer.tView && viewOrContainer.tView.childIndex > -1) {
+      next = getLViewChild(viewOrContainer as LView);
     } else if (viewOrContainer.next) {
       // Only move to the side and clean if operating below rootView -
       // otherwise we would start cleaning up sibling views of the rootView.
@@ -383,6 +383,15 @@ export function removeView(container: LContainerNode, removeIndex: number): LVie
   return viewNode;
 }
 
+/** Gets the child of the given LView */
+export function getLViewChild(view: LView): LView|LContainer|null {
+  if (view.tView.childIndex === -1) return null;
+
+  const hostNode: LElementNode|LContainerNode = view.data[view.tView.childIndex];
+
+  return hostNode.data ? hostNode.data : (hostNode.dynamicLContainerNode as LContainerNode).data;
+}
+
 /**
  * Determines which LViewOrLContainer to jump to when traversing back up the
  * tree in destroyViewTree.
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 77abaff7ae..df06f6a31f 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -107,6 +107,9 @@
   {
     "name": "getDirectiveInstance"
   },
+  {
+    "name": "getLViewChild"
+  },
   {
     "name": "getOrCreateTView"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 6b487a0142..fccb3b48e3 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -389,6 +389,9 @@
   {
     "name": "getDirectiveInstance"
   },
+  {
+    "name": "getLViewChild"
+  },
   {
     "name": "getNextLNode"
   },

From a5c47d0045bf9a7f35cfb3c877ecbae16b67eeba Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 27 May 2018 14:19:58 +0200
Subject: [PATCH 161/582] fix(ivy): determine value of SimpleChange.firstChange
 per property (#24152)

PR Close #24152
---
 packages/core/src/render3/definition.ts   | 33 +++++-----
 packages/core/test/render3/define_spec.ts | 79 +++++++++++++++++++++--
 2 files changed, 89 insertions(+), 23 deletions(-)

diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index dbe6f53663..d17049868d 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -253,32 +253,33 @@ export function NgOnChangesFeature(inputPropertyNames?: {[key: string]: string})
   return function(definition: DirectiveDef<any>): void {
     const inputs = definition.inputs;
     const proto = definition.type.prototype;
-    // Place where we will store SimpleChanges if there is a change
-    Object.defineProperty(proto, PRIVATE_PREFIX, {value: undefined, writable: true});
     for (let pubKey in inputs) {
       const minKey = inputs[pubKey];
       const propertyName = inputPropertyNames && inputPropertyNames[minKey] || pubKey;
       const privateMinKey = PRIVATE_PREFIX + minKey;
-      // Create a place where the actual value will be stored and make it non-enumerable
-      Object.defineProperty(proto, privateMinKey, {value: undefined, writable: true});
-
-      const existingDesc = Object.getOwnPropertyDescriptor(proto, minKey);
-
+      const originalProperty = Object.getOwnPropertyDescriptor(proto, minKey);
+      const getter = originalProperty && originalProperty.get;
+      const setter = originalProperty && originalProperty.set;
       // create a getter and setter for property
       Object.defineProperty(proto, minKey, {
-        get: function(this: OnChangesExpando) {
-          return (existingDesc && existingDesc.get) ? existingDesc.get.call(this) :
-                                                      this[privateMinKey];
-        },
+        get: getter ||
+            (setter ? undefined : function(this: OnChangesExpando) { return this[privateMinKey]; }),
         set: function(this: OnChangesExpando, value: any) {
           let simpleChanges = this[PRIVATE_PREFIX];
-          let isFirstChange = simpleChanges === undefined;
-          if (simpleChanges == null) {
-            simpleChanges = this[PRIVATE_PREFIX] = {};
+          if (!simpleChanges) {
+            // Place where we will store SimpleChanges if there is a change
+            Object.defineProperty(
+                this, PRIVATE_PREFIX, {value: simpleChanges = {}, writable: true});
           }
+          const isFirstChange = !this.hasOwnProperty(privateMinKey);
           simpleChanges[propertyName] = new SimpleChange(this[privateMinKey], value, isFirstChange);
-          (existingDesc && existingDesc.set) ? existingDesc.set.call(this, value) :
-                                               this[privateMinKey] = value;
+          if (isFirstChange) {
+            // Create a place where the actual value will be stored and make it non-enumerable
+            Object.defineProperty(this, privateMinKey, {value, writable: true});
+          } else {
+            this[privateMinKey] = value;
+          }
+          setter && setter.call(this, value);
         }
       });
     }
diff --git a/packages/core/test/render3/define_spec.ts b/packages/core/test/render3/define_spec.ts
index 7e03c7460d..2253dba899 100644
--- a/packages/core/test/render3/define_spec.ts
+++ b/packages/core/test/render3/define_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {DoCheck, OnChanges, SimpleChanges} from '../../src/core';
+import {DoCheck, OnChanges, SimpleChange, SimpleChanges} from '../../src/core';
 import {DirectiveDef, NgOnChangesFeature, defineDirective} from '../../src/render3/index';
 
 describe('define', () => {
@@ -14,7 +14,7 @@ describe('define', () => {
     describe('NgOnChangesFeature', () => {
       it('should patch class', () => {
         class MyDirective implements OnChanges, DoCheck {
-          public log: string[] = [];
+          public log: Array<string|SimpleChange> = [];
           public valA: string = 'initValue';
           public set valB(value: string) { this.log.push(value); }
 
@@ -23,8 +23,8 @@ describe('define', () => {
           ngDoCheck(): void { this.log.push('ngDoCheck'); }
           ngOnChanges(changes: SimpleChanges): void {
             this.log.push('ngOnChanges');
-            this.log.push('valA', changes['valA'].previousValue, changes['valA'].currentValue);
-            this.log.push('valB', changes['valB'].previousValue, changes['valB'].currentValue);
+            this.log.push('valA', changes['valA']);
+            this.log.push('valB', changes['valB']);
           }
 
           static ngDirectiveDef = defineDirective({
@@ -45,9 +45,74 @@ describe('define', () => {
         expect(myDir.valB).toEqual('works');
         myDir.log.length = 0;
         (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
-        expect(myDir.log).toEqual([
-          'ngOnChanges', 'valA', 'initValue', 'first', 'valB', undefined, 'second', 'ngDoCheck'
-        ]);
+        const changeA = new SimpleChange('initValue', 'first', false);
+        const changeB = new SimpleChange(undefined, 'second', true);
+        expect(myDir.log).toEqual(['ngOnChanges', 'valA', changeA, 'valB', changeB, 'ngDoCheck']);
+      });
+
+      it('correctly computes firstChange', () => {
+        class MyDirective implements OnChanges {
+          public log: Array<string|SimpleChange> = [];
+          public valA: string = 'initValue';
+          public valB: string;
+
+          ngOnChanges(changes: SimpleChanges): void {
+            this.log.push('valA', changes['valA']);
+            this.log.push('valB', changes['valB']);
+          }
+
+          static ngDirectiveDef = defineDirective({
+            type: MyDirective,
+            selectors: [['', 'myDir', '']],
+            factory: () => new MyDirective(),
+            features: [NgOnChangesFeature()],
+            inputs: {valA: 'valA', valB: 'valB'}
+          });
+        }
+
+        const myDir =
+            (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).factory() as MyDirective;
+        myDir.valA = 'first';
+        myDir.valB = 'second';
+        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        const changeA1 = new SimpleChange('initValue', 'first', false);
+        const changeB1 = new SimpleChange(undefined, 'second', true);
+        expect(myDir.log).toEqual(['valA', changeA1, 'valB', changeB1]);
+
+        myDir.log.length = 0;
+        myDir.valA = 'third';
+        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        const changeA2 = new SimpleChange('first', 'third', false);
+        expect(myDir.log).toEqual(['valA', changeA2, 'valB', undefined]);
+      });
+
+      it('should not create a getter when only a setter is originally defined', () => {
+        class MyDirective implements OnChanges {
+          public log: Array<string|SimpleChange> = [];
+
+          public set onlySetter(value: string) { this.log.push(value); }
+
+          ngOnChanges(changes: SimpleChanges): void {
+            this.log.push('ngOnChanges');
+            this.log.push('onlySetter', changes['onlySetter']);
+          }
+
+          static ngDirectiveDef = defineDirective({
+            type: MyDirective,
+            selectors: [['', 'myDir', '']],
+            factory: () => new MyDirective(),
+            features: [NgOnChangesFeature()],
+            inputs: {onlySetter: 'onlySetter'}
+          });
+        }
+
+        const myDir =
+            (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).factory() as MyDirective;
+        myDir.onlySetter = 'someValue';
+        expect(myDir.onlySetter).toBeUndefined();
+        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        const changeSetter = new SimpleChange(undefined, 'someValue', true);
+        expect(myDir.log).toEqual(['someValue', 'ngOnChanges', 'onlySetter', changeSetter]);
       });
     });
   });

From 2d9111bfb698aa1e418cbd73b33e3ef73209084e Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 27 May 2018 15:26:41 +0200
Subject: [PATCH 162/582] fix(ivy): account for multiple changes between change
 detection runs (#24152)

PR Close #24152
---
 packages/core/src/render3/definition.ts   | 8 +++++++-
 packages/core/test/render3/define_spec.ts | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index d17049868d..e39abdb9b7 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -272,7 +272,13 @@ export function NgOnChangesFeature(inputPropertyNames?: {[key: string]: string})
                 this, PRIVATE_PREFIX, {value: simpleChanges = {}, writable: true});
           }
           const isFirstChange = !this.hasOwnProperty(privateMinKey);
-          simpleChanges[propertyName] = new SimpleChange(this[privateMinKey], value, isFirstChange);
+          const currentChange: SimpleChange|undefined = simpleChanges[propertyName];
+          if (currentChange) {
+            currentChange.currentValue = value;
+          } else {
+            simpleChanges[propertyName] =
+                new SimpleChange(this[privateMinKey], value, isFirstChange);
+          }
           if (isFirstChange) {
             // Create a place where the actual value will be stored and make it non-enumerable
             Object.defineProperty(this, privateMinKey, {value, writable: true});
diff --git a/packages/core/test/render3/define_spec.ts b/packages/core/test/render3/define_spec.ts
index 2253dba899..6c9f6565e7 100644
--- a/packages/core/test/render3/define_spec.ts
+++ b/packages/core/test/render3/define_spec.ts
@@ -45,7 +45,7 @@ describe('define', () => {
         expect(myDir.valB).toEqual('works');
         myDir.log.length = 0;
         (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
-        const changeA = new SimpleChange('initValue', 'first', false);
+        const changeA = new SimpleChange(undefined, 'first', true);
         const changeB = new SimpleChange(undefined, 'second', true);
         expect(myDir.log).toEqual(['ngOnChanges', 'valA', changeA, 'valB', changeB, 'ngDoCheck']);
       });
@@ -75,7 +75,7 @@ describe('define', () => {
         myDir.valA = 'first';
         myDir.valB = 'second';
         (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
-        const changeA1 = new SimpleChange('initValue', 'first', false);
+        const changeA1 = new SimpleChange(undefined, 'first', true);
         const changeB1 = new SimpleChange(undefined, 'second', true);
         expect(myDir.log).toEqual(['valA', changeA1, 'valB', changeB1]);
 

From 81c13e2f86b27166acf502b3dbe88e88407273b6 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Thu, 31 May 2018 14:18:24 -0700
Subject: [PATCH 163/582] refactor(ivy): remove references to Ivy (#24234)

PR Close #24234
---
 packages/core/src/render3/jit/directive.ts  | 6 +++---
 packages/core/src/render3/jit/injectable.ts | 4 ++--
 packages/core/src/render3/jit/module.ts     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index c3551ed9cc..704edd26bc 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata as compileIvyComponent, compileDirectiveFromMetadata as compileIvyDirective, jitExpression, makeBindingParser, parseTemplate} from '@angular/compiler';
+import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata as compileR3Component, compileDirectiveFromMetadata as compileR3Directive, jitExpression, makeBindingParser, parseTemplate} from '@angular/compiler';
 
 import {Component, Directive, HostBinding, Input, Output} from '../../metadata/directives';
 import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
@@ -49,7 +49,7 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
 
         // Compile the component metadata, including template, into an expression.
         // TODO(alxhub): implement inputs, outputs, queries, etc.
-        const res = compileIvyComponent(
+        const res = compileR3Component(
             {
               ...directiveMetadata(type, metadata),
               template,
@@ -83,7 +83,7 @@ export function compileDirective(type: Type<any>, directive: Directive): Promise
       if (def === null) {
         const constantPool = new ConstantPool();
         const sourceMapUrl = `ng://${type && type.name}/ngDirectiveDef.js`;
-        const res = compileIvyDirective(
+        const res = compileR3Directive(
             directiveMetadata(type, directive), constantPool, makeBindingParser());
         def = jitExpression(res.expression, angularCoreEnv, sourceMapUrl, constantPool);
       }
diff --git a/packages/core/src/render3/jit/injectable.ts b/packages/core/src/render3/jit/injectable.ts
index eaf199c6a5..0b0b132421 100644
--- a/packages/core/src/render3/jit/injectable.ts
+++ b/packages/core/src/render3/jit/injectable.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, LiteralExpr, R3DependencyMetadata, WrappedNodeExpr, compileInjectable as compileIvyInjectable, jitExpression} from '@angular/compiler';
+import {Expression, LiteralExpr, R3DependencyMetadata, WrappedNodeExpr, compileInjectable as compileR3Injectable, jitExpression} from '@angular/compiler';
 
 import {Injectable} from '../../di/injectable';
 import {ClassSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from '../../di/provider';
@@ -74,7 +74,7 @@ export function compileInjectable(type: Type<any>, meta?: Injectable): void {
           throw new Error(`Unreachable state.`);
         }
 
-        const {expression} = compileIvyInjectable({
+        const {expression} = compileR3Injectable({
           name: type.name,
           type: new WrappedNodeExpr(type),
           providedIn: computeProvidedIn(meta.providedIn),
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 51df46a86b..0f633d77ba 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileIvyNgModule, jitExpression} from '@angular/compiler';
+import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
 
 import {ModuleWithProviders, NgModule, NgModuleDef} from '../../metadata/ng_module';
 import {Type} from '../../type';
@@ -76,7 +76,7 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
               flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
           emitInline: true,
         };
-        const res = compileIvyNgModule(meta);
+        const res = compileR3NgModule(meta);
         def = jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngModuleDef.js`);
         def.transitiveCompileScope = transitiveCompileScope;
       }

From 5f178f3a5a0655d091d97e021f0db7701af06a7c Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Thu, 31 May 2018 14:18:59 -0700
Subject: [PATCH 164/582] fix(ivy): do not eagerly JIT compile modules (#24234)

PR Close #24234
---
 packages/core/src/render3/jit/module.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 0f633d77ba..769d0f3413 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -26,7 +26,6 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
     exports: flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
     emitInline: true,
   };
-  const res = compileIvyNgModule(meta);
 
   // Compute transitiveCompileScope
   const transitiveCompileScope = {

From 68a799e950742b14aee91aec03d38df7eeeec586 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 30 May 2018 23:49:37 -0700
Subject: [PATCH 165/582] build(bazel): re-enable
 packages/upgrade/test:test_web test with static_files in ts_web_test_suite
 (#24214)

PR Close #24214
---
 BUILD.bazel                                  |  7 ++++---
 karma-js.conf.js                             | 10 ++++++++++
 packages/upgrade/test/BUILD.bazel            |  8 ++------
 packages/upgrade/test/common/test_helpers.ts |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index d92e4a43a6..9f477adf5b 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -48,10 +48,11 @@ filegroup(
 )
 
 filegroup(
-    name = "angularjs",
-    # do not sort
+    name = "angularjs_scripts",
     srcs = [
-        "//:node_modules/angular/angular.js",
+        "//:node_modules/angular-1.5/angular.js",
+        "//:node_modules/angular-mocks-1.5/angular-mocks.js",
         "//:node_modules/angular-mocks/angular-mocks.js",
+        "//:node_modules/angular/angular.js",
     ],
 )
diff --git a/karma-js.conf.js b/karma-js.conf.js
index 815b36fba9..0028c738c2 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -94,6 +94,16 @@ module.exports = function(config) {
       '**/*.js': ['sourcemap'],
     },
 
+    // Bazel inter-op: Allow tests to request resources from either
+    //   /base/node_modules/path/to/thing
+    // or
+    //   /base/angular/node_modules/path/to/thing
+    // This can be removed when all karma tests are run under Bazel, then we
+    // don't need this entire config file.
+    proxies: {
+      '/base/angular/': '/base/',
+    },
+
     reporters: ['internal-angular'],
     sauceLabs: {
       testName: 'Angular2',
diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel
index 635eef6a57..d6fc0c92e7 100644
--- a/packages/upgrade/test/BUILD.bazel
+++ b/packages/upgrade/test/BUILD.bazel
@@ -20,13 +20,9 @@ ts_library(
 
 ts_web_test_suite(
     name = "test_web",
-    bootstrap = [
-        # "//:angularjs",
+    static_files = [
+        "//:angularjs_scripts",
     ],
-    # Disable since tests need to request different AngularJS versions at
-    # runtime, which is not yet supported.
-    # (Related issue: https://github.com/bazelbuild/rules_typescript/issues/131)
-    tags = ["manual"],
     deps = [
         ":test_lib",
     ],
diff --git a/packages/upgrade/test/common/test_helpers.ts b/packages/upgrade/test/common/test_helpers.ts
index e03f243367..1f5a27e979 100644
--- a/packages/upgrade/test/common/test_helpers.ts
+++ b/packages/upgrade/test/common/test_helpers.ts
@@ -28,7 +28,7 @@ export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) {
             .reduce(
                 (prev, file) => prev.then(() => new Promise<void>((resolve, reject) => {
                                             const script = document.createElement('script');
-                                            script.src = `base/node_modules/${file}`;
+                                            script.src = `base/angular/node_modules/${file}`;
                                             script.onerror = reject;
                                             script.onload = () => {
                                               document.body.removeChild(script);

From 60aa943e2dd4654600c0e53e51b8d7a1ac3730da Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 31 May 2018 10:35:51 -0700
Subject: [PATCH 166/582] fix(platform-server): avoid dependency cycle when
 using http interceptor (#24229)

Fixes #23023.

When a HTTP Interceptor injects HttpClient it causes a DI cycle. This fix is to use Injector to lazily inject HTTP_INTERCEPTORS while setting up the HttpHandler on the server so as to break the cycle.

PR Close #24229
---
 packages/common/http/public_api.ts            |  2 +-
 packages/common/http/src/module.ts            | 17 --------
 packages/platform-server/src/http.ts          | 11 +++--
 .../platform-server/test/integration_spec.ts  | 40 ++++++++++++++++++-
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/packages/common/http/public_api.ts b/packages/common/http/public_api.ts
index 8ac2b95de8..9975cfc8f5 100644
--- a/packages/common/http/public_api.ts
+++ b/packages/common/http/public_api.ts
@@ -11,7 +11,7 @@ export {HttpClient} from './src/client';
 export {HttpHeaders} from './src/headers';
 export {HTTP_INTERCEPTORS, HttpInterceptor} from './src/interceptor';
 export {JsonpClientBackend, JsonpInterceptor} from './src/jsonp';
-export {HttpClientJsonpModule, HttpClientModule, HttpClientXsrfModule, interceptingHandler as ɵinterceptingHandler} from './src/module';
+export {HttpClientJsonpModule, HttpClientModule, HttpClientXsrfModule, HttpInterceptingHandler as ɵHttpInterceptingHandler} from './src/module';
 export {HttpParameterCodec, HttpParams, HttpUrlEncodingCodec} from './src/params';
 export {HttpRequest} from './src/request';
 export {HttpDownloadProgressEvent, HttpErrorResponse, HttpEvent, HttpEventType, HttpHeaderResponse, HttpProgressEvent, HttpResponse, HttpResponseBase, HttpSentEvent, HttpUserEvent} from './src/response';
diff --git a/packages/common/http/src/module.ts b/packages/common/http/src/module.ts
index 08ebe63e36..83a9fbfc94 100644
--- a/packages/common/http/src/module.ts
+++ b/packages/common/http/src/module.ts
@@ -42,23 +42,6 @@ export class HttpInterceptingHandler implements HttpHandler {
   }
 }
 
-/**
- * Constructs an `HttpHandler` that applies a bunch of `HttpInterceptor`s
- * to a request before passing it to the given `HttpBackend`.
- *
- * Meant to be used as a factory function within `HttpClientModule`.
- *
- *
- */
-export function interceptingHandler(
-    backend: HttpBackend, interceptors: HttpInterceptor[] | null = []): HttpHandler {
-  if (!interceptors) {
-    return backend;
-  }
-  return interceptors.reduceRight(
-      (next, interceptor) => new HttpInterceptorHandler(next, interceptor), backend);
-}
-
 /**
  * Factory function that determines where to store JSONP callbacks.
  *
diff --git a/packages/platform-server/src/http.ts b/packages/platform-server/src/http.ts
index 56e135c4b2..1fc55db209 100644
--- a/packages/platform-server/src/http.ts
+++ b/packages/platform-server/src/http.ts
@@ -8,10 +8,10 @@
 
 const xhr2: any = require('xhr2');
 
-import {Injectable, Optional, Provider} from '@angular/core';
+import {Injectable, Injector, Optional, Provider, InjectFlags} from '@angular/core';
 import {BrowserXhr, Connection, ConnectionBackend, Http, ReadyState, Request, RequestOptions, Response, XHRBackend, XSRFStrategy} from '@angular/http';
 
-import {HttpEvent, HttpRequest, HttpHandler, HttpInterceptor, HTTP_INTERCEPTORS, HttpBackend, XhrFactory, ɵinterceptingHandler as interceptingHandler} from '@angular/common/http';
+import {HttpEvent, HttpRequest, HttpHandler, HttpInterceptor, HTTP_INTERCEPTORS, HttpBackend, XhrFactory, ɵHttpInterceptingHandler as HttpInterceptingHandler} from '@angular/common/http';
 
 import {Observable, Observer, Subscription} from 'rxjs';
 
@@ -156,9 +156,8 @@ export function httpFactory(xhrBackend: XHRBackend, options: RequestOptions) {
   return new Http(macroBackend, options);
 }
 
-export function zoneWrappedInterceptingHandler(
-    backend: HttpBackend, interceptors: HttpInterceptor[] | null) {
-  const realBackend: HttpBackend = interceptingHandler(backend, interceptors);
+export function zoneWrappedInterceptingHandler(backend: HttpBackend, injector: Injector) {
+  const realBackend: HttpBackend = new HttpInterceptingHandler(backend, injector);
   return new ZoneClientBackend(realBackend);
 }
 
@@ -168,6 +167,6 @@ export const SERVER_HTTP_PROVIDERS: Provider[] = [
   {provide: XhrFactory, useClass: ServerXhr}, {
     provide: HttpHandler,
     useFactory: zoneWrappedInterceptingHandler,
-    deps: [HttpBackend, [new Optional(), HTTP_INTERCEPTORS]]
+    deps: [HttpBackend, Injector]
   }
 ];
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 11c836bfe3..4d8d8240c0 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -8,15 +8,16 @@
 
 import {AnimationBuilder, animate, style, transition, trigger} from '@angular/animations';
 import {APP_BASE_HREF, PlatformLocation, isPlatformServer} from '@angular/common';
-import {HttpClient, HttpClientModule} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';
 import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
-import {ApplicationRef, CompilerFactory, Component, HostListener, Inject, Input, NgModule, NgModuleRef, NgZone, PLATFORM_ID, PlatformRef, ViewEncapsulation, destroyPlatform, getPlatform} from '@angular/core';
+import {ApplicationRef, CompilerFactory, Component, HostListener, Inject, Injectable, Input, NgModule, NgModuleRef, NgZone, PLATFORM_ID, PlatformRef, ViewEncapsulation, destroyPlatform, getPlatform} from '@angular/core';
 import {TestBed, async, inject} from '@angular/core/testing';
 import {Http, HttpModule, Response, ResponseOptions, XHRBackend} from '@angular/http';
 import {MockBackend, MockConnection} from '@angular/http/testing';
 import {BrowserModule, DOCUMENT, StateKey, Title, TransferState, makeStateKey} from '@angular/platform-browser';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {BEFORE_APP_SERIALIZED, INITIAL_CONFIG, PlatformState, ServerModule, ServerTransferStateModule, platformDynamicServer, renderModule, renderModuleFactory} from '@angular/platform-server';
+import {Observable} from 'rxjs';
 import {first} from 'rxjs/operators';
 
 @Component({selector: 'app', template: `Works!`})
@@ -202,6 +203,26 @@ export class HttpAfterExampleModule {
 export class HttpClientExampleModule {
 }
 
+@Injectable()
+export class MyHttpInterceptor implements HttpInterceptor {
+  constructor(private http: HttpClient) {}
+
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    return next.handle(req);
+  }
+}
+
+@NgModule({
+  bootstrap: [MyServerApp],
+  declarations: [MyServerApp],
+  imports: [ServerModule, HttpClientModule, HttpClientTestingModule],
+  providers: [
+    {provide: HTTP_INTERCEPTORS, multi: true, useClass: MyHttpInterceptor},
+  ],
+})
+export class HttpInterceptorExampleModule {
+}
+
 @Component({selector: 'app', template: `<img [src]="'link'">`})
 class ImageApp {
 }
@@ -750,6 +771,21 @@ class EscapedTransferStoreModule {
              });
            });
          }));
+      it('can use HttpInterceptor that injects HttpClient', () => {
+        const platform =
+            platformDynamicServer([{provide: INITIAL_CONFIG, useValue: {document: '<app></app>'}}]);
+        platform.bootstrapModule(HttpInterceptorExampleModule).then(ref => {
+          const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
+          const http = ref.injector.get(HttpClient);
+          ref.injector.get<NgZone>(NgZone).run(() => {
+            http.get('http://localhost/testing').subscribe(body => {
+              NgZone.assertInAngularZone();
+              expect(body).toEqual('success!');
+            });
+            mock.expectOne('http://localhost/testing').flush('success!');
+          });
+        });
+      });
     });
 
     describe('ServerTransferStoreModule', () => {

From f69ac670eeebebc06f4ff7bd2afeb87460349538 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 31 May 2018 22:16:27 +0200
Subject: [PATCH 167/582] feat(compiler-cli): update `tsickle` to `0.29.x`
 (#24233)

PR Close #24233
---
 package.json                                                | 2 +-
 packages/compiler-cli/package.json                          | 2 +-
 packages/compiler-cli/test/ngc_spec.ts                      | 2 +-
 .../test/bundling/hello_world_r2/bundle.golden_symbols.json | 6 ++++++
 yarn.lock                                                   | 6 +++---
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1b0123cf83..e2b2398ebb 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "source-map": "0.5.7",
     "source-map-support": "0.4.18",
     "systemjs": "0.18.10",
-    "tsickle": "^0.28.0",
+    "tsickle": "^0.29.0",
     "tslint": "5.7.0",
     "tslint-eslint-rules": "4.1.1",
     "tsutils": "2.20.0",
diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json
index 8249b66deb..07fcee7d02 100644
--- a/packages/compiler-cli/package.json
+++ b/packages/compiler-cli/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "reflect-metadata": "^0.1.2",
     "minimist": "^1.2.0",
-    "tsickle": "^0.27.2",
+    "tsickle": "^0.29.0",
     "chokidar": "^1.4.2"
   },
   "peerDependencies": {
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index c4cbf8a1dd..f7264872e3 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -672,7 +672,7 @@ describe('ngc transformer command-line', () => {
         expect(mymoduleSource).toContain('args: [{ declarations: [] },] }');
         expect(mymoduleSource).not.toContain(`__metadata`);
         expect(mymoduleSource).toContain(`import { AClass } from './aclass';`);
-        expect(mymoduleSource).toContain(`{ type: AClass, }`);
+        expect(mymoduleSource).toContain(`{ type: AClass }`);
       });
     });
 
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index 688f862721..56d1450518 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -1040,6 +1040,9 @@
   {
     "name": "MethodCall"
   },
+  {
+    "name": "MissingTranslationStrategy"
+  },
   {
     "name": "MissingTranslationStrategy$1"
   },
@@ -1469,6 +1472,9 @@
   {
     "name": "SanitizingHtmlSerializer"
   },
+  {
+    "name": "SecurityContext"
+  },
   {
     "name": "SecurityContext$1"
   },
diff --git a/yarn.lock b/yarn.lock
index a04ffc296d..b9ee164192 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5886,9 +5886,9 @@ trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
-tsickle@^0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
+tsickle@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"

From 08f943a1f3dd74ad9475cb33d8f225392404f66e Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 31 May 2018 19:29:02 -0700
Subject: [PATCH 168/582] test(platform-server): add a test for 'hidden'
 property (#24239)

Add a test to verify that the hidden property is reflected properly to the hidden attribute.

PR Close #24239
---
 .../platform-server/test/integration_spec.ts  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 4d8d8240c0..311b4f52a7 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -334,6 +334,20 @@ class TransferStoreModule {
 class EscapedTransferStoreModule {
 }
 
+@Component({selector: 'app', template: '<input [hidden]="true"><input [hidden]="false">'})
+class MyHiddenComponent {
+  @Input()
+  name = '';
+}
+
+@NgModule({
+  declarations: [MyHiddenComponent],
+  bootstrap: [MyHiddenComponent],
+  imports: [ServerModule, BrowserModule.withServerTransition({appId: 'hidden-attributes'})]
+})
+class HiddenModule {
+}
+
 (function() {
   if (getDOM().supportsDOMEvents()) return;  // NODE only
 
@@ -613,6 +627,15 @@ class EscapedTransferStoreModule {
            });
          }));
 
+      it('should handle element property "hidden"', async(() => {
+           renderModule(HiddenModule, {document: doc}).then(output => {
+             expect(output).toBe(
+                 '<html><head></head><body><app ng-version="0.0.0-PLACEHOLDER">' +
+                 '<input hidden=""><input></app></body></html>');
+             called = true;
+           });
+         }));
+
       it('should call render hook', async(() => {
            renderModule(RenderHookModule, {document: doc}).then(output => {
              // title should be added by the render hook.

From 6948ef125ceec340d60cafc4a2b45c56cf2fefe3 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Tue, 29 May 2018 15:33:12 -0700
Subject: [PATCH 169/582] build(bazel): fix bazel built es5 ngfactory with
 secondary entry-point angular imports (#24170)

PR Close #24170
---
 packages/bazel/src/ng_package/packager.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/bazel/src/ng_package/packager.ts b/packages/bazel/src/ng_package/packager.ts
index 603d8c5ef9..65733c52fe 100644
--- a/packages/bazel/src/ng_package/packager.ts
+++ b/packages/bazel/src/ng_package/packager.ts
@@ -211,7 +211,8 @@ function main(args: string[]): number {
     const entryPointName = entryPointPackageName.substr(rootPackageName.length + 1);
     if (!entryPointName) return;
 
-    createMetadataReexportFile(entryPointName, modulesManifest[entryPointPackageName]['metadata']);
+    createMetadataReexportFile(
+        entryPointName, modulesManifest[entryPointPackageName]['metadata'], entryPointPackageName);
     createTypingsReexportFile(
         entryPointName, licenseBanner, modulesManifest[entryPointPackageName]['typings']);
 
@@ -318,7 +319,8 @@ function main(args: string[]): number {
   }
 
   /** Creates metadata re-export file for a secondary entry-point. */
-  function createMetadataReexportFile(entryPointName: string, metadataFile: string) {
+  function createMetadataReexportFile(
+      entryPointName: string, metadataFile: string, packageName: string) {
     const inputPath = path.join(srcDir, `${entryPointName}.metadata.json`);
     writeFileFromInputPath(inputPath, JSON.stringify({
       '__symbolic': 'module',
@@ -327,6 +329,7 @@ function main(args: string[]): number {
       'exports':
           [{'from': `${srcDirRelative(inputPath, metadataFile.replace(/.metadata.json$/, ''))}`}],
       'flatModuleIndexRedirect': true,
+      'importAs': packageName
     }) + '\n');
   }
 

From 5cbcb5680b950ece39521579da6f6a2734e27e5c Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Tue, 29 May 2018 15:35:48 -0700
Subject: [PATCH 170/582] build(bazel): update bazel integration test to test
 secondary angular imports such as @angular/common/http (#24170)

PR Close #24170
---
 integration/bazel/.bazelrc                    |   3 -
 integration/bazel/BUILD.bazel                 |  22 +
 integration/bazel/WORKSPACE                   |  61 +-
 integration/bazel/package.json                |  17 +-
 integration/bazel/protractor.conf.js          |   9 +
 integration/bazel/src/BUILD.bazel             |  49 ++
 integration/bazel/src/app.component.ts        |  19 +
 integration/bazel/src/app.module.ts           |  11 +-
 integration/bazel/src/hello-world/BUILD.bazel |  27 +-
 .../hello-world/hello-world.component.spec.ts |  45 +
 .../src/hello-world/hello-world.module.ts     |   2 +-
 integration/bazel/src/index.html              |  12 +
 integration/bazel/test/e2e/BUILD.bazel        |   7 +
 integration/bazel/test/e2e/app.spec.ts        |  12 +
 integration/bazel/tools/bazel.rc              |  10 +
 integration/bazel/yarn.lock                   | 771 +++++++++++++++++-
 16 files changed, 1040 insertions(+), 37 deletions(-)
 delete mode 100644 integration/bazel/.bazelrc
 create mode 100644 integration/bazel/protractor.conf.js
 create mode 100644 integration/bazel/src/app.component.ts
 create mode 100644 integration/bazel/src/hello-world/hello-world.component.spec.ts
 create mode 100644 integration/bazel/src/index.html
 create mode 100644 integration/bazel/test/e2e/BUILD.bazel
 create mode 100644 integration/bazel/test/e2e/app.spec.ts
 create mode 100644 integration/bazel/tools/bazel.rc

diff --git a/integration/bazel/.bazelrc b/integration/bazel/.bazelrc
deleted file mode 100644
index c5102a05a2..0000000000
--- a/integration/bazel/.bazelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Workaround https://github.com/bazelbuild/bazel/issues/3645
-# Limit Bazel to consuming 3072K of RAM
-build --local_resources=3072,2.0,1.0
diff --git a/integration/bazel/BUILD.bazel b/integration/bazel/BUILD.bazel
index 95347887f0..356533e8bb 100644
--- a/integration/bazel/BUILD.bazel
+++ b/integration/bazel/BUILD.bazel
@@ -17,3 +17,25 @@ filegroup(
         ],
     ),
 )
+
+ANGULAR_TESTING = [
+    "node_modules/@angular/*/bundles/*-testing.umd.js",
+    # We use AOT, so the compiler and the dynamic platform-browser should be
+    # visible only in tests
+    "node_modules/@angular/compiler/bundles/*.umd.js",
+    "node_modules/@angular/platform-browser-dynamic/bundles/*.umd.js",
+]
+
+filegroup(
+    name = "angular_bundles",
+    srcs = glob(
+        ["node_modules/@angular/*/bundles/*.umd.js"],
+        exclude = ANGULAR_TESTING,
+    ),
+)
+
+filegroup(
+    name = "angular_test_bundles",
+    testonly = 1,
+    srcs = glob(ANGULAR_TESTING),
+)
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 92a288f2b5..12dda52ee5 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -1,5 +1,9 @@
 workspace(name = "bazel_integration_test")
 
+#
+# Download Bazel toolchain dependencies as needed by build actions
+#
+
 http_archive(
     name = "build_bazel_rules_nodejs",
     url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
@@ -7,9 +11,6 @@ http_archive(
     sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
-node_repositories(package_json = ["//:package.json"])
-
 http_archive(
     name = "io_bazel_rules_webtesting",
     url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
@@ -24,10 +25,53 @@ http_archive(
     sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
 )
 
+http_archive(
+    name = "io_bazel_rules_go",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.11.0/rules_go-0.11.0.tar.gz",
+    sha256 = "f70c35a8c779bb92f7521ecb5a1c6604e9c3edd431e50b6376d7497abc8ad3c1",
+)
+
+http_archive(
+    name = "io_bazel_rules_sass",
+    url = "https://github.com/bazelbuild/rules_sass/archive/0.0.3.zip",
+    strip_prefix = "rules_sass-0.0.3",
+    sha256 = "8fa98e7b48a5837c286a1ea254b5a5c592fced819ee9fe4fdd759768d97be868",
+)
+
+#
+# Load and install our dependencies downloaded above.
+#
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
+
+check_bazel_version("0.13.0")
+node_repositories(package_json = ["//:package.json"])
+
+load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+
+go_rules_dependencies()
+go_register_toolchains()
+
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
+
+web_test_repositories()
+browser_repositories(
+    chromium = True,
+    firefox = True,
+)
+
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 
+load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+
+sass_repositories()
+
+#
+# Point Bazel to WORKSPACEs that live in subdirectories
+#
+
 local_repository(
     name = "angular",
     path = "node_modules/@angular/bazel",
@@ -37,14 +81,3 @@ local_repository(
     name = "rxjs",
     path = "node_modules/rxjs/src",
 )
-
-http_archive(
-    name = "io_bazel_rules_sass",
-    url = "https://github.com/bazelbuild/rules_sass/archive/0.0.3.zip",
-    strip_prefix = "rules_sass-0.0.3",
-    sha256 = "8fa98e7b48a5837c286a1ea254b5a5c592fced819ee9fe4fdd759768d97be868",
-)
-
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
-
-sass_repositories()
diff --git a/integration/bazel/package.json b/integration/bazel/package.json
index 2de7983b73..5c2bb294f2 100644
--- a/integration/bazel/package.json
+++ b/integration/bazel/package.json
@@ -9,17 +9,26 @@
     "@angular/compiler": "file:../../dist/packages-dist/compiler",
     "@angular/core": "file:../../dist/packages-dist/core",
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
     "rxjs": "file:../../node_modules/rxjs",
     "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
     "@angular/bazel": "file:../../dist/packages-dist/bazel",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
-    "typescript": "file:../../node_modules/typescript",
-    "@types/source-map": "0.5.1"
+    "@types/jasmine": "2.8.7",
+    "@types/source-map": "0.5.1",
+    "concurrently": "3.5.1",
+    "http-server": "0.11.1",
+    "protractor": "file:../../node_modules/protractor",
+    "typescript": "file:../../node_modules/typescript"
   },
   "scripts": {
-    "postinstall": "ngc -p angular.tsconfig.json",
-    "test": "bazel build //... --noshow_progress"
+    "postinstall": "concurrently \"webdriver-manager update $CHROMEDRIVER_VERSION_ARG\" \"ngc -p angular.tsconfig.json\"",
+    "test": "bazel build //... --noshow_progress && yarn e2e",
+    "pree2e": "bazel build test/...",
+    "e2e": "yarn e2e-prodserver && yarn e2e-devserver",
+    "e2e-prodserver": "concurrently \"bazel run //src:prodserver\" \"while ! nc -z 127.0.0.1 5432; do sleep 1; done && protractor\" --kill-others --success first",
+    "e2e-devserver": "concurrently \"bazel run //src:devserver\" \"while ! nc -z 127.0.0.1 5432; do sleep 1; done && protractor\" --kill-others --success first"
   }
 }
\ No newline at end of file
diff --git a/integration/bazel/protractor.conf.js b/integration/bazel/protractor.conf.js
new file mode 100644
index 0000000000..5ca2ef42d2
--- /dev/null
+++ b/integration/bazel/protractor.conf.js
@@ -0,0 +1,9 @@
+exports.config = {
+  specs: ['bazel-bin/test/e2e/*.spec.js'],
+  capabilities: {browserName: 'chrome', chromeOptions: {args: ['--no-sandbox']}},
+  directConnect: true,
+  baseUrl: 'http://localhost:5432/',
+  framework: 'jasmine',
+  getPageTimeout: 60 * 1000,
+  allScriptsTimeout: 60 * 1000,
+};
diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index 0530c6cc91..f82312302e 100644
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@@ -9,3 +9,52 @@ ng_module(
     tsconfig = ":tsconfig.json",
     deps = ["//src/hello-world"],
 )
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+
+ts_devserver(
+    name = "devserver",
+    additional_root_paths = [
+        "bazel_integration_test/node_modules/zone.js/dist",
+    ],
+    entry_module = "bazel_integration_test/src/main",
+    scripts = ["//:angular_bundles"],
+    serving_path = "/bundle.min.js",
+    static_files = [
+        "//:node_modules/zone.js/dist/zone.min.js",
+        "index.html",
+    ],
+    deps = ["//src"],
+)
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "nodejs_binary")
+
+rollup_bundle(
+    name = "bundle",
+    entry_point = "src/main",
+    deps = ["//src"],
+)
+
+# Needed because the prodserver only loads static files that appear under this
+# package.
+genrule(
+    name = "zone.js",
+    srcs = ["//:node_modules/zone.js/dist/zone.min.js"],
+    outs = ["zone.min.js"],
+    cmd = "cp $< $@",
+)
+
+nodejs_binary(
+    name = "prodserver",
+    args = [
+        "./src",
+        "-p",
+        "5432",
+    ],
+    data = [
+        "index.html",
+        ":bundle",
+        ":zone.js",
+    ],
+    entry_point = "http-server/bin/http-server",
+)
diff --git a/integration/bazel/src/app.component.ts b/integration/bazel/src/app.component.ts
new file mode 100644
index 0000000000..df2ab4a775
--- /dev/null
+++ b/integration/bazel/src/app.component.ts
@@ -0,0 +1,19 @@
+import {Component} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import {Observable} from 'rxjs';
+import {map, startWith} from 'rxjs/operators';
+
+@Component({
+  selector: 'app-component',
+  template: `
+    <hello-world-app></hello-world-app>
+    <div>The current time is {{ time$ | async }}</div>
+  `})
+export class AppComponent {
+  constructor(private http: HttpClient) {
+  }
+
+  time$ = this.http.get('http://worldclockapi.com/api/json/pst/now').pipe(
+    map((result: any) => result.currentDateTime),
+    startWith(['...']));
+}
diff --git a/integration/bazel/src/app.module.ts b/integration/bazel/src/app.module.ts
index 14e2760d75..bbd2d88dff 100644
--- a/integration/bazel/src/app.module.ts
+++ b/integration/bazel/src/app.module.ts
@@ -1,9 +1,14 @@
-import {HelloWorldModule} from './hello-world/hello-world.module';
-
 import {NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
+import {HttpClientModule} from '@angular/common/http';
+import {CommonModule} from '@angular/common';
+
+import {AppComponent} from './app.component';
+import {HelloWorldModule} from './hello-world/hello-world.module';
 
 @NgModule({
-  imports: [BrowserModule, HelloWorldModule]
+  imports: [CommonModule, BrowserModule, HttpClientModule, HelloWorldModule],
+  declarations: [AppComponent],
+  bootstrap: [AppComponent],
 })
 export class AppModule {}
diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
index 09a8465851..8ee3e2ed1a 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@angular//:index.bzl", "ng_module", "ng_package")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_web_test_suite")
 
 sass_binary(
     name = "hello-world-styles",
@@ -10,7 +11,10 @@ sass_binary(
 
 ng_module(
     name = "hello-world",
-    srcs = glob(["*.ts"]),
+    srcs = glob(
+        ["*.ts"],
+        exclude = ["*.spec.ts"],
+    ),
     assets = [":hello-world-styles.css"],
     tsconfig = "//src:tsconfig.json",
     # FIXME(alexeagle): the rxjs dep should come from Angular, but if we use the
@@ -23,3 +27,24 @@ ng_package(
     entry_point = "src/hello-world/index.js",
     deps = [":hello-world"],
 )
+
+ts_library(
+    name = "test_lib",
+    testonly = 1,
+    srcs = glob(["*.spec.ts"]),
+    deps = [":hello-world"],
+)
+
+ts_web_test_suite(
+    name = "test",
+    bootstrap = ["//:node_modules/zone.js/dist/zone-testing-bundle.js"],
+    browsers = [
+        "@io_bazel_rules_webtesting//browsers:chromium-local",
+        "@io_bazel_rules_webtesting//browsers:firefox-local",
+    ],
+    deps = [
+        ":test_lib",
+        "//:angular_bundles",
+        "//:angular_test_bundles",
+    ],
+)
diff --git a/integration/bazel/src/hello-world/hello-world.component.spec.ts b/integration/bazel/src/hello-world/hello-world.component.spec.ts
new file mode 100644
index 0000000000..c23d8c6b82
--- /dev/null
+++ b/integration/bazel/src/hello-world/hello-world.component.spec.ts
@@ -0,0 +1,45 @@
+import {DebugElement} from '@angular/core';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
+
+import {HelloWorldComponent} from './hello-world.component';
+import {HelloWorldModuleNgSummary} from './hello-world.module.ngsummary';
+
+// TODO(alexeagle): this helper should be in @angular/platform-browser-dynamic/testing
+try {
+  TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+} catch {
+  // Ignore exceptions when calling it multiple times.
+}
+
+describe('BannerComponent (inline template)', () => {
+  let comp: HelloWorldComponent;
+  let fixture: ComponentFixture<HelloWorldComponent>;
+  let el: HTMLElement;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [HelloWorldComponent],  // declare the test component
+      aotSummaries: HelloWorldModuleNgSummary,
+    });
+    TestBed.compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelloWorldComponent);
+    comp = fixture.componentInstance;
+    el = fixture.debugElement.query(By.css('div')).nativeElement;
+  });
+
+  it('should display original title', () => {
+    fixture.detectChanges();
+    expect(el.textContent).toContain(comp.name);
+  });
+
+  it('should display a different test title', () => {
+    comp.name = 'Test';
+    fixture.detectChanges();
+    expect(el.textContent).toContain('Test');
+  });
+});
diff --git a/integration/bazel/src/hello-world/hello-world.module.ts b/integration/bazel/src/hello-world/hello-world.module.ts
index ceb62649a4..92cba5c01f 100644
--- a/integration/bazel/src/hello-world/hello-world.module.ts
+++ b/integration/bazel/src/hello-world/hello-world.module.ts
@@ -3,6 +3,6 @@ import {NgModule} from '@angular/core';
 
 @NgModule({
   declarations: [HelloWorldComponent],
-  bootstrap: [HelloWorldComponent],
+  exports: [HelloWorldComponent],
 })
 export class HelloWorldModule {}
diff --git a/integration/bazel/src/index.html b/integration/bazel/src/index.html
new file mode 100644
index 0000000000..766707a3f2
--- /dev/null
+++ b/integration/bazel/src/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+
+<html>
+  <head>
+    <title>Bazel Integration Test</title>
+  </head>
+  <body>
+    <app-component></app-component>
+    <script src="/zone.min.js"></script>
+    <script src="/bundle.min.js"></script>
+  </body>
+</html>
diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel
new file mode 100644
index 0000000000..f023d58b55
--- /dev/null
+++ b/integration/bazel/test/e2e/BUILD.bazel
@@ -0,0 +1,7 @@
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+ts_library(
+    name = "e2e",
+    testonly = 1,
+    srcs = glob(["*.ts"]),
+)
diff --git a/integration/bazel/test/e2e/app.spec.ts b/integration/bazel/test/e2e/app.spec.ts
new file mode 100644
index 0000000000..79f46226d5
--- /dev/null
+++ b/integration/bazel/test/e2e/app.spec.ts
@@ -0,0 +1,12 @@
+import {browser, by, element, ExpectedConditions} from 'protractor';
+
+describe('angular example application', () => {
+  it('should display: Hello World!', (done) => {
+    browser.get('');
+    const div = element(by.css('div'));
+    div.getText().then(t => expect(t).toEqual(`Hello world!`));
+    element(by.css('input')).sendKeys('!');
+    div.getText().then(t => expect(t).toEqual(`Hello world!!`));
+    done();
+  });
+});
diff --git a/integration/bazel/tools/bazel.rc b/integration/bazel/tools/bazel.rc
new file mode 100644
index 0000000000..b005159840
--- /dev/null
+++ b/integration/bazel/tools/bazel.rc
@@ -0,0 +1,10 @@
+# Make TypeScript and Angular compilation fast, by keeping a few copies of the
+# compiler running as daemons, and cache SourceFile AST's to reduce parse time.
+build --strategy=TypeScriptCompile=worker
+build --strategy=AngularTemplateCompile=worker
+
+test --test_output=errors
+
+# Workaround https://github.com/bazelbuild/bazel/issues/3645
+# Limit Bazel to consuming 3072K of RAM
+build --local_resources=3072,2.0,1.0
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index 68eaa80d43..d7289ac005 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -38,6 +38,11 @@
   dependencies:
     tslib "^1.9.0"
 
+"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
+  version "6.0.0-rc.5"
+  dependencies:
+    tslib "^1.9.0"
+
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
   version "6.0.0-rc.5"
   dependencies:
@@ -55,6 +60,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/jasmine@2.8.7":
+  version "2.8.7"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.7.tgz#3fe583928ae0a22cdd34cedf930eeffeda2602fd"
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -67,6 +76,18 @@
   version "6.0.84"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
 
+"@types/node@^6.0.46":
+  version "6.0.111"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.111.tgz#85f880a1bab78d395a5de9bcb5319e73a0c31400"
+
+"@types/q@^0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+
+"@types/selenium-webdriver@^2.53.35", "@types/selenium-webdriver@~2.53.39":
+  version "2.53.43"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707"
+
 "@types/shelljs@0.7.7":
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.7.tgz#1f7bfa28947661afea06365db9b1135bbc903ec4"
@@ -82,6 +103,34 @@ abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
+adm-zip@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
+
+adm-zip@^0.4.7:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
+
+agent-base@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7"
+  dependencies:
+    extend "~3.0.0"
+    semver "~5.0.1"
+
+ajv@^5.1.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -90,6 +139,14 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -118,10 +175,24 @@ arr-flatten@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
@@ -129,18 +200,54 @@ ascli@~1:
     colour "~0.7.1"
     optjs "~3.2.2"
 
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
+blocking-proxy@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-0.0.5.tgz#462905e0dcfbea970f41aa37223dda9c07b1912b"
+  dependencies:
+    minimist "^1.2.0"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -170,6 +277,30 @@ camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+chalk@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  dependencies:
+    ansi-styles "^1.1.0"
+    escape-string-regexp "^1.0.0"
+    has-ansi "^0.1.0"
+    strip-ansi "^0.3.0"
+    supports-color "^0.2.0"
+
+chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
 chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -197,32 +328,83 @@ cliui@^3.0.3:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
 colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
 
+combined-stream@1.0.6, combined-stream@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
+concurrently@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.1.tgz#ee8b60018bbe86b02df13e5249453c6ececd2521"
+  dependencies:
+    chalk "0.5.1"
+    commander "2.6.0"
+    date-fns "^1.23.0"
+    lodash "^4.5.1"
+    rx "2.3.24"
+    spawn-command "^0.0.2-1"
+    supports-color "^3.2.3"
+    tree-kill "^1.1.0"
+
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
-core-util-is@~1.0.0:
+core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-debug@^2.1.2:
+corser@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-fns@^1.23.0:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
+debug@2, debug@^2.1.2, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -231,6 +413,22 @@ deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
+del@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -239,6 +437,33 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+ecstatic@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.2.0.tgz#1b1aee1ca7c6b99cfb5cf6c9b26b481b90c4409f"
+  dependencies:
+    he "^1.1.1"
+    mime "^1.4.1"
+    minimist "^1.1.0"
+    url-join "^2.0.2"
+
+escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -251,12 +476,32 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
+extend@3, extend@~3.0.0, extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -271,6 +516,12 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+follow-redirects@^1.0.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.0.tgz#234f49cf770b7f35b40e790f636ceba0c3a0ab77"
+  dependencies:
+    debug "^3.1.0"
+
 for-in@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -281,6 +532,18 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -311,6 +574,12 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -334,7 +603,7 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.5:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -345,14 +614,93 @@ glob@^7.0.0, glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 graceful-fs@^4.1.2:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+has-ansi@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  dependencies:
+    ansi-regex "^0.2.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+he@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+http-proxy@^1.8.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  dependencies:
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-server@0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
+  dependencies:
+    colors "1.0.3"
+    corser "~2.0.0"
+    ecstatic "^3.0.0"
+    http-proxy "^1.8.1"
+    opener "~1.4.0"
+    optimist "0.6.x"
+    portfinder "^1.0.13"
+    union "~0.4.3"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-proxy-agent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+
 iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -376,7 +724,7 @@ inherits@2, inherits@^2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -442,6 +790,22 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  dependencies:
+    path-is-inside "^1.0.1"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -450,6 +814,10 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -460,6 +828,51 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jasmine-core@~2.99.0:
+  version "2.99.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+
+jasmine@^2.5.3:
+  version "2.99.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
+  dependencies:
+    exit "^0.1.2"
+    glob "^7.0.6"
+    jasmine-core "~2.99.0"
+
+jasminewd2@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -476,6 +889,10 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+lodash@^4.5.1:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -502,6 +919,20 @@ micromatch@^2.1.5:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-types@^2.1.12, mime-types@~2.1.17:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
 "minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -512,10 +943,14 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@^1.2.0:
+minimist@^1.1.0, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
@@ -529,7 +964,7 @@ minizlib@^1.1.0:
   dependencies:
     minipass "^2.2.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -603,7 +1038,11 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-object-assign@^4.1.0:
+oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -620,6 +1059,21 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
+opener@~1.4.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+
+optimist@0.6.x, optimist@~0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+options@>=0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+
 optjs@~3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
@@ -634,7 +1088,7 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-tmpdir@^1.0.0:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -658,10 +1112,40 @@ path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
 path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+portfinder@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
@@ -679,6 +1163,45 @@ protobufjs@5.0.0:
     glob "^5.0.10"
     yargs "^3.10.0"
 
+"protractor@file:../../node_modules/protractor":
+  version "5.1.2"
+  dependencies:
+    "@types/node" "^6.0.46"
+    "@types/q" "^0.0.32"
+    "@types/selenium-webdriver" "~2.53.39"
+    blocking-proxy "0.0.5"
+    chalk "^1.1.3"
+    glob "^7.0.3"
+    jasmine "^2.5.3"
+    jasminewd2 "^2.1.0"
+    optimist "~0.6.0"
+    q "1.4.1"
+    saucelabs "~1.3.0"
+    selenium-webdriver "3.0.1"
+    source-map-support "~0.4.0"
+    webdriver-js-extender "^1.0.0"
+    webdriver-manager "^12.0.6"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+q@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+
+q@^1.4.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qs@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
+
+qs@~6.5.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
 randomatic@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
@@ -745,24 +1268,57 @@ repeat-string@^1.5.2:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
+request@^2.78.0:
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
 resolve@^1.1.6:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
-rimraf@^2.6.1:
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
+rx@2.3.24:
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
+
 "rxjs@file:../../node_modules/rxjs":
   version "6.0.0"
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
@@ -770,14 +1326,47 @@ safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sax@^1.2.4:
+saucelabs@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.3.0.tgz#d240e8009df7fa87306ec4578a69ba3b5c424fee"
+  dependencies:
+    https-proxy-agent "^1.0.0"
+
+sax@0.6.x:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
+
+sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
+selenium-webdriver@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7"
+  dependencies:
+    adm-zip "^0.4.7"
+    rimraf "^2.5.4"
+    tmp "0.0.30"
+    xml2js "^0.4.17"
+
+selenium-webdriver@^2.53.2:
+  version "2.53.3"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz#d29ff5a957dff1a1b49dc457756e4e4bfbdce085"
+  dependencies:
+    adm-zip "0.4.4"
+    rimraf "^2.2.8"
+    tmp "0.0.24"
+    ws "^1.0.1"
+    xml2js "0.4.4"
+
 semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
+semver@~5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
+
 set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -805,10 +1394,38 @@ source-map-support@^0.5.0:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@~0.4.0:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
 source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
+spawn-command@^0.0.2-1:
+  version "0.0.2-1"
+  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
+
+sshpk@^1.7.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -830,6 +1447,12 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+strip-ansi@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  dependencies:
+    ansi-regex "^0.2.1"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -846,6 +1469,20 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
 tar@^4:
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
@@ -858,6 +1495,26 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+tmp@0.0.24:
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.24.tgz#d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12"
+
+tmp@0.0.30:
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
+tree-kill@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
+
 tsickle@^0.27.2:
   version "0.27.5"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.5.tgz#41e1a41a5acf971cbb2b0558a9590779234d591f"
@@ -871,13 +1528,72 @@ tslib@^1.9.0:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
 "typescript@file:../../node_modules/typescript":
   version "2.8.3"
 
+ultron@1.0.x:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+
+union@~0.4.3:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0"
+  dependencies:
+    qs "~2.3.3"
+
+url-join@^2.0.2:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
+uuid@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+webdriver-js-extender@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
+  dependencies:
+    "@types/selenium-webdriver" "^2.53.35"
+    selenium-webdriver "^2.53.2"
+
+webdriver-manager@^12.0.6:
+  version "12.0.6"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.0.6.tgz#3df1a481977010b4cbf8c9d85c7a577828c0e70b"
+  dependencies:
+    adm-zip "^0.4.7"
+    chalk "^1.1.1"
+    del "^2.2.0"
+    glob "^7.0.3"
+    ini "^1.3.4"
+    minimist "^1.2.0"
+    q "^1.4.1"
+    request "^2.78.0"
+    rimraf "^2.5.2"
+    semver "^5.3.0"
+    xml2js "^0.4.17"
+
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -888,6 +1604,10 @@ window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -899,6 +1619,35 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+ws@^1.0.1:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"
+  dependencies:
+    options ">=0.0.5"
+    ultron "1.0.x"
+
+xml2js@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.4.tgz#3111010003008ae19240eba17497b57c729c555d"
+  dependencies:
+    sax "0.6.x"
+    xmlbuilder ">=1.0.0"
+
+xml2js@^0.4.17:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xmlbuilder@>=1.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55"
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+
 y18n@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"

From 0561b66a2bad8161c49a96a86a248216aa0ce89b Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Fri, 1 Jun 2018 17:01:24 +0200
Subject: [PATCH 171/582] fix(ivy): query nodes from different TemplateRefs
 inserted into one ViewContainerRef (#24254)

PR Close #24254
---
 packages/core/src/render3/di.ts           |   2 +-
 packages/core/src/render3/instructions.ts |  10 +-
 packages/core/test/render3/query_spec.ts  | 120 +++++++++++++++++++++-
 3 files changed, 126 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index a37b93bca8..1c48fc5c62 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -706,7 +706,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
     ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
         getOrCreateElementRef(di), hostTNode.tViews as TView, hostNode.data.template !,
-        getRenderer(), hostNode.queries);
+        getRenderer(), hostNode.data.queries);
   }
   return di.templateRef;
 }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index cc6659c7e6..a1d23e184b 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1514,16 +1514,20 @@ export function container(
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
   addToViewTree(currentView, index, node.data);
+
+  const queries = node.queries;
+  if (queries) {
+    // prepare place for matching nodes from views inserted into a given container
+    lContainer.queries = queries.container();
+  }
+
   createDirectivesAndLocals(localRefs);
 
   isParent = false;
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
-  const queries = node.queries;
   if (queries) {
     // check if a given container node matches
     queries.addNode(node);
-    // prepare place for matching nodes from views inserted into a given container
-    lContainer.queries = queries.container();
   }
 }
 
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 9309ec5022..133c24fdb1 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -7,9 +7,10 @@
  */
 
 import {NgForOfContext} from '@angular/common';
+import {TemplateRef, ViewContainerRef} from '@angular/core';
 
-import {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF} from '../../src/render3/di';
-import {QueryList, defineComponent, detectChanges} from '../../src/render3/index';
+import {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
+import {AttributeMarker, QueryList, defineComponent, defineDirective, detectChanges, injectViewContainerRef} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, queryRefresh} from '../../src/render3/query';
@@ -18,6 +19,7 @@ import {NgForOf, NgIf} from './common_with_def';
 import {ComponentFixture, createComponent, createDirective, renderComponent} from './render_util';
 
 
+
 /**
  * Helper function to check if a given candidate object resembles ElementRef
  * @param candidate
@@ -690,6 +692,29 @@ describe('query', () => {
 
     describe('ViewContainerRef', () => {
 
+      let directiveInstance: ViewContainerManipulatorDirective|null = null;
+
+      class ViewContainerManipulatorDirective {
+        static ngDirectiveDef = defineDirective({
+          type: ViewContainerManipulatorDirective,
+          selectors: [['', 'vc', '']],
+          factory: () => {
+            return directiveInstance =
+                       new ViewContainerManipulatorDirective(injectViewContainerRef());
+          }
+        });
+
+        constructor(private _vcRef: ViewContainerRef) {}
+
+        insertTpl(tpl: TemplateRef<{}>, ctx: {}, idx?: number) {
+          this._vcRef.createEmbeddedView(tpl, ctx, idx);
+        }
+
+        remove(index?: number) { this._vcRef.remove(index); }
+      }
+
+      beforeEach(() => { directiveInstance = null; });
+
       it('should report results in views inserted / removed by ngIf', () => {
 
         /**
@@ -782,6 +807,97 @@ describe('query', () => {
 
       });
 
+      // https://stackblitz.com/edit/angular-rrmmuf?file=src/app/app.component.ts
+      it('should report results when different instances of TemplateRef are inserted into one ViewContainerRefs',
+         () => {
+           let tpl1: TemplateRef<{}>;
+           let tpl2: TemplateRef<{}>;
+
+
+           /**
+            * <ng-template #tpl1 let-idx="idx">
+            *   <div #foo [id]="'foo1_'+idx"></div>
+            * </ng-template>
+            *
+            * <div #foo id="middle"></div>
+            *
+            * <ng-template #tpl2 let-idx="idx">
+            *   <div #foo [id]="'foo2_'+idx"></div>
+            * </ng-template>
+            *
+            * <ng-template viewInserter #vi="vi"></ng-template>
+            */
+           const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+             let tmp: any;
+             if (rf & RenderFlags.Create) {
+               query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+
+               container(1, (rf: RenderFlags, ctx: {idx: number}) => {
+                 if (rf & RenderFlags.Create) {
+                   elementStart(0, 'div', null, ['foo', '']);
+                   elementEnd();
+                 }
+                 if (rf & RenderFlags.Update) {
+                   elementProperty(0, 'id', bind('foo1_' + ctx.idx));
+                 }
+               }, null, []);
+
+               elementStart(2, 'div', ['id', 'middle'], ['foo', '']);
+               elementEnd();
+
+               container(4, (rf: RenderFlags, ctx: {idx: number}) => {
+                 if (rf & RenderFlags.Create) {
+                   elementStart(0, 'div', null, ['foo', '']);
+                   elementEnd();
+                 }
+                 if (rf & RenderFlags.Update) {
+                   elementProperty(0, 'id', bind('foo2_' + ctx.idx));
+                 }
+               }, null, []);
+
+               container(5, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
+             }
+
+             if (rf & RenderFlags.Update) {
+               tpl1 = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
+               tpl2 = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(4)));
+               queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+             }
+
+           }, [ViewContainerManipulatorDirective]);
+
+           const fixture = new ComponentFixture(Cmpt);
+           const qList = fixture.component.query;
+
+           expect(qList.length).toBe(1);
+           expect(qList.first.nativeElement.getAttribute('id')).toBe('middle');
+
+           directiveInstance !.insertTpl(tpl1 !, {idx: 0}, 0);
+           directiveInstance !.insertTpl(tpl2 !, {idx: 1}, 1);
+           fixture.update();
+           expect(qList.length).toBe(3);
+           let qListArr = qList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
+           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
+
+           directiveInstance !.insertTpl(tpl1 !, {idx: 1}, 1);
+           fixture.update();
+           expect(qList.length).toBe(4);
+           qListArr = qList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('foo1_1');
+           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('middle');
+           expect(qListArr[3].nativeElement.getAttribute('id')).toBe('foo2_1');
+
+           directiveInstance !.remove(1);
+           fixture.update();
+           expect(qList.length).toBe(3);
+           qListArr = qList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
+           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
+         });
     });
 
     describe('JS blocks', () => {

From 5db4f1a5ba932408b24dd421fd5af9e789865f4e Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 1 Jun 2018 14:46:28 -0700
Subject: [PATCH 172/582] refactor(ivy): convert TNode.index to number, general
 cleanup (#24260)

PR Close #24260
---
 packages/core/src/render3/di.ts               |  3 +-
 packages/core/src/render3/instructions.ts     | 30 +++++++++----------
 packages/core/src/render3/interfaces/node.ts  | 14 ++++-----
 .../core/src/render3/node_manipulation.ts     | 27 +++--------------
 4 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 1c48fc5c62..9058b36421 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -583,8 +583,7 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
 
     const hostTNode = vcRefHost.tNode;
     if (!hostTNode.dynamicContainerNode) {
-      hostTNode.dynamicContainerNode =
-          createTNode(TNodeType.Container, null, null, null, null, null);
+      hostTNode.dynamicContainerNode = createTNode(TNodeType.Container, -1, null, null, null, null);
     }
 
     lContainerNode.tNode = hostTNode.dynamicContainerNode;
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a1d23e184b..0cbc33810a 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -363,10 +363,10 @@ export function createLNodeObject(
  * @param data Any data that should be saved on the LNode
  */
 export function createLNode(
-    index: number | null, type: TNodeType.Element, native: RElement | RText | null,
-    name: string | null, attrs: TAttributes | null, lView?: LView | null): LElementNode;
+    index: number, type: TNodeType.Element, native: RElement | RText | null, name: string | null,
+    attrs: TAttributes | null, lView?: LView | null): LElementNode;
 export function createLNode(
-    index: number | null, type: TNodeType.View, native: null, name: null, attrs: null,
+    index: number, type: TNodeType.View, native: null, name: null, attrs: null,
     lView: LView): LViewNode;
 export function createLNode(
     index: number, type: TNodeType.Container, native: undefined, name: string | null,
@@ -375,7 +375,7 @@ export function createLNode(
     index: number, type: TNodeType.Projection, native: null, name: null, attrs: TAttributes | null,
     lProjection: LProjection): LProjectionNode;
 export function createLNode(
-    index: number | null, type: TNodeType, native: RText | RElement | null | undefined,
+    index: number, type: TNodeType, native: RText | RElement | null | undefined,
     name: string | null, attrs: TAttributes | null, state?: null | LView | LContainer |
         LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
@@ -391,7 +391,7 @@ export function createLNode(
   const node =
       createLNodeObject(type, currentView, parent, native, isState ? state as any : null, queries);
 
-  if (index === null || type === TNodeType.View) {
+  if (index === -1 || type === TNodeType.View) {
     // View nodes are not stored in data because they can be added / removed at runtime (which
     // would cause indices to change). Their TNodes are instead stored in TView.node.
     node.tNode = (state as LView).tView.node || createTNode(type, index, null, null, tParent, null);
@@ -469,7 +469,7 @@ export function renderTemplate<T>(
     rendererFactory = providedRendererFactory;
     const tView = getOrCreateTView(template, directives || null, pipes || null);
     host = createLNode(
-        null, TNodeType.Element, hostNode, null, null,
+        -1, TNodeType.Element, hostNode, null, null,
         createLView(
             -1, providedRendererFactory.createRenderer(null, null), tView, null, {},
             LViewFlags.CheckAlways, sanitizer));
@@ -509,7 +509,7 @@ export function renderEmbeddedTemplate<T>(
         lView.queries = queries.createView();
       }
 
-      viewNode = createLNode(null, TNodeType.View, null, null, null, lView);
+      viewNode = createLNode(-1, TNodeType.View, null, null, null, lView);
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
@@ -1045,7 +1045,7 @@ export function elementProperty<T>(
  * @returns the TNode object
  */
 export function createTNode(
-    type: TNodeType, index: number | null, tagName: string | null, attrs: TAttributes | null,
+    type: TNodeType, index: number, tagName: string | null, attrs: TAttributes | null,
     parent: TElementNode | TContainerNode | null, tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
@@ -1209,7 +1209,7 @@ export function elementStyleNamed<T>(
  * @param index The index of the element to update in the data array
  * @param value A value indicating if a given style should be added or removed.
  *   The expected shape of `value` is an object where keys are style names and the values
- *   are their corresponding values to set. If value is falsy than the style is remove. An absence
+ *   are their corresponding values to set. If value is falsy, then the style is removed. An absence
  *   of style does not cause that style to be removed. `NO_CHANGE` implies that no update should be
  *   performed.
  */
@@ -1620,7 +1620,7 @@ function scanForView(
       // found a view that should not be at this position - remove
       removeView(containerNode, i);
     } else {
-      // found a view with id grater than the one we are searching for
+      // found a view with id greater than the one we are searching for
       // which means that required view doesn't exist and can't be found at
       // later positions in the views array - stop the search here
       break;
@@ -2170,7 +2170,7 @@ export function bind<T>(value: T): T|NO_CHANGE {
 /**
  * Reserves slots for pure functions (`pureFunctionX` instructions)
  *
- * Binding for pure functions are store after the LNodes in the data array but before the binding.
+ * Bindings for pure functions are stored after the LNodes in the data array but before the binding.
  *
  *  ----------------------------------------------------------------------------
  *  |  LNodes ... | pure function bindings | regular bindings / interpolations |
@@ -2186,7 +2186,7 @@ export function bind<T>(value: T): T|NO_CHANGE {
  */
 export function reserveSlots(numSlots: number) {
   // Init the slots with a unique `NO_CHANGE` value so that the first change is always detected
-  // whether is happens or not during the first change detection pass - pure functions checks
+  // whether it happens or not during the first change detection pass - pure functions checks
   // might be skipped when short-circuited.
   data.length += numSlots;
   data.fill(NO_CHANGE, -numSlots);
@@ -2196,7 +2196,7 @@ export function reserveSlots(numSlots: number) {
 }
 
 /**
- * Sets up the binding index before execute any `pureFunctionX` instructions.
+ * Sets up the binding index before executing any `pureFunctionX` instructions.
  *
  * The index must be restored after the pure function is executed
  *
@@ -2451,9 +2451,9 @@ function assertDataNext(index: number, arr?: any[]) {
 }
 
 /**
- * On the first template pass the reserved slots should be set `NO_CHANGE`.
+ * On the first template pass, the reserved slots should be set `NO_CHANGE`.
  *
- * If not they might not have been actually reserved.
+ * If not, they might not have been actually reserved.
  */
 export function assertReservedSlotInitialized(slotOffset: number, numSlots: number) {
   if (firstTemplatePass) {
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 80b04fecbe..d4ac991ada 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -202,9 +202,9 @@ export interface TNode {
    * This is necessary to get from any TNode to its corresponding LNode when
    * traversing the node tree.
    *
-   * If null, this is a dynamically created container node or embedded view node.
+   * If index is -1, this is a dynamically created container node or embedded view node.
    */
-  index: number|null;
+  index: number;
 
   /**
    * This number stores two values using its bits:
@@ -363,12 +363,12 @@ export interface TTextNode extends TNode {
 /** Static data for an LContainerNode */
 export interface TContainerNode extends TNode {
   /**
-   * If number, index in the data[] array.
+   * Index in the data[] array.
    *
-   * If null, this is a dynamically created container node that isn't stored in
+   * If it's -1, this is a dynamically created container node that isn't stored in
    * data[] (e.g. when you inject ViewContainerRef) .
    */
-  index: number|null;
+  index: number;
   child: null;
 
   /**
@@ -383,8 +383,8 @@ export interface TContainerNode extends TNode {
 
 /** Static data for an LViewNode  */
 export interface TViewNode extends TNode {
-  /** If null, it's a dynamically created view*/
-  index: number|null;
+  /** If -1, it's a dynamically created view. Otherwise, it is the view block ID. */
+  index: number;
   child: TElementNode|TTextNode|TContainerNode|TProjectionNode|null;
   parent: TContainerNode|null;
   tViews: null;
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 31f6df401a..1b7403161a 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -72,14 +72,14 @@ export function getNextLNode(node: LNode): LNode|null {
     const lView = node.data as LView;
     return lView.next ? (lView.next as LView).node : null;
   }
-  return node.tNode.next ? node.view.data[node.tNode.next !.index as number] : null;
+  return node.tNode.next ? node.view.data[node.tNode.next !.index] : null;
 }
 
 /** Retrieves the first child of a given node */
 export function getChildLNode(node: LNode): LNode|null {
   if (node.tNode.child) {
     const view = node.tNode.type === TNodeType.View ? node.data as LView : node.view;
-    return view.data[node.tNode.child.index as number];
+    return view.data[node.tNode.child.index];
   }
   return null;
 }
@@ -90,9 +90,9 @@ export function getParentLNode(node: LElementNode | LTextNode | LProjectionNode)
 export function getParentLNode(node: LViewNode): LContainerNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null {
-  if (node.tNode.index === null) return null;
+  if (node.tNode.index === -1) return null;
   const parent = node.tNode.parent;
-  return parent ? node.view.data[parent.index as number] : node.view.node;
+  return parent ? node.view.data[parent.index] : node.view.node;
 }
 
 /**
@@ -510,25 +510,6 @@ export function appendChild(parent: LNode, child: RNode | null, currentView: LVi
   return false;
 }
 
-/**
- * Inserts the provided node before the correct element in the DOM.
- *
- * The element insertion might be delayed {@link canInsertNativeNode}
- *
- * @param node Node to insert
- * @param currentView Current LView
- */
-export function insertChild(node: LNode, currentView: LView): void {
-  const parent = getParentLNode(node) !;
-  if (canInsertNativeNode(parent, currentView)) {
-    let nativeSibling: RNode|null = findNextRNodeSibling(node, null);
-    const renderer = currentView.renderer;
-    isProceduralRenderer(renderer) ?
-        renderer.insertBefore(parent.native !, node.native !, nativeSibling) :
-        parent.native !.insertBefore(node.native !, nativeSibling, false);
-  }
-}
-
 /**
  * Appends a projected node to the DOM, or in the case of a projected container,
  * appends the nodes from all of the container's active views to the DOM.

From 44856bfc2f1067f1e11ebc4a0d56e5649bd70632 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 1 Jun 2018 18:14:05 -0700
Subject: [PATCH 173/582] refactor(ivy): move bindingStartIndex to TView
 (#24262)

PR Close #24262
---
 packages/core/src/render3/instructions.ts    | 49 +++++++++-----------
 packages/core/src/render3/interfaces/view.ts | 16 +++----
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 0cbc33810a..e79538ea7f 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -211,10 +211,6 @@ export function enterView(newView: LView, host: LElementNode | LViewNode | null)
   cleanup = newView && newView.cleanup;
   renderer = newView && newView.renderer;
 
-  if (newView && newView.bindingIndex < 0) {
-    newView.bindingIndex = newView.bindingStartIndex;
-  }
-
   if (host != null) {
     previousOrParentNode = host;
     isParent = true;
@@ -316,7 +312,6 @@ export function createLView<T>(
     renderer: renderer,
     tail: null,
     next: null,
-    bindingStartIndex: -1,
     bindingIndex: -1,
     template: template,
     context: context,
@@ -590,8 +585,7 @@ export function elementStart(
     index: number, name: string, attrs?: TAttributes | null,
     localRefs?: string[] | null): RElement {
   ngDevMode &&
-      assertEqual(
-          currentView.bindingStartIndex, -1, 'elements should be created before any bindings');
+      assertEqual(currentView.bindingIndex, -1, 'elements should be created before any bindings');
 
   ngDevMode && ngDevMode.rendererCreateElement++;
   const native: RElement = renderer.createElement(name);
@@ -801,7 +795,8 @@ export function createTView(
   return {
     node: null !,
     data: [],
-    childIndex: -1,  // Children set in addToViewTree(), if any
+    childIndex: -1,         // Children set in addToViewTree(), if any
+    bindingStartIndex: -1,  // Set in initBindings()
     directives: null,
     firstTemplatePass: true,
     initHooks: null,
@@ -1253,8 +1248,7 @@ export function elementStyle<T>(
  */
 export function text(index: number, value?: any): void {
   ngDevMode &&
-      assertEqual(
-          currentView.bindingStartIndex, -1, 'text nodes should be created before bindings');
+      assertEqual(currentView.bindingIndex, -1, 'text nodes should be created before bindings');
   ngDevMode && ngDevMode.rendererCreateTextNode++;
   const textNode = createTextNode(value, renderer);
   const node = createLNode(index, TNodeType.Element, textNode, null, null);
@@ -1356,8 +1350,7 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
 export function baseDirectiveCreate<T>(
     index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
   ngDevMode &&
-      assertEqual(
-          currentView.bindingStartIndex, -1, 'directives should be created before any bindings');
+      assertEqual(currentView.bindingIndex, -1, 'directives should be created before any bindings');
   ngDevMode && assertPreviousIsParent();
 
   Object.defineProperty(
@@ -1499,9 +1492,9 @@ export function createLContainer(
 export function container(
     index: number, template?: ComponentTemplate<any>, tagName?: string | null, attrs?: TAttributes,
     localRefs?: string[] | null): void {
-  ngDevMode && assertEqual(
-                   currentView.bindingStartIndex, -1,
-                   'container nodes should be created before any bindings');
+  ngDevMode &&
+      assertEqual(
+          currentView.bindingIndex, -1, 'container nodes should be created before any bindings');
 
   const currentParent = isParent ? previousOrParentNode : getParentLNode(previousOrParentNode) !;
   const lContainer = createLContainer(currentParent, currentView, template);
@@ -2149,13 +2142,13 @@ export const NO_CHANGE = {} as NO_CHANGE;
  *  (ie `bind()`, `interpolationX()`, `pureFunctionX()`)
  */
 function initBindings() {
-  ngDevMode && assertEqual(
-                   currentView.bindingStartIndex, -1,
-                   'Binding start index should only be set once, when null');
   ngDevMode && assertEqual(
                    currentView.bindingIndex, -1,
                    'Binding index should not yet be set ' + currentView.bindingIndex);
-  currentView.bindingIndex = currentView.bindingStartIndex = data.length;
+  if (currentView.tView.bindingStartIndex === -1) {
+    currentView.tView.bindingStartIndex = data.length;
+  }
+  currentView.bindingIndex = currentView.tView.bindingStartIndex;
 }
 
 /**
@@ -2176,10 +2169,10 @@ export function bind<T>(value: T): T|NO_CHANGE {
  *  |  LNodes ... | pure function bindings | regular bindings / interpolations |
  *  ----------------------------------------------------------------------------
  *                                         ^
- *                                         LView.bindingStartIndex
+ *                                         TView.bindingStartIndex
  *
- * Pure function instructions are given an offset from LView.bindingStartIndex.
- * Subtracting the offset from LView.bindingStartIndex gives the first index where the bindings
+ * Pure function instructions are given an offset from TView.bindingStartIndex.
+ * Subtracting the offset from TView.bindingStartIndex gives the first index where the bindings
  * are stored.
  *
  * NOTE: reserveSlots instructions are only ever allowed at the very end of the creation block
@@ -2204,7 +2197,7 @@ export function reserveSlots(numSlots: number) {
  */
 export function moveBindingIndexToReservedSlot(offset: number): number {
   const currentSlot = currentView.bindingIndex;
-  currentView.bindingIndex = currentView.bindingStartIndex - offset;
+  currentView.bindingIndex = currentView.tView.bindingStartIndex - offset;
   return currentSlot;
 }
 
@@ -2388,18 +2381,18 @@ export function consumeBinding(): any {
 /** Updates binding if changed, then returns whether it was updated. */
 export function bindingUpdated(value: any): boolean {
   ngDevMode && assertNotEqual(value, NO_CHANGE, 'Incoming value should never be NO_CHANGE.');
+  if (currentView.bindingIndex === -1) initBindings();
 
-  if (currentView.bindingStartIndex < 0) {
-    initBindings();
+  if (currentView.bindingIndex >= data.length) {
+    data[currentView.bindingIndex++] = value;
   } else if (isDifferent(data[currentView.bindingIndex], value)) {
     throwErrorIfNoChangesMode(
         creationMode, checkNoChangesMode, data[currentView.bindingIndex], value);
+    data[currentView.bindingIndex++] = value;
   } else {
     currentView.bindingIndex++;
     return false;
   }
-
-  data[currentView.bindingIndex++] = value;
   return true;
 }
 
@@ -2457,7 +2450,7 @@ function assertDataNext(index: number, arr?: any[]) {
  */
 export function assertReservedSlotInitialized(slotOffset: number, numSlots: number) {
   if (firstTemplatePass) {
-    const startIndex = currentView.bindingStartIndex - slotOffset;
+    const startIndex = currentView.tView.bindingStartIndex - slotOffset;
     for (let i = 0; i < numSlots; i++) {
       assertEqual(
           data[startIndex + i], NO_CHANGE,
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index b7c0c3819a..fe71585b10 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -59,14 +59,6 @@ export interface LView {
   /** Renderer to be used for this view. */
   readonly renderer: Renderer3;
 
-  /**
-   * The binding start index is the index at which the nodes array
-   * starts to store bindings only. Saving this value ensures that we
-   * will begin reading bindings at the correct point in the array when
-   * we are in update mode.
-   */
-  bindingStartIndex: number;
-
   /**
    * The binding index we should access next.
    *
@@ -240,6 +232,14 @@ export interface TView {
   /** Static data equivalent of LView.data[]. Contains TNodes. */
   data: TData;
 
+  /**
+   * The binding start index is the index at which the data array
+   * starts to store bindings only. Saving this value ensures that we
+   * will begin reading bindings at the correct point in the array when
+   * we are in update mode.
+   */
+  bindingStartIndex: number;
+
   /**
    * Index of the host node of the first LView or LContainer beneath this LView in
    * the hierarchy.

From cb6572476156067d54284b4243a5b65d99a4b5be Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 1 Jun 2018 18:54:23 -0700
Subject: [PATCH 174/582] refactor(ivy): combine lifecycleStage with LViewFlags
 (#24263)

PR Close #24263
---
 packages/core/src/render3/hooks.ts           |  7 +--
 packages/core/src/render3/instructions.ts    |  7 ++-
 packages/core/src/render3/interfaces/view.ts | 45 ++++++--------------
 3 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/packages/core/src/render3/hooks.ts b/packages/core/src/render3/hooks.ts
index 0094566580..66ba2b0de1 100644
--- a/packages/core/src/render3/hooks.ts
+++ b/packages/core/src/render3/hooks.ts
@@ -9,7 +9,8 @@
 import {assertEqual} from './assert';
 import {DirectiveDef} from './interfaces/definition';
 import {TNodeFlags} from './interfaces/node';
-import {HookData, LView, LifecycleStage, TView} from './interfaces/view';
+import {HookData, LView, LViewFlags, TView} from './interfaces/view';
+
 
 /**
  * If this is the first template pass, any ngOnInit or ngDoCheck hooks will be queued into
@@ -97,9 +98,9 @@ function queueDestroyHooks(def: DirectiveDef<any>, tView: TView, i: number): voi
  * @param currentView The current view
  */
 export function executeInitHooks(currentView: LView, tView: TView, creationMode: boolean): void {
-  if (currentView.lifecycleStage === LifecycleStage.Init) {
+  if (currentView.flags & LViewFlags.RunInit) {
     executeHooks(currentView.directives !, tView.initHooks, tView.checkHooks, creationMode);
-    currentView.lifecycleStage = LifecycleStage.AfterInit;
+    currentView.flags &= ~LViewFlags.RunInit;
   }
 }
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index e79538ea7f..ea547ab6b1 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -13,7 +13,7 @@ import {LContainer} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
-import {CurrentMatchesList, LView, LViewFlags, LifecycleStage, RootContext, TData, TView} from './interfaces/view';
+import {CurrentMatchesList, LView, LViewFlags, RootContext, TData, TView} from './interfaces/view';
 
 import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
@@ -240,7 +240,7 @@ export function leaveView(newView: LView, creationOnly?: boolean): void {
     // Views are clean and in update mode after being checked, so these bits are cleared
     currentView.flags &= ~(LViewFlags.CreationMode | LViewFlags.Dirty);
   }
-  currentView.lifecycleStage = LifecycleStage.Init;
+  currentView.flags |= LViewFlags.RunInit;
   currentView.bindingIndex = -1;
   enterView(newView, null);
 }
@@ -303,7 +303,7 @@ export function createLView<T>(
   const newView = {
     parent: currentView,
     id: viewId,  // -1 for component views
-    flags: flags | LViewFlags.CreationMode | LViewFlags.Attached,
+    flags: flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.RunInit,
     node: null !,  // until we initialize it in createNode.
     data: [],
     directives: null,
@@ -315,7 +315,6 @@ export function createLView<T>(
     bindingIndex: -1,
     template: template,
     context: context,
-    lifecycleStage: LifecycleStage.Init,
     queries: null,
     injector: currentView && currentView.injector,
     sanitizer: sanitizer || null
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index fe71585b10..5858d8a386 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -87,23 +87,6 @@ export interface LView {
    */
   cleanup: any[]|null;
 
-  /**
-   * This number tracks the next lifecycle hook that needs to be run.
-   *
-   * If lifecycleStage === LifecycleStage.ON_INIT, the init hooks haven't yet been run
-   * and should be executed by the first r() instruction that runs OR the first
-   * cR() instruction that runs (so inits are run for the top level view before any
-   * embedded views).
-   *
-   * If lifecycleStage === LifecycleStage.CONTENT_INIT, the init hooks have been run, but
-   * the content hooks have not yet been run. They should be executed on the first
-   * r() instruction that runs.
-   *
-   * If lifecycleStage === LifecycleStage.VIEW_INIT, both the init hooks and content hooks
-   * have already been run.
-   */
-  lifecycleStage: LifecycleStage;
-
   /**
    * The last LView or LContainer beneath this LView in the hierarchy.
    *
@@ -188,16 +171,25 @@ export const enum LViewFlags {
    * back into the parent view, `data` will be defined and `creationMode` will be
    * improperly reported as false.
    */
-  CreationMode = 0b0001,
+  CreationMode = 0b00001,
 
   /** Whether this view has default change detection strategy (checks always) or onPush */
-  CheckAlways = 0b0010,
+  CheckAlways = 0b00010,
 
   /** Whether or not this view is currently dirty (needing check) */
-  Dirty = 0b0100,
+  Dirty = 0b00100,
 
   /** Whether or not this view is currently attached to change detection tree. */
-  Attached = 0b1000,
+  Attached = 0b01000,
+
+  /**
+   *  Whether or not the init hooks have run.
+   *
+   * If on, the init hooks haven't yet been run and should be executed by the first component that
+   * runs OR the first cR() instruction that runs (so inits are run for the top level view before
+   * any embedded views).
+   */
+  RunInit = 0b10000,
 }
 
 /** Interface necessary to work with view tree traversal */
@@ -421,17 +413,6 @@ export interface RootContext {
  */
 export type HookData = (number | (() => void))[];
 
-/** Possible values of LView.lifecycleStage, used to determine which hooks to run.  */
-// TODO: Remove this enum when containerRefresh instructions are removed
-export const enum LifecycleStage {
-
-  /* Init hooks need to be run, if any. */
-  Init = 1,
-
-  /* Content hooks need to be run, if any. Init hooks have already run. */
-  AfterInit = 2,
-}
-
 /**
  * Static data that corresponds to the instance-specific data array on an LView.
  *

From 5794506c64491ca4e6b48fdb66342be7eb91e328 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 1 Jun 2018 19:28:20 -0700
Subject: [PATCH 175/582] refactor(ivy): move id to TView (#24264)

PR Close #24264
---
 packages/core/src/render3/component.ts        |  4 +--
 packages/core/src/render3/di.ts               |  2 +-
 packages/core/src/render3/instructions.ts     | 35 +++++++++++--------
 packages/core/src/render3/interfaces/view.ts  | 16 +++++----
 .../core/src/render3/node_manipulation.ts     |  2 +-
 packages/core/test/render3/di_spec.ts         |  2 +-
 6 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 53f7d15565..7ce6ef86bb 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -138,8 +138,8 @@ export function renderComponent<T>(
     clean: CLEAN_PROMISE,
   };
   const rootView: LView = createLView(
-      -1, rendererFactory.createRenderer(hostNode, componentDef.rendererType),
-      createTView(null, null), null, rootContext,
+      rendererFactory.createRenderer(hostNode, componentDef.rendererType),
+      createTView(-1, null, null), null, rootContext,
       componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
   rootView.injector = opts.injector || null;
 
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 9058b36421..9f7a5702cc 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -700,7 +700,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
     const hostTNode = hostNode.tNode;
     const hostTView = hostNode.view.tView;
     if (!hostTNode.tViews) {
-      hostTNode.tViews = createTView(hostTView.directiveRegistry, hostTView.pipeRegistry);
+      hostTNode.tViews = createTView(-1, hostTView.directiveRegistry, hostTView.pipeRegistry);
     }
     ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index ea547ab6b1..0533fa31ce 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -298,11 +298,10 @@ export function executeInitAndContentHooks(): void {
 }
 
 export function createLView<T>(
-    viewId: number, renderer: Renderer3, tView: TView, template: ComponentTemplate<T>| null,
-    context: T | null, flags: LViewFlags, sanitizer?: Sanitizer | null): LView {
+    renderer: Renderer3, tView: TView, template: ComponentTemplate<T>| null, context: T | null,
+    flags: LViewFlags, sanitizer?: Sanitizer | null): LView {
   const newView = {
     parent: currentView,
-    id: viewId,  // -1 for component views
     flags: flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.RunInit,
     node: null !,  // until we initialize it in createNode.
     data: [],
@@ -465,7 +464,7 @@ export function renderTemplate<T>(
     host = createLNode(
         -1, TNodeType.Element, hostNode, null, null,
         createLView(
-            -1, providedRendererFactory.createRenderer(null, null), tView, null, {},
+            providedRendererFactory.createRenderer(null, null), tView, null, {},
             LViewFlags.CheckAlways, sanitizer));
   }
   const hostView = host.data !;
@@ -497,7 +496,7 @@ export function renderEmbeddedTemplate<T>(
 
     if (viewNode == null) {
       const lView = createLView(
-          -1, renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
+          renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
       if (queries) {
         lView.queries = queries.createView();
@@ -784,14 +783,22 @@ function getOrCreateTView(
   // and not on embedded templates.
 
   return template.ngPrivateData ||
-      (template.ngPrivateData = createTView(directives, pipes) as never);
+      (template.ngPrivateData = createTView(-1, directives, pipes) as never);
 }
 
-/** Creates a TView instance */
+/**
+ * Creates a TView instance
+ *
+ * @param viewIndex The viewBlockId for inline views, or -1 if it's a component/dynamic
+ * @param directives Registry of directives for this view
+ * @param pipes Registry of pipes for this view
+ */
 export function createTView(
-    defs: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null): TView {
+    viewIndex: number, directives: DirectiveDefListOrFactory | null,
+    pipes: PipeDefListOrFactory | null): TView {
   ngDevMode && ngDevMode.tView++;
   return {
+    id: viewIndex,
     node: null !,
     data: [],
     childIndex: -1,         // Children set in addToViewTree(), if any
@@ -808,7 +815,7 @@ export function createTView(
     pipeDestroyHooks: null,
     hostBindings: null,
     components: null,
-    directiveRegistry: typeof defs === 'function' ? defs() : defs,
+    directiveRegistry: typeof directives === 'function' ? directives() : directives,
     pipeRegistry: typeof pipes === 'function' ? pipes() : pipes,
     currentMatches: null
   };
@@ -875,7 +882,7 @@ export function hostElement(
   const node = createLNode(
       0, TNodeType.Element, rNode, null, null,
       createLView(
-          -1, renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null, null,
+          renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null, null,
           def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
@@ -1324,7 +1331,6 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
   const hostView = addToViewTree(
       currentView, previousOrParentNode.tNode.index as number,
       createLView(
-          -1,
           rendererFactory.createRenderer(previousOrParentNode.native as RElement, def.rendererType),
           tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
           getCurrentSanitizer()));
@@ -1605,7 +1611,7 @@ function scanForView(
     containerNode: LContainerNode, startIdx: number, viewBlockId: number): LViewNode|null {
   const views = containerNode.data.views;
   for (let i = startIdx; i < views.length; i++) {
-    const viewAtPositionId = views[i].data.id;
+    const viewAtPositionId = views[i].data.tView.id;
     if (viewAtPositionId === viewBlockId) {
       return views[i];
     } else if (viewAtPositionId < viewBlockId) {
@@ -1642,7 +1648,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
   } else {
     // When we create a new LView, we always reset the state of the instructions.
     const newView = createLView(
-        viewBlockId, renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, null,
+        renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, null,
         LViewFlags.CheckAlways, getCurrentSanitizer());
 
     if (lContainer.queries) {
@@ -1673,7 +1679,8 @@ function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TV
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
     const tView = currentView.tView;
-    containerTViews[viewIndex] = createTView(tView.directiveRegistry, tView.pipeRegistry);
+    containerTViews[viewIndex] =
+        createTView(viewIndex, tView.directiveRegistry, tView.pipeRegistry);
   }
   return containerTViews[viewIndex];
 }
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 5858d8a386..942c1e0551 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -49,13 +49,6 @@ export interface LView {
   // TODO(kara): Remove when we have parent/child on TNodes
   readonly node: LViewNode|LElementNode;
 
-  /**
-   * ID to determine whether this view is the same as the previous view
-   * in this position. If it's not, we know this view needs to be inserted
-   * and the one that exists needs to be removed (e.g. if/else statements)
-   */
-  readonly id: number;
-
   /** Renderer to be used for this view. */
   readonly renderer: Renderer3;
 
@@ -207,6 +200,15 @@ export interface LViewOrLContainer {
  * Stored on the template function as ngPrivateData.
  */
 export interface TView {
+  /**
+   * ID for inline views to determine whether a view is the same as the previous view
+   * in a certain position. If it's not, we know the new view needs to be inserted
+   * and the one that exists needs to be removed (e.g. if/else statements)
+   *
+   * If this is -1, then this is a component view or a dynamically created view.
+   */
+  readonly id: number;
+
   /**
    * Pointer to the `TNode` that represents the root of the view.
    *
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 1b7403161a..a22c3cc088 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -426,7 +426,7 @@ function cleanUpView(view: LView): void {
   executeOnDestroys(view);
   executePipeOnDestroys(view);
   // For component views only, the local renderer is destroyed as clean up time.
-  if (view.id === -1 && isProceduralRenderer(view.renderer)) {
+  if (view.tView && view.tView.id === -1 && isProceduralRenderer(view.renderer)) {
     ngDevMode && ngDevMode.rendererDestroy++;
     view.renderer.destroy();
   }
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index c5bceace20..d4ef7d36ff 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1404,7 +1404,7 @@ describe('di', () => {
   describe('getOrCreateNodeInjector', () => {
     it('should handle initial undefined state', () => {
       const contentView =
-          createLView(-1, null !, createTView(null, null), null, null, LViewFlags.CheckAlways);
+          createLView(null !, createTView(-1, null, null), null, null, LViewFlags.CheckAlways);
       const oldView = enterView(contentView, null !);
       try {
         const parent = createLNode(0, TNodeType.Element, null, null, null, null);

From 069062236ca87a85e3ea66f23422a68b0dfa4d59 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 1 Jun 2018 22:09:01 +0200
Subject: [PATCH 176/582] docs(common): improve deprecation notices to be
 parsed by tslint

Closes: #24237
Closes: #24249
---
 packages/http/src/backends/browser_xhr.ts   |  2 +-
 packages/http/src/backends/jsonp_backend.ts |  4 ++--
 packages/http/src/backends/xhr_backend.ts   |  6 +++---
 packages/http/src/base_request_options.ts   |  4 ++--
 packages/http/src/base_response_options.ts  |  4 ++--
 packages/http/src/enums.ts                  | 10 +++++-----
 packages/http/src/headers.ts                |  2 +-
 packages/http/src/http.ts                   |  4 ++--
 packages/http/src/http_module.ts            |  4 ++--
 packages/http/src/interfaces.ts             | 10 +++++-----
 packages/http/src/static_request.ts         |  2 +-
 packages/http/src/static_response.ts        |  2 +-
 packages/http/src/url_search_params.ts      |  4 ++--
 packages/http/src/version.ts                |  2 +-
 packages/http/testing/src/mock_backend.ts   |  4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/http/src/backends/browser_xhr.ts b/packages/http/src/backends/browser_xhr.ts
index 819302b173..00ae0e60a0 100644
--- a/packages/http/src/backends/browser_xhr.ts
+++ b/packages/http/src/backends/browser_xhr.ts
@@ -13,7 +13,7 @@ import {Injectable} from '@angular/core';
  *
  * Take care not to evaluate this in non-browser contexts.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class BrowserXhr {
diff --git a/packages/http/src/backends/jsonp_backend.ts b/packages/http/src/backends/jsonp_backend.ts
index 1a9d846b5e..a3fc353b8c 100644
--- a/packages/http/src/backends/jsonp_backend.ts
+++ b/packages/http/src/backends/jsonp_backend.ts
@@ -23,7 +23,7 @@ const JSONP_ERR_WRONG_METHOD = 'JSONP requests must use GET request method.';
 /**
  * Base class for an in-flight JSONP request.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class JSONPConnection implements Connection {
   private _id: string;
@@ -136,7 +136,7 @@ export class JSONPConnection implements Connection {
 /**
  * A {@link ConnectionBackend} that uses the JSONP strategy of making requests.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class JSONPBackend extends ConnectionBackend {
diff --git a/packages/http/src/backends/xhr_backend.ts b/packages/http/src/backends/xhr_backend.ts
index 41bf5aee83..2238829b8a 100644
--- a/packages/http/src/backends/xhr_backend.ts
+++ b/packages/http/src/backends/xhr_backend.ts
@@ -28,7 +28,7 @@ const XSSI_PREFIX = /^\)\]\}',?\n/;
  * This class would typically not be created or interacted with directly inside applications, though
  * the {@link MockConnection} may be interacted with in tests.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class XHRConnection implements Connection {
   request: Request;
@@ -187,7 +187,7 @@ export class XHRConnection implements Connection {
  * with different `cookieName` and `headerName` values. See the main HTTP documentation for more
  * details.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class CookieXSRFStrategy implements XSRFStrategy {
   constructor(
@@ -225,7 +225,7 @@ export class CookieXSRFStrategy implements XSRFStrategy {
  *   }
  * }
  * ```
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class XHRBackend implements ConnectionBackend {
diff --git a/packages/http/src/base_request_options.ts b/packages/http/src/base_request_options.ts
index f245aa7790..e0acd15062 100644
--- a/packages/http/src/base_request_options.ts
+++ b/packages/http/src/base_request_options.ts
@@ -37,7 +37,7 @@ import {URLSearchParams} from './url_search_params';
  * console.log('options.url:', options.url); // https://google.com
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class RequestOptions {
   /**
@@ -200,7 +200,7 @@ export class RequestOptions {
  * console.log('req.url:', req.url); // https://google.com
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class BaseRequestOptions extends RequestOptions {
diff --git a/packages/http/src/base_response_options.ts b/packages/http/src/base_response_options.ts
index 3435c2cbba..b39c456ae3 100644
--- a/packages/http/src/base_response_options.ts
+++ b/packages/http/src/base_response_options.ts
@@ -39,7 +39,7 @@ import {ResponseOptionsArgs} from './interfaces';
  * console.log('res.json():', res.json()); // Object {name: "Jeff"}
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class ResponseOptions {
   // TODO: FormData | Blob
@@ -156,7 +156,7 @@ export class ResponseOptions {
  * console.log('res.text():', res.text()); // Angular;
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class BaseResponseOptions extends ResponseOptions {
diff --git a/packages/http/src/enums.ts b/packages/http/src/enums.ts
index c9be3538df..4152cbe3a1 100644
--- a/packages/http/src/enums.ts
+++ b/packages/http/src/enums.ts
@@ -8,7 +8,7 @@
 
 /**
  * Supported http methods.
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export enum RequestMethod {
   Get,
@@ -24,7 +24,7 @@ export enum RequestMethod {
  * All possible states in which a connection can be, based on
  * [States](http://www.w3.org/TR/XMLHttpRequest/#states) from the `XMLHttpRequest` spec, but with an
  * additional "CANCELLED" state.
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export enum ReadyState {
   Unsent,
@@ -38,7 +38,7 @@ export enum ReadyState {
 /**
  * Acceptable response types to be associated with a {@link Response}, based on
  * [ResponseType](https://fetch.spec.whatwg.org/#responsetype) from the Fetch spec.
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export enum ResponseType {
   Basic,
@@ -50,7 +50,7 @@ export enum ResponseType {
 
 /**
  * Supported content type to be automatically associated with a {@link Request}.
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export enum ContentType {
   NONE,
@@ -64,7 +64,7 @@ export enum ContentType {
 
 /**
  * Define which buffer to use to store the response
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export enum ResponseContentType {
   Text,
diff --git a/packages/http/src/headers.ts b/packages/http/src/headers.ts
index 5ae37ff3c5..9374bcbf8a 100644
--- a/packages/http/src/headers.ts
+++ b/packages/http/src/headers.ts
@@ -32,7 +32,7 @@
  * console.log(thirdHeaders.get('X-My-Custom-Header')); //'Angular'
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class Headers {
   /** @internal header names are lower case */
diff --git a/packages/http/src/http.ts b/packages/http/src/http.ts
index b4d02d728e..529fbdac2b 100644
--- a/packages/http/src/http.ts
+++ b/packages/http/src/http.ts
@@ -99,7 +99,7 @@ function mergeOptions(
  * http.get('request-from-mock-backend.json').subscribe((res:Response) => doSomething(res));
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class Http {
@@ -187,7 +187,7 @@ export class Http {
 
 
 /**
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class Jsonp extends Http {
diff --git a/packages/http/src/http_module.ts b/packages/http/src/http_module.ts
index 9706fc5f9f..89c86e935d 100644
--- a/packages/http/src/http_module.ts
+++ b/packages/http/src/http_module.ts
@@ -40,7 +40,7 @@ export function jsonpFactory(jsonpBackend: JSONPBackend, requestOptions: Request
 /**
  * The module that includes http's providers
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @NgModule({
   providers: [
@@ -60,7 +60,7 @@ export class HttpModule {
 /**
  * The module that includes jsonp's providers
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @NgModule({
   providers: [
diff --git a/packages/http/src/interfaces.ts b/packages/http/src/interfaces.ts
index e3d17fcb64..4c84b44d44 100644
--- a/packages/http/src/interfaces.ts
+++ b/packages/http/src/interfaces.ts
@@ -17,14 +17,14 @@ import {URLSearchParams} from './url_search_params';
  * The primary purpose of a `ConnectionBackend` is to create new connections to fulfill a given
  * {@link Request}.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export abstract class ConnectionBackend { abstract createConnection(request: any): Connection; }
 
 /**
  * Abstract class from which real connections are derived.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export abstract class Connection {
   readyState: ReadyState;
@@ -35,7 +35,7 @@ export abstract class Connection {
 /**
  * An XSRFStrategy configures XSRF protection (e.g. via headers) on an HTTP request.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export abstract class XSRFStrategy { abstract configureRequest(req: Request): void; }
 
@@ -43,7 +43,7 @@ export abstract class XSRFStrategy { abstract configureRequest(req: Request): vo
  * Interface for options to construct a RequestOptions, based on
  * [RequestInit](https://fetch.spec.whatwg.org/#requestinit) from the Fetch spec.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export interface RequestOptionsArgs {
   url?: string|null;
@@ -66,7 +66,7 @@ export interface RequestArgs extends RequestOptionsArgs { url: string|null; }
  * Interface for options to construct a Response, based on
  * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) from the Fetch spec.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export interface ResponseOptionsArgs {
   body?: string|Object|FormData|ArrayBuffer|Blob|null;
diff --git a/packages/http/src/static_request.ts b/packages/http/src/static_request.ts
index 4878505d6c..524c2e64bf 100644
--- a/packages/http/src/static_request.ts
+++ b/packages/http/src/static_request.ts
@@ -52,7 +52,7 @@ import {URLSearchParams} from './url_search_params';
  * });
  * ```
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class Request extends Body {
   /**
diff --git a/packages/http/src/static_response.ts b/packages/http/src/static_response.ts
index b2a3cc189f..0cdaec8bc7 100644
--- a/packages/http/src/static_response.ts
+++ b/packages/http/src/static_response.ts
@@ -32,7 +32,7 @@ import {Headers} from './headers';
  * can be accessed many times. There are other differences in the implementation, but this is the
  * most significant.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class Response extends Body {
   /**
diff --git a/packages/http/src/url_search_params.ts b/packages/http/src/url_search_params.ts
index eba62ccc91..5c9669a463 100644
--- a/packages/http/src/url_search_params.ts
+++ b/packages/http/src/url_search_params.ts
@@ -22,7 +22,7 @@ function paramParser(rawParams: string = ''): Map<string, string[]> {
   return map;
 }
 /**
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  **/
 export class QueryEncoder {
   encodeKey(k: string): string { return standardEncoding(k); }
@@ -76,7 +76,7 @@ function standardEncoding(v: string): string {
  *
  * let params = new URLSearchParams('', new MyQueryEncoder());
  * ```
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class URLSearchParams {
   paramsMap: Map<string, string[]>;
diff --git a/packages/http/src/version.ts b/packages/http/src/version.ts
index 97adbabbbb..8b6e32cb6f 100644
--- a/packages/http/src/version.ts
+++ b/packages/http/src/version.ts
@@ -14,6 +14,6 @@
 
 import {Version} from '@angular/core';
 /**
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/http/testing/src/mock_backend.ts b/packages/http/testing/src/mock_backend.ts
index 130a90d8f1..31f72d68cf 100644
--- a/packages/http/testing/src/mock_backend.ts
+++ b/packages/http/testing/src/mock_backend.ts
@@ -16,7 +16,7 @@ import {take} from 'rxjs/operators';
  *
  * Mock Connection to represent a {@link Connection} for tests.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 export class MockConnection implements Connection {
   // TODO: Name `readyState` should change to be more generic, and states could be made to be more
@@ -189,7 +189,7 @@ export class MockConnection implements Connection {
  *
  * This method only exists in the mock implementation, not in real Backends.
  *
- * @deprecated use @angular/common/http instead
+ * @deprecated see https://angular.io/guide/http
  */
 @Injectable()
 export class MockBackend implements ConnectionBackend {

From ccaa1993667e73e7a64bfc1d96ca3afa0e475a6d Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Date: Mon, 4 Jun 2018 10:20:45 -0400
Subject: [PATCH 177/582] docs(aio): remove an extraneous apostrophe (#24293)
 PR Close #24293

---
 aio/content/guide/dependency-injection.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/dependency-injection.md b/aio/content/guide/dependency-injection.md
index cf982bb931..6d29c2a0f3 100644
--- a/aio/content/guide/dependency-injection.md
+++ b/aio/content/guide/dependency-injection.md
@@ -32,7 +32,7 @@ from the [The Tour of Heroes](tutorial/).
 </code-tabs>
 
 The `HeroesComponent` is the top-level heroes component.
-It's only purpose is to display the `HeroListComponent`
+Its only purpose is to display the `HeroListComponent`
 which displays a list of hero names.
 
 This version of the `HeroListComponent` gets its `heroes` from the `HEROES` array, an in-memory collection

From 7623d7460791cb862d01cc85650a39a8603f06e1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 2 Jun 2018 10:18:11 +0200
Subject: [PATCH 178/582] docs(aio): clean up frequent ng-modules (#24025)

Closes #24017

PR Close #24025
---
 aio/content/guide/frequent-ngmodules.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/frequent-ngmodules.md b/aio/content/guide/frequent-ngmodules.md
index acd8a633b4..22b9ce9817 100644
--- a/aio/content/guide/frequent-ngmodules.md
+++ b/aio/content/guide/frequent-ngmodules.md
@@ -44,25 +44,25 @@ of some of the things they contain:
  <tr>
    <td><code>FormsModule</code></td>
    <td><code>@angular/forms</code></td>
-   <td>When you build template driven forms (includes <code>NgModel</code>)</td>
+   <td>When you want to build template driven forms (includes <code>NgModel</code>)</td>
  </tr>
 
  <tr>
    <td><code>ReactiveFormsModule</code></td>
    <td><code>@angular/forms</code></td>
-   <td>When building reactive forms</td>
+   <td>When you want to build reactive forms</td>
  </tr>
 
  <tr>
    <td><code>RouterModule</code></td>
    <td><code>@angular/router</code></td>
-   <td>For Routing and when you want to use <code>RouterLink</code>,<code>.forRoot()</code>, and <code>.forChild()</code></td>
+   <td>When you want to use <code>RouterLink</code>, <code>.forRoot()</code>, and <code>.forChild()</code></td>
  </tr>
 
  <tr>
    <td><code>HttpClientModule</code></td>
    <td><code>@angular/common/http</code></td>
-   <td>When you to talk to a server</td>
+   <td>When you want to talk to a server</td>
  </tr>
 
 </table>

From b4bbdb4ce2faf5d131ae8af224817a3216c818a5 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 30 May 2018 18:15:49 +0300
Subject: [PATCH 179/582] fix(aio): add right-margin to `.home` link (#24207)

PR Close #24207
---
 aio/src/styles/1-layouts/_top-menu.scss | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/aio/src/styles/1-layouts/_top-menu.scss b/aio/src/styles/1-layouts/_top-menu.scss
index f83ee3e5d3..928541791b 100644
--- a/aio/src/styles/1-layouts/_top-menu.scss
+++ b/aio/src/styles/1-layouts/_top-menu.scss
@@ -93,15 +93,21 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
 
 
 // HOME NAV-LINK
-.nav-link.home img {
-  position: relative;
-  margin-top: -21px;
-  top: 12px;
-  height: 40px;
+.nav-link.home {
+  cursor: pointer;
+  margin: 0 16px 0 0;
+  padding: 21px 0;
 
-  @media(max-width: 992px) {
-    &:hover {
-      transform: scale(1.1);
+  img {
+    position: relative;
+    margin-top: -21px;
+    top: 12px;
+    height: 40px;
+
+    @media(max-width: 992px) {
+      &:hover {
+        transform: scale(1.1);
+      }
     }
   }
 }
@@ -143,10 +149,6 @@ aio-top-menu {
     padding: 24px 16px;
     cursor: pointer;
 
-    &.home{
-      margin-right: 20px;
-    }
-    
     &:focus {
       background: rgba($white, 0.15);
       border-radius: 4px;

From 255463ed480d65dc111deba43614df084ad96db6 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 30 May 2018 19:20:05 +0300
Subject: [PATCH 180/582] fix(aio): remove unnecessary scrollbar in `code-tabs`
 (#24207)

PR Close #24207
---
 aio/src/styles/1-layouts/_content-layout.scss | 2 +-
 aio/src/styles/2-modules/_code.scss           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/aio/src/styles/1-layouts/_content-layout.scss b/aio/src/styles/1-layouts/_content-layout.scss
index c6034396da..4f31cd173b 100644
--- a/aio/src/styles/1-layouts/_content-layout.scss
+++ b/aio/src/styles/1-layouts/_content-layout.scss
@@ -27,7 +27,7 @@ aio-shell.page-docs {
 }
 
 .sidenav-content button {
-  min-width: 50px;
+  min-width: 24px;
 }
 
 #guide-change-log h2::before {
diff --git a/aio/src/styles/2-modules/_code.scss b/aio/src/styles/2-modules/_code.scss
index 166b6ef114..173f524274 100644
--- a/aio/src/styles/2-modules/_code.scss
+++ b/aio/src/styles/2-modules/_code.scss
@@ -97,8 +97,9 @@ aio-code pre {
 
 .copy-button {
   position: absolute;
-  top: -8px;
-  right: -32px;
+  top: -7px;
+  right: -19px;
+  padding: 0;
 
   color: $blue-grey-200;
   background-color: transparent;

From 08a18b82de003c379aa76323e65e8230e5b42a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mis=CC=8Cko=20Hevery?= <misko@hevery.com>
Date: Fri, 13 Apr 2018 17:11:21 -0700
Subject: [PATCH 181/582] refactor(common): Remove ngOnChanges from NgForOf
 (#23378)

`NgForOf` used to implement `OnChanges` and than use
`ngOnChanges` callback to detect when `ngForOf` binding
changed to update the differ. We now do the checking
manually which puts less pressure on the runtime to do
the bookkeeping and should result in minor perf improvement.

PR Close #23378
---
 packages/common/src/directives/ng_for_of.ts   | 26 +++++++++++--------
 .../bundling/todo/bundle.golden_symbols.json  |  9 -------
 packages/core/test/bundling/todo/index.ts     |  5 ----
 packages/core/test/render3/common_with_def.ts |  1 -
 tools/public_api_guard/common/common.d.ts     |  3 +--
 5 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/packages/common/src/directives/ng_for_of.ts b/packages/common/src/directives/ng_for_of.ts
index 7bffebc700..93288dc9f4 100644
--- a/packages/common/src/directives/ng_for_of.ts
+++ b/packages/common/src/directives/ng_for_of.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, Directive, DoCheck, EmbeddedViewRef, Input, IterableChangeRecord, IterableChanges, IterableDiffer, IterableDiffers, NgIterable, OnChanges, SimpleChanges, TemplateRef, TrackByFunction, ViewContainerRef, forwardRef, isDevMode} from '@angular/core';
+import {ChangeDetectorRef, Directive, DoCheck, EmbeddedViewRef, Input, IterableChangeRecord, IterableChanges, IterableDiffer, IterableDiffers, NgIterable, TemplateRef, TrackByFunction, ViewContainerRef, forwardRef, isDevMode} from '@angular/core';
 
 export class NgForOfContext<T> {
   constructor(
@@ -93,8 +93,12 @@ export class NgForOfContext<T> {
  *
  */
 @Directive({selector: '[ngFor][ngForOf]'})
-export class NgForOf<T> implements DoCheck, OnChanges {
-  @Input() ngForOf: NgIterable<T>;
+export class NgForOf<T> implements DoCheck {
+  @Input()
+  set ngForOf(ngForOf: NgIterable<T>) {
+    this._ngForOf = ngForOf;
+    this._ngForOfDirty = true;
+  }
   @Input()
   set ngForTrackBy(fn: TrackByFunction<T>) {
     if (isDevMode() && fn != null && typeof fn !== 'function') {
@@ -110,6 +114,8 @@ export class NgForOf<T> implements DoCheck, OnChanges {
 
   get ngForTrackBy(): TrackByFunction<T> { return this._trackByFn; }
 
+  private _ngForOf: NgIterable<T>;
+  private _ngForOfDirty: boolean = true;
   private _differ: IterableDiffer<T>|null = null;
   private _trackByFn: TrackByFunction<T>;
 
@@ -127,10 +133,11 @@ export class NgForOf<T> implements DoCheck, OnChanges {
     }
   }
 
-  ngOnChanges(changes: SimpleChanges): void {
-    if ('ngForOf' in changes) {
+  ngDoCheck(): void {
+    if (this._ngForOfDirty) {
+      this._ngForOfDirty = false;
       // React on ngForOf changes only once all inputs have been initialized
-      const value = changes['ngForOf'].currentValue;
+      const value = this._ngForOf;
       if (!this._differ && value) {
         try {
           this._differ = this._differs.find(value).create(this.ngForTrackBy);
@@ -140,11 +147,8 @@ export class NgForOf<T> implements DoCheck, OnChanges {
         }
       }
     }
-  }
-
-  ngDoCheck(): void {
     if (this._differ) {
-      const changes = this._differ.diff(this.ngForOf);
+      const changes = this._differ.diff(this._ngForOf);
       if (changes) this._applyChanges(changes);
     }
   }
@@ -155,7 +159,7 @@ export class NgForOf<T> implements DoCheck, OnChanges {
         (item: IterableChangeRecord<any>, adjustedPreviousIndex: number, currentIndex: number) => {
           if (item.previousIndex == null) {
             const view = this._viewContainer.createEmbeddedView(
-                this._template, new NgForOfContext<T>(null !, this.ngForOf, -1, -1), currentIndex);
+                this._template, new NgForOfContext<T>(null !, this._ngForOf, -1, -1), currentIndex);
             const tuple = new RecordViewTuple<T>(item, view);
             insertTuples.push(tuple);
           } else if (currentIndex == null) {
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index fccb3b48e3..6571af19de 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -59,27 +59,18 @@
   {
     "name": "NgIfContext"
   },
-  {
-    "name": "NgOnChangesFeature"
-  },
   {
     "name": "Optional"
   },
   {
     "name": "PARAMETERS"
   },
-  {
-    "name": "PRIVATE_PREFIX"
-  },
   {
     "name": "ROOT_DIRECTIVE_INDICES"
   },
   {
     "name": "RecordViewTuple"
   },
-  {
-    "name": "SimpleChange"
-  },
   {
     "name": "SkipSelf"
   },
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index d5694a3407..579335ce45 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -160,11 +160,6 @@ if (!(NgIf as any).ngDirectiveDef) {
     selectors: [['', 'ngFor', '', 'ngForOf', '']],
     factory: () => new NgForOf(
                  injectViewContainerRef(), injectTemplateRef(), directiveInject(IterableDiffers)),
-    features: [NgOnChangesFeature({
-      ngForOf: 'ngForOf',
-      ngForTrackBy: 'ngForTrackBy',
-      ngForTemplate: 'ngForTemplate',
-    })],
     inputs: {
       ngForOf: 'ngForOf',
       ngForTrackBy: 'ngForTrackBy',
diff --git a/packages/core/test/render3/common_with_def.ts b/packages/core/test/render3/common_with_def.ts
index 41975dad0e..9f3742fd3b 100644
--- a/packages/core/test/render3/common_with_def.ts
+++ b/packages/core/test/render3/common_with_def.ts
@@ -20,7 +20,6 @@ NgForOf.ngDirectiveDef = defineDirective({
   selectors: [['', 'ngForOf', '']],
   factory: () => new NgForOfDef(
                injectViewContainerRef(), injectTemplateRef(), directiveInject(IterableDiffers)),
-  features: [NgOnChangesFeature()],
   inputs: {
     ngForOf: 'ngForOf',
     ngForTrackBy: 'ngForTrackBy',
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index 0ba2b7ba56..1c04dc1595 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -240,13 +240,12 @@ export declare class NgComponentOutlet implements OnChanges, OnDestroy {
     ngOnDestroy(): void;
 }
 
-export declare class NgForOf<T> implements DoCheck, OnChanges {
+export declare class NgForOf<T> implements DoCheck {
     ngForOf: NgIterable<T>;
     ngForTemplate: TemplateRef<NgForOfContext<T>>;
     ngForTrackBy: TrackByFunction<T>;
     constructor(_viewContainer: ViewContainerRef, _template: TemplateRef<NgForOfContext<T>>, _differs: IterableDiffers);
     ngDoCheck(): void;
-    ngOnChanges(changes: SimpleChanges): void;
 }
 
 export declare class NgForOfContext<T> {

From 83a06863f9dbfaa5523e3485627c070de7ff8984 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 4 Jun 2018 10:00:08 -0700
Subject: [PATCH 182/582] docs: rename the "aio" component to "docs-infra"
 (#24295)

The legacy "aio" is still active for currently pending PRs,
The GH label has been renamed as well

PR Close #24295
---
 docs/TRIAGE_AND_LABELS.md                         | 2 +-
 tools/validate-commit-message/commit-message.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md
index 5894e23e00..979da15af5 100644
--- a/docs/TRIAGE_AND_LABELS.md
+++ b/docs/TRIAGE_AND_LABELS.md
@@ -12,7 +12,7 @@ The owner of the component is then responsible for the secondary / component-lev
 The caretaker should be able to determine which component the issue belongs to.
 The components have a clear piece of source code associated with it within the `/packages/` folder of this repo.
 
-* `comp: aio` - the angular.io application
+* `comp: docs-infra` - the angular.io application
 * `comp: animations`
 * `comp: bazel` - @angular/bazel rules
 * `comp: benchpress`
diff --git a/tools/validate-commit-message/commit-message.json b/tools/validate-commit-message/commit-message.json
index 8fb2dd5f2d..089fc4bff9 100644
--- a/tools/validate-commit-message/commit-message.json
+++ b/tools/validate-commit-message/commit-message.json
@@ -21,6 +21,7 @@
     "compiler",
     "compiler-cli",
     "core",
+    "docs-infra",
     "elements",
     "forms",
     "http",

From 9c403753e2158fb69e2a7bb72a529e6ac19f3aca Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 5 Jun 2018 10:11:43 -0700
Subject: [PATCH 183/582] refactor(ivy): misc minor fixes in the JIT compiler
 (#24308)

PR Close #24308
---
 packages/core/src/render3/jit/module.ts | 52 ++++++++++++++++---------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 769d0f3413..2ebbac9c13 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -29,34 +29,47 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
 
   // Compute transitiveCompileScope
   const transitiveCompileScope = {
-    directives: [] as any[],
-    pipes: [] as any[],
+    directives: new Set<any>(),
+    pipes: new Set<any>(),
+    modules: new Set<any>(),
   };
 
   function addExportsFrom(module: Type<any>& {ngModuleDef: NgModuleDef<any>}): void {
-    module.ngModuleDef.exports.forEach((exp: any) => {
-      if (isNgModule(exp)) {
-        addExportsFrom(exp);
-      } else if (exp.ngPipeDef) {
-        transitiveCompileScope.pipes.push(exp);
-      } else {
-        transitiveCompileScope.directives.push(exp);
-      }
-    });
+    if (!transitiveCompileScope.modules.has(module)) {
+      module.ngModuleDef.exports.forEach((exp: any) => {
+        if (isNgModule(exp)) {
+          addExportsFrom(exp);
+        } else if (exp.ngPipeDef) {
+          transitiveCompileScope.pipes.add(exp);
+        } else {
+          transitiveCompileScope.directives.add(exp);
+        }
+      });
+    }
   }
 
-  flatten([(ngModule.imports || EMPTY_ARRAY), (ngModule.exports || EMPTY_ARRAY)])
-      .filter(importExport => isNgModule(importExport))
-      .forEach(mod => addExportsFrom(mod));
+  flatten([
+    (ngModule.imports || EMPTY_ARRAY), (ngModule.exports || EMPTY_ARRAY)
+  ]).forEach(importExport => {
+    const maybeModule = expandModuleWithProviders(importExport);
+    if (isNgModule(maybeModule)) {
+      addExportsFrom(maybeModule);
+    }
+  });
 
   flatten(ngModule.declarations || EMPTY_ARRAY).forEach(decl => {
     if (decl.ngPipeDef) {
-      transitiveCompileScope.pipes.push(decl);
+      transitiveCompileScope.pipes.add(decl);
+    } else if (decl.ngDirectiveDef) {
+      transitiveCompileScope.directives.add(decl);
     } else if (decl.ngComponentDef) {
-      transitiveCompileScope.directives.push(decl);
+      transitiveCompileScope.directives.add(decl);
       patchComponentWithScope(decl, type as any);
     } else {
-      transitiveCompileScope.directives.push(decl);
+      // A component that has not been compiled yet because the template is being fetched
+      // we need to store a reference to the module to update the selector scope after
+      // the component gets compiled
+      transitiveCompileScope.directives.add(decl);
       decl.ngSelectorScope = type;
     }
   });
@@ -77,7 +90,10 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
         };
         const res = compileR3NgModule(meta);
         def = jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngModuleDef.js`);
-        def.transitiveCompileScope = transitiveCompileScope;
+        def.transitiveCompileScope = {
+          directives: Array.from(transitiveCompileScope.directives),
+          pipes: Array.from(transitiveCompileScope.pipes),
+        };
       }
       return def;
     },

From b750919ce05c152321a41a5e89761f723f3ffc47 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Thu, 31 May 2018 15:45:46 +0200
Subject: [PATCH 184/582] feat(ivy): implement ViewContainerRef.remove (#24221)

PR Close #24221
---
 packages/core/src/render3/STATUS.md           |  35 ++--
 packages/core/src/render3/component.ts        |   4 +-
 packages/core/src/render3/di.ts               |  24 +--
 packages/core/src/render3/instructions.ts     |  17 +-
 packages/core/src/render3/interfaces/view.ts  |  13 +-
 .../core/src/render3/node_manipulation.ts     | 157 ++++++++++++------
 packages/core/src/render3/query.ts            |   4 +-
 packages/core/src/render3/view_ref.ts         |  64 +++----
 .../bundling/todo/bundle.golden_symbols.json  |  15 +-
 .../core/test/render3/imported_renderer2.ts   |  10 +-
 packages/core/test/render3/query_list_spec.ts |   8 +
 packages/core/test/render3/query_spec.ts      |  57 ++++++-
 .../test/render3/renderer_factory_spec.ts     |   6 -
 .../test/render3/view_container_ref_spec.ts   | 115 ++++++++++++-
 14 files changed, 374 insertions(+), 155 deletions(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 2468ba56be..944c91574f 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -238,22 +238,25 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 ### `______Ref`s
 | Method                 | View Container Ref | Template Ref | Embeded View Ref | View Ref | Element Ref | Change Detection Ref |
 | ---------------------- | ------------------ | ------------ | ---------------- | -------- | ----------- | -------------------- |
-| `clear()`              |  ❌                | n/a          | n/a              | n/a      | n/a         | n/a                  |
-| `get()`                |  ❌                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `clear()`              |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `get()`                |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `createEmbededView()`  |  ✅                | ✅           | n/a              | n/a      | n/a         | n/a                  |
-| `createComponent()`    |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `createComponent()`    |  ❌                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `insert()`             |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
-| `move()`               |  ❌                | n/a          | n/a              | n/a      | n/a         | n/a                  |
-| `indexOf()`            |  ❌                | n/a          | n/a              | n/a      | n/a         | n/a                  |
-| `destroy()`            | n/a                | n/a          |  ❌              | ❌       | n/a         | n/a                  |
-| `destroyed`            | n/a                | n/a          |  ❌              | ❌       | n/a         | n/a                  |
-| `onDestroy()`          | n/a                | n/a          |  ❌              | ❌       | n/a         | n/a                  |
-| `markForCheck()`       | n/a                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
-| `detach()`             |  ❌                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
-| `detachChanges()`      | n/a                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
-| `checkNoChanges()`     | n/a                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
-| `reattach()`           | n/a                | n/a          |  ❌              | n/a      | n/a         | ✅                   |
-| `nativeElement()`      | n/a                | n/a          | n/a              | n/a      |  ✅         | n/a                  |
+| `move()`               |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `indexOf()`            |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `length()`             |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `remove()`             |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `destroy()`            | n/a                | n/a          |  ✅              | ✅       | n/a         | n/a                  |
+| `destroyed`            | n/a                | n/a          |  ✅              | ✅       | n/a         | n/a                  |
+| `onDestroy()`          | n/a                | n/a          |  ✅              | ✅       | n/a         | n/a                  |
+| `markForCheck()`       | n/a                | n/a          |  ✅              | ✅       | n/a         | ✅                   |
+| `detach()`             |  ✅                | n/a          |  ✅              | ✅       | n/a         | ✅                   |
+| `detachChanges()`      | n/a                | n/a          |  ✅              | ✅       | n/a         | ✅                   |
+| `checkNoChanges()`     | n/a                | n/a          |  ✅              | ✅       | n/a         | ✅                   |
+| `reattach()`           | n/a                | n/a          |  ✅              | ✅       | n/a         | ✅                   |
+| `nativeElement()`      | n/a                | n/a          | n/a              | n/a     |  ✅         | n/a                  |
+| `elementRef`           | n/a                | ✅           | n/a              | n/a      |  n/a        | n/a                  |
 
 ### Renderer2
 | Method                              | Runtime |
@@ -268,8 +271,8 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `insertBefore()`                    |  ✅     |
 | `removeChild()`                     |  ✅     |
 | `selectRootElement()`               |  ✅     |
-| `parentNode()`                      |  ❌     |
-| `nextSibling()`                     |  ❌     |
+| `parentNode()`                      |  n/a    |
+| `nextSibling()`                     |  n/a    |
 | `setAttribute()`                    |  ✅     |
 | `removeAttribute()`                 |  ✅     |
 | `addClass()`                        |  ✅     |
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 7ce6ef86bb..3049cd8de2 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -21,7 +21,7 @@ import {LElementNode, TNodeFlags} from './interfaces/node';
 import {RElement, RendererFactory3, domRendererFactory3} from './interfaces/renderer';
 import {LView, LViewFlags, RootContext} from './interfaces/view';
 import {stringify} from './util';
-import {createViewRef} from './view_ref';
+import {ViewRef} from './view_ref';
 
 
 
@@ -82,7 +82,7 @@ export function createComponentRef<T>(
     componentType: ComponentType<T>, opts: CreateComponentOptions): viewEngine_ComponentRef<T> {
   const component = renderComponent(componentType, opts);
   const hostView = _getComponentHostLElementNode(component).data as LView;
-  const hostViewRef = createViewRef(hostView, component);
+  const hostViewRef = new ViewRef(hostView, component);
   return {
     location: {nativeElement: getHostElement(component)},
     injector: opts.injector || NULL_INJECTOR,
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 9f7a5702cc..ba5a71bb76 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -27,9 +27,9 @@ import {LQueries, QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {LView, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
-import {getParentLNode, insertView, removeView} from './node_manipulation';
+import {detachView, getParentLNode, insertView, removeView} from './node_manipulation';
 import {notImplemented, stringify} from './util';
-import {EmbeddedViewRef, ViewRef, addDestroyable, createViewRef} from './view_ref';
+import {EmbeddedViewRef, ViewRef} from './view_ref';
 
 
 
@@ -282,7 +282,7 @@ export function getOrCreateChangeDetectorRef(
 
   const currentNode = di.node;
   if (isComponent(currentNode.tNode)) {
-    return di.changeDetectorRef = createViewRef(currentNode.data as LView, context);
+    return di.changeDetectorRef = new ViewRef(currentNode.data as LView, context);
   } else if (currentNode.tNode.type === TNodeType.Element) {
     return di.changeDetectorRef = getOrCreateHostChangeDetector(currentNode.view.node);
   }
@@ -298,7 +298,7 @@ function getOrCreateHostChangeDetector(currentNode: LViewNode | LElementNode):
 
   return existingRef ?
       existingRef :
-      createViewRef(
+      new ViewRef(
           hostNode.data as LView,
           hostNode.view
               .directives ![hostNode.tNode.flags >> TNodeFlags.DirectiveStartingIndexShift]);
@@ -638,9 +638,14 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
   }
 
   insert(viewRef: viewEngine_ViewRef, index?: number): viewEngine_ViewRef {
+    if (viewRef.destroyed) {
+      throw new Error('Cannot insert a destroyed View in a ViewContainer!');
+    }
     const lViewNode = (viewRef as EmbeddedViewRef<any>)._lViewNode;
     const adjustedIdx = this._adjustIndex(index);
 
+    (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
+
     insertView(this._lContainerNode, lViewNode, adjustedIdx);
     // invalidate cache of next sibling RNode (we do similar operation in the containerRefreshEnd
     // instruction)
@@ -661,15 +666,14 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
   indexOf(viewRef: viewEngine_ViewRef): number { return this._viewRefs.indexOf(viewRef); }
 
   remove(index?: number): void {
-    this.detach(index);
-    // TODO(ml): proper destroy of the ViewRef, i.e. recursively destroy the LviewNode and its
-    // children, delete DOM nodes and QueryList, trigger hooks (onDestroy), destroy the renderer,
-    // detach projected nodes
+    const adjustedIdx = this._adjustIndex(index, -1);
+    removeView(this._lContainerNode, adjustedIdx);
+    this._viewRefs.splice(adjustedIdx, 1);
   }
 
   detach(index?: number): viewEngine_ViewRef|null {
     const adjustedIdx = this._adjustIndex(index, -1);
-    removeView(this._lContainerNode, adjustedIdx);
+    detachView(this._lContainerNode, adjustedIdx);
     return this._viewRefs.splice(adjustedIdx, 1)[0] || null;
   }
 
@@ -723,6 +727,6 @@ class TemplateRef<T> implements viewEngine_TemplateRef<T> {
   createEmbeddedView(context: T): viewEngine_EmbeddedViewRef<T> {
     const viewNode = renderEmbeddedTemplate(
         null, this._tView, this._template, context, this._renderer, this._queries);
-    return addDestroyable(new EmbeddedViewRef(viewNode, this._template, context));
+    return new EmbeddedViewRef(viewNode, this._template, context);
   }
 }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 0533fa31ce..5c1fdcad56 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -81,7 +81,7 @@ let renderer: Renderer3;
 let rendererFactory: RendererFactory3;
 
 export function getRenderer(): Renderer3 {
-  // top level variables should not be exported for performance reason (PERF_NOTES.md)
+  // top level variables should not be exported for performance reasons (PERF_NOTES.md)
   return renderer;
 }
 
@@ -93,7 +93,7 @@ export function getCurrentSanitizer(): Sanitizer|null {
 let previousOrParentNode: LNode;
 
 export function getPreviousOrParentNode(): LNode {
-  // top level variables should not be exported for performance reason (PERF_NOTES.md)
+  // top level variables should not be exported for performance reasons (PERF_NOTES.md)
   return previousOrParentNode;
 }
 
@@ -126,7 +126,7 @@ let currentView: LView = null !;
 let currentQueries: LQueries|null;
 
 export function getCurrentQueries(QueryType: {new (): LQueries}): LQueries {
-  // top level variables should not be exported for performance reason (PERF_NOTES.md)
+  // top level variables should not be exported for performance reasons (PERF_NOTES.md)
   return currentQueries || (currentQueries = new QueryType());
 }
 
@@ -136,7 +136,7 @@ export function getCurrentQueries(QueryType: {new (): LQueries}): LQueries {
 let creationMode: boolean;
 
 export function getCreationMode(): boolean {
-  // top level variables should not be exported for performance reason (PERF_NOTES.md)
+  // top level variables should not be exported for performance reasons (PERF_NOTES.md)
   return creationMode;
 }
 
@@ -173,6 +173,11 @@ let directives: any[]|null;
  */
 let cleanup: any[]|null;
 
+export function getCleanup(): any[] {
+  // top level variables should not be exported for performance reasons (PERF_NOTES.md)
+  return cleanup || (cleanup = currentView.cleanup = []);
+}
+
 /**
  * In this mode, any changes in bindings will throw an ExpressionChangedAfterChecked error.
  *
@@ -913,7 +918,7 @@ export function listener(
 
   // In order to match current behavior, native DOM event listeners must be added for all
   // events (including outputs).
-  const cleanupFns = cleanup || (cleanup = currentView.cleanup = []);
+  const cleanupFns = getCleanup();
   ngDevMode && ngDevMode.rendererAddEventListener++;
   if (isProceduralRenderer(renderer)) {
     const wrappedListener = wrapListenerWithDirtyLogic(currentView, listenerFn);
@@ -947,7 +952,7 @@ function createOutput(outputs: PropertyAliasValue, listener: Function): void {
   for (let i = 0; i < outputs.length; i += 2) {
     ngDevMode && assertDataInRange(outputs[i] as number, directives !);
     const subscription = directives ![outputs[i] as number][outputs[i + 1]].subscribe(listener);
-    cleanup !.push(subscription.unsubscribe, subscription);
+    getCleanup().push(subscription.unsubscribe, subscription);
   }
 }
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 942c1e0551..4d702169c8 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -164,16 +164,16 @@ export const enum LViewFlags {
    * back into the parent view, `data` will be defined and `creationMode` will be
    * improperly reported as false.
    */
-  CreationMode = 0b00001,
+  CreationMode = 0b000001,
 
   /** Whether this view has default change detection strategy (checks always) or onPush */
-  CheckAlways = 0b00010,
+  CheckAlways = 0b000010,
 
   /** Whether or not this view is currently dirty (needing check) */
-  Dirty = 0b00100,
+  Dirty = 0b000100,
 
   /** Whether or not this view is currently attached to change detection tree. */
-  Attached = 0b01000,
+  Attached = 0b001000,
 
   /**
    *  Whether or not the init hooks have run.
@@ -182,7 +182,10 @@ export const enum LViewFlags {
    * runs OR the first cR() instruction that runs (so inits are run for the top level view before
    * any embedded views).
    */
-  RunInit = 0b10000,
+  RunInit = 0b010000,
+
+  /** Whether or not this view is destroyed. */
+  Destroyed = 0b100000,
 }
 
 /** Interface necessary to work with view tree traversal */
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index a22c3cc088..257c6e97b8 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -12,7 +12,7 @@ import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces
 import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
-import {HookData, LView, LViewOrLContainer, TView, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
+import {HookData, LView, LViewFlags, LViewOrLContainer, TView, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
 import {assertNodeType} from './node_assert';
 import {stringify} from './util';
 
@@ -149,17 +149,72 @@ function getNextOrParentSiblingNode(initialNode: LNode, rootNode: LNode): LNode|
  * @returns RNode The first RNode of the given LNode or null if there is none.
  */
 function findFirstRNode(rootNode: LNode): RElement|RText|null {
-  let node: LNode|null = rootNode;
+  return walkLNodeTree(rootNode, rootNode, WalkLNodeTreeAction.Find) || null;
+}
+
+const enum WalkLNodeTreeAction {
+  /** returns the first available native node */
+  Find = 0,
+
+  /** node insert in the native environment */
+  Insert = 1,
+
+  /** node detach from the native environment */
+  Detach = 2,
+
+  /** node destruction using the renderer's API */
+  Destroy = 3,
+}
+
+/**
+ * Walks a tree of LNodes, applying a transformation on the LElement nodes, either only on the first
+ * one found, or on all of them.
+ * NOTE: for performance reasons, the possible actions are inlined within the function instead of
+ * being passed as an argument.
+ *
+ * @param startingNode the node from which the walk is started.
+ * @param rootNode the root node considered.
+ * @param action Identifies the action to be performed on the LElement nodes.
+ * @param renderer Optional the current renderer, required for action modes 1, 2 and 3.
+ * @param renderParentNode Optionnal the render parent node to be set in all LContainerNodes found,
+ * required for action modes 1 and 2.
+ * @param beforeNode Optionnal the node before which elements should be added, required for action
+ * modes 1.
+ */
+function walkLNodeTree(
+    startingNode: LNode | null, rootNode: LNode, action: WalkLNodeTreeAction, renderer?: Renderer3,
+    renderParentNode?: LElementNode | null, beforeNode?: RNode | null) {
+  let node: LNode|null = startingNode;
   while (node) {
     let nextNode: LNode|null = null;
     if (node.tNode.type === TNodeType.Element) {
-      // A LElementNode has a matching RNode in LElementNode.native
-      return (node as LElementNode).native;
+      // Execute the action
+      if (action === WalkLNodeTreeAction.Find) {
+        return node.native;
+      } else if (action === WalkLNodeTreeAction.Insert) {
+        const parent = renderParentNode !.native;
+        isProceduralRenderer(renderer !) ?
+            (renderer as ProceduralRenderer3)
+                .insertBefore(parent !, node.native !, beforeNode as RNode | null) :
+            parent !.insertBefore(node.native !, beforeNode as RNode | null, true);
+      } else if (action === WalkLNodeTreeAction.Detach) {
+        const parent = renderParentNode !.native;
+        isProceduralRenderer(renderer !) ?
+            (renderer as ProceduralRenderer3).removeChild(parent as RElement, node.native !) :
+            parent !.removeChild(node.native !);
+      } else if (action === WalkLNodeTreeAction.Destroy) {
+        ngDevMode && ngDevMode.rendererDestroyNode++;
+        (renderer as ProceduralRenderer3).destroyNode !(node.native !);
+      }
+      nextNode = getNextLNode(node);
     } else if (node.tNode.type === TNodeType.Container) {
       const lContainerNode: LContainerNode = (node as LContainerNode);
       const childContainerData: LContainer = lContainerNode.dynamicLContainerNode ?
           lContainerNode.dynamicLContainerNode.data :
           lContainerNode.data;
+      if (renderParentNode) {
+        childContainerData.renderParent = renderParentNode;
+      }
       nextNode =
           childContainerData.views.length ? getChildLNode(childContainerData.views[0]) : null;
     } else if (node.tNode.type === TNodeType.Projection) {
@@ -172,7 +227,6 @@ function findFirstRNode(rootNode: LNode): RElement|RText|null {
 
     node = nextNode === null ? getNextOrParentSiblingNode(node, rootNode) : nextNode;
   }
-  return null;
 }
 
 export function createTextNode(value: any, renderer: Renderer3): RText {
@@ -204,46 +258,12 @@ export function addRemoveViewFromContainer(
   ngDevMode && assertNodeType(rootNode, TNodeType.View);
   const parentNode = container.data.renderParent;
   const parent = parentNode ? parentNode.native : null;
-  let node: LNode|null = getChildLNode(rootNode);
   if (parent) {
-    while (node) {
-      let nextNode: LNode|null = null;
-      const renderer = container.view.renderer;
-      if (node.tNode.type === TNodeType.Element) {
-        if (insertMode) {
-          isProceduralRenderer(renderer) ?
-              renderer.insertBefore(parent, node.native !, beforeNode as RNode | null) :
-              parent.insertBefore(node.native !, beforeNode as RNode | null, true);
-        } else {
-          if (isProceduralRenderer(renderer)) {
-            renderer.removeChild(parent as RElement, node.native !);
-            if (renderer.destroyNode) {
-              ngDevMode && ngDevMode.rendererDestroyNode++;
-              renderer.destroyNode(node.native !);
-            }
-          } else {
-            parent.removeChild(node.native !);
-          }
-        }
-        nextNode = getNextLNode(node);
-      } else if (node.tNode.type === TNodeType.Container) {
-        // if we get to a container, it must be a root node of a view because we are only
-        // propagating down into child views / containers and not child elements
-        const childContainerData: LContainer = (node as LContainerNode).data;
-        childContainerData.renderParent = parentNode;
-        nextNode =
-            childContainerData.views.length ? getChildLNode(childContainerData.views[0]) : null;
-      } else if (node.tNode.type === TNodeType.Projection) {
-        nextNode = (node as LProjectionNode).data.head;
-      } else {
-        nextNode = getChildLNode(node as LViewNode);
-      }
-      if (nextNode === null) {
-        node = getNextOrParentSiblingNode(node, rootNode);
-      } else {
-        node = nextNode;
-      }
-    }
+    let node: LNode|null = getChildLNode(rootNode);
+    const renderer = container.view.renderer;
+    walkLNodeTree(
+        node, rootNode, insertMode ? WalkLNodeTreeAction.Insert : WalkLNodeTreeAction.Detach,
+        renderer, parentNode, beforeNode);
   }
 }
 
@@ -350,36 +370,51 @@ export function insertView(
     addRemoveViewFromContainer(container, viewNode, true, beforeNode);
   }
 
+  // Sets the attached flag
+  viewNode.data.flags |= LViewFlags.Attached;
+
   return viewNode;
 }
 
 /**
- * Removes a view from a container.
+ * Detaches a view from a container.
  *
  * This method splices the view from the container's array of active views. It also
- * removes the view's elements from the DOM and conducts cleanup (e.g. removing
- * listeners, calling onDestroys).
+ * removes the view's elements from the DOM.
  *
- * @param container The container from which to remove a view
- * @param removeIndex The index of the view to remove
- * @returns The removed view
+ * @param container The container from which to detach a view
+ * @param removeIndex The index of the view to detach
+ * @returns The detached view
  */
-export function removeView(container: LContainerNode, removeIndex: number): LViewNode {
+export function detachView(container: LContainerNode, removeIndex: number): LViewNode {
   const views = container.data.views;
   const viewNode = views[removeIndex];
   if (removeIndex > 0) {
     views[removeIndex - 1].data.next = viewNode.data.next as LView;
   }
   views.splice(removeIndex, 1);
-  destroyViewTree(viewNode.data);
   addRemoveViewFromContainer(container, viewNode, false);
-
   // Notify query that view has been removed
   const removedLview = viewNode.data;
   if (removedLview.queries) {
     removedLview.queries.removeView(removeIndex);
   }
+  // Unsets the attached flag
+  viewNode.data.flags &= ~LViewFlags.Attached;
+  return viewNode;
+}
 
+/**
+ * Removes a view from a container, i.e. detaches it and then destroys the underlying LView.
+ *
+ * @param container The container from which to remove a view
+ * @param removeIndex The index of the view to remove
+ * @returns The removed view
+ */
+export function removeView(container: LContainerNode, removeIndex: number): LViewNode {
+  const viewNode = container.data.views[removeIndex];
+  detachView(container, removeIndex);
+  destroyLView(viewNode.data);
   return viewNode;
 }
 
@@ -392,6 +427,22 @@ export function getLViewChild(view: LView): LView|LContainer|null {
   return hostNode.data ? hostNode.data : (hostNode.dynamicLContainerNode as LContainerNode).data;
 }
 
+/**
+ * A standalone function which destroys an LView,
+ * conducting cleanup (e.g. removing listeners, calling onDestroys).
+ *
+ * @param view The view to be destroyed.
+ */
+export function destroyLView(view: LView) {
+  const renderer = view.renderer;
+  if (isProceduralRenderer(renderer) && renderer.destroyNode) {
+    walkLNodeTree(view.node, view.node, WalkLNodeTreeAction.Destroy, renderer);
+  }
+  destroyViewTree(view);
+  // Sets the destroyed flag
+  view.flags |= LViewFlags.Destroyed;
+}
+
 /**
  * Determines which LViewOrLContainer to jump to when traversing back up the
  * tree in destroyViewTree.
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 21a69f8ff3..7e3f029848 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -17,7 +17,7 @@ import {getSymbolIterator} from '../util';
 
 import {assertEqual, assertNotNull} from './assert';
 import {ReadFromInjectorFn, getOrCreateNodeInjectorForNode} from './di';
-import {assertPreviousIsParent, getCurrentQueries, store} from './instructions';
+import {assertPreviousIsParent, getCleanup, getCurrentQueries, store} from './instructions';
 import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
 import {LInjector, unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {LContainerNode, LElementNode, LNode, TNode, TNodeFlags, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
@@ -416,7 +416,7 @@ export function query<T>(
   const queryList = new QueryList<T>();
   const queries = getCurrentQueries(LQueries_);
   queries.track(queryList, predicate, descend, read);
-
+  getCleanup().push(queryList.destroy, queryList);
   if (memoryIndex != null) {
     store(memoryIndex, queryList);
   }
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 44b7682927..4d912ffc55 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -6,19 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef} from '../linker/view_ref';
 
 import {checkNoChanges, detectChanges, markViewDirty} from './instructions';
 import {ComponentTemplate} from './interfaces/definition';
 import {LViewNode} from './interfaces/node';
 import {LView, LViewFlags} from './interfaces/view';
-import {notImplemented} from './util';
+import {destroyLView} from './node_manipulation';
 
 export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
   context: T;
   rootNodes: any[];
 
-  constructor(private _view: LView, context: T|null, ) { this.context = context !; }
+  constructor(protected _view: LView, context: T|null) { this.context = context !; }
 
   /** @internal */
   _setComponentContext(view: LView, context: T) {
@@ -26,9 +27,15 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
     this.context = context;
   }
 
-  destroy(): void { notImplemented(); }
-  destroyed: boolean;
-  onDestroy(callback: Function) { notImplemented(); }
+  get destroyed(): boolean {
+    return (this._view.flags & LViewFlags.Destroyed) === LViewFlags.Destroyed;
+  }
+
+  destroy(): void { destroyLView(this._view); }
+
+  onDestroy(callback: Function) {
+    (this._view.cleanup || (this._view.cleanup = [])).push(callback, null);
+  }
 
   /**
    * Marks a view and all of its ancestors dirty.
@@ -213,48 +220,21 @@ export class EmbeddedViewRef<T> extends ViewRef<T> {
    * @internal
    */
   _lViewNode: LViewNode;
+  private _viewContainerRef: viewEngine_ViewContainerRef|null = null;
 
   constructor(viewNode: LViewNode, template: ComponentTemplate<T>, context: T) {
     super(viewNode.data, context);
     this._lViewNode = viewNode;
   }
-}
 
-/**
- * Creates a ViewRef bundled with destroy functionality.
- *
- * @param context The context for this view
- * @returns The ViewRef
- */
-export function createViewRef<T>(view: LView | null, context: T): ViewRef<T> {
-  // TODO: add detectChanges back in when implementing ChangeDetectorRef.detectChanges
-  return addDestroyable(new ViewRef(view !, context));
-}
+  destroy(): void {
+    if (this._viewContainerRef &&
+        (this._view.flags & LViewFlags.Attached) === LViewFlags.Attached) {
+      this._viewContainerRef.detach(this._viewContainerRef.indexOf(this));
+      this._viewContainerRef = null;
+    }
+    super.destroy();
+  }
 
-/** Interface for destroy logic. Implemented by addDestroyable. */
-export interface DestroyRef<T> {
-  /** Whether or not this object has been destroyed */
-  destroyed: boolean;
-  /** Destroy the instance and call all onDestroy callbacks. */
-  destroy(): void;
-  /** Register callbacks that should be called onDestroy */
-  onDestroy(cb: Function): void;
-}
-
-/**
- * Decorates an object with destroy logic (implementing the DestroyRef interface)
- * and returns the enhanced object.
- *
- * @param obj The object to decorate
- * @returns The object with destroy logic
- */
-export function addDestroyable<T, C>(obj: any): T&DestroyRef<C> {
-  let destroyFn: Function[]|null = null;
-  obj.destroyed = false;
-  obj.destroy = function() {
-    destroyFn && destroyFn.forEach((fn) => fn());
-    this.destroyed = true;
-  };
-  obj.onDestroy = (fn: Function) => (destroyFn || (destroyFn = [])).push(fn);
-  return obj;
+  attachToViewContainerRef(vcRef: viewEngine_ViewContainerRef) { this._viewContainerRef = vcRef; }
 }
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 6571af19de..0d19433be3 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -194,9 +194,6 @@
   {
     "name": "addComponentLogic"
   },
-  {
-    "name": "addDestroyable"
-  },
   {
     "name": "addRemoveViewFromContainer"
   },
@@ -293,9 +290,15 @@
   {
     "name": "defineInjector"
   },
+  {
+    "name": "destroyLView"
+  },
   {
     "name": "destroyViewTree"
   },
+  {
+    "name": "detachView"
+  },
   {
     "name": "detectChanges"
   },
@@ -374,6 +377,9 @@
   {
     "name": "getChildLNode"
   },
+  {
+    "name": "getCleanup"
+  },
   {
     "name": "getCurrentSanitizer"
   },
@@ -650,6 +656,9 @@
   {
     "name": "viewAttached"
   },
+  {
+    "name": "walkLNodeTree"
+  },
   {
     "name": "wrapListenerWithDirtyAndDefault"
   },
diff --git a/packages/core/test/render3/imported_renderer2.ts b/packages/core/test/render3/imported_renderer2.ts
index 30d25b5789..49ec367b85 100644
--- a/packages/core/test/render3/imported_renderer2.ts
+++ b/packages/core/test/render3/imported_renderer2.ts
@@ -35,7 +35,15 @@ export class SimpleDomEventsPlugin extends EventManagerPlugin {
 export function getRendererFactory2(document: any): RendererFactory2 {
   const fakeNgZone: NgZone = new NoopNgZone();
   const eventManager = new EventManager([new SimpleDomEventsPlugin(document)], fakeNgZone);
-  return new ɵDomRendererFactory2(eventManager, new ɵDomSharedStylesHost(document));
+  const rendererFactory =
+      new ɵDomRendererFactory2(eventManager, new ɵDomSharedStylesHost(document));
+  const origCreateRenderer = rendererFactory.createRenderer;
+  rendererFactory.createRenderer = function() {
+    const renderer = origCreateRenderer.apply(this, arguments);
+    renderer.destroyNode = () => {};
+    return renderer;
+  };
+  return rendererFactory;
 }
 
 export function getAnimationRendererFactory2(document: any): RendererFactory2 {
diff --git a/packages/core/test/render3/query_list_spec.ts b/packages/core/test/render3/query_list_spec.ts
index 648d27eadc..59e3973047 100644
--- a/packages/core/test/render3/query_list_spec.ts
+++ b/packages/core/test/render3/query_list_spec.ts
@@ -91,4 +91,12 @@ describe('QueryList', () => {
 
   });
 
+  describe('destroy', () => {
+    it('should close all subscriptions', () => {
+      let completed = false;
+      q.changes.subscribe(() => {}, () => {}, () => { completed = true; });
+      q.destroy();
+      expect(completed).toBeTruthy();
+    });
+  });
 });
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 133c24fdb1..7382fabfa3 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -9,6 +9,7 @@
 import {NgForOfContext} from '@angular/common';
 import {TemplateRef, ViewContainerRef} from '@angular/core';
 
+import {EventEmitter} from '../..';
 import {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
 import {AttributeMarker, QueryList, defineComponent, defineDirective, detectChanges, injectViewContainerRef} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
@@ -16,7 +17,7 @@ import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, queryRefresh} from '../../src/render3/query';
 
 import {NgForOf, NgIf} from './common_with_def';
-import {ComponentFixture, createComponent, createDirective, renderComponent} from './render_util';
+import {ComponentFixture, TemplateFixture, createComponent, createDirective, renderComponent} from './render_util';
 
 
 
@@ -1237,4 +1238,58 @@ describe('query', () => {
     });
 
   });
+
+  describe('queryList', () => {
+    it('should be destroyed when the containing view is destroyed', () => {
+      let queryInstance: QueryList<any>;
+
+      const SimpleComponentWithQuery =
+          createComponent('some-component-with-query', function(rf: RenderFlags, ctx: any) {
+            let tmp: any;
+            if (rf & RenderFlags.Create) {
+              query(0, ['foo'], false, QUERY_READ_FROM_NODE);
+              elementStart(1, 'div', null, ['foo', '']);
+              elementEnd();
+            }
+            if (rf & RenderFlags.Update) {
+              queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                  (ctx.query = queryInstance = tmp as QueryList<any>);
+            }
+          });
+
+      function createTemplate() { container(0); }
+
+      function updateTemplate() {
+        containerRefreshStart(0);
+        {
+          if (condition) {
+            let rf1 = embeddedViewStart(1);
+            {
+              if (rf1 & RenderFlags.Create) {
+                elementStart(0, 'some-component-with-query');
+                elementEnd();
+              }
+            }
+            embeddedViewEnd();
+          }
+        }
+        containerRefreshEnd();
+      }
+
+      /**
+       * % if (condition) {
+       *   <some-component-with-query></some-component-with-query>
+       * %}
+       */
+      let condition = true;
+      const t = new TemplateFixture(createTemplate, updateTemplate, [SimpleComponentWithQuery]);
+      expect(t.html).toEqual('<some-component-with-query><div></div></some-component-with-query>');
+      expect((queryInstance !.changes as EventEmitter<any>).closed).toBeFalsy();
+
+      condition = false;
+      t.update();
+      expect(t.html).toEqual('');
+      expect((queryInstance !.changes as EventEmitter<any>).closed).toBeTruthy();
+    });
+  });
 });
diff --git a/packages/core/test/render3/renderer_factory_spec.ts b/packages/core/test/render3/renderer_factory_spec.ts
index c2d8200a15..3cf26ecaf3 100644
--- a/packages/core/test/render3/renderer_factory_spec.ts
+++ b/packages/core/test/render3/renderer_factory_spec.ts
@@ -209,12 +209,6 @@ describe('animation renderer factory', () => {
 
 describe('Renderer2 destruction hooks', () => {
   const rendererFactory = getRendererFactory2(document);
-  const origCreateRenderer = rendererFactory.createRenderer;
-  rendererFactory.createRenderer = function() {
-    const renderer = origCreateRenderer.apply(this, arguments);
-    renderer.destroyNode = () => {};
-    return renderer;
-  };
 
   it('should call renderer.destroyNode for each node destroyed', () => {
     let condition = true;
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 8dc809fa6e..94ec687f7b 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -6,13 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, Pipe, PipeTransform, TemplateRef, ViewContainerRef} from '../../src/core';
+import {Component, Directive, EmbeddedViewRef, Pipe, PipeTransform, TemplateRef, ViewContainerRef} from '../../src/core';
 import {getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
 import {NgOnChangesFeature, defineComponent, defineDirective, definePipe, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, projection, projectionDef, reserveSlots, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {pipe, pipeBind1} from '../../src/render3/pipe';
 
+import {getRendererFactory2} from './imported_renderer2';
 import {ComponentFixture, TemplateFixture} from './render_util';
 
 describe('ViewContainerRef', () => {
@@ -45,8 +46,9 @@ describe('ViewContainerRef', () => {
       }
     }
 
-    function createView(s: string, index?: number) {
-      directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, {name: s}, index);
+    function createView(s: string, index?: number): EmbeddedViewRef<any> {
+      return directiveInstance !.vcref.createEmbeddedView(
+          directiveInstance !.tplRef, {name: s}, index);
     }
 
     /**
@@ -419,13 +421,16 @@ describe('ViewContainerRef', () => {
       });
     });
 
+    const rendererFactory = getRendererFactory2(document);
+
     describe('detach', () => {
       it('should detach the right embedded view when an index is specified', () => {
-        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
-        createView('A');
+        const fixture = new TemplateFixture(
+            createTemplate, updateTemplate, [DirectiveWithVCRef], null, null, rendererFactory);
+        const viewA = createView('A');
         createView('B');
         createView('C');
-        createView('D');
+        const viewD = createView('D');
         createView('E');
         fixture.update();
         expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
@@ -433,29 +438,97 @@ describe('ViewContainerRef', () => {
         directiveInstance !.vcref.detach(3);
         fixture.update();
         expect(fixture.html).toEqual('<p vcref=""></p>ABCE');
+        expect(viewD.destroyed).toBeFalsy();
 
         directiveInstance !.vcref.detach(0);
         fixture.update();
         expect(fixture.html).toEqual('<p vcref=""></p>BCE');
+        expect(viewA.destroyed).toBeFalsy();
 
         expect(() => { directiveInstance !.vcref.detach(-1); }).toThrow();
         expect(() => { directiveInstance !.vcref.detach(42); }).toThrow();
+        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 0});
       });
 
 
       it('should detach the last embedded view when no index is specified', () => {
-        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
+        const fixture = new TemplateFixture(
+            createTemplate, updateTemplate, [DirectiveWithVCRef], null, null, rendererFactory);
         createView('A');
         createView('B');
         createView('C');
         createView('D');
-        createView('E');
+        const viewE = createView('E');
         fixture.update();
         expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
 
         directiveInstance !.vcref.detach();
         fixture.update();
         expect(fixture.html).toEqual('<p vcref=""></p>ABCD');
+        expect(viewE.destroyed).toBeFalsy();
+        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 0});
+      });
+    });
+
+    describe('remove', () => {
+      it('should remove the right embedded view when an index is specified', () => {
+        const fixture = new TemplateFixture(
+            createTemplate, updateTemplate, [DirectiveWithVCRef], null, null, rendererFactory);
+        const viewA = createView('A');
+        createView('B');
+        createView('C');
+        const viewD = createView('D');
+        createView('E');
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
+
+        directiveInstance !.vcref.remove(3);
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p>ABCE');
+        expect(viewD.destroyed).toBeTruthy();
+
+        directiveInstance !.vcref.remove(0);
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p>BCE');
+        expect(viewA.destroyed).toBeTruthy();
+
+        expect(() => { directiveInstance !.vcref.remove(-1); }).toThrow();
+        expect(() => { directiveInstance !.vcref.remove(42); }).toThrow();
+        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 2});
+      });
+
+      it('should remove the last embedded view when no index is specified', () => {
+        const fixture = new TemplateFixture(
+            createTemplate, updateTemplate, [DirectiveWithVCRef], null, null, rendererFactory);
+        createView('A');
+        createView('B');
+        createView('C');
+        createView('D');
+        const viewE = createView('E');
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
+
+        directiveInstance !.vcref.remove();
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p>ABCD');
+        expect(viewE.destroyed).toBeTruthy();
+        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 1});
+      });
+
+      it('should throw when trying to insert a removed or destroyed view', () => {
+        const fixture = new TemplateFixture(
+            createTemplate, updateTemplate, [DirectiveWithVCRef], null, null, rendererFactory);
+        const viewA = createView('A');
+        const viewB = createView('B');
+        fixture.update();
+
+        directiveInstance !.vcref.remove();
+        fixture.update();
+        expect(() => directiveInstance !.vcref.insert(viewB)).toThrow();
+
+        viewA.destroy();
+        fixture.update();
+        expect(() => directiveInstance !.vcref.insert(viewA)).toThrow();
       });
     });
 
@@ -843,6 +916,8 @@ describe('ViewContainerRef', () => {
         ngAfterViewInit() { this.log('afterViewInit-' + this.name); }
         ngAfterViewChecked() { this.log('afterViewChecked-' + this.name); }
 
+        ngOnDestroy() { this.log('onDestroy-' + this.name); }
+
         static ngComponentDef = defineComponent({
           type: ComponentWithHooks,
           selectors: [['hooks']],
@@ -936,6 +1011,30 @@ describe('ViewContainerRef', () => {
         'doCheck-A', 'doCheck-B', 'doCheck-C', 'afterContentChecked-C', 'afterViewChecked-C',
         'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
       ]);
+
+      log.length = 0;
+      const viewRef = directiveInstance !.vcref.detach(0);
+      fixture.update();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      directiveInstance !.vcref.insert(viewRef !);
+      fixture.update();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-C', 'afterContentChecked-C', 'afterViewChecked-C',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      directiveInstance !.vcref.remove(0);
+      fixture.update();
+      expect(log).toEqual([
+        'onDestroy-C', 'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
     });
   });
 });

From d700a409da22f00ddebc3d6fbe0638c3c9b8fbeb Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Sun, 3 Jun 2018 23:06:17 -0700
Subject: [PATCH 185/582] build(bazel): enable manual ts_web_test_suite tests
 that require static_files (#24279)

PR Close #24279
---
 packages/platform-browser-dynamic/test/BUILD.bazel     |  6 ++++--
 .../test/resource_loader/resource_loader_impl_spec.ts  |  2 +-
 .../test/testing_public_browser_spec.ts                |  4 ++--
 packages/platform-browser/test/BUILD.bazel             | 10 ++++++++--
 packages/platform-browser/test/testing_public_spec.ts  |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel
index 35d9f51d27..520f263005 100644
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@@ -29,8 +29,10 @@ jasmine_node_test(
 
 ts_web_test_suite(
     name = "test_web",
-    # disable since tests are running but not yet passing
-    tags = ["manual"],
+    static_files = [
+        "//packages/platform-browser/test:static_assets/test.html",
+        "//packages/platform-browser/test:browser/static_assets/200.html"
+    ],
     deps = [
         ":test_lib",
     ],
diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts
index 626fddae8c..b10eb07eae 100644
--- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts
+++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts
@@ -19,7 +19,7 @@ import {ResourceLoaderImpl} from '../../src/resource_loader/resource_loader_impl
     // will be relative to here, so url200 should look like
     // static_assets/200.html.
     // We currently have no way of detecting this.
-    const url200 = '/base/packages/platform-browser/test/browser/static_assets/200.html';
+    const url200 = '/base/angular/packages/platform-browser/test/browser/static_assets/200.html';
     const url404 = '/bad/path/404.html';
 
     beforeEach(() => { resourceLoader = new ResourceLoaderImpl(); });
diff --git a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
index 82c071e761..036f7bb190 100644
--- a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
+++ b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
@@ -26,7 +26,7 @@ class FancyService {
 
 @Component({
   selector: 'external-template-comp',
-  templateUrl: '/base/packages/platform-browser/test/static_assets/test.html'
+  templateUrl: '/base/angular/packages/platform-browser/test/static_assets/test.html'
 })
 class ExternalTemplateComp {
 }
@@ -48,7 +48,7 @@ class BadTemplateUrl {
 
       it('should run async tests with ResourceLoaders', async(() => {
            const resourceLoader = new ResourceLoaderImpl();
-           resourceLoader.get('/base/packages/platform-browser/test/static_assets/test.html')
+           resourceLoader.get('/base/angular/packages/platform-browser/test/static_assets/test.html')
                .then(() => { actuallyDone = true; });
          }),
          10000);  // Long timeout here because this test makes an actual ResourceLoader.
diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel
index 996e9a29cf..b76a06b997 100644
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@@ -1,6 +1,11 @@
 load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
+exports_files([
+  "browser/static_assets/200.html",
+  "static_assets/test.html",
+])
+
 ts_library(
     name = "test_lib",
     testonly = 1,
@@ -35,8 +40,9 @@ jasmine_node_test(
 
 ts_web_test_suite(
     name = "test_web",
-    # disable since tests are running but not yet passing
-    tags = ["manual"],
+    static_files = [
+        ":static_assets/test.html"
+    ],
     deps = [
         ":test_lib",
     ],
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index cf33d392f0..69b447c14f 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -104,7 +104,7 @@ class SomeLibModule {
 }
 
 @Component(
-    {selector: 'comp', templateUrl: '/base/packages/platform-browser/test/static_assets/test.html'})
+    {selector: 'comp', templateUrl: '/base/angular/packages/platform-browser/test/static_assets/test.html'})
 class CompWithUrlTemplate {
 }
 

From 3e938279d042ab749335ce66414d095eac135432 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 4 Jun 2018 14:58:23 -0700
Subject: [PATCH 186/582] build(bazel): fix
 //packages/platform-browser/test:test_web (#24279)

PR Close #24279
---
 BUILD.bazel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BUILD.bazel b/BUILD.bazel
index 9f477adf5b..1c040afea2 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -44,6 +44,7 @@ filegroup(
         "//:node_modules/zone.js/dist/zone.js",
         "//:node_modules/zone.js/dist/zone-testing.js",
         "//:node_modules/zone.js/dist/task-tracking.js",
+        "//:test-events.js",
     ],
 )
 

From 678fd32406264296dc0ad1e952c90641760b0d41 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 4 Jun 2018 15:00:06 -0700
Subject: [PATCH 187/582] build(bazel): ran buildifier (#24279)

PR Close #24279
---
 packages/platform-browser-dynamic/test/BUILD.bazel | 2 +-
 packages/platform-browser/test/BUILD.bazel         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel
index 520f263005..0abf978379 100644
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@@ -31,7 +31,7 @@ ts_web_test_suite(
     name = "test_web",
     static_files = [
         "//packages/platform-browser/test:static_assets/test.html",
-        "//packages/platform-browser/test:browser/static_assets/200.html"
+        "//packages/platform-browser/test:browser/static_assets/200.html",
     ],
     deps = [
         ":test_lib",
diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel
index b76a06b997..622b9c9edb 100644
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@@ -2,8 +2,8 @@ load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 exports_files([
-  "browser/static_assets/200.html",
-  "static_assets/test.html",
+    "browser/static_assets/200.html",
+    "static_assets/test.html",
 ])
 
 ts_library(
@@ -41,7 +41,7 @@ jasmine_node_test(
 ts_web_test_suite(
     name = "test_web",
     static_files = [
-        ":static_assets/test.html"
+        ":static_assets/test.html",
     ],
     deps = [
         ":test_lib",

From d814eaad95ba488ed91c6ce2e5fa3a92d8c9664d Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 4 Jun 2018 15:11:40 -0700
Subject: [PATCH 188/582] build(bazel): ran format (#24279)

PR Close #24279
---
 .../test/testing_public_browser_spec.ts                     | 3 ++-
 packages/platform-browser/test/testing_public_spec.ts       | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
index 036f7bb190..668a552eb9 100644
--- a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
+++ b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
@@ -48,7 +48,8 @@ class BadTemplateUrl {
 
       it('should run async tests with ResourceLoaders', async(() => {
            const resourceLoader = new ResourceLoaderImpl();
-           resourceLoader.get('/base/angular/packages/platform-browser/test/static_assets/test.html')
+           resourceLoader
+               .get('/base/angular/packages/platform-browser/test/static_assets/test.html')
                .then(() => { actuallyDone = true; });
          }),
          10000);  // Long timeout here because this test makes an actual ResourceLoader.
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index 69b447c14f..37c1121e65 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -103,8 +103,10 @@ class CompUsingModuleDirectiveAndPipe {
 class SomeLibModule {
 }
 
-@Component(
-    {selector: 'comp', templateUrl: '/base/angular/packages/platform-browser/test/static_assets/test.html'})
+@Component({
+  selector: 'comp',
+  templateUrl: '/base/angular/packages/platform-browser/test/static_assets/test.html'
+})
 class CompWithUrlTemplate {
 }
 

From 57eacf4b5a558bbc2205f60ef3724beb86686699 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Mon, 4 Jun 2018 13:07:09 -0700
Subject: [PATCH 189/582] refactor(ivy): move LView.template and component
 templates to TView (#24300)

PR Close #24300
---
 packages/core/src/render3/component.ts       |  4 +-
 packages/core/src/render3/di.ts              | 15 +++---
 packages/core/src/render3/instructions.ts    | 53 +++++++++-----------
 packages/core/src/render3/interfaces/view.ts | 11 ++--
 packages/core/test/render3/di_spec.ts        |  2 +-
 5 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 3049cd8de2..9bc5fa88ca 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -139,7 +139,7 @@ export function renderComponent<T>(
   };
   const rootView: LView = createLView(
       rendererFactory.createRenderer(hostNode, componentDef.rendererType),
-      createTView(-1, null, null), null, rootContext,
+      createTView(-1, null, null, null), rootContext,
       componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
   rootView.injector = opts.injector || null;
 
@@ -160,7 +160,7 @@ export function renderComponent<T>(
 
     executeInitAndContentHooks();
     setHostBindings(ROOT_DIRECTIVE_INDICES);
-    detectChangesInternal(elementNode.data as LView, elementNode, componentDef, component);
+    detectChangesInternal(elementNode.data as LView, elementNode, component);
   } finally {
     leaveView(oldView);
     if (rendererFactory.end) rendererFactory.end();
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index ba5a71bb76..1c55e79fa6 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -704,12 +704,12 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
     const hostTNode = hostNode.tNode;
     const hostTView = hostNode.view.tView;
     if (!hostTNode.tViews) {
-      hostTNode.tViews = createTView(-1, hostTView.directiveRegistry, hostTView.pipeRegistry);
+      hostTNode.tViews = createTView(
+          -1, hostNode.data.template !, hostTView.directiveRegistry, hostTView.pipeRegistry);
     }
     ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
-        getOrCreateElementRef(di), hostTNode.tViews as TView, hostNode.data.template !,
-        getRenderer(), hostNode.data.queries);
+        getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(), hostNode.data.queries);
   }
   return di.templateRef;
 }
@@ -718,15 +718,14 @@ class TemplateRef<T> implements viewEngine_TemplateRef<T> {
   readonly elementRef: viewEngine_ElementRef;
 
   constructor(
-      elementRef: viewEngine_ElementRef, private _tView: TView,
-      private _template: ComponentTemplate<T>, private _renderer: Renderer3,
+      elementRef: viewEngine_ElementRef, private _tView: TView, private _renderer: Renderer3,
       private _queries: LQueries|null) {
     this.elementRef = elementRef;
   }
 
   createEmbeddedView(context: T): viewEngine_EmbeddedViewRef<T> {
-    const viewNode = renderEmbeddedTemplate(
-        null, this._tView, this._template, context, this._renderer, this._queries);
-    return new EmbeddedViewRef(viewNode, this._template, context);
+    const viewNode =
+        renderEmbeddedTemplate(null, this._tView, context, this._renderer, this._queries);
+    return new EmbeddedViewRef(viewNode, this._tView.template !as ComponentTemplate<T>, context);
   }
 }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 5c1fdcad56..d485c11202 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -303,8 +303,8 @@ export function executeInitAndContentHooks(): void {
 }
 
 export function createLView<T>(
-    renderer: Renderer3, tView: TView, template: ComponentTemplate<T>| null, context: T | null,
-    flags: LViewFlags, sanitizer?: Sanitizer | null): LView {
+    renderer: Renderer3, tView: TView, context: T | null, flags: LViewFlags,
+    sanitizer?: Sanitizer | null): LView {
   const newView = {
     parent: currentView,
     flags: flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.RunInit,
@@ -317,7 +317,6 @@ export function createLView<T>(
     tail: null,
     next: null,
     bindingIndex: -1,
-    template: template,
     context: context,
     queries: null,
     injector: currentView && currentView.injector,
@@ -469,8 +468,8 @@ export function renderTemplate<T>(
     host = createLNode(
         -1, TNodeType.Element, hostNode, null, null,
         createLView(
-            providedRendererFactory.createRenderer(null, null), tView, null, {},
-            LViewFlags.CheckAlways, sanitizer));
+            providedRendererFactory.createRenderer(null, null), tView, {}, LViewFlags.CheckAlways,
+            sanitizer));
   }
   const hostView = host.data !;
   ngDevMode && assertNotNull(hostView, 'Host node should have an LView defined in host.data.');
@@ -489,8 +488,8 @@ export function renderTemplate<T>(
  * TView for dynamically created views on their host TNode, which only has one instance.
  */
 export function renderEmbeddedTemplate<T>(
-    viewNode: LViewNode | null, tView: TView, template: ComponentTemplate<T>, context: T,
-    renderer: Renderer3, queries?: LQueries | null): LViewNode {
+    viewNode: LViewNode | null, tView: TView, context: T, renderer: Renderer3,
+    queries?: LQueries | null): LViewNode {
   const _isParent = isParent;
   const _previousOrParentNode = previousOrParentNode;
   let oldView: LView;
@@ -500,8 +499,8 @@ export function renderEmbeddedTemplate<T>(
     previousOrParentNode = null !;
 
     if (viewNode == null) {
-      const lView = createLView(
-          renderer, tView, template, context, LViewFlags.CheckAlways, getCurrentSanitizer());
+      const lView =
+          createLView(renderer, tView, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
       if (queries) {
         lView.queries = queries.createView();
@@ -511,7 +510,7 @@ export function renderEmbeddedTemplate<T>(
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
-    template(rf, context);
+    tView.template !(rf, context);
     if (rf & RenderFlags.Update) {
       refreshView();
     } else {
@@ -788,7 +787,7 @@ function getOrCreateTView(
   // and not on embedded templates.
 
   return template.ngPrivateData ||
-      (template.ngPrivateData = createTView(-1, directives, pipes) as never);
+      (template.ngPrivateData = createTView(-1, template, directives, pipes) as never);
 }
 
 /**
@@ -799,11 +798,12 @@ function getOrCreateTView(
  * @param pipes Registry of pipes for this view
  */
 export function createTView(
-    viewIndex: number, directives: DirectiveDefListOrFactory | null,
-    pipes: PipeDefListOrFactory | null): TView {
+    viewIndex: number, template: ComponentTemplate<any>| null,
+    directives: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null): TView {
   ngDevMode && ngDevMode.tView++;
   return {
     id: viewIndex,
+    template: template,
     node: null !,
     data: [],
     childIndex: -1,         // Children set in addToViewTree(), if any
@@ -887,7 +887,7 @@ export function hostElement(
   const node = createLNode(
       0, TNodeType.Element, rNode, null, null,
       createLView(
-          renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null, null,
+          renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null,
           def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
@@ -1337,7 +1337,7 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
       currentView, previousOrParentNode.tNode.index as number,
       createLView(
           rendererFactory.createRenderer(previousOrParentNode.native as RElement, def.rendererType),
-          tView, null, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
+          tView, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
           getCurrentSanitizer()));
 
   // We need to set the host node/data here because when the component LNode was created,
@@ -1592,8 +1592,7 @@ function refreshDynamicChildren() {
         // The directives and pipes are not needed here as an existing view is only being refreshed.
         const dynamicView = lViewNode.data;
         ngDevMode && assertNotNull(dynamicView.tView, 'TView must be allocated');
-        renderEmbeddedTemplate(
-            lViewNode, dynamicView.tView, dynamicView.template !, dynamicView.context !, renderer);
+        renderEmbeddedTemplate(lViewNode, dynamicView.tView, dynamicView.context !, renderer);
       }
     }
   }
@@ -1653,8 +1652,8 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
   } else {
     // When we create a new LView, we always reset the state of the instructions.
     const newView = createLView(
-        renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, null,
-        LViewFlags.CheckAlways, getCurrentSanitizer());
+        renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, LViewFlags.CheckAlways,
+        getCurrentSanitizer());
 
     if (lContainer.queries) {
       newView.queries = lContainer.queries.createView();
@@ -1685,7 +1684,7 @@ function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TV
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
     const tView = currentView.tView;
     containerTViews[viewIndex] =
-        createTView(viewIndex, tView.directiveRegistry, tView.pipeRegistry);
+        createTView(viewIndex, null, tView.directiveRegistry, tView.pipeRegistry);
   }
   return containerTViews[viewIndex];
 }
@@ -1760,10 +1759,7 @@ export function componentRefresh<T>(directiveIndex: number, elementIndex: number
   // Only attached CheckAlways components or attached, dirty OnPush components should be checked
   if (viewAttached(hostView) && hostView.flags & (LViewFlags.CheckAlways | LViewFlags.Dirty)) {
     ngDevMode && assertDataInRange(directiveIndex, directives !);
-    const def = currentView.tView.directives ![directiveIndex] as ComponentDef<T>;
-
-    detectChangesInternal(
-        hostView, element, def, getDirectiveInstance(directives ![directiveIndex]));
+    detectChangesInternal(hostView, element, getDirectiveInstance(directives ![directiveIndex]));
   }
 }
 
@@ -2078,9 +2074,7 @@ export function getRootView(component: any): LView {
 export function detectChanges<T>(component: T): void {
   const hostNode = _getComponentHostLElementNode(component);
   ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
-  const componentIndex = hostNode.tNode.flags >> TNodeFlags.DirectiveStartingIndexShift;
-  const def = hostNode.view.tView.directives ![componentIndex] as ComponentDef<T>;
-  detectChangesInternal(hostNode.data as LView, hostNode, def, component);
+  detectChangesInternal(hostNode.data as LView, hostNode, component);
 }
 
 
@@ -2100,10 +2094,9 @@ export function checkNoChanges<T>(component: T): void {
 }
 
 /** Checks the view of the component provided. Does not gate on dirty checks or execute doCheck. */
-export function detectChangesInternal<T>(
-    hostView: LView, hostNode: LElementNode, def: ComponentDef<T>, component: T) {
+export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode, component: T) {
   const oldView = enterView(hostView, hostNode);
-  const template = def.template;
+  const template = hostView.tView.template !;
 
   try {
     template(getRenderFlags(hostView), component);
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 4d702169c8..fa672663fc 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -126,11 +126,6 @@ export interface LView {
    */
   tView: TView;
 
-  /**
-   * For dynamically inserted views, the template function to refresh the view.
-   */
-  template: ComponentTemplate<{}>|null;
-
   /**
    * - For embedded views, the context with which to render the template.
    * - For root view of the root component the context contains change detection data.
@@ -212,6 +207,12 @@ export interface TView {
    */
   readonly id: number;
 
+  /**
+   * The template function used to refresh the view of dynamically created views
+   * and components. Will be null for inline views.
+   */
+  template: ComponentTemplate<{}>|null;
+
   /**
    * Pointer to the `TNode` that represents the root of the view.
    *
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index d4ef7d36ff..ea3d413d31 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1404,7 +1404,7 @@ describe('di', () => {
   describe('getOrCreateNodeInjector', () => {
     it('should handle initial undefined state', () => {
       const contentView =
-          createLView(null !, createTView(-1, null, null), null, null, LViewFlags.CheckAlways);
+          createLView(null !, createTView(-1, null, null, null), null, LViewFlags.CheckAlways);
       const oldView = enterView(contentView, null !);
       try {
         const parent = createLNode(0, TNodeType.Element, null, null, null, null);

From 20c463e97cfd32266172bbdc5016a71621f12704 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 30 May 2018 11:20:48 -0700
Subject: [PATCH 190/582] feat(router): add navigation execution context info
 to activation hooks (#24204)

This change adds to internal API hooks (undocumented API) for
`before/afterPreactivation`. The immediate need for this API is to
allow applications to build support for marshalling navigation between
a web worker and the main application.

Fixes #24202

PR Close #24204
---
 packages/router/src/router.ts | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index 1cf291a4b9..bdee78a836 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -177,12 +177,24 @@ type NavigationParams = {
 /**
  * @internal
  */
-export type RouterHook = (snapshot: RouterStateSnapshot) => Observable<void>;
+export type RouterHook = (snapshot: RouterStateSnapshot, runExtras: {
+  appliedUrlTree: UrlTree,
+  rawUrlTree: UrlTree,
+  skipLocationChange: boolean,
+  replaceUrl: boolean,
+  navigationId: number
+}) => Observable<void>;
 
 /**
  * @internal
  */
-function defaultRouterHook(snapshot: RouterStateSnapshot): Observable<void> {
+function defaultRouterHook(snapshot: RouterStateSnapshot, runExtras: {
+  appliedUrlTree: UrlTree,
+  rawUrlTree: UrlTree,
+  skipLocationChange: boolean,
+  replaceUrl: boolean,
+  navigationId: number
+}): Observable<void> {
   return of (null) as any;
 }
 
@@ -645,7 +657,13 @@ export class Router {
       const beforePreactivationDone$ =
           urlAndSnapshot$.pipe(mergeMap((p): Observable<NavStreamValue> => {
             if (typeof p === 'boolean') return of (p);
-            return this.hooks.beforePreactivation(p.snapshot).pipe(map(() => p));
+            return this.hooks
+                .beforePreactivation(p.snapshot, {
+                  navigationId: id,
+                  appliedUrlTree: url,
+                  rawUrlTree: rawUrl, skipLocationChange, replaceUrl,
+                })
+                .pipe(map(() => p));
           }));
 
       // run preactivation: guards and data resolvers
@@ -698,7 +716,13 @@ export class Router {
       const preactivationDone$ =
           preactivationResolveData$.pipe(mergeMap((p): Observable<NavStreamValue> => {
             if (typeof p === 'boolean' || this.navigationId !== id) return of (false);
-            return this.hooks.afterPreactivation(p.snapshot).pipe(map(() => p));
+            return this.hooks
+                .afterPreactivation(p.snapshot, {
+                  navigationId: id,
+                  appliedUrlTree: url,
+                  rawUrlTree: rawUrl, skipLocationChange, replaceUrl,
+                })
+                .pipe(map(() => p));
           }));
 
 

From 87b16710e7a9113819b33b5ae276ffae556309e7 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 16 May 2018 15:47:13 -0500
Subject: [PATCH 191/582] docs(aio): Add null type to form validation example
 (#23949)

Closes #20282

PR Close #23949
---
 .../src/app/shared/forbidden-name.directive.ts                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts b/aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts
index 277a31bd33..9da3abef37 100644
--- a/aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts
+++ b/aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts
@@ -5,7 +5,7 @@ import { AbstractControl, NG_VALIDATORS, Validator, ValidatorFn, Validators } fr
 // #docregion custom-validator
 /** A hero's name can't match the given regular expression */
 export function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
-  return (control: AbstractControl): {[key: string]: any} => {
+  return (control: AbstractControl): {[key: string]: any} | null => {
     const forbidden = nameRe.test(control.value);
     return forbidden ? {'forbiddenName': {value: control.value}} : null;
   };
@@ -22,7 +22,7 @@ export function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
 export class ForbiddenValidatorDirective implements Validator {
   @Input('appForbiddenName') forbiddenName: string;
 
-  validate(control: AbstractControl): {[key: string]: any} {
+  validate(control: AbstractControl): {[key: string]: any} | null {
     return this.forbiddenName ? forbiddenNameValidator(new RegExp(this.forbiddenName, 'i'))(control)
                               : null;
   }

From 9367e9140212c6606973995a7124b70716985cd6 Mon Sep 17 00:00:00 2001
From: Trotyl <trotyl@qq.com>
Date: Sat, 7 Apr 2018 15:11:02 +0800
Subject: [PATCH 192/582] fix(forms): properly handle special properties in
 FormGroup.get (#22249)

closes #17195

PR Close #22249
---
 packages/forms/src/model.ts            |  2 +-
 packages/forms/test/form_group_spec.ts | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index ffaa339d99..bbda7f1c6b 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -44,7 +44,7 @@ function _find(control: AbstractControl, path: Array<string|number>| string, del
 
   return (<Array<string|number>>path).reduce((v: AbstractControl, name) => {
     if (v instanceof FormGroup) {
-      return v.controls[name] || null;
+      return v.controls.hasOwnProperty(name as string) ? v.controls[name] : null;
     }
 
     if (v instanceof FormArray) {
diff --git a/packages/forms/test/form_group_spec.ts b/packages/forms/test/form_group_spec.ts
index 7089f245cf..5b3f622070 100644
--- a/packages/forms/test/form_group_spec.ts
+++ b/packages/forms/test/form_group_spec.ts
@@ -629,6 +629,18 @@ import {of } from 'rxjs';
       });
     });
 
+    describe('retrieve', () => {
+      let group: FormGroup;
+
+      beforeEach(() => {
+        group = new FormGroup({
+          'required': new FormControl('requiredValue'),
+        });
+      });
+
+      it('should not get inherited properties',
+         () => { expect(group.get('constructor')).toBe(null); });
+    });
 
     describe('statusChanges', () => {
       let control: FormControl;

From 8db928df9de7b08695d4dbfbe2542cdccb680e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 31 May 2018 16:52:54 -0700
Subject: [PATCH 193/582] fix(animations): retain trigger-state for nodes that
 are moved around (#24238)

This patch ensures that if a list of nodes (that contain
animation triggers) are moved around then they will retain their
trigger-value state when animated again at a later point.

PR Close #24238
---
 .../src/render/transition_animation_engine.ts |  7 ---
 .../animation/animation_integration_spec.ts   | 59 +++++++++++++++++++
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index 205f6ecbba..4864388f53 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -104,7 +104,6 @@ export class StateValue {
 
 export const VOID_VALUE = 'void';
 export const DEFAULT_STATE_VALUE = new StateValue(VOID_VALUE);
-export const DELETED_STATE_VALUE = new StateValue('DELETED');
 
 export class AnimationTransitionNamespace {
   public players: TransitionAnimationPlayer[] = [];
@@ -208,8 +207,6 @@ export class AnimationTransitionNamespace {
 
     if (!fromState) {
       fromState = DEFAULT_STATE_VALUE;
-    } else if (fromState === DELETED_STATE_VALUE) {
-      return player;
     }
 
     const isRemoval = toState.value === VOID_VALUE;
@@ -773,10 +770,6 @@ export class TransitionAnimationEngine {
         }
       });
     }
-    const stateMap = this.statesByElement.get(element);
-    if (stateMap) {
-      Object.keys(stateMap).forEach(triggerName => stateMap[triggerName] = DELETED_STATE_VALUE);
-    }
   }
 
   finishActiveQueriedAnimationOnElement(element: any) {
diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts
index a1dcb50b60..f94bca7d0c 100644
--- a/packages/core/test/animation/animation_integration_spec.ts
+++ b/packages/core/test/animation/animation_integration_spec.ts
@@ -2379,6 +2379,65 @@ const DEFAULT_COMPONENT_ID = '1';
           });
         });
       });
+
+      it('should animate nodes properly when they have been re-ordered', () => {
+        @Component({
+          selector: 'if-cmp',
+          template: `
+                <div *ngFor="let item of items" [class]="'class-' + item.value">
+                  <div [@myAnimation]="item.count">
+                    {{ item.value }}
+                  </div>
+                </div>
+              `,
+          animations: [
+            trigger(
+                'myAnimation',
+                [
+                  state('0', style({opacity: 0})), state('1', style({opacity: 0.4})),
+                  state('2', style({opacity: 0.8})), transition('* => 1, * => 2', [animate(1000)])
+                ]),
+          ]
+        })
+        class Cmp {
+          items = [
+            {value: '1', count: 0},
+            {value: '2', count: 0},
+            {value: '3', count: 0},
+            {value: '4', count: 0},
+            {value: '5', count: 0},
+          ];
+
+          reOrder() {
+            this.items = [
+              this.items[4],
+              this.items[1],
+              this.items[3],
+              this.items[0],
+              this.items[2],
+            ];
+          }
+        }
+
+        TestBed.configureTestingModule({declarations: [Cmp]});
+        const fixture = TestBed.createComponent(Cmp);
+        const cmp = fixture.componentInstance;
+        const one = cmp.items[0];
+        const two = cmp.items[1];
+        one.count++;
+        fixture.detectChanges();
+
+        cmp.reOrder();
+        fixture.detectChanges();
+        resetLog();
+
+        one.count++;
+        two.count++;
+        fixture.detectChanges();
+
+        const players = getLog();
+        expect(players.length).toEqual(2);
+      });
     });
 
     describe('animation listeners', () => {

From 86b13ccf80010474c98bb72341d638e320d1fe7e Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 5 Jun 2018 15:28:15 -0700
Subject: [PATCH 194/582] refactor(ivy): move static parts of LView.cleanup to
 TView (#24301)

PR Close #24301
---
 packages/core/src/render3/instructions.ts     |  76 +++++---
 packages/core/src/render3/interfaces/view.ts  |  43 ++--
 .../core/src/render3/node_manipulation.ts     |  42 ++--
 packages/core/src/render3/query.ts            |   4 +-
 packages/core/src/render3/view_ref.ts         |   6 +-
 .../bundling/todo/bundle.golden_symbols.json  |   9 +
 packages/core/test/render3/listeners_spec.ts  | 183 +++++++++++++++++-
 packages/core/test/render3/render_util.ts     |   5 +-
 8 files changed, 302 insertions(+), 66 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index d485c11202..a004f10d81 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -154,30 +154,14 @@ let data: any[];
  */
 let directives: any[]|null;
 
-/**
- * When a view is destroyed, listeners need to be released and outputs need to be
- * unsubscribed. This cleanup array stores both listener data (in chunks of 4)
- * and output data (in chunks of 2) for a particular view. Combining the arrays
- * saves on memory (70 bytes per array) and on a few bytes of code size (for two
- * separate for loops).
- *
- * If it's a listener being stored:
- * 1st index is: event name to remove
- * 2nd index is: native element
- * 3rd index is: listener function
- * 4th index is: useCapture boolean
- *
- * If it's an output subscription:
- * 1st index is: unsubscribe function
- * 2nd index is: context for function
- */
-let cleanup: any[]|null;
-
-export function getCleanup(): any[] {
+function getCleanup(view: LView): any[] {
   // top level variables should not be exported for performance reasons (PERF_NOTES.md)
-  return cleanup || (cleanup = currentView.cleanup = []);
+  return view.cleanupInstances || (view.cleanupInstances = []);
 }
 
+function getTViewCleanup(view: LView): any[] {
+  return view.tView.cleanup || (view.tView.cleanup = []);
+}
 /**
  * In this mode, any changes in bindings will throw an ExpressionChangedAfterChecked error.
  *
@@ -213,7 +197,6 @@ export function enterView(newView: LView, host: LElementNode | LViewNode | null)
   creationMode = newView && (newView.flags & LViewFlags.CreationMode) === LViewFlags.CreationMode;
   firstTemplatePass = newView && newView.tView.firstTemplatePass;
 
-  cleanup = newView && newView.cleanup;
   renderer = newView && newView.renderer;
 
   if (host != null) {
@@ -312,7 +295,7 @@ export function createLView<T>(
     data: [],
     directives: null,
     tView: tView,
-    cleanup: null,
+    cleanupInstances: null,
     renderer: renderer,
     tail: null,
     next: null,
@@ -818,6 +801,7 @@ export function createTView(
     viewCheckHooks: null,
     destroyHooks: null,
     pipeDestroyHooks: null,
+    cleanup: null,
     hostBindings: null,
     components: null,
     directiveRegistry: typeof directives === 'function' ? directives() : directives,
@@ -915,19 +899,23 @@ export function listener(
   ngDevMode && assertPreviousIsParent();
   const node = previousOrParentNode;
   const native = node.native as RElement;
+  ngDevMode && ngDevMode.rendererAddEventListener++;
 
   // In order to match current behavior, native DOM event listeners must be added for all
   // events (including outputs).
-  const cleanupFns = getCleanup();
-  ngDevMode && ngDevMode.rendererAddEventListener++;
   if (isProceduralRenderer(renderer)) {
     const wrappedListener = wrapListenerWithDirtyLogic(currentView, listenerFn);
     const cleanupFn = renderer.listen(native, eventName, wrappedListener);
-    cleanupFns.push(cleanupFn, null);
+    storeCleanupFn(currentView, cleanupFn);
   } else {
     const wrappedListener = wrapListenerWithDirtyAndDefault(currentView, listenerFn);
     native.addEventListener(eventName, wrappedListener, useCapture);
-    cleanupFns.push(eventName, native, wrappedListener, useCapture);
+    const cleanupInstances = getCleanup(currentView);
+    cleanupInstances.push(wrappedListener);
+    if (firstTemplatePass) {
+      getTViewCleanup(currentView)
+          .push(eventName, node.tNode.index, cleanupInstances !.length - 1, useCapture);
+    }
   }
 
   let tNode: TNode|null = node.tNode;
@@ -952,7 +940,39 @@ function createOutput(outputs: PropertyAliasValue, listener: Function): void {
   for (let i = 0; i < outputs.length; i += 2) {
     ngDevMode && assertDataInRange(outputs[i] as number, directives !);
     const subscription = directives ![outputs[i] as number][outputs[i + 1]].subscribe(listener);
-    getCleanup().push(subscription.unsubscribe, subscription);
+    storeCleanupWithContext(currentView, subscription, subscription.unsubscribe);
+  }
+}
+
+/**
+ * Saves context for this cleanup function in LView.cleanupInstances.
+ *
+ * On the first template pass, saves in TView:
+ * - Cleanup function
+ * - Index of context we just saved in LView.cleanupInstances
+ */
+export function storeCleanupWithContext(
+    view: LView = currentView, context: any, cleanupFn: Function): void {
+  getCleanup(view).push(context);
+
+  if (view.tView.firstTemplatePass) {
+    getTViewCleanup(view).push(cleanupFn, view.cleanupInstances !.length - 1);
+  }
+}
+
+/**
+ * Saves the cleanup function itself in LView.cleanupInstances.
+ *
+ * This is necessary for functions that are wrapped with their contexts, like in renderer2
+ * listeners.
+ *
+ * On the first template pass, the index of the cleanup function is saved in TView.
+ */
+export function storeCleanupFn(view: LView, cleanupFn: Function): void {
+  getCleanup(view).push(cleanupFn);
+
+  if (view.tView.firstTemplatePass) {
+    getTViewCleanup(view).push(view.cleanupInstances !.length - 1, null);
   }
 }
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index fa672663fc..c069e6f0ed 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -63,22 +63,14 @@ export interface LView {
 
   /**
    * When a view is destroyed, listeners need to be released and outputs need to be
-   * unsubscribed. This cleanup array stores both listener data (in chunks of 4)
-   * and output data (in chunks of 2) for a particular view. Combining the arrays
-   * saves on memory (70 bytes per array) and on a few bytes of code size (for two
-   * separate for loops).
+   * unsubscribed. This context array stores both listener functions wrapped with
+   * their context and output subscription instances for a particular view.
    *
-   * If it's a listener being stored:
-   * 1st index is: event name to remove
-   * 2nd index is: native element
-   * 3rd index is: listener function
-   * 4th index is: useCapture boolean
-   *
-   * If it's an output subscription:
-   * 1st index is: unsubscribe function
-   * 2nd index is: context for function
+   * These change per LView instance, so they cannot be stored on TView. Instead,
+   * TView.cleanup saves an index to the necessary context in this array.
    */
-  cleanup: any[]|null;
+  // TODO: collapse into data[]
+  cleanupInstances: any[]|null;
 
   /**
    * The last LView or LContainer beneath this LView in the hierarchy.
@@ -368,6 +360,29 @@ export interface TView {
    */
   pipeDestroyHooks: HookData|null;
 
+  /**
+   * When a view is destroyed, listeners need to be released and outputs need to be
+   * unsubscribed. This cleanup array stores both listener data (in chunks of 4)
+   * and output data (in chunks of 2) for a particular view. Combining the arrays
+   * saves on memory (70 bytes per array) and on a few bytes of code size (for two
+   * separate for loops).
+   *
+   * If it's a native DOM listener being stored:
+   * 1st index is: event name to remove
+   * 2nd index is: index of native element in LView.data[]
+   * 3rd index is: index of wrapped listener function in LView.cleanupInstances[]
+   * 4th index is: useCapture boolean
+   *
+   * If it's a renderer2 style listener or ViewRef destroy hook being stored:
+   * 1st index is: index of the cleanup function in LView.cleanupInstances[]
+   * 2nd index is: null
+   *
+   * If it's an output subscription or query list destroy hook:
+   * 1st index is: output unsubscribe function / query list destroy function
+   * 2nd index is: index of function context in LView.cleanupInstances[]
+   */
+  cleanup: any[]|null;
+
   /**
    * A list of directive and element indices for child components that will need to be
    * refreshed when the current view has finished its check.
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 257c6e97b8..db4eb95d50 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -297,7 +297,7 @@ export function destroyViewTree(rootView: LView): void {
     } else if (viewOrContainer.next) {
       // Only move to the side and clean if operating below rootView -
       // otherwise we would start cleaning up sibling views of the rootView.
-      cleanUpView(viewOrContainer as LView);
+      cleanUpView(viewOrContainer);
       next = viewOrContainer.next;
     }
 
@@ -306,10 +306,10 @@ export function destroyViewTree(rootView: LView): void {
       // with a root view that doesn't have children. We didn't descend into child views
       // so no need to go back up the views tree.
       while (viewOrContainer && !viewOrContainer !.next && viewOrContainer !== rootView) {
-        cleanUpView(viewOrContainer as LView);
+        cleanUpView(viewOrContainer);
         viewOrContainer = getParentState(viewOrContainer, rootView);
       }
-      cleanUpView(viewOrContainer as LView || rootView);
+      cleanUpView(viewOrContainer || rootView);
 
       next = viewOrContainer && viewOrContainer.next;
     }
@@ -472,30 +472,42 @@ export function getParentState(state: LViewOrLContainer, rootView: LView): LView
  *
  * @param view The LView to clean up
  */
-function cleanUpView(view: LView): void {
-  removeListeners(view);
-  executeOnDestroys(view);
-  executePipeOnDestroys(view);
-  // For component views only, the local renderer is destroyed as clean up time.
-  if (view.tView && view.tView.id === -1 && isProceduralRenderer(view.renderer)) {
-    ngDevMode && ngDevMode.rendererDestroy++;
-    view.renderer.destroy();
+function cleanUpView(viewOrContainer: LViewOrLContainer): void {
+  if ((viewOrContainer as LView).tView) {
+    const view = viewOrContainer as LView;
+    removeListeners(view);
+    executeOnDestroys(view);
+    executePipeOnDestroys(view);
+    // For component views only, the local renderer is destroyed as clean up time.
+    if (view.tView.id === -1 && isProceduralRenderer(view.renderer)) {
+      ngDevMode && ngDevMode.rendererDestroy++;
+      view.renderer.destroy();
+    }
   }
 }
 
 /** Removes listeners and unsubscribes from output subscriptions */
 function removeListeners(view: LView): void {
-  const cleanup = view.cleanup !;
+  const cleanup = view.tView.cleanup !;
   if (cleanup != null) {
     for (let i = 0; i < cleanup.length - 1; i += 2) {
       if (typeof cleanup[i] === 'string') {
-        cleanup ![i + 1].removeEventListener(cleanup[i], cleanup[i + 2], cleanup[i + 3]);
+        // This is a listener with the native renderer
+        const native = view.data[cleanup[i + 1]].native;
+        const listener = view.cleanupInstances ![cleanup[i + 2]];
+        native.removeEventListener(cleanup[i], listener, cleanup[i + 3]);
         i += 2;
+      } else if (typeof cleanup[i] === 'number') {
+        // This is a listener with renderer2 (cleanup fn can be found by index)
+        const cleanupFn = view.cleanupInstances ![cleanup[i]];
+        cleanupFn();
       } else {
-        cleanup[i].call(cleanup[i + 1]);
+        // This is a cleanup function that is grouped with the index of its context
+        const context = view.cleanupInstances ![cleanup[i + 1]];
+        cleanup[i].call(context);
       }
     }
-    view.cleanup = null;
+    view.cleanupInstances = null;
   }
 }
 
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 7e3f029848..fd6a667a01 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -17,7 +17,7 @@ import {getSymbolIterator} from '../util';
 
 import {assertEqual, assertNotNull} from './assert';
 import {ReadFromInjectorFn, getOrCreateNodeInjectorForNode} from './di';
-import {assertPreviousIsParent, getCleanup, getCurrentQueries, store} from './instructions';
+import {assertPreviousIsParent, getCurrentQueries, store, storeCleanupWithContext} from './instructions';
 import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
 import {LInjector, unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {LContainerNode, LElementNode, LNode, TNode, TNodeFlags, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
@@ -416,7 +416,7 @@ export function query<T>(
   const queryList = new QueryList<T>();
   const queries = getCurrentQueries(LQueries_);
   queries.track(queryList, predicate, descend, read);
-  getCleanup().push(queryList.destroy, queryList);
+  storeCleanupWithContext(undefined, queryList, queryList.destroy);
   if (memoryIndex != null) {
     store(memoryIndex, queryList);
   }
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 4d912ffc55..060f2c997b 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -9,7 +9,7 @@
 import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef} from '../linker/view_ref';
 
-import {checkNoChanges, detectChanges, markViewDirty} from './instructions';
+import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn} from './instructions';
 import {ComponentTemplate} from './interfaces/definition';
 import {LViewNode} from './interfaces/node';
 import {LView, LViewFlags} from './interfaces/view';
@@ -33,9 +33,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
 
   destroy(): void { destroyLView(this._view); }
 
-  onDestroy(callback: Function) {
-    (this._view.cleanup || (this._view.cleanup = [])).push(callback, null);
-  }
+  onDestroy(callback: Function) { storeCleanupFn(this._view, callback); }
 
   /**
    * Marks a view and all of its ancestors dirty.
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 0d19433be3..64f8a6e020 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -443,6 +443,9 @@
   {
     "name": "getSymbolIterator"
   },
+  {
+    "name": "getTViewCleanup"
+  },
   {
     "name": "getTypeNameForDebugging"
   },
@@ -626,6 +629,12 @@
   {
     "name": "setUpAttributes"
   },
+  {
+    "name": "storeCleanupFn"
+  },
+  {
+    "name": "storeCleanupWithContext"
+  },
   {
     "name": "stringify"
   },
diff --git a/packages/core/test/render3/listeners_spec.ts b/packages/core/test/render3/listeners_spec.ts
index d3a6cc9c00..f9aa7042ec 100644
--- a/packages/core/test/render3/listeners_spec.ts
+++ b/packages/core/test/render3/listeners_spec.ts
@@ -10,7 +10,7 @@ import {defineComponent, defineDirective} from '../../src/render3/index';
 import {container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, listener, text} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {getRendererFactory2} from './imported_renderer2';
-import {containerEl, renderComponent, renderToHtml} from './render_util';
+import {ComponentFixture, containerEl, renderComponent, renderToHtml} from './render_util';
 
 
 describe('event listeners', () => {
@@ -228,6 +228,187 @@ describe('event listeners', () => {
     expect(comp.counter).toEqual(2);
   });
 
+  it('should destroy listeners in views with renderer2', () => {
+
+    /**
+     * % if (ctx.showing) {
+       *  <button (click)="onClick()"> Click me </button>
+       * % }
+     */
+    class AppComp {
+      counter = 0;
+      showing = true;
+
+      onClick() { this.counter++; }
+
+      static ngComponentDef = defineComponent({
+        type: AppComp,
+        selectors: [['app-comp']],
+        factory: () => new AppComp(),
+        template: function(rf: RenderFlags, ctx: any) {
+          if (rf & RenderFlags.Create) {
+            container(0);
+          }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(0);
+            {
+              if (ctx.showing) {
+                if (embeddedViewStart(0)) {
+                  elementStart(0, 'button');
+                  {
+                    listener('click', function() { return ctx.onClick(); });
+                    text(1, 'Click me');
+                  }
+                  elementEnd();
+                }
+                embeddedViewEnd();
+              }
+            }
+            containerRefreshEnd();
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(AppComp, {rendererFactory: getRendererFactory2(document)});
+    const comp = fixture.component;
+    const button = fixture.hostElement.querySelector('button') !;
+
+    button.click();
+    expect(comp.counter).toEqual(1);
+
+    button.click();
+    expect(comp.counter).toEqual(2);
+
+    // the listener should be removed when the view is removed
+    comp.showing = false;
+    fixture.update();
+    button.click();
+    expect(comp.counter).toEqual(2);
+  });
+
+  it('should destroy listeners in for loops', () => {
+
+    /**
+     * % for (let i = 0; i < ctx.buttons; i++) {
+       *  <button (click)="onClick(i)"> Click me </button>
+       * % }
+     */
+    class AppComp {
+      buttons = 2;
+      counters = [0, 0];
+
+      onClick(index: number) { this.counters[index]++; }
+
+      static ngComponentDef = defineComponent({
+        type: AppComp,
+        selectors: [['app-comp']],
+        factory: () => new AppComp(),
+        template: function(rf: RenderFlags, ctx: any) {
+          if (rf & RenderFlags.Create) {
+            container(0);
+          }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(0);
+            {
+              for (let i = 0; i < ctx.buttons; i++) {
+                if (embeddedViewStart(0)) {
+                  elementStart(0, 'button');
+                  {
+                    listener('click', function() { return ctx.onClick(i); });
+                    text(1, 'Click me');
+                  }
+                  elementEnd();
+                }
+                embeddedViewEnd();
+              }
+            }
+            containerRefreshEnd();
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(AppComp);
+    const comp = fixture.component;
+    const buttons = fixture.hostElement.querySelectorAll('button') !;
+
+    buttons[0].click();
+    expect(comp.counters).toEqual([1, 0]);
+
+    buttons[1].click();
+    expect(comp.counters).toEqual([1, 1]);
+
+    // the listener should be removed when the view is removed
+    comp.buttons = 0;
+    fixture.update();
+
+    buttons[0].click();
+    buttons[1].click();
+    expect(comp.counters).toEqual([1, 1]);
+  });
+
+  it('should destroy listeners in for loops with renderer2', () => {
+
+    /**
+     * % for (let i = 0; i < ctx.buttons; i++) {
+       *  <button (click)="onClick(i)"> Click me </button>
+       * % }
+     */
+    class AppComp {
+      buttons = 2;
+      counters = [0, 0];
+
+      onClick(index: number) { this.counters[index]++; }
+
+      static ngComponentDef = defineComponent({
+        type: AppComp,
+        selectors: [['app-comp']],
+        factory: () => new AppComp(),
+        template: function(rf: RenderFlags, ctx: any) {
+          if (rf & RenderFlags.Create) {
+            container(0);
+          }
+          if (rf & RenderFlags.Update) {
+            containerRefreshStart(0);
+            {
+              for (let i = 0; i < ctx.buttons; i++) {
+                if (embeddedViewStart(1)) {
+                  elementStart(0, 'button');
+                  {
+                    listener('click', function() { return ctx.onClick(i); });
+                    text(1, 'Click me');
+                  }
+                  elementEnd();
+                }
+                embeddedViewEnd();
+              }
+            }
+            containerRefreshEnd();
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(AppComp, {rendererFactory: getRendererFactory2(document)});
+    const comp = fixture.component;
+    const buttons = fixture.hostElement.querySelectorAll('button') !;
+
+    buttons[0].click();
+    expect(comp.counters).toEqual([1, 0]);
+
+    buttons[1].click();
+    expect(comp.counters).toEqual([1, 1]);
+
+    // the listener should be removed when the view is removed
+    comp.buttons = 0;
+    fixture.update();
+
+    buttons[0].click();
+    buttons[1].click();
+    expect(comp.counters).toEqual([1, 1]);
+  });
+
   it('should support host listeners', () => {
     let events: string[] = [];
 
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 2486905eae..cb4bf297ad 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -103,7 +103,7 @@ export class ComponentFixture<T> extends BaseFixture {
 
   constructor(
       private componentType: ComponentType<T>,
-      opts: {injector?: Injector, sanitizer?: Sanitizer} = {}) {
+      opts: {injector?: Injector, sanitizer?: Sanitizer, rendererFactory?: RendererFactory3} = {}) {
     super();
     this.requestAnimationFrame = function(fn: () => void) {
       requestAnimationFrame.queue.push(fn);
@@ -119,7 +119,8 @@ export class ComponentFixture<T> extends BaseFixture {
       host: this.hostElement,
       scheduler: this.requestAnimationFrame,
       injector: opts.injector,
-      sanitizer: opts.sanitizer
+      sanitizer: opts.sanitizer,
+      rendererFactory: opts.rendererFactory || domRendererFactory3
     });
   }
 

From 22b58a717aad87092a7f7080805c10ef36960694 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 9 May 2018 16:49:39 -0700
Subject: [PATCH 195/582] feat(ivy): add support of
 ApplicationRef.bootstrapModuleFactory (#23811)

PR Close #23811
---
 packages/core/src/application_module.ts       |  45 +++--
 .../core/src/core_render3_private_export.ts   |   2 +
 packages/core/src/di.ts                       |   2 +-
 packages/core/src/di/injector.ts              |   9 +-
 packages/core/src/di/provider.ts              |   8 +-
 packages/core/src/di/r3_injector.ts           |  29 +--
 packages/core/src/render3/assert.ts           |   4 +-
 packages/core/src/render3/component.ts        |  49 ++---
 packages/core/src/render3/component_ref.ts    | 176 ++++++++++++++++++
 packages/core/src/render3/di.ts               |   8 +-
 packages/core/src/render3/index.ts            |   7 +-
 packages/core/src/render3/instructions.ts     |  58 +++---
 packages/core/src/render3/interfaces/view.ts  |   4 +-
 packages/core/src/render3/ng_module_ref.ts    |  73 ++++++++
 packages/core/src/render3/node_assert.ts      |   6 +-
 .../core/src/render3/node_manipulation.ts     |   2 +-
 .../core/src/render3/node_selector_matcher.ts |   4 +-
 packages/core/src/render3/query.ts            |   8 +-
 packages/core/src/render3/view_ref.ts         |  13 +-
 .../test/application_ref_integration_spec.ts  |  95 ++++++++++
 .../hello_world/bundle.golden_symbols.json    |   3 +
 .../hello_world_r2/bundle.golden_symbols.json |   2 +-
 .../bundling/todo/bundle.golden_symbols.json  |   5 +-
 packages/core/test/di/r3_injector_spec.ts     |  20 ++
 packages/core/test/render3/component_spec.ts  |  27 ++-
 packages/core/test/render3/render_util.ts     |   2 +-
 packages/platform-browser/src/browser.ts      |  61 +++---
 tools/public_api_guard/core/core.d.ts         |   9 +-
 .../platform-browser/platform-browser.d.ts    |   2 +-
 29 files changed, 580 insertions(+), 153 deletions(-)
 create mode 100644 packages/core/src/render3/component_ref.ts
 create mode 100644 packages/core/src/render3/ng_module_ref.ts
 create mode 100644 packages/core/test/application_ref_integration_spec.ts

diff --git a/packages/core/src/application_module.ts b/packages/core/src/application_module.ts
index 55caa5d9b7..4cbd10b24b 100644
--- a/packages/core/src/application_module.ts
+++ b/packages/core/src/application_module.ts
@@ -10,11 +10,15 @@ import {APP_INITIALIZER, ApplicationInitStatus} from './application_init';
 import {ApplicationRef} from './application_ref';
 import {APP_ID_RANDOM_PROVIDER} from './application_tokens';
 import {IterableDiffers, KeyValueDiffers, defaultIterableDiffers, defaultKeyValueDiffers} from './change_detection/change_detection';
-import {forwardRef} from './di/forward_ref';
+import {Console} from './console';
+import {InjectionToken, Injector, StaticProvider} from './di';
 import {Inject, Optional, SkipSelf} from './di/metadata';
+import {ErrorHandler} from './error_handler';
 import {LOCALE_ID} from './i18n/tokens';
+import {ComponentFactoryResolver} from './linker';
 import {Compiler} from './linker/compiler';
 import {NgModule} from './metadata';
+import {NgZone} from './zone';
 
 export function _iterableDiffersFactory() {
   return defaultIterableDiffers;
@@ -28,27 +32,36 @@ export function _localeFactory(locale?: string): string {
   return locale || 'en-US';
 }
 
+export const APPLICATION_MODULE_PROVIDERS: StaticProvider[] = [
+  {
+    provide: ApplicationRef,
+    useClass: ApplicationRef,
+    deps:
+        [NgZone, Console, Injector, ErrorHandler, ComponentFactoryResolver, ApplicationInitStatus]
+  },
+  {
+    provide: ApplicationInitStatus,
+    useClass: ApplicationInitStatus,
+    deps: [[new Optional(), APP_INITIALIZER]]
+  },
+  {provide: Compiler, useClass: Compiler, deps: []},
+  APP_ID_RANDOM_PROVIDER,
+  {provide: IterableDiffers, useFactory: _iterableDiffersFactory, deps: []},
+  {provide: KeyValueDiffers, useFactory: _keyValueDiffersFactory, deps: []},
+  {
+    provide: LOCALE_ID,
+    useFactory: _localeFactory,
+    deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
+  },
+];
+
 /**
  * This module includes the providers of @angular/core that are needed
  * to bootstrap components via `ApplicationRef`.
  *
  * @experimental
  */
-@NgModule({
-  providers: [
-    ApplicationRef,
-    ApplicationInitStatus,
-    Compiler,
-    APP_ID_RANDOM_PROVIDER,
-    {provide: IterableDiffers, useFactory: _iterableDiffersFactory},
-    {provide: KeyValueDiffers, useFactory: _keyValueDiffersFactory},
-    {
-      provide: LOCALE_ID,
-      useFactory: _localeFactory,
-      deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
-    },
-  ],
-})
+@NgModule({providers: APPLICATION_MODULE_PROVIDERS})
 export class ApplicationModule {
   // Inject ApplicationRef to make it eager...
   constructor(appRef: ApplicationRef) {}
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index ff8c7449b4..3998173ec9 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -23,6 +23,8 @@ export {
   injectAttribute as ɵinjectAttribute,
   PublicFeature as ɵPublicFeature,
   NgOnChangesFeature as ɵNgOnChangesFeature,
+  NgModuleDef as ɵNgModuleDef,
+  NgModuleType as ɵNgModuleType,
   CssSelectorList as ɵCssSelectorList,
   markDirty as ɵmarkDirty,
   NC as ɵNC,
diff --git a/packages/core/src/di.ts b/packages/core/src/di.ts
index 62d3c4a38e..1e6b201b84 100644
--- a/packages/core/src/di.ts
+++ b/packages/core/src/di.ts
@@ -18,7 +18,7 @@ export {forwardRef, resolveForwardRef, ForwardRefFn} from './di/forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './di/injectable';
 export {inject, InjectFlags, INJECTOR, Injector} from './di/injector';
 export {ReflectiveInjector} from './di/reflective_injector';
-export {StaticProvider, ValueProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './di/provider';
+export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './di/provider';
 export {createInjector} from './di/r3_injector';
 export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './di/reflective_provider';
 export {ReflectiveKey} from './di/reflective_key';
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index 5cbd618846..e0286e80b4 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -32,6 +32,9 @@ export const INJECTOR = new InjectionToken<Injector>('INJECTOR');
 export class NullInjector implements Injector {
   get(token: any, notFoundValue: any = _THROW_IF_NOT_FOUND): any {
     if (notFoundValue === _THROW_IF_NOT_FOUND) {
+      // Intentionally left behind: With dev tools open the debugger will stop here. There is no
+      // reason why correctly written application should cause this exception.
+      debugger;
       throw new Error(`NullInjectorError: No provider for ${stringify(token)}!`);
     }
     return notFoundValue;
@@ -487,11 +490,11 @@ export function injectArgs(types: (Type<any>| InjectionToken<any>| any[])[]): an
 
       for (let j = 0; j < arg.length; j++) {
         const meta = arg[j];
-        if (meta instanceof Optional || meta.__proto__.ngMetadataName === 'Optional') {
+        if (meta instanceof Optional || meta.ngMetadataName === 'Optional') {
           flags |= InjectFlags.Optional;
-        } else if (meta instanceof SkipSelf || meta.__proto__.ngMetadataName === 'SkipSelf') {
+        } else if (meta instanceof SkipSelf || meta.ngMetadataName === 'SkipSelf') {
           flags |= InjectFlags.SkipSelf;
-        } else if (meta instanceof Self || meta.__proto__.ngMetadataName === 'Self') {
+        } else if (meta instanceof Self || meta.ngMetadataName === 'Self') {
           flags |= InjectFlags.Self;
         } else if (meta instanceof Inject) {
           type = meta.token;
diff --git a/packages/core/src/di/provider.ts b/packages/core/src/di/provider.ts
index 1b521e911a..447f7c2279 100644
--- a/packages/core/src/di/provider.ts
+++ b/packages/core/src/di/provider.ts
@@ -151,10 +151,6 @@ export interface StaticClassProvider extends StaticClassSansProvider {
  *
  * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
  *
- * ### Example
- *
- * {@example core/di/ts/provider_spec.ts region='ConstructorSansProvider'}
- *
  * @experimental
  */
 export interface ConstructorSansProvider {
@@ -453,5 +449,5 @@ export interface ClassProvider extends ClassSansProvider {
  *
  *
  */
-export type Provider =
-    TypeProvider | ValueProvider | ClassProvider | ExistingProvider | FactoryProvider | any[];
+export type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider |
+    ExistingProvider | FactoryProvider | any[];
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index 9305d4b796..28742c19a2 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -14,7 +14,7 @@ import {InjectableDef, InjectableType, InjectorDef, InjectorType, InjectorTypeWi
 import {resolveForwardRef} from './forward_ref';
 import {InjectableDefToken, InjectionToken} from './injection_token';
 import {INJECTOR, InjectFlags, Injector, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, inject, injectArgs, setCurrentInjector} from './injector';
-import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, TypeProvider, ValueProvider} from './provider';
+import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './provider';
 import {APP_ROOT} from './scope';
 
 
@@ -64,14 +64,15 @@ interface Record<T> {
 }
 
 /**
- * Create a new `Injector` which is configured using `InjectorType`s.
+ * Create a new `Injector` which is configured using a `defType` of `InjectorType<any>`s.
  *
  * @experimental
  */
 export function createInjector(
-    defType: /* InjectorType<any> */ any, parent: Injector | null = null): Injector {
+    defType: /* InjectorType<any> */ any, parent: Injector | null = null,
+    additionalProviders: StaticProvider[] | null = null): Injector {
   parent = parent || getNullInjector();
-  return new R3Injector(defType, parent);
+  return new R3Injector(defType, additionalProviders, parent);
 }
 
 export class R3Injector {
@@ -101,12 +102,18 @@ export class R3Injector {
    */
   private destroyed = false;
 
-  constructor(def: InjectorType<any>, readonly parent: Injector) {
+  constructor(
+      def: InjectorType<any>, additionalProviders: StaticProvider[]|null,
+      readonly parent: Injector) {
     // Start off by creating Records for every provider declared in every InjectorType
     // included transitively in `def`.
     deepForEach(
         [def], injectorDef => this.processInjectorType(injectorDef, new Set<InjectorType<any>>()));
 
+    additionalProviders &&
+        deepForEach(additionalProviders, provider => this.processProvider(provider));
+
+
     // Make sure the INJECTOR token provides this injector.
     this.records.set(INJECTOR, makeRecord(undefined, this));
 
@@ -284,20 +291,18 @@ export class R3Injector {
           throw new Error(`Mixed multi-provider for ${token}.`);
         }
       } else {
-        token = provider;
         multiRecord = makeRecord(undefined, NOT_YET, true);
         multiRecord.factory = () => injectArgs(multiRecord !.multi !);
         this.records.set(token, multiRecord);
       }
       token = provider;
       multiRecord.multi !.push(provider);
+    } else {
+      const existing = this.records.get(token);
+      if (existing && existing.multi !== undefined) {
+        throw new Error(`Mixed multi-provider for ${stringify(token)}`);
+      }
     }
-
-    const existing = this.records.get(token);
-    if (existing && existing.multi !== undefined) {
-      throw new Error(`Mixed multi-provider for ${token}`);
-    }
-
     this.records.set(token, record);
   }
 
diff --git a/packages/core/src/render3/assert.ts b/packages/core/src/render3/assert.ts
index 8c80e47fb6..121217cb58 100644
--- a/packages/core/src/render3/assert.ts
+++ b/packages/core/src/render3/assert.ts
@@ -46,13 +46,13 @@ export function assertGreaterThan<T>(actual: T, expected: T, msg: string) {
   }
 }
 
-export function assertNull<T>(actual: T, msg: string) {
+export function assertNotDefined<T>(actual: T, msg: string) {
   if (actual != null) {
     throwError(msg);
   }
 }
 
-export function assertNotNull<T>(actual: T, msg: string) {
+export function assertDefined<T>(actual: T, msg: string) {
   if (actual == null) {
     throwError(msg);
   }
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 9bc5fa88ca..cfbc386e2d 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -13,7 +13,7 @@ import {Injector} from '../di/injector';
 import {ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
 import {Sanitizer} from '../sanitization/security';
 
-import {assertComponentType, assertNotNull} from './assert';
+import {assertComponentType, assertDefined} from './assert';
 import {queueInitHooks, queueLifecycleHooks} from './hooks';
 import {CLEAN_PROMISE, ROOT_DIRECTIVE_INDICES, _getComponentHostLElementNode, baseDirectiveCreate, createLView, createTView, detectChangesInternal, enterView, executeInitAndContentHooks, getRootView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement, setHostBindings} from './instructions';
 import {ComponentDef, ComponentType} from './interfaces/definition';
@@ -72,31 +72,6 @@ export interface CreateComponentOptions {
 }
 
 
-/**
- * Bootstraps a component, then creates and returns a `ComponentRef` for that component.
- *
- * @param componentType Component to bootstrap
- * @param options Optional parameters which control bootstrapping
- */
-export function createComponentRef<T>(
-    componentType: ComponentType<T>, opts: CreateComponentOptions): viewEngine_ComponentRef<T> {
-  const component = renderComponent(componentType, opts);
-  const hostView = _getComponentHostLElementNode(component).data as LView;
-  const hostViewRef = new ViewRef(hostView, component);
-  return {
-    location: {nativeElement: getHostElement(component)},
-    injector: opts.injector || NULL_INJECTOR,
-    instance: component,
-    hostView: hostViewRef,
-    changeDetectorRef: hostViewRef,
-    componentType: componentType,
-    // TODO: implement destroy and onDestroy
-    destroy: () => {},
-    onDestroy: (cb: Function) => {}
-  };
-}
-
-
 // TODO: A hack to not pull in the NullInjector from @angular/core.
 export const NULL_INJECTOR: Injector = {
   get: (token: any, notFoundValue?: any) => {
@@ -131,12 +106,8 @@ export function renderComponent<T>(
   // The first index of the first selector is the tag name.
   const componentTag = componentDef.selectors ![0] ![0] as string;
   const hostNode = locateHostElement(rendererFactory, opts.host || componentTag);
-  const rootContext: RootContext = {
-    // Incomplete initialization due to circular reference.
-    component: null !,
-    scheduler: opts.scheduler || requestAnimationFrame.bind(window),
-    clean: CLEAN_PROMISE,
-  };
+  const rootContext = createRootContext(opts.scheduler || requestAnimationFrame.bind(window));
+
   const rootView: LView = createLView(
       rendererFactory.createRenderer(hostNode, componentDef.rendererType),
       createTView(-1, null, null, null), rootContext,
@@ -152,8 +123,8 @@ export function renderComponent<T>(
     elementNode = hostElement(componentTag, hostNode, componentDef, sanitizer);
 
     // Create directive instance with factory() and store at index 0 in directives array
-    component = rootContext.component =
-        baseDirectiveCreate(0, componentDef.factory(), componentDef) as T;
+    rootContext.components.push(
+        component = baseDirectiveCreate(0, componentDef.factory(), componentDef) as T);
     initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
 
     opts.hostFeatures && opts.hostFeatures.forEach((feature) => feature(component, componentDef));
@@ -169,6 +140,14 @@ export function renderComponent<T>(
   return component;
 }
 
+export function createRootContext(scheduler: (workFn: () => void) => void): RootContext {
+  return {
+    components: [],
+    scheduler: scheduler,
+    clean: CLEAN_PROMISE,
+  };
+}
+
 /**
  * Used to enable lifecycle hooks on the root component.
  *
@@ -198,7 +177,7 @@ export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): v
  */
 function getRootContext(component: any): RootContext {
   const rootContext = getRootView(component).context as RootContext;
-  ngDevMode && assertNotNull(rootContext, 'rootContext');
+  ngDevMode && assertDefined(rootContext, 'rootContext');
   return rootContext;
 }
 
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
new file mode 100644
index 0000000000..01222b5a3b
--- /dev/null
+++ b/packages/core/src/render3/component_ref.ts
@@ -0,0 +1,176 @@
+/**
+ * @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 {ChangeDetectorRef} from '../change_detection/change_detector_ref';
+import {InjectionToken} from '../di/injection_token';
+import {Injector, inject} from '../di/injector';
+import {ComponentFactory as viewEngine_ComponentFactory, ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
+import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
+import {ElementRef} from '../linker/element_ref';
+import {NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
+import {RendererFactory2} from '../render/api';
+import {Type} from '../type';
+
+import {assertComponentType, assertDefined} from './assert';
+import {createRootContext} from './component';
+import {baseDirectiveCreate, createLView, createTView, enterView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement} from './instructions';
+import {ComponentDef, ComponentType} from './interfaces/definition';
+import {LElementNode} from './interfaces/node';
+import {RElement} from './interfaces/renderer';
+import {LView, LViewFlags, RootContext} from './interfaces/view';
+import {ViewRef} from './view_ref';
+
+export class ComponentFactoryResolver extends viewEngine_ComponentFactoryResolver {
+  resolveComponentFactory<T>(component: Type<T>): viewEngine_ComponentFactory<T> {
+    ngDevMode && assertComponentType(component);
+    const componentDef = (component as ComponentType<T>).ngComponentDef;
+    return new ComponentFactory(componentDef);
+  }
+}
+
+function toRefArray(map: {[key: string]: string}): {propName: string; templateName: string;}[] {
+  const array: {propName: string; templateName: string;}[] = [];
+  for (let nonMinified in map) {
+    if (map.hasOwnProperty(nonMinified)) {
+      const minified = map[nonMinified];
+      array.push({propName: minified, templateName: nonMinified});
+    }
+  }
+  return array;
+}
+
+/**
+ * Default {@link RootContext} for all components rendered with {@link renderComponent}.
+ */
+export const ROOT_CONTEXT = new InjectionToken<RootContext>(
+    'ROOT_CONTEXT_TOKEN',
+    {providedIn: 'root', factory: () => createRootContext(inject(SCHEDULER))});
+
+/**
+ * A change detection scheduler token for {@link RootContext}. This token is the default value used
+ * for the default `RootContext` found in the {@link ROOT_CONTEXT} token.
+ */
+export const SCHEDULER = new InjectionToken<((fn: () => void) => void)>(
+    'SCHEDULER_TOKEN', {providedIn: 'root', factory: () => requestAnimationFrame.bind(window)});
+
+/**
+ * Render3 implementation of {@link viewEngine_ComponentFactory}.
+ */
+export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
+  selector: string;
+  componentType: Type<any>;
+  ngContentSelectors: string[];
+  get inputs(): {propName: string; templateName: string;}[] {
+    return toRefArray(this.componentDef.inputs);
+  }
+  get outputs(): {propName: string; templateName: string;}[] {
+    return toRefArray(this.componentDef.outputs);
+  }
+
+  constructor(private componentDef: ComponentDef<any>) {
+    super();
+    this.componentType = componentDef.type;
+    this.selector = componentDef.selectors[0][0] as string;
+    this.ngContentSelectors = [];
+  }
+
+  create(
+      parentComponentInjector: Injector, projectableNodes?: any[][]|undefined,
+      rootSelectorOrNode?: any,
+      ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<T> {
+    ngDevMode && assertDefined(ngModule, 'ngModule should always be defined');
+
+    const rendererFactory = ngModule ? ngModule.injector.get(RendererFactory2) : document;
+    const hostNode = locateHostElement(rendererFactory, rootSelectorOrNode);
+
+    // The first index of the first selector is the tag name.
+    const componentTag = this.componentDef.selectors ![0] ![0] as string;
+
+    const rootContext: RootContext = ngModule !.injector.get(ROOT_CONTEXT);
+
+    // Create the root view. Uses empty TView and ContentTemplate.
+    const rootView: LView = createLView(
+        rendererFactory.createRenderer(hostNode, this.componentDef.rendererType),
+        createTView(-1, null, null, null), null,
+        this.componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
+    rootView.injector = ngModule && ngModule.injector || null;
+
+    // rootView is the parent when bootstrapping
+    const oldView = enterView(rootView, null !);
+
+    let component: T;
+    let elementNode: LElementNode;
+    try {
+      if (rendererFactory.begin) rendererFactory.begin();
+
+      // Create element node at index 0 in data array
+      elementNode = hostElement(componentTag, hostNode, this.componentDef);
+
+      // Create directive instance with factory() and store at index 0 in directives array
+      rootContext.components.push(
+          component = baseDirectiveCreate(0, this.componentDef.factory(), this.componentDef) as T);
+      initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
+
+    } finally {
+      enterView(oldView, null);
+      if (rendererFactory.end) rendererFactory.end();
+    }
+
+    // TODO(misko): this is the wrong injector here.
+    return new ComponentRef(
+        this.componentType, component, rootView, ngModule !.injector, hostNode !);
+  }
+}
+
+/**
+ * Represents an instance of a Component created via a {@link ComponentFactory}.
+ *
+ * `ComponentRef` provides access to the Component Instance as well other objects related to this
+ * Component Instance and allows you to destroy the Component Instance via the {@link #destroy}
+ * method.
+ *
+ */
+export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
+  destroyCbs: (() => void)[]|null = [];
+  location: ElementRef<any>;
+  injector: Injector;
+  instance: T;
+  hostView: ViewRef<T>;
+  changeDetectorRef: ChangeDetectorRef;
+  componentType: Type<T>;
+
+  constructor(
+      componentType: Type<T>, instance: T, rootView: LView, injector: Injector,
+      hostNode: RElement) {
+    super();
+    this.instance = instance;
+    /* TODO(jasonaden): This is incomplete, to be adjusted in follow-up PR. Notes from Kara:When
+     * ViewRef.detectChanges is called from ApplicationRef.tick, it will call detectChanges at the
+     * component instance level. I suspect this means that lifecycle hooks and host bindings on the
+     * given component won't work (as these are always called at the level above a component).
+     *
+     * In render2, ViewRef.detectChanges uses the root view instance for view checks, not the
+     * component instance. So passing in the root view (1 level above the component) is sufficient.
+     * We might  want to think about creating a fake component for the top level? Or overwrite
+     * detectChanges with a function that calls tickRootContext? */
+    this.hostView = this.changeDetectorRef = new ViewRef(rootView, instance);
+    this.injector = injector;
+    this.location = new ElementRef(hostNode);
+    this.componentType = componentType;
+  }
+
+  destroy(): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.forEach(fn => fn());
+    this.destroyCbs = null;
+  }
+  onDestroy(callback: () => void): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.push(callback);
+  }
+}
\ No newline at end of file
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 1c55e79fa6..4129107841 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -18,9 +18,9 @@ import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_co
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_ViewRef} from '../linker/view_ref';
 import {Type} from '../type';
 
-import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
+import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
-import {ComponentTemplate, DirectiveDef} from './interfaces/definition';
+import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
@@ -256,7 +256,7 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   const lElement = getPreviousOrParentNode() as LElementNode;
   ngDevMode && assertNodeType(lElement, TNodeType.Element);
   const tElement = lElement.tNode;
-  ngDevMode && assertNotNull(tElement, 'expecting tNode');
+  ngDevMode && assertDefined(tElement, 'expecting tNode');
   const attrs = tElement.attrs;
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
@@ -707,7 +707,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
       hostTNode.tViews = createTView(
           -1, hostNode.data.template !, hostTView.directiveRegistry, hostTView.pipeRegistry);
     }
-    ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
+    ngDevMode && assertDefined(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
         getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(), hostNode.data.queries);
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 0e8e091bc3..9d3c28b344 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LifecycleHooksFeature, createComponentRef, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
+import {LifecycleHooksFeature, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
 import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, definePipe} from './definition';
 import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef} from './interfaces/definition';
 
+export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
 
-
 // Naming scheme:
 // - Capital letters are for creating things: T(Text), E(Element), D(Directive), V(View),
 // C(Container), L(Listener)
@@ -73,6 +73,8 @@ export {
   tick,
 } from './instructions';
 
+export {NgModuleDef, NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
+
 export {
     AttributeMarker
 } from './interfaces/node';
@@ -122,7 +124,6 @@ export {
   defineComponent,
   defineDirective,
   definePipe,
-  createComponentRef,
   getHostElement,
   getRenderedText,
   renderComponent,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a004f10d81..509cd528bf 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -8,7 +8,7 @@
 
 import './ng_dev_mode';
 
-import {assertEqual, assertLessThan, assertNotEqual, assertNotNull, assertNull, assertSame} from './assert';
+import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual, assertSame} from './assert';
 import {LContainer} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
@@ -406,7 +406,8 @@ export function createLNode(
   if ((type & TNodeType.ViewOrElement) === TNodeType.ViewOrElement && isState) {
     // Bit of a hack to bust through the readonly because there is a circular dep between
     // LView and LNode.
-    ngDevMode && assertNull((state as LView).node, 'LView.node should not have been initialized');
+    ngDevMode &&
+        assertNotDefined((state as LView).node, 'LView.node should not have been initialized');
     (state as{node: LNode}).node = node;
     if (firstTemplatePass) (state as LView).tView.node = node.tNode;
   }
@@ -455,7 +456,7 @@ export function renderTemplate<T>(
             sanitizer));
   }
   const hostView = host.data !;
-  ngDevMode && assertNotNull(hostView, 'Host node should have an LView defined in host.data.');
+  ngDevMode && assertDefined(hostView, 'Host node should have an LView defined in host.data.');
   renderComponentOrTemplate(host, hostView, context, template);
   return host;
 }
@@ -1300,8 +1301,8 @@ export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
     ngDevMode && assertDataInRange(index);
     const existingNode = data[index] as LTextNode;
-    ngDevMode && assertNotNull(existingNode, 'LNode should exist');
-    ngDevMode && assertNotNull(existingNode.native, 'native element should exist');
+    ngDevMode && assertDefined(existingNode, 'LNode should exist');
+    ngDevMode && assertDefined(existingNode.native, 'native element should exist');
     ngDevMode && ngDevMode.rendererSetText++;
     isProceduralRenderer(renderer) ? renderer.setValue(existingNode.native, stringify(value)) :
                                      existingNode.native.textContent = stringify(value);
@@ -1325,7 +1326,7 @@ export function directiveCreate<T>(
     index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
   const instance = baseDirectiveCreate(index, directive, directiveDef);
 
-  ngDevMode && assertNotNull(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
+  ngDevMode && assertDefined(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
   const tNode = previousOrParentNode.tNode;
 
   const isComponent = (directiveDef as ComponentDef<T>).template;
@@ -1494,7 +1495,7 @@ function generateInitialInputs(
 export function createLContainer(
     parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>,
     isForViewContainerRef?: boolean): LContainer {
-  ngDevMode && assertNotNull(parentLNode, 'containers should have a parent');
+  ngDevMode && assertDefined(parentLNode, 'containers should have a parent');
   return <LContainer>{
     views: [],
     nextIndex: isForViewContainerRef ? null : 0,
@@ -1611,7 +1612,7 @@ function refreshDynamicChildren() {
         const lViewNode = container.views[i];
         // The directives and pipes are not needed here as an existing view is only being refreshed.
         const dynamicView = lViewNode.data;
-        ngDevMode && assertNotNull(dynamicView.tView, 'TView must be allocated');
+        ngDevMode && assertDefined(dynamicView.tView, 'TView must be allocated');
         renderEmbeddedTemplate(lViewNode, dynamicView.tView, dynamicView.context !, renderer);
       }
     }
@@ -1699,7 +1700,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
 function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TView {
   ngDevMode && assertNodeType(parent, TNodeType.Container);
   const containerTViews = (parent !.tNode as TContainerNode).tViews as TView[];
-  ngDevMode && assertNotNull(containerTViews, 'TView expected');
+  ngDevMode && assertDefined(containerTViews, 'TView expected');
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
     const tView = currentView.tView;
@@ -1773,7 +1774,7 @@ export function componentRefresh<T>(directiveIndex: number, elementIndex: number
   ngDevMode && assertDataInRange(elementIndex);
   const element = data ![elementIndex] as LElementNode;
   ngDevMode && assertNodeType(element, TNodeType.Element);
-  ngDevMode && assertNotNull(element.data, `Component's host node should have an LView attached.`);
+  ngDevMode && assertDefined(element.data, `Component's host node should have an LView attached.`);
   const hostView = element.data !;
 
   // Only attached CheckAlways components or attached, dirty OnPush components should be checked
@@ -1928,13 +1929,13 @@ export function projection(
 function findComponentHost(lView: LView): LElementNode {
   let viewRootLNode = lView.node;
   while (viewRootLNode.tNode.type === TNodeType.View) {
-    ngDevMode && assertNotNull(lView.parent, 'lView.parent');
+    ngDevMode && assertDefined(lView.parent, 'lView.parent');
     lView = lView.parent !;
     viewRootLNode = lView.node;
   }
 
   ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
-  ngDevMode && assertNotNull(viewRootLNode.data, 'node.data');
+  ngDevMode && assertDefined(viewRootLNode.data, 'node.data');
 
   return viewRootLNode as LElementNode;
 }
@@ -2012,7 +2013,7 @@ export function markViewDirty(view: LView): void {
   }
   currentView.flags |= LViewFlags.Dirty;
 
-  ngDevMode && assertNotNull(currentView !.context, 'rootContext');
+  ngDevMode && assertDefined(currentView !.context, 'rootContext');
   scheduleTick(currentView !.context as RootContext);
 }
 
@@ -2033,7 +2034,7 @@ export function scheduleTick<T>(rootContext: RootContext) {
     let res: null|((val: null) => void);
     rootContext.clean = new Promise<null>((r) => res = r);
     rootContext.scheduler(() => {
-      tick(rootContext.component);
+      tickRootContext(rootContext);
       res !(null);
       rootContext.clean = _CLEAN_PROMISE;
     });
@@ -2054,11 +2055,18 @@ export function scheduleTick<T>(rootContext: RootContext) {
  */
 export function tick<T>(component: T): void {
   const rootView = getRootView(component);
-  const rootComponent = (rootView.context as RootContext).component;
-  const hostNode = _getComponentHostLElementNode(rootComponent);
+  const rootContext = rootView.context as RootContext;
+  tickRootContext(rootContext);
+}
 
-  ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
-  renderComponentOrTemplate(hostNode, rootView, rootComponent);
+function tickRootContext(rootContext: RootContext) {
+  for (let i = 0; i < rootContext.components.length; i++) {
+    const rootComponent = rootContext.components[i];
+    const hostNode = _getComponentHostLElementNode(rootComponent);
+
+    ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
+    renderComponentOrTemplate(hostNode, getRootView(rootComponent), rootComponent);
+  }
 }
 
 /**
@@ -2069,7 +2077,7 @@ export function tick<T>(component: T): void {
  */
 
 export function getRootView(component: any): LView {
-  ngDevMode && assertNotNull(component, 'component');
+  ngDevMode && assertDefined(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
   let lView = lElementNode.view;
   while (lView.parent) {
@@ -2093,7 +2101,7 @@ export function getRootView(component: any): LView {
  */
 export function detectChanges<T>(component: T): void {
   const hostNode = _getComponentHostLElementNode(component);
-  ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
+  ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
   detectChangesInternal(hostNode.data as LView, hostNode, component);
 }
 
@@ -2142,7 +2150,7 @@ export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode
  * @param component Component to mark as dirty.
  */
 export function markDirty<T>(component: T) {
-  ngDevMode && assertNotNull(component, 'component');
+  ngDevMode && assertDefined(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
   markViewDirty(lElementNode.view);
 }
@@ -2388,7 +2396,7 @@ export function load<T>(index: number): T {
 
 /** Retrieves a value from the `directives` array. */
 export function loadDirective<T>(index: number): T {
-  ngDevMode && assertNotNull(directives, 'Directives array should be defined if reading a dir.');
+  ngDevMode && assertDefined(directives, 'Directives array should be defined if reading a dir.');
   ngDevMode && assertDataInRange(index, directives !);
   return directives ![index];
 }
@@ -2453,7 +2461,7 @@ export function assertPreviousIsParent() {
 }
 
 function assertHasParent() {
-  assertNotNull(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
+  assertDefined(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
 }
 
 function assertDataInRange(index: number, arr?: any[]) {
@@ -2484,9 +2492,9 @@ export function assertReservedSlotInitialized(slotOffset: number, numSlots: numb
 }
 
 export function _getComponentHostLElementNode<T>(component: T): LElementNode {
-  ngDevMode && assertNotNull(component, 'expecting component got null');
+  ngDevMode && assertDefined(component, 'expecting component got null');
   const lElementNode = (component as any)[NG_HOST_SYMBOL] as LElementNode;
-  ngDevMode && assertNotNull(component, 'object is not a component');
+  ngDevMode && assertDefined(component, 'object is not a component');
   return lElementNode;
 }
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index c069e6f0ed..204c1e0960 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -420,10 +420,10 @@ export interface RootContext {
   clean: Promise<null>;
 
   /**
-   * RootComponent - The component which was instantiated by the call to
+   * RootComponents - The components that were instantiated by the call to
    * {@link renderComponent}.
    */
-  component: {};
+  components: {}[];
 }
 
 /**
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
new file mode 100644
index 0000000000..1844b3b57c
--- /dev/null
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -0,0 +1,73 @@
+/**
+ * @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 {Injector} from '../di/injector';
+import {StaticProvider} from '../di/provider';
+import {createInjector} from '../di/r3_injector';
+import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
+import {InternalNgModuleRef, NgModuleFactory as viewEngine_NgModuleFactory, NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
+import {Type} from '../type';
+import {stringify} from '../util';
+import {assertDefined} from './assert';
+import {ComponentFactoryResolver} from './component_ref';
+
+export interface NgModuleType { ngModuleDef: NgModuleDef; }
+
+export interface NgModuleDef { bootstrap: Type<any>[]; }
+
+export const COMPONENT_FACTORY_RESOLVER: StaticProvider = {
+  provide: viewEngine_ComponentFactoryResolver,
+  useFactory: () => new ComponentFactoryResolver(),
+  deps: [],
+};
+
+export class NgModuleRef<T> extends viewEngine_NgModuleRef<T> implements InternalNgModuleRef<T> {
+  // tslint:disable-next-line:require-internal-with-underscore
+  _bootstrapComponents: Type<any>[] = [];
+  injector: Injector;
+  componentFactoryResolver: viewEngine_ComponentFactoryResolver;
+  instance: T;
+  destroyCbs: (() => void)[]|null = [];
+
+  constructor(ngModuleType: Type<T>, parentInjector: Injector|null) {
+    super();
+    const ngModuleDef = (ngModuleType as any as NgModuleType).ngModuleDef;
+    ngDevMode && assertDefined(
+                     ngModuleDef,
+                     `NgModule '${stringify(ngModuleType)}' is not a subtype of 'NgModuleType'.`);
+
+    this._bootstrapComponents = ngModuleDef.bootstrap;
+    const additionalProviders: StaticProvider[] = [
+      COMPONENT_FACTORY_RESOLVER, {
+        provide: viewEngine_NgModuleRef,
+        useValue: this,
+      }
+    ];
+    this.injector = createInjector(ngModuleType, parentInjector, additionalProviders);
+    this.instance = this.injector.get(ngModuleType);
+    this.componentFactoryResolver = new ComponentFactoryResolver();
+  }
+
+  destroy(): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.forEach(fn => fn());
+    this.destroyCbs = null;
+  }
+  onDestroy(callback: () => void): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.push(callback);
+  }
+}
+
+export class NgModuleFactory<T> extends viewEngine_NgModuleFactory<T> {
+  constructor(public moduleType: Type<T>) { super(); }
+
+  create(parentInjector: Injector|null): viewEngine_NgModuleRef<T> {
+    return new NgModuleRef(this.moduleType, parentInjector);
+  }
+}
diff --git a/packages/core/src/render3/node_assert.ts b/packages/core/src/render3/node_assert.ts
index 73bf9b6997..c30a0f2455 100644
--- a/packages/core/src/render3/node_assert.ts
+++ b/packages/core/src/render3/node_assert.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertEqual, assertNotNull} from './assert';
+import {assertDefined, assertEqual} from './assert';
 import {LNode, TNodeType} from './interfaces/node';
 
 export function assertNodeType(node: LNode, type: TNodeType) {
-  assertNotNull(node, 'should be called with a node');
+  assertDefined(node, 'should be called with a node');
   assertEqual(node.tNode.type, type, `should be a ${typeName(type)}`);
 }
 
 export function assertNodeOfPossibleTypes(node: LNode, ...types: TNodeType[]) {
-  assertNotNull(node, 'should be called with a node');
+  assertDefined(node, 'should be called with a node');
   const found = types.some(type => node.tNode.type === type);
   assertEqual(found, true, `Should be one of ${types.map(typeName).join(', ')}`);
 }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index db4eb95d50..716565fc71 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertNotNull} from './assert';
+import {assertDefined} from './assert';
 import {callHooks} from './hooks';
 import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
 import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 73f2ab55ec..db94094e24 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -8,7 +8,7 @@
 
 import './ng_dev_mode';
 
-import {assertNotNull} from './assert';
+import {assertDefined} from './assert';
 import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
@@ -36,7 +36,7 @@ function isCssClassMatching(nodeClassAttrVal: string, cssClassToMatch: string):
  * @returns true if node matches the selector.
  */
 export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boolean {
-  ngDevMode && assertNotNull(selector[0], 'Selector should have a tag name');
+  ngDevMode && assertDefined(selector[0], 'Selector should have a tag name');
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index fd6a667a01..c04f3f48c8 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -15,7 +15,7 @@ import {QueryList as viewEngine_QueryList} from '../linker/query_list';
 import {Type} from '../type';
 import {getSymbolIterator} from '../util';
 
-import {assertEqual, assertNotNull} from './assert';
+import {assertDefined, assertEqual} from './assert';
 import {ReadFromInjectorFn, getOrCreateNodeInjectorForNode} from './di';
 import {assertPreviousIsParent, getCurrentQueries, store, storeCleanupWithContext} from './instructions';
 import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
@@ -163,7 +163,7 @@ export class LQueries_ implements LQueries {
     let query = this.deep;
     while (query) {
       ngDevMode &&
-          assertNotNull(
+          assertDefined(
               query.containerValues, 'View queries need to have a pointer to container values.');
       query.containerValues !.splice(index, 0, query.values);
       query = query.next;
@@ -179,7 +179,7 @@ export class LQueries_ implements LQueries {
     let query = this.deep;
     while (query) {
       ngDevMode &&
-          assertNotNull(
+          assertDefined(
               query.containerValues, 'View queries need to have a pointer to container values.');
       const removed = query.containerValues !.splice(index, 1);
 
@@ -273,7 +273,7 @@ function add(query: LQuery<any>| null, node: LNode) {
         if (directiveIdx !== null) {
           // a node is matching a predicate - determine what to read
           // note that queries using name selector must specify read strategy
-          ngDevMode && assertNotNull(predicate.read, 'the node should have a predicate');
+          ngDevMode && assertDefined(predicate.read, 'the node should have a predicate');
           const result = readFromNodeInjector(nodeInjector, node, predicate.read !, directiveIdx);
           if (result !== null) {
             addMatch(query, result);
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 060f2c997b..55c1b11e20 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ApplicationRef} from '../application_ref';
+import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
-import {EmbeddedViewRef as viewEngine_EmbeddedViewRef} from '../linker/view_ref';
+import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
 
 import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn} from './instructions';
 import {ComponentTemplate} from './interfaces/definition';
@@ -15,7 +17,10 @@ import {LViewNode} from './interfaces/node';
 import {LView, LViewFlags} from './interfaces/view';
 import {destroyLView} from './node_manipulation';
 
-export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
+export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_InternalViewRef,
+    viewEngine_ChangeDetectorRef {
+  private _appRef: ApplicationRef|null;
+
   context: T;
   rootNodes: any[];
 
@@ -210,6 +215,10 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
    * introduce other changes.
    */
   checkNoChanges(): void { checkNoChanges(this.context); }
+
+  detachFromAppRef() { this._appRef = null; }
+
+  attachToAppRef(appRef: ApplicationRef) { this._appRef = appRef; }
 }
 
 
diff --git a/packages/core/test/application_ref_integration_spec.ts b/packages/core/test/application_ref_integration_spec.ts
new file mode 100644
index 0000000000..9dee7acc17
--- /dev/null
+++ b/packages/core/test/application_ref_integration_spec.ts
@@ -0,0 +1,95 @@
+/**
+ * @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 {ApplicationModule, ApplicationRef, DoCheck, InjectFlags, InjectorType, Input, OnInit, PlatformRef, TestabilityRegistry, Type, defineInjector, inject, ɵE as elementStart, ɵNgModuleDef as NgModuleDef, ɵRenderFlags as RenderFlags, ɵT as text, ɵdefineComponent as defineComponent, ɵe as elementEnd, ɵi1 as interpolation1, ɵt as textBinding} from '@angular/core';
+import {getTestBed, withBody} from '@angular/core/testing';
+import {BrowserModule, EVENT_MANAGER_PLUGINS, platformBrowser} from '@angular/platform-browser';
+
+import {BROWSER_MODULE_PROVIDERS} from '../../platform-browser/src/browser';
+import {APPLICATION_MODULE_PROVIDERS} from '../src/application_module';
+import {NgModuleFactory} from '../src/render3/ng_module_ref';
+
+describe('ApplicationRef bootstrap', () => {
+  class HelloWorldComponent implements OnInit, DoCheck {
+    log: string[] = [];
+    name = 'World';
+    static ngComponentDef = defineComponent({
+      type: HelloWorldComponent,
+      selectors: [['hello-world']],
+      factory: () => new HelloWorldComponent(),
+      template: function(rf: RenderFlags, ctx: HelloWorldComponent): void {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'div');
+          text(1);
+          elementEnd();
+        }
+        if (rf & RenderFlags.Update) {
+          textBinding(1, interpolation1('Hello ', ctx.name, ''));
+        }
+      }
+    });
+
+    ngOnInit(): void { this.log.push('OnInit'); }
+
+    ngDoCheck(): void { this.log.push('DoCheck'); }
+  }
+
+  class MyAppModule {
+    static ngInjectorDef =
+        defineInjector({factory: () => new MyAppModule(), imports: [BrowserModule]});
+    static ngModuleDef = defineNgModule({bootstrap: [HelloWorldComponent]});
+  }
+
+  it('should bootstrap hello world', withBody('<hello-world></hello-world>', async() => {
+       const MyAppModuleFactory = new NgModuleFactory(MyAppModule);
+       const moduleRef =
+           await getTestBed().platform.bootstrapModuleFactory(MyAppModuleFactory, {ngZone: 'noop'});
+       const appRef = moduleRef.injector.get(ApplicationRef);
+       const helloWorldComponent = appRef.components[0].instance as HelloWorldComponent;
+       expect(document.body.innerHTML).toEqual('<hello-world><div>Hello World</div></hello-world>');
+       // TODO(jasonaden): Get with Kara on lifecycle hooks
+       //  expect(helloWorldComponent.log).toEqual(['OnInit', 'DoCheck']);
+       helloWorldComponent.name = 'Mundo';
+       appRef.tick();
+       expect(document.body.innerHTML).toEqual('<hello-world><div>Hello Mundo</div></hello-world>');
+       // TODO(jasonaden): Get with Kara on lifecycle hooks
+       //  expect(helloWorldComponent.log).toEqual(['OnInit', 'DoCheck', 'DoCheck']);
+
+       // Cleanup TestabilityRegistry
+       const registry: TestabilityRegistry = getTestBed().get(TestabilityRegistry);
+       registry.unregisterAllApplications();
+     }));
+
+});
+
+/////////////////////////////////////////////////////////
+
+// These go away when Compiler is ready
+
+(BrowserModule as any as InjectorType<BrowserModule>).ngInjectorDef = defineInjector({
+  factory: function BrowserModule_Factory() {
+    return new BrowserModule(inject(BrowserModule, InjectFlags.Optional | InjectFlags.SkipSelf));
+  },
+  imports: [ApplicationModule],
+  providers: BROWSER_MODULE_PROVIDERS
+});
+
+(ApplicationModule as any as InjectorType<ApplicationModule>).ngInjectorDef = defineInjector({
+  factory: function ApplicationModule_Factory() {
+    return new ApplicationModule(inject(ApplicationRef));
+  },
+  providers: APPLICATION_MODULE_PROVIDERS
+});
+
+export function defineNgModule({bootstrap}: {bootstrap?: Type<any>[]}): NgModuleDef {
+  return {
+    bootstrap: bootstrap || [],
+  };
+}
+
+/////////////////////////////////////////////////////////
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index df06f6a31f..c1c0de6f38 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -56,6 +56,9 @@
   {
     "name": "createLView"
   },
+  {
+    "name": "createRootContext"
+  },
   {
     "name": "createTNode"
   },
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index 56d1450518..c359140b00 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -2418,7 +2418,7 @@
     "name": "assertInterpolationSymbols"
   },
   {
-    "name": "assertNotNull$1"
+    "name": "assertNotNull"
   },
   {
     "name": "assertPlatform"
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 64f8a6e020..865432ac91 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -266,6 +266,9 @@
   {
     "name": "createOutput"
   },
+  {
+    "name": "createRootContext"
+  },
   {
     "name": "createTNode"
   },
@@ -657,7 +660,7 @@
     "name": "throwMultipleComponentError"
   },
   {
-    "name": "tick"
+    "name": "tickRootContext"
   },
   {
     "name": "trackByIdentity"
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 7d08f65de5..5e690b2f86 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -41,6 +41,8 @@ describe('InjectorDef-based createInjector()', () => {
 
   const STATIC_TOKEN = new InjectionToken<StaticService>('STATIC_TOKEN');
 
+  const LOCALE = new InjectionToken<string[]>('LOCALE');
+
   class ServiceWithDep {
     constructor(readonly service: Service) {}
 
@@ -50,6 +52,15 @@ describe('InjectorDef-based createInjector()', () => {
     });
   }
 
+  class ServiceWithMultiDep {
+    constructor(readonly locale: string[]) {}
+
+    static ngInjectableDef = defineInjectable({
+      providedIn: null,
+      factory: () => new ServiceWithMultiDep(inject(LOCALE)),
+    });
+  }
+
   class ServiceTwo {
     static ngInjectableDef = defineInjectable({
       providedIn: null,
@@ -112,6 +123,9 @@ describe('InjectorDef-based createInjector()', () => {
       imports: [IntermediateModule],
       providers: [
         ServiceWithDep,
+        ServiceWithMultiDep,
+        {provide: LOCALE, multi: true, useValue: 'en'},
+        {provide: LOCALE, multi: true, useValue: 'es'},
         Service,
         {provide: SERVICE_TOKEN, useExisting: Service},
         CircularA,
@@ -168,6 +182,12 @@ describe('InjectorDef-based createInjector()', () => {
     expect(instance.service).toBe(injector.get(Service));
   });
 
+  it('injects a service with dependencies on multi-providers', () => {
+    const instance = injector.get(ServiceWithMultiDep);
+    expect(instance instanceof ServiceWithMultiDep);
+    expect(instance.locale).toEqual(['en', 'es']);
+  });
+
   it('injects a token with useExisting', () => {
     const instance = injector.get(SERVICE_TOKEN);
     expect(instance).toBe(injector.get(Service));
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index 7b7026e9a2..148f447ded 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -7,9 +7,9 @@
  */
 
 
-import {ComponentFactory, DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
+import {DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
 import {getRenderedText} from '../../src/render3/component';
-import {LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
+import {ComponentFactory, LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding, tick} from '../../src/render3/instructions';
 import {ComponentDef, DirectiveDef, RenderFlags} from '../../src/render3/interfaces/definition';
 import {createRendererType2} from '../../src/view/index';
@@ -364,4 +364,27 @@ describe('recursive components', () => {
     tick(comp);
     expect(events).toEqual(['check6', 'check2', 'check0', 'check1', 'check5', 'check3', 'check4']);
   });
+
+  it('should map inputs minified & unminified names', async() => {
+    class TestInputsComponent {
+      minifiedName: string;
+      static ngComponentDef = defineComponent({
+        type: TestInputsComponent,
+        selectors: [['test-inputs']],
+        inputs: {minifiedName: 'unminifiedName'},
+        factory: () => new TestInputsComponent(),
+        template: function(rf: RenderFlags, ctx: TestInputsComponent): void {
+          // Template not needed for this test
+        }
+      });
+    }
+
+    const testInputsComponentFactory = new ComponentFactory(TestInputsComponent.ngComponentDef);
+
+    expect([
+      {propName: 'minifiedName', templateName: 'unminifiedName'}
+    ]).toEqual(testInputsComponentFactory.inputs);
+
+  });
+
 });
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index cb4bf297ad..0a68b1ead8 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -135,7 +135,7 @@ export class ComponentFixture<T> extends BaseFixture {
 // Fixtures above are preferred way of testing Components and Templates
 ///////////////////////////////////////////////////////////////////////////////////
 
-export const document = ((global || window) as any).document;
+export const document = ((typeof global == 'object' && global || window) as any).document;
 export let containerEl: HTMLElement = null !;
 let host: LElementNode|null;
 const isRenderer2 =
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index dc13d2bdbb..9550029af9 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, PlatformLocation, ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
-import {APP_ID, ApplicationModule, ErrorHandler, ModuleWithProviders, NgModule, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
+import {APP_ID, ApplicationModule, ClassProvider, ConstructorSansProvider, ErrorHandler, ExistingProvider, FactoryProvider, Inject, InjectionToken, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
 
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserPlatformLocation} from './browser/location/browser_platform_location';
@@ -20,7 +20,7 @@ import {getDOM} from './dom/dom_adapter';
 import {DomRendererFactory2} from './dom/dom_renderer';
 import {DOCUMENT} from './dom/dom_tokens';
 import {DomEventsPlugin} from './dom/events/dom_events';
-import {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
+import {EVENT_MANAGER_PLUGINS, EventManager, EventManagerPlugin} from './dom/events/event_manager';
 import {HAMMER_GESTURE_CONFIG, HammerGestureConfig, HammerGesturesPlugin} from './dom/events/hammer_gestures';
 import {KeyEventsPlugin} from './dom/events/key_events';
 import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
@@ -60,34 +60,47 @@ export function _document(): any {
   return document;
 }
 
+export const BROWSER_MODULE_PROVIDERS: StaticProvider[] = [
+  BROWSER_SANITIZATION_PROVIDERS,
+  {provide: APP_ROOT, useValue: true},
+  {provide: ErrorHandler, useFactory: errorHandler, deps: []},
+  {
+    provide: EVENT_MANAGER_PLUGINS,
+    useClass: DomEventsPlugin,
+    multi: true,
+    deps: [DOCUMENT, NgZone, PLATFORM_ID]
+  },
+  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true, deps: [DOCUMENT]},
+  {
+    provide: EVENT_MANAGER_PLUGINS,
+    useClass: HammerGesturesPlugin,
+    multi: true,
+    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG]
+  },
+  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig, deps: []},
+  {
+    provide: DomRendererFactory2,
+    useClass: DomRendererFactory2,
+    deps: [EventManager, DomSharedStylesHost]
+  },
+  {provide: RendererFactory2, useExisting: DomRendererFactory2},
+  {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
+  {provide: DomSharedStylesHost, useClass: DomSharedStylesHost, deps: [DOCUMENT]},
+  {provide: Testability, useClass: Testability, deps: [NgZone]},
+  {provide: EventManager, useClass: EventManager, deps: [EVENT_MANAGER_PLUGINS, NgZone]},
+  ELEMENT_PROBE_PROVIDERS,
+  {provide: Meta, useClass: Meta, deps: [DOCUMENT]},
+  {provide: Title, useClass: Title, deps: [DOCUMENT]},
+];
+
 /**
  * The ng module for the browser.
  *
  *
  */
-@NgModule({
-  providers: [
-    BROWSER_SANITIZATION_PROVIDERS,
-    {provide: APP_ROOT, useValue: true},
-    {provide: ErrorHandler, useFactory: errorHandler, deps: []},
-    {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
-    {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true},
-    {provide: EVENT_MANAGER_PLUGINS, useClass: HammerGesturesPlugin, multi: true},
-    {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig},
-    DomRendererFactory2,
-    {provide: RendererFactory2, useExisting: DomRendererFactory2},
-    {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
-    DomSharedStylesHost,
-    Testability,
-    EventManager,
-    ELEMENT_PROBE_PROVIDERS,
-    Meta,
-    Title,
-  ],
-  exports: [CommonModule, ApplicationModule]
-})
+@NgModule({providers: BROWSER_MODULE_PROVIDERS, exports: [CommonModule, ApplicationModule]})
 export class BrowserModule {
-  constructor(@Optional() @SkipSelf() parentModule: BrowserModule) {
+  constructor(@Optional() @SkipSelf() @Inject(BrowserModule) parentModule: BrowserModule|null) {
     if (parentModule) {
       throw new Error(
           `BrowserModule has already been loaded. If you need access to common directives such as NgIf and NgFor from a lazy loaded module, import CommonModule instead.`);
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index d781017237..d65ed33a3c 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -143,6 +143,11 @@ export declare abstract class ComponentRef<C> {
     abstract onDestroy(callback: Function): void;
 }
 
+/** @experimental */
+export interface ConstructorSansProvider {
+    deps?: any[];
+}
+
 export declare const ContentChild: ContentChildDecorator;
 
 export interface ContentChildDecorator {
@@ -168,7 +173,7 @@ export interface ContentChildrenDecorator {
 }
 
 /** @experimental */
-export declare function createInjector(defType: any, parent?: Injector | null): Injector;
+export declare function createInjector(defType: any, parent?: Injector | null, additionalProviders?: StaticProvider[] | null): Injector;
 
 /** @experimental */
 export declare function createPlatform(injector: Injector): PlatformRef;
@@ -609,7 +614,7 @@ export interface Predicate<T> {
     (value: T): boolean;
 }
 
-export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ExistingProvider | FactoryProvider | any[];
+export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider | ExistingProvider | FactoryProvider | any[];
 
 export declare abstract class Query {
 }
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
index e1c07cbe9b..52231287f2 100644
--- a/tools/public_api_guard/platform-browser/platform-browser.d.ts
+++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts
@@ -1,5 +1,5 @@
 export declare class BrowserModule {
-    constructor(parentModule: BrowserModule);
+    constructor(parentModule: BrowserModule | null);
     /** @experimental */ static withServerTransition(params: {
         appId: string;
     }): ModuleWithProviders;

From c494d3cf60ac1415d4fa7dedf519aafd9e4b23d1 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 5 Jun 2018 22:11:47 -0700
Subject: [PATCH 196/582] Revert "feat(ivy): add support of
 ApplicationRef.bootstrapModuleFactory (#23811)"

This reverts commit 22b58a717aad87092a7f7080805c10ef36960694.
This commit causes a breakage in g3.
---
 packages/core/src/application_module.ts       |  45 ++---
 .../core/src/core_render3_private_export.ts   |   2 -
 packages/core/src/di.ts                       |   2 +-
 packages/core/src/di/injector.ts              |   9 +-
 packages/core/src/di/provider.ts              |   8 +-
 packages/core/src/di/r3_injector.ts           |  29 ++-
 packages/core/src/render3/assert.ts           |   4 +-
 packages/core/src/render3/component.ts        |  49 +++--
 packages/core/src/render3/component_ref.ts    | 176 ------------------
 packages/core/src/render3/di.ts               |   8 +-
 packages/core/src/render3/index.ts            |   7 +-
 packages/core/src/render3/instructions.ts     |  58 +++---
 packages/core/src/render3/interfaces/view.ts  |   4 +-
 packages/core/src/render3/ng_module_ref.ts    |  73 --------
 packages/core/src/render3/node_assert.ts      |   6 +-
 .../core/src/render3/node_manipulation.ts     |   2 +-
 .../core/src/render3/node_selector_matcher.ts |   4 +-
 packages/core/src/render3/query.ts            |   8 +-
 packages/core/src/render3/view_ref.ts         |  13 +-
 .../test/application_ref_integration_spec.ts  |  95 ----------
 .../hello_world/bundle.golden_symbols.json    |   3 -
 .../hello_world_r2/bundle.golden_symbols.json |   2 +-
 .../bundling/todo/bundle.golden_symbols.json  |   5 +-
 packages/core/test/di/r3_injector_spec.ts     |  20 --
 packages/core/test/render3/component_spec.ts  |  27 +--
 packages/core/test/render3/render_util.ts     |   2 +-
 packages/platform-browser/src/browser.ts      |  61 +++---
 tools/public_api_guard/core/core.d.ts         |   9 +-
 .../platform-browser/platform-browser.d.ts    |   2 +-
 29 files changed, 153 insertions(+), 580 deletions(-)
 delete mode 100644 packages/core/src/render3/component_ref.ts
 delete mode 100644 packages/core/src/render3/ng_module_ref.ts
 delete mode 100644 packages/core/test/application_ref_integration_spec.ts

diff --git a/packages/core/src/application_module.ts b/packages/core/src/application_module.ts
index 4cbd10b24b..55caa5d9b7 100644
--- a/packages/core/src/application_module.ts
+++ b/packages/core/src/application_module.ts
@@ -10,15 +10,11 @@ import {APP_INITIALIZER, ApplicationInitStatus} from './application_init';
 import {ApplicationRef} from './application_ref';
 import {APP_ID_RANDOM_PROVIDER} from './application_tokens';
 import {IterableDiffers, KeyValueDiffers, defaultIterableDiffers, defaultKeyValueDiffers} from './change_detection/change_detection';
-import {Console} from './console';
-import {InjectionToken, Injector, StaticProvider} from './di';
+import {forwardRef} from './di/forward_ref';
 import {Inject, Optional, SkipSelf} from './di/metadata';
-import {ErrorHandler} from './error_handler';
 import {LOCALE_ID} from './i18n/tokens';
-import {ComponentFactoryResolver} from './linker';
 import {Compiler} from './linker/compiler';
 import {NgModule} from './metadata';
-import {NgZone} from './zone';
 
 export function _iterableDiffersFactory() {
   return defaultIterableDiffers;
@@ -32,36 +28,27 @@ export function _localeFactory(locale?: string): string {
   return locale || 'en-US';
 }
 
-export const APPLICATION_MODULE_PROVIDERS: StaticProvider[] = [
-  {
-    provide: ApplicationRef,
-    useClass: ApplicationRef,
-    deps:
-        [NgZone, Console, Injector, ErrorHandler, ComponentFactoryResolver, ApplicationInitStatus]
-  },
-  {
-    provide: ApplicationInitStatus,
-    useClass: ApplicationInitStatus,
-    deps: [[new Optional(), APP_INITIALIZER]]
-  },
-  {provide: Compiler, useClass: Compiler, deps: []},
-  APP_ID_RANDOM_PROVIDER,
-  {provide: IterableDiffers, useFactory: _iterableDiffersFactory, deps: []},
-  {provide: KeyValueDiffers, useFactory: _keyValueDiffersFactory, deps: []},
-  {
-    provide: LOCALE_ID,
-    useFactory: _localeFactory,
-    deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
-  },
-];
-
 /**
  * This module includes the providers of @angular/core that are needed
  * to bootstrap components via `ApplicationRef`.
  *
  * @experimental
  */
-@NgModule({providers: APPLICATION_MODULE_PROVIDERS})
+@NgModule({
+  providers: [
+    ApplicationRef,
+    ApplicationInitStatus,
+    Compiler,
+    APP_ID_RANDOM_PROVIDER,
+    {provide: IterableDiffers, useFactory: _iterableDiffersFactory},
+    {provide: KeyValueDiffers, useFactory: _keyValueDiffersFactory},
+    {
+      provide: LOCALE_ID,
+      useFactory: _localeFactory,
+      deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
+    },
+  ],
+})
 export class ApplicationModule {
   // Inject ApplicationRef to make it eager...
   constructor(appRef: ApplicationRef) {}
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 3998173ec9..ff8c7449b4 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -23,8 +23,6 @@ export {
   injectAttribute as ɵinjectAttribute,
   PublicFeature as ɵPublicFeature,
   NgOnChangesFeature as ɵNgOnChangesFeature,
-  NgModuleDef as ɵNgModuleDef,
-  NgModuleType as ɵNgModuleType,
   CssSelectorList as ɵCssSelectorList,
   markDirty as ɵmarkDirty,
   NC as ɵNC,
diff --git a/packages/core/src/di.ts b/packages/core/src/di.ts
index 1e6b201b84..62d3c4a38e 100644
--- a/packages/core/src/di.ts
+++ b/packages/core/src/di.ts
@@ -18,7 +18,7 @@ export {forwardRef, resolveForwardRef, ForwardRefFn} from './di/forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './di/injectable';
 export {inject, InjectFlags, INJECTOR, Injector} from './di/injector';
 export {ReflectiveInjector} from './di/reflective_injector';
-export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './di/provider';
+export {StaticProvider, ValueProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './di/provider';
 export {createInjector} from './di/r3_injector';
 export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './di/reflective_provider';
 export {ReflectiveKey} from './di/reflective_key';
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index e0286e80b4..5cbd618846 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -32,9 +32,6 @@ export const INJECTOR = new InjectionToken<Injector>('INJECTOR');
 export class NullInjector implements Injector {
   get(token: any, notFoundValue: any = _THROW_IF_NOT_FOUND): any {
     if (notFoundValue === _THROW_IF_NOT_FOUND) {
-      // Intentionally left behind: With dev tools open the debugger will stop here. There is no
-      // reason why correctly written application should cause this exception.
-      debugger;
       throw new Error(`NullInjectorError: No provider for ${stringify(token)}!`);
     }
     return notFoundValue;
@@ -490,11 +487,11 @@ export function injectArgs(types: (Type<any>| InjectionToken<any>| any[])[]): an
 
       for (let j = 0; j < arg.length; j++) {
         const meta = arg[j];
-        if (meta instanceof Optional || meta.ngMetadataName === 'Optional') {
+        if (meta instanceof Optional || meta.__proto__.ngMetadataName === 'Optional') {
           flags |= InjectFlags.Optional;
-        } else if (meta instanceof SkipSelf || meta.ngMetadataName === 'SkipSelf') {
+        } else if (meta instanceof SkipSelf || meta.__proto__.ngMetadataName === 'SkipSelf') {
           flags |= InjectFlags.SkipSelf;
-        } else if (meta instanceof Self || meta.ngMetadataName === 'Self') {
+        } else if (meta instanceof Self || meta.__proto__.ngMetadataName === 'Self') {
           flags |= InjectFlags.Self;
         } else if (meta instanceof Inject) {
           type = meta.token;
diff --git a/packages/core/src/di/provider.ts b/packages/core/src/di/provider.ts
index 447f7c2279..1b521e911a 100644
--- a/packages/core/src/di/provider.ts
+++ b/packages/core/src/di/provider.ts
@@ -151,6 +151,10 @@ export interface StaticClassProvider extends StaticClassSansProvider {
  *
  * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
  *
+ * ### Example
+ *
+ * {@example core/di/ts/provider_spec.ts region='ConstructorSansProvider'}
+ *
  * @experimental
  */
 export interface ConstructorSansProvider {
@@ -449,5 +453,5 @@ export interface ClassProvider extends ClassSansProvider {
  *
  *
  */
-export type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider |
-    ExistingProvider | FactoryProvider | any[];
+export type Provider =
+    TypeProvider | ValueProvider | ClassProvider | ExistingProvider | FactoryProvider | any[];
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index 28742c19a2..9305d4b796 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -14,7 +14,7 @@ import {InjectableDef, InjectableType, InjectorDef, InjectorType, InjectorTypeWi
 import {resolveForwardRef} from './forward_ref';
 import {InjectableDefToken, InjectionToken} from './injection_token';
 import {INJECTOR, InjectFlags, Injector, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, inject, injectArgs, setCurrentInjector} from './injector';
-import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './provider';
+import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, TypeProvider, ValueProvider} from './provider';
 import {APP_ROOT} from './scope';
 
 
@@ -64,15 +64,14 @@ interface Record<T> {
 }
 
 /**
- * Create a new `Injector` which is configured using a `defType` of `InjectorType<any>`s.
+ * Create a new `Injector` which is configured using `InjectorType`s.
  *
  * @experimental
  */
 export function createInjector(
-    defType: /* InjectorType<any> */ any, parent: Injector | null = null,
-    additionalProviders: StaticProvider[] | null = null): Injector {
+    defType: /* InjectorType<any> */ any, parent: Injector | null = null): Injector {
   parent = parent || getNullInjector();
-  return new R3Injector(defType, additionalProviders, parent);
+  return new R3Injector(defType, parent);
 }
 
 export class R3Injector {
@@ -102,18 +101,12 @@ export class R3Injector {
    */
   private destroyed = false;
 
-  constructor(
-      def: InjectorType<any>, additionalProviders: StaticProvider[]|null,
-      readonly parent: Injector) {
+  constructor(def: InjectorType<any>, readonly parent: Injector) {
     // Start off by creating Records for every provider declared in every InjectorType
     // included transitively in `def`.
     deepForEach(
         [def], injectorDef => this.processInjectorType(injectorDef, new Set<InjectorType<any>>()));
 
-    additionalProviders &&
-        deepForEach(additionalProviders, provider => this.processProvider(provider));
-
-
     // Make sure the INJECTOR token provides this injector.
     this.records.set(INJECTOR, makeRecord(undefined, this));
 
@@ -291,18 +284,20 @@ export class R3Injector {
           throw new Error(`Mixed multi-provider for ${token}.`);
         }
       } else {
+        token = provider;
         multiRecord = makeRecord(undefined, NOT_YET, true);
         multiRecord.factory = () => injectArgs(multiRecord !.multi !);
         this.records.set(token, multiRecord);
       }
       token = provider;
       multiRecord.multi !.push(provider);
-    } else {
-      const existing = this.records.get(token);
-      if (existing && existing.multi !== undefined) {
-        throw new Error(`Mixed multi-provider for ${stringify(token)}`);
-      }
     }
+
+    const existing = this.records.get(token);
+    if (existing && existing.multi !== undefined) {
+      throw new Error(`Mixed multi-provider for ${token}`);
+    }
+
     this.records.set(token, record);
   }
 
diff --git a/packages/core/src/render3/assert.ts b/packages/core/src/render3/assert.ts
index 121217cb58..8c80e47fb6 100644
--- a/packages/core/src/render3/assert.ts
+++ b/packages/core/src/render3/assert.ts
@@ -46,13 +46,13 @@ export function assertGreaterThan<T>(actual: T, expected: T, msg: string) {
   }
 }
 
-export function assertNotDefined<T>(actual: T, msg: string) {
+export function assertNull<T>(actual: T, msg: string) {
   if (actual != null) {
     throwError(msg);
   }
 }
 
-export function assertDefined<T>(actual: T, msg: string) {
+export function assertNotNull<T>(actual: T, msg: string) {
   if (actual == null) {
     throwError(msg);
   }
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index cfbc386e2d..9bc5fa88ca 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -13,7 +13,7 @@ import {Injector} from '../di/injector';
 import {ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
 import {Sanitizer} from '../sanitization/security';
 
-import {assertComponentType, assertDefined} from './assert';
+import {assertComponentType, assertNotNull} from './assert';
 import {queueInitHooks, queueLifecycleHooks} from './hooks';
 import {CLEAN_PROMISE, ROOT_DIRECTIVE_INDICES, _getComponentHostLElementNode, baseDirectiveCreate, createLView, createTView, detectChangesInternal, enterView, executeInitAndContentHooks, getRootView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement, setHostBindings} from './instructions';
 import {ComponentDef, ComponentType} from './interfaces/definition';
@@ -72,6 +72,31 @@ export interface CreateComponentOptions {
 }
 
 
+/**
+ * Bootstraps a component, then creates and returns a `ComponentRef` for that component.
+ *
+ * @param componentType Component to bootstrap
+ * @param options Optional parameters which control bootstrapping
+ */
+export function createComponentRef<T>(
+    componentType: ComponentType<T>, opts: CreateComponentOptions): viewEngine_ComponentRef<T> {
+  const component = renderComponent(componentType, opts);
+  const hostView = _getComponentHostLElementNode(component).data as LView;
+  const hostViewRef = new ViewRef(hostView, component);
+  return {
+    location: {nativeElement: getHostElement(component)},
+    injector: opts.injector || NULL_INJECTOR,
+    instance: component,
+    hostView: hostViewRef,
+    changeDetectorRef: hostViewRef,
+    componentType: componentType,
+    // TODO: implement destroy and onDestroy
+    destroy: () => {},
+    onDestroy: (cb: Function) => {}
+  };
+}
+
+
 // TODO: A hack to not pull in the NullInjector from @angular/core.
 export const NULL_INJECTOR: Injector = {
   get: (token: any, notFoundValue?: any) => {
@@ -106,8 +131,12 @@ export function renderComponent<T>(
   // The first index of the first selector is the tag name.
   const componentTag = componentDef.selectors ![0] ![0] as string;
   const hostNode = locateHostElement(rendererFactory, opts.host || componentTag);
-  const rootContext = createRootContext(opts.scheduler || requestAnimationFrame.bind(window));
-
+  const rootContext: RootContext = {
+    // Incomplete initialization due to circular reference.
+    component: null !,
+    scheduler: opts.scheduler || requestAnimationFrame.bind(window),
+    clean: CLEAN_PROMISE,
+  };
   const rootView: LView = createLView(
       rendererFactory.createRenderer(hostNode, componentDef.rendererType),
       createTView(-1, null, null, null), rootContext,
@@ -123,8 +152,8 @@ export function renderComponent<T>(
     elementNode = hostElement(componentTag, hostNode, componentDef, sanitizer);
 
     // Create directive instance with factory() and store at index 0 in directives array
-    rootContext.components.push(
-        component = baseDirectiveCreate(0, componentDef.factory(), componentDef) as T);
+    component = rootContext.component =
+        baseDirectiveCreate(0, componentDef.factory(), componentDef) as T;
     initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
 
     opts.hostFeatures && opts.hostFeatures.forEach((feature) => feature(component, componentDef));
@@ -140,14 +169,6 @@ export function renderComponent<T>(
   return component;
 }
 
-export function createRootContext(scheduler: (workFn: () => void) => void): RootContext {
-  return {
-    components: [],
-    scheduler: scheduler,
-    clean: CLEAN_PROMISE,
-  };
-}
-
 /**
  * Used to enable lifecycle hooks on the root component.
  *
@@ -177,7 +198,7 @@ export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): v
  */
 function getRootContext(component: any): RootContext {
   const rootContext = getRootView(component).context as RootContext;
-  ngDevMode && assertDefined(rootContext, 'rootContext');
+  ngDevMode && assertNotNull(rootContext, 'rootContext');
   return rootContext;
 }
 
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
deleted file mode 100644
index 01222b5a3b..0000000000
--- a/packages/core/src/render3/component_ref.ts
+++ /dev/null
@@ -1,176 +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 {ChangeDetectorRef} from '../change_detection/change_detector_ref';
-import {InjectionToken} from '../di/injection_token';
-import {Injector, inject} from '../di/injector';
-import {ComponentFactory as viewEngine_ComponentFactory, ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
-import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
-import {ElementRef} from '../linker/element_ref';
-import {NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
-import {RendererFactory2} from '../render/api';
-import {Type} from '../type';
-
-import {assertComponentType, assertDefined} from './assert';
-import {createRootContext} from './component';
-import {baseDirectiveCreate, createLView, createTView, enterView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement} from './instructions';
-import {ComponentDef, ComponentType} from './interfaces/definition';
-import {LElementNode} from './interfaces/node';
-import {RElement} from './interfaces/renderer';
-import {LView, LViewFlags, RootContext} from './interfaces/view';
-import {ViewRef} from './view_ref';
-
-export class ComponentFactoryResolver extends viewEngine_ComponentFactoryResolver {
-  resolveComponentFactory<T>(component: Type<T>): viewEngine_ComponentFactory<T> {
-    ngDevMode && assertComponentType(component);
-    const componentDef = (component as ComponentType<T>).ngComponentDef;
-    return new ComponentFactory(componentDef);
-  }
-}
-
-function toRefArray(map: {[key: string]: string}): {propName: string; templateName: string;}[] {
-  const array: {propName: string; templateName: string;}[] = [];
-  for (let nonMinified in map) {
-    if (map.hasOwnProperty(nonMinified)) {
-      const minified = map[nonMinified];
-      array.push({propName: minified, templateName: nonMinified});
-    }
-  }
-  return array;
-}
-
-/**
- * Default {@link RootContext} for all components rendered with {@link renderComponent}.
- */
-export const ROOT_CONTEXT = new InjectionToken<RootContext>(
-    'ROOT_CONTEXT_TOKEN',
-    {providedIn: 'root', factory: () => createRootContext(inject(SCHEDULER))});
-
-/**
- * A change detection scheduler token for {@link RootContext}. This token is the default value used
- * for the default `RootContext` found in the {@link ROOT_CONTEXT} token.
- */
-export const SCHEDULER = new InjectionToken<((fn: () => void) => void)>(
-    'SCHEDULER_TOKEN', {providedIn: 'root', factory: () => requestAnimationFrame.bind(window)});
-
-/**
- * Render3 implementation of {@link viewEngine_ComponentFactory}.
- */
-export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
-  selector: string;
-  componentType: Type<any>;
-  ngContentSelectors: string[];
-  get inputs(): {propName: string; templateName: string;}[] {
-    return toRefArray(this.componentDef.inputs);
-  }
-  get outputs(): {propName: string; templateName: string;}[] {
-    return toRefArray(this.componentDef.outputs);
-  }
-
-  constructor(private componentDef: ComponentDef<any>) {
-    super();
-    this.componentType = componentDef.type;
-    this.selector = componentDef.selectors[0][0] as string;
-    this.ngContentSelectors = [];
-  }
-
-  create(
-      parentComponentInjector: Injector, projectableNodes?: any[][]|undefined,
-      rootSelectorOrNode?: any,
-      ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<T> {
-    ngDevMode && assertDefined(ngModule, 'ngModule should always be defined');
-
-    const rendererFactory = ngModule ? ngModule.injector.get(RendererFactory2) : document;
-    const hostNode = locateHostElement(rendererFactory, rootSelectorOrNode);
-
-    // The first index of the first selector is the tag name.
-    const componentTag = this.componentDef.selectors ![0] ![0] as string;
-
-    const rootContext: RootContext = ngModule !.injector.get(ROOT_CONTEXT);
-
-    // Create the root view. Uses empty TView and ContentTemplate.
-    const rootView: LView = createLView(
-        rendererFactory.createRenderer(hostNode, this.componentDef.rendererType),
-        createTView(-1, null, null, null), null,
-        this.componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
-    rootView.injector = ngModule && ngModule.injector || null;
-
-    // rootView is the parent when bootstrapping
-    const oldView = enterView(rootView, null !);
-
-    let component: T;
-    let elementNode: LElementNode;
-    try {
-      if (rendererFactory.begin) rendererFactory.begin();
-
-      // Create element node at index 0 in data array
-      elementNode = hostElement(componentTag, hostNode, this.componentDef);
-
-      // Create directive instance with factory() and store at index 0 in directives array
-      rootContext.components.push(
-          component = baseDirectiveCreate(0, this.componentDef.factory(), this.componentDef) as T);
-      initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
-
-    } finally {
-      enterView(oldView, null);
-      if (rendererFactory.end) rendererFactory.end();
-    }
-
-    // TODO(misko): this is the wrong injector here.
-    return new ComponentRef(
-        this.componentType, component, rootView, ngModule !.injector, hostNode !);
-  }
-}
-
-/**
- * Represents an instance of a Component created via a {@link ComponentFactory}.
- *
- * `ComponentRef` provides access to the Component Instance as well other objects related to this
- * Component Instance and allows you to destroy the Component Instance via the {@link #destroy}
- * method.
- *
- */
-export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
-  destroyCbs: (() => void)[]|null = [];
-  location: ElementRef<any>;
-  injector: Injector;
-  instance: T;
-  hostView: ViewRef<T>;
-  changeDetectorRef: ChangeDetectorRef;
-  componentType: Type<T>;
-
-  constructor(
-      componentType: Type<T>, instance: T, rootView: LView, injector: Injector,
-      hostNode: RElement) {
-    super();
-    this.instance = instance;
-    /* TODO(jasonaden): This is incomplete, to be adjusted in follow-up PR. Notes from Kara:When
-     * ViewRef.detectChanges is called from ApplicationRef.tick, it will call detectChanges at the
-     * component instance level. I suspect this means that lifecycle hooks and host bindings on the
-     * given component won't work (as these are always called at the level above a component).
-     *
-     * In render2, ViewRef.detectChanges uses the root view instance for view checks, not the
-     * component instance. So passing in the root view (1 level above the component) is sufficient.
-     * We might  want to think about creating a fake component for the top level? Or overwrite
-     * detectChanges with a function that calls tickRootContext? */
-    this.hostView = this.changeDetectorRef = new ViewRef(rootView, instance);
-    this.injector = injector;
-    this.location = new ElementRef(hostNode);
-    this.componentType = componentType;
-  }
-
-  destroy(): void {
-    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
-    this.destroyCbs !.forEach(fn => fn());
-    this.destroyCbs = null;
-  }
-  onDestroy(callback: () => void): void {
-    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
-    this.destroyCbs !.push(callback);
-  }
-}
\ No newline at end of file
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 4129107841..1c55e79fa6 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -18,9 +18,9 @@ import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_co
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_ViewRef} from '../linker/view_ref';
 import {Type} from '../type';
 
-import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
+import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
-import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
+import {ComponentTemplate, DirectiveDef} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
@@ -256,7 +256,7 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   const lElement = getPreviousOrParentNode() as LElementNode;
   ngDevMode && assertNodeType(lElement, TNodeType.Element);
   const tElement = lElement.tNode;
-  ngDevMode && assertDefined(tElement, 'expecting tNode');
+  ngDevMode && assertNotNull(tElement, 'expecting tNode');
   const attrs = tElement.attrs;
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
@@ -707,7 +707,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
       hostTNode.tViews = createTView(
           -1, hostNode.data.template !, hostTView.directiveRegistry, hostTView.pipeRegistry);
     }
-    ngDevMode && assertDefined(hostTNode.tViews, 'TView must be allocated');
+    ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
         getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(), hostNode.data.queries);
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 9d3c28b344..0e8e091bc3 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LifecycleHooksFeature, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
+import {LifecycleHooksFeature, createComponentRef, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
 import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, definePipe} from './definition';
 import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef} from './interfaces/definition';
 
-export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
 
+
 // Naming scheme:
 // - Capital letters are for creating things: T(Text), E(Element), D(Directive), V(View),
 // C(Container), L(Listener)
@@ -73,8 +73,6 @@ export {
   tick,
 } from './instructions';
 
-export {NgModuleDef, NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
-
 export {
     AttributeMarker
 } from './interfaces/node';
@@ -124,6 +122,7 @@ export {
   defineComponent,
   defineDirective,
   definePipe,
+  createComponentRef,
   getHostElement,
   getRenderedText,
   renderComponent,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 509cd528bf..a004f10d81 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -8,7 +8,7 @@
 
 import './ng_dev_mode';
 
-import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual, assertSame} from './assert';
+import {assertEqual, assertLessThan, assertNotEqual, assertNotNull, assertNull, assertSame} from './assert';
 import {LContainer} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
@@ -406,8 +406,7 @@ export function createLNode(
   if ((type & TNodeType.ViewOrElement) === TNodeType.ViewOrElement && isState) {
     // Bit of a hack to bust through the readonly because there is a circular dep between
     // LView and LNode.
-    ngDevMode &&
-        assertNotDefined((state as LView).node, 'LView.node should not have been initialized');
+    ngDevMode && assertNull((state as LView).node, 'LView.node should not have been initialized');
     (state as{node: LNode}).node = node;
     if (firstTemplatePass) (state as LView).tView.node = node.tNode;
   }
@@ -456,7 +455,7 @@ export function renderTemplate<T>(
             sanitizer));
   }
   const hostView = host.data !;
-  ngDevMode && assertDefined(hostView, 'Host node should have an LView defined in host.data.');
+  ngDevMode && assertNotNull(hostView, 'Host node should have an LView defined in host.data.');
   renderComponentOrTemplate(host, hostView, context, template);
   return host;
 }
@@ -1301,8 +1300,8 @@ export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
     ngDevMode && assertDataInRange(index);
     const existingNode = data[index] as LTextNode;
-    ngDevMode && assertDefined(existingNode, 'LNode should exist');
-    ngDevMode && assertDefined(existingNode.native, 'native element should exist');
+    ngDevMode && assertNotNull(existingNode, 'LNode should exist');
+    ngDevMode && assertNotNull(existingNode.native, 'native element should exist');
     ngDevMode && ngDevMode.rendererSetText++;
     isProceduralRenderer(renderer) ? renderer.setValue(existingNode.native, stringify(value)) :
                                      existingNode.native.textContent = stringify(value);
@@ -1326,7 +1325,7 @@ export function directiveCreate<T>(
     index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
   const instance = baseDirectiveCreate(index, directive, directiveDef);
 
-  ngDevMode && assertDefined(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
+  ngDevMode && assertNotNull(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
   const tNode = previousOrParentNode.tNode;
 
   const isComponent = (directiveDef as ComponentDef<T>).template;
@@ -1495,7 +1494,7 @@ function generateInitialInputs(
 export function createLContainer(
     parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>,
     isForViewContainerRef?: boolean): LContainer {
-  ngDevMode && assertDefined(parentLNode, 'containers should have a parent');
+  ngDevMode && assertNotNull(parentLNode, 'containers should have a parent');
   return <LContainer>{
     views: [],
     nextIndex: isForViewContainerRef ? null : 0,
@@ -1612,7 +1611,7 @@ function refreshDynamicChildren() {
         const lViewNode = container.views[i];
         // The directives and pipes are not needed here as an existing view is only being refreshed.
         const dynamicView = lViewNode.data;
-        ngDevMode && assertDefined(dynamicView.tView, 'TView must be allocated');
+        ngDevMode && assertNotNull(dynamicView.tView, 'TView must be allocated');
         renderEmbeddedTemplate(lViewNode, dynamicView.tView, dynamicView.context !, renderer);
       }
     }
@@ -1700,7 +1699,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
 function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TView {
   ngDevMode && assertNodeType(parent, TNodeType.Container);
   const containerTViews = (parent !.tNode as TContainerNode).tViews as TView[];
-  ngDevMode && assertDefined(containerTViews, 'TView expected');
+  ngDevMode && assertNotNull(containerTViews, 'TView expected');
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
     const tView = currentView.tView;
@@ -1774,7 +1773,7 @@ export function componentRefresh<T>(directiveIndex: number, elementIndex: number
   ngDevMode && assertDataInRange(elementIndex);
   const element = data ![elementIndex] as LElementNode;
   ngDevMode && assertNodeType(element, TNodeType.Element);
-  ngDevMode && assertDefined(element.data, `Component's host node should have an LView attached.`);
+  ngDevMode && assertNotNull(element.data, `Component's host node should have an LView attached.`);
   const hostView = element.data !;
 
   // Only attached CheckAlways components or attached, dirty OnPush components should be checked
@@ -1929,13 +1928,13 @@ export function projection(
 function findComponentHost(lView: LView): LElementNode {
   let viewRootLNode = lView.node;
   while (viewRootLNode.tNode.type === TNodeType.View) {
-    ngDevMode && assertDefined(lView.parent, 'lView.parent');
+    ngDevMode && assertNotNull(lView.parent, 'lView.parent');
     lView = lView.parent !;
     viewRootLNode = lView.node;
   }
 
   ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
-  ngDevMode && assertDefined(viewRootLNode.data, 'node.data');
+  ngDevMode && assertNotNull(viewRootLNode.data, 'node.data');
 
   return viewRootLNode as LElementNode;
 }
@@ -2013,7 +2012,7 @@ export function markViewDirty(view: LView): void {
   }
   currentView.flags |= LViewFlags.Dirty;
 
-  ngDevMode && assertDefined(currentView !.context, 'rootContext');
+  ngDevMode && assertNotNull(currentView !.context, 'rootContext');
   scheduleTick(currentView !.context as RootContext);
 }
 
@@ -2034,7 +2033,7 @@ export function scheduleTick<T>(rootContext: RootContext) {
     let res: null|((val: null) => void);
     rootContext.clean = new Promise<null>((r) => res = r);
     rootContext.scheduler(() => {
-      tickRootContext(rootContext);
+      tick(rootContext.component);
       res !(null);
       rootContext.clean = _CLEAN_PROMISE;
     });
@@ -2055,18 +2054,11 @@ export function scheduleTick<T>(rootContext: RootContext) {
  */
 export function tick<T>(component: T): void {
   const rootView = getRootView(component);
-  const rootContext = rootView.context as RootContext;
-  tickRootContext(rootContext);
-}
+  const rootComponent = (rootView.context as RootContext).component;
+  const hostNode = _getComponentHostLElementNode(rootComponent);
 
-function tickRootContext(rootContext: RootContext) {
-  for (let i = 0; i < rootContext.components.length; i++) {
-    const rootComponent = rootContext.components[i];
-    const hostNode = _getComponentHostLElementNode(rootComponent);
-
-    ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
-    renderComponentOrTemplate(hostNode, getRootView(rootComponent), rootComponent);
-  }
+  ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
+  renderComponentOrTemplate(hostNode, rootView, rootComponent);
 }
 
 /**
@@ -2077,7 +2069,7 @@ function tickRootContext(rootContext: RootContext) {
  */
 
 export function getRootView(component: any): LView {
-  ngDevMode && assertDefined(component, 'component');
+  ngDevMode && assertNotNull(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
   let lView = lElementNode.view;
   while (lView.parent) {
@@ -2101,7 +2093,7 @@ export function getRootView(component: any): LView {
  */
 export function detectChanges<T>(component: T): void {
   const hostNode = _getComponentHostLElementNode(component);
-  ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
+  ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
   detectChangesInternal(hostNode.data as LView, hostNode, component);
 }
 
@@ -2150,7 +2142,7 @@ export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode
  * @param component Component to mark as dirty.
  */
 export function markDirty<T>(component: T) {
-  ngDevMode && assertDefined(component, 'component');
+  ngDevMode && assertNotNull(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
   markViewDirty(lElementNode.view);
 }
@@ -2396,7 +2388,7 @@ export function load<T>(index: number): T {
 
 /** Retrieves a value from the `directives` array. */
 export function loadDirective<T>(index: number): T {
-  ngDevMode && assertDefined(directives, 'Directives array should be defined if reading a dir.');
+  ngDevMode && assertNotNull(directives, 'Directives array should be defined if reading a dir.');
   ngDevMode && assertDataInRange(index, directives !);
   return directives ![index];
 }
@@ -2461,7 +2453,7 @@ export function assertPreviousIsParent() {
 }
 
 function assertHasParent() {
-  assertDefined(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
+  assertNotNull(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
 }
 
 function assertDataInRange(index: number, arr?: any[]) {
@@ -2492,9 +2484,9 @@ export function assertReservedSlotInitialized(slotOffset: number, numSlots: numb
 }
 
 export function _getComponentHostLElementNode<T>(component: T): LElementNode {
-  ngDevMode && assertDefined(component, 'expecting component got null');
+  ngDevMode && assertNotNull(component, 'expecting component got null');
   const lElementNode = (component as any)[NG_HOST_SYMBOL] as LElementNode;
-  ngDevMode && assertDefined(component, 'object is not a component');
+  ngDevMode && assertNotNull(component, 'object is not a component');
   return lElementNode;
 }
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 204c1e0960..c069e6f0ed 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -420,10 +420,10 @@ export interface RootContext {
   clean: Promise<null>;
 
   /**
-   * RootComponents - The components that were instantiated by the call to
+   * RootComponent - The component which was instantiated by the call to
    * {@link renderComponent}.
    */
-  components: {}[];
+  component: {};
 }
 
 /**
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
deleted file mode 100644
index 1844b3b57c..0000000000
--- a/packages/core/src/render3/ng_module_ref.ts
+++ /dev/null
@@ -1,73 +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 {Injector} from '../di/injector';
-import {StaticProvider} from '../di/provider';
-import {createInjector} from '../di/r3_injector';
-import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
-import {InternalNgModuleRef, NgModuleFactory as viewEngine_NgModuleFactory, NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
-import {Type} from '../type';
-import {stringify} from '../util';
-import {assertDefined} from './assert';
-import {ComponentFactoryResolver} from './component_ref';
-
-export interface NgModuleType { ngModuleDef: NgModuleDef; }
-
-export interface NgModuleDef { bootstrap: Type<any>[]; }
-
-export const COMPONENT_FACTORY_RESOLVER: StaticProvider = {
-  provide: viewEngine_ComponentFactoryResolver,
-  useFactory: () => new ComponentFactoryResolver(),
-  deps: [],
-};
-
-export class NgModuleRef<T> extends viewEngine_NgModuleRef<T> implements InternalNgModuleRef<T> {
-  // tslint:disable-next-line:require-internal-with-underscore
-  _bootstrapComponents: Type<any>[] = [];
-  injector: Injector;
-  componentFactoryResolver: viewEngine_ComponentFactoryResolver;
-  instance: T;
-  destroyCbs: (() => void)[]|null = [];
-
-  constructor(ngModuleType: Type<T>, parentInjector: Injector|null) {
-    super();
-    const ngModuleDef = (ngModuleType as any as NgModuleType).ngModuleDef;
-    ngDevMode && assertDefined(
-                     ngModuleDef,
-                     `NgModule '${stringify(ngModuleType)}' is not a subtype of 'NgModuleType'.`);
-
-    this._bootstrapComponents = ngModuleDef.bootstrap;
-    const additionalProviders: StaticProvider[] = [
-      COMPONENT_FACTORY_RESOLVER, {
-        provide: viewEngine_NgModuleRef,
-        useValue: this,
-      }
-    ];
-    this.injector = createInjector(ngModuleType, parentInjector, additionalProviders);
-    this.instance = this.injector.get(ngModuleType);
-    this.componentFactoryResolver = new ComponentFactoryResolver();
-  }
-
-  destroy(): void {
-    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
-    this.destroyCbs !.forEach(fn => fn());
-    this.destroyCbs = null;
-  }
-  onDestroy(callback: () => void): void {
-    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
-    this.destroyCbs !.push(callback);
-  }
-}
-
-export class NgModuleFactory<T> extends viewEngine_NgModuleFactory<T> {
-  constructor(public moduleType: Type<T>) { super(); }
-
-  create(parentInjector: Injector|null): viewEngine_NgModuleRef<T> {
-    return new NgModuleRef(this.moduleType, parentInjector);
-  }
-}
diff --git a/packages/core/src/render3/node_assert.ts b/packages/core/src/render3/node_assert.ts
index c30a0f2455..73bf9b6997 100644
--- a/packages/core/src/render3/node_assert.ts
+++ b/packages/core/src/render3/node_assert.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined, assertEqual} from './assert';
+import {assertEqual, assertNotNull} from './assert';
 import {LNode, TNodeType} from './interfaces/node';
 
 export function assertNodeType(node: LNode, type: TNodeType) {
-  assertDefined(node, 'should be called with a node');
+  assertNotNull(node, 'should be called with a node');
   assertEqual(node.tNode.type, type, `should be a ${typeName(type)}`);
 }
 
 export function assertNodeOfPossibleTypes(node: LNode, ...types: TNodeType[]) {
-  assertDefined(node, 'should be called with a node');
+  assertNotNull(node, 'should be called with a node');
   const found = types.some(type => node.tNode.type === type);
   assertEqual(found, true, `Should be one of ${types.map(typeName).join(', ')}`);
 }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 716565fc71..db4eb95d50 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined} from './assert';
+import {assertNotNull} from './assert';
 import {callHooks} from './hooks';
 import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
 import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index db94094e24..73f2ab55ec 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -8,7 +8,7 @@
 
 import './ng_dev_mode';
 
-import {assertDefined} from './assert';
+import {assertNotNull} from './assert';
 import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
@@ -36,7 +36,7 @@ function isCssClassMatching(nodeClassAttrVal: string, cssClassToMatch: string):
  * @returns true if node matches the selector.
  */
 export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boolean {
-  ngDevMode && assertDefined(selector[0], 'Selector should have a tag name');
+  ngDevMode && assertNotNull(selector[0], 'Selector should have a tag name');
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index c04f3f48c8..fd6a667a01 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -15,7 +15,7 @@ import {QueryList as viewEngine_QueryList} from '../linker/query_list';
 import {Type} from '../type';
 import {getSymbolIterator} from '../util';
 
-import {assertDefined, assertEqual} from './assert';
+import {assertEqual, assertNotNull} from './assert';
 import {ReadFromInjectorFn, getOrCreateNodeInjectorForNode} from './di';
 import {assertPreviousIsParent, getCurrentQueries, store, storeCleanupWithContext} from './instructions';
 import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
@@ -163,7 +163,7 @@ export class LQueries_ implements LQueries {
     let query = this.deep;
     while (query) {
       ngDevMode &&
-          assertDefined(
+          assertNotNull(
               query.containerValues, 'View queries need to have a pointer to container values.');
       query.containerValues !.splice(index, 0, query.values);
       query = query.next;
@@ -179,7 +179,7 @@ export class LQueries_ implements LQueries {
     let query = this.deep;
     while (query) {
       ngDevMode &&
-          assertDefined(
+          assertNotNull(
               query.containerValues, 'View queries need to have a pointer to container values.');
       const removed = query.containerValues !.splice(index, 1);
 
@@ -273,7 +273,7 @@ function add(query: LQuery<any>| null, node: LNode) {
         if (directiveIdx !== null) {
           // a node is matching a predicate - determine what to read
           // note that queries using name selector must specify read strategy
-          ngDevMode && assertDefined(predicate.read, 'the node should have a predicate');
+          ngDevMode && assertNotNull(predicate.read, 'the node should have a predicate');
           const result = readFromNodeInjector(nodeInjector, node, predicate.read !, directiveIdx);
           if (result !== null) {
             addMatch(query, result);
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 55c1b11e20..060f2c997b 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -6,10 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationRef} from '../application_ref';
-import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
-import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
+import {EmbeddedViewRef as viewEngine_EmbeddedViewRef} from '../linker/view_ref';
 
 import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn} from './instructions';
 import {ComponentTemplate} from './interfaces/definition';
@@ -17,10 +15,7 @@ import {LViewNode} from './interfaces/node';
 import {LView, LViewFlags} from './interfaces/view';
 import {destroyLView} from './node_manipulation';
 
-export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_InternalViewRef,
-    viewEngine_ChangeDetectorRef {
-  private _appRef: ApplicationRef|null;
-
+export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
   context: T;
   rootNodes: any[];
 
@@ -215,10 +210,6 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    * introduce other changes.
    */
   checkNoChanges(): void { checkNoChanges(this.context); }
-
-  detachFromAppRef() { this._appRef = null; }
-
-  attachToAppRef(appRef: ApplicationRef) { this._appRef = appRef; }
 }
 
 
diff --git a/packages/core/test/application_ref_integration_spec.ts b/packages/core/test/application_ref_integration_spec.ts
deleted file mode 100644
index 9dee7acc17..0000000000
--- a/packages/core/test/application_ref_integration_spec.ts
+++ /dev/null
@@ -1,95 +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 {ApplicationModule, ApplicationRef, DoCheck, InjectFlags, InjectorType, Input, OnInit, PlatformRef, TestabilityRegistry, Type, defineInjector, inject, ɵE as elementStart, ɵNgModuleDef as NgModuleDef, ɵRenderFlags as RenderFlags, ɵT as text, ɵdefineComponent as defineComponent, ɵe as elementEnd, ɵi1 as interpolation1, ɵt as textBinding} from '@angular/core';
-import {getTestBed, withBody} from '@angular/core/testing';
-import {BrowserModule, EVENT_MANAGER_PLUGINS, platformBrowser} from '@angular/platform-browser';
-
-import {BROWSER_MODULE_PROVIDERS} from '../../platform-browser/src/browser';
-import {APPLICATION_MODULE_PROVIDERS} from '../src/application_module';
-import {NgModuleFactory} from '../src/render3/ng_module_ref';
-
-describe('ApplicationRef bootstrap', () => {
-  class HelloWorldComponent implements OnInit, DoCheck {
-    log: string[] = [];
-    name = 'World';
-    static ngComponentDef = defineComponent({
-      type: HelloWorldComponent,
-      selectors: [['hello-world']],
-      factory: () => new HelloWorldComponent(),
-      template: function(rf: RenderFlags, ctx: HelloWorldComponent): void {
-        if (rf & RenderFlags.Create) {
-          elementStart(0, 'div');
-          text(1);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          textBinding(1, interpolation1('Hello ', ctx.name, ''));
-        }
-      }
-    });
-
-    ngOnInit(): void { this.log.push('OnInit'); }
-
-    ngDoCheck(): void { this.log.push('DoCheck'); }
-  }
-
-  class MyAppModule {
-    static ngInjectorDef =
-        defineInjector({factory: () => new MyAppModule(), imports: [BrowserModule]});
-    static ngModuleDef = defineNgModule({bootstrap: [HelloWorldComponent]});
-  }
-
-  it('should bootstrap hello world', withBody('<hello-world></hello-world>', async() => {
-       const MyAppModuleFactory = new NgModuleFactory(MyAppModule);
-       const moduleRef =
-           await getTestBed().platform.bootstrapModuleFactory(MyAppModuleFactory, {ngZone: 'noop'});
-       const appRef = moduleRef.injector.get(ApplicationRef);
-       const helloWorldComponent = appRef.components[0].instance as HelloWorldComponent;
-       expect(document.body.innerHTML).toEqual('<hello-world><div>Hello World</div></hello-world>');
-       // TODO(jasonaden): Get with Kara on lifecycle hooks
-       //  expect(helloWorldComponent.log).toEqual(['OnInit', 'DoCheck']);
-       helloWorldComponent.name = 'Mundo';
-       appRef.tick();
-       expect(document.body.innerHTML).toEqual('<hello-world><div>Hello Mundo</div></hello-world>');
-       // TODO(jasonaden): Get with Kara on lifecycle hooks
-       //  expect(helloWorldComponent.log).toEqual(['OnInit', 'DoCheck', 'DoCheck']);
-
-       // Cleanup TestabilityRegistry
-       const registry: TestabilityRegistry = getTestBed().get(TestabilityRegistry);
-       registry.unregisterAllApplications();
-     }));
-
-});
-
-/////////////////////////////////////////////////////////
-
-// These go away when Compiler is ready
-
-(BrowserModule as any as InjectorType<BrowserModule>).ngInjectorDef = defineInjector({
-  factory: function BrowserModule_Factory() {
-    return new BrowserModule(inject(BrowserModule, InjectFlags.Optional | InjectFlags.SkipSelf));
-  },
-  imports: [ApplicationModule],
-  providers: BROWSER_MODULE_PROVIDERS
-});
-
-(ApplicationModule as any as InjectorType<ApplicationModule>).ngInjectorDef = defineInjector({
-  factory: function ApplicationModule_Factory() {
-    return new ApplicationModule(inject(ApplicationRef));
-  },
-  providers: APPLICATION_MODULE_PROVIDERS
-});
-
-export function defineNgModule({bootstrap}: {bootstrap?: Type<any>[]}): NgModuleDef {
-  return {
-    bootstrap: bootstrap || [],
-  };
-}
-
-/////////////////////////////////////////////////////////
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index c1c0de6f38..df06f6a31f 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -56,9 +56,6 @@
   {
     "name": "createLView"
   },
-  {
-    "name": "createRootContext"
-  },
   {
     "name": "createTNode"
   },
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index c359140b00..56d1450518 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -2418,7 +2418,7 @@
     "name": "assertInterpolationSymbols"
   },
   {
-    "name": "assertNotNull"
+    "name": "assertNotNull$1"
   },
   {
     "name": "assertPlatform"
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 865432ac91..64f8a6e020 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -266,9 +266,6 @@
   {
     "name": "createOutput"
   },
-  {
-    "name": "createRootContext"
-  },
   {
     "name": "createTNode"
   },
@@ -660,7 +657,7 @@
     "name": "throwMultipleComponentError"
   },
   {
-    "name": "tickRootContext"
+    "name": "tick"
   },
   {
     "name": "trackByIdentity"
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 5e690b2f86..7d08f65de5 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -41,8 +41,6 @@ describe('InjectorDef-based createInjector()', () => {
 
   const STATIC_TOKEN = new InjectionToken<StaticService>('STATIC_TOKEN');
 
-  const LOCALE = new InjectionToken<string[]>('LOCALE');
-
   class ServiceWithDep {
     constructor(readonly service: Service) {}
 
@@ -52,15 +50,6 @@ describe('InjectorDef-based createInjector()', () => {
     });
   }
 
-  class ServiceWithMultiDep {
-    constructor(readonly locale: string[]) {}
-
-    static ngInjectableDef = defineInjectable({
-      providedIn: null,
-      factory: () => new ServiceWithMultiDep(inject(LOCALE)),
-    });
-  }
-
   class ServiceTwo {
     static ngInjectableDef = defineInjectable({
       providedIn: null,
@@ -123,9 +112,6 @@ describe('InjectorDef-based createInjector()', () => {
       imports: [IntermediateModule],
       providers: [
         ServiceWithDep,
-        ServiceWithMultiDep,
-        {provide: LOCALE, multi: true, useValue: 'en'},
-        {provide: LOCALE, multi: true, useValue: 'es'},
         Service,
         {provide: SERVICE_TOKEN, useExisting: Service},
         CircularA,
@@ -182,12 +168,6 @@ describe('InjectorDef-based createInjector()', () => {
     expect(instance.service).toBe(injector.get(Service));
   });
 
-  it('injects a service with dependencies on multi-providers', () => {
-    const instance = injector.get(ServiceWithMultiDep);
-    expect(instance instanceof ServiceWithMultiDep);
-    expect(instance.locale).toEqual(['en', 'es']);
-  });
-
   it('injects a token with useExisting', () => {
     const instance = injector.get(SERVICE_TOKEN);
     expect(instance).toBe(injector.get(Service));
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index 148f447ded..7b7026e9a2 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -7,9 +7,9 @@
  */
 
 
-import {DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
+import {ComponentFactory, DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
 import {getRenderedText} from '../../src/render3/component';
-import {ComponentFactory, LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
+import {LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding, tick} from '../../src/render3/instructions';
 import {ComponentDef, DirectiveDef, RenderFlags} from '../../src/render3/interfaces/definition';
 import {createRendererType2} from '../../src/view/index';
@@ -364,27 +364,4 @@ describe('recursive components', () => {
     tick(comp);
     expect(events).toEqual(['check6', 'check2', 'check0', 'check1', 'check5', 'check3', 'check4']);
   });
-
-  it('should map inputs minified & unminified names', async() => {
-    class TestInputsComponent {
-      minifiedName: string;
-      static ngComponentDef = defineComponent({
-        type: TestInputsComponent,
-        selectors: [['test-inputs']],
-        inputs: {minifiedName: 'unminifiedName'},
-        factory: () => new TestInputsComponent(),
-        template: function(rf: RenderFlags, ctx: TestInputsComponent): void {
-          // Template not needed for this test
-        }
-      });
-    }
-
-    const testInputsComponentFactory = new ComponentFactory(TestInputsComponent.ngComponentDef);
-
-    expect([
-      {propName: 'minifiedName', templateName: 'unminifiedName'}
-    ]).toEqual(testInputsComponentFactory.inputs);
-
-  });
-
 });
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 0a68b1ead8..cb4bf297ad 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -135,7 +135,7 @@ export class ComponentFixture<T> extends BaseFixture {
 // Fixtures above are preferred way of testing Components and Templates
 ///////////////////////////////////////////////////////////////////////////////////
 
-export const document = ((typeof global == 'object' && global || window) as any).document;
+export const document = ((global || window) as any).document;
 export let containerEl: HTMLElement = null !;
 let host: LElementNode|null;
 const isRenderer2 =
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index 9550029af9..dc13d2bdbb 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, PlatformLocation, ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
-import {APP_ID, ApplicationModule, ClassProvider, ConstructorSansProvider, ErrorHandler, ExistingProvider, FactoryProvider, Inject, InjectionToken, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
+import {APP_ID, ApplicationModule, ErrorHandler, ModuleWithProviders, NgModule, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
 
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserPlatformLocation} from './browser/location/browser_platform_location';
@@ -20,7 +20,7 @@ import {getDOM} from './dom/dom_adapter';
 import {DomRendererFactory2} from './dom/dom_renderer';
 import {DOCUMENT} from './dom/dom_tokens';
 import {DomEventsPlugin} from './dom/events/dom_events';
-import {EVENT_MANAGER_PLUGINS, EventManager, EventManagerPlugin} from './dom/events/event_manager';
+import {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
 import {HAMMER_GESTURE_CONFIG, HammerGestureConfig, HammerGesturesPlugin} from './dom/events/hammer_gestures';
 import {KeyEventsPlugin} from './dom/events/key_events';
 import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
@@ -60,47 +60,34 @@ export function _document(): any {
   return document;
 }
 
-export const BROWSER_MODULE_PROVIDERS: StaticProvider[] = [
-  BROWSER_SANITIZATION_PROVIDERS,
-  {provide: APP_ROOT, useValue: true},
-  {provide: ErrorHandler, useFactory: errorHandler, deps: []},
-  {
-    provide: EVENT_MANAGER_PLUGINS,
-    useClass: DomEventsPlugin,
-    multi: true,
-    deps: [DOCUMENT, NgZone, PLATFORM_ID]
-  },
-  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true, deps: [DOCUMENT]},
-  {
-    provide: EVENT_MANAGER_PLUGINS,
-    useClass: HammerGesturesPlugin,
-    multi: true,
-    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG]
-  },
-  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig, deps: []},
-  {
-    provide: DomRendererFactory2,
-    useClass: DomRendererFactory2,
-    deps: [EventManager, DomSharedStylesHost]
-  },
-  {provide: RendererFactory2, useExisting: DomRendererFactory2},
-  {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
-  {provide: DomSharedStylesHost, useClass: DomSharedStylesHost, deps: [DOCUMENT]},
-  {provide: Testability, useClass: Testability, deps: [NgZone]},
-  {provide: EventManager, useClass: EventManager, deps: [EVENT_MANAGER_PLUGINS, NgZone]},
-  ELEMENT_PROBE_PROVIDERS,
-  {provide: Meta, useClass: Meta, deps: [DOCUMENT]},
-  {provide: Title, useClass: Title, deps: [DOCUMENT]},
-];
-
 /**
  * The ng module for the browser.
  *
  *
  */
-@NgModule({providers: BROWSER_MODULE_PROVIDERS, exports: [CommonModule, ApplicationModule]})
+@NgModule({
+  providers: [
+    BROWSER_SANITIZATION_PROVIDERS,
+    {provide: APP_ROOT, useValue: true},
+    {provide: ErrorHandler, useFactory: errorHandler, deps: []},
+    {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
+    {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true},
+    {provide: EVENT_MANAGER_PLUGINS, useClass: HammerGesturesPlugin, multi: true},
+    {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig},
+    DomRendererFactory2,
+    {provide: RendererFactory2, useExisting: DomRendererFactory2},
+    {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
+    DomSharedStylesHost,
+    Testability,
+    EventManager,
+    ELEMENT_PROBE_PROVIDERS,
+    Meta,
+    Title,
+  ],
+  exports: [CommonModule, ApplicationModule]
+})
 export class BrowserModule {
-  constructor(@Optional() @SkipSelf() @Inject(BrowserModule) parentModule: BrowserModule|null) {
+  constructor(@Optional() @SkipSelf() parentModule: BrowserModule) {
     if (parentModule) {
       throw new Error(
           `BrowserModule has already been loaded. If you need access to common directives such as NgIf and NgFor from a lazy loaded module, import CommonModule instead.`);
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index d65ed33a3c..d781017237 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -143,11 +143,6 @@ export declare abstract class ComponentRef<C> {
     abstract onDestroy(callback: Function): void;
 }
 
-/** @experimental */
-export interface ConstructorSansProvider {
-    deps?: any[];
-}
-
 export declare const ContentChild: ContentChildDecorator;
 
 export interface ContentChildDecorator {
@@ -173,7 +168,7 @@ export interface ContentChildrenDecorator {
 }
 
 /** @experimental */
-export declare function createInjector(defType: any, parent?: Injector | null, additionalProviders?: StaticProvider[] | null): Injector;
+export declare function createInjector(defType: any, parent?: Injector | null): Injector;
 
 /** @experimental */
 export declare function createPlatform(injector: Injector): PlatformRef;
@@ -614,7 +609,7 @@ export interface Predicate<T> {
     (value: T): boolean;
 }
 
-export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider | ExistingProvider | FactoryProvider | any[];
+export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ExistingProvider | FactoryProvider | any[];
 
 export declare abstract class Query {
 }
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
index 52231287f2..e1c07cbe9b 100644
--- a/tools/public_api_guard/platform-browser/platform-browser.d.ts
+++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts
@@ -1,5 +1,5 @@
 export declare class BrowserModule {
-    constructor(parentModule: BrowserModule | null);
+    constructor(parentModule: BrowserModule);
     /** @experimental */ static withServerTransition(params: {
         appId: string;
     }): ModuleWithProviders;

From 81e4b2a4bf21d8b6ab7d33053f4e020c09021e1f Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 25 May 2018 13:14:49 -0700
Subject: [PATCH 197/582] feat(ivy): add namespace instructions for SVG and
 others (#23899)

PR Close #23899
---
 packages/core/src/render3/instructions.ts     | 41 ++++++++++++++++---
 .../core/src/render3/interfaces/renderer.ts   |  1 +
 .../bundling/todo/bundle.golden_symbols.json  |  3 ++
 packages/core/test/linker/integration_spec.ts |  2 +-
 .../core/test/render3/instructions_spec.ts    | 36 +++++++++++++++-
 .../platform-browser/src/dom/dom_renderer.ts  | 19 +++------
 6 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a004f10d81..13952a0761 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -8,24 +8,27 @@
 
 import './ng_dev_mode';
 
+import {Sanitizer} from '../sanitization/security';
+
 import {assertEqual, assertLessThan, assertNotEqual, assertNotNull, assertNull, assertSame} from './assert';
+import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
+import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {LContainer} from './interfaces/container';
+import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
+import {ObjectOrientedRenderer3, ProceduralRenderer3, RElement, RText, Renderer3, RendererFactory3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {CurrentMatchesList, LView, LViewFlags, RootContext, TData, TView} from './interfaces/view';
 
 import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
-import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
-import {executeHooks, queueLifecycleHooks, queueInitHooks, executeInitHooks} from './hooks';
 import {ViewRef} from './view_ref';
-import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
-import {Sanitizer} from '../sanitization/security';
+
+
 
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
@@ -550,6 +553,28 @@ function getRenderFlags(view: LView): RenderFlags {
                                                 RenderFlags.Update;
 }
 
+//////////////////////////
+//// Namespace
+//////////////////////////
+let _currentNS: string|null = null;
+
+export function setNS(namespace: string) {
+  _currentNS = namespace;
+}
+
+export function setHtmlNS() {
+  _currentNS = null;
+}
+
+export function setSvgNS() {
+  _currentNS = 'http://www.w3.org/2000/svg';
+}
+
+export function setMathML() {
+  _currentNS = 'http://www.w3.org/1998/Math/MathML';
+}
+
+
 //////////////////////////
 //// Element
 //////////////////////////
@@ -573,7 +598,11 @@ export function elementStart(
       assertEqual(currentView.bindingIndex, -1, 'elements should be created before any bindings');
 
   ngDevMode && ngDevMode.rendererCreateElement++;
-  const native: RElement = renderer.createElement(name);
+
+  const native: RElement = _currentNS === null || isProceduralRenderer(renderer) ?
+      renderer.createElement(name) :
+      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNS, name);
+
   ngDevMode && assertDataInRange(index - 1);
 
   const node: LElementNode =
diff --git a/packages/core/src/render3/interfaces/renderer.ts b/packages/core/src/render3/interfaces/renderer.ts
index 54983d0a3b..49709897dc 100644
--- a/packages/core/src/render3/interfaces/renderer.ts
+++ b/packages/core/src/render3/interfaces/renderer.ts
@@ -36,6 +36,7 @@ export type Renderer3 = ObjectOrientedRenderer3 | ProceduralRenderer3;
  * */
 export interface ObjectOrientedRenderer3 {
   createElement(tagName: string): RElement;
+  createElementNS(namespace: string, name: string): RElement;
   createTextNode(data: string): RText;
 
   querySelector(selectors: string): RElement|null;
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 64f8a6e020..2b63963bd6 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -176,6 +176,9 @@
   {
     "name": "_currentInjector"
   },
+  {
+    "name": "_currentNS"
+  },
   {
     "name": "_devMode"
   },
diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts
index 027a36f9f1..5da89f3af4 100644
--- a/packages/core/test/linker/integration_spec.ts
+++ b/packages/core/test/linker/integration_spec.ts
@@ -1820,7 +1820,7 @@ function declareTests({useJit}: {useJit: boolean}) {
               .toEqual('http://www.w3.org/2000/svg');
 
           const firstAttribute = getDOM().getProperty(<Element>use, 'attributes')[0];
-          expect(firstAttribute.name).toEqual('xlink:href');
+          expect(firstAttribute.name).toEqual('href');
           expect(firstAttribute.namespaceURI).toEqual('http://www.w3.org/1999/xlink');
         });
 
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 7a59ec8834..751ab50bd8 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
 import {LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
@@ -392,6 +392,40 @@ describe('instructions', () => {
       expect(s.lastSanitizedValue).toBeFalsy();
     });
   });
+
+  describe('namespace', () => {
+    it('should render SVG', () => {
+      const t = new TemplateFixture(() => {
+        elementStart(0, 'div', ['id', 'container']);
+        setSvgNS();
+        elementStart(1, 'svg', [
+          // id="display"
+          'id',
+          'display',
+          // width="400"
+          'width',
+          '400',
+          // height="300"
+          'height',
+          '300',
+        ]);
+        elementStart(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
+        elementEnd();
+        elementEnd();
+        setHtmlNS();
+        elementEnd();
+      });
+
+
+      // Most browsers will print <circle></circle>, some will print <circle />, both are valid
+      const standardHTML =
+          '<div id="container"><svg id="display" width="400" height="300"><circle cx="200" cy="150" fill="#0000ff"></circle></svg></div>';
+      const ie11HTML =
+          '<div id="container"><svg xmlns="http://www.w3.org/2000/svg" id="display" width="400" height="300"><circle fill="#0000ff" cx="200" cy="150" /></svg></div>';
+
+      expect([standardHTML, ie11HTML]).toContain(t.html);
+    });
+  });
 });
 
 class LocalSanitizedValue {
diff --git a/packages/platform-browser/src/dom/dom_renderer.ts b/packages/platform-browser/src/dom/dom_renderer.ts
index 6715d20513..a4684a1248 100644
--- a/packages/platform-browser/src/dom/dom_renderer.ts
+++ b/packages/platform-browser/src/dom/dom_renderer.ts
@@ -110,7 +110,7 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   createElement(name: string, namespace?: string): any {
     if (namespace) {
-      return document.createElementNS(NAMESPACE_URIS[namespace], name);
+      return document.createElementNS(NAMESPACE_URIS[namespace] || namespace, name);
     }
 
     return document.createElement(name);
@@ -150,13 +150,8 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   setAttribute(el: any, name: string, value: string, namespace?: string): void {
     if (namespace) {
-      name = `${namespace}:${name}`;
-      const namespaceUri = NAMESPACE_URIS[namespace];
-      if (namespaceUri) {
-        el.setAttributeNS(namespaceUri, name, value);
-      } else {
-        el.setAttribute(name, value);
-      }
+      const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
+      el.setAttributeNS(namespaceUri, name, value);
     } else {
       el.setAttribute(name, value);
     }
@@ -164,12 +159,8 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   removeAttribute(el: any, name: string, namespace?: string): void {
     if (namespace) {
-      const namespaceUri = NAMESPACE_URIS[namespace];
-      if (namespaceUri) {
-        el.removeAttributeNS(namespaceUri, name);
-      } else {
-        el.removeAttribute(`${namespace}:${name}`);
-      }
+      const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
+      el.removeAttributeNS(namespaceUri, name);
     } else {
       el.removeAttribute(name);
     }

From d6989c80d3f23397790bded613c7922e9ef61865 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 25 May 2018 13:28:49 -0700
Subject: [PATCH 198/582] feat(ivy): added namespaced attributes (#23899)

PR Close #23899
---
 packages/core/src/render3/di.ts               |   5 +-
 packages/core/src/render3/instructions.ts     |  36 ++++--
 packages/core/src/render3/interfaces/node.ts  |  13 ++-
 .../core/src/render3/node_selector_matcher.ts |   8 +-
 .../core/test/render3/instructions_spec.ts    | 107 +++++++++++++++++-
 .../test/dom/dom_renderer_spec.ts             |  29 +----
 6 files changed, 155 insertions(+), 43 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 1c55e79fa6..4cc09c5b2d 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -260,8 +260,11 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   const attrs = tElement.attrs;
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
-      const attrName = attrs[i];
+      let attrName = attrs[i];
       if (attrName === AttributeMarker.SELECT_ONLY) break;
+      if (attrName === 0) {  // NS.FULL
+        attrName = attrs[i += 2];
+      }
       if (attrName == attrNameToInject) {
         return attrs[i + 1] as string;
       }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 13952a0761..ef9e7d9540 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -842,15 +842,28 @@ export function createTView(
 function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
-    const attrName = attrs[i];
-    if (attrName === AttributeMarker.SELECT_ONLY) break;
-    if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
-      const attrVal = attrs[i + 1];
-      ngDevMode && ngDevMode.rendererSetAttribute++;
-      isProc ?
-          (renderer as ProceduralRenderer3)
-              .setAttribute(native, attrName as string, attrVal as string) :
-          native.setAttribute(attrName as string, attrVal as string);
+    let attrName = attrs[i];
+    if (attrName === 0) {  // NS.FULL
+      // Namespaced attribute
+      const attrNS = attrs[i + 1] as string;
+      attrName = attrs[i + 2] as string;
+      const attrVal = attrs[i + 3] as string;
+      i += 2;
+      if (isProc) {
+        (renderer as ProceduralRenderer3).setAttribute(native, attrName, attrVal, attrNS);
+      } else {
+        native.setAttributeNS(attrNS, attrName, attrVal);
+      }
+    } else {
+      if (attrName === AttributeMarker.SELECT_ONLY) break;
+      if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
+        const attrVal = attrs[i + 1];
+        ngDevMode && ngDevMode.rendererSetAttribute++;
+        isProc ?
+            (renderer as ProceduralRenderer3)
+                .setAttribute(native, attrName as string, attrVal as string) :
+            native.setAttribute(attrName as string, attrVal as string);
+      }
     }
   }
 }
@@ -1493,7 +1506,8 @@ function generateInitialInputs(
 
   const attrs = tNode.attrs !;
   for (let i = 0; i < attrs.length; i += 2) {
-    const attrName = attrs[i];
+    const first = attrs[i];
+    const attrName = first === 0 ? attrs[i += 2] : first;  // 0 = NS.FULL
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
@@ -1906,7 +1920,7 @@ function appendToProjectionNode(
  *        - 1 based index of the selector from the {@link projectionDef}
  */
 export function projection(
-    nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: string[]): void {
+    nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: TAttributes): void {
   const node = createLNode(
       nodeIndex, TNodeType.Projection, null, null, attrs || null, {head: null, tail: null});
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index d4ac991ada..00ea8220a7 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -5,7 +5,6 @@
  * 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 {LContainer} from './container';
 import {LInjector} from './injector';
 import {LProjection} from './projection';
@@ -14,6 +13,16 @@ import {RElement, RNode, RText} from './renderer';
 import {LView, TData, TView} from './view';
 
 
+/**
+ * Namespace attribute flags.
+ */
+export const enum NS {
+  /**
+   * Use the next value as the full namespaces URI, the values after that
+   * are then the name and the value, respectively.
+   */
+  FULL = 0,
+}
 
 /**
  * TNodeType corresponds to the TNode.type property. It contains information
@@ -179,7 +188,7 @@ export const enum AttributeMarker {
  * - attribute names and values
  * - special markers acting as flags to alter attributes processing.
  */
-export type TAttributes = (string | AttributeMarker)[];
+export type TAttributes = (string | AttributeMarker | NS)[];
 
 /**
  * LNode binding data (flyweight) for a particular node that is shared between all templates
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 73f2ab55ec..5f6f8b5ed0 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -106,8 +106,12 @@ function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
   if (attrs === null) return -1;
   for (let i = 0; i < attrs.length; i += step) {
     const attrName = attrs[i];
-    if (attrName === name) return i;
-    if (attrName === AttributeMarker.SELECT_ONLY) {
+    if (attrName === 0) {
+      // NS.FULL
+      step = 2;
+    } else if (attrName === name) {
+      return i;
+    } else if (attrName === AttributeMarker.SELECT_ONLY) {
       step = 1;
     }
   }
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 751ab50bd8..7056457990 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -11,7 +11,7 @@ import {NgForOfContext} from '@angular/common';
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
 import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
-import {LElementNode, LNode} from '../../src/render3/interfaces/node';
+import {LElementNode, LNode, NS} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -91,6 +91,43 @@ describe('instructions', () => {
         rendererSetAttribute: 2
       });
     });
+
+    it('should use sanitizer function even on elements with namespaced attributes', () => {
+      const t = new TemplateFixture(() => {
+        elementStart(0, 'div', [
+          NS.FULL,
+          'http://www.example.com/2004/test',
+          'whatever',
+          'abc',
+        ]);
+        elementEnd();
+      });
+
+      t.update(() => elementAttribute(0, 'title', 'javascript:true', sanitizeUrl));
+
+
+      let standardHTML = '<div whatever="abc" title="unsafe:javascript:true"></div>';
+      let ieHTML = '<div title="unsafe:javascript:true" whatever="abc"></div>';
+
+      expect([standardHTML, ieHTML]).toContain(t.html);
+
+      t.update(
+          () => elementAttribute(
+              0, 'title', bypassSanitizationTrustUrl('javascript:true'), sanitizeUrl));
+
+      standardHTML = '<div whatever="abc" title="javascript:true"></div>';
+      ieHTML = '<div title="javascript:true" whatever="abc"></div>';
+
+      expect([standardHTML, ieHTML]).toContain(t.html);
+
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 1,
+        tNode: 2,
+        tView: 1,
+        rendererCreateElement: 1,
+        rendererSetAttribute: 2
+      });
+    });
   });
 
   describe('elementProperty', () => {
@@ -408,6 +445,11 @@ describe('instructions', () => {
           // height="300"
           'height',
           '300',
+          // test:title="abc"
+          NS.FULL,
+          'http://www.example.com/2014/test',
+          'title',
+          'abc',
         ]);
         elementStart(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
         elementEnd();
@@ -419,12 +461,71 @@ describe('instructions', () => {
 
       // Most browsers will print <circle></circle>, some will print <circle />, both are valid
       const standardHTML =
-          '<div id="container"><svg id="display" width="400" height="300"><circle cx="200" cy="150" fill="#0000ff"></circle></svg></div>';
+          '<div id="container"><svg id="display" width="400" height="300" title="abc"><circle cx="200" cy="150" fill="#0000ff"></circle></svg></div>';
       const ie11HTML =
-          '<div id="container"><svg xmlns="http://www.w3.org/2000/svg" id="display" width="400" height="300"><circle fill="#0000ff" cx="200" cy="150" /></svg></div>';
+          '<div id="container"><svg xmlns="http://www.w3.org/2000/svg" xmlns:NS1="http://www.example.com/2014/test" NS1:title="abc" id="display" width="400" height="300"><circle fill="#0000ff" cx="200" cy="150" /></svg></div>';
 
       expect([standardHTML, ie11HTML]).toContain(t.html);
     });
+
+    it('should set an attribute with a namespace', () => {
+      const t = new TemplateFixture(() => {
+        elementStart(0, 'div', [
+          'id',
+          'container',
+          // test:title="abc"
+          NS.FULL,
+          'http://www.example.com/2014/test',
+          'title',
+          'abc',
+        ]);
+        elementEnd();
+      });
+
+      const standardHTML = '<div id="container" title="abc"></div>';
+      const ie11HTML =
+          '<div id="container" xmlns:NS1="https://www.example.com/2014/test" NS1:title="abc"></div>';
+      expect([standardHTML, ie11HTML]).toContain(t.html);
+    });
+
+    it('should set attributes including more than one namespaced attribute', () => {
+      const t = new TemplateFixture(() => {
+        elementStart(0, 'div', [
+          'id',
+          'container',
+
+          // NS1:title="abc"
+          NS.FULL,
+          'http://www.example.com/2014/test',
+          'title',
+          'abc',
+
+          // style="background: #dead11"
+          'style',
+          'background: #dead11',
+
+          // NS1:whatever="wee"
+          NS.FULL,
+          'http://www.example.com/2014/test',
+          'whatever',
+          'wee',
+
+          // NS2:shazbot="wocka wocka"
+          NS.FULL,
+          'http://www.whatever.com/2016/blah',
+          'shazbot',
+          'wocka wocka',
+        ]);
+        elementEnd();
+      });
+
+      const standardHTML =
+          '<div id="container" title="abc" style="background: #dead11" whatever="wee" shazbot="wocka wocka"></div>';
+      const ieHTML =
+          '<div id="container" style="background: rgb(222, 173, 17);" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
+
+      expect([standardHTML, ieHTML]).toContain(t.html);
+    });
   });
 });
 
diff --git a/packages/platform-browser/test/dom/dom_renderer_spec.ts b/packages/platform-browser/test/dom/dom_renderer_spec.ts
index 1386e8b617..d8108b97ad 100644
--- a/packages/platform-browser/test/dom/dom_renderer_spec.ts
+++ b/packages/platform-browser/test/dom/dom_renderer_spec.ts
@@ -28,23 +28,14 @@ import {NAMESPACE_URIS} from '../../src/dom/dom_renderer';
 
     describe('setAttribute', () => {
       describe('with namespace', () => {
-        it('xmlns', () => shouldSetAttributeWithNs('xmlns'));
         it('xml', () => shouldSetAttributeWithNs('xml'));
         it('svg', () => shouldSetAttributeWithNs('svg'));
         it('xhtml', () => shouldSetAttributeWithNs('xhtml'));
         it('xlink', () => shouldSetAttributeWithNs('xlink'));
-
-        it('unknown', () => {
-          const div = document.createElement('div');
-          expect(div.hasAttribute('unknown:name')).toBe(false);
-
-          renderer.setAttribute(div, 'name', 'value', 'unknown');
-
-          expect(div.getAttribute('unknown:name')).toBe('value');
-        });
+        it('custom', () => shouldSetAttributeWithNs('custom'));
 
         function shouldSetAttributeWithNs(namespace: string): void {
-          const namespaceUri = NAMESPACE_URIS[namespace];
+          const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
           const div = document.createElement('div');
           expect(div.hasAttributeNS(namespaceUri, 'name')).toBe(false);
 
@@ -57,26 +48,16 @@ import {NAMESPACE_URIS} from '../../src/dom/dom_renderer';
 
     describe('removeAttribute', () => {
       describe('with namespace', () => {
-        it('xmlns', () => shouldRemoveAttributeWithNs('xmlns'));
         it('xml', () => shouldRemoveAttributeWithNs('xml'));
         it('svg', () => shouldRemoveAttributeWithNs('svg'));
         it('xhtml', () => shouldRemoveAttributeWithNs('xhtml'));
         it('xlink', () => shouldRemoveAttributeWithNs('xlink'));
-
-        it('unknown', () => {
-          const div = document.createElement('div');
-          div.setAttribute('unknown:name', 'value');
-          expect(div.hasAttribute('unknown:name')).toBe(true);
-
-          renderer.removeAttribute(div, 'name', 'unknown');
-
-          expect(div.hasAttribute('unknown:name')).toBe(false);
-        });
+        it('custom', () => shouldRemoveAttributeWithNs('custom'));
 
         function shouldRemoveAttributeWithNs(namespace: string): void {
-          const namespaceUri = NAMESPACE_URIS[namespace];
+          const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
           const div = document.createElement('div');
-          div.setAttributeNS(namespaceUri, `${namespace}:name`, 'value');
+          div.setAttributeNS(namespaceUri, 'name', 'value');
           expect(div.hasAttributeNS(namespaceUri, 'name')).toBe(true);
 
           renderer.removeAttribute(div, 'name', namespace);

From b415010222c4616a45cf06fb85221f2452aa05e4 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 25 May 2018 16:23:00 -0700
Subject: [PATCH 199/582] feat(ivy): add element instruction (#23899)

Adds a simplified element instruction that can be used if an element
has no children.

PR Close #23899
---
 .../compiler/src/render3/r3_identifiers.ts    |  4 +-
 .../compiler/src/render3/view/template.ts     | 61 +++++++++++--------
 .../render3/r3_compiler_compliance_spec.ts    | 36 ++++-------
 .../render3/r3_view_compiler_binding_spec.ts  |  6 +-
 .../render3/r3_view_compiler_i18n_spec.ts     |  3 +-
 .../render3/r3_view_compiler_template_spec.ts | 39 ++++++++++++
 .../core/src/core_render3_private_export.ts   |  1 +
 packages/core/src/render3/index.ts            |  1 +
 packages/core/src/render3/instructions.ts     |  9 +++
 .../core/src/render3/node_selector_matcher.ts |  1 +
 .../component_directives_spec.ts              | 15 ++---
 .../render3/compiler_canonical/query_spec.ts  |  3 +-
 .../core/test/render3/instructions_spec.ts    | 16 ++---
 13 files changed, 117 insertions(+), 78 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index b9bf96b0d3..a37e2a7bdc 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -17,10 +17,12 @@ export class Identifiers {
   static PATCH_DEPS = 'patchedDeps';
 
   /* Instructions */
-  static createElement: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
+  static elementStart: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
 
   static elementEnd: o.ExternalReference = {name: 'ɵe', moduleName: CORE};
 
+  static element: o.ExternalReference = {name: 'ɵEe', moduleName: CORE};
+
   static elementProperty: o.ExternalReference = {name: 'ɵp', moduleName: CORE};
 
   static elementAttribute: o.ExternalReference = {name: 'ɵa', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index b0d21a9a11..607703732d 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -314,32 +314,42 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     if (i18nMessages.length > 0) {
       this._creationCode.push(...i18nMessages);
     }
-    this.instruction(
-        this._creationCode, element.sourceSpan, R3.createElement, ...trimTrailingNulls(parameters));
+
+    let isSelfClosingElement = element.outputs.length === 0 && element.children.length === 0;
+
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    // Generate Listeners (outputs)
-    element.outputs.forEach((outputAst: t.BoundEvent) => {
-      const elName = sanitizeIdentifier(element.name);
-      const evName = sanitizeIdentifier(outputAst.name);
-      const functionName = `${this.templateName}_${elName}_${evName}_listener`;
-      const localVars: o.Statement[] = [];
-      const bindingScope =
-          this._bindingScope.nestedScope((lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => {
-            localVars.push(
-                lhsVar.set(rhsExpression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
-          });
-      const bindingExpr = convertActionBinding(
-          bindingScope, implicit, outputAst.handler, 'b', () => error('Unexpected interpolation'));
-      const handler = o.fn(
-          [new o.FnParam('$event', o.DYNAMIC_TYPE)], [...localVars, ...bindingExpr.render3Stmts],
-          o.INFERRED_TYPE, null, functionName);
+    if (isSelfClosingElement) {
       this.instruction(
-          this._creationCode, outputAst.sourceSpan, R3.listener, o.literal(outputAst.name),
-          handler);
-    });
+          this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
+    } else {
+      this.instruction(
+          this._creationCode, element.sourceSpan, R3.elementStart,
+          ...trimTrailingNulls(parameters));
 
+      // Generate Listeners (outputs)
+      element.outputs.forEach((outputAst: t.BoundEvent) => {
+        const elName = sanitizeIdentifier(element.name);
+        const evName = sanitizeIdentifier(outputAst.name);
+        const functionName = `${this.templateName}_${elName}_${evName}_listener`;
+        const localVars: o.Statement[] = [];
+        const bindingScope =
+            this._bindingScope.nestedScope((lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => {
+              localVars.push(
+                  lhsVar.set(rhsExpression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
+            });
+        const bindingExpr = convertActionBinding(
+            bindingScope, implicit, outputAst.handler, 'b',
+            () => error('Unexpected interpolation'));
+        const handler = o.fn(
+            [new o.FnParam('$event', o.DYNAMIC_TYPE)], [...localVars, ...bindingExpr.render3Stmts],
+            o.INFERRED_TYPE, null, functionName);
+        this.instruction(
+            this._creationCode, outputAst.sourceSpan, R3.listener, o.literal(outputAst.name),
+            handler);
+      });
+    }
 
     // Generate element input bindings
     element.inputs.forEach((input: t.BoundAttribute) => {
@@ -367,10 +377,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       t.visitAll(this, element.children);
     }
 
-    // Finish element construction mode.
-    this.instruction(
-        this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
-
+    if (!isSelfClosingElement) {
+      // Finish element construction mode.
+      this.instruction(
+          this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
+    }
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
   }
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index a60ccb687c..74045c062b 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -90,8 +90,7 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div');
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.id));
@@ -135,9 +134,8 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
+            $r3$.ɵEe(0, 'div');
             $r3$.ɵPp(1,'pipe');
-            $r3$.ɵe();
             $r3$.ɵrS(10);
           }
           if (rf & 2) {
@@ -181,8 +179,7 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div');
           }
           if (rf & 2) {
             $r3$.ɵkn(0, 'error', $r3$.ɵb(ctx.error));
@@ -254,8 +251,7 @@ describe('compiler compliance', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'child', $c1$);
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'child', $c1$);
               $r3$.ɵT(1, '!');
             }
           },
@@ -461,8 +457,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'my-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'my-comp');
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
@@ -541,8 +536,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'my-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'my-comp');
                 $r3$.ɵrS(10);
               }
               if (rf & 2) {
@@ -603,8 +597,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'object-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'object-comp');
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
@@ -669,8 +662,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'nested-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'nested-comp');
                 $r3$.ɵrS(7);
               }
               if (rf & 2) {
@@ -814,8 +806,7 @@ describe('compiler compliance', () => {
               var $tmp$: $any$;
               if (rf & 1) {
                 $r3$.ɵQ(0, SomeDirective, true);
-                $r3$.ɵE(1, 'div', $e0_attrs$);
-                $r3$.ɵe();
+                $r3$.ɵEe(1, 'div', $e0_attrs$);
               }
               if (rf & 2) {
                 ($r3$.ɵqR(($tmp$ = $r3$.ɵld(0))) && (ctx.someDir = $tmp$.first));
@@ -1009,8 +1000,7 @@ describe('compiler compliance', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'input', null, $c1$);
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'input', null, $c1$);
               $r3$.ɵT(2);
             }
             const $user$ = $r3$.ɵld(1);
@@ -1089,10 +1079,8 @@ describe('compiler compliance', () => {
             factory: function SimpleLayout_Factory() { return new SimpleLayout(); },
             template: function SimpleLayout_Template(rf: IDENT, ctx: IDENT) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'lifecycle-comp');
-                $r3$.ɵe();
-                $r3$.ɵE(1, 'lifecycle-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'lifecycle-comp');
+                $r3$.ɵEe(1, 'lifecycle-comp');
               }
               if (rf & 2) {
                 $r3$.ɵp(0, 'name', $r3$.ɵb(ctx.name1));
diff --git a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
index 8b0a9edcbe..a9f4f3672e 100644
--- a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
@@ -75,8 +75,7 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
         if (rf & 1) {
-          $i0$.ɵE(0, 'a');
-          $i0$.ɵe();
+          $i0$.ɵEe(0, 'a');
         }
         if (rf & 2) {
           $i0$.ɵp(0, 'title', $i0$.ɵb($ctx$.title));
@@ -108,8 +107,7 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
         if (rf & 1) {
-          $i0$.ɵE(0, 'a');
-          $i0$.ɵe();
+          $i0$.ɵEe(0, 'a');
         }
         if (rf & 2) {
           $i0$.ɵp(0, 'title', $i0$.ɵi1('Hello ', $ctx$.name, ''));
diff --git a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
index 3839df2615..1065b3acb9 100644
--- a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
@@ -148,8 +148,7 @@ describe('i18n support in the view compiler', () => {
       …
       template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
         if (rf & 1) {
-          $r3$.ɵE(0, 'div', $c1$);
-          $r3$.ɵe();
+          $r3$.ɵEe(0, 'div', $c1$);
         }
       }
     `;
diff --git a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
index 12041faec4..86d96f9850 100644
--- a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
@@ -109,4 +109,43 @@ describe('compiler compliance: template', () => {
     expectEmit(result.source, template, 'Incorrect template');
   });
 
+  // tslint:disable-next-line:ban
+  describe('element with no children', () => {
+    it('should just use the element instruction', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+                import {CommonModule} from '@angular/common';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`
+                    <div></div>\`
+                })
+                export class MyComponent {
+                }
+
+                @NgModule({declarations: [MyComponent], imports: [CommonModule]})
+                export class MyModule {}
+            `
+        }
+      };
+
+      const template = `
+        // ...
+        template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+          if (rf & 1) {
+            $i0$.ɵEe(0,'div');
+          }
+        }`;
+
+      debugger;
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+  });
+
 });
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index ff8c7449b4..edcd9abbf5 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -28,6 +28,7 @@ export {
   NC as ɵNC,
   C as ɵC,
   E as ɵE,
+  Ee as ɵEe,
   L as ɵL,
   T as ɵT,
   V as ɵV,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 0e8e091bc3..19929ac932 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -50,6 +50,7 @@ export {
   elementEnd as e,
   elementProperty as p,
   elementStart as E,
+  element as Ee,
   elementStyle as s,
   elementStyleNamed as sn,
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index ef9e7d9540..30fcc1fe80 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1032,6 +1032,15 @@ export function elementEnd() {
   queueLifecycleHooks(previousOrParentNode.tNode.flags, currentView);
 }
 
+/** Marks the beginning and end of an element in one call. */
+export function element(
+    index: number, name: string, attrs?: TAttributes | null | undefined,
+    localRefs?: string[] | null | undefined): RElement {
+  const relement = elementStart(index, name, attrs, localRefs);
+  elementEnd();
+  return relement;
+}
+
 /**
  * Updates the value of removes an attribute on an Element.
  *
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 5f6f8b5ed0..efba0295ee 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -12,6 +12,7 @@ import {assertNotNull} from './assert';
 import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
+
 const unusedValueToPlacateAjd = unused1 + unused2;
 
 function isCssClassMatching(nodeClassAttrVal: string, cssClassToMatch: string): boolean {
diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index 7c1e6a7845..f928655a46 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -69,8 +69,7 @@ describe('components & directives', () => {
         factory: () => new MyComponent(),
         template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'child', $e0_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'child', $e0_attrs$);
             $r3$.ɵT(1, '!');
           }
         }
@@ -455,8 +454,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-array-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-array-comp');
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'names', rf & 1 ? $e0_arr$ : $r3$.ɵNC);
@@ -500,8 +498,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-array-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-array-comp');
               $r3$.ɵrS(1);
             }
             if (rf & 2) {
@@ -606,8 +603,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-array-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-array-comp');
               $r3$.ɵrS(2);
             }
             if (rf & 2) {
@@ -717,8 +713,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, c: $any$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-comp');
               $r3$.ɵrS(10);
             }
             if (rf & 2) {
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index d3e19413e3..a5d51d0391 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -58,8 +58,7 @@ describe('queries', () => {
           if (rf & 1) {
             $r3$.ɵQ(0, SomeDirective, false);
             $r3$.ɵQ(1, SomeDirective, false);
-            $r3$.ɵE(2, 'div', $e1_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(2, 'div', $e1_attrs$);
           }
           if (rf & 2) {
             $r3$.ɵqR($tmp$ = $r3$.ɵld<QueryList<any>>(0)) && (ctx.someDir = $tmp$.first);
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 7056457990..237744cee4 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,14 +10,14 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
 import {LElementNode, LNode, NS} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {NgForOf} from './common_with_def';
-import {ComponentFixture, TemplateFixture} from './render_util';
+import {ComponentFixture, TemplateFixture, toHtml} from './render_util';
 
 describe('instructions', () => {
   function createAnchor() {
@@ -94,13 +94,12 @@ describe('instructions', () => {
 
     it('should use sanitizer function even on elements with namespaced attributes', () => {
       const t = new TemplateFixture(() => {
-        elementStart(0, 'div', [
+        element(0, 'div', [
           NS.FULL,
           'http://www.example.com/2004/test',
           'whatever',
           'abc',
         ]);
-        elementEnd();
       });
 
       t.update(() => elementAttribute(0, 'title', 'javascript:true', sanitizeUrl));
@@ -451,8 +450,7 @@ describe('instructions', () => {
           'title',
           'abc',
         ]);
-        elementStart(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
-        elementEnd();
+        element(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
         elementEnd();
         setHtmlNS();
         elementEnd();
@@ -470,7 +468,7 @@ describe('instructions', () => {
 
     it('should set an attribute with a namespace', () => {
       const t = new TemplateFixture(() => {
-        elementStart(0, 'div', [
+        element(0, 'div', [
           'id',
           'container',
           // test:title="abc"
@@ -479,7 +477,6 @@ describe('instructions', () => {
           'title',
           'abc',
         ]);
-        elementEnd();
       });
 
       const standardHTML = '<div id="container" title="abc"></div>';
@@ -490,7 +487,7 @@ describe('instructions', () => {
 
     it('should set attributes including more than one namespaced attribute', () => {
       const t = new TemplateFixture(() => {
-        elementStart(0, 'div', [
+        element(0, 'div', [
           'id',
           'container',
 
@@ -516,7 +513,6 @@ describe('instructions', () => {
           'shazbot',
           'wocka wocka',
         ]);
-        elementEnd();
       });
 
       const standardHTML =

From 1208a35373f1ebf58f7512948c6f58d7d1a03570 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 30 May 2018 15:57:09 -0700
Subject: [PATCH 200/582] refactor(ivy): Use AttributeMarker instead of NS
 (#23899)

- Removes NS enum
- Uses existing AttributeMarker
- Adds enum value NAMESPACE_URI

PR Close #23899
---
 packages/core/src/render3/di.ts               |  2 +-
 packages/core/src/render3/instructions.ts     |  5 ++---
 packages/core/src/render3/interfaces/node.ts  | 20 ++++++-------------
 .../core/src/render3/node_selector_matcher.ts |  3 +--
 .../core/test/render3/instructions_spec.ts    | 14 ++++++-------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 4cc09c5b2d..168507bdb5 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -262,7 +262,7 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
     for (let i = 0; i < attrs.length; i = i + 2) {
       let attrName = attrs[i];
       if (attrName === AttributeMarker.SELECT_ONLY) break;
-      if (attrName === 0) {  // NS.FULL
+      if (attrName === AttributeMarker.NAMESPACE_URI) {
         attrName = attrs[i += 2];
       }
       if (attrName == attrNameToInject) {
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 30fcc1fe80..f6fad80f48 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -843,8 +843,7 @@ function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
     let attrName = attrs[i];
-    if (attrName === 0) {  // NS.FULL
-      // Namespaced attribute
+    if (attrName === AttributeMarker.NAMESPACE_URI) {
       const attrNS = attrs[i + 1] as string;
       attrName = attrs[i + 2] as string;
       const attrVal = attrs[i + 3] as string;
@@ -1516,7 +1515,7 @@ function generateInitialInputs(
   const attrs = tNode.attrs !;
   for (let i = 0; i < attrs.length; i += 2) {
     const first = attrs[i];
-    const attrName = first === 0 ? attrs[i += 2] : first;  // 0 = NS.FULL
+    const attrName = first === AttributeMarker.NAMESPACE_URI ? attrs[i += 2] : first;
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 00ea8220a7..2f3ac9585a 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -12,18 +12,6 @@ import {LQueries} from './query';
 import {RElement, RNode, RText} from './renderer';
 import {LView, TData, TView} from './view';
 
-
-/**
- * Namespace attribute flags.
- */
-export const enum NS {
-  /**
-   * Use the next value as the full namespaces URI, the values after that
-   * are then the name and the value, respectively.
-   */
-  FULL = 0,
-}
-
 /**
  * TNodeType corresponds to the TNode.type property. It contains information
  * on how to map a particular set of bits in LNode.flags to the node type.
@@ -172,7 +160,11 @@ export interface LProjectionNode extends LNode {
  * items are not regular attributes and the processing should be adapted accordingly.
  */
 export const enum AttributeMarker {
-  NS = 0,  // namespace. Has to be repeated.
+  /**
+   * Use the next value as the full namespaces URI, the values after that
+   * are then the name and the value, respectively.
+   */
+  NAMESPACE_URI = 0,  // namespace. Has to be repeated.
 
   /**
    * This marker indicates that the following attribute names were extracted from bindings (ex.:
@@ -188,7 +180,7 @@ export const enum AttributeMarker {
  * - attribute names and values
  * - special markers acting as flags to alter attributes processing.
  */
-export type TAttributes = (string | AttributeMarker | NS)[];
+export type TAttributes = (string | AttributeMarker)[];
 
 /**
  * LNode binding data (flyweight) for a particular node that is shared between all templates
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index efba0295ee..354ff7317f 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -107,8 +107,7 @@ function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
   if (attrs === null) return -1;
   for (let i = 0; i < attrs.length; i += step) {
     const attrName = attrs[i];
-    if (attrName === 0) {
-      // NS.FULL
+    if (attrName === AttributeMarker.NAMESPACE_URI) {
       step = 2;
     } else if (attrName === name) {
       return i;
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 237744cee4..b7e79be99d 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -11,7 +11,7 @@ import {NgForOfContext} from '@angular/common';
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
 import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
-import {LElementNode, LNode, NS} from '../../src/render3/interfaces/node';
+import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -95,7 +95,7 @@ describe('instructions', () => {
     it('should use sanitizer function even on elements with namespaced attributes', () => {
       const t = new TemplateFixture(() => {
         element(0, 'div', [
-          NS.FULL,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2004/test',
           'whatever',
           'abc',
@@ -445,7 +445,7 @@ describe('instructions', () => {
           'height',
           '300',
           // test:title="abc"
-          NS.FULL,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -472,7 +472,7 @@ describe('instructions', () => {
           'id',
           'container',
           // test:title="abc"
-          NS.FULL,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -492,7 +492,7 @@ describe('instructions', () => {
           'container',
 
           // NS1:title="abc"
-          NS.FULL,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -502,13 +502,13 @@ describe('instructions', () => {
           'background: #dead11',
 
           // NS1:whatever="wee"
-          NS.FULL,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'whatever',
           'wee',
 
           // NS2:shazbot="wocka wocka"
-          NS.FULL,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.whatever.com/2016/blah',
           'shazbot',
           'wocka wocka',

From 0d06c866c69bb9dec51c570afc2bd77977aacd23 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 30 May 2018 16:05:40 -0700
Subject: [PATCH 201/582] refactor(ivy): rename setNS, setHtmlNS and friends to
 namespace, namespaceHTML, etc (#23899)

- Renames functions
- Adds documentation

PR Close #23899
---
 packages/core/src/render3/instructions.ts     | 40 +++++++++++++------
 .../bundling/todo/bundle.golden_symbols.json  |  2 +-
 .../core/test/render3/instructions_spec.ts    |  6 +--
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index f6fad80f48..e195770c05 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -556,22 +556,38 @@ function getRenderFlags(view: LView): RenderFlags {
 //////////////////////////
 //// Namespace
 //////////////////////////
-let _currentNS: string|null = null;
+let _currentNamespace: string|null = null;
 
-export function setNS(namespace: string) {
-  _currentNS = namespace;
+/**
+ * Sets the namespace URI that will be used to create elements in {@link element}
+ * and {@link elementStart}
+ * @param uri the full namespaceUri
+ */
+export function namespace(uri: string | null) {
+  _currentNamespace = uri;
 }
 
-export function setHtmlNS() {
-  _currentNS = null;
+/**
+ * Sets the current namespace URI to null, meaning createElement (not createElementNS)
+ * will be used to create elements in {@link element} and {@link elementStart}
+ */
+export function namespaceHTML() {
+  _currentNamespace = null;
 }
 
-export function setSvgNS() {
-  _currentNS = 'http://www.w3.org/2000/svg';
+/**
+ * Sets the current namespace URI to http://www.w3.org/2000/svg, which will be
+ * used in conjunction with createElementNS in {@link element} and {@link elementStart}
+ */
+export function namespaceSVG() {
+  _currentNamespace = 'http://www.w3.org/2000/svg';
 }
-
-export function setMathML() {
-  _currentNS = 'http://www.w3.org/1998/Math/MathML';
+/**
+ * Sets the current namespace URI to http://www.w3.org/1998/Math/MathML, which will be
+ * used in conjunction with createElementNS in {@link element} and {@link elementStart}
+ */
+export function namespaceMathML() {
+  _currentNamespace = 'http://www.w3.org/1998/Math/MathML';
 }
 
 
@@ -599,9 +615,9 @@ export function elementStart(
 
   ngDevMode && ngDevMode.rendererCreateElement++;
 
-  const native: RElement = _currentNS === null || isProceduralRenderer(renderer) ?
+  const native: RElement = _currentNamespace === null || isProceduralRenderer(renderer) ?
       renderer.createElement(name) :
-      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNS, name);
+      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNamespace, name);
 
   ngDevMode && assertDataInRange(index - 1);
 
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 2b63963bd6..8a2c2c97c0 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -177,7 +177,7 @@
     "name": "_currentInjector"
   },
   {
-    "name": "_currentNS"
+    "name": "_currentNamespace"
   },
   {
     "name": "_devMode"
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index b7e79be99d..32aa8fe6fc 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, namespaceHTML, namespaceSVG, renderTemplate, text, textBinding} from '../../src/render3/instructions';
 import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
@@ -433,7 +433,7 @@ describe('instructions', () => {
     it('should render SVG', () => {
       const t = new TemplateFixture(() => {
         elementStart(0, 'div', ['id', 'container']);
-        setSvgNS();
+        namespaceSVG();
         elementStart(1, 'svg', [
           // id="display"
           'id',
@@ -452,7 +452,7 @@ describe('instructions', () => {
         ]);
         element(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
         elementEnd();
-        setHtmlNS();
+        namespaceHTML();
         elementEnd();
       });
 

From 856ee734640ac1031603b66d61cc20d1d2373fe3 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 30 May 2018 16:08:28 -0700
Subject: [PATCH 202/582] refactor(ivy): clean up (#23899)

- remove unnecessary debugger statement
- rename `isSelfClosingElement` to `isEmptyElement`
- remove unnecessary template anchor in test

PR Close #23899
---
 packages/compiler/src/render3/view/template.ts              | 6 +++---
 .../compiler/test/render3/r3_view_compiler_template_spec.ts | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 607703732d..49e593ba90 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -315,12 +315,12 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this._creationCode.push(...i18nMessages);
     }
 
-    let isSelfClosingElement = element.outputs.length === 0 && element.children.length === 0;
+    const isEmptyElement = element.outputs.length === 0 && element.children.length === 0;
 
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    if (isSelfClosingElement) {
+    if (isEmptyElement) {
       this.instruction(
           this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
     } else {
@@ -377,7 +377,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       t.visitAll(this, element.children);
     }
 
-    if (!isSelfClosingElement) {
+    if (!isEmptyElement) {
       // Finish element construction mode.
       this.instruction(
           this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
diff --git a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
index 86d96f9850..d4593cb197 100644
--- a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
@@ -133,15 +133,12 @@ describe('compiler compliance: template', () => {
       };
 
       const template = `
-        // ...
         template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
           if (rf & 1) {
             $i0$.ɵEe(0,'div');
           }
         }`;
 
-      debugger;
-
       const result = compile(files, angularFiles);
 
       expectEmit(result.source, template, 'Incorrect template');

From e994b11105e3a2dcd02eb3432a53a44f50991fb8 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 30 May 2018 16:47:32 -0700
Subject: [PATCH 203/582] test(ivy): add testing for namespaced attributes
 (#23899)

PR Close #23899
---
 packages/core/test/render3/instructions_spec.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 32aa8fe6fc..9aeade3a2f 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -521,6 +521,22 @@ describe('instructions', () => {
           '<div id="container" style="background: rgb(222, 173, 17);" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
 
       expect([standardHTML, ieHTML]).toContain(t.html);
+
+      const div = t.hostElement.querySelector('#container');
+      expect(div !.attributes.length).toBe(5);
+
+      const expectedAttributes: {[key: string]: string} = {
+        'id': 'container',
+        'http://www.example.com/2014/test:title': 'abc',
+        'style': 'background: #dead11',
+        'http://www.example.com/2014/test:whatever': 'wee',
+        'http://www.whatever.com/2016/blah:shazbot': 'wocka wocka',
+      };
+
+      Array.from(div !.attributes).forEach(attr => {
+        const key = attr.namespaceURI ? attr.namespaceURI + ':' + attr.name : attr.name;
+        expect(attr.value).toEqual(expectedAttributes[key]);
+      });
     });
   });
 });

From 1915e47d1138d53a5dfd98028501540aca3868af Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 30 May 2018 17:17:07 -0700
Subject: [PATCH 204/582] docs(ivy): update SVG status (#23899)

PR Close #23899
---
 packages/core/src/render3/STATUS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 944c91574f..8209be7c33 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -150,7 +150,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |
-| `<svg:g svg:p>`                             |  ❌     |  ❌      |  ❌      |
+| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ❌      |
 | `<img src=[userData]>` sanitization         |  ❌     |  ❌      |  ❌      |
 | `<div (nocd.click)>`                        |  ❌     |  ❌      |  ❌      |
 | `<div (bubble.click)>`                      |  ❌     |  ❌      |  ❌      |

From 51e9e64c5acd0ce024873ffa5a71fd0ca6db8232 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Thu, 31 May 2018 09:13:52 -0700
Subject: [PATCH 205/582] test(ivy): update test that is flaky in IE (#23899)

PR Close #23899
---
 packages/core/test/render3/instructions_spec.ts | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 9aeade3a2f..35ed8b3d5c 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -497,10 +497,6 @@ describe('instructions', () => {
           'title',
           'abc',
 
-          // style="background: #dead11"
-          'style',
-          'background: #dead11',
-
           // NS1:whatever="wee"
           AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
@@ -516,19 +512,16 @@ describe('instructions', () => {
       });
 
       const standardHTML =
-          '<div id="container" title="abc" style="background: #dead11" whatever="wee" shazbot="wocka wocka"></div>';
-      const ieHTML =
-          '<div id="container" style="background: rgb(222, 173, 17);" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
+          '<div id="container" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
 
-      expect([standardHTML, ieHTML]).toContain(t.html);
+      expect(t.html).toEqual(standardHTML);
 
       const div = t.hostElement.querySelector('#container');
-      expect(div !.attributes.length).toBe(5);
+      expect(div !.attributes.length).toBe(4);
 
       const expectedAttributes: {[key: string]: string} = {
         'id': 'container',
         'http://www.example.com/2014/test:title': 'abc',
-        'style': 'background: #dead11',
         'http://www.example.com/2014/test:whatever': 'wee',
         'http://www.whatever.com/2016/blah:shazbot': 'wocka wocka',
       };

From 1007d1ad271566a8beabb2fcf234be393b3ce313 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 1 Jun 2018 08:02:14 -0700
Subject: [PATCH 206/582] feat(ivy): SVG now handled by ivy compiler (#23899)

PR Close #23899
---
 .../compiler/src/render3/r3_identifiers.ts    |   6 +
 .../compiler/src/render3/view/template.ts     |  42 ++++++-
 .../render3/r3_compiler_compliance_spec.ts    | 116 ++++++++++++++++++
 .../core/src/core_render3_private_export.ts   |   4 +
 packages/core/src/render3/index.ts            |   5 +
 packages/core/src/render3/instructions.ts     |   3 +
 .../bundling/todo/bundle.golden_symbols.json  |   3 +
 .../compiler_canonical/elements_spec.ts       |  38 ++++++
 .../template_variables_spec.ts                |  51 ++++++++
 9 files changed, 267 insertions(+), 1 deletion(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index a37e2a7bdc..57e4b5fb91 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -39,6 +39,12 @@ export class Identifiers {
 
   static bind: o.ExternalReference = {name: 'ɵb', moduleName: CORE};
 
+
+  static namespace: o.ExternalReference = {name: 'ɵN', moduleName: CORE};
+  static namespaceHTML: o.ExternalReference = {name: 'ɵNH', moduleName: CORE};
+  static namespaceMathML: o.ExternalReference = {name: 'ɵNM', moduleName: CORE};
+  static namespaceSVG: o.ExternalReference = {name: 'ɵNS', moduleName: CORE};
+
   static interpolation1: o.ExternalReference = {name: 'ɵi1', moduleName: CORE};
   static interpolation2: o.ExternalReference = {name: 'ɵi2', moduleName: CORE};
   static interpolation3: o.ExternalReference = {name: 'ɵi3', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 49e593ba90..9d7a7163d4 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -19,6 +19,7 @@ import {HtmlParser} from '../../ml_parser/html_parser';
 import {WhitespaceVisitor} from '../../ml_parser/html_whitespaces';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
 import * as o from '../../output/output_ast';
+import {ExternalReference} from '../../output/output_ast';
 import {ParseError, ParseSourceSpan} from '../../parse_util';
 import {DomElementSchemaRegistry} from '../../schema/dom_element_schema_registry';
 import {CssSelector, SelectorMatcher} from '../../selector';
@@ -51,6 +52,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private _valueConverter: ValueConverter;
   private _unsupported = unsupported;
   private _bindingScope: BindingScope;
+  private _namespace = R3.namespaceHTML;
 
   // Whether we are inside a translatable element (`<p i18n>... somewhere here ... </p>)
   private _inI18nSection: boolean = false;
@@ -220,6 +222,26 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     this.instruction(this._creationCode, ngContent.sourceSpan, R3.projection, ...parameters);
   }
 
+  /**
+   * Gets the namespace instruction function based on the current element
+   * @param ivyElementName An system element name, can include colons like :svg:svg
+   */
+  getNamespaceInstruction(ivyElementName: string) {
+    switch (ivyElementName) {
+      case ':svg:svg':
+        return R3.namespaceSVG;
+      case ':math:math':
+        return R3.namespaceMathML;
+      default:
+        return this._namespace;
+    }
+  }
+
+  addNamespaceInstruction(nsInstruction: ExternalReference, element: t.Element) {
+    this._namespace = nsInstruction;
+    this.instruction(this._creationCode, element.sourceSpan, nsInstruction);
+  }
+
   visitElement(element: t.Element) {
     const elementIndex = this.allocateDataSlot();
     const referenceDataSlots = new Map<string, number>();
@@ -315,11 +337,20 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this._creationCode.push(...i18nMessages);
     }
 
-    const isEmptyElement = element.outputs.length === 0 && element.children.length === 0;
+    const isEmptyElement = element.children.length === 0 && element.outputs.length === 0;
 
 
     const implicit = o.variable(CONTEXT_NAME);
 
+    const wasInNamespace = this._namespace;
+    const currentNamespace = this.getNamespaceInstruction(element.name);
+    // If the namespace is changing now, include an instruction to change it
+    // during element creation.
+    if (currentNamespace !== wasInNamespace) {
+      this.addNamespaceInstruction(currentNamespace, element);
+    }
+
+
     if (isEmptyElement) {
       this.instruction(
           this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
@@ -328,6 +359,14 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           this._creationCode, element.sourceSpan, R3.elementStart,
           ...trimTrailingNulls(parameters));
 
+      // If the element happens to be an SVG <foreignObject>, we need to switch
+      // to the HTML namespace inside of it
+      if (element.name === ':svg:foreignObject') {
+        // NOTE(benlesh): this may cause extremem corner-case bugs if someone was to do something
+        //   like <math>...<foreignObject></foreignObject>...</math>.
+        this.addNamespaceInstruction(R3.namespaceHTML, element);
+      }
+
       // Generate Listeners (outputs)
       element.outputs.forEach((outputAst: t.BoundEvent) => {
         const elName = sanitizeIdentifier(element.name);
@@ -384,6 +423,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
+    this._namespace = wasInNamespace;
   }
 
   visitTemplate(template: t.Template) {
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 74045c062b..322af1a50c 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -66,6 +66,50 @@ describe('compiler compliance', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
+    it('should translate DOM structure for SVG', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+
+              @Component({
+                selector: 'my-component',
+                template: \`<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"/></svg></div>\`
+              })
+              export class MyComponent {}
+
+              @NgModule({declarations: [MyComponent]})
+              export class MyModule {}
+          `
+        }
+      };
+
+      // The factory should look like this:
+      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
+
+      // The template should look like this (where IDENT is a wild card for an identifier):
+      const template = `
+        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
+        …
+        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div', $e0_attrs$);
+            $r3$.ɵNS();
+            $r3$.ɵE(1, ':svg:svg');
+            $r3$.ɵEe(2, ':svg:circle', $e2_attrs$);
+            $r3$.ɵe();
+            $r3$.ɵe();
+          }
+        }
+      `;
+
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, factory, 'Incorrect factory');
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+
     it('should bind to element properties', () => {
       const files = {
         app: {
@@ -1230,6 +1274,78 @@ describe('compiler compliance', () => {
         expectEmit(source, MyComponentDefinition, 'Invalid component definition');
       });
 
+      it('should support a let variable and reference for SVG', () => {
+        const files = {
+          app: {
+            ...shared,
+            'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+              import {ForOfDirective} from './shared/for_of';
+
+              @Component({
+                selector: 'my-component',
+                template: \`<svg><g *for="let item of items"><circle></circle></g></svg>\`
+              })
+              export class MyComponent {
+                items = [{ data: 42 }, { data: 42 }];
+              }
+
+              @NgModule({
+                declarations: [MyComponent, ForOfDirective]
+              })
+              export class MyModule {}
+            `
+          }
+        };
+
+        // TODO(chuckj): Enforce this when the directives are specified
+        const ForDirectiveDefinition = `
+          static ngDirectiveDef = $r3$.ɵdefineDirective({
+            type: ForOfDirective,
+            selectors: [['', 'forOf', '']],
+            factory: function ForOfDirective_Factory() {
+              return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
+            },
+            features: [$r3$.ɵNgOnChangesFeature(NgForOf)],
+            inputs: {forOf: 'forOf'}
+          });
+        `;
+
+        const MyComponentDefinition = `
+          const $_c0$ = ['for','','forOf',''];
+          …
+          static ngComponentDef = $r3$.ɵdefineComponent({
+            type: MyComponent,
+            selectors: [['my-component']],
+            factory: function MyComponent_Factory() { return new MyComponent(); },
+            template: function MyComponent_Template(rf:IDENT,ctx:IDENT){
+              if (rf & 1) {
+                $r3$.ɵNS();
+                $r3$.ɵE(0,':svg:svg');
+                $r3$.ɵC(1,MyComponent__svg_g_Template_1,null,$_c0$);
+                $r3$.ɵe();
+              }
+              if (rf & 2) { $r3$.ɵp(1,'forOf',$r3$.ɵb(ctx.items)); }
+              function MyComponent__svg_g_Template_1(rf:IDENT,ctx0:IDENT) {
+                if (rf & 1) {
+                  $r3$.ɵE(0,':svg:g');
+                  $r3$.ɵEe(1,':svg:circle');
+                  $r3$.ɵe();
+                }
+              }
+            },
+            directives: [ForOfDirective]
+          });
+        `;
+
+        const result = compile(files, angularFiles);
+        const source = result.source;
+
+        // TODO(chuckj): Enforce this when the directives are specified
+        // expectEmit(source, ForDirectiveDefinition, 'Invalid directive definition');
+        expectEmit(source, MyComponentDefinition, 'Invalid component definition');
+      });
+
       it('should support accessing parent template variables', () => {
         const files = {
           app: {
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index edcd9abbf5..0be275e0b1 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -45,6 +45,10 @@ export {
   i7 as ɵi7,
   i8 as ɵi8,
   iV as ɵiV,
+  N as ɵN,
+  NH as ɵNH,
+  NM as ɵNM,
+  NS as ɵNS,
   pb1 as ɵpb1,
   pb2 as ɵpb2,
   pb3 as ɵpb3,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 19929ac932..fd08cc9a0f 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -54,6 +54,11 @@ export {
   elementStyle as s,
   elementStyleNamed as sn,
 
+  namespace as N,
+  namespaceHTML as NH,
+  namespaceMathML as NM,
+  namespaceSVG as NS,
+
   listener as L,
   store as st,
   load as ld,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index e195770c05..c8efc2cbe3 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -496,6 +496,7 @@ export function renderEmbeddedTemplate<T>(
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
+    namespaceHTML();
     tView.template !(rf, context);
     if (rf & RenderFlags.Update) {
       refreshView();
@@ -521,6 +522,7 @@ export function renderComponentOrTemplate<T>(
       rendererFactory.begin();
     }
     if (template) {
+      namespaceHTML();
       template(getRenderFlags(hostView), componentOrContext !);
       refreshView();
     } else {
@@ -2186,6 +2188,7 @@ export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode
   const template = hostView.tView.template !;
 
   try {
+    namespaceHTML();
     template(getRenderFlags(hostView), component);
     refreshView();
   } finally {
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 8a2c2c97c0..79c48eea7a 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -545,6 +545,9 @@
   {
     "name": "markViewDirty"
   },
+  {
+    "name": "namespaceHTML"
+  },
   {
     "name": "notImplemented"
   },
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index 1155b8b229..aacdf0a3bf 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -55,6 +55,44 @@ describe('elements', () => {
         .toEqual('<div class="my-app" title="Hello">Hello <b>World</b>!</div>');
   });
 
+  it('should translate DOM structure with SVG', () => {
+    type $MyComponent$ = MyComponent;
+
+    // Important: keep arrays outside of function to not create new instances.
+    const $e0_attrs$ = ['class', 'my-app', 'title', 'Hello'];
+    const $e2_attrs$ = ['cx', '50', 'cy', '100', 'r', '25'];
+
+    @Component({
+      selector: 'my-component',
+      template:
+          `<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"/></svg></div>`
+    })
+    class MyComponent {
+      // NORMATIVE
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyComponent,
+        selectors: [['my-component']],
+        factory: () => new MyComponent(),
+        template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div', $e0_attrs$);
+            $r3$.ɵNS();
+            $r3$.ɵE(1, 'svg');
+            $r3$.ɵEe(2, 'circle', $e2_attrs$);
+            $r3$.ɵe();
+            $r3$.ɵNH();
+            $r3$.ɵe();
+          }
+        }
+      });
+      // /NORMATIVE
+    }
+
+    expect(toHtml(renderComponent(MyComponent)))
+        .toEqual(
+            '<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"></circle></svg></div>');
+  });
+
   it('should support local refs', () => {
     type $LocalRefComp$ = LocalRefComp;
 
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index 26c198b24c..f3ab25ad1d 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -133,6 +133,57 @@ describe('template variables', () => {
     expect(toHtml(renderComponent(MyComponent))).toEqual('<ul></ul>');
   });
 
+  it('should support a let variable and reference inside of SVG', () => {
+    type $MyComponent$ = MyComponent;
+    const $_c0$ = ['for', '', 'forOf', ''];
+
+    interface Item {
+      name: number;
+    }
+
+    @Component({
+      selector: 'my-component',
+      template: `<svg><g *for="let item of items"><circle></circle></g></svg>`
+    })
+    class MyComponent {
+      items = [{data: 42}, {data: 42}];
+
+      // NORMATIVE
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyComponent,
+        selectors: [['my-component']],
+        factory: function MyComponent_Factory() { return new MyComponent(); },
+        template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
+          if (rf & 1) {
+            $r3$.ɵNS();
+            $r3$.ɵE(0, 'svg');
+            $r3$.ɵC(1, MyComponent__svg_g_Template_1, null, $_c0$);
+            $r3$.ɵe();
+          }
+          if (rf & 2) {
+            $r3$.ɵp(1, 'forOf', $r3$.ɵb(ctx.items));
+          }
+          function MyComponent__svg_g_Template_1(rf: $RenderFlags$, ctx0: $MyComponent$) {
+            if (rf & 1) {
+              $r3$.ɵE(0, 'g');
+              $r3$.ɵEe(1, 'circle');
+              $r3$.ɵe();
+            }
+          }
+        }
+      });
+      // /NORMATIVE
+    }
+
+    // NON-NORMATIVE
+    (MyComponent.ngComponentDef as ComponentDef<any>).directiveDefs =
+        [ForOfDirective.ngDirectiveDef];
+    // /NON-NORMATIVE
+
+    // TODO(chuckj): update when the changes to enable ngForOf lands.
+    expect(toHtml(renderComponent(MyComponent))).toEqual('<svg></svg>');
+  });
+
   it('should support accessing parent template variables', () => {
     type $MyComponent$ = MyComponent;
 

From acf270d724ce0b229bc5410b3344b142efb61a1a Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 1 Jun 2018 16:00:51 -0700
Subject: [PATCH 207/582] feat(ivy): added new namespace and element
 instructions to JIT environment (#23899)

PR Close #23899
---
 .../compiler/src/render3/view/compiler.ts     |  5 +-
 .../compiler/src/render3/view/template.ts     | 45 +++++++-------
 .../render3/r3_compiler_compliance_spec.ts    | 61 +++++++++++++++++--
 .../core/src/core_render3_private_export.ts   |  1 -
 packages/core/src/render3/STATUS.md           |  2 +-
 packages/core/src/render3/di.ts               |  4 +-
 packages/core/src/render3/index.ts            |  1 -
 packages/core/src/render3/instructions.ts     | 31 +++++-----
 packages/core/src/render3/interfaces/node.ts  |  4 +-
 packages/core/src/render3/jit/environment.ts  |  4 ++
 .../core/src/render3/node_selector_matcher.ts |  6 +-
 .../template_variables_spec.ts                |  3 +-
 packages/core/test/render3/content_spec.ts    |  2 +-
 packages/core/test/render3/di_spec.ts         |  4 +-
 packages/core/test/render3/directive_spec.ts  |  8 +--
 .../core/test/render3/instructions_spec.ts    | 12 ++--
 .../render3/node_selector_matcher_spec.ts     |  6 +-
 packages/core/test/render3/query_spec.ts      |  2 +-
 18 files changed, 126 insertions(+), 75 deletions(-)

diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index a057d83826..d830630418 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -136,7 +136,8 @@ export function compileComponentFromMetadata(
   const templateFunctionExpression =
       new TemplateDefinitionBuilder(
           constantPool, CONTEXT_NAME, BindingScope.ROOT_SCOPE, 0, templateTypeName, templateName,
-          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed)
+          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed,
+          R3.namespaceHTML)
           .buildTemplateFunction(
               template.nodes, [], template.hasNgContent, template.ngContentSelectors);
 
@@ -443,4 +444,4 @@ function typeMapToExpressionMap(
   const entries = Array.from(map).map(
       ([key, type]): [string, o.Expression] => [key, outputCtx.importExpr(type)]);
   return new Map(entries);
-}
\ No newline at end of file
+}
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 9d7a7163d4..a445fe1b11 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -18,8 +18,8 @@ import * as html from '../../ml_parser/ast';
 import {HtmlParser} from '../../ml_parser/html_parser';
 import {WhitespaceVisitor} from '../../ml_parser/html_whitespaces';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
+import {splitNsName} from '../../ml_parser/tags';
 import * as o from '../../output/output_ast';
-import {ExternalReference} from '../../output/output_ast';
 import {ParseError, ParseSourceSpan} from '../../parse_util';
 import {DomElementSchemaRegistry} from '../../schema/dom_element_schema_registry';
 import {CssSelector, SelectorMatcher} from '../../selector';
@@ -52,7 +52,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private _valueConverter: ValueConverter;
   private _unsupported = unsupported;
   private _bindingScope: BindingScope;
-  private _namespace = R3.namespaceHTML;
 
   // Whether we are inside a translatable element (`<p i18n>... somewhere here ... </p>)
   private _inI18nSection: boolean = false;
@@ -68,7 +67,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       parentBindingScope: BindingScope, private level = 0, private contextName: string|null,
       private templateName: string|null, private viewQueries: R3QueryMetadata[],
       private directiveMatcher: SelectorMatcher|null, private directives: Set<o.Expression>,
-      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>) {
+      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>,
+      private _namespace: o.ExternalReference) {
     this._bindingScope =
         parentBindingScope.nestedScope((lhsVar: o.ReadVarExpr, expression: o.Expression) => {
           this._bindingCode.push(
@@ -91,6 +91,10 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   buildTemplateFunction(
       nodes: t.Node[], variables: t.Variable[], hasNgContent: boolean = false,
       ngContentSelectors: string[] = []): o.FunctionExpr {
+    if (this._namespace !== R3.namespaceHTML) {
+      this.instruction(this._creationCode, null, this._namespace);
+    }
+
     // Create variable bindings
     for (const variable of variables) {
       const variableName = variable.name;
@@ -224,20 +228,20 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
   /**
    * Gets the namespace instruction function based on the current element
-   * @param ivyElementName An system element name, can include colons like :svg:svg
+   * @param namespaceKey A system key for a namespace (e.g. 'svg' or 'math')
    */
-  getNamespaceInstruction(ivyElementName: string) {
-    switch (ivyElementName) {
-      case ':svg:svg':
+  getNamespaceInstruction(namespaceKey: string|null) {
+    switch (namespaceKey) {
+      case 'svg':
         return R3.namespaceSVG;
-      case ':math:math':
+      case 'math':
         return R3.namespaceMathML;
       default:
-        return this._namespace;
+        return R3.namespaceHTML;
     }
   }
 
-  addNamespaceInstruction(nsInstruction: ExternalReference, element: t.Element) {
+  addNamespaceInstruction(nsInstruction: o.ExternalReference, element: t.Element) {
     this._namespace = nsInstruction;
     this.instruction(this._creationCode, element.sourceSpan, nsInstruction);
   }
@@ -249,7 +253,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const outputAttrs: {[name: string]: string} = {};
     const attrI18nMetas: {[name: string]: string} = {};
-    let i18nMeta: string = '';
+    let i18nMeta = '';
+
+    const [namespaceKey, elementName] = splitNsName(element.name);
 
     // Elements inside i18n sections are replaced with placeholders
     // TODO(vicb): nested elements are a WIP in this phase
@@ -291,7 +297,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Element creation mode
     const parameters: o.Expression[] = [
       o.literal(elementIndex),
-      o.literal(element.name),
+      o.literal(elementName),
     ];
 
     // Add the attributes
@@ -343,7 +349,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     const implicit = o.variable(CONTEXT_NAME);
 
     const wasInNamespace = this._namespace;
-    const currentNamespace = this.getNamespaceInstruction(element.name);
+    const currentNamespace = this.getNamespaceInstruction(namespaceKey);
+
     // If the namespace is changing now, include an instruction to change it
     // during element creation.
     if (currentNamespace !== wasInNamespace) {
@@ -359,14 +366,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           this._creationCode, element.sourceSpan, R3.elementStart,
           ...trimTrailingNulls(parameters));
 
-      // If the element happens to be an SVG <foreignObject>, we need to switch
-      // to the HTML namespace inside of it
-      if (element.name === ':svg:foreignObject') {
-        // NOTE(benlesh): this may cause extremem corner-case bugs if someone was to do something
-        //   like <math>...<foreignObject></foreignObject>...</math>.
-        this.addNamespaceInstruction(R3.namespaceHTML, element);
-      }
-
       // Generate Listeners (outputs)
       element.outputs.forEach((outputAst: t.BoundEvent) => {
         const elName = sanitizeIdentifier(element.name);
@@ -423,7 +422,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
-    this._namespace = wasInNamespace;
   }
 
   visitTemplate(template: t.Template) {
@@ -484,7 +482,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Create the template function
     const templateVisitor = new TemplateDefinitionBuilder(
         this.constantPool, templateContext, this._bindingScope, this.level + 1, contextName,
-        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes);
+        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes,
+        this._namespace);
     const templateFunctionExpr =
         templateVisitor.buildTemplateFunction(template.children, template.variables);
     this._postfixCode.push(templateFunctionExpr.toDeclStmt(templateName, null));
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 322af1a50c..54b504383a 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -95,8 +95,8 @@ describe('compiler compliance', () => {
           if (rf & 1) {
             $r3$.ɵE(0, 'div', $e0_attrs$);
             $r3$.ɵNS();
-            $r3$.ɵE(1, ':svg:svg');
-            $r3$.ɵEe(2, ':svg:circle', $e2_attrs$);
+            $r3$.ɵE(1, 'svg');
+            $r3$.ɵEe(2, 'circle', $e2_attrs$);
             $r3$.ɵe();
             $r3$.ɵe();
           }
@@ -110,6 +110,54 @@ describe('compiler compliance', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
+    it('should enter and leave the SVG namespace appropriately', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+
+              @Component({
+                selector: 'my-component',
+                template: \`<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"/></svg><p>TEST 2</p></div>\`
+              })
+              export class MyComponent {}
+
+              @NgModule({declarations: [MyComponent]})
+              export class MyModule {}
+          `
+        }
+      };
+
+      // The factory should look like this:
+      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
+
+      // The template should look like this (where IDENT is a wild card for an identifier):
+      const template = `
+        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
+        …
+        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div', $e0_attrs$);
+              $r3$.ɵNS();
+              $r3$.ɵE(1, 'svg');
+                $r3$.ɵEe(2, 'circle', $e2_attrs$);
+              $r3$.ɵe();
+              $r3$.ɵNH();
+              $r3$.ɵE(3, 'p');
+                $r3$.ɵT(4, 'TEST 2');
+              $r3$.ɵe();
+            $r3$.ɵe();
+          }
+        }
+      `;
+
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, factory, 'Incorrect factory');
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+
     it('should bind to element properties', () => {
       const files = {
         app: {
@@ -1274,7 +1322,7 @@ describe('compiler compliance', () => {
         expectEmit(source, MyComponentDefinition, 'Invalid component definition');
       });
 
-      it('should support a let variable and reference for SVG', () => {
+      it('should support embedded views in the SVG namespace', () => {
         const files = {
           app: {
             ...shared,
@@ -1321,15 +1369,16 @@ describe('compiler compliance', () => {
             template: function MyComponent_Template(rf:IDENT,ctx:IDENT){
               if (rf & 1) {
                 $r3$.ɵNS();
-                $r3$.ɵE(0,':svg:svg');
+                $r3$.ɵE(0,'svg');
                 $r3$.ɵC(1,MyComponent__svg_g_Template_1,null,$_c0$);
                 $r3$.ɵe();
               }
               if (rf & 2) { $r3$.ɵp(1,'forOf',$r3$.ɵb(ctx.items)); }
               function MyComponent__svg_g_Template_1(rf:IDENT,ctx0:IDENT) {
                 if (rf & 1) {
-                  $r3$.ɵE(0,':svg:g');
-                  $r3$.ɵEe(1,':svg:circle');
+                  $r3$.ɵNS();
+                  $r3$.ɵE(0,'g');
+                  $r3$.ɵEe(1,'circle');
                   $r3$.ɵe();
                 }
               }
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 0be275e0b1..c6e22fa8f5 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -45,7 +45,6 @@ export {
   i7 as ɵi7,
   i8 as ɵi8,
   iV as ɵiV,
-  N as ɵN,
   NH as ɵNH,
   NM as ɵNM,
   NS as ɵNS,
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 8209be7c33..cf29f3dd99 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -150,7 +150,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |
-| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ❌      |
+| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ✅      |
 | `<img src=[userData]>` sanitization         |  ❌     |  ❌      |  ❌      |
 | `<div (nocd.click)>`                        |  ❌     |  ❌      |  ❌      |
 | `<div (bubble.click)>`                      |  ❌     |  ❌      |  ❌      |
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 168507bdb5..8a2e17e35f 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -261,8 +261,8 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
       let attrName = attrs[i];
-      if (attrName === AttributeMarker.SELECT_ONLY) break;
-      if (attrName === AttributeMarker.NAMESPACE_URI) {
+      if (attrName === AttributeMarker.SelectOnly) break;
+      if (attrName === AttributeMarker.NamespaceUri) {
         attrName = attrs[i += 2];
       }
       if (attrName == attrNameToInject) {
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index fd08cc9a0f..c88d6334b2 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -54,7 +54,6 @@ export {
   elementStyle as s,
   elementStyleNamed as sn,
 
-  namespace as N,
   namespaceHTML as NH,
   namespaceMathML as NM,
   namespaceSVG as NS,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index c8efc2cbe3..9991d5bc92 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -560,15 +560,6 @@ function getRenderFlags(view: LView): RenderFlags {
 //////////////////////////
 let _currentNamespace: string|null = null;
 
-/**
- * Sets the namespace URI that will be used to create elements in {@link element}
- * and {@link elementStart}
- * @param uri the full namespaceUri
- */
-export function namespace(uri: string | null) {
-  _currentNamespace = uri;
-}
-
 /**
  * Sets the current namespace URI to null, meaning createElement (not createElementNS)
  * will be used to create elements in {@link element} and {@link elementStart}
@@ -617,9 +608,17 @@ export function elementStart(
 
   ngDevMode && ngDevMode.rendererCreateElement++;
 
-  const native: RElement = _currentNamespace === null || isProceduralRenderer(renderer) ?
-      renderer.createElement(name) :
-      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNamespace, name);
+  let native: RElement;
+
+  if (isProceduralRenderer(renderer)) {
+    native = renderer.createElement(name, _currentNamespace);
+  } else {
+    if (_currentNamespace === null) {
+      native = renderer.createElement(name);
+    } else {
+      native = renderer.createElementNS(_currentNamespace, name);
+    }
+  }
 
   ngDevMode && assertDataInRange(index - 1);
 
@@ -861,7 +860,7 @@ function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
     let attrName = attrs[i];
-    if (attrName === AttributeMarker.NAMESPACE_URI) {
+    if (attrName === AttributeMarker.NamespaceUri) {
       const attrNS = attrs[i + 1] as string;
       attrName = attrs[i + 2] as string;
       const attrVal = attrs[i + 3] as string;
@@ -872,7 +871,7 @@ function setUpAttributes(native: RElement, attrs: TAttributes): void {
         native.setAttributeNS(attrNS, attrName, attrVal);
       }
     } else {
-      if (attrName === AttributeMarker.SELECT_ONLY) break;
+      if (attrName === AttributeMarker.SelectOnly) break;
       if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
         const attrVal = attrs[i + 1];
         ngDevMode && ngDevMode.rendererSetAttribute++;
@@ -1533,11 +1532,11 @@ function generateInitialInputs(
   const attrs = tNode.attrs !;
   for (let i = 0; i < attrs.length; i += 2) {
     const first = attrs[i];
-    const attrName = first === AttributeMarker.NAMESPACE_URI ? attrs[i += 2] : first;
+    const attrName = first === AttributeMarker.NamespaceUri ? attrs[i += 2] : first;
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
-    if (attrName === AttributeMarker.SELECT_ONLY) break;
+    if (attrName === AttributeMarker.SelectOnly) break;
     if (minifiedInputName !== undefined) {
       const inputsToStore: InitialInputs =
           initialInputData[directiveIndex] || (initialInputData[directiveIndex] = []);
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 2f3ac9585a..33dfe4940f 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -164,7 +164,7 @@ export const enum AttributeMarker {
    * Use the next value as the full namespaces URI, the values after that
    * are then the name and the value, respectively.
    */
-  NAMESPACE_URI = 0,  // namespace. Has to be repeated.
+  NamespaceUri = 0,  // namespace. Has to be repeated.
 
   /**
    * This marker indicates that the following attribute names were extracted from bindings (ex.:
@@ -172,7 +172,7 @@ export const enum AttributeMarker {
    * Taking the above bindings and outputs as an example an attributes array could look as follows:
    * ['class', 'fade in', AttributeMarker.SELECT_ONLY, 'foo', 'bar']
    */
-  SELECT_ONLY = 1
+  SelectOnly = 1
 }
 
 /**
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 4714697558..5ca7cda1e6 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -37,6 +37,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵcr': r3.cr,
   'ɵd': r3.d,
   'ɵE': r3.E,
+  'ɵEe': r3.Ee,
   'ɵe': r3.e,
   'ɵf0': r3.f0,
   'ɵf1': r3.f1,
@@ -60,6 +61,9 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵkn': r3.kn,
   'ɵL': r3.L,
   'ɵld': r3.ld,
+  'ɵNH': r3.NH,
+  'ɵNM': r3.NM,
+  'ɵNS': r3.NS,
   'ɵp': r3.p,
   'ɵpb1': r3.pb1,
   'ɵpb2': r3.pb2,
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 354ff7317f..79f3ad2190 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -41,7 +41,7 @@ export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boo
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
-  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SELECT_ONLY) : -1;
+  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SelectOnly) : -1;
 
   // When processing ":not" selectors, we skip to the next ":not" if the
   // current one doesn't match
@@ -107,11 +107,11 @@ function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
   if (attrs === null) return -1;
   for (let i = 0; i < attrs.length; i += step) {
     const attrName = attrs[i];
-    if (attrName === AttributeMarker.NAMESPACE_URI) {
+    if (attrName === AttributeMarker.NamespaceUri) {
       step = 2;
     } else if (attrName === name) {
       return i;
-    } else if (attrName === AttributeMarker.SELECT_ONLY) {
+    } else if (attrName === AttributeMarker.SelectOnly) {
       step = 1;
     }
   }
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index f3ab25ad1d..7e8aaee0e5 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -165,6 +165,7 @@ describe('template variables', () => {
           }
           function MyComponent__svg_g_Template_1(rf: $RenderFlags$, ctx0: $MyComponent$) {
             if (rf & 1) {
+              $r3$.ɵNS();
               $r3$.ɵE(0, 'g');
               $r3$.ɵEe(1, 'circle');
               $r3$.ɵe();
@@ -180,7 +181,7 @@ describe('template variables', () => {
         [ForOfDirective.ngDirectiveDef];
     // /NON-NORMATIVE
 
-    // TODO(chuckj): update when the changes to enable ngForOf lands.
+    // TODO(benlesh): update when the changes to enable ngForOf lands.
     expect(toHtml(renderComponent(MyComponent))).toEqual('<svg></svg>');
   });
 
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 71d7dda90b..058be8ca4b 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -605,7 +605,7 @@ describe('content projection', () => {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'child');
           {
-            elementStart(1, 'span', [AttributeMarker.SELECT_ONLY, 'title']);
+            elementStart(1, 'span', [AttributeMarker.SelectOnly, 'title']);
             { text(2, 'Has title'); }
             elementEnd();
           }
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index ea3d413d31..9d46b94ab1 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1225,7 +1225,7 @@ describe('di', () => {
 
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SELECT_ONLY, 'nonExist']);
+          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SelectOnly, 'nonExist']);
           exist = injectAttribute('exist');
           nonExist = injectAttribute('nonExist');
         }
@@ -1243,7 +1243,7 @@ describe('di', () => {
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'div', [
-            'exist', 'existValue', AttributeMarker.SELECT_ONLY, 'binding1', 'nonExist', 'binding2'
+            'exist', 'existValue', AttributeMarker.SelectOnly, 'binding1', 'nonExist', 'binding2'
           ]);
           exist = injectAttribute('exist');
           nonExist = injectAttribute('nonExist');
diff --git a/packages/core/test/render3/directive_spec.ts b/packages/core/test/render3/directive_spec.ts
index 58f0c22349..3dde1057d9 100644
--- a/packages/core/test/render3/directive_spec.ts
+++ b/packages/core/test/render3/directive_spec.ts
@@ -34,7 +34,7 @@ describe('directive', () => {
       }
 
       function Template() {
-        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'dir']);
+        elementStart(0, 'span', [AttributeMarker.SelectOnly, 'dir']);
         elementEnd();
       }
 
@@ -82,7 +82,7 @@ describe('directive', () => {
        */
       function createTemplate() {
         // using 2 bindings to show example shape of attributes array
-        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'test', 'other']);
+        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SelectOnly, 'test', 'other']);
         elementEnd();
       }
 
@@ -132,7 +132,7 @@ describe('directive', () => {
          function createTemplate() {
            // putting name (test) in the "usual" value position
            elementStart(
-               0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'prop1', 'test', 'prop2']);
+               0, 'span', ['class', 'fade', AttributeMarker.SelectOnly, 'prop1', 'test', 'prop2']);
            elementEnd();
          }
 
@@ -168,7 +168,7 @@ describe('directive', () => {
        * <span (out)="someVar = true"></span>
        */
       function createTemplate() {
-        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'out']);
+        elementStart(0, 'span', [AttributeMarker.SelectOnly, 'out']);
         { listener('out', () => {}); }
         elementEnd();
       }
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 35ed8b3d5c..00da2cbf97 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -95,7 +95,7 @@ describe('instructions', () => {
     it('should use sanitizer function even on elements with namespaced attributes', () => {
       const t = new TemplateFixture(() => {
         element(0, 'div', [
-          AttributeMarker.NAMESPACE_URI,
+          AttributeMarker.NamespaceUri,
           'http://www.example.com/2004/test',
           'whatever',
           'abc',
@@ -445,7 +445,7 @@ describe('instructions', () => {
           'height',
           '300',
           // test:title="abc"
-          AttributeMarker.NAMESPACE_URI,
+          AttributeMarker.NamespaceUri,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -472,7 +472,7 @@ describe('instructions', () => {
           'id',
           'container',
           // test:title="abc"
-          AttributeMarker.NAMESPACE_URI,
+          AttributeMarker.NamespaceUri,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -492,19 +492,19 @@ describe('instructions', () => {
           'container',
 
           // NS1:title="abc"
-          AttributeMarker.NAMESPACE_URI,
+          AttributeMarker.NamespaceUri,
           'http://www.example.com/2014/test',
           'title',
           'abc',
 
           // NS1:whatever="wee"
-          AttributeMarker.NAMESPACE_URI,
+          AttributeMarker.NamespaceUri,
           'http://www.example.com/2014/test',
           'whatever',
           'wee',
 
           // NS2:shazbot="wocka wocka"
-          AttributeMarker.NAMESPACE_URI,
+          AttributeMarker.NamespaceUri,
           'http://www.whatever.com/2016/blah',
           'shazbot',
           'wocka wocka',
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 3a143bcadf..0011c732d6 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -179,14 +179,14 @@ describe('css selector matching', () => {
       });
 
       it('should take optional binding attribute names into account', () => {
-        expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
+        expect(isMatching('span', [AttributeMarker.SelectOnly, 'directive'], [
           '', 'directive', ''
         ])).toBeTruthy(`Selector '[directive]' should match <span [directive]="exp">`);
       });
 
       it('should not match optional binding attribute names if attribute selector has value',
          () => {
-           expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
+           expect(isMatching('span', [AttributeMarker.SelectOnly, 'directive'], [
              '', 'directive', 'value'
            ])).toBeFalsy(`Selector '[directive=value]' should not match <span [directive]="exp">`);
          });
@@ -194,7 +194,7 @@ describe('css selector matching', () => {
       it('should not match optional binding attribute names if attribute selector has value and next name equals to value',
          () => {
            expect(isMatching(
-                      'span', [AttributeMarker.SELECT_ONLY, 'directive', 'value'],
+                      'span', [AttributeMarker.SelectOnly, 'directive', 'value'],
                       ['', 'directive', 'value']))
                .toBeFalsy(
                    `Selector '[directive=value]' should not match <span [directive]="exp" [value]="otherExp">`);
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 7382fabfa3..cd4a3df46d 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -856,7 +856,7 @@ describe('query', () => {
                  }
                }, null, []);
 
-               container(5, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
+               container(5, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
              }
 
              if (rf & RenderFlags.Update) {

From 68d37ef0c1b8cfffcd5f7930f86ba4d4754324ce Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 4 Jun 2018 11:43:15 +0100
Subject: [PATCH 208/582] build(aio): ensure the correct decorator properties
 are merged (#24289)

Previously only the `description` and `usageNotes` were being copied over
from the call-member of the decorator interface. Important properties such
as `shortDescription` were missed.

These are now added and the code has been refactored to make it simpler and
clearer to update which properties get copied as the requirements change.

PR Close #24289
---
 .../transforms/angular-api-package/index.js   | 11 +++++++
 .../processors/mergeDecoratorDocs.js          |  8 +++--
 .../processors/mergeDecoratorDocs.spec.js     | 25 +++++++++------
 aio/tools/transforms/helpers/utils.js         | 16 +++++++++-
 aio/tools/transforms/helpers/utils.spec.js    | 32 ++++++++++++++++++-
 5 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index 6a9d64cbaa..6eef84a819 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -119,6 +119,17 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
   })
 
+  .config(function(mergeDecoratorDocs) {
+    mergeDecoratorDocs.propertiesToMerge = [
+      'shortDescription',
+      'description',
+      'security',
+      'deprecated',
+      'see',
+      'usageNotes',
+    ];
+  })
+
   .config(function(checkContentRules, EXPORT_DOC_TYPES) {
     // Min length rules
     const createMinLengthRule = require('./content-rules/minLength');
diff --git a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
index 86571ea5fa..b15b28bc98 100644
--- a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
+++ b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
@@ -1,3 +1,5 @@
+const {mergeProperties} = require('../../helpers/utils');
+
 /**
  * Decorators in the Angular code base are made up from three code items:
  *
@@ -47,6 +49,7 @@ module.exports = function mergeDecoratorDocs(log) {
   return {
     $runAfter: ['processing-docs'],
     $runBefore: ['docs-processed'],
+    propertiesToMerge: [],
     makeDecoratorCalls: [
       {type: '', description: 'toplevel', functionName: 'makeDecorator'},
       {type: 'Prop', description: 'property', functionName: 'makePropDecorator'},
@@ -55,6 +58,7 @@ module.exports = function mergeDecoratorDocs(log) {
     $process: function(docs) {
 
       var makeDecoratorCalls = this.makeDecoratorCalls;
+      var propertiesToMerge = this.propertiesToMerge;
       var docsToMerge = Object.create(null);
 
       docs.forEach(function(doc) {
@@ -88,9 +92,9 @@ module.exports = function mergeDecoratorDocs(log) {
           log.debug(
               'mergeDecoratorDocs: merging', doc.name, 'into', decoratorDoc.name,
               callMember.description.substring(0, 50));
+
           // Merge the documentation found in this call signature into the original decorator
-          decoratorDoc.description = callMember.description;
-          decoratorDoc.usageNotes = callMember.usageNotes;
+          mergeProperties(decoratorDoc, callMember, propertiesToMerge);
 
           // remove doc from its module doc's exports
           doc.moduleDoc.exports =
diff --git a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js
index 77b3f2593d..77bc9f8141 100644
--- a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.spec.js
@@ -9,17 +9,21 @@ describe('mergeDecoratorDocs processor', () => {
     const injector = dgeni.configureInjector();
     processor = injector.get('mergeDecoratorDocs');
 
+    // Note that we do not include usageNotes in the tests.
+    processor.propertiesToMerge = ['description', 'shortDescription'];
+
     moduleDoc = {};
 
     decoratorDoc = {
       name: 'Component',
       docType: 'const',
-      description: 'A description of the metadata for the Component decorator',
+      shortDescription: 'decorator - short description',
+      description: 'decorator - description',
       symbol: {
         valueDeclaration: { initializer: { expression: { text: 'makeDecorator' }, arguments: [{ text: 'X' }] } }
       },
       members: [
-        { name: 'templateUrl', description: 'A description of the templateUrl property' }
+        { name: 'templateUrl', description: 'templateUrl - description' }
       ],
       moduleDoc
     };
@@ -27,15 +31,15 @@ describe('mergeDecoratorDocs processor', () => {
     metadataDoc = {
       name: 'ComponentDecorator',
       docType: 'interface',
-      description: 'A description of the interface for the call signature for the Component decorator',
+      description: 'call interface - description',
       members: [
         {
           isCallMember: true,
-          description: 'The actual description of the call signature',
-          usageNotes: 'Use it like this...'
+          description: 'call interface - call member - description',
+          usageNotes: 'call interface - call member - usageNotes',
         },
         {
-          description: 'Some other member'
+          description: 'call interface - non call member - description'
         }
       ],
       moduleDoc
@@ -65,10 +69,13 @@ describe('mergeDecoratorDocs processor', () => {
     expect(decoratorDoc.decoratorType).toEqual('X');
   });
 
-  it('should copy across properties from the call signature doc', () => {
+  it('should copy across specified properties from the call signature doc', () => {
     processor.$process([decoratorDoc, metadataDoc, otherDoc]);
-    expect(decoratorDoc.description).toEqual('The actual description of the call signature');
-    expect(decoratorDoc.usageNotes).toEqual('Use it like this...');
+    expect(decoratorDoc.description).toEqual('call interface - call member - description');
+    // Since usageNotes is not in `propertiesToMerge` it will not get copied over in these tests.
+    expect(decoratorDoc.usageNotes).toBeUndefined();
+    // Since `shortDescription` does not exist on the call-member this will not get overridden.
+    expect(decoratorDoc.shortDescription).toEqual('decorator - short description');
   });
 
   it('should remove the metadataDoc from the module exports', () => {
diff --git a/aio/tools/transforms/helpers/utils.js b/aio/tools/transforms/helpers/utils.js
index 945a210eed..3ca5556beb 100644
--- a/aio/tools/transforms/helpers/utils.js
+++ b/aio/tools/transforms/helpers/utils.js
@@ -96,5 +96,19 @@ module.exports = {
       attrMap[key] === false ? '' :
       attrMap[key] === true ? ` ${key}` :
       ` ${key}="${attrMap[key].replace(/"/g, '&quot;')}"`).join('');
-  }
+  },
+
+  /**
+   * Merge the specified properties from the source to the target document
+   * @param {Document} target The document to receive the properties from the source
+   * @param {Document} source The document from which to get the properties to merge
+   * @param {string[]} properties A collection of the names of the properties to merge
+   */
+  mergeProperties(target, source, properties) {
+    properties.forEach(property => {
+      if (source.hasOwnProperty(property)) {
+        target[property] = source[property];
+      }
+    });
+  },
 };
diff --git a/aio/tools/transforms/helpers/utils.spec.js b/aio/tools/transforms/helpers/utils.spec.js
index 952336e92d..ee086b8374 100644
--- a/aio/tools/transforms/helpers/utils.spec.js
+++ b/aio/tools/transforms/helpers/utils.spec.js
@@ -1,4 +1,4 @@
-const { mapObject, parseAttributes, renderAttributes } = require('./utils');
+const { mergeProperties, mapObject, parseAttributes, renderAttributes } = require('./utils');
 
 describe('utils', () => {
   describe('mapObject', () => {
@@ -96,4 +96,34 @@ describe('utils', () => {
       expect(renderAttributes({ })).toEqual('');
     });
   });
+
+  describe('mergeProperties', () => {
+    it('should write specified properties from the source to the target', () => {
+      const source = { a: 1, b: 2, c: 3 };
+      const target = { };
+      mergeProperties(target, source, ['a', 'b']);
+      expect(target).toEqual({ a: 1, b: 2 });
+    });
+
+    it('should not overwrite target properties that are not specified', () => {
+      const source = { a: 1, b: 2, c: 3 };
+      const target = { b: 10 };
+      mergeProperties(target, source, ['a']);
+      expect(target).toEqual({ a: 1, b: 10 });
+    });
+
+    it('should not overwrite target properties that are specified but do not exist in the source', () => {
+      const source = { a: 1 };
+      const target = { b: 10 };
+      mergeProperties(target, source, ['a', 'b']);
+      expect(target).toEqual({ a: 1, b: 10 });
+    });
+
+    it('should overwrite target properties even if they are `undefined` in the source', () => {
+      const source = { a: undefined };
+      const target = { a: 10 };
+      mergeProperties(target, source, ['a']);
+      expect(target).toEqual({ a: undefined });
+    });
+  });
 });

From 700e55ce145db43593751431e8ca6e680116646d Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 6 Jun 2018 12:22:25 +0100
Subject: [PATCH 209/582] build(docs-infra): log warning rather than error if
 content errors are not fatal (#24320)

PR Close #24320
---
 .../processors/checkContentRules.js           |  5 ++-
 .../processors/checkContentRules.spec.js      | 42 ++++++++++++-------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/aio/tools/transforms/angular-base-package/processors/checkContentRules.js b/aio/tools/transforms/angular-base-package/processors/checkContentRules.js
index ae6f569ad1..148311b969 100644
--- a/aio/tools/transforms/angular-base-package/processors/checkContentRules.js
+++ b/aio/tools/transforms/angular-base-package/processors/checkContentRules.js
@@ -34,6 +34,7 @@ module.exports = function checkContentRules(log, createDocMessage) {
     $runAfter: ['tags-extracted'],
     $runBefore: ['processing-docs'],
     $process(docs) {
+      const logMessage = this.failOnContentErrors ? log.error.bind(log) : log.warn.bind(log);
       const errors = [];
       docs.forEach(doc => {
         const docErrors = [];
@@ -55,10 +56,10 @@ module.exports = function checkContentRules(log, createDocMessage) {
       });
 
       if (errors.length) {
-        log.error('Content contains errors');
+        logMessage('Content contains errors');
         errors.forEach(docError => {
           const errors = docError.errors.join('\n        ');
-          log.error(createDocMessage(errors + '\n        ', docError.doc));
+          logMessage(createDocMessage(errors + '\n        ', docError.doc));
         });
         if (this.failOnContentErrors) {
           throw new Error('Stopping due to content errors.');
diff --git a/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js b/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js
index a4ec18a16a..a5be9e5e59 100644
--- a/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js
+++ b/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js
@@ -67,10 +67,11 @@ describe('checkContentRules processor', function() {
     expect(descriptionSpy3).toHaveBeenCalledWith(docs[0], 'description', 'test doc 1');
   });
 
-  it('should log errors if the rule returns error messages', () => {
+  it('should log warnings if the rule returns error messages and `failOnContentErrors` is false', () => {
     const nameSpy1 = jasmine.createSpy('name 1').and.returnValue('name error message');
     const descriptionSpy1 = jasmine.createSpy('description 1').and.returnValue('description error message');
 
+    processor.failOnContentErrors = false;
     processor.docTypeRules = {
       'test1': {
         name: [nameSpy1],
@@ -85,6 +86,32 @@ describe('checkContentRules processor', function() {
 
     processor.$process(docs);
 
+    expect(logger.warn).toHaveBeenCalledTimes(2);
+    expect(logger.warn).toHaveBeenCalledWith('Content contains errors');
+    expect(logger.warn).toHaveBeenCalledWith(`name error message
+        description error message
+         - doc "test-1" (test1) `);
+  });
+
+  it('should log errors and then throw if `failOnContentErrors` is true and errors are found', () => {
+    const nameSpy1 = jasmine.createSpy('name 1').and.returnValue('name error message');
+    const descriptionSpy1 = jasmine.createSpy('description 1').and.returnValue('description error message');
+
+    processor.failOnContentErrors = true;
+    processor.docTypeRules = {
+      'test1': {
+        name: [nameSpy1],
+        description: [descriptionSpy1]
+      }
+    };
+
+    const docs = [
+      { docType: 'test1', description: 'test doc 1', name: 'test-1' },
+      { docType: 'test2', description: 'test doc 2', name: 'test-2' }
+    ];
+
+    expect(() => processor.$process(docs)).toThrowError('Stopping due to content errors.');
+
     expect(logger.error).toHaveBeenCalledTimes(2);
     expect(logger.error).toHaveBeenCalledWith('Content contains errors');
     expect(logger.error).toHaveBeenCalledWith(`name error message
@@ -92,17 +119,4 @@ describe('checkContentRules processor', function() {
          - doc "test-1" (test1) `);
   });
 
-  it('should throw an error if `failOnContentErrors` is true and errors are found', () => {
-    const errorRule = jasmine.createSpy('error rule').and.returnValue('some error');
-    processor.docTypeRules = {
-      'test': { description: [errorRule] }
-    };
-    processor.failOnContentErrors = true;
-
-    const docs = [
-      { docType: 'test', description: 'test doc' },
-    ];
-    expect(() => processor.$process(docs)).toThrowError('Stopping due to content errors.');
-  });
-
 });

From 47814b4cdf4c0e9e05aa23c68cc896f4d1d51c1c Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 11:49:25 -0700
Subject: [PATCH 210/582] release: cut the v6.0.4 release

---
 CHANGELOG.md | 43 +++++++++++++++++++++++++++++--------------
 package.json |  2 +-
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efd682c40f..185b5df20c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="6.0.4"></a>
+## [6.0.4](https://github.com/angular/angular/compare/6.0.3...6.0.4) (2018-06-06)
+
+
+### Bug Fixes
+
+* **animations:** Fix browser detection logic ([#24188](https://github.com/angular/angular/issues/24188)) ([c9eb491](https://github.com/angular/angular/commit/c9eb491))
+* **animations:** retain trigger-state for nodes that are moved around ([#24238](https://github.com/angular/angular/issues/24238)) ([19deca1](https://github.com/angular/angular/commit/19deca1))
+* **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([dc3e8aa](https://github.com/angular/angular/commit/dc3e8aa)), closes [#17195](https://github.com/angular/angular/issues/17195)
+* **platform-server:** avoid clash between server and client style encapsulation attributes ([#24158](https://github.com/angular/angular/issues/24158)) ([e9f2203](https://github.com/angular/angular/commit/e9f2203))
+* **platform-server:** avoid dependency cycle when using http interceptor ([#24229](https://github.com/angular/angular/issues/24229)) ([2991b1b](https://github.com/angular/angular/commit/2991b1b)), closes [#23023](https://github.com/angular/angular/issues/23023)
+* **platform-server:** don't reflect innerHTML property to attibute ([#24213](https://github.com/angular/angular/issues/24213)) ([c17098d](https://github.com/angular/angular/commit/c17098d)), closes [#19278](https://github.com/angular/angular/issues/19278)
+* **platform-server:** provide Domino DOM types globally ([#24116](https://github.com/angular/angular/issues/24116)) ([906b3ec](https://github.com/angular/angular/commit/906b3ec)), closes [#23280](https://github.com/angular/angular/issues/23280) [#23133](https://github.com/angular/angular/issues/23133)
+
+
 <a name="6.0.3"></a>
 ## [6.0.3](https://github.com/angular/angular/compare/6.0.2...6.0.3) (2018-05-22)
 
@@ -42,7 +57,7 @@
 
 Angular v6 is the first release of Angular that unifies the Framework, Material and CLI.
 
-To learn about the release highlights and our new CLI-powered update workflow for your projects please check out the [v6 release announcement](https://blog.angular.io/version-6-0-0-of-angular-now-available-cc56b0efa7a4). 
+To learn about the release highlights and our new CLI-powered update workflow for your projects please check out the [v6 release announcement](https://blog.angular.io/version-6-0-0-of-angular-now-available-cc56b0efa7a4).
 
 
 
@@ -193,10 +208,10 @@ To learn about the release highlights and our new CLI-powered update workflow fo
   This change removes support for `<template>`. `<ng-template>` should be used instead.
 
   BEFORE:
-  
+
       <!-- html template -->
       <template>some template content</template>
-  
+
       # tsconfig.json
       {
         # ...
@@ -206,12 +221,12 @@ To learn about the release highlights and our new CLI-powered update workflow fo
           "enableLegacyTemplate": [true|false]
         }
       }
-  
+
   AFTER:
-  
+
       <!-- html template -->
       <ng-template>some template content</ng-template>
-      
+
 * **core:** it is no longer possible to import animation-related functions from @angular/core. All animation symbols must now be imported from @angular/animations.
 
 
@@ -224,35 +239,35 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 
   Previously, ngModelChange was emitted before its underlying control was updated.
   This was fine if you passed through the value directly through the $event keyword, e.g.
-  
+
   ```
   <input [(ngModel)]="name" (ngModelChange)="onChange($event)">
-  
+
   onChange(value) {
      console.log(value);               // would log updated value
   }
   ```
-  
+
   However, if you had a handler for the ngModelChange event that checked the value through the control,
   you would get the old value rather than the updated value. e.g:
-  
+
   ```
   <input #modelDir="ngModel" [(ngModel)]="name" (ngModelChange)="onChange(modelDir)">
-  
+
   onChange(ngModel: NgModel) {
     console.log(ngModel.value);        // would log old value, not updated value
   }
   ```
-  
+
   Now the value and validity will be updated before the ngModelChange event is emitted,
   so the same setup will log the updated value.
-  
+
   ```
   onChange(ngModel: NgModel) {
      console.log(ngModel.value);       // will log updated value
   }
   ```
-  
+
   We think this order will be less confusing when the control is checked directly.
   You will only need to update your app if it has relied on this bug to keep track of the old control value.
   If that is the case, you should be able to track the old value directly by saving it on your component.
diff --git a/package.json b/package.json
index e2b2398ebb..2132c8abe0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 9dd647b0879544015dec14fc8f8d5ee1cc16066d Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:15:33 -0700
Subject: [PATCH 211/582] release: cut the v6.1.0-beta.0 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185b5df20c..617138e77f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,48 @@
+<a name="6.1.0-beta.0"></a>
+## [6.1.0-beta.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0-beta.0) (2018-06-06)
+
+
+### Bug Fixes
+
+* **animations:** do not throw errors when a destroyed component is animated ([#23836](https://github.com/angular/angular/issues/23836)) ([d2a8687](https://github.com/angular/angular/commit/d2a8687))
+* **animations:** Fix browser detection logic ([#24188](https://github.com/angular/angular/issues/24188)) ([b492b9e](https://github.com/angular/angular/commit/b492b9e))
+* **animations:** properly clean up queried element styles in safari/edge ([#23633](https://github.com/angular/angular/issues/23633)) ([da9ff25](https://github.com/angular/angular/commit/da9ff25))
+* **animations:** retain state styling for nodes that are moved around ([#23534](https://github.com/angular/angular/issues/23534)) ([65211f4](https://github.com/angular/angular/commit/65211f4))
+* **animations:** retain trigger-state for nodes that are moved around ([#24238](https://github.com/angular/angular/issues/24238)) ([8db928d](https://github.com/angular/angular/commit/8db928d))
+* **benchpress:** Fix promise chain in chrome_driver_extension. ([#23458](https://github.com/angular/angular/issues/23458)) ([d4b6c41](https://github.com/angular/angular/commit/d4b6c41))
+* **compiler:** avoid a crash in ngc-wrapped. ([#23468](https://github.com/angular/angular/issues/23468)) ([e1c4930](https://github.com/angular/angular/commit/e1c4930))
+* **compiler:** generate constant array for i18n attributes ([#23837](https://github.com/angular/angular/issues/23837)) ([cfde36d](https://github.com/angular/angular/commit/cfde36d))
+* **compiler:** generate core-compliant hostBindings property ([#24087](https://github.com/angular/angular/issues/24087)) ([01b5acd](https://github.com/angular/angular/commit/01b5acd)), closes [#24013](https://github.com/angular/angular/issues/24013)
+* **compiler:** handle undefined annotation metadata ([#23349](https://github.com/angular/angular/issues/23349)) ([ca776c5](https://github.com/angular/angular/commit/ca776c5))
+* **compiler-cli:** don't rely on incompatible TS method ([#23550](https://github.com/angular/angular/issues/23550)) ([b1f040f](https://github.com/angular/angular/commit/b1f040f))
+* **core:** avoid eager providers re-initialization ([#23559](https://github.com/angular/angular/issues/23559)) ([0c6dc45](https://github.com/angular/angular/commit/0c6dc45))
+* **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([fc03427](https://github.com/angular/angular/commit/fc03427)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
+* **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([b1cda36](https://github.com/angular/angular/commit/b1cda36))
+* **elements:** prevent closure renaming of platform properties ([#23843](https://github.com/angular/angular/issues/23843)) ([d4b8b24](https://github.com/angular/angular/commit/d4b8b24))
+* **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([9367e91](https://github.com/angular/angular/commit/9367e91)), closes [#17195](https://github.com/angular/angular/issues/17195)
+* **platform-server:** avoid clash between server and client style encapsulation attributes ([#24158](https://github.com/angular/angular/issues/24158)) ([b96a3c8](https://github.com/angular/angular/commit/b96a3c8))
+* **platform-server:** avoid dependency cycle when using http interceptor ([#24229](https://github.com/angular/angular/issues/24229)) ([60aa943](https://github.com/angular/angular/commit/60aa943)), closes [#23023](https://github.com/angular/angular/issues/23023)
+* **platform-server:** don't reflect innerHTML property to attibute ([#24213](https://github.com/angular/angular/issues/24213)) ([6a663a4](https://github.com/angular/angular/commit/6a663a4)), closes [#19278](https://github.com/angular/angular/issues/19278)
+* **platform-server:** provide Domino DOM types globally ([#24116](https://github.com/angular/angular/issues/24116)) ([c73196e](https://github.com/angular/angular/commit/c73196e)), closes [#23280](https://github.com/angular/angular/issues/23280) [#23133](https://github.com/angular/angular/issues/23133)
+* **router:** avoid freezing queryParams in-place ([#22663](https://github.com/angular/angular/issues/22663)) ([89f64e5](https://github.com/angular/angular/commit/89f64e5)), closes [#22617](https://github.com/angular/angular/issues/22617)
+* **router:** cache route handle if found ([#22475](https://github.com/angular/angular/issues/22475)) ([4cfa571](https://github.com/angular/angular/commit/4cfa571)), closes [#22474](https://github.com/angular/angular/issues/22474)
+* **router:** correct the segment parsing so it won't break on ampersand ([#23684](https://github.com/angular/angular/issues/23684)) ([553a680](https://github.com/angular/angular/commit/553a680))
+* **service-worker:** add badge to NOTIFICATION_OPTION_NAMES ([#23241](https://github.com/angular/angular/issues/23241)) ([fb59b2d](https://github.com/angular/angular/commit/fb59b2d)), closes [#23196](https://github.com/angular/angular/issues/23196)
+* **service-worker:** check platformBrowser before accessing navigator.serviceWorker ([#21231](https://github.com/angular/angular/issues/21231)) ([0bdd30e](https://github.com/angular/angular/commit/0bdd30e))
+* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([e0ed59e](https://github.com/angular/angular/commit/e0ed59e)), closes [#23526](https://github.com/angular/angular/issues/23526)
+* **service-worker:** deprecate `versionedFiles` in asset-group resources ([#23584](https://github.com/angular/angular/issues/23584)) ([1d378e2](https://github.com/angular/angular/commit/1d378e2))
+
+
+### Features
+
+* **compiler:** support `// ...` and `// TODO` in mock compiler expectations ([#23441](https://github.com/angular/angular/issues/23441)) ([c6b206e](https://github.com/angular/angular/commit/c6b206e))
+* **compiler-cli:** update `tsickle` to `0.29.x` ([#24233](https://github.com/angular/angular/issues/24233)) ([f69ac67](https://github.com/angular/angular/commit/f69ac67))
+* **platform-browser:** add HammerJS lazy-loader symbols to public API ([#23943](https://github.com/angular/angular/issues/23943)) ([26fbf1d](https://github.com/angular/angular/commit/26fbf1d))
+* **platform-browser:** allow lazy-loading HammerJS ([#23906](https://github.com/angular/angular/issues/23906)) ([313bdce](https://github.com/angular/angular/commit/313bdce))
+* **platform-server:** use EventManagerPlugin on the server ([#24132](https://github.com/angular/angular/issues/24132)) ([d6595eb](https://github.com/angular/angular/commit/d6595eb))
+* **router:** add navigation execution context info to activation hooks ([#24204](https://github.com/angular/angular/issues/24204)) ([20c463e](https://github.com/angular/angular/commit/20c463e)), closes [#24202](https://github.com/angular/angular/issues/24202)
+
+
 <a name="6.0.4"></a>
 ## [6.0.4](https://github.com/angular/angular/compare/6.0.3...6.0.4) (2018-06-06)
 
diff --git a/package.json b/package.json
index 2132c8abe0..a547b4ef29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.0.4",
+  "version": "6.1.0-beta.0",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 7e73287676affb603387e9aef132a6d93c89e44b Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:00 -0700
Subject: [PATCH 212/582] Revert "feat(ivy): added new namespace and element
 instructions to JIT environment (#23899)"

This reverts commit acf270d724ce0b229bc5410b3344b142efb61a1a.
---
 .../compiler/src/render3/view/compiler.ts     |  5 +-
 .../compiler/src/render3/view/template.ts     | 45 +++++++-------
 .../render3/r3_compiler_compliance_spec.ts    | 61 ++-----------------
 .../core/src/core_render3_private_export.ts   |  1 +
 packages/core/src/render3/STATUS.md           |  2 +-
 packages/core/src/render3/di.ts               |  4 +-
 packages/core/src/render3/index.ts            |  1 +
 packages/core/src/render3/instructions.ts     | 31 +++++-----
 packages/core/src/render3/interfaces/node.ts  |  4 +-
 packages/core/src/render3/jit/environment.ts  |  4 --
 .../core/src/render3/node_selector_matcher.ts |  6 +-
 .../template_variables_spec.ts                |  3 +-
 packages/core/test/render3/content_spec.ts    |  2 +-
 packages/core/test/render3/di_spec.ts         |  4 +-
 packages/core/test/render3/directive_spec.ts  |  8 +--
 .../core/test/render3/instructions_spec.ts    | 12 ++--
 .../render3/node_selector_matcher_spec.ts     |  6 +-
 packages/core/test/render3/query_spec.ts      |  2 +-
 18 files changed, 75 insertions(+), 126 deletions(-)

diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index d830630418..a057d83826 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -136,8 +136,7 @@ export function compileComponentFromMetadata(
   const templateFunctionExpression =
       new TemplateDefinitionBuilder(
           constantPool, CONTEXT_NAME, BindingScope.ROOT_SCOPE, 0, templateTypeName, templateName,
-          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed,
-          R3.namespaceHTML)
+          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed)
           .buildTemplateFunction(
               template.nodes, [], template.hasNgContent, template.ngContentSelectors);
 
@@ -444,4 +443,4 @@ function typeMapToExpressionMap(
   const entries = Array.from(map).map(
       ([key, type]): [string, o.Expression] => [key, outputCtx.importExpr(type)]);
   return new Map(entries);
-}
+}
\ No newline at end of file
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index a445fe1b11..9d7a7163d4 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -18,8 +18,8 @@ import * as html from '../../ml_parser/ast';
 import {HtmlParser} from '../../ml_parser/html_parser';
 import {WhitespaceVisitor} from '../../ml_parser/html_whitespaces';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
-import {splitNsName} from '../../ml_parser/tags';
 import * as o from '../../output/output_ast';
+import {ExternalReference} from '../../output/output_ast';
 import {ParseError, ParseSourceSpan} from '../../parse_util';
 import {DomElementSchemaRegistry} from '../../schema/dom_element_schema_registry';
 import {CssSelector, SelectorMatcher} from '../../selector';
@@ -52,6 +52,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private _valueConverter: ValueConverter;
   private _unsupported = unsupported;
   private _bindingScope: BindingScope;
+  private _namespace = R3.namespaceHTML;
 
   // Whether we are inside a translatable element (`<p i18n>... somewhere here ... </p>)
   private _inI18nSection: boolean = false;
@@ -67,8 +68,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       parentBindingScope: BindingScope, private level = 0, private contextName: string|null,
       private templateName: string|null, private viewQueries: R3QueryMetadata[],
       private directiveMatcher: SelectorMatcher|null, private directives: Set<o.Expression>,
-      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>,
-      private _namespace: o.ExternalReference) {
+      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>) {
     this._bindingScope =
         parentBindingScope.nestedScope((lhsVar: o.ReadVarExpr, expression: o.Expression) => {
           this._bindingCode.push(
@@ -91,10 +91,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   buildTemplateFunction(
       nodes: t.Node[], variables: t.Variable[], hasNgContent: boolean = false,
       ngContentSelectors: string[] = []): o.FunctionExpr {
-    if (this._namespace !== R3.namespaceHTML) {
-      this.instruction(this._creationCode, null, this._namespace);
-    }
-
     // Create variable bindings
     for (const variable of variables) {
       const variableName = variable.name;
@@ -228,20 +224,20 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
   /**
    * Gets the namespace instruction function based on the current element
-   * @param namespaceKey A system key for a namespace (e.g. 'svg' or 'math')
+   * @param ivyElementName An system element name, can include colons like :svg:svg
    */
-  getNamespaceInstruction(namespaceKey: string|null) {
-    switch (namespaceKey) {
-      case 'svg':
+  getNamespaceInstruction(ivyElementName: string) {
+    switch (ivyElementName) {
+      case ':svg:svg':
         return R3.namespaceSVG;
-      case 'math':
+      case ':math:math':
         return R3.namespaceMathML;
       default:
-        return R3.namespaceHTML;
+        return this._namespace;
     }
   }
 
-  addNamespaceInstruction(nsInstruction: o.ExternalReference, element: t.Element) {
+  addNamespaceInstruction(nsInstruction: ExternalReference, element: t.Element) {
     this._namespace = nsInstruction;
     this.instruction(this._creationCode, element.sourceSpan, nsInstruction);
   }
@@ -253,9 +249,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const outputAttrs: {[name: string]: string} = {};
     const attrI18nMetas: {[name: string]: string} = {};
-    let i18nMeta = '';
-
-    const [namespaceKey, elementName] = splitNsName(element.name);
+    let i18nMeta: string = '';
 
     // Elements inside i18n sections are replaced with placeholders
     // TODO(vicb): nested elements are a WIP in this phase
@@ -297,7 +291,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Element creation mode
     const parameters: o.Expression[] = [
       o.literal(elementIndex),
-      o.literal(elementName),
+      o.literal(element.name),
     ];
 
     // Add the attributes
@@ -349,8 +343,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     const implicit = o.variable(CONTEXT_NAME);
 
     const wasInNamespace = this._namespace;
-    const currentNamespace = this.getNamespaceInstruction(namespaceKey);
-
+    const currentNamespace = this.getNamespaceInstruction(element.name);
     // If the namespace is changing now, include an instruction to change it
     // during element creation.
     if (currentNamespace !== wasInNamespace) {
@@ -366,6 +359,14 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           this._creationCode, element.sourceSpan, R3.elementStart,
           ...trimTrailingNulls(parameters));
 
+      // If the element happens to be an SVG <foreignObject>, we need to switch
+      // to the HTML namespace inside of it
+      if (element.name === ':svg:foreignObject') {
+        // NOTE(benlesh): this may cause extremem corner-case bugs if someone was to do something
+        //   like <math>...<foreignObject></foreignObject>...</math>.
+        this.addNamespaceInstruction(R3.namespaceHTML, element);
+      }
+
       // Generate Listeners (outputs)
       element.outputs.forEach((outputAst: t.BoundEvent) => {
         const elName = sanitizeIdentifier(element.name);
@@ -422,6 +423,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
+    this._namespace = wasInNamespace;
   }
 
   visitTemplate(template: t.Template) {
@@ -482,8 +484,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Create the template function
     const templateVisitor = new TemplateDefinitionBuilder(
         this.constantPool, templateContext, this._bindingScope, this.level + 1, contextName,
-        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes,
-        this._namespace);
+        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes);
     const templateFunctionExpr =
         templateVisitor.buildTemplateFunction(template.children, template.variables);
     this._postfixCode.push(templateFunctionExpr.toDeclStmt(templateName, null));
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 54b504383a..322af1a50c 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -95,8 +95,8 @@ describe('compiler compliance', () => {
           if (rf & 1) {
             $r3$.ɵE(0, 'div', $e0_attrs$);
             $r3$.ɵNS();
-            $r3$.ɵE(1, 'svg');
-            $r3$.ɵEe(2, 'circle', $e2_attrs$);
+            $r3$.ɵE(1, ':svg:svg');
+            $r3$.ɵEe(2, ':svg:circle', $e2_attrs$);
             $r3$.ɵe();
             $r3$.ɵe();
           }
@@ -110,54 +110,6 @@ describe('compiler compliance', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
-    it('should enter and leave the SVG namespace appropriately', () => {
-      const files = {
-        app: {
-          'spec.ts': `
-              import {Component, NgModule} from '@angular/core';
-
-              @Component({
-                selector: 'my-component',
-                template: \`<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"/></svg><p>TEST 2</p></div>\`
-              })
-              export class MyComponent {}
-
-              @NgModule({declarations: [MyComponent]})
-              export class MyModule {}
-          `
-        }
-      };
-
-      // The factory should look like this:
-      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
-
-      // The template should look like this (where IDENT is a wild card for an identifier):
-      const template = `
-        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
-        …
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
-          if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$);
-              $r3$.ɵNS();
-              $r3$.ɵE(1, 'svg');
-                $r3$.ɵEe(2, 'circle', $e2_attrs$);
-              $r3$.ɵe();
-              $r3$.ɵNH();
-              $r3$.ɵE(3, 'p');
-                $r3$.ɵT(4, 'TEST 2');
-              $r3$.ɵe();
-            $r3$.ɵe();
-          }
-        }
-      `;
-
-
-      const result = compile(files, angularFiles);
-
-      expectEmit(result.source, factory, 'Incorrect factory');
-      expectEmit(result.source, template, 'Incorrect template');
-    });
-
     it('should bind to element properties', () => {
       const files = {
         app: {
@@ -1322,7 +1274,7 @@ describe('compiler compliance', () => {
         expectEmit(source, MyComponentDefinition, 'Invalid component definition');
       });
 
-      it('should support embedded views in the SVG namespace', () => {
+      it('should support a let variable and reference for SVG', () => {
         const files = {
           app: {
             ...shared,
@@ -1369,16 +1321,15 @@ describe('compiler compliance', () => {
             template: function MyComponent_Template(rf:IDENT,ctx:IDENT){
               if (rf & 1) {
                 $r3$.ɵNS();
-                $r3$.ɵE(0,'svg');
+                $r3$.ɵE(0,':svg:svg');
                 $r3$.ɵC(1,MyComponent__svg_g_Template_1,null,$_c0$);
                 $r3$.ɵe();
               }
               if (rf & 2) { $r3$.ɵp(1,'forOf',$r3$.ɵb(ctx.items)); }
               function MyComponent__svg_g_Template_1(rf:IDENT,ctx0:IDENT) {
                 if (rf & 1) {
-                  $r3$.ɵNS();
-                  $r3$.ɵE(0,'g');
-                  $r3$.ɵEe(1,'circle');
+                  $r3$.ɵE(0,':svg:g');
+                  $r3$.ɵEe(1,':svg:circle');
                   $r3$.ɵe();
                 }
               }
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index c6e22fa8f5..0be275e0b1 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -45,6 +45,7 @@ export {
   i7 as ɵi7,
   i8 as ɵi8,
   iV as ɵiV,
+  N as ɵN,
   NH as ɵNH,
   NM as ɵNM,
   NS as ɵNS,
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index cf29f3dd99..8209be7c33 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -150,7 +150,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |
-| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ✅      |
+| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ❌      |
 | `<img src=[userData]>` sanitization         |  ❌     |  ❌      |  ❌      |
 | `<div (nocd.click)>`                        |  ❌     |  ❌      |  ❌      |
 | `<div (bubble.click)>`                      |  ❌     |  ❌      |  ❌      |
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 8a2e17e35f..168507bdb5 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -261,8 +261,8 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
       let attrName = attrs[i];
-      if (attrName === AttributeMarker.SelectOnly) break;
-      if (attrName === AttributeMarker.NamespaceUri) {
+      if (attrName === AttributeMarker.SELECT_ONLY) break;
+      if (attrName === AttributeMarker.NAMESPACE_URI) {
         attrName = attrs[i += 2];
       }
       if (attrName == attrNameToInject) {
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index c88d6334b2..fd08cc9a0f 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -54,6 +54,7 @@ export {
   elementStyle as s,
   elementStyleNamed as sn,
 
+  namespace as N,
   namespaceHTML as NH,
   namespaceMathML as NM,
   namespaceSVG as NS,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 9991d5bc92..c8efc2cbe3 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -560,6 +560,15 @@ function getRenderFlags(view: LView): RenderFlags {
 //////////////////////////
 let _currentNamespace: string|null = null;
 
+/**
+ * Sets the namespace URI that will be used to create elements in {@link element}
+ * and {@link elementStart}
+ * @param uri the full namespaceUri
+ */
+export function namespace(uri: string | null) {
+  _currentNamespace = uri;
+}
+
 /**
  * Sets the current namespace URI to null, meaning createElement (not createElementNS)
  * will be used to create elements in {@link element} and {@link elementStart}
@@ -608,17 +617,9 @@ export function elementStart(
 
   ngDevMode && ngDevMode.rendererCreateElement++;
 
-  let native: RElement;
-
-  if (isProceduralRenderer(renderer)) {
-    native = renderer.createElement(name, _currentNamespace);
-  } else {
-    if (_currentNamespace === null) {
-      native = renderer.createElement(name);
-    } else {
-      native = renderer.createElementNS(_currentNamespace, name);
-    }
-  }
+  const native: RElement = _currentNamespace === null || isProceduralRenderer(renderer) ?
+      renderer.createElement(name) :
+      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNamespace, name);
 
   ngDevMode && assertDataInRange(index - 1);
 
@@ -860,7 +861,7 @@ function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
     let attrName = attrs[i];
-    if (attrName === AttributeMarker.NamespaceUri) {
+    if (attrName === AttributeMarker.NAMESPACE_URI) {
       const attrNS = attrs[i + 1] as string;
       attrName = attrs[i + 2] as string;
       const attrVal = attrs[i + 3] as string;
@@ -871,7 +872,7 @@ function setUpAttributes(native: RElement, attrs: TAttributes): void {
         native.setAttributeNS(attrNS, attrName, attrVal);
       }
     } else {
-      if (attrName === AttributeMarker.SelectOnly) break;
+      if (attrName === AttributeMarker.SELECT_ONLY) break;
       if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
         const attrVal = attrs[i + 1];
         ngDevMode && ngDevMode.rendererSetAttribute++;
@@ -1532,11 +1533,11 @@ function generateInitialInputs(
   const attrs = tNode.attrs !;
   for (let i = 0; i < attrs.length; i += 2) {
     const first = attrs[i];
-    const attrName = first === AttributeMarker.NamespaceUri ? attrs[i += 2] : first;
+    const attrName = first === AttributeMarker.NAMESPACE_URI ? attrs[i += 2] : first;
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
-    if (attrName === AttributeMarker.SelectOnly) break;
+    if (attrName === AttributeMarker.SELECT_ONLY) break;
     if (minifiedInputName !== undefined) {
       const inputsToStore: InitialInputs =
           initialInputData[directiveIndex] || (initialInputData[directiveIndex] = []);
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 33dfe4940f..2f3ac9585a 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -164,7 +164,7 @@ export const enum AttributeMarker {
    * Use the next value as the full namespaces URI, the values after that
    * are then the name and the value, respectively.
    */
-  NamespaceUri = 0,  // namespace. Has to be repeated.
+  NAMESPACE_URI = 0,  // namespace. Has to be repeated.
 
   /**
    * This marker indicates that the following attribute names were extracted from bindings (ex.:
@@ -172,7 +172,7 @@ export const enum AttributeMarker {
    * Taking the above bindings and outputs as an example an attributes array could look as follows:
    * ['class', 'fade in', AttributeMarker.SELECT_ONLY, 'foo', 'bar']
    */
-  SelectOnly = 1
+  SELECT_ONLY = 1
 }
 
 /**
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 5ca7cda1e6..4714697558 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -37,7 +37,6 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵcr': r3.cr,
   'ɵd': r3.d,
   'ɵE': r3.E,
-  'ɵEe': r3.Ee,
   'ɵe': r3.e,
   'ɵf0': r3.f0,
   'ɵf1': r3.f1,
@@ -61,9 +60,6 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵkn': r3.kn,
   'ɵL': r3.L,
   'ɵld': r3.ld,
-  'ɵNH': r3.NH,
-  'ɵNM': r3.NM,
-  'ɵNS': r3.NS,
   'ɵp': r3.p,
   'ɵpb1': r3.pb1,
   'ɵpb2': r3.pb2,
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 79f3ad2190..354ff7317f 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -41,7 +41,7 @@ export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boo
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
-  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SelectOnly) : -1;
+  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SELECT_ONLY) : -1;
 
   // When processing ":not" selectors, we skip to the next ":not" if the
   // current one doesn't match
@@ -107,11 +107,11 @@ function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
   if (attrs === null) return -1;
   for (let i = 0; i < attrs.length; i += step) {
     const attrName = attrs[i];
-    if (attrName === AttributeMarker.NamespaceUri) {
+    if (attrName === AttributeMarker.NAMESPACE_URI) {
       step = 2;
     } else if (attrName === name) {
       return i;
-    } else if (attrName === AttributeMarker.SelectOnly) {
+    } else if (attrName === AttributeMarker.SELECT_ONLY) {
       step = 1;
     }
   }
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index 7e8aaee0e5..f3ab25ad1d 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -165,7 +165,6 @@ describe('template variables', () => {
           }
           function MyComponent__svg_g_Template_1(rf: $RenderFlags$, ctx0: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵNS();
               $r3$.ɵE(0, 'g');
               $r3$.ɵEe(1, 'circle');
               $r3$.ɵe();
@@ -181,7 +180,7 @@ describe('template variables', () => {
         [ForOfDirective.ngDirectiveDef];
     // /NON-NORMATIVE
 
-    // TODO(benlesh): update when the changes to enable ngForOf lands.
+    // TODO(chuckj): update when the changes to enable ngForOf lands.
     expect(toHtml(renderComponent(MyComponent))).toEqual('<svg></svg>');
   });
 
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 058be8ca4b..71d7dda90b 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -605,7 +605,7 @@ describe('content projection', () => {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'child');
           {
-            elementStart(1, 'span', [AttributeMarker.SelectOnly, 'title']);
+            elementStart(1, 'span', [AttributeMarker.SELECT_ONLY, 'title']);
             { text(2, 'Has title'); }
             elementEnd();
           }
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 9d46b94ab1..ea3d413d31 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1225,7 +1225,7 @@ describe('di', () => {
 
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SelectOnly, 'nonExist']);
+          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SELECT_ONLY, 'nonExist']);
           exist = injectAttribute('exist');
           nonExist = injectAttribute('nonExist');
         }
@@ -1243,7 +1243,7 @@ describe('di', () => {
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'div', [
-            'exist', 'existValue', AttributeMarker.SelectOnly, 'binding1', 'nonExist', 'binding2'
+            'exist', 'existValue', AttributeMarker.SELECT_ONLY, 'binding1', 'nonExist', 'binding2'
           ]);
           exist = injectAttribute('exist');
           nonExist = injectAttribute('nonExist');
diff --git a/packages/core/test/render3/directive_spec.ts b/packages/core/test/render3/directive_spec.ts
index 3dde1057d9..58f0c22349 100644
--- a/packages/core/test/render3/directive_spec.ts
+++ b/packages/core/test/render3/directive_spec.ts
@@ -34,7 +34,7 @@ describe('directive', () => {
       }
 
       function Template() {
-        elementStart(0, 'span', [AttributeMarker.SelectOnly, 'dir']);
+        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'dir']);
         elementEnd();
       }
 
@@ -82,7 +82,7 @@ describe('directive', () => {
        */
       function createTemplate() {
         // using 2 bindings to show example shape of attributes array
-        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SelectOnly, 'test', 'other']);
+        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'test', 'other']);
         elementEnd();
       }
 
@@ -132,7 +132,7 @@ describe('directive', () => {
          function createTemplate() {
            // putting name (test) in the "usual" value position
            elementStart(
-               0, 'span', ['class', 'fade', AttributeMarker.SelectOnly, 'prop1', 'test', 'prop2']);
+               0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'prop1', 'test', 'prop2']);
            elementEnd();
          }
 
@@ -168,7 +168,7 @@ describe('directive', () => {
        * <span (out)="someVar = true"></span>
        */
       function createTemplate() {
-        elementStart(0, 'span', [AttributeMarker.SelectOnly, 'out']);
+        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'out']);
         { listener('out', () => {}); }
         elementEnd();
       }
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 00da2cbf97..35ed8b3d5c 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -95,7 +95,7 @@ describe('instructions', () => {
     it('should use sanitizer function even on elements with namespaced attributes', () => {
       const t = new TemplateFixture(() => {
         element(0, 'div', [
-          AttributeMarker.NamespaceUri,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2004/test',
           'whatever',
           'abc',
@@ -445,7 +445,7 @@ describe('instructions', () => {
           'height',
           '300',
           // test:title="abc"
-          AttributeMarker.NamespaceUri,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -472,7 +472,7 @@ describe('instructions', () => {
           'id',
           'container',
           // test:title="abc"
-          AttributeMarker.NamespaceUri,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -492,19 +492,19 @@ describe('instructions', () => {
           'container',
 
           // NS1:title="abc"
-          AttributeMarker.NamespaceUri,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'title',
           'abc',
 
           // NS1:whatever="wee"
-          AttributeMarker.NamespaceUri,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
           'whatever',
           'wee',
 
           // NS2:shazbot="wocka wocka"
-          AttributeMarker.NamespaceUri,
+          AttributeMarker.NAMESPACE_URI,
           'http://www.whatever.com/2016/blah',
           'shazbot',
           'wocka wocka',
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 0011c732d6..3a143bcadf 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -179,14 +179,14 @@ describe('css selector matching', () => {
       });
 
       it('should take optional binding attribute names into account', () => {
-        expect(isMatching('span', [AttributeMarker.SelectOnly, 'directive'], [
+        expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
           '', 'directive', ''
         ])).toBeTruthy(`Selector '[directive]' should match <span [directive]="exp">`);
       });
 
       it('should not match optional binding attribute names if attribute selector has value',
          () => {
-           expect(isMatching('span', [AttributeMarker.SelectOnly, 'directive'], [
+           expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
              '', 'directive', 'value'
            ])).toBeFalsy(`Selector '[directive=value]' should not match <span [directive]="exp">`);
          });
@@ -194,7 +194,7 @@ describe('css selector matching', () => {
       it('should not match optional binding attribute names if attribute selector has value and next name equals to value',
          () => {
            expect(isMatching(
-                      'span', [AttributeMarker.SelectOnly, 'directive', 'value'],
+                      'span', [AttributeMarker.SELECT_ONLY, 'directive', 'value'],
                       ['', 'directive', 'value']))
                .toBeFalsy(
                    `Selector '[directive=value]' should not match <span [directive]="exp" [value]="otherExp">`);
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index cd4a3df46d..7382fabfa3 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -856,7 +856,7 @@ describe('query', () => {
                  }
                }, null, []);
 
-               container(5, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
+               container(5, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
              }
 
              if (rf & RenderFlags.Update) {

From d96ae123b211fa89e4155001578eab12c21338b3 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:10 -0700
Subject: [PATCH 213/582] Revert "feat(ivy): SVG now handled by ivy compiler
 (#23899)"

This reverts commit 1007d1ad271566a8beabb2fcf234be393b3ce313.
---
 .../compiler/src/render3/r3_identifiers.ts    |   6 -
 .../compiler/src/render3/view/template.ts     |  42 +------
 .../render3/r3_compiler_compliance_spec.ts    | 116 ------------------
 .../core/src/core_render3_private_export.ts   |   4 -
 packages/core/src/render3/index.ts            |   5 -
 packages/core/src/render3/instructions.ts     |   3 -
 .../bundling/todo/bundle.golden_symbols.json  |   3 -
 .../compiler_canonical/elements_spec.ts       |  38 ------
 .../template_variables_spec.ts                |  51 --------
 9 files changed, 1 insertion(+), 267 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 57e4b5fb91..a37e2a7bdc 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -39,12 +39,6 @@ export class Identifiers {
 
   static bind: o.ExternalReference = {name: 'ɵb', moduleName: CORE};
 
-
-  static namespace: o.ExternalReference = {name: 'ɵN', moduleName: CORE};
-  static namespaceHTML: o.ExternalReference = {name: 'ɵNH', moduleName: CORE};
-  static namespaceMathML: o.ExternalReference = {name: 'ɵNM', moduleName: CORE};
-  static namespaceSVG: o.ExternalReference = {name: 'ɵNS', moduleName: CORE};
-
   static interpolation1: o.ExternalReference = {name: 'ɵi1', moduleName: CORE};
   static interpolation2: o.ExternalReference = {name: 'ɵi2', moduleName: CORE};
   static interpolation3: o.ExternalReference = {name: 'ɵi3', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 9d7a7163d4..49e593ba90 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -19,7 +19,6 @@ import {HtmlParser} from '../../ml_parser/html_parser';
 import {WhitespaceVisitor} from '../../ml_parser/html_whitespaces';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
 import * as o from '../../output/output_ast';
-import {ExternalReference} from '../../output/output_ast';
 import {ParseError, ParseSourceSpan} from '../../parse_util';
 import {DomElementSchemaRegistry} from '../../schema/dom_element_schema_registry';
 import {CssSelector, SelectorMatcher} from '../../selector';
@@ -52,7 +51,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private _valueConverter: ValueConverter;
   private _unsupported = unsupported;
   private _bindingScope: BindingScope;
-  private _namespace = R3.namespaceHTML;
 
   // Whether we are inside a translatable element (`<p i18n>... somewhere here ... </p>)
   private _inI18nSection: boolean = false;
@@ -222,26 +220,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     this.instruction(this._creationCode, ngContent.sourceSpan, R3.projection, ...parameters);
   }
 
-  /**
-   * Gets the namespace instruction function based on the current element
-   * @param ivyElementName An system element name, can include colons like :svg:svg
-   */
-  getNamespaceInstruction(ivyElementName: string) {
-    switch (ivyElementName) {
-      case ':svg:svg':
-        return R3.namespaceSVG;
-      case ':math:math':
-        return R3.namespaceMathML;
-      default:
-        return this._namespace;
-    }
-  }
-
-  addNamespaceInstruction(nsInstruction: ExternalReference, element: t.Element) {
-    this._namespace = nsInstruction;
-    this.instruction(this._creationCode, element.sourceSpan, nsInstruction);
-  }
-
   visitElement(element: t.Element) {
     const elementIndex = this.allocateDataSlot();
     const referenceDataSlots = new Map<string, number>();
@@ -337,20 +315,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this._creationCode.push(...i18nMessages);
     }
 
-    const isEmptyElement = element.children.length === 0 && element.outputs.length === 0;
+    const isEmptyElement = element.outputs.length === 0 && element.children.length === 0;
 
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    const wasInNamespace = this._namespace;
-    const currentNamespace = this.getNamespaceInstruction(element.name);
-    // If the namespace is changing now, include an instruction to change it
-    // during element creation.
-    if (currentNamespace !== wasInNamespace) {
-      this.addNamespaceInstruction(currentNamespace, element);
-    }
-
-
     if (isEmptyElement) {
       this.instruction(
           this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
@@ -359,14 +328,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           this._creationCode, element.sourceSpan, R3.elementStart,
           ...trimTrailingNulls(parameters));
 
-      // If the element happens to be an SVG <foreignObject>, we need to switch
-      // to the HTML namespace inside of it
-      if (element.name === ':svg:foreignObject') {
-        // NOTE(benlesh): this may cause extremem corner-case bugs if someone was to do something
-        //   like <math>...<foreignObject></foreignObject>...</math>.
-        this.addNamespaceInstruction(R3.namespaceHTML, element);
-      }
-
       // Generate Listeners (outputs)
       element.outputs.forEach((outputAst: t.BoundEvent) => {
         const elName = sanitizeIdentifier(element.name);
@@ -423,7 +384,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
-    this._namespace = wasInNamespace;
   }
 
   visitTemplate(template: t.Template) {
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 322af1a50c..74045c062b 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -66,50 +66,6 @@ describe('compiler compliance', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
-    it('should translate DOM structure for SVG', () => {
-      const files = {
-        app: {
-          'spec.ts': `
-              import {Component, NgModule} from '@angular/core';
-
-              @Component({
-                selector: 'my-component',
-                template: \`<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"/></svg></div>\`
-              })
-              export class MyComponent {}
-
-              @NgModule({declarations: [MyComponent]})
-              export class MyModule {}
-          `
-        }
-      };
-
-      // The factory should look like this:
-      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
-
-      // The template should look like this (where IDENT is a wild card for an identifier):
-      const template = `
-        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
-        …
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
-          if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$);
-            $r3$.ɵNS();
-            $r3$.ɵE(1, ':svg:svg');
-            $r3$.ɵEe(2, ':svg:circle', $e2_attrs$);
-            $r3$.ɵe();
-            $r3$.ɵe();
-          }
-        }
-      `;
-
-
-      const result = compile(files, angularFiles);
-
-      expectEmit(result.source, factory, 'Incorrect factory');
-      expectEmit(result.source, template, 'Incorrect template');
-    });
-
     it('should bind to element properties', () => {
       const files = {
         app: {
@@ -1274,78 +1230,6 @@ describe('compiler compliance', () => {
         expectEmit(source, MyComponentDefinition, 'Invalid component definition');
       });
 
-      it('should support a let variable and reference for SVG', () => {
-        const files = {
-          app: {
-            ...shared,
-            'spec.ts': `
-              import {Component, NgModule} from '@angular/core';
-              import {ForOfDirective} from './shared/for_of';
-
-              @Component({
-                selector: 'my-component',
-                template: \`<svg><g *for="let item of items"><circle></circle></g></svg>\`
-              })
-              export class MyComponent {
-                items = [{ data: 42 }, { data: 42 }];
-              }
-
-              @NgModule({
-                declarations: [MyComponent, ForOfDirective]
-              })
-              export class MyModule {}
-            `
-          }
-        };
-
-        // TODO(chuckj): Enforce this when the directives are specified
-        const ForDirectiveDefinition = `
-          static ngDirectiveDef = $r3$.ɵdefineDirective({
-            type: ForOfDirective,
-            selectors: [['', 'forOf', '']],
-            factory: function ForOfDirective_Factory() {
-              return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
-            },
-            features: [$r3$.ɵNgOnChangesFeature(NgForOf)],
-            inputs: {forOf: 'forOf'}
-          });
-        `;
-
-        const MyComponentDefinition = `
-          const $_c0$ = ['for','','forOf',''];
-          …
-          static ngComponentDef = $r3$.ɵdefineComponent({
-            type: MyComponent,
-            selectors: [['my-component']],
-            factory: function MyComponent_Factory() { return new MyComponent(); },
-            template: function MyComponent_Template(rf:IDENT,ctx:IDENT){
-              if (rf & 1) {
-                $r3$.ɵNS();
-                $r3$.ɵE(0,':svg:svg');
-                $r3$.ɵC(1,MyComponent__svg_g_Template_1,null,$_c0$);
-                $r3$.ɵe();
-              }
-              if (rf & 2) { $r3$.ɵp(1,'forOf',$r3$.ɵb(ctx.items)); }
-              function MyComponent__svg_g_Template_1(rf:IDENT,ctx0:IDENT) {
-                if (rf & 1) {
-                  $r3$.ɵE(0,':svg:g');
-                  $r3$.ɵEe(1,':svg:circle');
-                  $r3$.ɵe();
-                }
-              }
-            },
-            directives: [ForOfDirective]
-          });
-        `;
-
-        const result = compile(files, angularFiles);
-        const source = result.source;
-
-        // TODO(chuckj): Enforce this when the directives are specified
-        // expectEmit(source, ForDirectiveDefinition, 'Invalid directive definition');
-        expectEmit(source, MyComponentDefinition, 'Invalid component definition');
-      });
-
       it('should support accessing parent template variables', () => {
         const files = {
           app: {
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 0be275e0b1..edcd9abbf5 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -45,10 +45,6 @@ export {
   i7 as ɵi7,
   i8 as ɵi8,
   iV as ɵiV,
-  N as ɵN,
-  NH as ɵNH,
-  NM as ɵNM,
-  NS as ɵNS,
   pb1 as ɵpb1,
   pb2 as ɵpb2,
   pb3 as ɵpb3,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index fd08cc9a0f..19929ac932 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -54,11 +54,6 @@ export {
   elementStyle as s,
   elementStyleNamed as sn,
 
-  namespace as N,
-  namespaceHTML as NH,
-  namespaceMathML as NM,
-  namespaceSVG as NS,
-
   listener as L,
   store as st,
   load as ld,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index c8efc2cbe3..e195770c05 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -496,7 +496,6 @@ export function renderEmbeddedTemplate<T>(
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
-    namespaceHTML();
     tView.template !(rf, context);
     if (rf & RenderFlags.Update) {
       refreshView();
@@ -522,7 +521,6 @@ export function renderComponentOrTemplate<T>(
       rendererFactory.begin();
     }
     if (template) {
-      namespaceHTML();
       template(getRenderFlags(hostView), componentOrContext !);
       refreshView();
     } else {
@@ -2188,7 +2186,6 @@ export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode
   const template = hostView.tView.template !;
 
   try {
-    namespaceHTML();
     template(getRenderFlags(hostView), component);
     refreshView();
   } finally {
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 79c48eea7a..8a2c2c97c0 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -545,9 +545,6 @@
   {
     "name": "markViewDirty"
   },
-  {
-    "name": "namespaceHTML"
-  },
   {
     "name": "notImplemented"
   },
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index aacdf0a3bf..1155b8b229 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -55,44 +55,6 @@ describe('elements', () => {
         .toEqual('<div class="my-app" title="Hello">Hello <b>World</b>!</div>');
   });
 
-  it('should translate DOM structure with SVG', () => {
-    type $MyComponent$ = MyComponent;
-
-    // Important: keep arrays outside of function to not create new instances.
-    const $e0_attrs$ = ['class', 'my-app', 'title', 'Hello'];
-    const $e2_attrs$ = ['cx', '50', 'cy', '100', 'r', '25'];
-
-    @Component({
-      selector: 'my-component',
-      template:
-          `<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"/></svg></div>`
-    })
-    class MyComponent {
-      // NORMATIVE
-      static ngComponentDef = $r3$.ɵdefineComponent({
-        type: MyComponent,
-        selectors: [['my-component']],
-        factory: () => new MyComponent(),
-        template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
-          if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$);
-            $r3$.ɵNS();
-            $r3$.ɵE(1, 'svg');
-            $r3$.ɵEe(2, 'circle', $e2_attrs$);
-            $r3$.ɵe();
-            $r3$.ɵNH();
-            $r3$.ɵe();
-          }
-        }
-      });
-      // /NORMATIVE
-    }
-
-    expect(toHtml(renderComponent(MyComponent)))
-        .toEqual(
-            '<div class="my-app" title="Hello"><svg><circle cx="50" cy="100" r="25"></circle></svg></div>');
-  });
-
   it('should support local refs', () => {
     type $LocalRefComp$ = LocalRefComp;
 
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index f3ab25ad1d..26c198b24c 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -133,57 +133,6 @@ describe('template variables', () => {
     expect(toHtml(renderComponent(MyComponent))).toEqual('<ul></ul>');
   });
 
-  it('should support a let variable and reference inside of SVG', () => {
-    type $MyComponent$ = MyComponent;
-    const $_c0$ = ['for', '', 'forOf', ''];
-
-    interface Item {
-      name: number;
-    }
-
-    @Component({
-      selector: 'my-component',
-      template: `<svg><g *for="let item of items"><circle></circle></g></svg>`
-    })
-    class MyComponent {
-      items = [{data: 42}, {data: 42}];
-
-      // NORMATIVE
-      static ngComponentDef = $r3$.ɵdefineComponent({
-        type: MyComponent,
-        selectors: [['my-component']],
-        factory: function MyComponent_Factory() { return new MyComponent(); },
-        template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
-          if (rf & 1) {
-            $r3$.ɵNS();
-            $r3$.ɵE(0, 'svg');
-            $r3$.ɵC(1, MyComponent__svg_g_Template_1, null, $_c0$);
-            $r3$.ɵe();
-          }
-          if (rf & 2) {
-            $r3$.ɵp(1, 'forOf', $r3$.ɵb(ctx.items));
-          }
-          function MyComponent__svg_g_Template_1(rf: $RenderFlags$, ctx0: $MyComponent$) {
-            if (rf & 1) {
-              $r3$.ɵE(0, 'g');
-              $r3$.ɵEe(1, 'circle');
-              $r3$.ɵe();
-            }
-          }
-        }
-      });
-      // /NORMATIVE
-    }
-
-    // NON-NORMATIVE
-    (MyComponent.ngComponentDef as ComponentDef<any>).directiveDefs =
-        [ForOfDirective.ngDirectiveDef];
-    // /NON-NORMATIVE
-
-    // TODO(chuckj): update when the changes to enable ngForOf lands.
-    expect(toHtml(renderComponent(MyComponent))).toEqual('<svg></svg>');
-  });
-
   it('should support accessing parent template variables', () => {
     type $MyComponent$ = MyComponent;
 

From 355e0b058710438e440e573bff762512772ab205 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:11 -0700
Subject: [PATCH 214/582] Revert "test(ivy): update test that is flaky in IE
 (#23899)"

This reverts commit 51e9e64c5acd0ce024873ffa5a71fd0ca6db8232.
---
 packages/core/test/render3/instructions_spec.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 35ed8b3d5c..9aeade3a2f 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -497,6 +497,10 @@ describe('instructions', () => {
           'title',
           'abc',
 
+          // style="background: #dead11"
+          'style',
+          'background: #dead11',
+
           // NS1:whatever="wee"
           AttributeMarker.NAMESPACE_URI,
           'http://www.example.com/2014/test',
@@ -512,16 +516,19 @@ describe('instructions', () => {
       });
 
       const standardHTML =
-          '<div id="container" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
+          '<div id="container" title="abc" style="background: #dead11" whatever="wee" shazbot="wocka wocka"></div>';
+      const ieHTML =
+          '<div id="container" style="background: rgb(222, 173, 17);" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
 
-      expect(t.html).toEqual(standardHTML);
+      expect([standardHTML, ieHTML]).toContain(t.html);
 
       const div = t.hostElement.querySelector('#container');
-      expect(div !.attributes.length).toBe(4);
+      expect(div !.attributes.length).toBe(5);
 
       const expectedAttributes: {[key: string]: string} = {
         'id': 'container',
         'http://www.example.com/2014/test:title': 'abc',
+        'style': 'background: #dead11',
         'http://www.example.com/2014/test:whatever': 'wee',
         'http://www.whatever.com/2016/blah:shazbot': 'wocka wocka',
       };

From 8ac74da016c3fa76510fbfd668579e577f466de9 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:12 -0700
Subject: [PATCH 215/582] Revert "docs(ivy): update SVG status (#23899)"

This reverts commit 1915e47d1138d53a5dfd98028501540aca3868af.
---
 packages/core/src/render3/STATUS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 8209be7c33..944c91574f 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -150,7 +150,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |
-| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ❌      |
+| `<svg:g svg:p>`                             |  ❌     |  ❌      |  ❌      |
 | `<img src=[userData]>` sanitization         |  ❌     |  ❌      |  ❌      |
 | `<div (nocd.click)>`                        |  ❌     |  ❌      |  ❌      |
 | `<div (bubble.click)>`                      |  ❌     |  ❌      |  ❌      |

From 31988a6ff930c9e2666e2646f61a047e7f2f7615 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:12 -0700
Subject: [PATCH 216/582] Revert "test(ivy): add testing for namespaced
 attributes (#23899)"

This reverts commit e994b11105e3a2dcd02eb3432a53a44f50991fb8.
---
 packages/core/test/render3/instructions_spec.ts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 9aeade3a2f..32aa8fe6fc 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -521,22 +521,6 @@ describe('instructions', () => {
           '<div id="container" style="background: rgb(222, 173, 17);" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
 
       expect([standardHTML, ieHTML]).toContain(t.html);
-
-      const div = t.hostElement.querySelector('#container');
-      expect(div !.attributes.length).toBe(5);
-
-      const expectedAttributes: {[key: string]: string} = {
-        'id': 'container',
-        'http://www.example.com/2014/test:title': 'abc',
-        'style': 'background: #dead11',
-        'http://www.example.com/2014/test:whatever': 'wee',
-        'http://www.whatever.com/2016/blah:shazbot': 'wocka wocka',
-      };
-
-      Array.from(div !.attributes).forEach(attr => {
-        const key = attr.namespaceURI ? attr.namespaceURI + ':' + attr.name : attr.name;
-        expect(attr.value).toEqual(expectedAttributes[key]);
-      });
     });
   });
 });

From 24ab0a7db0dc1c1ba90bda714e96c55f391df3e4 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:13 -0700
Subject: [PATCH 217/582] Revert "refactor(ivy): clean up (#23899)"

This reverts commit 856ee734640ac1031603b66d61cc20d1d2373fe3.
---
 packages/compiler/src/render3/view/template.ts              | 6 +++---
 .../compiler/test/render3/r3_view_compiler_template_spec.ts | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 49e593ba90..607703732d 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -315,12 +315,12 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this._creationCode.push(...i18nMessages);
     }
 
-    const isEmptyElement = element.outputs.length === 0 && element.children.length === 0;
+    let isSelfClosingElement = element.outputs.length === 0 && element.children.length === 0;
 
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    if (isEmptyElement) {
+    if (isSelfClosingElement) {
       this.instruction(
           this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
     } else {
@@ -377,7 +377,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       t.visitAll(this, element.children);
     }
 
-    if (!isEmptyElement) {
+    if (!isSelfClosingElement) {
       // Finish element construction mode.
       this.instruction(
           this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
diff --git a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
index d4593cb197..86d96f9850 100644
--- a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
@@ -133,12 +133,15 @@ describe('compiler compliance: template', () => {
       };
 
       const template = `
+        // ...
         template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
           if (rf & 1) {
             $i0$.ɵEe(0,'div');
           }
         }`;
 
+      debugger;
+
       const result = compile(files, angularFiles);
 
       expectEmit(result.source, template, 'Incorrect template');

From c151f9cdc8a38ec1a5083b2e4f9e7e6318ef8227 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:17 -0700
Subject: [PATCH 218/582] Revert "refactor(ivy): rename setNS, setHtmlNS and
 friends to namespace, namespaceHTML, etc (#23899)"

This reverts commit 0d06c866c69bb9dec51c570afc2bd77977aacd23.
---
 packages/core/src/render3/instructions.ts     | 40 ++++++-------------
 .../bundling/todo/bundle.golden_symbols.json  |  2 +-
 .../core/test/render3/instructions_spec.ts    |  6 +--
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index e195770c05..f6fad80f48 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -556,38 +556,22 @@ function getRenderFlags(view: LView): RenderFlags {
 //////////////////////////
 //// Namespace
 //////////////////////////
-let _currentNamespace: string|null = null;
+let _currentNS: string|null = null;
 
-/**
- * Sets the namespace URI that will be used to create elements in {@link element}
- * and {@link elementStart}
- * @param uri the full namespaceUri
- */
-export function namespace(uri: string | null) {
-  _currentNamespace = uri;
+export function setNS(namespace: string) {
+  _currentNS = namespace;
 }
 
-/**
- * Sets the current namespace URI to null, meaning createElement (not createElementNS)
- * will be used to create elements in {@link element} and {@link elementStart}
- */
-export function namespaceHTML() {
-  _currentNamespace = null;
+export function setHtmlNS() {
+  _currentNS = null;
 }
 
-/**
- * Sets the current namespace URI to http://www.w3.org/2000/svg, which will be
- * used in conjunction with createElementNS in {@link element} and {@link elementStart}
- */
-export function namespaceSVG() {
-  _currentNamespace = 'http://www.w3.org/2000/svg';
+export function setSvgNS() {
+  _currentNS = 'http://www.w3.org/2000/svg';
 }
-/**
- * Sets the current namespace URI to http://www.w3.org/1998/Math/MathML, which will be
- * used in conjunction with createElementNS in {@link element} and {@link elementStart}
- */
-export function namespaceMathML() {
-  _currentNamespace = 'http://www.w3.org/1998/Math/MathML';
+
+export function setMathML() {
+  _currentNS = 'http://www.w3.org/1998/Math/MathML';
 }
 
 
@@ -615,9 +599,9 @@ export function elementStart(
 
   ngDevMode && ngDevMode.rendererCreateElement++;
 
-  const native: RElement = _currentNamespace === null || isProceduralRenderer(renderer) ?
+  const native: RElement = _currentNS === null || isProceduralRenderer(renderer) ?
       renderer.createElement(name) :
-      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNamespace, name);
+      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNS, name);
 
   ngDevMode && assertDataInRange(index - 1);
 
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 8a2c2c97c0..2b63963bd6 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -177,7 +177,7 @@
     "name": "_currentInjector"
   },
   {
-    "name": "_currentNamespace"
+    "name": "_currentNS"
   },
   {
     "name": "_devMode"
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 32aa8fe6fc..b7e79be99d 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, namespaceHTML, namespaceSVG, renderTemplate, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
 import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
@@ -433,7 +433,7 @@ describe('instructions', () => {
     it('should render SVG', () => {
       const t = new TemplateFixture(() => {
         elementStart(0, 'div', ['id', 'container']);
-        namespaceSVG();
+        setSvgNS();
         elementStart(1, 'svg', [
           // id="display"
           'id',
@@ -452,7 +452,7 @@ describe('instructions', () => {
         ]);
         element(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
         elementEnd();
-        namespaceHTML();
+        setHtmlNS();
         elementEnd();
       });
 

From 4f5b01a98ab299c740114a748c1861a6cc2fe03f Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:18 -0700
Subject: [PATCH 219/582] Revert "refactor(ivy): Use AttributeMarker instead of
 NS (#23899)"

This reverts commit 1208a35373f1ebf58f7512948c6f58d7d1a03570.
---
 packages/core/src/render3/di.ts               |  2 +-
 packages/core/src/render3/instructions.ts     |  5 +++--
 packages/core/src/render3/interfaces/node.ts  | 20 +++++++++++++------
 .../core/src/render3/node_selector_matcher.ts |  3 ++-
 .../core/test/render3/instructions_spec.ts    | 14 ++++++-------
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 168507bdb5..4cc09c5b2d 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -262,7 +262,7 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
     for (let i = 0; i < attrs.length; i = i + 2) {
       let attrName = attrs[i];
       if (attrName === AttributeMarker.SELECT_ONLY) break;
-      if (attrName === AttributeMarker.NAMESPACE_URI) {
+      if (attrName === 0) {  // NS.FULL
         attrName = attrs[i += 2];
       }
       if (attrName == attrNameToInject) {
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index f6fad80f48..30fcc1fe80 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -843,7 +843,8 @@ function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
     let attrName = attrs[i];
-    if (attrName === AttributeMarker.NAMESPACE_URI) {
+    if (attrName === 0) {  // NS.FULL
+      // Namespaced attribute
       const attrNS = attrs[i + 1] as string;
       attrName = attrs[i + 2] as string;
       const attrVal = attrs[i + 3] as string;
@@ -1515,7 +1516,7 @@ function generateInitialInputs(
   const attrs = tNode.attrs !;
   for (let i = 0; i < attrs.length; i += 2) {
     const first = attrs[i];
-    const attrName = first === AttributeMarker.NAMESPACE_URI ? attrs[i += 2] : first;
+    const attrName = first === 0 ? attrs[i += 2] : first;  // 0 = NS.FULL
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 2f3ac9585a..00ea8220a7 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -12,6 +12,18 @@ import {LQueries} from './query';
 import {RElement, RNode, RText} from './renderer';
 import {LView, TData, TView} from './view';
 
+
+/**
+ * Namespace attribute flags.
+ */
+export const enum NS {
+  /**
+   * Use the next value as the full namespaces URI, the values after that
+   * are then the name and the value, respectively.
+   */
+  FULL = 0,
+}
+
 /**
  * TNodeType corresponds to the TNode.type property. It contains information
  * on how to map a particular set of bits in LNode.flags to the node type.
@@ -160,11 +172,7 @@ export interface LProjectionNode extends LNode {
  * items are not regular attributes and the processing should be adapted accordingly.
  */
 export const enum AttributeMarker {
-  /**
-   * Use the next value as the full namespaces URI, the values after that
-   * are then the name and the value, respectively.
-   */
-  NAMESPACE_URI = 0,  // namespace. Has to be repeated.
+  NS = 0,  // namespace. Has to be repeated.
 
   /**
    * This marker indicates that the following attribute names were extracted from bindings (ex.:
@@ -180,7 +188,7 @@ export const enum AttributeMarker {
  * - attribute names and values
  * - special markers acting as flags to alter attributes processing.
  */
-export type TAttributes = (string | AttributeMarker)[];
+export type TAttributes = (string | AttributeMarker | NS)[];
 
 /**
  * LNode binding data (flyweight) for a particular node that is shared between all templates
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 354ff7317f..efba0295ee 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -107,7 +107,8 @@ function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
   if (attrs === null) return -1;
   for (let i = 0; i < attrs.length; i += step) {
     const attrName = attrs[i];
-    if (attrName === AttributeMarker.NAMESPACE_URI) {
+    if (attrName === 0) {
+      // NS.FULL
       step = 2;
     } else if (attrName === name) {
       return i;
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index b7e79be99d..237744cee4 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -11,7 +11,7 @@ import {NgForOfContext} from '@angular/common';
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
 import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
-import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
+import {LElementNode, LNode, NS} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -95,7 +95,7 @@ describe('instructions', () => {
     it('should use sanitizer function even on elements with namespaced attributes', () => {
       const t = new TemplateFixture(() => {
         element(0, 'div', [
-          AttributeMarker.NAMESPACE_URI,
+          NS.FULL,
           'http://www.example.com/2004/test',
           'whatever',
           'abc',
@@ -445,7 +445,7 @@ describe('instructions', () => {
           'height',
           '300',
           // test:title="abc"
-          AttributeMarker.NAMESPACE_URI,
+          NS.FULL,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -472,7 +472,7 @@ describe('instructions', () => {
           'id',
           'container',
           // test:title="abc"
-          AttributeMarker.NAMESPACE_URI,
+          NS.FULL,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -492,7 +492,7 @@ describe('instructions', () => {
           'container',
 
           // NS1:title="abc"
-          AttributeMarker.NAMESPACE_URI,
+          NS.FULL,
           'http://www.example.com/2014/test',
           'title',
           'abc',
@@ -502,13 +502,13 @@ describe('instructions', () => {
           'background: #dead11',
 
           // NS1:whatever="wee"
-          AttributeMarker.NAMESPACE_URI,
+          NS.FULL,
           'http://www.example.com/2014/test',
           'whatever',
           'wee',
 
           // NS2:shazbot="wocka wocka"
-          AttributeMarker.NAMESPACE_URI,
+          NS.FULL,
           'http://www.whatever.com/2016/blah',
           'shazbot',
           'wocka wocka',

From 3128b26e5c4e29da3eadf76e67f1ef64f7fcc484 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:19 -0700
Subject: [PATCH 220/582] Revert "feat(ivy): add element instruction (#23899)"

This reverts commit b415010222c4616a45cf06fb85221f2452aa05e4.
---
 .../compiler/src/render3/r3_identifiers.ts    |  4 +-
 .../compiler/src/render3/view/template.ts     | 61 ++++++++-----------
 .../render3/r3_compiler_compliance_spec.ts    | 36 +++++++----
 .../render3/r3_view_compiler_binding_spec.ts  |  6 +-
 .../render3/r3_view_compiler_i18n_spec.ts     |  3 +-
 .../render3/r3_view_compiler_template_spec.ts | 39 ------------
 .../core/src/core_render3_private_export.ts   |  1 -
 packages/core/src/render3/index.ts            |  1 -
 packages/core/src/render3/instructions.ts     |  9 ---
 .../core/src/render3/node_selector_matcher.ts |  1 -
 .../component_directives_spec.ts              | 15 +++--
 .../render3/compiler_canonical/query_spec.ts  |  3 +-
 .../core/test/render3/instructions_spec.ts    | 16 +++--
 13 files changed, 78 insertions(+), 117 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index a37e2a7bdc..b9bf96b0d3 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -17,12 +17,10 @@ export class Identifiers {
   static PATCH_DEPS = 'patchedDeps';
 
   /* Instructions */
-  static elementStart: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
+  static createElement: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
 
   static elementEnd: o.ExternalReference = {name: 'ɵe', moduleName: CORE};
 
-  static element: o.ExternalReference = {name: 'ɵEe', moduleName: CORE};
-
   static elementProperty: o.ExternalReference = {name: 'ɵp', moduleName: CORE};
 
   static elementAttribute: o.ExternalReference = {name: 'ɵa', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 607703732d..b0d21a9a11 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -314,42 +314,32 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     if (i18nMessages.length > 0) {
       this._creationCode.push(...i18nMessages);
     }
-
-    let isSelfClosingElement = element.outputs.length === 0 && element.children.length === 0;
-
+    this.instruction(
+        this._creationCode, element.sourceSpan, R3.createElement, ...trimTrailingNulls(parameters));
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    if (isSelfClosingElement) {
+    // Generate Listeners (outputs)
+    element.outputs.forEach((outputAst: t.BoundEvent) => {
+      const elName = sanitizeIdentifier(element.name);
+      const evName = sanitizeIdentifier(outputAst.name);
+      const functionName = `${this.templateName}_${elName}_${evName}_listener`;
+      const localVars: o.Statement[] = [];
+      const bindingScope =
+          this._bindingScope.nestedScope((lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => {
+            localVars.push(
+                lhsVar.set(rhsExpression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
+          });
+      const bindingExpr = convertActionBinding(
+          bindingScope, implicit, outputAst.handler, 'b', () => error('Unexpected interpolation'));
+      const handler = o.fn(
+          [new o.FnParam('$event', o.DYNAMIC_TYPE)], [...localVars, ...bindingExpr.render3Stmts],
+          o.INFERRED_TYPE, null, functionName);
       this.instruction(
-          this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
-    } else {
-      this.instruction(
-          this._creationCode, element.sourceSpan, R3.elementStart,
-          ...trimTrailingNulls(parameters));
+          this._creationCode, outputAst.sourceSpan, R3.listener, o.literal(outputAst.name),
+          handler);
+    });
 
-      // Generate Listeners (outputs)
-      element.outputs.forEach((outputAst: t.BoundEvent) => {
-        const elName = sanitizeIdentifier(element.name);
-        const evName = sanitizeIdentifier(outputAst.name);
-        const functionName = `${this.templateName}_${elName}_${evName}_listener`;
-        const localVars: o.Statement[] = [];
-        const bindingScope =
-            this._bindingScope.nestedScope((lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => {
-              localVars.push(
-                  lhsVar.set(rhsExpression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
-            });
-        const bindingExpr = convertActionBinding(
-            bindingScope, implicit, outputAst.handler, 'b',
-            () => error('Unexpected interpolation'));
-        const handler = o.fn(
-            [new o.FnParam('$event', o.DYNAMIC_TYPE)], [...localVars, ...bindingExpr.render3Stmts],
-            o.INFERRED_TYPE, null, functionName);
-        this.instruction(
-            this._creationCode, outputAst.sourceSpan, R3.listener, o.literal(outputAst.name),
-            handler);
-      });
-    }
 
     // Generate element input bindings
     element.inputs.forEach((input: t.BoundAttribute) => {
@@ -377,11 +367,10 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       t.visitAll(this, element.children);
     }
 
-    if (!isSelfClosingElement) {
-      // Finish element construction mode.
-      this.instruction(
-          this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
-    }
+    // Finish element construction mode.
+    this.instruction(
+        this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
+
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
   }
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 74045c062b..a60ccb687c 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -90,7 +90,8 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵe();
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.id));
@@ -134,8 +135,9 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
+            $r3$.ɵE(0, 'div');
             $r3$.ɵPp(1,'pipe');
+            $r3$.ɵe();
             $r3$.ɵrS(10);
           }
           if (rf & 2) {
@@ -179,7 +181,8 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵe();
           }
           if (rf & 2) {
             $r3$.ɵkn(0, 'error', $r3$.ɵb(ctx.error));
@@ -251,7 +254,8 @@ describe('compiler compliance', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'child', $c1$);
+              $r3$.ɵE(0, 'child', $c1$);
+              $r3$.ɵe();
               $r3$.ɵT(1, '!');
             }
           },
@@ -457,7 +461,8 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'my-comp');
+                $r3$.ɵE(0, 'my-comp');
+                $r3$.ɵe();
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
@@ -536,7 +541,8 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'my-comp');
+                $r3$.ɵE(0, 'my-comp');
+                $r3$.ɵe();
                 $r3$.ɵrS(10);
               }
               if (rf & 2) {
@@ -597,7 +603,8 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'object-comp');
+                $r3$.ɵE(0, 'object-comp');
+                $r3$.ɵe();
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
@@ -662,7 +669,8 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'nested-comp');
+                $r3$.ɵE(0, 'nested-comp');
+                $r3$.ɵe();
                 $r3$.ɵrS(7);
               }
               if (rf & 2) {
@@ -806,7 +814,8 @@ describe('compiler compliance', () => {
               var $tmp$: $any$;
               if (rf & 1) {
                 $r3$.ɵQ(0, SomeDirective, true);
-                $r3$.ɵEe(1, 'div', $e0_attrs$);
+                $r3$.ɵE(1, 'div', $e0_attrs$);
+                $r3$.ɵe();
               }
               if (rf & 2) {
                 ($r3$.ɵqR(($tmp$ = $r3$.ɵld(0))) && (ctx.someDir = $tmp$.first));
@@ -1000,7 +1009,8 @@ describe('compiler compliance', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'input', null, $c1$);
+              $r3$.ɵE(0, 'input', null, $c1$);
+              $r3$.ɵe();
               $r3$.ɵT(2);
             }
             const $user$ = $r3$.ɵld(1);
@@ -1079,8 +1089,10 @@ describe('compiler compliance', () => {
             factory: function SimpleLayout_Factory() { return new SimpleLayout(); },
             template: function SimpleLayout_Template(rf: IDENT, ctx: IDENT) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'lifecycle-comp');
-                $r3$.ɵEe(1, 'lifecycle-comp');
+                $r3$.ɵE(0, 'lifecycle-comp');
+                $r3$.ɵe();
+                $r3$.ɵE(1, 'lifecycle-comp');
+                $r3$.ɵe();
               }
               if (rf & 2) {
                 $r3$.ɵp(0, 'name', $r3$.ɵb(ctx.name1));
diff --git a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
index a9f4f3672e..8b0a9edcbe 100644
--- a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
@@ -75,7 +75,8 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
         if (rf & 1) {
-          $i0$.ɵEe(0, 'a');
+          $i0$.ɵE(0, 'a');
+          $i0$.ɵe();
         }
         if (rf & 2) {
           $i0$.ɵp(0, 'title', $i0$.ɵb($ctx$.title));
@@ -107,7 +108,8 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
         if (rf & 1) {
-          $i0$.ɵEe(0, 'a');
+          $i0$.ɵE(0, 'a');
+          $i0$.ɵe();
         }
         if (rf & 2) {
           $i0$.ɵp(0, 'title', $i0$.ɵi1('Hello ', $ctx$.name, ''));
diff --git a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
index 1065b3acb9..3839df2615 100644
--- a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
@@ -148,7 +148,8 @@ describe('i18n support in the view compiler', () => {
       …
       template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
         if (rf & 1) {
-          $r3$.ɵEe(0, 'div', $c1$);
+          $r3$.ɵE(0, 'div', $c1$);
+          $r3$.ɵe();
         }
       }
     `;
diff --git a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
index 86d96f9850..12041faec4 100644
--- a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
@@ -109,43 +109,4 @@ describe('compiler compliance: template', () => {
     expectEmit(result.source, template, 'Incorrect template');
   });
 
-  // tslint:disable-next-line:ban
-  describe('element with no children', () => {
-    it('should just use the element instruction', () => {
-      const files = {
-        app: {
-          'spec.ts': `
-                import {Component, NgModule} from '@angular/core';
-                import {CommonModule} from '@angular/common';
-
-                @Component({
-                  selector: 'my-component',
-                  template: \`
-                    <div></div>\`
-                })
-                export class MyComponent {
-                }
-
-                @NgModule({declarations: [MyComponent], imports: [CommonModule]})
-                export class MyModule {}
-            `
-        }
-      };
-
-      const template = `
-        // ...
-        template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
-          if (rf & 1) {
-            $i0$.ɵEe(0,'div');
-          }
-        }`;
-
-      debugger;
-
-      const result = compile(files, angularFiles);
-
-      expectEmit(result.source, template, 'Incorrect template');
-    });
-  });
-
 });
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index edcd9abbf5..ff8c7449b4 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -28,7 +28,6 @@ export {
   NC as ɵNC,
   C as ɵC,
   E as ɵE,
-  Ee as ɵEe,
   L as ɵL,
   T as ɵT,
   V as ɵV,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 19929ac932..0e8e091bc3 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -50,7 +50,6 @@ export {
   elementEnd as e,
   elementProperty as p,
   elementStart as E,
-  element as Ee,
   elementStyle as s,
   elementStyleNamed as sn,
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 30fcc1fe80..ef9e7d9540 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1032,15 +1032,6 @@ export function elementEnd() {
   queueLifecycleHooks(previousOrParentNode.tNode.flags, currentView);
 }
 
-/** Marks the beginning and end of an element in one call. */
-export function element(
-    index: number, name: string, attrs?: TAttributes | null | undefined,
-    localRefs?: string[] | null | undefined): RElement {
-  const relement = elementStart(index, name, attrs, localRefs);
-  elementEnd();
-  return relement;
-}
-
 /**
  * Updates the value of removes an attribute on an Element.
  *
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index efba0295ee..5f6f8b5ed0 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -12,7 +12,6 @@ import {assertNotNull} from './assert';
 import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
-
 const unusedValueToPlacateAjd = unused1 + unused2;
 
 function isCssClassMatching(nodeClassAttrVal: string, cssClassToMatch: string): boolean {
diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index f928655a46..7c1e6a7845 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -69,7 +69,8 @@ describe('components & directives', () => {
         factory: () => new MyComponent(),
         template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'child', $e0_attrs$);
+            $r3$.ɵE(0, 'child', $e0_attrs$);
+            $r3$.ɵe();
             $r3$.ɵT(1, '!');
           }
         }
@@ -454,7 +455,8 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'my-array-comp');
+              $r3$.ɵE(0, 'my-array-comp');
+              $r3$.ɵe();
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'names', rf & 1 ? $e0_arr$ : $r3$.ɵNC);
@@ -498,7 +500,8 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'my-array-comp');
+              $r3$.ɵE(0, 'my-array-comp');
+              $r3$.ɵe();
               $r3$.ɵrS(1);
             }
             if (rf & 2) {
@@ -603,7 +606,8 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'my-array-comp');
+              $r3$.ɵE(0, 'my-array-comp');
+              $r3$.ɵe();
               $r3$.ɵrS(2);
             }
             if (rf & 2) {
@@ -713,7 +717,8 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, c: $any$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'my-comp');
+              $r3$.ɵE(0, 'my-comp');
+              $r3$.ɵe();
               $r3$.ɵrS(10);
             }
             if (rf & 2) {
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index a5d51d0391..d3e19413e3 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -58,7 +58,8 @@ describe('queries', () => {
           if (rf & 1) {
             $r3$.ɵQ(0, SomeDirective, false);
             $r3$.ɵQ(1, SomeDirective, false);
-            $r3$.ɵEe(2, 'div', $e1_attrs$);
+            $r3$.ɵE(2, 'div', $e1_attrs$);
+            $r3$.ɵe();
           }
           if (rf & 2) {
             $r3$.ɵqR($tmp$ = $r3$.ɵld<QueryList<any>>(0)) && (ctx.someDir = $tmp$.first);
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 237744cee4..7056457990 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,14 +10,14 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
 import {LElementNode, LNode, NS} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {NgForOf} from './common_with_def';
-import {ComponentFixture, TemplateFixture, toHtml} from './render_util';
+import {ComponentFixture, TemplateFixture} from './render_util';
 
 describe('instructions', () => {
   function createAnchor() {
@@ -94,12 +94,13 @@ describe('instructions', () => {
 
     it('should use sanitizer function even on elements with namespaced attributes', () => {
       const t = new TemplateFixture(() => {
-        element(0, 'div', [
+        elementStart(0, 'div', [
           NS.FULL,
           'http://www.example.com/2004/test',
           'whatever',
           'abc',
         ]);
+        elementEnd();
       });
 
       t.update(() => elementAttribute(0, 'title', 'javascript:true', sanitizeUrl));
@@ -450,7 +451,8 @@ describe('instructions', () => {
           'title',
           'abc',
         ]);
-        element(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
+        elementStart(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
+        elementEnd();
         elementEnd();
         setHtmlNS();
         elementEnd();
@@ -468,7 +470,7 @@ describe('instructions', () => {
 
     it('should set an attribute with a namespace', () => {
       const t = new TemplateFixture(() => {
-        element(0, 'div', [
+        elementStart(0, 'div', [
           'id',
           'container',
           // test:title="abc"
@@ -477,6 +479,7 @@ describe('instructions', () => {
           'title',
           'abc',
         ]);
+        elementEnd();
       });
 
       const standardHTML = '<div id="container" title="abc"></div>';
@@ -487,7 +490,7 @@ describe('instructions', () => {
 
     it('should set attributes including more than one namespaced attribute', () => {
       const t = new TemplateFixture(() => {
-        element(0, 'div', [
+        elementStart(0, 'div', [
           'id',
           'container',
 
@@ -513,6 +516,7 @@ describe('instructions', () => {
           'shazbot',
           'wocka wocka',
         ]);
+        elementEnd();
       });
 
       const standardHTML =

From 07b4c8be42b3df7559253b48e1e769a82bac160d Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:20 -0700
Subject: [PATCH 221/582] Revert "feat(ivy): added namespaced attributes
 (#23899)"

This reverts commit d6989c80d3f23397790bded613c7922e9ef61865.
---
 packages/core/src/render3/di.ts               |   5 +-
 packages/core/src/render3/instructions.ts     |  36 ++----
 packages/core/src/render3/interfaces/node.ts  |  13 +--
 .../core/src/render3/node_selector_matcher.ts |   8 +-
 .../core/test/render3/instructions_spec.ts    | 107 +-----------------
 .../test/dom/dom_renderer_spec.ts             |  29 ++++-
 6 files changed, 43 insertions(+), 155 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 4cc09c5b2d..1c55e79fa6 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -260,11 +260,8 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   const attrs = tElement.attrs;
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
-      let attrName = attrs[i];
+      const attrName = attrs[i];
       if (attrName === AttributeMarker.SELECT_ONLY) break;
-      if (attrName === 0) {  // NS.FULL
-        attrName = attrs[i += 2];
-      }
       if (attrName == attrNameToInject) {
         return attrs[i + 1] as string;
       }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index ef9e7d9540..13952a0761 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -842,28 +842,15 @@ export function createTView(
 function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
   for (let i = 0; i < attrs.length; i += 2) {
-    let attrName = attrs[i];
-    if (attrName === 0) {  // NS.FULL
-      // Namespaced attribute
-      const attrNS = attrs[i + 1] as string;
-      attrName = attrs[i + 2] as string;
-      const attrVal = attrs[i + 3] as string;
-      i += 2;
-      if (isProc) {
-        (renderer as ProceduralRenderer3).setAttribute(native, attrName, attrVal, attrNS);
-      } else {
-        native.setAttributeNS(attrNS, attrName, attrVal);
-      }
-    } else {
-      if (attrName === AttributeMarker.SELECT_ONLY) break;
-      if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
-        const attrVal = attrs[i + 1];
-        ngDevMode && ngDevMode.rendererSetAttribute++;
-        isProc ?
-            (renderer as ProceduralRenderer3)
-                .setAttribute(native, attrName as string, attrVal as string) :
-            native.setAttribute(attrName as string, attrVal as string);
-      }
+    const attrName = attrs[i];
+    if (attrName === AttributeMarker.SELECT_ONLY) break;
+    if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
+      const attrVal = attrs[i + 1];
+      ngDevMode && ngDevMode.rendererSetAttribute++;
+      isProc ?
+          (renderer as ProceduralRenderer3)
+              .setAttribute(native, attrName as string, attrVal as string) :
+          native.setAttribute(attrName as string, attrVal as string);
     }
   }
 }
@@ -1506,8 +1493,7 @@ function generateInitialInputs(
 
   const attrs = tNode.attrs !;
   for (let i = 0; i < attrs.length; i += 2) {
-    const first = attrs[i];
-    const attrName = first === 0 ? attrs[i += 2] : first;  // 0 = NS.FULL
+    const attrName = attrs[i];
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
@@ -1920,7 +1906,7 @@ function appendToProjectionNode(
  *        - 1 based index of the selector from the {@link projectionDef}
  */
 export function projection(
-    nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: TAttributes): void {
+    nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: string[]): void {
   const node = createLNode(
       nodeIndex, TNodeType.Projection, null, null, attrs || null, {head: null, tail: null});
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 00ea8220a7..d4ac991ada 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import {LContainer} from './container';
 import {LInjector} from './injector';
 import {LProjection} from './projection';
@@ -13,16 +14,6 @@ import {RElement, RNode, RText} from './renderer';
 import {LView, TData, TView} from './view';
 
 
-/**
- * Namespace attribute flags.
- */
-export const enum NS {
-  /**
-   * Use the next value as the full namespaces URI, the values after that
-   * are then the name and the value, respectively.
-   */
-  FULL = 0,
-}
 
 /**
  * TNodeType corresponds to the TNode.type property. It contains information
@@ -188,7 +179,7 @@ export const enum AttributeMarker {
  * - attribute names and values
  * - special markers acting as flags to alter attributes processing.
  */
-export type TAttributes = (string | AttributeMarker | NS)[];
+export type TAttributes = (string | AttributeMarker)[];
 
 /**
  * LNode binding data (flyweight) for a particular node that is shared between all templates
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 5f6f8b5ed0..73f2ab55ec 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -106,12 +106,8 @@ function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
   if (attrs === null) return -1;
   for (let i = 0; i < attrs.length; i += step) {
     const attrName = attrs[i];
-    if (attrName === 0) {
-      // NS.FULL
-      step = 2;
-    } else if (attrName === name) {
-      return i;
-    } else if (attrName === AttributeMarker.SELECT_ONLY) {
+    if (attrName === name) return i;
+    if (attrName === AttributeMarker.SELECT_ONLY) {
       step = 1;
     }
   }
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 7056457990..751ab50bd8 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -11,7 +11,7 @@ import {NgForOfContext} from '@angular/common';
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
 import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
-import {LElementNode, LNode, NS} from '../../src/render3/interfaces/node';
+import {LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -91,43 +91,6 @@ describe('instructions', () => {
         rendererSetAttribute: 2
       });
     });
-
-    it('should use sanitizer function even on elements with namespaced attributes', () => {
-      const t = new TemplateFixture(() => {
-        elementStart(0, 'div', [
-          NS.FULL,
-          'http://www.example.com/2004/test',
-          'whatever',
-          'abc',
-        ]);
-        elementEnd();
-      });
-
-      t.update(() => elementAttribute(0, 'title', 'javascript:true', sanitizeUrl));
-
-
-      let standardHTML = '<div whatever="abc" title="unsafe:javascript:true"></div>';
-      let ieHTML = '<div title="unsafe:javascript:true" whatever="abc"></div>';
-
-      expect([standardHTML, ieHTML]).toContain(t.html);
-
-      t.update(
-          () => elementAttribute(
-              0, 'title', bypassSanitizationTrustUrl('javascript:true'), sanitizeUrl));
-
-      standardHTML = '<div whatever="abc" title="javascript:true"></div>';
-      ieHTML = '<div title="javascript:true" whatever="abc"></div>';
-
-      expect([standardHTML, ieHTML]).toContain(t.html);
-
-      expect(ngDevMode).toHaveProperties({
-        firstTemplatePass: 1,
-        tNode: 2,
-        tView: 1,
-        rendererCreateElement: 1,
-        rendererSetAttribute: 2
-      });
-    });
   });
 
   describe('elementProperty', () => {
@@ -445,11 +408,6 @@ describe('instructions', () => {
           // height="300"
           'height',
           '300',
-          // test:title="abc"
-          NS.FULL,
-          'http://www.example.com/2014/test',
-          'title',
-          'abc',
         ]);
         elementStart(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
         elementEnd();
@@ -461,71 +419,12 @@ describe('instructions', () => {
 
       // Most browsers will print <circle></circle>, some will print <circle />, both are valid
       const standardHTML =
-          '<div id="container"><svg id="display" width="400" height="300" title="abc"><circle cx="200" cy="150" fill="#0000ff"></circle></svg></div>';
+          '<div id="container"><svg id="display" width="400" height="300"><circle cx="200" cy="150" fill="#0000ff"></circle></svg></div>';
       const ie11HTML =
-          '<div id="container"><svg xmlns="http://www.w3.org/2000/svg" xmlns:NS1="http://www.example.com/2014/test" NS1:title="abc" id="display" width="400" height="300"><circle fill="#0000ff" cx="200" cy="150" /></svg></div>';
+          '<div id="container"><svg xmlns="http://www.w3.org/2000/svg" id="display" width="400" height="300"><circle fill="#0000ff" cx="200" cy="150" /></svg></div>';
 
       expect([standardHTML, ie11HTML]).toContain(t.html);
     });
-
-    it('should set an attribute with a namespace', () => {
-      const t = new TemplateFixture(() => {
-        elementStart(0, 'div', [
-          'id',
-          'container',
-          // test:title="abc"
-          NS.FULL,
-          'http://www.example.com/2014/test',
-          'title',
-          'abc',
-        ]);
-        elementEnd();
-      });
-
-      const standardHTML = '<div id="container" title="abc"></div>';
-      const ie11HTML =
-          '<div id="container" xmlns:NS1="https://www.example.com/2014/test" NS1:title="abc"></div>';
-      expect([standardHTML, ie11HTML]).toContain(t.html);
-    });
-
-    it('should set attributes including more than one namespaced attribute', () => {
-      const t = new TemplateFixture(() => {
-        elementStart(0, 'div', [
-          'id',
-          'container',
-
-          // NS1:title="abc"
-          NS.FULL,
-          'http://www.example.com/2014/test',
-          'title',
-          'abc',
-
-          // style="background: #dead11"
-          'style',
-          'background: #dead11',
-
-          // NS1:whatever="wee"
-          NS.FULL,
-          'http://www.example.com/2014/test',
-          'whatever',
-          'wee',
-
-          // NS2:shazbot="wocka wocka"
-          NS.FULL,
-          'http://www.whatever.com/2016/blah',
-          'shazbot',
-          'wocka wocka',
-        ]);
-        elementEnd();
-      });
-
-      const standardHTML =
-          '<div id="container" title="abc" style="background: #dead11" whatever="wee" shazbot="wocka wocka"></div>';
-      const ieHTML =
-          '<div id="container" style="background: rgb(222, 173, 17);" title="abc" whatever="wee" shazbot="wocka wocka"></div>';
-
-      expect([standardHTML, ieHTML]).toContain(t.html);
-    });
   });
 });
 
diff --git a/packages/platform-browser/test/dom/dom_renderer_spec.ts b/packages/platform-browser/test/dom/dom_renderer_spec.ts
index d8108b97ad..1386e8b617 100644
--- a/packages/platform-browser/test/dom/dom_renderer_spec.ts
+++ b/packages/platform-browser/test/dom/dom_renderer_spec.ts
@@ -28,14 +28,23 @@ import {NAMESPACE_URIS} from '../../src/dom/dom_renderer';
 
     describe('setAttribute', () => {
       describe('with namespace', () => {
+        it('xmlns', () => shouldSetAttributeWithNs('xmlns'));
         it('xml', () => shouldSetAttributeWithNs('xml'));
         it('svg', () => shouldSetAttributeWithNs('svg'));
         it('xhtml', () => shouldSetAttributeWithNs('xhtml'));
         it('xlink', () => shouldSetAttributeWithNs('xlink'));
-        it('custom', () => shouldSetAttributeWithNs('custom'));
+
+        it('unknown', () => {
+          const div = document.createElement('div');
+          expect(div.hasAttribute('unknown:name')).toBe(false);
+
+          renderer.setAttribute(div, 'name', 'value', 'unknown');
+
+          expect(div.getAttribute('unknown:name')).toBe('value');
+        });
 
         function shouldSetAttributeWithNs(namespace: string): void {
-          const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
+          const namespaceUri = NAMESPACE_URIS[namespace];
           const div = document.createElement('div');
           expect(div.hasAttributeNS(namespaceUri, 'name')).toBe(false);
 
@@ -48,16 +57,26 @@ import {NAMESPACE_URIS} from '../../src/dom/dom_renderer';
 
     describe('removeAttribute', () => {
       describe('with namespace', () => {
+        it('xmlns', () => shouldRemoveAttributeWithNs('xmlns'));
         it('xml', () => shouldRemoveAttributeWithNs('xml'));
         it('svg', () => shouldRemoveAttributeWithNs('svg'));
         it('xhtml', () => shouldRemoveAttributeWithNs('xhtml'));
         it('xlink', () => shouldRemoveAttributeWithNs('xlink'));
-        it('custom', () => shouldRemoveAttributeWithNs('custom'));
+
+        it('unknown', () => {
+          const div = document.createElement('div');
+          div.setAttribute('unknown:name', 'value');
+          expect(div.hasAttribute('unknown:name')).toBe(true);
+
+          renderer.removeAttribute(div, 'name', 'unknown');
+
+          expect(div.hasAttribute('unknown:name')).toBe(false);
+        });
 
         function shouldRemoveAttributeWithNs(namespace: string): void {
-          const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
+          const namespaceUri = NAMESPACE_URIS[namespace];
           const div = document.createElement('div');
-          div.setAttributeNS(namespaceUri, 'name', 'value');
+          div.setAttributeNS(namespaceUri, `${namespace}:name`, 'value');
           expect(div.hasAttributeNS(namespaceUri, 'name')).toBe(true);
 
           renderer.removeAttribute(div, 'name', namespace);

From 7de2ba0e22d6976abc48f24f2442e90877db4d90 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 6 Jun 2018 13:38:21 -0700
Subject: [PATCH 222/582] Revert "feat(ivy): add namespace instructions for SVG
 and others (#23899)"

This reverts commit 81e4b2a4bf21d8b6ab7d33053f4e020c09021e1f.
---
 packages/core/src/render3/instructions.ts     | 41 +++----------------
 .../core/src/render3/interfaces/renderer.ts   |  1 -
 .../bundling/todo/bundle.golden_symbols.json  |  3 --
 packages/core/test/linker/integration_spec.ts |  2 +-
 .../core/test/render3/instructions_spec.ts    | 36 +---------------
 .../platform-browser/src/dom/dom_renderer.ts  | 19 ++++++---
 6 files changed, 22 insertions(+), 80 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 13952a0761..a004f10d81 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -8,27 +8,24 @@
 
 import './ng_dev_mode';
 
-import {Sanitizer} from '../sanitization/security';
-
 import {assertEqual, assertLessThan, assertNotEqual, assertNotNull, assertNull, assertSame} from './assert';
-import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
-import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {LContainer} from './interfaces/container';
-import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
-import {ObjectOrientedRenderer3, ProceduralRenderer3, RElement, RText, Renderer3, RendererFactory3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {CurrentMatchesList, LView, LViewFlags, RootContext, TData, TView} from './interfaces/view';
 
 import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
+import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
+import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
+import {executeHooks, queueLifecycleHooks, queueInitHooks, executeInitHooks} from './hooks';
 import {ViewRef} from './view_ref';
-
-
+import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
+import {Sanitizer} from '../sanitization/security';
 
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
@@ -553,28 +550,6 @@ function getRenderFlags(view: LView): RenderFlags {
                                                 RenderFlags.Update;
 }
 
-//////////////////////////
-//// Namespace
-//////////////////////////
-let _currentNS: string|null = null;
-
-export function setNS(namespace: string) {
-  _currentNS = namespace;
-}
-
-export function setHtmlNS() {
-  _currentNS = null;
-}
-
-export function setSvgNS() {
-  _currentNS = 'http://www.w3.org/2000/svg';
-}
-
-export function setMathML() {
-  _currentNS = 'http://www.w3.org/1998/Math/MathML';
-}
-
-
 //////////////////////////
 //// Element
 //////////////////////////
@@ -598,11 +573,7 @@ export function elementStart(
       assertEqual(currentView.bindingIndex, -1, 'elements should be created before any bindings');
 
   ngDevMode && ngDevMode.rendererCreateElement++;
-
-  const native: RElement = _currentNS === null || isProceduralRenderer(renderer) ?
-      renderer.createElement(name) :
-      (renderer as ObjectOrientedRenderer3).createElementNS(_currentNS, name);
-
+  const native: RElement = renderer.createElement(name);
   ngDevMode && assertDataInRange(index - 1);
 
   const node: LElementNode =
diff --git a/packages/core/src/render3/interfaces/renderer.ts b/packages/core/src/render3/interfaces/renderer.ts
index 49709897dc..54983d0a3b 100644
--- a/packages/core/src/render3/interfaces/renderer.ts
+++ b/packages/core/src/render3/interfaces/renderer.ts
@@ -36,7 +36,6 @@ export type Renderer3 = ObjectOrientedRenderer3 | ProceduralRenderer3;
  * */
 export interface ObjectOrientedRenderer3 {
   createElement(tagName: string): RElement;
-  createElementNS(namespace: string, name: string): RElement;
   createTextNode(data: string): RText;
 
   querySelector(selectors: string): RElement|null;
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 2b63963bd6..64f8a6e020 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -176,9 +176,6 @@
   {
     "name": "_currentInjector"
   },
-  {
-    "name": "_currentNS"
-  },
   {
     "name": "_devMode"
   },
diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts
index 5da89f3af4..027a36f9f1 100644
--- a/packages/core/test/linker/integration_spec.ts
+++ b/packages/core/test/linker/integration_spec.ts
@@ -1820,7 +1820,7 @@ function declareTests({useJit}: {useJit: boolean}) {
               .toEqual('http://www.w3.org/2000/svg');
 
           const firstAttribute = getDOM().getProperty(<Element>use, 'attributes')[0];
-          expect(firstAttribute.name).toEqual('href');
+          expect(firstAttribute.name).toEqual('xlink:href');
           expect(firstAttribute.namespaceURI).toEqual('http://www.w3.org/1999/xlink');
         });
 
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 751ab50bd8..7a59ec8834 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, setHtmlNS, setSvgNS, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
 import {LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
@@ -392,40 +392,6 @@ describe('instructions', () => {
       expect(s.lastSanitizedValue).toBeFalsy();
     });
   });
-
-  describe('namespace', () => {
-    it('should render SVG', () => {
-      const t = new TemplateFixture(() => {
-        elementStart(0, 'div', ['id', 'container']);
-        setSvgNS();
-        elementStart(1, 'svg', [
-          // id="display"
-          'id',
-          'display',
-          // width="400"
-          'width',
-          '400',
-          // height="300"
-          'height',
-          '300',
-        ]);
-        elementStart(2, 'circle', ['cx', '200', 'cy', '150', 'fill', '#0000ff']);
-        elementEnd();
-        elementEnd();
-        setHtmlNS();
-        elementEnd();
-      });
-
-
-      // Most browsers will print <circle></circle>, some will print <circle />, both are valid
-      const standardHTML =
-          '<div id="container"><svg id="display" width="400" height="300"><circle cx="200" cy="150" fill="#0000ff"></circle></svg></div>';
-      const ie11HTML =
-          '<div id="container"><svg xmlns="http://www.w3.org/2000/svg" id="display" width="400" height="300"><circle fill="#0000ff" cx="200" cy="150" /></svg></div>';
-
-      expect([standardHTML, ie11HTML]).toContain(t.html);
-    });
-  });
 });
 
 class LocalSanitizedValue {
diff --git a/packages/platform-browser/src/dom/dom_renderer.ts b/packages/platform-browser/src/dom/dom_renderer.ts
index a4684a1248..6715d20513 100644
--- a/packages/platform-browser/src/dom/dom_renderer.ts
+++ b/packages/platform-browser/src/dom/dom_renderer.ts
@@ -110,7 +110,7 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   createElement(name: string, namespace?: string): any {
     if (namespace) {
-      return document.createElementNS(NAMESPACE_URIS[namespace] || namespace, name);
+      return document.createElementNS(NAMESPACE_URIS[namespace], name);
     }
 
     return document.createElement(name);
@@ -150,8 +150,13 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   setAttribute(el: any, name: string, value: string, namespace?: string): void {
     if (namespace) {
-      const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
-      el.setAttributeNS(namespaceUri, name, value);
+      name = `${namespace}:${name}`;
+      const namespaceUri = NAMESPACE_URIS[namespace];
+      if (namespaceUri) {
+        el.setAttributeNS(namespaceUri, name, value);
+      } else {
+        el.setAttribute(name, value);
+      }
     } else {
       el.setAttribute(name, value);
     }
@@ -159,8 +164,12 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   removeAttribute(el: any, name: string, namespace?: string): void {
     if (namespace) {
-      const namespaceUri = NAMESPACE_URIS[namespace] || namespace;
-      el.removeAttributeNS(namespaceUri, name);
+      const namespaceUri = NAMESPACE_URIS[namespace];
+      if (namespaceUri) {
+        el.removeAttributeNS(namespaceUri, name);
+      } else {
+        el.removeAttribute(`${namespace}:${name}`);
+      }
     } else {
       el.removeAttribute(name);
     }

From e3759f7a7361991e2e3fd4de67ab139babd7c166 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 9 May 2018 16:49:39 -0700
Subject: [PATCH 223/582] feat(ivy): add support of
 ApplicationRef.bootstrapModuleFactory (#23811)

PR Close #23811
---
 packages/core/src/application_module.ts       |  45 +++--
 .../core/src/core_render3_private_export.ts   |   2 +
 packages/core/src/di.ts                       |   2 +-
 packages/core/src/di/injector.ts              |   9 +-
 packages/core/src/di/provider.ts              |   8 +-
 packages/core/src/di/r3_injector.ts           |  29 +--
 packages/core/src/render3/assert.ts           |   4 +-
 packages/core/src/render3/component.ts        |  49 ++---
 packages/core/src/render3/component_ref.ts    | 176 ++++++++++++++++++
 packages/core/src/render3/di.ts               |   8 +-
 packages/core/src/render3/index.ts            |   7 +-
 packages/core/src/render3/instructions.ts     |  65 ++++---
 packages/core/src/render3/interfaces/view.ts  |   4 +-
 packages/core/src/render3/ng_module_ref.ts    |  73 ++++++++
 packages/core/src/render3/node_assert.ts      |   6 +-
 .../core/src/render3/node_manipulation.ts     |   2 +-
 .../core/src/render3/node_selector_matcher.ts |   4 +-
 packages/core/src/render3/query.ts            |   8 +-
 packages/core/src/render3/view_ref.ts         |  18 +-
 .../test/application_ref_integration_spec.ts  |  95 ++++++++++
 .../hello_world/bundle.golden_symbols.json    |   3 +
 .../hello_world_r2/bundle.golden_symbols.json |   2 +-
 .../bundling/todo/bundle.golden_symbols.json  |   5 +-
 packages/core/test/di/r3_injector_spec.ts     |  20 ++
 packages/core/test/render3/component_spec.ts  |  27 ++-
 packages/core/test/render3/render_util.ts     |   2 +-
 packages/platform-browser/src/browser.ts      |  61 +++---
 tools/public_api_guard/core/core.d.ts         |   9 +-
 .../platform-browser/platform-browser.d.ts    |   2 +-
 29 files changed, 589 insertions(+), 156 deletions(-)
 create mode 100644 packages/core/src/render3/component_ref.ts
 create mode 100644 packages/core/src/render3/ng_module_ref.ts
 create mode 100644 packages/core/test/application_ref_integration_spec.ts

diff --git a/packages/core/src/application_module.ts b/packages/core/src/application_module.ts
index 55caa5d9b7..4cbd10b24b 100644
--- a/packages/core/src/application_module.ts
+++ b/packages/core/src/application_module.ts
@@ -10,11 +10,15 @@ import {APP_INITIALIZER, ApplicationInitStatus} from './application_init';
 import {ApplicationRef} from './application_ref';
 import {APP_ID_RANDOM_PROVIDER} from './application_tokens';
 import {IterableDiffers, KeyValueDiffers, defaultIterableDiffers, defaultKeyValueDiffers} from './change_detection/change_detection';
-import {forwardRef} from './di/forward_ref';
+import {Console} from './console';
+import {InjectionToken, Injector, StaticProvider} from './di';
 import {Inject, Optional, SkipSelf} from './di/metadata';
+import {ErrorHandler} from './error_handler';
 import {LOCALE_ID} from './i18n/tokens';
+import {ComponentFactoryResolver} from './linker';
 import {Compiler} from './linker/compiler';
 import {NgModule} from './metadata';
+import {NgZone} from './zone';
 
 export function _iterableDiffersFactory() {
   return defaultIterableDiffers;
@@ -28,27 +32,36 @@ export function _localeFactory(locale?: string): string {
   return locale || 'en-US';
 }
 
+export const APPLICATION_MODULE_PROVIDERS: StaticProvider[] = [
+  {
+    provide: ApplicationRef,
+    useClass: ApplicationRef,
+    deps:
+        [NgZone, Console, Injector, ErrorHandler, ComponentFactoryResolver, ApplicationInitStatus]
+  },
+  {
+    provide: ApplicationInitStatus,
+    useClass: ApplicationInitStatus,
+    deps: [[new Optional(), APP_INITIALIZER]]
+  },
+  {provide: Compiler, useClass: Compiler, deps: []},
+  APP_ID_RANDOM_PROVIDER,
+  {provide: IterableDiffers, useFactory: _iterableDiffersFactory, deps: []},
+  {provide: KeyValueDiffers, useFactory: _keyValueDiffersFactory, deps: []},
+  {
+    provide: LOCALE_ID,
+    useFactory: _localeFactory,
+    deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
+  },
+];
+
 /**
  * This module includes the providers of @angular/core that are needed
  * to bootstrap components via `ApplicationRef`.
  *
  * @experimental
  */
-@NgModule({
-  providers: [
-    ApplicationRef,
-    ApplicationInitStatus,
-    Compiler,
-    APP_ID_RANDOM_PROVIDER,
-    {provide: IterableDiffers, useFactory: _iterableDiffersFactory},
-    {provide: KeyValueDiffers, useFactory: _keyValueDiffersFactory},
-    {
-      provide: LOCALE_ID,
-      useFactory: _localeFactory,
-      deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
-    },
-  ],
-})
+@NgModule({providers: APPLICATION_MODULE_PROVIDERS})
 export class ApplicationModule {
   // Inject ApplicationRef to make it eager...
   constructor(appRef: ApplicationRef) {}
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index ff8c7449b4..3998173ec9 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -23,6 +23,8 @@ export {
   injectAttribute as ɵinjectAttribute,
   PublicFeature as ɵPublicFeature,
   NgOnChangesFeature as ɵNgOnChangesFeature,
+  NgModuleDef as ɵNgModuleDef,
+  NgModuleType as ɵNgModuleType,
   CssSelectorList as ɵCssSelectorList,
   markDirty as ɵmarkDirty,
   NC as ɵNC,
diff --git a/packages/core/src/di.ts b/packages/core/src/di.ts
index 62d3c4a38e..1e6b201b84 100644
--- a/packages/core/src/di.ts
+++ b/packages/core/src/di.ts
@@ -18,7 +18,7 @@ export {forwardRef, resolveForwardRef, ForwardRefFn} from './di/forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './di/injectable';
 export {inject, InjectFlags, INJECTOR, Injector} from './di/injector';
 export {ReflectiveInjector} from './di/reflective_injector';
-export {StaticProvider, ValueProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './di/provider';
+export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './di/provider';
 export {createInjector} from './di/r3_injector';
 export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './di/reflective_provider';
 export {ReflectiveKey} from './di/reflective_key';
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index 5cbd618846..e0286e80b4 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -32,6 +32,9 @@ export const INJECTOR = new InjectionToken<Injector>('INJECTOR');
 export class NullInjector implements Injector {
   get(token: any, notFoundValue: any = _THROW_IF_NOT_FOUND): any {
     if (notFoundValue === _THROW_IF_NOT_FOUND) {
+      // Intentionally left behind: With dev tools open the debugger will stop here. There is no
+      // reason why correctly written application should cause this exception.
+      debugger;
       throw new Error(`NullInjectorError: No provider for ${stringify(token)}!`);
     }
     return notFoundValue;
@@ -487,11 +490,11 @@ export function injectArgs(types: (Type<any>| InjectionToken<any>| any[])[]): an
 
       for (let j = 0; j < arg.length; j++) {
         const meta = arg[j];
-        if (meta instanceof Optional || meta.__proto__.ngMetadataName === 'Optional') {
+        if (meta instanceof Optional || meta.ngMetadataName === 'Optional') {
           flags |= InjectFlags.Optional;
-        } else if (meta instanceof SkipSelf || meta.__proto__.ngMetadataName === 'SkipSelf') {
+        } else if (meta instanceof SkipSelf || meta.ngMetadataName === 'SkipSelf') {
           flags |= InjectFlags.SkipSelf;
-        } else if (meta instanceof Self || meta.__proto__.ngMetadataName === 'Self') {
+        } else if (meta instanceof Self || meta.ngMetadataName === 'Self') {
           flags |= InjectFlags.Self;
         } else if (meta instanceof Inject) {
           type = meta.token;
diff --git a/packages/core/src/di/provider.ts b/packages/core/src/di/provider.ts
index 1b521e911a..447f7c2279 100644
--- a/packages/core/src/di/provider.ts
+++ b/packages/core/src/di/provider.ts
@@ -151,10 +151,6 @@ export interface StaticClassProvider extends StaticClassSansProvider {
  *
  * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
  *
- * ### Example
- *
- * {@example core/di/ts/provider_spec.ts region='ConstructorSansProvider'}
- *
  * @experimental
  */
 export interface ConstructorSansProvider {
@@ -453,5 +449,5 @@ export interface ClassProvider extends ClassSansProvider {
  *
  *
  */
-export type Provider =
-    TypeProvider | ValueProvider | ClassProvider | ExistingProvider | FactoryProvider | any[];
+export type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider |
+    ExistingProvider | FactoryProvider | any[];
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index 9305d4b796..28742c19a2 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -14,7 +14,7 @@ import {InjectableDef, InjectableType, InjectorDef, InjectorType, InjectorTypeWi
 import {resolveForwardRef} from './forward_ref';
 import {InjectableDefToken, InjectionToken} from './injection_token';
 import {INJECTOR, InjectFlags, Injector, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, inject, injectArgs, setCurrentInjector} from './injector';
-import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, TypeProvider, ValueProvider} from './provider';
+import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './provider';
 import {APP_ROOT} from './scope';
 
 
@@ -64,14 +64,15 @@ interface Record<T> {
 }
 
 /**
- * Create a new `Injector` which is configured using `InjectorType`s.
+ * Create a new `Injector` which is configured using a `defType` of `InjectorType<any>`s.
  *
  * @experimental
  */
 export function createInjector(
-    defType: /* InjectorType<any> */ any, parent: Injector | null = null): Injector {
+    defType: /* InjectorType<any> */ any, parent: Injector | null = null,
+    additionalProviders: StaticProvider[] | null = null): Injector {
   parent = parent || getNullInjector();
-  return new R3Injector(defType, parent);
+  return new R3Injector(defType, additionalProviders, parent);
 }
 
 export class R3Injector {
@@ -101,12 +102,18 @@ export class R3Injector {
    */
   private destroyed = false;
 
-  constructor(def: InjectorType<any>, readonly parent: Injector) {
+  constructor(
+      def: InjectorType<any>, additionalProviders: StaticProvider[]|null,
+      readonly parent: Injector) {
     // Start off by creating Records for every provider declared in every InjectorType
     // included transitively in `def`.
     deepForEach(
         [def], injectorDef => this.processInjectorType(injectorDef, new Set<InjectorType<any>>()));
 
+    additionalProviders &&
+        deepForEach(additionalProviders, provider => this.processProvider(provider));
+
+
     // Make sure the INJECTOR token provides this injector.
     this.records.set(INJECTOR, makeRecord(undefined, this));
 
@@ -284,20 +291,18 @@ export class R3Injector {
           throw new Error(`Mixed multi-provider for ${token}.`);
         }
       } else {
-        token = provider;
         multiRecord = makeRecord(undefined, NOT_YET, true);
         multiRecord.factory = () => injectArgs(multiRecord !.multi !);
         this.records.set(token, multiRecord);
       }
       token = provider;
       multiRecord.multi !.push(provider);
+    } else {
+      const existing = this.records.get(token);
+      if (existing && existing.multi !== undefined) {
+        throw new Error(`Mixed multi-provider for ${stringify(token)}`);
+      }
     }
-
-    const existing = this.records.get(token);
-    if (existing && existing.multi !== undefined) {
-      throw new Error(`Mixed multi-provider for ${token}`);
-    }
-
     this.records.set(token, record);
   }
 
diff --git a/packages/core/src/render3/assert.ts b/packages/core/src/render3/assert.ts
index 8c80e47fb6..121217cb58 100644
--- a/packages/core/src/render3/assert.ts
+++ b/packages/core/src/render3/assert.ts
@@ -46,13 +46,13 @@ export function assertGreaterThan<T>(actual: T, expected: T, msg: string) {
   }
 }
 
-export function assertNull<T>(actual: T, msg: string) {
+export function assertNotDefined<T>(actual: T, msg: string) {
   if (actual != null) {
     throwError(msg);
   }
 }
 
-export function assertNotNull<T>(actual: T, msg: string) {
+export function assertDefined<T>(actual: T, msg: string) {
   if (actual == null) {
     throwError(msg);
   }
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 9bc5fa88ca..cfbc386e2d 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -13,7 +13,7 @@ import {Injector} from '../di/injector';
 import {ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
 import {Sanitizer} from '../sanitization/security';
 
-import {assertComponentType, assertNotNull} from './assert';
+import {assertComponentType, assertDefined} from './assert';
 import {queueInitHooks, queueLifecycleHooks} from './hooks';
 import {CLEAN_PROMISE, ROOT_DIRECTIVE_INDICES, _getComponentHostLElementNode, baseDirectiveCreate, createLView, createTView, detectChangesInternal, enterView, executeInitAndContentHooks, getRootView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement, setHostBindings} from './instructions';
 import {ComponentDef, ComponentType} from './interfaces/definition';
@@ -72,31 +72,6 @@ export interface CreateComponentOptions {
 }
 
 
-/**
- * Bootstraps a component, then creates and returns a `ComponentRef` for that component.
- *
- * @param componentType Component to bootstrap
- * @param options Optional parameters which control bootstrapping
- */
-export function createComponentRef<T>(
-    componentType: ComponentType<T>, opts: CreateComponentOptions): viewEngine_ComponentRef<T> {
-  const component = renderComponent(componentType, opts);
-  const hostView = _getComponentHostLElementNode(component).data as LView;
-  const hostViewRef = new ViewRef(hostView, component);
-  return {
-    location: {nativeElement: getHostElement(component)},
-    injector: opts.injector || NULL_INJECTOR,
-    instance: component,
-    hostView: hostViewRef,
-    changeDetectorRef: hostViewRef,
-    componentType: componentType,
-    // TODO: implement destroy and onDestroy
-    destroy: () => {},
-    onDestroy: (cb: Function) => {}
-  };
-}
-
-
 // TODO: A hack to not pull in the NullInjector from @angular/core.
 export const NULL_INJECTOR: Injector = {
   get: (token: any, notFoundValue?: any) => {
@@ -131,12 +106,8 @@ export function renderComponent<T>(
   // The first index of the first selector is the tag name.
   const componentTag = componentDef.selectors ![0] ![0] as string;
   const hostNode = locateHostElement(rendererFactory, opts.host || componentTag);
-  const rootContext: RootContext = {
-    // Incomplete initialization due to circular reference.
-    component: null !,
-    scheduler: opts.scheduler || requestAnimationFrame.bind(window),
-    clean: CLEAN_PROMISE,
-  };
+  const rootContext = createRootContext(opts.scheduler || requestAnimationFrame.bind(window));
+
   const rootView: LView = createLView(
       rendererFactory.createRenderer(hostNode, componentDef.rendererType),
       createTView(-1, null, null, null), rootContext,
@@ -152,8 +123,8 @@ export function renderComponent<T>(
     elementNode = hostElement(componentTag, hostNode, componentDef, sanitizer);
 
     // Create directive instance with factory() and store at index 0 in directives array
-    component = rootContext.component =
-        baseDirectiveCreate(0, componentDef.factory(), componentDef) as T;
+    rootContext.components.push(
+        component = baseDirectiveCreate(0, componentDef.factory(), componentDef) as T);
     initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
 
     opts.hostFeatures && opts.hostFeatures.forEach((feature) => feature(component, componentDef));
@@ -169,6 +140,14 @@ export function renderComponent<T>(
   return component;
 }
 
+export function createRootContext(scheduler: (workFn: () => void) => void): RootContext {
+  return {
+    components: [],
+    scheduler: scheduler,
+    clean: CLEAN_PROMISE,
+  };
+}
+
 /**
  * Used to enable lifecycle hooks on the root component.
  *
@@ -198,7 +177,7 @@ export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): v
  */
 function getRootContext(component: any): RootContext {
   const rootContext = getRootView(component).context as RootContext;
-  ngDevMode && assertNotNull(rootContext, 'rootContext');
+  ngDevMode && assertDefined(rootContext, 'rootContext');
   return rootContext;
 }
 
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
new file mode 100644
index 0000000000..01222b5a3b
--- /dev/null
+++ b/packages/core/src/render3/component_ref.ts
@@ -0,0 +1,176 @@
+/**
+ * @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 {ChangeDetectorRef} from '../change_detection/change_detector_ref';
+import {InjectionToken} from '../di/injection_token';
+import {Injector, inject} from '../di/injector';
+import {ComponentFactory as viewEngine_ComponentFactory, ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
+import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
+import {ElementRef} from '../linker/element_ref';
+import {NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
+import {RendererFactory2} from '../render/api';
+import {Type} from '../type';
+
+import {assertComponentType, assertDefined} from './assert';
+import {createRootContext} from './component';
+import {baseDirectiveCreate, createLView, createTView, enterView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement} from './instructions';
+import {ComponentDef, ComponentType} from './interfaces/definition';
+import {LElementNode} from './interfaces/node';
+import {RElement} from './interfaces/renderer';
+import {LView, LViewFlags, RootContext} from './interfaces/view';
+import {ViewRef} from './view_ref';
+
+export class ComponentFactoryResolver extends viewEngine_ComponentFactoryResolver {
+  resolveComponentFactory<T>(component: Type<T>): viewEngine_ComponentFactory<T> {
+    ngDevMode && assertComponentType(component);
+    const componentDef = (component as ComponentType<T>).ngComponentDef;
+    return new ComponentFactory(componentDef);
+  }
+}
+
+function toRefArray(map: {[key: string]: string}): {propName: string; templateName: string;}[] {
+  const array: {propName: string; templateName: string;}[] = [];
+  for (let nonMinified in map) {
+    if (map.hasOwnProperty(nonMinified)) {
+      const minified = map[nonMinified];
+      array.push({propName: minified, templateName: nonMinified});
+    }
+  }
+  return array;
+}
+
+/**
+ * Default {@link RootContext} for all components rendered with {@link renderComponent}.
+ */
+export const ROOT_CONTEXT = new InjectionToken<RootContext>(
+    'ROOT_CONTEXT_TOKEN',
+    {providedIn: 'root', factory: () => createRootContext(inject(SCHEDULER))});
+
+/**
+ * A change detection scheduler token for {@link RootContext}. This token is the default value used
+ * for the default `RootContext` found in the {@link ROOT_CONTEXT} token.
+ */
+export const SCHEDULER = new InjectionToken<((fn: () => void) => void)>(
+    'SCHEDULER_TOKEN', {providedIn: 'root', factory: () => requestAnimationFrame.bind(window)});
+
+/**
+ * Render3 implementation of {@link viewEngine_ComponentFactory}.
+ */
+export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
+  selector: string;
+  componentType: Type<any>;
+  ngContentSelectors: string[];
+  get inputs(): {propName: string; templateName: string;}[] {
+    return toRefArray(this.componentDef.inputs);
+  }
+  get outputs(): {propName: string; templateName: string;}[] {
+    return toRefArray(this.componentDef.outputs);
+  }
+
+  constructor(private componentDef: ComponentDef<any>) {
+    super();
+    this.componentType = componentDef.type;
+    this.selector = componentDef.selectors[0][0] as string;
+    this.ngContentSelectors = [];
+  }
+
+  create(
+      parentComponentInjector: Injector, projectableNodes?: any[][]|undefined,
+      rootSelectorOrNode?: any,
+      ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<T> {
+    ngDevMode && assertDefined(ngModule, 'ngModule should always be defined');
+
+    const rendererFactory = ngModule ? ngModule.injector.get(RendererFactory2) : document;
+    const hostNode = locateHostElement(rendererFactory, rootSelectorOrNode);
+
+    // The first index of the first selector is the tag name.
+    const componentTag = this.componentDef.selectors ![0] ![0] as string;
+
+    const rootContext: RootContext = ngModule !.injector.get(ROOT_CONTEXT);
+
+    // Create the root view. Uses empty TView and ContentTemplate.
+    const rootView: LView = createLView(
+        rendererFactory.createRenderer(hostNode, this.componentDef.rendererType),
+        createTView(-1, null, null, null), null,
+        this.componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
+    rootView.injector = ngModule && ngModule.injector || null;
+
+    // rootView is the parent when bootstrapping
+    const oldView = enterView(rootView, null !);
+
+    let component: T;
+    let elementNode: LElementNode;
+    try {
+      if (rendererFactory.begin) rendererFactory.begin();
+
+      // Create element node at index 0 in data array
+      elementNode = hostElement(componentTag, hostNode, this.componentDef);
+
+      // Create directive instance with factory() and store at index 0 in directives array
+      rootContext.components.push(
+          component = baseDirectiveCreate(0, this.componentDef.factory(), this.componentDef) as T);
+      initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
+
+    } finally {
+      enterView(oldView, null);
+      if (rendererFactory.end) rendererFactory.end();
+    }
+
+    // TODO(misko): this is the wrong injector here.
+    return new ComponentRef(
+        this.componentType, component, rootView, ngModule !.injector, hostNode !);
+  }
+}
+
+/**
+ * Represents an instance of a Component created via a {@link ComponentFactory}.
+ *
+ * `ComponentRef` provides access to the Component Instance as well other objects related to this
+ * Component Instance and allows you to destroy the Component Instance via the {@link #destroy}
+ * method.
+ *
+ */
+export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
+  destroyCbs: (() => void)[]|null = [];
+  location: ElementRef<any>;
+  injector: Injector;
+  instance: T;
+  hostView: ViewRef<T>;
+  changeDetectorRef: ChangeDetectorRef;
+  componentType: Type<T>;
+
+  constructor(
+      componentType: Type<T>, instance: T, rootView: LView, injector: Injector,
+      hostNode: RElement) {
+    super();
+    this.instance = instance;
+    /* TODO(jasonaden): This is incomplete, to be adjusted in follow-up PR. Notes from Kara:When
+     * ViewRef.detectChanges is called from ApplicationRef.tick, it will call detectChanges at the
+     * component instance level. I suspect this means that lifecycle hooks and host bindings on the
+     * given component won't work (as these are always called at the level above a component).
+     *
+     * In render2, ViewRef.detectChanges uses the root view instance for view checks, not the
+     * component instance. So passing in the root view (1 level above the component) is sufficient.
+     * We might  want to think about creating a fake component for the top level? Or overwrite
+     * detectChanges with a function that calls tickRootContext? */
+    this.hostView = this.changeDetectorRef = new ViewRef(rootView, instance);
+    this.injector = injector;
+    this.location = new ElementRef(hostNode);
+    this.componentType = componentType;
+  }
+
+  destroy(): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.forEach(fn => fn());
+    this.destroyCbs = null;
+  }
+  onDestroy(callback: () => void): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.push(callback);
+  }
+}
\ No newline at end of file
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 1c55e79fa6..4129107841 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -18,9 +18,9 @@ import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_co
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_ViewRef} from '../linker/view_ref';
 import {Type} from '../type';
 
-import {assertGreaterThan, assertLessThan, assertNotNull} from './assert';
+import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
-import {ComponentTemplate, DirectiveDef} from './interfaces/definition';
+import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
@@ -256,7 +256,7 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   const lElement = getPreviousOrParentNode() as LElementNode;
   ngDevMode && assertNodeType(lElement, TNodeType.Element);
   const tElement = lElement.tNode;
-  ngDevMode && assertNotNull(tElement, 'expecting tNode');
+  ngDevMode && assertDefined(tElement, 'expecting tNode');
   const attrs = tElement.attrs;
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
@@ -707,7 +707,7 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
       hostTNode.tViews = createTView(
           -1, hostNode.data.template !, hostTView.directiveRegistry, hostTView.pipeRegistry);
     }
-    ngDevMode && assertNotNull(hostTNode.tViews, 'TView must be allocated');
+    ngDevMode && assertDefined(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
         getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(), hostNode.data.queries);
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 0e8e091bc3..9d3c28b344 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LifecycleHooksFeature, createComponentRef, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
+import {LifecycleHooksFeature, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
 import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, definePipe} from './definition';
 import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef} from './interfaces/definition';
 
+export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
 
-
 // Naming scheme:
 // - Capital letters are for creating things: T(Text), E(Element), D(Directive), V(View),
 // C(Container), L(Listener)
@@ -73,6 +73,8 @@ export {
   tick,
 } from './instructions';
 
+export {NgModuleDef, NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
+
 export {
     AttributeMarker
 } from './interfaces/node';
@@ -122,7 +124,6 @@ export {
   defineComponent,
   defineDirective,
   definePipe,
-  createComponentRef,
   getHostElement,
   getRenderedText,
   renderComponent,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a004f10d81..3b2dcf65bf 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -8,7 +8,11 @@
 
 import './ng_dev_mode';
 
-import {assertEqual, assertLessThan, assertNotEqual, assertNotNull, assertNull, assertSame} from './assert';
+import {Sanitizer} from '../sanitization/security';
+
+import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual, assertSame} from './assert';
+import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
+import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {LContainer} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
@@ -22,10 +26,7 @@ import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
-import {executeHooks, queueLifecycleHooks, queueInitHooks, executeInitHooks} from './hooks';
 import {ViewRef} from './view_ref';
-import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
-import {Sanitizer} from '../sanitization/security';
 
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
@@ -406,7 +407,8 @@ export function createLNode(
   if ((type & TNodeType.ViewOrElement) === TNodeType.ViewOrElement && isState) {
     // Bit of a hack to bust through the readonly because there is a circular dep between
     // LView and LNode.
-    ngDevMode && assertNull((state as LView).node, 'LView.node should not have been initialized');
+    ngDevMode &&
+        assertNotDefined((state as LView).node, 'LView.node should not have been initialized');
     (state as{node: LNode}).node = node;
     if (firstTemplatePass) (state as LView).tView.node = node.tNode;
   }
@@ -455,7 +457,7 @@ export function renderTemplate<T>(
             sanitizer));
   }
   const hostView = host.data !;
-  ngDevMode && assertNotNull(hostView, 'Host node should have an LView defined in host.data.');
+  ngDevMode && assertDefined(hostView, 'Host node should have an LView defined in host.data.');
   renderComponentOrTemplate(host, hostView, context, template);
   return host;
 }
@@ -1300,8 +1302,8 @@ export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
     ngDevMode && assertDataInRange(index);
     const existingNode = data[index] as LTextNode;
-    ngDevMode && assertNotNull(existingNode, 'LNode should exist');
-    ngDevMode && assertNotNull(existingNode.native, 'native element should exist');
+    ngDevMode && assertDefined(existingNode, 'LNode should exist');
+    ngDevMode && assertDefined(existingNode.native, 'native element should exist');
     ngDevMode && ngDevMode.rendererSetText++;
     isProceduralRenderer(renderer) ? renderer.setValue(existingNode.native, stringify(value)) :
                                      existingNode.native.textContent = stringify(value);
@@ -1325,7 +1327,7 @@ export function directiveCreate<T>(
     index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
   const instance = baseDirectiveCreate(index, directive, directiveDef);
 
-  ngDevMode && assertNotNull(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
+  ngDevMode && assertDefined(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
   const tNode = previousOrParentNode.tNode;
 
   const isComponent = (directiveDef as ComponentDef<T>).template;
@@ -1494,7 +1496,7 @@ function generateInitialInputs(
 export function createLContainer(
     parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>,
     isForViewContainerRef?: boolean): LContainer {
-  ngDevMode && assertNotNull(parentLNode, 'containers should have a parent');
+  ngDevMode && assertDefined(parentLNode, 'containers should have a parent');
   return <LContainer>{
     views: [],
     nextIndex: isForViewContainerRef ? null : 0,
@@ -1611,7 +1613,7 @@ function refreshDynamicChildren() {
         const lViewNode = container.views[i];
         // The directives and pipes are not needed here as an existing view is only being refreshed.
         const dynamicView = lViewNode.data;
-        ngDevMode && assertNotNull(dynamicView.tView, 'TView must be allocated');
+        ngDevMode && assertDefined(dynamicView.tView, 'TView must be allocated');
         renderEmbeddedTemplate(lViewNode, dynamicView.tView, dynamicView.context !, renderer);
       }
     }
@@ -1699,7 +1701,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
 function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TView {
   ngDevMode && assertNodeType(parent, TNodeType.Container);
   const containerTViews = (parent !.tNode as TContainerNode).tViews as TView[];
-  ngDevMode && assertNotNull(containerTViews, 'TView expected');
+  ngDevMode && assertDefined(containerTViews, 'TView expected');
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
     const tView = currentView.tView;
@@ -1773,7 +1775,7 @@ export function componentRefresh<T>(directiveIndex: number, elementIndex: number
   ngDevMode && assertDataInRange(elementIndex);
   const element = data ![elementIndex] as LElementNode;
   ngDevMode && assertNodeType(element, TNodeType.Element);
-  ngDevMode && assertNotNull(element.data, `Component's host node should have an LView attached.`);
+  ngDevMode && assertDefined(element.data, `Component's host node should have an LView attached.`);
   const hostView = element.data !;
 
   // Only attached CheckAlways components or attached, dirty OnPush components should be checked
@@ -1928,13 +1930,13 @@ export function projection(
 function findComponentHost(lView: LView): LElementNode {
   let viewRootLNode = lView.node;
   while (viewRootLNode.tNode.type === TNodeType.View) {
-    ngDevMode && assertNotNull(lView.parent, 'lView.parent');
+    ngDevMode && assertDefined(lView.parent, 'lView.parent');
     lView = lView.parent !;
     viewRootLNode = lView.node;
   }
 
   ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
-  ngDevMode && assertNotNull(viewRootLNode.data, 'node.data');
+  ngDevMode && assertDefined(viewRootLNode.data, 'node.data');
 
   return viewRootLNode as LElementNode;
 }
@@ -2012,7 +2014,7 @@ export function markViewDirty(view: LView): void {
   }
   currentView.flags |= LViewFlags.Dirty;
 
-  ngDevMode && assertNotNull(currentView !.context, 'rootContext');
+  ngDevMode && assertDefined(currentView !.context, 'rootContext');
   scheduleTick(currentView !.context as RootContext);
 }
 
@@ -2033,7 +2035,7 @@ export function scheduleTick<T>(rootContext: RootContext) {
     let res: null|((val: null) => void);
     rootContext.clean = new Promise<null>((r) => res = r);
     rootContext.scheduler(() => {
-      tick(rootContext.component);
+      tickRootContext(rootContext);
       res !(null);
       rootContext.clean = _CLEAN_PROMISE;
     });
@@ -2054,11 +2056,18 @@ export function scheduleTick<T>(rootContext: RootContext) {
  */
 export function tick<T>(component: T): void {
   const rootView = getRootView(component);
-  const rootComponent = (rootView.context as RootContext).component;
-  const hostNode = _getComponentHostLElementNode(rootComponent);
+  const rootContext = rootView.context as RootContext;
+  tickRootContext(rootContext);
+}
 
-  ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
-  renderComponentOrTemplate(hostNode, rootView, rootComponent);
+function tickRootContext(rootContext: RootContext) {
+  for (let i = 0; i < rootContext.components.length; i++) {
+    const rootComponent = rootContext.components[i];
+    const hostNode = _getComponentHostLElementNode(rootComponent);
+
+    ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
+    renderComponentOrTemplate(hostNode, getRootView(rootComponent), rootComponent);
+  }
 }
 
 /**
@@ -2069,7 +2078,7 @@ export function tick<T>(component: T): void {
  */
 
 export function getRootView(component: any): LView {
-  ngDevMode && assertNotNull(component, 'component');
+  ngDevMode && assertDefined(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
   let lView = lElementNode.view;
   while (lView.parent) {
@@ -2093,7 +2102,7 @@ export function getRootView(component: any): LView {
  */
 export function detectChanges<T>(component: T): void {
   const hostNode = _getComponentHostLElementNode(component);
-  ngDevMode && assertNotNull(hostNode.data, 'Component host node should be attached to an LView');
+  ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
   detectChangesInternal(hostNode.data as LView, hostNode, component);
 }
 
@@ -2142,7 +2151,7 @@ export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode
  * @param component Component to mark as dirty.
  */
 export function markDirty<T>(component: T) {
-  ngDevMode && assertNotNull(component, 'component');
+  ngDevMode && assertDefined(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
   markViewDirty(lElementNode.view);
 }
@@ -2388,7 +2397,7 @@ export function load<T>(index: number): T {
 
 /** Retrieves a value from the `directives` array. */
 export function loadDirective<T>(index: number): T {
-  ngDevMode && assertNotNull(directives, 'Directives array should be defined if reading a dir.');
+  ngDevMode && assertDefined(directives, 'Directives array should be defined if reading a dir.');
   ngDevMode && assertDataInRange(index, directives !);
   return directives ![index];
 }
@@ -2453,7 +2462,7 @@ export function assertPreviousIsParent() {
 }
 
 function assertHasParent() {
-  assertNotNull(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
+  assertDefined(getParentLNode(previousOrParentNode), 'previousOrParentNode should have a parent');
 }
 
 function assertDataInRange(index: number, arr?: any[]) {
@@ -2484,9 +2493,9 @@ export function assertReservedSlotInitialized(slotOffset: number, numSlots: numb
 }
 
 export function _getComponentHostLElementNode<T>(component: T): LElementNode {
-  ngDevMode && assertNotNull(component, 'expecting component got null');
+  ngDevMode && assertDefined(component, 'expecting component got null');
   const lElementNode = (component as any)[NG_HOST_SYMBOL] as LElementNode;
-  ngDevMode && assertNotNull(component, 'object is not a component');
+  ngDevMode && assertDefined(component, 'object is not a component');
   return lElementNode;
 }
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index c069e6f0ed..204c1e0960 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -420,10 +420,10 @@ export interface RootContext {
   clean: Promise<null>;
 
   /**
-   * RootComponent - The component which was instantiated by the call to
+   * RootComponents - The components that were instantiated by the call to
    * {@link renderComponent}.
    */
-  component: {};
+  components: {}[];
 }
 
 /**
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
new file mode 100644
index 0000000000..1844b3b57c
--- /dev/null
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -0,0 +1,73 @@
+/**
+ * @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 {Injector} from '../di/injector';
+import {StaticProvider} from '../di/provider';
+import {createInjector} from '../di/r3_injector';
+import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
+import {InternalNgModuleRef, NgModuleFactory as viewEngine_NgModuleFactory, NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
+import {Type} from '../type';
+import {stringify} from '../util';
+import {assertDefined} from './assert';
+import {ComponentFactoryResolver} from './component_ref';
+
+export interface NgModuleType { ngModuleDef: NgModuleDef; }
+
+export interface NgModuleDef { bootstrap: Type<any>[]; }
+
+export const COMPONENT_FACTORY_RESOLVER: StaticProvider = {
+  provide: viewEngine_ComponentFactoryResolver,
+  useFactory: () => new ComponentFactoryResolver(),
+  deps: [],
+};
+
+export class NgModuleRef<T> extends viewEngine_NgModuleRef<T> implements InternalNgModuleRef<T> {
+  // tslint:disable-next-line:require-internal-with-underscore
+  _bootstrapComponents: Type<any>[] = [];
+  injector: Injector;
+  componentFactoryResolver: viewEngine_ComponentFactoryResolver;
+  instance: T;
+  destroyCbs: (() => void)[]|null = [];
+
+  constructor(ngModuleType: Type<T>, parentInjector: Injector|null) {
+    super();
+    const ngModuleDef = (ngModuleType as any as NgModuleType).ngModuleDef;
+    ngDevMode && assertDefined(
+                     ngModuleDef,
+                     `NgModule '${stringify(ngModuleType)}' is not a subtype of 'NgModuleType'.`);
+
+    this._bootstrapComponents = ngModuleDef.bootstrap;
+    const additionalProviders: StaticProvider[] = [
+      COMPONENT_FACTORY_RESOLVER, {
+        provide: viewEngine_NgModuleRef,
+        useValue: this,
+      }
+    ];
+    this.injector = createInjector(ngModuleType, parentInjector, additionalProviders);
+    this.instance = this.injector.get(ngModuleType);
+    this.componentFactoryResolver = new ComponentFactoryResolver();
+  }
+
+  destroy(): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.forEach(fn => fn());
+    this.destroyCbs = null;
+  }
+  onDestroy(callback: () => void): void {
+    ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
+    this.destroyCbs !.push(callback);
+  }
+}
+
+export class NgModuleFactory<T> extends viewEngine_NgModuleFactory<T> {
+  constructor(public moduleType: Type<T>) { super(); }
+
+  create(parentInjector: Injector|null): viewEngine_NgModuleRef<T> {
+    return new NgModuleRef(this.moduleType, parentInjector);
+  }
+}
diff --git a/packages/core/src/render3/node_assert.ts b/packages/core/src/render3/node_assert.ts
index 73bf9b6997..c30a0f2455 100644
--- a/packages/core/src/render3/node_assert.ts
+++ b/packages/core/src/render3/node_assert.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertEqual, assertNotNull} from './assert';
+import {assertDefined, assertEqual} from './assert';
 import {LNode, TNodeType} from './interfaces/node';
 
 export function assertNodeType(node: LNode, type: TNodeType) {
-  assertNotNull(node, 'should be called with a node');
+  assertDefined(node, 'should be called with a node');
   assertEqual(node.tNode.type, type, `should be a ${typeName(type)}`);
 }
 
 export function assertNodeOfPossibleTypes(node: LNode, ...types: TNodeType[]) {
-  assertNotNull(node, 'should be called with a node');
+  assertDefined(node, 'should be called with a node');
   const found = types.some(type => node.tNode.type === type);
   assertEqual(found, true, `Should be one of ${types.map(typeName).join(', ')}`);
 }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index db4eb95d50..716565fc71 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertNotNull} from './assert';
+import {assertDefined} from './assert';
 import {callHooks} from './hooks';
 import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
 import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 73f2ab55ec..db94094e24 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -8,7 +8,7 @@
 
 import './ng_dev_mode';
 
-import {assertNotNull} from './assert';
+import {assertDefined} from './assert';
 import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
@@ -36,7 +36,7 @@ function isCssClassMatching(nodeClassAttrVal: string, cssClassToMatch: string):
  * @returns true if node matches the selector.
  */
 export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boolean {
-  ngDevMode && assertNotNull(selector[0], 'Selector should have a tag name');
+  ngDevMode && assertDefined(selector[0], 'Selector should have a tag name');
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index fd6a667a01..c04f3f48c8 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -15,7 +15,7 @@ import {QueryList as viewEngine_QueryList} from '../linker/query_list';
 import {Type} from '../type';
 import {getSymbolIterator} from '../util';
 
-import {assertEqual, assertNotNull} from './assert';
+import {assertDefined, assertEqual} from './assert';
 import {ReadFromInjectorFn, getOrCreateNodeInjectorForNode} from './di';
 import {assertPreviousIsParent, getCurrentQueries, store, storeCleanupWithContext} from './instructions';
 import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
@@ -163,7 +163,7 @@ export class LQueries_ implements LQueries {
     let query = this.deep;
     while (query) {
       ngDevMode &&
-          assertNotNull(
+          assertDefined(
               query.containerValues, 'View queries need to have a pointer to container values.');
       query.containerValues !.splice(index, 0, query.values);
       query = query.next;
@@ -179,7 +179,7 @@ export class LQueries_ implements LQueries {
     let query = this.deep;
     while (query) {
       ngDevMode &&
-          assertNotNull(
+          assertDefined(
               query.containerValues, 'View queries need to have a pointer to container values.');
       const removed = query.containerValues !.splice(index, 1);
 
@@ -273,7 +273,7 @@ function add(query: LQuery<any>| null, node: LNode) {
         if (directiveIdx !== null) {
           // a node is matching a predicate - determine what to read
           // note that queries using name selector must specify read strategy
-          ngDevMode && assertNotNull(predicate.read, 'the node should have a predicate');
+          ngDevMode && assertDefined(predicate.read, 'the node should have a predicate');
           const result = readFromNodeInjector(nodeInjector, node, predicate.read !, directiveIdx);
           if (result !== null) {
             addMatch(query, result);
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 060f2c997b..17a7beb5a8 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ApplicationRef} from '../application_ref';
+import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
-import {EmbeddedViewRef as viewEngine_EmbeddedViewRef} from '../linker/view_ref';
+import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
 
 import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn} from './instructions';
 import {ComponentTemplate} from './interfaces/definition';
@@ -15,7 +17,15 @@ import {LViewNode} from './interfaces/node';
 import {LView, LViewFlags} from './interfaces/view';
 import {destroyLView} from './node_manipulation';
 
-export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
+// Needed due to tsickle downleveling where multiple `implements` with classes creates
+// multiple @extends in Closure annotations, which is illegal. This workaround fixes
+// the multiple @extends by making the annotation @implements instead
+export interface viewEngine_ChangeDetectorRef_interface extends viewEngine_ChangeDetectorRef {}
+
+export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_InternalViewRef,
+    viewEngine_ChangeDetectorRef_interface {
+  private _appRef: ApplicationRef|null;
+
   context: T;
   rootNodes: any[];
 
@@ -210,6 +220,10 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T> {
    * introduce other changes.
    */
   checkNoChanges(): void { checkNoChanges(this.context); }
+
+  detachFromAppRef() { this._appRef = null; }
+
+  attachToAppRef(appRef: ApplicationRef) { this._appRef = appRef; }
 }
 
 
diff --git a/packages/core/test/application_ref_integration_spec.ts b/packages/core/test/application_ref_integration_spec.ts
new file mode 100644
index 0000000000..9dee7acc17
--- /dev/null
+++ b/packages/core/test/application_ref_integration_spec.ts
@@ -0,0 +1,95 @@
+/**
+ * @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 {ApplicationModule, ApplicationRef, DoCheck, InjectFlags, InjectorType, Input, OnInit, PlatformRef, TestabilityRegistry, Type, defineInjector, inject, ɵE as elementStart, ɵNgModuleDef as NgModuleDef, ɵRenderFlags as RenderFlags, ɵT as text, ɵdefineComponent as defineComponent, ɵe as elementEnd, ɵi1 as interpolation1, ɵt as textBinding} from '@angular/core';
+import {getTestBed, withBody} from '@angular/core/testing';
+import {BrowserModule, EVENT_MANAGER_PLUGINS, platformBrowser} from '@angular/platform-browser';
+
+import {BROWSER_MODULE_PROVIDERS} from '../../platform-browser/src/browser';
+import {APPLICATION_MODULE_PROVIDERS} from '../src/application_module';
+import {NgModuleFactory} from '../src/render3/ng_module_ref';
+
+describe('ApplicationRef bootstrap', () => {
+  class HelloWorldComponent implements OnInit, DoCheck {
+    log: string[] = [];
+    name = 'World';
+    static ngComponentDef = defineComponent({
+      type: HelloWorldComponent,
+      selectors: [['hello-world']],
+      factory: () => new HelloWorldComponent(),
+      template: function(rf: RenderFlags, ctx: HelloWorldComponent): void {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'div');
+          text(1);
+          elementEnd();
+        }
+        if (rf & RenderFlags.Update) {
+          textBinding(1, interpolation1('Hello ', ctx.name, ''));
+        }
+      }
+    });
+
+    ngOnInit(): void { this.log.push('OnInit'); }
+
+    ngDoCheck(): void { this.log.push('DoCheck'); }
+  }
+
+  class MyAppModule {
+    static ngInjectorDef =
+        defineInjector({factory: () => new MyAppModule(), imports: [BrowserModule]});
+    static ngModuleDef = defineNgModule({bootstrap: [HelloWorldComponent]});
+  }
+
+  it('should bootstrap hello world', withBody('<hello-world></hello-world>', async() => {
+       const MyAppModuleFactory = new NgModuleFactory(MyAppModule);
+       const moduleRef =
+           await getTestBed().platform.bootstrapModuleFactory(MyAppModuleFactory, {ngZone: 'noop'});
+       const appRef = moduleRef.injector.get(ApplicationRef);
+       const helloWorldComponent = appRef.components[0].instance as HelloWorldComponent;
+       expect(document.body.innerHTML).toEqual('<hello-world><div>Hello World</div></hello-world>');
+       // TODO(jasonaden): Get with Kara on lifecycle hooks
+       //  expect(helloWorldComponent.log).toEqual(['OnInit', 'DoCheck']);
+       helloWorldComponent.name = 'Mundo';
+       appRef.tick();
+       expect(document.body.innerHTML).toEqual('<hello-world><div>Hello Mundo</div></hello-world>');
+       // TODO(jasonaden): Get with Kara on lifecycle hooks
+       //  expect(helloWorldComponent.log).toEqual(['OnInit', 'DoCheck', 'DoCheck']);
+
+       // Cleanup TestabilityRegistry
+       const registry: TestabilityRegistry = getTestBed().get(TestabilityRegistry);
+       registry.unregisterAllApplications();
+     }));
+
+});
+
+/////////////////////////////////////////////////////////
+
+// These go away when Compiler is ready
+
+(BrowserModule as any as InjectorType<BrowserModule>).ngInjectorDef = defineInjector({
+  factory: function BrowserModule_Factory() {
+    return new BrowserModule(inject(BrowserModule, InjectFlags.Optional | InjectFlags.SkipSelf));
+  },
+  imports: [ApplicationModule],
+  providers: BROWSER_MODULE_PROVIDERS
+});
+
+(ApplicationModule as any as InjectorType<ApplicationModule>).ngInjectorDef = defineInjector({
+  factory: function ApplicationModule_Factory() {
+    return new ApplicationModule(inject(ApplicationRef));
+  },
+  providers: APPLICATION_MODULE_PROVIDERS
+});
+
+export function defineNgModule({bootstrap}: {bootstrap?: Type<any>[]}): NgModuleDef {
+  return {
+    bootstrap: bootstrap || [],
+  };
+}
+
+/////////////////////////////////////////////////////////
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index df06f6a31f..c1c0de6f38 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -56,6 +56,9 @@
   {
     "name": "createLView"
   },
+  {
+    "name": "createRootContext"
+  },
   {
     "name": "createTNode"
   },
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index 56d1450518..c359140b00 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -2418,7 +2418,7 @@
     "name": "assertInterpolationSymbols"
   },
   {
-    "name": "assertNotNull$1"
+    "name": "assertNotNull"
   },
   {
     "name": "assertPlatform"
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 64f8a6e020..865432ac91 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -266,6 +266,9 @@
   {
     "name": "createOutput"
   },
+  {
+    "name": "createRootContext"
+  },
   {
     "name": "createTNode"
   },
@@ -657,7 +660,7 @@
     "name": "throwMultipleComponentError"
   },
   {
-    "name": "tick"
+    "name": "tickRootContext"
   },
   {
     "name": "trackByIdentity"
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 7d08f65de5..5e690b2f86 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -41,6 +41,8 @@ describe('InjectorDef-based createInjector()', () => {
 
   const STATIC_TOKEN = new InjectionToken<StaticService>('STATIC_TOKEN');
 
+  const LOCALE = new InjectionToken<string[]>('LOCALE');
+
   class ServiceWithDep {
     constructor(readonly service: Service) {}
 
@@ -50,6 +52,15 @@ describe('InjectorDef-based createInjector()', () => {
     });
   }
 
+  class ServiceWithMultiDep {
+    constructor(readonly locale: string[]) {}
+
+    static ngInjectableDef = defineInjectable({
+      providedIn: null,
+      factory: () => new ServiceWithMultiDep(inject(LOCALE)),
+    });
+  }
+
   class ServiceTwo {
     static ngInjectableDef = defineInjectable({
       providedIn: null,
@@ -112,6 +123,9 @@ describe('InjectorDef-based createInjector()', () => {
       imports: [IntermediateModule],
       providers: [
         ServiceWithDep,
+        ServiceWithMultiDep,
+        {provide: LOCALE, multi: true, useValue: 'en'},
+        {provide: LOCALE, multi: true, useValue: 'es'},
         Service,
         {provide: SERVICE_TOKEN, useExisting: Service},
         CircularA,
@@ -168,6 +182,12 @@ describe('InjectorDef-based createInjector()', () => {
     expect(instance.service).toBe(injector.get(Service));
   });
 
+  it('injects a service with dependencies on multi-providers', () => {
+    const instance = injector.get(ServiceWithMultiDep);
+    expect(instance instanceof ServiceWithMultiDep);
+    expect(instance.locale).toEqual(['en', 'es']);
+  });
+
   it('injects a token with useExisting', () => {
     const instance = injector.get(SERVICE_TOKEN);
     expect(instance).toBe(injector.get(Service));
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index 7b7026e9a2..148f447ded 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -7,9 +7,9 @@
  */
 
 
-import {ComponentFactory, DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
+import {DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
 import {getRenderedText} from '../../src/render3/component';
-import {LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
+import {ComponentFactory, LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding, tick} from '../../src/render3/instructions';
 import {ComponentDef, DirectiveDef, RenderFlags} from '../../src/render3/interfaces/definition';
 import {createRendererType2} from '../../src/view/index';
@@ -364,4 +364,27 @@ describe('recursive components', () => {
     tick(comp);
     expect(events).toEqual(['check6', 'check2', 'check0', 'check1', 'check5', 'check3', 'check4']);
   });
+
+  it('should map inputs minified & unminified names', async() => {
+    class TestInputsComponent {
+      minifiedName: string;
+      static ngComponentDef = defineComponent({
+        type: TestInputsComponent,
+        selectors: [['test-inputs']],
+        inputs: {minifiedName: 'unminifiedName'},
+        factory: () => new TestInputsComponent(),
+        template: function(rf: RenderFlags, ctx: TestInputsComponent): void {
+          // Template not needed for this test
+        }
+      });
+    }
+
+    const testInputsComponentFactory = new ComponentFactory(TestInputsComponent.ngComponentDef);
+
+    expect([
+      {propName: 'minifiedName', templateName: 'unminifiedName'}
+    ]).toEqual(testInputsComponentFactory.inputs);
+
+  });
+
 });
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index cb4bf297ad..0a68b1ead8 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -135,7 +135,7 @@ export class ComponentFixture<T> extends BaseFixture {
 // Fixtures above are preferred way of testing Components and Templates
 ///////////////////////////////////////////////////////////////////////////////////
 
-export const document = ((global || window) as any).document;
+export const document = ((typeof global == 'object' && global || window) as any).document;
 export let containerEl: HTMLElement = null !;
 let host: LElementNode|null;
 const isRenderer2 =
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index dc13d2bdbb..9550029af9 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, PlatformLocation, ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
-import {APP_ID, ApplicationModule, ErrorHandler, ModuleWithProviders, NgModule, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
+import {APP_ID, ApplicationModule, ClassProvider, ConstructorSansProvider, ErrorHandler, ExistingProvider, FactoryProvider, Inject, InjectionToken, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
 
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserPlatformLocation} from './browser/location/browser_platform_location';
@@ -20,7 +20,7 @@ import {getDOM} from './dom/dom_adapter';
 import {DomRendererFactory2} from './dom/dom_renderer';
 import {DOCUMENT} from './dom/dom_tokens';
 import {DomEventsPlugin} from './dom/events/dom_events';
-import {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
+import {EVENT_MANAGER_PLUGINS, EventManager, EventManagerPlugin} from './dom/events/event_manager';
 import {HAMMER_GESTURE_CONFIG, HammerGestureConfig, HammerGesturesPlugin} from './dom/events/hammer_gestures';
 import {KeyEventsPlugin} from './dom/events/key_events';
 import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
@@ -60,34 +60,47 @@ export function _document(): any {
   return document;
 }
 
+export const BROWSER_MODULE_PROVIDERS: StaticProvider[] = [
+  BROWSER_SANITIZATION_PROVIDERS,
+  {provide: APP_ROOT, useValue: true},
+  {provide: ErrorHandler, useFactory: errorHandler, deps: []},
+  {
+    provide: EVENT_MANAGER_PLUGINS,
+    useClass: DomEventsPlugin,
+    multi: true,
+    deps: [DOCUMENT, NgZone, PLATFORM_ID]
+  },
+  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true, deps: [DOCUMENT]},
+  {
+    provide: EVENT_MANAGER_PLUGINS,
+    useClass: HammerGesturesPlugin,
+    multi: true,
+    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG]
+  },
+  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig, deps: []},
+  {
+    provide: DomRendererFactory2,
+    useClass: DomRendererFactory2,
+    deps: [EventManager, DomSharedStylesHost]
+  },
+  {provide: RendererFactory2, useExisting: DomRendererFactory2},
+  {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
+  {provide: DomSharedStylesHost, useClass: DomSharedStylesHost, deps: [DOCUMENT]},
+  {provide: Testability, useClass: Testability, deps: [NgZone]},
+  {provide: EventManager, useClass: EventManager, deps: [EVENT_MANAGER_PLUGINS, NgZone]},
+  ELEMENT_PROBE_PROVIDERS,
+  {provide: Meta, useClass: Meta, deps: [DOCUMENT]},
+  {provide: Title, useClass: Title, deps: [DOCUMENT]},
+];
+
 /**
  * The ng module for the browser.
  *
  *
  */
-@NgModule({
-  providers: [
-    BROWSER_SANITIZATION_PROVIDERS,
-    {provide: APP_ROOT, useValue: true},
-    {provide: ErrorHandler, useFactory: errorHandler, deps: []},
-    {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
-    {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true},
-    {provide: EVENT_MANAGER_PLUGINS, useClass: HammerGesturesPlugin, multi: true},
-    {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig},
-    DomRendererFactory2,
-    {provide: RendererFactory2, useExisting: DomRendererFactory2},
-    {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
-    DomSharedStylesHost,
-    Testability,
-    EventManager,
-    ELEMENT_PROBE_PROVIDERS,
-    Meta,
-    Title,
-  ],
-  exports: [CommonModule, ApplicationModule]
-})
+@NgModule({providers: BROWSER_MODULE_PROVIDERS, exports: [CommonModule, ApplicationModule]})
 export class BrowserModule {
-  constructor(@Optional() @SkipSelf() parentModule: BrowserModule) {
+  constructor(@Optional() @SkipSelf() @Inject(BrowserModule) parentModule: BrowserModule|null) {
     if (parentModule) {
       throw new Error(
           `BrowserModule has already been loaded. If you need access to common directives such as NgIf and NgFor from a lazy loaded module, import CommonModule instead.`);
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index d781017237..d65ed33a3c 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -143,6 +143,11 @@ export declare abstract class ComponentRef<C> {
     abstract onDestroy(callback: Function): void;
 }
 
+/** @experimental */
+export interface ConstructorSansProvider {
+    deps?: any[];
+}
+
 export declare const ContentChild: ContentChildDecorator;
 
 export interface ContentChildDecorator {
@@ -168,7 +173,7 @@ export interface ContentChildrenDecorator {
 }
 
 /** @experimental */
-export declare function createInjector(defType: any, parent?: Injector | null): Injector;
+export declare function createInjector(defType: any, parent?: Injector | null, additionalProviders?: StaticProvider[] | null): Injector;
 
 /** @experimental */
 export declare function createPlatform(injector: Injector): PlatformRef;
@@ -609,7 +614,7 @@ export interface Predicate<T> {
     (value: T): boolean;
 }
 
-export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ExistingProvider | FactoryProvider | any[];
+export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider | ExistingProvider | FactoryProvider | any[];
 
 export declare abstract class Query {
 }
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
index e1c07cbe9b..52231287f2 100644
--- a/tools/public_api_guard/platform-browser/platform-browser.d.ts
+++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts
@@ -1,5 +1,5 @@
 export declare class BrowserModule {
-    constructor(parentModule: BrowserModule);
+    constructor(parentModule: BrowserModule | null);
     /** @experimental */ static withServerTransition(params: {
         appId: string;
     }): ModuleWithProviders;

From bd02b27ee1a60a3c900d373e734c1a9ee6c4d294 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 1 Jun 2018 12:02:48 -0700
Subject: [PATCH 224/582] feat(core): expose a Compiler API for accessing
 module ids from NgModule types (#24258)

This will allow RouterTestingModule to better support lazy loading of modules
when using summaries, since it can detect whether a module is already loaded
if it can access the id.

PR Close #24258
---
 packages/core/src/linker/compiler.ts           |  5 +++++
 .../src/compiler_factory.ts                    |  4 ++++
 .../test/testing_public_browser_spec.ts        | 18 +++++++++++++++++-
 .../testing/src/compiler_factory.ts            |  4 ++++
 tools/public_api_guard/core/core.d.ts          |  1 +
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/linker/compiler.ts b/packages/core/src/linker/compiler.ts
index d9e5acec94..86446a9eae 100644
--- a/packages/core/src/linker/compiler.ts
+++ b/packages/core/src/linker/compiler.ts
@@ -78,6 +78,11 @@ export class Compiler {
    * Clears the cache for the given component/ngModule.
    */
   clearCacheFor(type: Type<any>) {}
+
+  /**
+   * Returns the id for a given NgModule, if one is defined and known to the compiler.
+   */
+  getModuleId(moduleType: Type<any>): string|undefined { return undefined; }
 }
 
 /**
diff --git a/packages/platform-browser-dynamic/src/compiler_factory.ts b/packages/platform-browser-dynamic/src/compiler_factory.ts
index 1e71000025..dd7e887f05 100644
--- a/packages/platform-browser-dynamic/src/compiler_factory.ts
+++ b/packages/platform-browser-dynamic/src/compiler_factory.ts
@@ -78,6 +78,10 @@ export class CompilerImpl implements Compiler {
   }
   clearCache(): void { this._delegate.clearCache(); }
   clearCacheFor(type: Type<any>) { this._delegate.clearCacheFor(type); }
+  getModuleId(moduleType: Type<any>): string|undefined {
+    const meta = this._metadataResolver.getNgModuleMetadata(moduleType);
+    return meta && meta.id || undefined;
+  }
 }
 
 /**
diff --git a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
index 668a552eb9..f219a92ffe 100644
--- a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
+++ b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {ResourceLoader} from '@angular/compiler';
-import {Component} from '@angular/core';
+import {Compiler, Component, NgModule} from '@angular/core';
 import {TestBed, async, fakeAsync, inject, tick} from '@angular/core/testing';
 
 import {ResourceLoaderImpl} from '../src/resource_loader/resource_loader_impl';
@@ -77,6 +77,22 @@ class BadTemplateUrl {
       });
     });
 
+    describe('Compiler', () => {
+      it('should return NgModule id when asked', () => {
+        @NgModule({
+          id: 'test-module',
+        })
+        class TestModule {
+        }
+
+        TestBed.configureTestingModule({
+          imports: [TestModule],
+        });
+        const compiler = TestBed.get(Compiler) as Compiler;
+        expect(compiler.getModuleId(TestModule)).toBe('test-module');
+      });
+    });
+
     describe('errors', () => {
       let originalJasmineIt: any;
 
diff --git a/packages/platform-browser-dynamic/testing/src/compiler_factory.ts b/packages/platform-browser-dynamic/testing/src/compiler_factory.ts
index b2dda8b0f9..02d139f25c 100644
--- a/packages/platform-browser-dynamic/testing/src/compiler_factory.ts
+++ b/packages/platform-browser-dynamic/testing/src/compiler_factory.ts
@@ -99,4 +99,8 @@ export class TestingCompilerImpl implements TestingCompiler {
   clearCacheFor(type: Type<any>) { this._compiler.clearCacheFor(type); }
 
   getComponentFromError(error: Error) { return (error as any)[ERROR_COMPONENT_TYPE] || null; }
+
+  getModuleId(moduleType: Type<any>): string|undefined {
+    return this._moduleResolver.resolve(moduleType, true).id;
+  }
 }
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index d65ed33a3c..7c6a03a6e3 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -86,6 +86,7 @@ export declare class Compiler {
     compileModuleAndAllComponentsSync<T>(moduleType: Type<T>): ModuleWithComponentFactories<T>;
     compileModuleAsync<T>(moduleType: Type<T>): Promise<NgModuleFactory<T>>;
     compileModuleSync<T>(moduleType: Type<T>): NgModuleFactory<T>;
+    getModuleId(moduleType: Type<any>): string | undefined;
 }
 
 /** @experimental */

From f781f741eaf2aa1bc528b0af2846cb1b8e8794a7 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 6 Jun 2018 20:43:17 -0700
Subject: [PATCH 225/582] refactor(ivy): remove need for LContainer.template
 (#24335)

PR Close #24335
---
 packages/core/src/render3/di.ts                   |  7 +------
 packages/core/src/render3/instructions.ts         | 12 +++++++-----
 packages/core/src/render3/interfaces/container.ts |  6 ------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 4129107841..a8a800f846 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -572,7 +572,7 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
 
     ngDevMode && assertNodeOfPossibleTypes(vcRefHost, TNodeType.Container, TNodeType.Element);
     const hostParent = getParentLNode(vcRefHost) !;
-    const lContainer = createLContainer(hostParent, vcRefHost.view, undefined, true);
+    const lContainer = createLContainer(hostParent, vcRefHost.view, true);
     const lContainerNode: LContainerNode = createLNodeObject(
         TNodeType.Container, vcRefHost.view, hostParent, undefined, lContainer, null);
 
@@ -702,11 +702,6 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
     ngDevMode && assertNodeType(di.node, TNodeType.Container);
     const hostNode = di.node as LContainerNode;
     const hostTNode = hostNode.tNode;
-    const hostTView = hostNode.view.tView;
-    if (!hostTNode.tViews) {
-      hostTNode.tViews = createTView(
-          -1, hostNode.data.template !, hostTView.directiveRegistry, hostTView.pipeRegistry);
-    }
     ngDevMode && assertDefined(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
         getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(), hostNode.data.queries);
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 3b2dcf65bf..e14ee63070 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1494,8 +1494,7 @@ function generateInitialInputs(
  * @returns LContainer
  */
 export function createLContainer(
-    parentLNode: LNode, currentView: LView, template?: ComponentTemplate<any>,
-    isForViewContainerRef?: boolean): LContainer {
+    parentLNode: LNode, currentView: LView, isForViewContainerRef?: boolean): LContainer {
   ngDevMode && assertDefined(parentLNode, 'containers should have a parent');
   return <LContainer>{
     views: [],
@@ -1503,7 +1502,6 @@ export function createLContainer(
     // If the direct parent of the container is a view, its views will need to be added
     // through insertView() when its parent view is being inserted:
     renderParent: canInsertNativeNode(parentLNode, currentView) ? parentLNode : null,
-    template: template == null ? null : template,
     next: null,
     parent: currentView,
     queries: null
@@ -1529,12 +1527,16 @@ export function container(
           currentView.bindingIndex, -1, 'container nodes should be created before any bindings');
 
   const currentParent = isParent ? previousOrParentNode : getParentLNode(previousOrParentNode) !;
-  const lContainer = createLContainer(currentParent, currentView, template);
+  const lContainer = createLContainer(currentParent, currentView);
 
   const node = createLNode(
       index, TNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
 
-  if (firstTemplatePass && template == null) node.tNode.tViews = [];
+  if (firstTemplatePass) {
+    const tView = currentView.tView;
+    node.tNode.tViews =
+        template ? createTView(-1, template, tView.directiveRegistry, tView.pipeRegistry) : [];
+  }
 
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
diff --git a/packages/core/src/render3/interfaces/container.ts b/packages/core/src/render3/interfaces/container.ts
index 54cb538d7d..5ea41442d8 100644
--- a/packages/core/src/render3/interfaces/container.ts
+++ b/packages/core/src/render3/interfaces/container.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentTemplate} from './definition';
 import {LContainerNode, LElementNode, LViewNode} from './node';
 import {LQueries} from './query';
 import {LView, TView} from './view';
@@ -67,11 +66,6 @@ export interface LContainer {
    */
   renderParent: LElementNode|null;
 
-  /**
-   * The template extracted from the location of the Container.
-   */
-  readonly template: ComponentTemplate<any>|null;
-
   /**
    * Queries active for this container - all the views inserted to / removed from
    * this container are reported to queries referenced here.

From ca79e11bfad4c1ed41c413262eeaf302a892992b Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 30 May 2018 16:02:53 -0700
Subject: [PATCH 226/582] feat(ivy): a generic visitor which allows prefixing
 nodes for ngtsc (#24230)

This adds ngtsc/util/src/visitor, a utility for visiting TS ASTs that
can add synthetic nodes immediately prior to certain types of nodes (e.g.
class declarations). It's useful to lift definitions that need to be
referenced repeatedly in generated code outside of the class that defines
them.

PR Close #24230
---
 .../src/ngtsc/metadata/test/BUILD.bazel       |   1 +
 .../src/ngtsc/metadata/test/reflector_spec.ts |  11 +-
 .../src/ngtsc/metadata/test/resolver_spec.ts  |  16 +--
 .../src/ngtsc/testing/BUILD.bazel             |  15 +++
 .../test => testing}/in_memory_typescript.ts  |   9 +-
 .../compiler-cli/src/ngtsc/util/BUILD.bazel   |  12 ++
 .../src/ngtsc/util/src/visitor.ts             | 118 ++++++++++++++++++
 .../src/ngtsc/util/test/BUILD.bazel           |  26 ++++
 .../src/ngtsc/util/test/visitor_spec.ts       |  94 ++++++++++++++
 9 files changed, 284 insertions(+), 18 deletions(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
 rename packages/compiler-cli/src/ngtsc/{metadata/test => testing}/in_memory_typescript.ts (95%)
 create mode 100644 packages/compiler-cli/src/ngtsc/util/BUILD.bazel
 create mode 100644 packages/compiler-cli/src/ngtsc/util/src/visitor.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
 create mode 100644 packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts

diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
index f62ae96cae..746e88739e 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
@@ -12,6 +12,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/compiler-cli/src/ngtsc/metadata",
+        "//packages/compiler-cli/src/ngtsc/testing",
     ],
 )
 
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
index 0d66504794..f7cf26bd17 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
@@ -8,14 +8,13 @@
 
 import * as ts from 'typescript';
 
+import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
 import {Parameter, reflectConstructorParameters} from '../src/reflector';
 
-import {getDeclaration, makeProgram} from './in_memory_typescript';
-
 describe('reflector', () => {
   describe('ctor params', () => {
     it('should reflect a single argument', () => {
-      const program = makeProgram([{
+      const {program} = makeProgram([{
         name: 'entry.ts',
         contents: `
             class Bar {}
@@ -33,7 +32,7 @@ describe('reflector', () => {
     });
 
     it('should reflect a decorated argument', () => {
-      const program = makeProgram([
+      const {program} = makeProgram([
         {
           name: 'dec.ts',
           contents: `
@@ -61,7 +60,7 @@ describe('reflector', () => {
     });
 
     it('should reflect a decorated argument with a call', () => {
-      const program = makeProgram([
+      const {program} = makeProgram([
         {
           name: 'dec.ts',
           contents: `
@@ -89,7 +88,7 @@ describe('reflector', () => {
     });
 
     it('should reflect a decorated argument with an indirection', () => {
-      const program = makeProgram([
+      const {program} = makeProgram([
         {
           name: 'bar.ts',
           contents: `
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
index 04920b8efb..8f6feddf27 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
@@ -8,17 +8,17 @@
 
 import * as ts from 'typescript';
 
+import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
 import {ResolvedValue, staticallyResolve} from '../src/resolver';
 
-import {getDeclaration, makeProgram} from './in_memory_typescript';
-
 function makeSimpleProgram(contents: string): ts.Program {
-  return makeProgram([{name: 'entry.ts', contents}]);
+  return makeProgram([{name: 'entry.ts', contents}]).program;
 }
 
 function makeExpression(
     code: string, expr: string): {expression: ts.Expression, checker: ts.TypeChecker} {
-  const program = makeProgram([{name: 'entry.ts', contents: `${code}; const target$ = ${expr};`}]);
+  const {program} =
+      makeProgram([{name: 'entry.ts', contents: `${code}; const target$ = ${expr};`}]);
   const checker = program.getTypeChecker();
   const decl = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
   return {
@@ -34,7 +34,7 @@ function evaluate<T extends ResolvedValue>(code: string, expr: string): T {
 
 describe('ngtsc metadata', () => {
   it('reads a file correctly', () => {
-    const program = makeProgram([
+    const {program} = makeProgram([
       {
         name: 'entry.ts',
         contents: `
@@ -117,7 +117,7 @@ describe('ngtsc metadata', () => {
   });
 
   it('reads values from default exports', () => {
-    const program = makeProgram([
+    const {program} = makeProgram([
       {name: 'second.ts', contents: 'export default {property: "test"}'},
       {
         name: 'entry.ts',
@@ -135,7 +135,7 @@ describe('ngtsc metadata', () => {
   });
 
   it('reads values from named exports', () => {
-    const program = makeProgram([
+    const {program} = makeProgram([
       {name: 'second.ts', contents: 'export const a = {property: "test"};'},
       {
         name: 'entry.ts',
@@ -152,7 +152,7 @@ describe('ngtsc metadata', () => {
   });
 
   it('chain of re-exports works', () => {
-    const program = makeProgram([
+    const {program} = makeProgram([
       {name: 'const.ts', contents: 'export const value = {property: "test"};'},
       {name: 'def.ts', contents: `import {value} from './const'; export default value;`},
       {name: 'indirect-reexport.ts', contents: `import value from './def'; export {value};`},
diff --git a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
new file mode 100644
index 0000000000..9396da86ca
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
@@ -0,0 +1,15 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "testing",
+    testonly = 1,
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    deps = [
+        "//packages:types",
+    ],
+)
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/in_memory_typescript.ts b/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
similarity index 95%
rename from packages/compiler-cli/src/ngtsc/metadata/test/in_memory_typescript.ts
rename to packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
index 78f3206db7..ad9356834a 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/in_memory_typescript.ts
+++ b/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
@@ -9,7 +9,8 @@
 import * as path from 'path';
 import * as ts from 'typescript';
 
-export function makeProgram(files: {name: string, contents: string}[]): ts.Program {
+export function makeProgram(files: {name: string, contents: string}[]):
+    {program: ts.Program, host: ts.CompilerHost} {
   const host = new InMemoryHost();
   files.forEach(file => host.writeFile(file.name, file.contents));
 
@@ -17,10 +18,10 @@ export function makeProgram(files: {name: string, contents: string}[]): ts.Progr
   const program = ts.createProgram(rootNames, {noLib: true, experimentalDecorators: true}, host);
   const diags = [...program.getSyntacticDiagnostics(), ...program.getSemanticDiagnostics()];
   if (diags.length > 0) {
-    fail(diags.map(diag => diag.messageText).join(', '));
-    throw new Error(`Typescript diagnostics failed!`);
+    throw new Error(
+        `Typescript diagnostics failed! ${diags.map(diag => diag.messageText).join(', ')}`);
   }
-  return program;
+  return {program, host};
 }
 
 export class InMemoryHost implements ts.CompilerHost {
diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
new file mode 100644
index 0000000000..c8d3c82949
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "util",
+    srcs = glob([
+        "index.ts",
+        "src/**/*.ts",
+    ]),
+    module_name = "@angular/compiler-cli/src/ngtsc/util",
+)
diff --git a/packages/compiler-cli/src/ngtsc/util/src/visitor.ts b/packages/compiler-cli/src/ngtsc/util/src/visitor.ts
new file mode 100644
index 0000000000..f3e04a1056
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/util/src/visitor.ts
@@ -0,0 +1,118 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+/**
+ * Result type of visiting a node that's typically an entry in a list, which allows specifying that
+ * nodes should be added before the visited node in the output.
+ */
+export type VisitListEntryResult<B extends ts.Node, T extends B> = {
+  node: T,
+  before?: B[]
+};
+
+/**
+ * Visit a node with the given visitor and return a transformed copy.
+ */
+export function visit<T extends ts.Node>(
+    node: T, visitor: Visitor, context: ts.TransformationContext): T {
+  return visitor._visit(node, context);
+}
+
+/**
+ * Abstract base class for visitors, which processes certain nodes specially to allow insertion
+ * of other nodes before them.
+ */
+export abstract class Visitor {
+  /**
+   * Maps statements to an array of statements that should be inserted before them.
+   */
+  private _before = new Map<ts.Statement, ts.Statement[]>();
+
+  /**
+   * Visit a class declaration, returning at least the transformed declaration and optionally other
+   * nodes to insert before the declaration.
+   */
+  visitClassDeclaration(node: ts.ClassDeclaration):
+      VisitListEntryResult<ts.Statement, ts.ClassDeclaration> {
+    return {node};
+  }
+
+  private _visitClassDeclaration(node: ts.ClassDeclaration, context: ts.TransformationContext):
+      ts.ClassDeclaration {
+    const result = this.visitClassDeclaration(node);
+    const visited = ts.visitEachChild(result.node, child => this._visit(child, context), context);
+    if (result.before !== undefined) {
+      // Record that some nodes should be inserted before the given declaration. The declaration's
+      // parent's _visit call is responsible for performing this insertion.
+      this._before.set(visited, result.before);
+    }
+    return visited;
+  }
+
+  /**
+   * Visit types of nodes which don't have their own explicit visitor.
+   */
+  visitOtherNode<T extends ts.Node>(node: T): T { return node; }
+
+  private _visitOtherNode<T extends ts.Node>(node: T, context: ts.TransformationContext): T {
+    return ts.visitEachChild(
+        this.visitOtherNode(node), child => this._visit(child, context), context);
+  }
+
+  /**
+   * @internal
+   */
+  _visit<T extends ts.Node>(node: T, context: ts.TransformationContext): T {
+    // First, visit the node. visitedNode starts off as `null` but should be set after visiting
+    // is completed.
+    let visitedNode: T|null = null;
+    if (ts.isClassDeclaration(node)) {
+      visitedNode = this._visitClassDeclaration(node, context) as typeof node;
+    } else {
+      visitedNode = this._visitOtherNode(node, context);
+    }
+
+    // If the visited node has a `statements` array then process them, maybe replacing the visited
+    // node and adding additional statements.
+    if (hasStatements(visitedNode)) {
+      visitedNode = this._maybeProcessStatements(visitedNode);
+    }
+
+    return visitedNode;
+  }
+
+  private _maybeProcessStatements<T extends ts.Node&{statements: ts.NodeArray<ts.Statement>}>(
+      node: T): T {
+    // Shortcut - if every statement doesn't require nodes to be prepended, this is a no-op.
+    if (node.statements.every(stmt => !this._before.has(stmt))) {
+      return node;
+    }
+
+    // There are statements to prepend, so clone the original node.
+    const clone = ts.getMutableClone(node);
+
+    // Build a new list of statements and patch it onto the clone.
+    const newStatements: ts.Statement[] = [];
+    clone.statements.forEach(stmt => {
+      if (this._before.has(stmt)) {
+        newStatements.push(...(this._before.get(stmt) !as ts.Statement[]));
+        this._before.delete(stmt);
+      }
+      newStatements.push(stmt);
+    });
+    clone.statements = ts.createNodeArray(newStatements, node.statements.hasTrailingComma);
+    return clone;
+  }
+}
+
+function hasStatements(node: ts.Node): node is ts.Node&{statements: ts.NodeArray<ts.Statement>} {
+  const block = node as{statements?: any};
+  return block.statements !== undefined && Array.isArray(block.statements);
+}
diff --git a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
new file mode 100644
index 0000000000..21637b1b03
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
@@ -0,0 +1,26 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "test_lib",
+    testonly = 1,
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    deps = [
+        "//packages:types",
+        "//packages/compiler-cli/src/ngtsc/testing",
+        "//packages/compiler-cli/src/ngtsc/util",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"],
+    deps = [
+        ":test_lib",
+        "//tools/testing:node_no_angular",
+    ],
+)
diff --git a/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts b/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts
new file mode 100644
index 0000000000..9fd8641508
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts
@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {makeProgram} from '../../testing/in_memory_typescript';
+import {VisitListEntryResult, Visitor, visit} from '../src/visitor';
+
+class TestAstVisitor extends Visitor {
+  visitClassDeclaration(node: ts.ClassDeclaration):
+      VisitListEntryResult<ts.Statement, ts.ClassDeclaration> {
+    const name = node.name !.text;
+    const statics =
+        node.members.filter(member => (member.modifiers as ReadonlyArray<ts.Modifier>|| [
+                                      ]).some(mod => mod.kind === ts.SyntaxKind.StaticKeyword));
+    const idStatic = statics
+                         .find(
+                             el => ts.isPropertyDeclaration(el) && ts.isIdentifier(el.name) &&
+                                 el.name.text === 'id') as ts.PropertyDeclaration |
+        undefined;
+    if (idStatic !== undefined) {
+      return {
+        node,
+        before: [
+          ts.createVariableStatement(
+              undefined,
+              [
+                ts.createVariableDeclaration(`${name}_id`, undefined, idStatic.initializer),
+              ]),
+        ],
+      };
+    }
+    return {node};
+  }
+}
+
+function testTransformerFactory(context: ts.TransformationContext): ts.Transformer<ts.SourceFile> {
+  return (file: ts.SourceFile) => visit(file, new TestAstVisitor(), context);
+}
+
+describe('AST Visitor', () => {
+  it('should add a statement before class in plain file', () => {
+    const {program, host} =
+        makeProgram([{name: 'main.ts', contents: `class A { static id = 3; }`}]);
+    const sf = program.getSourceFile('main.ts') !;
+    program.emit(sf, undefined, undefined, undefined, {before: [testTransformerFactory]});
+    const main = host.readFile('/main.js');
+    expect(main).toMatch(/^var A_id = 3;/);
+  });
+
+  it('should add a statement before class inside function definition', () => {
+    const {program, host} = makeProgram([{
+      name: 'main.ts',
+      contents: `
+      export function foo() {
+        var x = 3;
+        class A { static id = 2; }
+        return A;
+      }
+    `
+    }]);
+    const sf = program.getSourceFile('main.ts') !;
+    program.emit(sf, undefined, undefined, undefined, {before: [testTransformerFactory]});
+    const main = host.readFile('/main.js');
+    expect(main).toMatch(/var x = 3;\s+var A_id = 2;\s+var A =/);
+  });
+
+  it('handles nested statements', () => {
+    const {program, host} = makeProgram([{
+      name: 'main.ts',
+      contents: `
+      export class A {
+        static id = 3;
+
+        foo() {
+          class B {
+            static id = 4;
+          }
+          return B;
+        }
+    }`
+    }]);
+    const sf = program.getSourceFile('main.ts') !;
+    program.emit(sf, undefined, undefined, undefined, {before: [testTransformerFactory]});
+    const main = host.readFile('/main.js');
+    expect(main).toMatch(/var A_id = 3;\s+var A = /);
+    expect(main).toMatch(/var B_id = 4;\s+var B = /);
+  });
+});

From a6e797b8f53132c3b249ff16f1d3c2bed759b08c Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 4 Jun 2018 12:16:16 -0700
Subject: [PATCH 227/582] build(bazel): fix ng_package rollup root dir for
 fesm2015 output (#24298)

PR Close #24298
---
 packages/bazel/src/ng_package/ng_package.bzl | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 93ed711413..0e74959433 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -76,7 +76,7 @@ WELL_KNOWN_GLOBALS = { p: _global_name(p) for p in [
     "rxjs/operators",
 ]}
 
-def _rollup(ctx, rollup_config, entry_point, inputs, js_output, format = "es", package_name = "", include_tslib = False):
+def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, format = "es", package_name = "", include_tslib = False):
   map_output = ctx.actions.declare_file(js_output.basename + ".map", sibling = js_output)
 
   args = ctx.actions.args()
@@ -112,7 +112,7 @@ def _rollup(ctx, rollup_config, entry_point, inputs, js_output, format = "es", p
   if ctx.version_file:
     other_inputs.append(ctx.version_file)
   ctx.actions.run(
-      progress_message = "ng_package: Rollup %s" % ctx.label,
+      progress_message = "ng_package: Rollup %s %s" % (bundle_name, ctx.label),
       mnemonic = "AngularPackageRollup",
       inputs = inputs.to_list() + other_inputs,
       outputs = [js_output, map_output],
@@ -144,6 +144,10 @@ def _filter_out_generated_files(files):
   return depset(result)
 
 
+def _esm2015_root_dir(ctx):
+  return ctx.label.name + ".es6"
+
+
 # ng_package produces package that is npm-ready.
 def _ng_package_impl(ctx):
   npm_package_directory = ctx.actions.declare_directory("%s.ng_pkg" % ctx.label.name)
@@ -191,7 +195,7 @@ def _ng_package_impl(ctx):
     es2015_entry_point = "/".join([p for p in [
         ctx.bin_dir.path,
         ctx.label.package,
-        ctx.label.name + ".es6",
+        _esm2015_root_dir(ctx),
         ctx.label.package,
         entry_point,
         flat_module_out_file,
@@ -218,13 +222,14 @@ def _ng_package_impl(ctx):
       umd_output = ctx.outputs.umd
       min_output = ctx.outputs.umd_min
 
-    config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, esm5_root_dir(ctx)]))
+    esm2015_config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, _esm2015_root_dir(ctx)]), filename="_%s.rollup_esm2015.conf.js")
+    esm5_config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, esm5_root_dir(ctx)]), filename="_%s.rollup_esm5.conf.js")
 
-    fesm2015.append(_rollup(ctx, config, es2015_entry_point, esm_2015_files, fesm2015_output))
-    fesm5.append(_rollup(ctx, config, es5_entry_point, esm5_sources, fesm5_output))
+    fesm2015.append(_rollup(ctx, "fesm2015", esm2015_config, es2015_entry_point, esm_2015_files, fesm2015_output))
+    fesm5.append(_rollup(ctx, "fesm5", esm5_config, es5_entry_point, esm5_sources, fesm5_output))
 
     bundles.append(
-        _rollup(ctx, config, es5_entry_point, esm5_sources, umd_output,
+        _rollup(ctx, "umd", esm5_config, es5_entry_point, esm5_sources, umd_output,
                 format = "umd", package_name = package_name, include_tslib = True))
     uglify_sourcemap = run_uglify(ctx, umd_output, min_output,
         config_name = entry_point.replace("/", "_"))

From ce1543fcde9078269d1130802b385af12ed35a53 Mon Sep 17 00:00:00 2001
From: ketangote <ketan.gote@metamagic.in>
Date: Thu, 7 Jun 2018 10:43:02 +0530
Subject: [PATCH 228/582] docs(aio): Added resource link to Amexio Canvas Web
 Based IDE (#24336)

PR Close #24336
---
 aio/content/marketing/resources.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 25403598f6..2c75bf3534 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -175,7 +175,13 @@
             "rev": true,
             "title": "Angular IDE by Webclipse",
             "url": "https://www.genuitec.com/products/angular-ide"
-          }
+          },
+          "amexio-canvas": {
+             "desc": "Amexio Canvas is Drag and Drop Environment to create Fully Responsive Web and Smart Device HTML5/Angular Apps. Code will be auto generated and hot deployed by the Canvas for live testing. Out of the box 50+ Material Design Theme support. Commit your code to GitHub public or private repository.",
+            "rev": true,
+            "title": "Amexio Canvas Web Based Drag and Drop IDE by MetaMagic",
+            "url": "https://amexio.tech/"
+          }	
         }
       },
       "Tooling": {

From d4c66d5edbb66d37d3df4bfa909eb407f4a78bdd Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Wed, 6 Jun 2018 17:32:21 +0200
Subject: [PATCH 229/582] docs(ivy): update status of impl progress (#24323)

Updating runtime implementation progress after merge of #23991

PR Close #24323
---
 packages/core/src/render3/STATUS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 944c91574f..fe3abbc13b 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -156,7 +156,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `<div (bubble.click)>`                      |  ❌     |  ❌      |  ❌      |
 | `<div (keyup.enter)>`                       |  ❌     |  ❌      |  ❌      |
 | `<div (hammer.js)>`                         |  ❌     |  ❌      |  ❌      |
-| [`<div (directiveOut)>`][gh23560]           |  ❌     |  ❌      |  ❌      |
+| [`<div (directiveOut)>`][gh23560]           |  ✅     |  ❌      |  ❌      |
 | [`<ng-template (directiveOut)>`][gh23561]   |  ❌     |  ❌      |  ❌      |
 
 [gh23560]: https://github.com/angular/angular/issues/23560

From 4664226b97e62983cbc1e03e6e1be87c66aafaf1 Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Thu, 7 Jun 2018 16:09:16 -0700
Subject: [PATCH 230/582] docs(aio): add mix and connect to front page
 campaigns (#24357)

PR Close #24357
---
 aio/content/marketing/announcements.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/aio/content/marketing/announcements.json b/aio/content/marketing/announcements.json
index 9166c1f5b7..879e0b4740 100644
--- a/aio/content/marketing/announcements.json
+++ b/aio/content/marketing/announcements.json
@@ -12,5 +12,19 @@
     "message": "Watch ng-conf live stream <br/>Apr 18th-20th, 2018",
     "imageUrl": "generated/images/marketing/home/ng-conf.png",
     "linkUrl": "https://www.ng-conf.org/livestream/"
+  },
+  {
+    "startDate": "2018-06-01",
+    "endDate": "2018-08-15",
+    "message": "Join us for Angular Mix<br/>October 10th-12th, 2018",
+    "imageUrl": "generated/images/marketing/home/angular-mix.png",
+    "linkUrl": "https://angularmix.com/"
+  },
+  {
+    "startDate": "2018-08-15",
+    "endDate": "2018-11-06",
+    "message": "Join us for Angular Connect<br/>November 6th-7th, 2018",
+    "imageUrl": "generated/images/marketing/home/angular-connect.png",
+    "linkUrl": "https://angularconnect.com/"
   }
 ]

From 9f877f44160abccf53361ef0078908f1d3b4209c Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 7 Jun 2018 22:26:14 +0100
Subject: [PATCH 231/582] build(docs-infra): ensure stability is computed
 before the API list (#24356)

Previously the API list was being generated before the stability had
been computed. This meant that the API list page showed no API docs
when filtering by `stable` stability status.

Closes #24329

PR Close #24356
---
 .../angular-api-package/processors/generateApiListDoc.js        | 2 +-
 .../angular-api-package/processors/generateApiListDoc.spec.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js
index a4a7ada49e..b36b446904 100644
--- a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js
+++ b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js
@@ -1,7 +1,7 @@
 module.exports = function generateApiListDoc() {
 
   return {
-    $runAfter: ['extra-docs-added'],
+    $runAfter: ['extra-docs-added', 'computeStability'],
     $runBefore: ['rendering-docs'],
     outputFolder: null,
     $validate: {outputFolder: {presence: true}},
diff --git a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js
index bbc4108e44..35d9ad000c 100644
--- a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js
@@ -13,7 +13,7 @@ describe('generateApiListDoc processor', () => {
 
   it('should run after the correct processor', () => {
     const processor = processorFactory();
-    expect(processor.$runAfter).toEqual(['extra-docs-added']);
+    expect(processor.$runAfter).toEqual(['extra-docs-added', 'computeStability']);
   });
 
   it('should run before the correct processor', () => {

From 8be689277720dc669ddda0911f8fd8d9fc646185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski-Owczarek?=
 <m.goleb@gmail.com>
Date: Wed, 6 Jun 2018 11:00:41 +0200
Subject: [PATCH 232/582] fix(docs-infra): use script nomodule to load IE
 polyfills, skip other polyfills (#24317)

This commit includes two changes:
1. It changes the unreliable dynamic way of loading IE polyfills to use
   `<script nomodule>` instead - for IE it's equivalent to a regular script tag
   while modern browsers will ignore it.
2. It removes other polyfills for browsers not supporting `Object.assign` as
   this API is supported by Chrome 45+, Firefox 34+ and Safari 9+ i.e. it's been
   supported for some time.

Note that as of June 2018 Googlebot uses Chrome 41 to render sites to be
indexed. Chrome 41 doesn't support `Object.assign` but it also doesn't support
ES6 modules so it'll load polyfills meant for IE - which it should do anyway
as it doesn't support most of ES6.

Fixes #23647

PR Close #24317
---
 aio/src/index.html | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/aio/src/index.html b/aio/src/index.html
index 7e8e5b6f95..99565e7800 100644
--- a/aio/src/index.html
+++ b/aio/src/index.html
@@ -82,31 +82,7 @@
     };
   </script>
 
-  <script>
-    if (window.document.documentMode) {
-      // polyfill IE11 in a blocking way
-      var s = document.createElement('script');
-      s.src = 'generated/ie-polyfills.min.js';
-      document.head.appendChild(s);
-    } else if (!Object.assign) {
-      // polyfill other non-evergreen browsers in a blocking way
-      var polyfillUrl = "https://cdn.polyfill.io/v2/polyfill.min.js?features=default,Array.prototype.find&flags=gated&unknown=polyfill";
-
-      // send a blocking XHR to fetch the polyfill
-      // then append it to the document so that its eval-ed synchronously
-      // this is required because the method used for IE is not reliable with other non-evergreen browsers
-      var xhr = new XMLHttpRequest();
-      xhr.addEventListener("load", function() {
-        var s = document.createElement('script');
-        s.type = 'text/javascript';
-        var code = this.responseText;
-        s.appendChild(document.createTextNode(code));
-        document.head.appendChild(s);
-      });
-      xhr.open("GET", polyfillUrl, false);
-      xhr.send();
-    }
-  </script>
+  <script nomodule src="generated/ie-polyfills.min.js"></script>
 
   <script>
     //load CE polyfill

From 7983f0a69b1cb8097762dc9ae355f5d083edcc7d Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 5 Jun 2018 11:38:46 -0700
Subject: [PATCH 233/582] ci(ivy): configure CI environments for Ivy JIT and
 AOT (#24309)

Two new CircleCI environments are created: test_ivy_jit and test_ivy_aot.
Both run a subset of the tests that have been marked with Bazel tags as
being appropriate for that environment.

Once all the tests pass, builds are published to the *-builds repo both
for the legacy View Engine compiled code as well as for ivy-jit and ivy-aot.

PR Close #24309
---
 .circleci/config.yml                          | 42 +++++++++++++++
 packages/animations/BUILD.bazel               |  5 +-
 packages/common/BUILD.bazel                   |  5 +-
 packages/compiler-cli/BUILD.bazel             |  5 +-
 packages/compiler/BUILD.bazel                 |  5 +-
 packages/core/BUILD.bazel                     |  6 ++-
 packages/core/test/BUILD.bazel                | 23 ++++++++
 packages/core/test/ivy_local_empty_spec.ts    | 19 +++++++
 packages/elements/BUILD.bazel                 |  5 +-
 packages/forms/BUILD.bazel                    |  5 +-
 packages/http/BUILD.bazel                     |  5 +-
 packages/language-service/BUILD.bazel         |  1 +
 packages/platform-browser-dynamic/BUILD.bazel |  5 +-
 packages/platform-browser/BUILD.bazel         |  5 +-
 packages/platform-server/BUILD.bazel          |  5 +-
 .../platform-webworker-dynamic/BUILD.bazel    |  5 +-
 packages/platform-webworker/BUILD.bazel       |  5 +-
 packages/router/BUILD.bazel                   |  5 +-
 packages/service-worker/BUILD.bazel           |  1 +
 packages/upgrade/BUILD.bazel                  |  5 +-
 scripts/build-packages-dist.sh                | 52 +++++++++++++------
 scripts/ci/publish-build-artifacts.sh         | 12 ++++-
 22 files changed, 192 insertions(+), 34 deletions(-)
 create mode 100644 packages/core/test/ivy_local_empty_spec.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7893208e54..4ce1cfd6a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,6 +111,42 @@ jobs:
           paths:
             - "node_modules"
             - "~/bazel_repository_cache"
+  # Temporary job to test what will happen when we flip the Ivy flag to true
+  test_ivy_jit:
+    <<: *job_defaults
+    resource_class: xlarge
+    steps:
+      - *define_env_vars
+      - checkout:
+          <<: *post_checkout
+      # See remote cache documentation in /docs/BAZEL.md
+      - run: .circleci/setup_cache.sh
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - *setup-bazel-remote-cache
+
+      - restore_cache:
+          key: *cache_key
+
+      - run: bazel run @yarn//:yarn
+      - run: bazel query --output=label //... | xargs bazel test --define=compile=jit --build_tag_filters=ivy-jit --test_tag_filters=-manual,ivy-jit
+
+  test_ivy_aot:
+    <<: *job_defaults
+    resource_class: xlarge
+    steps:
+      - *define_env_vars
+      - checkout:
+          <<: *post_checkout
+      # See remote cache documentation in /docs/BAZEL.md
+      - run: .circleci/setup_cache.sh
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - *setup-bazel-remote-cache
+
+      - restore_cache:
+          key: *cache_key
+
+      - run: bazel run @yarn//:yarn
+      - run: bazel query --output=label //... | xargs bazel test --define=compile=local --build_tag_filters=ivy-local --test_tag_filters=-manual,ivy-local
 
   # This job exists only for backwards-compatibility with old scripts and tests
   # that rely on the pre-Bazel dist/packages-dist layout.
@@ -140,6 +176,8 @@ jobs:
           root: dist
           paths:
             - packages-dist
+            - packages-dist-ivy-jit
+            - packages-dist-ivy-local
 
   # We run the integration tests outside of Bazel for now.
   # They are a separate workflow job so that they can be easily re-run.
@@ -200,6 +238,8 @@ workflows:
     jobs:
       - lint
       - test
+      - test_ivy_jit
+      - test_ivy_aot
       - build-packages-dist
       - integration_test:
           requires:
@@ -212,6 +252,8 @@ workflows:
           requires:
             # Only publish if tests and integration tests pass
             - test
+            - test_ivy_jit
+            - test_ivy_aot
             - integration_test
             # Get the artifacts to publish from the build-packages-dist job
             # since the publishing script expects the legacy outputs layout.
diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel
index ee56422dc1..8cf0a12c17 100644
--- a/packages/animations/BUILD.bazel
+++ b/packages/animations/BUILD.bazel
@@ -24,7 +24,10 @@ ng_package(
         "//packages/animations/browser/testing:package.json",
     ],
     entry_point = "packages/animations/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":animations",
         "//packages/animations/browser",
diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
index e84f675896..bcf015c9d5 100644
--- a/packages/common/BUILD.bazel
+++ b/packages/common/BUILD.bazel
@@ -27,7 +27,10 @@ ng_package(
     ],
     entry_point = "packages/common/index.js",
     packages = ["//packages/common/locales:package"],
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         "//packages/common",
         "//packages/common/http",
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index e75f0399a2..e10d0f4d2e 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -34,6 +34,9 @@ npm_package(
     srcs = [
         "package.json",
     ],
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [":compiler-cli"],
 )
diff --git a/packages/compiler/BUILD.bazel b/packages/compiler/BUILD.bazel
index 5dab11e686..4c269ffb73 100644
--- a/packages/compiler/BUILD.bazel
+++ b/packages/compiler/BUILD.bazel
@@ -21,7 +21,10 @@ ng_package(
     ],
     entry_point = "packages/compiler/compiler.js",
     include_devmode_srcs = True,
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":compiler",
         "//packages/compiler/testing",
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index 6da82e9b34..5dbdbfbe4b 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -29,7 +29,11 @@ ng_package(
         "//packages/core/testing:package.json",
     ],
     entry_point = "packages/core/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "ivy-local",
+        "release-with-framework",
+    ],
     deps = [
         ":core",
         "//packages/core/testing",
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index bf1c7473b0..e8cfc9708e 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
         exclude = [
             "**/*_node_only_spec.ts",
             "render3/**/*.ts",
+            "ivy_local_empty_spec.ts",
         ],
     ),
     deps = [
@@ -33,6 +34,15 @@ ts_library(
     ],
 )
 
+ts_library(
+    name = "ivy_local_empty_lib",
+    testonly = 1,
+    srcs = ["ivy_local_empty_spec.ts"],
+    deps = [
+        "//packages:types",
+    ],
+)
+
 ts_library(
     name = "test_node_only_lib",
     testonly = 1,
@@ -60,6 +70,19 @@ jasmine_node_test(
     ],
 )
 
+jasmine_node_test(
+    name = "ivy_local_empty_test",
+    bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"],
+    tags = [
+        "ivy-local",
+        "ivy-only",
+    ],
+    deps = [
+        ":ivy_local_empty_lib",
+        "//tools/testing:node_no_angular",
+    ],
+)
+
 ts_web_test_suite(
     name = "test_web",
     deps = [
diff --git a/packages/core/test/ivy_local_empty_spec.ts b/packages/core/test/ivy_local_empty_spec.ts
new file mode 100644
index 0000000000..e74dd0455a
--- /dev/null
+++ b/packages/core/test/ivy_local_empty_spec.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/*
+ * This file exists to have at least one test target that can pass with --define=compile=local.
+ *
+ * TODO(alxhub): Clean up once actual Angular tests start passing with Ivy/AOT.
+ */
+
+describe('empty test', () => {
+  it('should pass without doing anything', () => {
+                                               // If this fails, you probably need a new computer.
+                                           });
+});
diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel
index 03c35cdd47..8821aaafcc 100644
--- a/packages/elements/BUILD.bazel
+++ b/packages/elements/BUILD.bazel
@@ -28,7 +28,10 @@ ng_package(
     packages = [
         "//packages/elements/schematics:npm_package",
     ],
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":elements",
     ],
diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel
index a26bab1e3a..24f377d99e 100644
--- a/packages/forms/BUILD.bazel
+++ b/packages/forms/BUILD.bazel
@@ -22,7 +22,10 @@ ng_package(
     name = "npm_package",
     srcs = ["package.json"],
     entry_point = "packages/forms/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":forms",
     ],
diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel
index 453d42a0a0..66b8230f1d 100644
--- a/packages/http/BUILD.bazel
+++ b/packages/http/BUILD.bazel
@@ -25,7 +25,10 @@ ng_package(
         "//packages/http/testing:package.json",
     ],
     entry_point = "packages/http/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":http",
         "//packages/http/testing",
diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
index 11d5f92393..b042e693b5 100644
--- a/packages/language-service/BUILD.bazel
+++ b/packages/language-service/BUILD.bazel
@@ -23,6 +23,7 @@ npm_package(
     name = "npm_package",
     srcs = ["package.json"],
     tags = [
+        "ivy-jit",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/platform-browser-dynamic/BUILD.bazel b/packages/platform-browser-dynamic/BUILD.bazel
index 26762f35db..7eea343f5c 100644
--- a/packages/platform-browser-dynamic/BUILD.bazel
+++ b/packages/platform-browser-dynamic/BUILD.bazel
@@ -27,7 +27,10 @@ ng_package(
         "//packages/platform-browser-dynamic/testing:package.json",
     ],
     entry_point = "packages/platform-browser-dynamic/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":platform-browser-dynamic",
         "//packages/platform-browser-dynamic/testing",
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
index 214e482e29..b9ad4a7331 100644
--- a/packages/platform-browser/BUILD.bazel
+++ b/packages/platform-browser/BUILD.bazel
@@ -26,7 +26,10 @@ ng_package(
         "//packages/platform-browser/testing:package.json",
     ],
     entry_point = "packages/platform-browser/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":platform-browser",
         "//packages/platform-browser/animations",
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
index a967e51f16..f1f8242cfb 100644
--- a/packages/platform-server/BUILD.bazel
+++ b/packages/platform-server/BUILD.bazel
@@ -32,7 +32,10 @@ ng_package(
         "//packages/platform-server/testing:package.json",
     ],
     entry_point = "packages/platform-server/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":platform-server",
         "//packages/platform-server/testing",
diff --git a/packages/platform-webworker-dynamic/BUILD.bazel b/packages/platform-webworker-dynamic/BUILD.bazel
index ed85ccb473..4e3d7260cd 100644
--- a/packages/platform-webworker-dynamic/BUILD.bazel
+++ b/packages/platform-webworker-dynamic/BUILD.bazel
@@ -24,6 +24,9 @@ ng_package(
     name = "npm_package",
     srcs = ["package.json"],
     entry_point = "packages/platform-webworker-dynamic/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [":platform-webworker-dynamic"],
 )
diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel
index dfdafe0cc8..c21890fc21 100644
--- a/packages/platform-webworker/BUILD.bazel
+++ b/packages/platform-webworker/BUILD.bazel
@@ -24,7 +24,10 @@ ng_package(
     name = "npm_package",
     srcs = ["package.json"],
     entry_point = "packages/platform-webworker/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":platform-webworker",
     ],
diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
index cadbae38e8..547927f85b 100644
--- a/packages/router/BUILD.bazel
+++ b/packages/router/BUILD.bazel
@@ -28,7 +28,10 @@ ng_package(
         "//packages/router/upgrade:package.json",
     ],
     entry_point = "packages/router/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":router",
         "//packages/router/testing",
diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
index 5777b67bf0..8be9e9c52f 100644
--- a/packages/service-worker/BUILD.bazel
+++ b/packages/service-worker/BUILD.bazel
@@ -47,6 +47,7 @@ ng_package(
     ],
     entry_point = "packages/service-worker/index.js",
     tags = [
+        "ivy-jit",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index 2e828c8010..09bff3383e 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -25,7 +25,10 @@ ng_package(
         "//packages/upgrade/static:package.json",
     ],
     entry_point = "packages/upgrade/index.js",
-    tags = ["release-with-framework"],
+    tags = [
+        "ivy-jit",
+        "release-with-framework",
+    ],
     deps = [
         ":upgrade",
         "//packages/upgrade/static",
diff --git a/scripts/build-packages-dist.sh b/scripts/build-packages-dist.sh
index 6ebc5e7b7c..1dbb4e29ae 100755
--- a/scripts/build-packages-dist.sh
+++ b/scripts/build-packages-dist.sh
@@ -12,30 +12,48 @@ cd "$(dirname "$0")"
 
 # basedir is the workspace root
 readonly basedir=$(pwd)/..
+readonly bin=$(bazel info bazel-bin)
+
+function buildTargetPackages() {
+  targets="$1"
+  destPath="$2"
+  compileMode="$3"
+  desc="$4"
 
 echo "##################################"
 echo "scripts/build-packages-dist.sh:"
 echo "  building @angular/* npm packages"
+echo "  mode: ${desc}"
 echo "##################################"
+  
+  echo "$targets" | xargs bazel build --define=compile=$compileMode
+  
+  [ -d "${basedir}/${destPath}" ] || mkdir -p $basedir/${destPath}
+  
+  dirs=`echo "$targets" | grep '//packages/[^/]*:npm_package' | sed -e 's/\/\/packages\/\(.*\):npm_package/\1/'`
+  
+  for pkg in $dirs; do
+    # Skip any that don't have an "npm_package" target
+    srcDir="${bin}/packages/${pkg}/npm_package"
+    destDir="${basedir}/${destPath}/${pkg}"
+    if [ -d $srcDir ]; then
+      echo "# Copy artifacts to ${destDir}"
+      rm -rf $destDir
+      cp -R $srcDir $destDir
+      chmod -R u+w $destDir
+    fi
+  done
+}
+
 # Ideally these integration tests should run under bazel, and just list the npm
 # packages in their deps[].
 # Until then, we have to manually run bazel first to create the npm packages we
 # want to test.
-bazel query --output=label 'kind(.*_package, //packages/...)' \
-  | xargs bazel build
-readonly bin=$(bazel info bazel-bin)
+LEGACY_TARGETS=`bazel query --output=label 'kind(.*_package, //packages/...)'`
+IVY_JIT_TARGETS=`bazel query --output=label 'attr("tags", "\[.*ivy-jit.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
+IVY_LOCAL_TARGETS=`bazel query --output=label 'attr("tags", "\[.*ivy-local.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
+
+buildTargetPackages "$LEGACY_TARGETS" "dist/packages-dist" "legacy" "Production"
+buildTargetPackages "$IVY_JIT_TARGETS" "dist/packages-dist-ivy-jit" "jit" "Ivy JIT"
+buildTargetPackages "$IVY_LOCAL_TARGETS" "dist/packages-dist-ivy-local" "local" "Ivy AOT"
 
-# Create the legacy dist/packages-dist folder
-[ -d "${basedir}/dist/packages-dist" ] || mkdir -p $basedir/dist/packages-dist
-# Each package is a subdirectory of bazel-bin/packages/
-for pkg in $(ls ${bin}/packages); do
-  # Skip any that don't have an "npm_package" target
-  srcDir="${bin}/packages/${pkg}/npm_package"
-  destDir="${basedir}/dist/packages-dist/${pkg}"
-  if [ -d $srcDir ]; then
-    echo "# Copy artifacts to ${destDir}"
-    rm -rf $destDir
-    cp -R $srcDir $destDir
-    chmod -R u+w $destDir
-  fi
-done
diff --git a/scripts/ci/publish-build-artifacts.sh b/scripts/ci/publish-build-artifacts.sh
index e89754a4d7..8f30c40053 100755
--- a/scripts/ci/publish-build-artifacts.sh
+++ b/scripts/ci/publish-build-artifacts.sh
@@ -117,12 +117,20 @@ function publishPackages {
   echo "Finished publishing build artifacts"
 }
 
+function publishAllBuilds() {
+  GIT_SCHEME="$1"
+
+  publishPackages $GIT_SCHEME dist/packages-dist $CUR_BRANCH
+  publishPackages $GIT_SCHEME dist/packages-dist-ivy-jit "${CUR_BRANCH}-ivy-jit"
+  publishPackages $GIT_SCHEME dist/packages-dist-ivy-local "${CUR_BRANCH}-ivy-aot"
+}
+
 # See docs/DEVELOPER.md for help
 CUR_BRANCH=${CIRCLE_BRANCH:-$(git symbolic-ref --short HEAD)}
 if [ $# -gt 0 ]; then
   ORG=$1
-  publishPackages "ssh" dist/packages-dist $CUR_BRANCH
+  publishAllBuilds "ssh"
 else
   ORG="angular"
-  publishPackages "http" dist/packages-dist $CUR_BRANCH
+  publishAllBuilds "http"
 fi

From 113556357a98a76e04bd5501f7138cddfee294f3 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 6 Jun 2018 11:23:38 -0700
Subject: [PATCH 234/582] fix(ivy): compute transitive scopes from NgModuleDef
 only (#24334)

Previously, the transitive scopes of an NgModuleDef were computed
during execution of the @NgModule decorator. This meant that JIT-
compiled modules could only import other JIT-compiled modules, as
the import mechanism relied on the calculation of transitive scopes
to already have happened for the imported module.

This change moves computation of transitive scopes to a function
`transitiveScopesFor` (and makes it lazy). This opens the door for
AOT -> JIT or JIT -> AOT imports, as transitive scopes for AOT
modules can be calculated when needed by JIT, and AOT modules can
also write expressions that call `transitiveScopesFor` when
importing a JIT-compiled module.

PR Close #24334
---
 packages/core/src/metadata/ng_module.ts    |  23 ++-
 packages/core/src/render3/jit/directive.ts |  19 +-
 packages/core/src/render3/jit/fields.ts    |  16 ++
 packages/core/src/render3/jit/module.ts    | 212 +++++++++++++--------
 packages/core/test/render3/ivy/BUILD.bazel |   3 +
 5 files changed, 194 insertions(+), 79 deletions(-)
 create mode 100644 packages/core/src/render3/jit/fields.ts

diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 4ab8d8744a..40def87bb2 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -13,6 +13,20 @@ import {R3_COMPILE_NGMODULE} from '../ivy_switch';
 import {Type} from '../type';
 import {TypeDecorator, makeDecorator} from '../util/decorators';
 
+/**
+ * Represents the expansion of an `NgModule` into its scopes.
+ *
+ * A scope is a set of directives and pipes that are visible in a particular context. Each
+ * `NgModule` has two scopes. The `compilation` scope is the set of directives and pipes that will
+ * be recognized in the templates of components declared by the module. The `exported` scope is the
+ * set of directives and pipes exported by a module (that is, module B's exported scope gets added
+ * to module A's compilation scope when module A imports B).
+ */
+export interface NgModuleTransitiveScopes {
+  compilation: {directives: Set<any>; pipes: Set<any>;};
+  exported: {directives: Set<any>; pipes: Set<any>;};
+}
+
 export interface NgModuleDef<T> {
   type: T;
   bootstrap: Type<any>[];
@@ -20,7 +34,12 @@ export interface NgModuleDef<T> {
   imports: Type<any>[];
   exports: Type<any>[];
 
-  transitiveCompileScope: {directives: any[]; pipes: any[];}|undefined;
+  /**
+   * Cached value of computed `transitiveCompileScopes` for this module.
+   *
+   * This should never be read directly, but accessed via `transitiveScopesFor`.
+   */
+  transitiveCompileScopes: NgModuleTransitiveScopes|null;
 }
 
 export function defineNgModule<T>(def: {type: T} & Partial<NgModuleDef<T>>): never {
@@ -30,7 +49,7 @@ export function defineNgModule<T>(def: {type: T} & Partial<NgModuleDef<T>>): nev
     declarations: def.declarations || [],
     imports: def.imports || [],
     exports: def.exports || [],
-    transitiveCompileScope: undefined,
+    transitiveCompileScopes: null,
   };
   return res as never;
 }
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index 704edd26bc..9e5d00539d 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -13,6 +13,8 @@ import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
 import {Type} from '../../type';
 
 import {angularCoreEnv} from './environment';
+import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF} from './fields';
+import {patchComponentDefWithScope} from './module';
 import {getReflect, reflectDependencies} from './util';
 
 let _pendingPromises: Promise<void>[] = [];
@@ -34,7 +36,7 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
   const templateStr = metadata.template;
 
   let def: any = null;
-  Object.defineProperty(type, 'ngComponentDef', {
+  Object.defineProperty(type, NG_COMPONENT_DEF, {
     get: () => {
       if (def === null) {
         // The ConstantPool is a requirement of the JIT'er.
@@ -61,6 +63,14 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
 
         def = jitExpression(
             res.expression, angularCoreEnv, `ng://${type.name}/ngComponentDef.js`, constantPool);
+
+        // If component compilation is async, then the @NgModule annotation which declares the
+        // component may execute and set an ngSelectorScope property on the component type. This
+        // allows the component to patch itself with directiveDefs from the module after it finishes
+        // compiling.
+        if (hasSelectorScope(type)) {
+          patchComponentDefWithScope(def, type.ngSelectorScope);
+        }
       }
       return def;
     },
@@ -69,6 +79,11 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
   return null;
 }
 
+function hasSelectorScope<T>(component: Type<T>): component is Type<T>&
+    {ngSelectorScope: Type<any>} {
+  return (component as{ngSelectorScope?: any}).ngSelectorScope !== undefined;
+}
+
 /**
  * Compile an Angular directive according to its decorator metadata, and patch the resulting
  * ngDirectiveDef onto the component type.
@@ -78,7 +93,7 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
  */
 export function compileDirective(type: Type<any>, directive: Directive): Promise<void>|null {
   let def: any = null;
-  Object.defineProperty(type, 'ngDirectiveDef', {
+  Object.defineProperty(type, NG_DIRECTIVE_DEF, {
     get: () => {
       if (def === null) {
         const constantPool = new ConstantPool();
diff --git a/packages/core/src/render3/jit/fields.ts b/packages/core/src/render3/jit/fields.ts
new file mode 100644
index 0000000000..6ddef85fee
--- /dev/null
+++ b/packages/core/src/render3/jit/fields.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {getClosureSafeProperty} from '../../util/property';
+
+const TARGET = {} as any;
+
+export const NG_COMPONENT_DEF = getClosureSafeProperty({ngComponentDef: TARGET}, TARGET);
+export const NG_DIRECTIVE_DEF = getClosureSafeProperty({ngDirectiveDef: TARGET}, TARGET);
+export const NG_PIPE_DEF = getClosureSafeProperty({ngPipeDef: TARGET}, TARGET);
+export const NG_MODULE_DEF = getClosureSafeProperty({ngModuleDef: TARGET}, TARGET);
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 2ebbac9c13..e457f3e7ca 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -8,80 +8,26 @@
 
 import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
 
-import {ModuleWithProviders, NgModule, NgModuleDef} from '../../metadata/ng_module';
+import {ModuleWithProviders, NgModule, NgModuleDef, NgModuleTransitiveScopes} from '../../metadata/ng_module';
 import {Type} from '../../type';
 import {ComponentDef} from '../interfaces/definition';
-import {flatten} from '../util';
 
 import {angularCoreEnv} from './environment';
+import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
 
 const EMPTY_ARRAY: Type<any>[] = [];
 
 export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
-  const meta: R3NgModuleMetadata = {
-    type: wrap(type),
-    bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(wrap),
-    declarations: flatten(ngModule.declarations || EMPTY_ARRAY).map(wrap),
-    imports: flatten(ngModule.imports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
-    exports: flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
-    emitInline: true,
-  };
-
-  // Compute transitiveCompileScope
-  const transitiveCompileScope = {
-    directives: new Set<any>(),
-    pipes: new Set<any>(),
-    modules: new Set<any>(),
-  };
-
-  function addExportsFrom(module: Type<any>& {ngModuleDef: NgModuleDef<any>}): void {
-    if (!transitiveCompileScope.modules.has(module)) {
-      module.ngModuleDef.exports.forEach((exp: any) => {
-        if (isNgModule(exp)) {
-          addExportsFrom(exp);
-        } else if (exp.ngPipeDef) {
-          transitiveCompileScope.pipes.add(exp);
-        } else {
-          transitiveCompileScope.directives.add(exp);
-        }
-      });
-    }
-  }
-
-  flatten([
-    (ngModule.imports || EMPTY_ARRAY), (ngModule.exports || EMPTY_ARRAY)
-  ]).forEach(importExport => {
-    const maybeModule = expandModuleWithProviders(importExport);
-    if (isNgModule(maybeModule)) {
-      addExportsFrom(maybeModule);
-    }
-  });
-
-  flatten(ngModule.declarations || EMPTY_ARRAY).forEach(decl => {
-    if (decl.ngPipeDef) {
-      transitiveCompileScope.pipes.add(decl);
-    } else if (decl.ngDirectiveDef) {
-      transitiveCompileScope.directives.add(decl);
-    } else if (decl.ngComponentDef) {
-      transitiveCompileScope.directives.add(decl);
-      patchComponentWithScope(decl, type as any);
-    } else {
-      // A component that has not been compiled yet because the template is being fetched
-      // we need to store a reference to the module to update the selector scope after
-      // the component gets compiled
-      transitiveCompileScope.directives.add(decl);
-      decl.ngSelectorScope = type;
-    }
-  });
+  const declarations: Type<any>[] = flatten(ngModule.declarations || EMPTY_ARRAY);
 
   let def: any = null;
-  Object.defineProperty(type, 'ngModuleDef', {
+  Object.defineProperty(type, NG_MODULE_DEF, {
     get: () => {
       if (def === null) {
         const meta: R3NgModuleMetadata = {
           type: wrap(type),
           bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(wrap),
-          declarations: flatten(ngModule.declarations || EMPTY_ARRAY).map(wrap),
+          declarations: declarations.map(wrap),
           imports:
               flatten(ngModule.imports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
           exports:
@@ -90,25 +36,141 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
         };
         const res = compileR3NgModule(meta);
         def = jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngModuleDef.js`);
-        def.transitiveCompileScope = {
-          directives: Array.from(transitiveCompileScope.directives),
-          pipes: Array.from(transitiveCompileScope.pipes),
-        };
       }
       return def;
     },
   });
+
+  declarations.forEach(declaration => {
+    // Some declared components may be compiled asynchronously, and thus may not have their
+    // ngComponentDef set yet. If this is the case, then a reference to the module is written into
+    // the `ngSelectorScope` property of the declared type.
+    if (declaration.hasOwnProperty(NG_COMPONENT_DEF)) {
+      // An `ngComponentDef` field exists - go ahead and patch the component directly.
+      patchComponentDefWithScope(
+          (declaration as Type<any>& {ngComponentDef: ComponentDef<any>}).ngComponentDef, type);
+    } else if (
+        !declaration.hasOwnProperty(NG_DIRECTIVE_DEF) && !declaration.hasOwnProperty(NG_PIPE_DEF)) {
+      // Set `ngSelectorScope` for future reference when the component compilation finishes.
+      (declaration as Type<any>& {ngSelectorScope?: any}).ngSelectorScope = type;
+    }
+  });
 }
 
-export function patchComponentWithScope<C, M>(
-    component: Type<C>& {ngComponentDef: ComponentDef<C>},
-    module: Type<M>& {ngModuleDef: NgModuleDef<M>}) {
-  component.ngComponentDef.directiveDefs = () =>
-      module.ngModuleDef.transitiveCompileScope !.directives
-          .map(dir => dir.ngDirectiveDef || dir.ngComponentDef)
-          .filter(def => !!def);
-  component.ngComponentDef.pipeDefs = () =>
-      module.ngModuleDef.transitiveCompileScope !.pipes.map(pipe => pipe.ngPipeDef);
+/**
+ * Patch the definition of a component with directives and pipes from the compilation scope of
+ * a given module.
+ */
+export function patchComponentDefWithScope<C, M>(componentDef: ComponentDef<C>, module: Type<M>) {
+  componentDef.directiveDefs = () => Array.from(transitiveScopesFor(module).compilation.directives)
+                                         .map(dir => dir.ngDirectiveDef || dir.ngComponentDef)
+                                         .filter(def => !!def);
+  componentDef.pipeDefs = () =>
+      Array.from(transitiveScopesFor(module).compilation.pipes).map(pipe => pipe.ngPipeDef);
+}
+
+/**
+ * Compute the pair of transitive scopes (compilation scope and exported scope) for a given module.
+ *
+ * This operation is memoized and the result is cached on the module's definition. It can be called
+ * on modules with components that have not fully compiled yet, but the result should not be used
+ * until they have.
+ */
+export function transitiveScopesFor<T>(moduleType: Type<T>): NgModuleTransitiveScopes {
+  if (!isNgModule(moduleType)) {
+    throw new Error(`${moduleType.name} does not have an ngModuleDef`);
+  }
+  const def = moduleType.ngModuleDef;
+
+  if (def.transitiveCompileScopes !== null) {
+    return def.transitiveCompileScopes;
+  }
+
+  const scopes: NgModuleTransitiveScopes = {
+    compilation: {
+      directives: new Set<any>(),
+      pipes: new Set<any>(),
+    },
+    exported: {
+      directives: new Set<any>(),
+      pipes: new Set<any>(),
+    },
+  };
+
+  def.declarations.forEach(declared => {
+    const declaredWithDefs = declared as Type<any>& { ngPipeDef?: any; };
+
+    if (declaredWithDefs.ngPipeDef !== undefined) {
+      scopes.compilation.pipes.add(declared);
+    } else {
+      // Either declared has an ngComponentDef or ngDirectiveDef, or it's a component which hasn't
+      // had its template compiled yet. In either case, it gets added to the compilation's
+      // directives.
+      scopes.compilation.directives.add(declared);
+    }
+  });
+
+  def.imports.forEach(<I>(imported: Type<I>) => {
+    let importedTyped = imported as Type<I>& {
+      // If imported is an @NgModule:
+      ngModuleDef?: NgModuleDef<I>;
+    };
+
+    if (!isNgModule<I>(importedTyped)) {
+      throw new Error(`Importing ${importedTyped.name} which does not have an ngModuleDef`);
+    }
+
+    // When this module imports another, the imported module's exported directives and pipes are
+    // added to the compilation scope of this module.
+    const importedScope = transitiveScopesFor(importedTyped);
+    importedScope.exported.directives.forEach(entry => scopes.compilation.directives.add(entry));
+    importedScope.exported.pipes.forEach(entry => scopes.compilation.pipes.add(entry));
+  });
+
+  def.exports.forEach(<E>(exported: Type<E>) => {
+    const exportedTyped = exported as Type<E>& {
+      // Components, Directives, NgModules, and Pipes can all be exported.
+      ngComponentDef?: any;
+      ngDirectiveDef?: any;
+      ngModuleDef?: NgModuleDef<E>;
+      ngPipeDef?: any;
+    };
+
+    // Either the type is a module, a pipe, or a component/directive (which may not have an
+    // ngComponentDef as it might be compiled asynchronously).
+    if (isNgModule(exportedTyped)) {
+      // When this module exports another, the exported module's exported directives and pipes are
+      // added to both the compilation and exported scopes of this module.
+      const exportedScope = transitiveScopesFor(exportedTyped);
+      exportedScope.exported.directives.forEach(entry => {
+        scopes.compilation.directives.add(entry);
+        scopes.exported.directives.add(entry);
+      });
+      exportedScope.exported.pipes.forEach(entry => {
+        scopes.compilation.pipes.add(entry);
+        scopes.exported.pipes.add(entry);
+      });
+    } else if (exportedTyped.ngPipeDef !== undefined) {
+      scopes.exported.pipes.add(exportedTyped);
+    } else {
+      scopes.exported.directives.add(exportedTyped);
+    }
+  });
+
+  def.transitiveCompileScopes = scopes;
+  return scopes;
+}
+
+function flatten<T>(values: any[]): T[] {
+  const out: T[] = [];
+  values.forEach(value => {
+    if (Array.isArray(value)) {
+      out.push(...flatten<T>(value));
+    } else {
+      out.push(value);
+    }
+  });
+  return out;
 }
 
 function expandModuleWithProviders(value: Type<any>| ModuleWithProviders): Type<any> {
@@ -123,9 +185,9 @@ function wrap(value: Type<any>): Expression {
 }
 
 function isModuleWithProviders(value: any): value is ModuleWithProviders {
-  return value.ngModule !== undefined;
+  return (value as{ngModule?: any}).ngModule !== undefined;
 }
 
-function isNgModule(value: any): value is Type<any>&{ngModuleDef: NgModuleDef<any>} {
-  return value.ngModuleDef !== undefined;
+function isNgModule<T>(value: Type<T>): value is Type<T>&{ngModuleDef: NgModuleDef<T>} {
+  return (value as{ngModuleDef?: NgModuleDef<T>}).ngModuleDef !== undefined;
 }
diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel
index 57a2439653..a6e21830bd 100644
--- a/packages/core/test/render3/ivy/BUILD.bazel
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@@ -28,6 +28,9 @@ jasmine_node_test(
     bootstrap = [
         "angular/packages/core/test/render3/load_domino",
     ],
+    tags = [
+        "ivy-jit",
+    ],
     deps = [
         ":ivy_node_lib",
     ],

From 5ef7a07c4ba1835452a2d257d47b9a5cac6e6588 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 8 Jun 2018 11:43:13 -0700
Subject: [PATCH 235/582] docs(ivy): add `<ng-container>` to the remaining work
 items (#24381)

PR Close #24381
---
 packages/core/src/render3/STATUS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index fe3abbc13b..786f0eac08 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -158,9 +158,11 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `<div (hammer.js)>`                         |  ❌     |  ❌      |  ❌      |
 | [`<div (directiveOut)>`][gh23560]           |  ✅     |  ❌      |  ❌      |
 | [`<ng-template (directiveOut)>`][gh23561]   |  ❌     |  ❌      |  ❌      |
+| [`<ng-container>`][gh24381]                 |  ❌     |  ❌      |  ❌      |
 
 [gh23560]: https://github.com/angular/angular/issues/23560
 [gh23561]: https://github.com/angular/angular/issues/23561
+[gh24381]: https://github.com/angular/angular/pull/24381
 
 ### Life Cycle Hooks
 | Feature                   | Runtime | Spec     | Compiler |

From 8c1ac282759035c1134bce92260faec14b959ad0 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 8 Jun 2018 09:00:01 -0700
Subject: [PATCH 236/582] feat(ivy): now supports SVG and MathML elements
 (#24377)

- Adds support for ivy creating SVG and MathML elements properly using
createElementNS

PR Close #24377
---
 .../compiler/src/render3/r3_identifiers.ts    |   6 +
 .../compiler/src/render3/view/compiler.ts     |   5 +-
 .../compiler/src/render3/view/template.ts     |  42 ++++-
 .../render3/r3_compiler_compliance_spec.ts    | 173 ++++++++++++++++++
 .../core/src/core_render3_private_export.ts   |   3 +
 packages/core/src/render3/STATUS.md           |   2 +-
 packages/core/src/render3/index.ts            |   4 +
 packages/core/src/render3/instructions.ts     |  35 +++-
 .../core/src/render3/interfaces/renderer.ts   |   1 +
 packages/core/src/render3/jit/environment.ts  |   3 +
 .../bundling/todo/bundle.golden_symbols.json  |   6 +
 11 files changed, 273 insertions(+), 7 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index b9bf96b0d3..6cdcdc8404 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -17,6 +17,12 @@ export class Identifiers {
   static PATCH_DEPS = 'patchedDeps';
 
   /* Instructions */
+  static namespaceHTML: o.ExternalReference = {name: 'ɵNH', moduleName: CORE};
+
+  static namespaceMathML: o.ExternalReference = {name: 'ɵNM', moduleName: CORE};
+
+  static namespaceSVG: o.ExternalReference = {name: 'ɵNS', moduleName: CORE};
+
   static createElement: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
 
   static elementEnd: o.ExternalReference = {name: 'ɵe', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index a057d83826..d830630418 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -136,7 +136,8 @@ export function compileComponentFromMetadata(
   const templateFunctionExpression =
       new TemplateDefinitionBuilder(
           constantPool, CONTEXT_NAME, BindingScope.ROOT_SCOPE, 0, templateTypeName, templateName,
-          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed)
+          meta.viewQueries, directiveMatcher, directivesUsed, meta.pipes, pipesUsed,
+          R3.namespaceHTML)
           .buildTemplateFunction(
               template.nodes, [], template.hasNgContent, template.ngContentSelectors);
 
@@ -443,4 +444,4 @@ function typeMapToExpressionMap(
   const entries = Array.from(map).map(
       ([key, type]): [string, o.Expression] => [key, outputCtx.importExpr(type)]);
   return new Map(entries);
-}
\ No newline at end of file
+}
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index b0d21a9a11..a9f535f848 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -18,6 +18,7 @@ import * as html from '../../ml_parser/ast';
 import {HtmlParser} from '../../ml_parser/html_parser';
 import {WhitespaceVisitor} from '../../ml_parser/html_whitespaces';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
+import {splitNsName} from '../../ml_parser/tags';
 import * as o from '../../output/output_ast';
 import {ParseError, ParseSourceSpan} from '../../parse_util';
 import {DomElementSchemaRegistry} from '../../schema/dom_element_schema_registry';
@@ -66,7 +67,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       parentBindingScope: BindingScope, private level = 0, private contextName: string|null,
       private templateName: string|null, private viewQueries: R3QueryMetadata[],
       private directiveMatcher: SelectorMatcher|null, private directives: Set<o.Expression>,
-      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>) {
+      private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>,
+      private _namespace: o.ExternalReference) {
     this._bindingScope =
         parentBindingScope.nestedScope((lhsVar: o.ReadVarExpr, expression: o.Expression) => {
           this._bindingCode.push(
@@ -89,6 +91,10 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   buildTemplateFunction(
       nodes: t.Node[], variables: t.Variable[], hasNgContent: boolean = false,
       ngContentSelectors: string[] = []): o.FunctionExpr {
+    if (this._namespace !== R3.namespaceHTML) {
+      this.instruction(this._creationCode, null, this._namespace);
+    }
+
     // Create variable bindings
     for (const variable of variables) {
       const variableName = variable.name;
@@ -220,6 +226,23 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     this.instruction(this._creationCode, ngContent.sourceSpan, R3.projection, ...parameters);
   }
 
+
+  getNamespaceInstruction(namespaceKey: string|null) {
+    switch (namespaceKey) {
+      case 'math':
+        return R3.namespaceMathML;
+      case 'svg':
+        return R3.namespaceSVG;
+      default:
+        return R3.namespaceHTML;
+    }
+  }
+
+  addNamespaceInstruction(nsInstruction: o.ExternalReference, element: t.Element) {
+    this._namespace = nsInstruction;
+    this.instruction(this._creationCode, element.sourceSpan, nsInstruction);
+  }
+
   visitElement(element: t.Element) {
     const elementIndex = this.allocateDataSlot();
     const referenceDataSlots = new Map<string, number>();
@@ -229,6 +252,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     const attrI18nMetas: {[name: string]: string} = {};
     let i18nMeta: string = '';
 
+    const [namespaceKey, elementName] = splitNsName(element.name);
+
     // Elements inside i18n sections are replaced with placeholders
     // TODO(vicb): nested elements are a WIP in this phase
     if (this._inI18nSection) {
@@ -269,7 +294,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Element creation mode
     const parameters: o.Expression[] = [
       o.literal(elementIndex),
-      o.literal(element.name),
+      o.literal(elementName),
     ];
 
     // Add the attributes
@@ -314,6 +339,16 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     if (i18nMessages.length > 0) {
       this._creationCode.push(...i18nMessages);
     }
+
+    const wasInNamespace = this._namespace;
+    const currentNamespace = this.getNamespaceInstruction(namespaceKey);
+
+    // If the namespace is changing now, include an instruction to change it
+    // during element creation.
+    if (currentNamespace !== wasInNamespace) {
+      this.addNamespaceInstruction(currentNamespace, element);
+    }
+
     this.instruction(
         this._creationCode, element.sourceSpan, R3.createElement, ...trimTrailingNulls(parameters));
 
@@ -433,7 +468,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Create the template function
     const templateVisitor = new TemplateDefinitionBuilder(
         this.constantPool, templateContext, this._bindingScope, this.level + 1, contextName,
-        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes);
+        templateName, [], this.directiveMatcher, this.directives, this.pipeTypeByName, this.pipes,
+        this._namespace);
     const templateFunctionExpr =
         templateVisitor.buildTemplateFunction(template.children, template.variables);
     this._postfixCode.push(templateFunctionExpr.toDeclStmt(templateName, null));
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index a60ccb687c..f0371076b3 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -21,6 +21,105 @@ describe('compiler compliance', () => {
   });
 
   describe('elements', () => {
+    it('should handle SVG', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+
+              @Component({
+                selector: 'my-component',
+                template: \`<div class="my-app" title="Hello"><svg><circle cx="20" cy="30" r="50"/></svg><p>test</p></div>\`
+              })
+              export class MyComponent {}
+
+              @NgModule({declarations: [MyComponent]})
+              export class MyModule {}
+          `
+        }
+      };
+
+      // The factory should look like this:
+      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
+
+      // The template should look like this (where IDENT is a wild card for an identifier):
+      const template = `
+        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
+        const $c2$ = ['cx', '20', 'cy', '30', 'r', '50'];
+        …
+        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div', $c1$);
+            $r3$.ɵNS();
+            $r3$.ɵE(1, 'svg');
+            $r3$.ɵE(2, 'circle', $c2$);
+            $r3$.ɵe();
+            $r3$.ɵe();
+            $r3$.ɵNH();
+            $r3$.ɵE(3, 'p');
+            $r3$.ɵT(4, 'test');
+            $r3$.ɵe();
+            $r3$.ɵe();
+          }
+        }
+      `;
+
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, factory, 'Incorrect factory');
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+
+    it('should handle MathML', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+
+              @Component({
+                selector: 'my-component',
+                template: \`<div class="my-app" title="Hello"><math><infinity/></math><p>test</p></div>\`
+              })
+              export class MyComponent {}
+
+              @NgModule({declarations: [MyComponent]})
+              export class MyModule {}
+          `
+        }
+      };
+
+      // The factory should look like this:
+      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
+
+      // The template should look like this (where IDENT is a wild card for an identifier):
+      const template = `
+        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
+        …
+        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div', $c1$);
+            $r3$.ɵNM();
+            $r3$.ɵE(1, 'math');
+            $r3$.ɵE(2, 'infinity');
+            $r3$.ɵe();
+            $r3$.ɵe();
+            $r3$.ɵNH();
+            $r3$.ɵE(3, 'p');
+            $r3$.ɵT(4, 'test');
+            $r3$.ɵe();
+            $r3$.ɵe();
+          }
+        }
+      `;
+
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, factory, 'Incorrect factory');
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+
     it('should translate DOM structure', () => {
       const files = {
         app: {
@@ -1164,6 +1263,80 @@ describe('compiler compliance', () => {
         }
       };
 
+      it('should support embedded views in the SVG namespace', () => {
+        const files = {
+          app: {
+            ...shared,
+            'spec.ts': `
+                  import {Component, NgModule} from '@angular/core';
+                  import {ForOfDirective} from './shared/for_of';
+
+                  @Component({
+                    selector: 'my-component',
+                    template: \`<svg><g *for="let item of items"><circle></circle></g></svg>\`
+                  })
+                  export class MyComponent {
+                    items = [{ data: 42 }, { data: 42 }];
+                  }
+
+                  @NgModule({
+                    declarations: [MyComponent, ForOfDirective]
+                  })
+                  export class MyModule {}
+                `
+          }
+        };
+
+        // TODO(benlesh): Enforce this when the directives are specified
+        const ForDirectiveDefinition = `
+              static ngDirectiveDef = $r3$.ɵdefineDirective({
+                type: ForOfDirective,
+                selectors: [['', 'forOf', '']],
+                factory: function ForOfDirective_Factory() {
+                  return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
+                },
+                features: [$r3$.ɵNgOnChangesFeature(NgForOf)],
+                inputs: {forOf: 'forOf'}
+              });
+            `;
+
+        const MyComponentDefinition = `
+              const $_c0$ = ['for','','forOf',''];
+              …
+              static ngComponentDef = $r3$.ɵdefineComponent({
+                type: MyComponent,
+                selectors: [['my-component']],
+                factory: function MyComponent_Factory() { return new MyComponent(); },
+                template: function MyComponent_Template(rf:IDENT,ctx:IDENT){
+                  if (rf & 1) {
+                    $r3$.ɵNS();
+                    $r3$.ɵE(0,'svg');
+                    $r3$.ɵC(1,MyComponent__svg_g_Template_1,null,$_c0$);
+                    $r3$.ɵe();
+                  }
+                  if (rf & 2) { $r3$.ɵp(1,'forOf',$r3$.ɵb(ctx.items)); }
+                  function MyComponent__svg_g_Template_1(rf:IDENT,ctx0:IDENT) {
+                    if (rf & 1) {
+                      $r3$.ɵNS();
+                      $r3$.ɵE(0,'g');
+                      $r3$.ɵE(1,'circle');
+                      $r3$.ɵe();
+                      $r3$.ɵe();
+                    }
+                  }
+                },
+                directives: [ForOfDirective]
+              });
+            `;
+
+        const result = compile(files, angularFiles);
+        const source = result.source;
+
+        // TODO(benlesh): Enforce this when the directives are specified
+        // expectEmit(source, ForDirectiveDefinition, 'Invalid directive definition');
+        expectEmit(source, MyComponentDefinition, 'Invalid component definition');
+      });
+
       it('should support a let variable and reference', () => {
         const files = {
           app: {
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 3998173ec9..60df2a44cd 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -30,6 +30,9 @@ export {
   NC as ɵNC,
   C as ɵC,
   E as ɵE,
+  NH as ɵNH,
+  NM as ɵNM,
+  NS as ɵNS,
   L as ɵL,
   T as ɵT,
   V as ɵV,
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 786f0eac08..c0a0daae8a 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -150,7 +150,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |
-| `<svg:g svg:p>`                             |  ❌     |  ❌      |  ❌      |
+| `<svg:g svg:p>`                             |  ✅     |  ✅      |  ✅      |
 | `<img src=[userData]>` sanitization         |  ❌     |  ❌      |  ❌      |
 | `<div (nocd.click)>`                        |  ❌     |  ❌      |  ❌      |
 | `<div (bubble.click)>`                      |  ❌     |  ❌      |  ❌      |
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 9d3c28b344..e57520dc1c 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -58,6 +58,10 @@ export {
   load as ld,
   loadDirective as d,
 
+  namespaceHTML as NH,
+  namespaceMathML as NM,
+  namespaceSVG as NS,
+
   projection as P,
   projectionDef as pD,
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index e14ee63070..442d94ae15 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -495,6 +495,7 @@ export function renderEmbeddedTemplate<T>(
       rf = RenderFlags.Create;
     }
     oldView = enterView(viewNode.data, viewNode);
+    namespaceHTML();
     tView.template !(rf, context);
     if (rf & RenderFlags.Update) {
       refreshView();
@@ -520,6 +521,7 @@ export function renderComponentOrTemplate<T>(
       rendererFactory.begin();
     }
     if (template) {
+      namespaceHTML();
       template(getRenderFlags(hostView), componentOrContext !);
       refreshView();
     } else {
@@ -552,6 +554,24 @@ function getRenderFlags(view: LView): RenderFlags {
                                                 RenderFlags.Update;
 }
 
+//////////////////////////
+//// Namespace
+//////////////////////////
+
+let _currentNamespace: string|null = null;
+
+export function namespaceSVG() {
+  _currentNamespace = 'http://www.w3.org/2000/svg/';
+}
+
+export function namespaceMathML() {
+  _currentNamespace = 'http://www.w3.org/1998/MathML/';
+}
+
+export function namespaceHTML() {
+  _currentNamespace = null;
+}
+
 //////////////////////////
 //// Element
 //////////////////////////
@@ -575,7 +595,19 @@ export function elementStart(
       assertEqual(currentView.bindingIndex, -1, 'elements should be created before any bindings');
 
   ngDevMode && ngDevMode.rendererCreateElement++;
-  const native: RElement = renderer.createElement(name);
+
+  let native: RElement;
+
+  if (isProceduralRenderer(renderer)) {
+    native = renderer.createElement(name, _currentNamespace);
+  } else {
+    if (_currentNamespace === null) {
+      native = renderer.createElement(name);
+    } else {
+      native = renderer.createElementNS(_currentNamespace, name);
+    }
+  }
+
   ngDevMode && assertDataInRange(index - 1);
 
   const node: LElementNode =
@@ -2130,6 +2162,7 @@ export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode
   const template = hostView.tView.template !;
 
   try {
+    namespaceHTML();
     template(getRenderFlags(hostView), component);
     refreshView();
   } finally {
diff --git a/packages/core/src/render3/interfaces/renderer.ts b/packages/core/src/render3/interfaces/renderer.ts
index 54983d0a3b..2bc0775a00 100644
--- a/packages/core/src/render3/interfaces/renderer.ts
+++ b/packages/core/src/render3/interfaces/renderer.ts
@@ -36,6 +36,7 @@ export type Renderer3 = ObjectOrientedRenderer3 | ProceduralRenderer3;
  * */
 export interface ObjectOrientedRenderer3 {
   createElement(tagName: string): RElement;
+  createElementNS(namespace: string, tagName: string): RElement;
   createTextNode(data: string): RText;
 
   querySelector(selectors: string): RElement|null;
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 4714697558..0496c64a8b 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -36,6 +36,9 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵcR': r3.cR,
   'ɵcr': r3.cr,
   'ɵd': r3.d,
+  'ɵNH': r3.NH,
+  'ɵNM': r3.NM,
+  'ɵNS': r3.NS,
   'ɵE': r3.E,
   'ɵe': r3.e,
   'ɵf0': r3.f0,
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 865432ac91..e1929f512a 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -176,6 +176,9 @@
   {
     "name": "_currentInjector"
   },
+  {
+    "name": "_currentNamespace"
+  },
   {
     "name": "_devMode"
   },
@@ -545,6 +548,9 @@
   {
     "name": "markViewDirty"
   },
+  {
+    "name": "namespaceHTML"
+  },
   {
     "name": "notImplemented"
   },

From 1b253e14ff3425e404674aa9e0c4778349ff1b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Fri, 6 Apr 2018 12:52:17 -0700
Subject: [PATCH 237/582] fix(ivy): special case [style] and [class] bindings
 for future use (#23232)

PR Close #23232
---
 .../compiler/src/render3/r3_identifiers.ts    |  4 +
 .../compiler/src/render3/view/template.ts     | 20 ++++
 .../render3/r3_view_compiler_styling_spec.ts  | 94 +++++++++++++++++++
 packages/core/src/render3/STATUS.md           |  8 +-
 4 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 packages/compiler/test/render3/r3_view_compiler_styling_spec.ts

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 6cdcdc8404..e5fb36727e 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -31,8 +31,12 @@ export class Identifiers {
 
   static elementAttribute: o.ExternalReference = {name: 'ɵa', moduleName: CORE};
 
+  static elementClass: o.ExternalReference = {name: 'ɵk', moduleName: CORE};
+
   static elementClassNamed: o.ExternalReference = {name: 'ɵkn', moduleName: CORE};
 
+  static elementStyle: o.ExternalReference = {name: 'ɵs', moduleName: CORE};
+
   static elementStyleNamed: o.ExternalReference = {name: 'ɵsn', moduleName: CORE};
 
   static containerCreate: o.ExternalReference = {name: 'ɵC', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index a9f535f848..eca3a45a39 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -39,6 +39,14 @@ const BINDING_INSTRUCTION_MAP: {[type: number]: o.ExternalReference} = {
   [BindingType.Style]: R3.elementStyleNamed,
 };
 
+// `className` is used below instead of `class` because the interception
+// code (where this map is used) deals with DOM element property values
+// (like elm.propName) and not component bindining properties (like [propName]).
+const SPECIAL_CASED_PROPERTIES_INSTRUCTION_MAP: {[index: string]: o.ExternalReference} = {
+  'className': R3.elementClass,
+  'style': R3.elementStyle
+};
+
 export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   private _dataIndex = 0;
   private _bindingContext = 0;
@@ -382,6 +390,18 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
         this._unsupported('animations');
       }
       const convertedBinding = this.convertPropertyBinding(implicit, input.value);
+      const specialInstruction = SPECIAL_CASED_PROPERTIES_INSTRUCTION_MAP[input.name];
+      if (specialInstruction) {
+        // special case for [style] and [class] bindings since they are not handled as
+        // standard properties within this implementation. Instead they are
+        // handed off to special cased instruction handlers which will then
+        // delegate them as animation sequences (or input bindings for dirs/cmps)
+        this.instruction(
+            this._bindingCode, input.sourceSpan, specialInstruction, o.literal(elementIndex),
+            convertedBinding);
+        return;
+      }
+
       const instruction = BINDING_INSTRUCTION_MAP[input.type];
       if (instruction) {
         // TODO(chuckj): runtime: security context?
diff --git a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
new file mode 100644
index 0000000000..df527a99d5
--- /dev/null
+++ b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
@@ -0,0 +1,94 @@
+/**
+ * @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 {MockDirectory, setup} from '../aot/test_util';
+import {compile, expectEmit} from './mock_compile';
+
+describe('compiler compliance: styling', () => {
+  const angularFiles = setup({
+    compileAngular: true,
+    compileAnimations: false,
+    compileCommon: true,
+  });
+
+  describe('[style]', () => {
+    it('should create style instructions on the element', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div [style]="myStyleExp"></div>\`
+                })
+                export class MyComponent {
+                  myStyleExp = [{color:'red'}, {color:'blue', duration:1000}]
+                }
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+        }
+      };
+
+      const template = `
+          template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+            if (rf & 1) {
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵe();
+            }
+            if (rf & 2) {
+              $r3$.ɵs(0,$r3$.ɵb($ctx$.myStyleExp));
+            }
+          }
+          `;
+
+      const result = compile(files, angularFiles);
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+  });
+
+  describe('[class]', () => {
+    it('should create class styling instructions on the element', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div [class]="myClassExp"></div>\`
+                })
+                export class MyComponent {
+                  myClassExp = [{color:'orange'}, {color:'green', duration:1000}]
+                }
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+        }
+      };
+
+      const template = `
+          template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+            if (rf & 1) {
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵe();
+            }
+            if (rf & 2) {
+              $r3$.ɵk(0,$r3$.ɵb($ctx$.myClassExp));
+            }
+          }
+          `;
+
+      const result = compile(files, angularFiles);
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+  });
+});
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index c0a0daae8a..a8de96258b 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -142,11 +142,11 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `<div title="Hello {{name}}!">`             |  ✅     |  ✅      |  ✅      |
 | `<div [attr.value]="exp">`                  |  ✅     |  ✅      |  ❌      |
 | `<div class="literal">`                     |  ✅     |  ✅      |  ✅      |
-| `<div [class]="exp">`                       |  ❌     |  ❌      |  ❌      |
-| `<div [class.foo]="exp">`                   |  ✅     |  ✅      |  ❌      |
+| `<div [class]="exp">`                       |  ✅     |  ✅      |  ✅      |
+| `<div [class.foo]="exp">`                   |  ✅     |  ✅      |  ✅      |
 | `<div style="literal">`                     |  ✅     |  ✅      |  ✅      |
-| `<div [style]="exp">`                       |  ❌     |  ❌      |  ❌      |
-| `<div [style.foo]="exp">`                   |  ✅     |  ✅      |  ❌      |
+| `<div [style]="exp">`                       |  ✅     |  ✅      |  ✅      |
+| `<div [style.foo]="exp">`                   |  ✅     |  ✅      |  ✅      |
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |

From 49c5234c6817ceae02b8bacb30adae99c45a49a9 Mon Sep 17 00:00:00 2001
From: Victor Savkin <vic.savkin@gmail.com>
Date: Thu, 17 May 2018 07:33:50 -0400
Subject: [PATCH 238/582] feat(router): implement scrolling restoration service
 (#20030)

For documentation, see `RouterModule.scrollPositionRestoration`

Fixes #13636 #10929 #7791 #6595

PR Close #20030
---
 packages/common/src/common.ts                 |   1 +
 packages/common/src/viewport_scroller.ts      | 183 ++++++++++++++++++
 packages/platform-server/src/server.ts        |   3 +-
 packages/platform-webworker/src/worker_app.ts |   3 +-
 packages/router/src/events.ts                 |  25 ++-
 packages/router/src/index.ts                  |   2 +-
 packages/router/src/router.ts                 |   1 -
 packages/router/src/router_module.ts          |  89 ++++++++-
 packages/router/src/router_scroller.ts        |  91 +++++++++
 packages/router/test/bootstrap.spec.ts        |  82 +++++++-
 packages/router/test/router_scroller.spec.ts  | 168 ++++++++++++++++
 tools/public_api_guard/common/common.d.ts     |   9 +
 tools/public_api_guard/router/router.d.ts     |  16 +-
 13 files changed, 662 insertions(+), 11 deletions(-)
 create mode 100644 packages/common/src/viewport_scroller.ts
 create mode 100644 packages/router/src/router_scroller.ts
 create mode 100644 packages/router/test/router_scroller.spec.ts

diff --git a/packages/common/src/common.ts b/packages/common/src/common.ts
index 9db719aba6..1ad85ea133 100644
--- a/packages/common/src/common.ts
+++ b/packages/common/src/common.ts
@@ -25,3 +25,4 @@ export {AsyncPipe, DatePipe, I18nPluralPipe, I18nSelectPipe, JsonPipe, LowerCase
 export {DeprecatedDatePipe, DeprecatedCurrencyPipe, DeprecatedDecimalPipe, DeprecatedPercentPipe} from './pipes/deprecated/index';
 export {PLATFORM_BROWSER_ID as ɵPLATFORM_BROWSER_ID, PLATFORM_SERVER_ID as ɵPLATFORM_SERVER_ID, PLATFORM_WORKER_APP_ID as ɵPLATFORM_WORKER_APP_ID, PLATFORM_WORKER_UI_ID as ɵPLATFORM_WORKER_UI_ID, isPlatformBrowser, isPlatformServer, isPlatformWorkerApp, isPlatformWorkerUi} from './platform_id';
 export {VERSION} from './version';
+export {ViewportScroller, NullViewportScroller as ɵNullViewportScroller} from './viewport_scroller';
diff --git a/packages/common/src/viewport_scroller.ts b/packages/common/src/viewport_scroller.ts
new file mode 100644
index 0000000000..6270b063d6
--- /dev/null
+++ b/packages/common/src/viewport_scroller.ts
@@ -0,0 +1,183 @@
+/**
+ * @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 {defineInjectable, inject} from '@angular/core';
+
+import {DOCUMENT} from './dom_tokens';
+
+/**
+ * @whatItDoes Manages the scroll position.
+ */
+export abstract class ViewportScroller {
+  // De-sugared tree-shakable injection
+  // See #23917
+  /** @nocollapse */
+  static ngInjectableDef = defineInjectable(
+      {providedIn: 'root', factory: () => new BrowserViewportScroller(inject(DOCUMENT), window)});
+
+  /**
+   * @whatItDoes Configures the top offset used when scrolling to an anchor.
+   *
+   * When given a tuple with two number, the service will always use the numbers.
+   * When given a function, the service will invoke the function every time it restores scroll
+   * position.
+   */
+  abstract setOffset(offset: [number, number]|(() => [number, number])): void;
+
+  /**
+   * @whatItDoes Returns the current scroll position.
+   */
+  abstract getScrollPosition(): [number, number];
+
+  /**
+   * @whatItDoes Sets the scroll position.
+   */
+  abstract scrollToPosition(position: [number, number]): void;
+
+  /**
+   * @whatItDoes Scrolls to the provided anchor.
+   */
+  abstract scrollToAnchor(anchor: string): void;
+
+  /**
+   * @whatItDoes Disables automatic scroll restoration provided by the browser.
+   * See also [window.history.scrollRestoration
+   * info](https://developers.google.com/web/updates/2015/09/history-api-scroll-restoration)
+   */
+  abstract setHistoryScrollRestoration(scrollRestoration: 'auto'|'manual'): void;
+}
+
+/**
+ * @whatItDoes Manages the scroll position.
+ */
+export class BrowserViewportScroller implements ViewportScroller {
+  private offset: () => [number, number] = () => [0, 0];
+
+  constructor(private document: any, private window: any) {}
+
+  /**
+   * @whatItDoes Configures the top offset used when scrolling to an anchor.
+   *
+   * * When given a number, the service will always use the number.
+   * * When given a function, the service will invoke the function every time it restores scroll
+   * position.
+   */
+  setOffset(offset: [number, number]|(() => [number, number])): void {
+    if (Array.isArray(offset)) {
+      this.offset = () => offset;
+    } else {
+      this.offset = offset;
+    }
+  }
+
+  /**
+   * @whatItDoes Returns the current scroll position.
+   */
+  getScrollPosition(): [number, number] {
+    if (this.supportScrollRestoration()) {
+      return [this.window.scrollX, this.window.scrollY];
+    } else {
+      return [0, 0];
+    }
+  }
+
+  /**
+   * @whatItDoes Sets the scroll position.
+   */
+  scrollToPosition(position: [number, number]): void {
+    if (this.supportScrollRestoration()) {
+      this.window.scrollTo(position[0], position[1]);
+    }
+  }
+
+  /**
+   * @whatItDoes Scrolls to the provided anchor.
+   */
+  scrollToAnchor(anchor: string): void {
+    if (this.supportScrollRestoration()) {
+      const elSelectedById = this.document.querySelector(`#${anchor}`);
+      if (elSelectedById) {
+        this.scrollToElement(elSelectedById);
+        return;
+      }
+      const elSelectedByName = this.document.querySelector(`[name='${anchor}']`);
+      if (elSelectedByName) {
+        this.scrollToElement(elSelectedByName);
+        return;
+      }
+    }
+  }
+
+  /**
+   * @whatItDoes Disables automatic scroll restoration provided by the browser.
+   */
+  setHistoryScrollRestoration(scrollRestoration: 'auto'|'manual'): void {
+    if (this.supportScrollRestoration()) {
+      const history = this.window.history;
+      if (history && history.scrollRestoration) {
+        history.scrollRestoration = scrollRestoration;
+      }
+    }
+  }
+
+  private scrollToElement(el: any): void {
+    const rect = el.getBoundingClientRect();
+    const left = rect.left + this.window.pageXOffset;
+    const top = rect.top + this.window.pageYOffset;
+    const offset = this.offset();
+    this.window.scrollTo(left - offset[0], top - offset[1]);
+  }
+
+  /**
+   * We only support scroll restoration when we can get a hold of window.
+   * This means that we do not support this behavior when running in a web worker.
+   *
+   * Lifting this restriction right now would require more changes in the dom adapter.
+   * Since webworkers aren't widely used, we will lift it once RouterScroller is
+   * battle-tested.
+   */
+  private supportScrollRestoration(): boolean {
+    try {
+      return !!this.window && !!this.window.scrollTo;
+    } catch (e) {
+      return false;
+    }
+  }
+}
+
+
+/**
+ * @whatItDoes Provides an empty implementation of the viewport scroller. This will
+ * live in @angular/common as it will be used by both platform-server and platform-webworker.
+ */
+export class NullViewportScroller implements ViewportScroller {
+  /**
+   * @whatItDoes empty implementation
+   */
+  setOffset(offset: [number, number]|(() => [number, number])): void {}
+
+  /**
+   * @whatItDoes empty implementation
+   */
+  getScrollPosition(): [number, number] { return [0, 0]; }
+
+  /**
+   * @whatItDoes empty implementation
+   */
+  scrollToPosition(position: [number, number]): void {}
+
+  /**
+   * @whatItDoes empty implementation
+   */
+  scrollToAnchor(anchor: string): void {}
+
+  /**
+   * @whatItDoes empty implementation
+   */
+  setHistoryScrollRestoration(scrollRestoration: 'auto'|'manual'): void {}
+}
\ No newline at end of file
diff --git a/packages/platform-server/src/server.ts b/packages/platform-server/src/server.ts
index 1b0febf54c..a09d0882db 100644
--- a/packages/platform-server/src/server.ts
+++ b/packages/platform-server/src/server.ts
@@ -7,7 +7,7 @@
  */
 
 import {ɵAnimationEngine} from '@angular/animations/browser';
-import {PlatformLocation, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@angular/common';
+import {PlatformLocation, ViewportScroller, ɵNullViewportScroller as NullViewportScroller, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@angular/common';
 import {HttpClientModule} from '@angular/common/http';
 import {Injectable, InjectionToken, Injector, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, StaticProvider, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core';
 import {HttpModule} from '@angular/http';
@@ -74,6 +74,7 @@ export const SERVER_RENDER_PROVIDERS: Provider[] = [
     SERVER_RENDER_PROVIDERS,
     SERVER_HTTP_PROVIDERS,
     {provide: Testability, useValue: null},
+    {provide: ViewportScroller, useClass: NullViewportScroller},
   ],
 })
 export class ServerModule {
diff --git a/packages/platform-webworker/src/worker_app.ts b/packages/platform-webworker/src/worker_app.ts
index 07bf264d64..6fbb10206a 100644
--- a/packages/platform-webworker/src/worker_app.ts
+++ b/packages/platform-webworker/src/worker_app.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CommonModule, ɵPLATFORM_WORKER_APP_ID as PLATFORM_WORKER_APP_ID} from '@angular/common';
+import {CommonModule, ViewportScroller, ɵNullViewportScroller as NullViewportScroller, ɵPLATFORM_WORKER_APP_ID as PLATFORM_WORKER_APP_ID} from '@angular/common';
 import {APP_INITIALIZER, ApplicationModule, ErrorHandler, NgModule, NgZone, PLATFORM_ID, PlatformRef, RendererFactory2, RootRenderer, StaticProvider, createPlatformFactory, platformCore} from '@angular/core';
 import {DOCUMENT, ɵBROWSER_SANITIZATION_PROVIDERS as BROWSER_SANITIZATION_PROVIDERS} from '@angular/platform-browser';
 
@@ -71,6 +71,7 @@ export function setupWebWorker(): void {
     {provide: ErrorHandler, useFactory: errorHandler, deps: []},
     {provide: MessageBus, useFactory: createMessageBus, deps: [NgZone]},
     {provide: APP_INITIALIZER, useValue: setupWebWorker, multi: true},
+    {provide: ViewportScroller, useClass: NullViewportScroller, deps: []},
   ],
   exports: [
     CommonModule,
diff --git a/packages/router/src/events.ts b/packages/router/src/events.ts
index 72c49ab3a2..4459327449 100644
--- a/packages/router/src/events.ts
+++ b/packages/router/src/events.ts
@@ -401,6 +401,28 @@ export class ActivationEnd {
   }
 }
 
+/**
+ * @description
+ *
+ * Represents a scrolling event.
+ */
+export class Scroll {
+  constructor(
+      /** @docsNotRequired */
+      readonly routerEvent: NavigationEnd,
+
+      /** @docsNotRequired */
+      readonly position: [number, number]|null,
+
+      /** @docsNotRequired */
+      readonly anchor: string|null) {}
+
+  toString(): string {
+    const pos = this.position ? `${this.position[0]}, ${this.position[1]}` : null;
+    return `Scroll(anchor: '${this.anchor}', position: '${pos}')`;
+  }
+}
+
 /**
  * @description
  *
@@ -423,8 +445,9 @@ export class ActivationEnd {
  * - `NavigationEnd`,
  * - `NavigationCancel`,
  * - `NavigationError`
+ * - `Scroll`
  *
  *
  */
 export type Event = RouterEvent | RouteConfigLoadStart | RouteConfigLoadEnd | ChildActivationStart |
-    ChildActivationEnd | ActivationStart | ActivationEnd;
+    ChildActivationEnd | ActivationStart | ActivationEnd | Scroll;
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index b57ec7884e..19cef3be6b 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -11,7 +11,7 @@ export {Data, LoadChildren, LoadChildrenCallback, ResolveData, Route, Routes, Ru
 export {RouterLink, RouterLinkWithHref} from './directives/router_link';
 export {RouterLinkActive} from './directives/router_link_active';
 export {RouterOutlet} from './directives/router_outlet';
-export {ActivationEnd, ActivationStart, ChildActivationEnd, ChildActivationStart, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouterEvent, RoutesRecognized} from './events';
+export {ActivationEnd, ActivationStart, ChildActivationEnd, ChildActivationStart, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouterEvent, RoutesRecognized, Scroll} from './events';
 export {CanActivate, CanActivateChild, CanDeactivate, CanLoad, Resolve} from './interfaces';
 export {DetachedRouteHandle, RouteReuseStrategy} from './route_reuse_strategy';
 export {NavigationExtras, Router} from './router';
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index bdee78a836..b4f28a84c0 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -543,7 +543,6 @@ export class Router {
       rawUrl: UrlTree, source: NavigationTrigger, state: {navigationId: number}|null,
       extras: NavigationExtras): Promise<boolean> {
     const lastNavigation = this.navigations.value;
-
     // If the user triggers a navigation imperatively (e.g., by using navigateByUrl),
     // and that navigation results in 'replaceState' that leads to the same URL,
     // we should skip those.
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index 0d8c252af2..8a0c1c8bd6 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_BASE_HREF, HashLocationStrategy, LOCATION_INITIALIZED, Location, LocationStrategy, PathLocationStrategy, PlatformLocation} from '@angular/common';
+import {APP_BASE_HREF, HashLocationStrategy, LOCATION_INITIALIZED, Location, LocationStrategy, PathLocationStrategy, PlatformLocation, ViewportScroller} from '@angular/common';
 import {ANALYZE_FOR_ENTRY_COMPONENTS, APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, ApplicationRef, Compiler, ComponentRef, Inject, Injectable, InjectionToken, Injector, ModuleWithProviders, NgModule, NgModuleFactoryLoader, NgProbeToken, Optional, Provider, SkipSelf, SystemJsNgModuleLoader} from '@angular/core';
 import {ɵgetDOM as getDOM} from '@angular/platform-browser';
 import {Subject, of } from 'rxjs';
@@ -21,6 +21,7 @@ import {ErrorHandler, Router} from './router';
 import {ROUTES} from './router_config_loader';
 import {ChildrenOutletContexts} from './router_outlet_context';
 import {NoPreloading, PreloadAllModules, PreloadingStrategy, RouterPreloader} from './router_preloader';
+import {RouterScroller} from './router_scroller';
 import {ActivatedRoute} from './router_state';
 import {UrlHandlingStrategy} from './url_handling_strategy';
 import {DefaultUrlSerializer, UrlSerializer} from './url_tree';
@@ -165,6 +166,11 @@ export class RouterModule {
             PlatformLocation, [new Inject(APP_BASE_HREF), new Optional()], ROUTER_CONFIGURATION
           ]
         },
+        {
+          provide: RouterScroller,
+          useFactory: createRouterScroller,
+          deps: [Router, ViewportScroller, ROUTER_CONFIGURATION]
+        },
         {
           provide: PreloadingStrategy,
           useExisting: config && config.preloadingStrategy ? config.preloadingStrategy :
@@ -184,6 +190,14 @@ export class RouterModule {
   }
 }
 
+export function createRouterScroller(
+    router: Router, viewportScroller: ViewportScroller, config: ExtraOptions): RouterScroller {
+  if (config.scrollOffset) {
+    viewportScroller.setOffset(config.scrollOffset);
+  }
+  return new RouterScroller(router, viewportScroller, config);
+}
+
 export function provideLocationStrategy(
     platformLocationStrategy: PlatformLocation, baseHref: string, options: ExtraOptions = {}) {
   return options.useHash ? new HashLocationStrategy(platformLocationStrategy, baseHref) :
@@ -291,6 +305,77 @@ export interface ExtraOptions {
    */
   onSameUrlNavigation?: 'reload'|'ignore';
 
+  /**
+   * Configures if the scroll position needs to be restored when navigating back.
+   *
+   * * 'disabled'--does nothing (default).
+   * * 'top'--set the scroll position to 0,0..
+   * * 'enabled'--set the scroll position to the stored position. This option will be the default in
+   * the future.
+   *
+   * When enabled, the router store store scroll positions when navigating forward, and will
+   * restore the stored positions whe navigating back (popstate). When navigating forward,
+   * the scroll position will be set to [0, 0], or to the anchor if one is provided.
+   *
+   * You can implement custom scroll restoration behavior as follows.
+   * ```typescript
+   * class AppModule {
+   *  constructor(router: Router, viewportScroller: ViewportScroller, store: Store<AppState>) {
+   *    router.events.pipe(filter(e => e instanceof Scroll), switchMap(e => {
+   *      return store.pipe(first(), timeout(200), map(() => e));
+   *    }).subscribe(e => {
+   *      if (e.position) {
+   *        viewportScroller.scrollToPosition(e.position);
+   *      } else if (e.anchor) {
+   *        viewportScroller.scrollToAnchor(e.anchor);
+   *      } else {
+   *        viewportScroller.scrollToPosition([0, 0]);
+   *      }
+   *    });
+   *  }
+   * }
+   * ```
+   *
+   * You can also implement component-specific scrolling like this:
+   *
+   * ```typescript
+   * class ListComponent {
+   *   list: any[];
+   *   constructor(router: Router, viewportScroller: ViewportScroller, fetcher: ListFetcher) {
+   *     const scrollEvents = router.events.filter(e => e instanceof Scroll);
+   *     listFetcher.fetch().pipe(withLatestFrom(scrollEvents)).subscribe(([list, e]) => {
+   *       this.list = list;
+   *       if (e.position) {
+   *         viewportScroller.scrollToPosition(e.position);
+   *       } else {
+   *         viewportScroller.scrollToPosition([0, 0]);
+   *       }
+   *     });
+   *   }
+   * }
+   */
+  scrollPositionRestoration?: 'disabled'|'enabled'|'top';
+
+  /**
+   * Configures if the router should scroll to the element when the url has a fragment.
+   *
+   * * 'disabled'--does nothing (default).
+   * * 'enabled'--scrolls to the element. This option will be the default in the future.
+   *
+   * Anchor scrolling does not happen on 'popstate'. Instead, we restore the position
+   * that we stored or scroll to the top.
+   */
+  anchorScrolling?: 'disabled'|'enabled';
+
+  /**
+   * Configures the scroll offset the router will use when scrolling to an element.
+   *
+   * When given a tuple with two numbers, the router will always use the numbers.
+   * When given a function, the router will invoke the function every time it restores scroll
+   * position.
+   */
+  scrollOffset?: [number, number]|(() => [number, number]);
+
   /**
    * Defines how the router merges params, data and resolved data from parent to child
    * routes. Available options are:
@@ -406,6 +491,7 @@ export class RouterInitializer {
   bootstrapListener(bootstrappedComponentRef: ComponentRef<any>): void {
     const opts = this.injector.get(ROUTER_CONFIGURATION);
     const preloader = this.injector.get(RouterPreloader);
+    const routerScroller = this.injector.get(RouterScroller);
     const router = this.injector.get(Router);
     const ref = this.injector.get<ApplicationRef>(ApplicationRef);
 
@@ -420,6 +506,7 @@ export class RouterInitializer {
     }
 
     preloader.setUpPreloading();
+    routerScroller.init();
     router.resetRootComponentType(ref.componentTypes[0]);
     this.resultOfPreactivationDone.next(null !);
     this.resultOfPreactivationDone.complete();
diff --git a/packages/router/src/router_scroller.ts b/packages/router/src/router_scroller.ts
new file mode 100644
index 0000000000..7d3dc4b90d
--- /dev/null
+++ b/packages/router/src/router_scroller.ts
@@ -0,0 +1,91 @@
+/**
+ * @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 {ViewportScroller} from '@angular/common';
+import {OnDestroy} from '@angular/core';
+import {Unsubscribable} from 'rxjs';
+
+import {NavigationEnd, NavigationStart, Scroll} from './events';
+import {Router} from './router';
+
+export class RouterScroller implements OnDestroy {
+  private routerEventsSubscription: Unsubscribable;
+  private scrollEventsSubscription: Unsubscribable;
+
+  private lastId = 0;
+  private lastSource: 'imperative'|'popstate'|'hashchange'|undefined = 'imperative';
+  private restoredId = 0;
+  private store: {[key: string]: [number, number]} = {};
+
+  constructor(
+      private router: Router,
+      /** @docsNotRequired */ public readonly viewportScroller: ViewportScroller, private options: {
+        scrollPositionRestoration?: 'disabled' | 'enabled' | 'top',
+        anchorScrolling?: 'disabled'|'enabled'
+      } = {}) {}
+
+  init(): void {
+    // we want to disable the automatic scrolling because having two places
+    // responsible for scrolling results race conditions, especially given
+    // that browser don't implement this behavior consistently
+    if (this.options.scrollPositionRestoration !== 'disabled') {
+      this.viewportScroller.setHistoryScrollRestoration('manual');
+    }
+    this.routerEventsSubscription = this.createScrollEvents();
+    this.scrollEventsSubscription = this.consumeScrollEvents();
+  }
+
+  private createScrollEvents() {
+    return this.router.events.subscribe(e => {
+      if (e instanceof NavigationStart) {
+        // store the scroll position of the current stable navigations.
+        this.store[this.lastId] = this.viewportScroller.getScrollPosition();
+        this.lastSource = e.navigationTrigger;
+        this.restoredId = e.restoredState ? e.restoredState.navigationId : 0;
+      } else if (e instanceof NavigationEnd) {
+        this.lastId = e.id;
+        this.scheduleScrollEvent(e, this.router.parseUrl(e.urlAfterRedirects).fragment);
+      }
+    });
+  }
+
+  private consumeScrollEvents() {
+    return this.router.events.subscribe(e => {
+      if (!(e instanceof Scroll)) return;
+      // a popstate event. The pop state event will always ignore anchor scrolling.
+      if (e.position) {
+        if (this.options.scrollPositionRestoration === 'top') {
+          this.viewportScroller.scrollToPosition([0, 0]);
+        } else if (this.options.scrollPositionRestoration === 'enabled') {
+          this.viewportScroller.scrollToPosition(e.position);
+        }
+        // imperative navigation "forward"
+      } else {
+        if (e.anchor && this.options.anchorScrolling === 'enabled') {
+          this.viewportScroller.scrollToAnchor(e.anchor);
+        } else if (this.options.scrollPositionRestoration !== 'disabled') {
+          this.viewportScroller.scrollToPosition([0, 0]);
+        }
+      }
+    });
+  }
+
+  private scheduleScrollEvent(routerEvent: NavigationEnd, anchor: string|null): void {
+    this.router.triggerEvent(new Scroll(
+        routerEvent, this.lastSource === 'popstate' ? this.store[this.restoredId] : null, anchor));
+  }
+
+  ngOnDestroy() {
+    if (this.routerEventsSubscription) {
+      this.routerEventsSubscription.unsubscribe();
+    }
+    if (this.scrollEventsSubscription) {
+      this.scrollEventsSubscription.unsubscribe();
+    }
+  }
+}
diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts
index 82555905e2..adf4c99e0c 100644
--- a/packages/router/test/bootstrap.spec.ts
+++ b/packages/router/test/bootstrap.spec.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_BASE_HREF} from '@angular/common';
+import {APP_BASE_HREF, Location, ViewportScroller} from '@angular/common';
 import {ApplicationRef, CUSTOM_ELEMENTS_SCHEMA, Component, NgModule, destroyPlatform} from '@angular/core';
 import {inject} from '@angular/core/testing';
 import {BrowserModule, DOCUMENT, ɵgetDOM as getDOM} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {NavigationEnd, Resolve, Router, RouterModule} from '@angular/router';
-
+import {NavigationEnd, NavigationStart, Resolve, Router, RouterModule} from '@angular/router';
+import {filter, first} from 'rxjs/operators';
 
 describe('bootstrap', () => {
   if (isNode) return;
@@ -86,7 +86,7 @@ describe('bootstrap', () => {
       expect(log).toEqual([
         'TestModule', 'NavigationStart', 'RoutesRecognized', 'GuardsCheckStart',
         'ChildActivationStart', 'ActivationStart', 'GuardsCheckEnd', 'ResolveStart', 'ResolveEnd',
-        'RootCmp', 'ActivationEnd', 'ChildActivationEnd', 'NavigationEnd'
+        'RootCmp', 'ActivationEnd', 'ChildActivationEnd', 'NavigationEnd', 'Scroll'
       ]);
       done();
     });
@@ -248,4 +248,78 @@ describe('bootstrap', () => {
          appRef.components[0].destroy();
        });
      });
+
+
+  it('should restore the scrolling position', async(done) => {
+    @Component({
+      selector: 'component-a',
+      template: `
+           <div style="height: 3000px;"></div>
+           <div id="marker1"></div>
+           <div style="height: 3000px;"></div>
+           <div id="marker2"></div>
+           <div style="height: 3000px;"></div>
+           <a name="marker3"></a>
+           <div style="height: 3000px;"></div>
+      `
+    })
+    class TallComponent {
+    }
+    @NgModule({
+      imports: [
+        BrowserModule,
+        RouterModule.forRoot(
+            [
+              {path: '', pathMatch: 'full', redirectTo: '/aa'},
+              {path: 'aa', component: TallComponent}, {path: 'bb', component: TallComponent},
+              {path: 'cc', component: TallComponent},
+              {path: 'fail', component: TallComponent, canActivate: ['returnFalse']}
+            ],
+            {
+              useHash: true,
+              scrollPositionRestoration: 'enabled',
+              anchorScrolling: 'enabled',
+              scrollOffset: [0, 100],
+              onSameUrlNavigation: 'reload'
+            })
+      ],
+      declarations: [TallComponent, RootCmp],
+      bootstrap: [RootCmp],
+      providers: [...testProviders, {provide: 'returnFalse', useValue: () => false}],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    })
+    class TestModule {
+    }
+
+    const res = await platformBrowserDynamic([]).bootstrapModule(TestModule);
+    const router = res.injector.get(Router);
+    const location: Location = res.injector.get(Location);
+
+    await router.navigateByUrl('/aa');
+    window.scrollTo(0, 5000);
+
+    await router.navigateByUrl('/fail');
+    expect(window.scrollY).toEqual(5000);
+
+    await router.navigateByUrl('/bb');
+    window.scrollTo(0, 3000);
+
+    expect(window.scrollY).toEqual(3000);
+
+    await router.navigateByUrl('/cc');
+    expect(window.scrollY).toEqual(0);
+
+    await router.navigateByUrl('/aa#marker2');
+    expect(window.scrollY >= 5900).toBe(true);
+    expect(window.scrollY < 6000).toBe(true);  // offset
+
+    await router.navigateByUrl('/aa#marker3');
+    expect(window.scrollY >= 8900).toBe(true);
+    expect(window.scrollY < 9000).toBe(true);
+    done();
+  });
+
+  function waitForNavigationToComplete(router: Router): Promise<any> {
+    return router.events.pipe(filter((e: any) => e instanceof NavigationEnd), first()).toPromise();
+  }
 });
diff --git a/packages/router/test/router_scroller.spec.ts b/packages/router/test/router_scroller.spec.ts
new file mode 100644
index 0000000000..b5565f65f2
--- /dev/null
+++ b/packages/router/test/router_scroller.spec.ts
@@ -0,0 +1,168 @@
+/**
+ * @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 {fakeAsync, tick} from '@angular/core/testing';
+import {DefaultUrlSerializer, NavigationEnd, NavigationStart, RouterEvent} from '@angular/router';
+import {Subject} from 'rxjs';
+import {filter, switchMap} from 'rxjs/operators';
+
+import {Scroll} from '../src/events';
+import {RouterScroller} from '../src/router_scroller';
+
+describe('RouterScroller', () => {
+  describe('scroll to top', () => {
+    it('should scroll to the top', () => {
+      const {events, viewportScroller} =
+          createRouterScroller({scrollPositionRestoration: 'top', anchorScrolling: 'disabled'});
+
+      events.next(new NavigationStart(1, '/a'));
+      events.next(new NavigationEnd(1, '/a', '/a'));
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]);
+
+      events.next(new NavigationStart(2, '/a'));
+      events.next(new NavigationEnd(2, '/b', '/b'));
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]);
+
+      events.next(new NavigationStart(3, '/a', 'popstate'));
+      events.next(new NavigationEnd(3, '/a', '/a'));
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]);
+    });
+  });
+
+  describe('scroll to the stored position', () => {
+    it('should scroll to the stored position on popstate', () => {
+      const {events, viewportScroller} =
+          createRouterScroller({scrollPositionRestoration: 'enabled', anchorScrolling: 'disabled'});
+
+      events.next(new NavigationStart(1, '/a'));
+      events.next(new NavigationEnd(1, '/a', '/a'));
+      setScroll(viewportScroller, 10, 100);
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]);
+
+      events.next(new NavigationStart(2, '/b'));
+      events.next(new NavigationEnd(2, '/b', '/b'));
+      setScroll(viewportScroller, 20, 200);
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]);
+
+      events.next(new NavigationStart(3, '/a', 'popstate', {navigationId: 1}));
+      events.next(new NavigationEnd(3, '/a', '/a'));
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([10, 100]);
+    });
+  });
+
+  describe('anchor scrolling', () => {
+    it('should work (scrollPositionRestoration is disabled)', () => {
+      const {events, viewportScroller} =
+          createRouterScroller({scrollPositionRestoration: 'disabled', anchorScrolling: 'enabled'});
+      events.next(new NavigationStart(1, '/a#anchor'));
+      events.next(new NavigationEnd(1, '/a#anchor', '/a#anchor'));
+      expect(viewportScroller.scrollToAnchor).toHaveBeenCalledWith('anchor');
+
+      events.next(new NavigationStart(2, '/a#anchor2'));
+      events.next(new NavigationEnd(2, '/a#anchor2', '/a#anchor2'));
+      expect(viewportScroller.scrollToAnchor).toHaveBeenCalledWith('anchor2');
+      viewportScroller.scrollToAnchor.calls.reset();
+
+      // we never scroll to anchor when navigating back.
+      events.next(new NavigationStart(3, '/a#anchor', 'popstate'));
+      events.next(new NavigationEnd(3, '/a#anchor', '/a#anchor'));
+      expect(viewportScroller.scrollToAnchor).not.toHaveBeenCalled();
+      expect(viewportScroller.scrollToPosition).not.toHaveBeenCalled();
+    });
+
+    it('should work (scrollPositionRestoration is enabled)', () => {
+      const {events, viewportScroller} =
+          createRouterScroller({scrollPositionRestoration: 'enabled', anchorScrolling: 'enabled'});
+      events.next(new NavigationStart(1, '/a#anchor'));
+      events.next(new NavigationEnd(1, '/a#anchor', '/a#anchor'));
+      expect(viewportScroller.scrollToAnchor).toHaveBeenCalledWith('anchor');
+
+      events.next(new NavigationStart(2, '/a#anchor2'));
+      events.next(new NavigationEnd(2, '/a#anchor2', '/a#anchor2'));
+      expect(viewportScroller.scrollToAnchor).toHaveBeenCalledWith('anchor2');
+      viewportScroller.scrollToAnchor.calls.reset();
+
+      // we never scroll to anchor when navigating back
+      events.next(new NavigationStart(3, '/a#anchor', 'popstate', {navigationId: 1}));
+      events.next(new NavigationEnd(3, '/a#anchor', '/a#anchor'));
+      expect(viewportScroller.scrollToAnchor).not.toHaveBeenCalled();
+      expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]);
+    });
+  });
+
+  describe('extending a scroll service', () => {
+    it('work', fakeAsync(() => {
+         const {events, viewportScroller, router} = createRouterScroller(
+             {scrollPositionRestoration: 'disabled', anchorScrolling: 'disabled'});
+
+         router.events
+             .pipe(filter(e => e instanceof Scroll && !!e.position), switchMap(p => {
+                     // can be any delay (e.g., we can wait for NgRx store to emit an event)
+                     const r = new Subject<any>();
+                     setTimeout(() => {
+                       r.next(p);
+                       r.complete();
+                     }, 1000);
+                     return r;
+                   }))
+             .subscribe((e: Scroll) => { viewportScroller.scrollToPosition(e.position); });
+
+         events.next(new NavigationStart(1, '/a'));
+         events.next(new NavigationEnd(1, '/a', '/a'));
+         setScroll(viewportScroller, 10, 100);
+
+         events.next(new NavigationStart(2, '/b'));
+         events.next(new NavigationEnd(2, '/b', '/b'));
+         setScroll(viewportScroller, 20, 200);
+
+         events.next(new NavigationStart(3, '/c'));
+         events.next(new NavigationEnd(3, '/c', '/c'));
+         setScroll(viewportScroller, 30, 300);
+
+         events.next(new NavigationStart(4, '/a', 'popstate', {navigationId: 1}));
+         events.next(new NavigationEnd(4, '/a', '/a'));
+
+         tick(500);
+         expect(viewportScroller.scrollToPosition).not.toHaveBeenCalled();
+
+         events.next(new NavigationStart(5, '/a', 'popstate', {navigationId: 1}));
+         events.next(new NavigationEnd(5, '/a', '/a'));
+
+         tick(5000);
+         expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([10, 100]);
+       }));
+  });
+
+
+  function createRouterScroller({scrollPositionRestoration, anchorScrolling}: {
+    scrollPositionRestoration: 'disabled' | 'enabled' | 'top',
+    anchorScrolling: 'disabled' | 'enabled'
+  }) {
+    const events = new Subject<RouterEvent>();
+    const router = <any>{
+      events,
+      parseUrl: (url: any) => new DefaultUrlSerializer().parse(url),
+      triggerEvent: (e: any) => events.next(e)
+    };
+
+    const viewportScroller = jasmine.createSpyObj(
+        'viewportScroller',
+        ['getScrollPosition', 'scrollToPosition', 'scrollToAnchor', 'setHistoryScrollRestoration']);
+    setScroll(viewportScroller, 0, 0);
+
+    const scroller =
+        new RouterScroller(router, viewportScroller, {scrollPositionRestoration, anchorScrolling});
+    scroller.init();
+
+    return {events, viewportScroller, router};
+  }
+
+  function setScroll(viewportScroller: any, x: number, y: number) {
+    viewportScroller.getScrollPosition.and.returnValue([x, y]);
+  }
+});
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index 1c04dc1595..26ab3bd1b2 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -433,6 +433,15 @@ export declare class UpperCasePipe implements PipeTransform {
 
 export declare const VERSION: Version;
 
+export declare abstract class ViewportScroller {
+    abstract getScrollPosition(): [number, number];
+    abstract scrollToAnchor(anchor: string): void;
+    abstract scrollToPosition(position: [number, number]): void;
+    abstract setHistoryScrollRestoration(scrollRestoration: 'auto' | 'manual'): void;
+    abstract setOffset(offset: [number, number] | (() => [number, number])): void;
+    static ngInjectableDef: never;
+}
+
 /** @experimental */
 export declare enum WeekDay {
     Sunday = 0,
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index 34a80a4878..3c635c50a5 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -108,15 +108,18 @@ export declare class DefaultUrlSerializer implements UrlSerializer {
 /** @experimental */
 export declare type DetachedRouteHandle = {};
 
-export declare type Event = RouterEvent | RouteConfigLoadStart | RouteConfigLoadEnd | ChildActivationStart | ChildActivationEnd | ActivationStart | ActivationEnd;
+export declare type Event = RouterEvent | RouteConfigLoadStart | RouteConfigLoadEnd | ChildActivationStart | ChildActivationEnd | ActivationStart | ActivationEnd | Scroll;
 
 export interface ExtraOptions {
+    anchorScrolling?: 'disabled' | 'enabled';
     enableTracing?: boolean;
     errorHandler?: ErrorHandler;
     initialNavigation?: InitialNavigation;
     onSameUrlNavigation?: 'reload' | 'ignore';
     paramsInheritanceStrategy?: 'emptyOnly' | 'always';
     preloadingStrategy?: any;
+    scrollOffset?: [number, number] | (() => [number, number]);
+    scrollPositionRestoration?: 'disabled' | 'enabled' | 'top';
     useHash?: boolean;
 }
 
@@ -465,6 +468,17 @@ export declare class RoutesRecognized extends RouterEvent {
 /** @experimental */
 export declare type RunGuardsAndResolvers = 'paramsChange' | 'paramsOrQueryParamsChange' | 'always';
 
+export declare class Scroll {
+    readonly anchor: string | null;
+    readonly position: [number, number] | null;
+    readonly routerEvent: NavigationEnd;
+    constructor(
+        routerEvent: NavigationEnd,
+        position: [number, number] | null,
+        anchor: string | null);
+    toString(): string;
+}
+
 /** @experimental */
 export declare abstract class UrlHandlingStrategy {
     abstract extract(url: UrlTree): UrlTree;

From 8aa70c24777c150fc065459ada05b02d54b44bfb Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Thu, 7 Jun 2018 09:42:29 -0700
Subject: [PATCH 239/582] docs: adds information about the VSCode clang-format
 extension (#24351)

PR Close #24351
---
 docs/DEVELOPER.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index 395c620e9f..ba0b2e24c2 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -123,6 +123,16 @@ You can automatically format your code by running:
 $ gulp format
 ```
 
+There is a handy [clang-format extension](https://marketplace.visualstudio.com/items?itemName=xaver.clang-format)
+for Visual Studio Code. Use the following settings to format your code when you save a file:
+
+```json
+{
+    "editor.formatOnSave": true,
+    "clang-format.executable": "${workspaceRoot}/node_modules/.bin/clang-format"
+}
+```
+
 ## Linting/verifying your source code
 
 You can check that your code is properly formatted and adheres to coding style by running:

From dc4a3d00d0a408953866dda8ef86f1b73d3c6e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 31 May 2018 14:51:30 -0700
Subject: [PATCH 240/582] fix(animations): always render end-state styles for
 orphaned DOM nodes (#24236)

This patch ensures that any destination animation styling (state values)
are always applied even if the DOM node is not apart of the DOM.

PR Close #24236
---
 .../src/dsl/animation_transition_factory.ts   | 11 ++++----
 .../src/render/transition_animation_engine.ts | 27 ++++++++++++-------
 .../transition_animation_engine_spec.ts       | 17 ++++++++++++
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/packages/animations/browser/src/dsl/animation_transition_factory.ts b/packages/animations/browser/src/dsl/animation_transition_factory.ts
index 0c4f9785fe..f1499e862b 100644
--- a/packages/animations/browser/src/dsl/animation_transition_factory.ts
+++ b/packages/animations/browser/src/dsl/animation_transition_factory.ts
@@ -38,8 +38,8 @@ export class AnimationTransitionFactory {
   build(
       driver: AnimationDriver, element: any, currentState: any, nextState: any,
       enterClassName: string, leaveClassName: string, currentOptions?: AnimationOptions,
-      nextOptions?: AnimationOptions,
-      subInstructions?: ElementInstructionMap): AnimationTransitionInstruction {
+      nextOptions?: AnimationOptions, subInstructions?: ElementInstructionMap,
+      skipAstBuild?: boolean): AnimationTransitionInstruction {
     const errors: any[] = [];
 
     const transitionAnimationParams = this.ast.options && this.ast.options.params || EMPTY_OBJECT;
@@ -55,9 +55,10 @@ export class AnimationTransitionFactory {
 
     const animationOptions = {params: {...transitionAnimationParams, ...nextAnimationParams}};
 
-    const timelines = buildAnimationTimelines(
-        driver, element, this.ast.animation, enterClassName, leaveClassName, currentStateStyles,
-        nextStateStyles, animationOptions, subInstructions, errors);
+    const timelines = skipAstBuild ? [] : buildAnimationTimelines(
+                                              driver, element, this.ast.animation, enterClassName,
+                                              leaveClassName, currentStateStyles, nextStateStyles,
+                                              animationOptions, subInstructions, errors);
 
     let totalTime = 0;
     timelines.forEach(tl => { totalTime = Math.max(tl.duration + tl.delay, totalTime); });
diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index 4864388f53..d388ac1676 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -740,10 +740,10 @@ export class TransitionAnimationEngine {
 
   private _buildInstruction(
       entry: QueueInstruction, subTimelines: ElementInstructionMap, enterClassName: string,
-      leaveClassName: string) {
+      leaveClassName: string, skipBuildAst?: boolean) {
     return entry.transition.build(
         this.driver, entry.element, entry.fromState.value, entry.toState.value, enterClassName,
-        leaveClassName, entry.fromState.options, entry.toState.options, subTimelines);
+        leaveClassName, entry.fromState.options, entry.toState.options, subTimelines, skipBuildAst);
   }
 
   destroyInnerAnimations(containerElement: any) {
@@ -962,17 +962,24 @@ export class TransitionAnimationEngine {
           }
         }
 
-        if (!bodyNode || !this.driver.containsElement(bodyNode, element)) {
-          player.destroy();
+        const nodeIsOrphaned = !bodyNode || !this.driver.containsElement(bodyNode, element);
+        const leaveClassName = leaveNodeMapIds.get(element) !;
+        const enterClassName = enterNodeMapIds.get(element) !;
+        const instruction = this._buildInstruction(
+            entry, subTimelines, enterClassName, leaveClassName, nodeIsOrphaned) !;
+        if (instruction.errors && instruction.errors.length) {
+          erroneousTransitions.push(instruction);
           return;
         }
 
-        const leaveClassName = leaveNodeMapIds.get(element) !;
-        const enterClassName = enterNodeMapIds.get(element) !;
-        const instruction =
-            this._buildInstruction(entry, subTimelines, enterClassName, leaveClassName) !;
-        if (instruction.errors && instruction.errors.length) {
-          erroneousTransitions.push(instruction);
+        // even though the element may not be apart of the DOM, it may
+        // still be added at a later point (due to the mechanics of content
+        // projection and/or dynamic component insertion) therefore it's
+        // important we still style the element.
+        if (nodeIsOrphaned) {
+          player.onStart(() => eraseStyles(element, instruction.fromStyles));
+          player.onDestroy(() => setStyles(element, instruction.toStyles));
+          skippedPlayers.push(player);
           return;
         }
 
diff --git a/packages/animations/browser/test/render/transition_animation_engine_spec.ts b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
index a76398d2e2..ad6fc89fcd 100644
--- a/packages/animations/browser/test/render/transition_animation_engine_spec.ts
+++ b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
@@ -623,6 +623,23 @@ const DEFAULT_NAMESPACE_ID = 'id';
         const TRIGGER = 'fooTrigger';
         expect(() => { engine.trigger(ID, element, TRIGGER, 'something'); }).not.toThrow();
       });
+
+      it('should still apply state-styling to an element even if it is not yet inserted into the DOM',
+         () => {
+           const engine = makeEngine();
+           const orphanElement = document.createElement('div');
+           orphanElement.classList.add('orphan');
+
+           registerTrigger(
+               orphanElement, engine, trigger('trig', [
+                 state('go', style({opacity: 0.5})), transition('* => go', animate(1000))
+               ]));
+
+           setProperty(orphanElement, engine, 'trig', 'go');
+           engine.flush();
+           expect(engine.players.length).toEqual(0);
+           expect(orphanElement.style.opacity).toEqual('0.5');
+         });
     });
   });
 })();

From 29eb24b142b29a84491f92fe1a4c48290a207db8 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 7 Jun 2018 22:42:32 -0700
Subject: [PATCH 241/582] refactor(ivy): combine LView with data (#24382)

PR Close #24382
---
 packages/core/src/render3/component.ts        |  23 +-
 packages/core/src/render3/component_ref.ts    |  12 +-
 packages/core/src/render3/di.ts               |  42 +-
 packages/core/src/render3/hooks.ts            |  18 +-
 packages/core/src/render3/instructions.ts     | 606 +++++++++---------
 .../core/src/render3/interfaces/container.ts  |  60 +-
 packages/core/src/render3/interfaces/node.ts  |  12 +-
 packages/core/src/render3/interfaces/query.ts |   2 +-
 packages/core/src/render3/interfaces/view.ts  | 172 +++--
 .../core/src/render3/node_manipulation.ts     | 165 +++--
 packages/core/src/render3/pipe.ts             |  11 +-
 packages/core/src/render3/query.ts            |   7 +-
 packages/core/src/render3/view_ref.ts         |  17 +-
 .../hello_world/bundle.golden_symbols.json    |  59 +-
 .../bundling/todo/bundle.golden_symbols.json  |  68 +-
 packages/core/test/render3/di_spec.ts         |   4 +-
 .../core/test/render3/integration_spec.ts     |  12 +-
 17 files changed, 702 insertions(+), 588 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index cfbc386e2d..5f275cd7cd 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -10,19 +10,16 @@
 // correctly implementing its interfaces for backwards compatibility.
 import {Type} from '../core';
 import {Injector} from '../di/injector';
-import {ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
 import {Sanitizer} from '../sanitization/security';
 
 import {assertComponentType, assertDefined} from './assert';
 import {queueInitHooks, queueLifecycleHooks} from './hooks';
-import {CLEAN_PROMISE, ROOT_DIRECTIVE_INDICES, _getComponentHostLElementNode, baseDirectiveCreate, createLView, createTView, detectChangesInternal, enterView, executeInitAndContentHooks, getRootView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement, setHostBindings} from './instructions';
+import {CLEAN_PROMISE, ROOT_DIRECTIVE_INDICES, _getComponentHostLElementNode, baseDirectiveCreate, createLViewData, createTView, detectChangesInternal, enterView, executeInitAndContentHooks, getRootView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement, setHostBindings,} from './instructions';
 import {ComponentDef, ComponentType} from './interfaces/definition';
-import {LElementNode, TNodeFlags} from './interfaces/node';
+import {LElementNode} from './interfaces/node';
 import {RElement, RendererFactory3, domRendererFactory3} from './interfaces/renderer';
-import {LView, LViewFlags, RootContext} from './interfaces/view';
+import {LViewData, LViewFlags, RootContext, INJECTOR, CONTEXT, TVIEW} from './interfaces/view';
 import {stringify} from './util';
-import {ViewRef} from './view_ref';
-
 
 
 /** Options that control how the component should be bootstrapped. */
@@ -71,7 +68,6 @@ export interface CreateComponentOptions {
   scheduler?: (work: () => void) => void;
 }
 
-
 // TODO: A hack to not pull in the NullInjector from @angular/core.
 export const NULL_INJECTOR: Injector = {
   get: (token: any, notFoundValue?: any) => {
@@ -108,11 +104,11 @@ export function renderComponent<T>(
   const hostNode = locateHostElement(rendererFactory, opts.host || componentTag);
   const rootContext = createRootContext(opts.scheduler || requestAnimationFrame.bind(window));
 
-  const rootView: LView = createLView(
+  const rootView: LViewData = createLViewData(
       rendererFactory.createRenderer(hostNode, componentDef.rendererType),
       createTView(-1, null, null, null), rootContext,
       componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
-  rootView.injector = opts.injector || null;
+  rootView[INJECTOR] = opts.injector || null;
 
   const oldView = enterView(rootView, null !);
   let elementNode: LElementNode;
@@ -131,7 +127,7 @@ export function renderComponent<T>(
 
     executeInitAndContentHooks();
     setHostBindings(ROOT_DIRECTIVE_INDICES);
-    detectChangesInternal(elementNode.data as LView, elementNode, component);
+    detectChangesInternal(elementNode.data as LViewData, elementNode, component);
   } finally {
     leaveView(oldView);
     if (rendererFactory.end) rendererFactory.end();
@@ -165,8 +161,9 @@ export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): v
   const elementNode = _getComponentHostLElementNode(component);
 
   // Root component is always created at dir index 0
-  queueInitHooks(0, def.onInit, def.doCheck, elementNode.view.tView);
-  queueLifecycleHooks(elementNode.tNode.flags, elementNode.view);
+  const tView = elementNode.view[TVIEW];
+  queueInitHooks(0, def.onInit, def.doCheck, tView);
+  queueLifecycleHooks(elementNode.tNode.flags, tView);
 }
 
 /**
@@ -176,7 +173,7 @@ export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): v
  * @param component any component
  */
 function getRootContext(component: any): RootContext {
-  const rootContext = getRootView(component).context as RootContext;
+  const rootContext = getRootView(component)[CONTEXT] as RootContext;
   ngDevMode && assertDefined(rootContext, 'rootContext');
   return rootContext;
 }
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index 01222b5a3b..a903ca309c 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -18,11 +18,11 @@ import {Type} from '../type';
 
 import {assertComponentType, assertDefined} from './assert';
 import {createRootContext} from './component';
-import {baseDirectiveCreate, createLView, createTView, enterView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement} from './instructions';
+import {baseDirectiveCreate, createLViewData, createTView, enterView, hostElement, initChangeDetectorIfExisting, locateHostElement} from './instructions';
 import {ComponentDef, ComponentType} from './interfaces/definition';
 import {LElementNode} from './interfaces/node';
 import {RElement} from './interfaces/renderer';
-import {LView, LViewFlags, RootContext} from './interfaces/view';
+import {INJECTOR, LViewData, LViewFlags, RootContext} from './interfaces/view';
 import {ViewRef} from './view_ref';
 
 export class ComponentFactoryResolver extends viewEngine_ComponentFactoryResolver {
@@ -94,11 +94,11 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     const rootContext: RootContext = ngModule !.injector.get(ROOT_CONTEXT);
 
     // Create the root view. Uses empty TView and ContentTemplate.
-    const rootView: LView = createLView(
+    const rootView: LViewData = createLViewData(
         rendererFactory.createRenderer(hostNode, this.componentDef.rendererType),
         createTView(-1, null, null, null), null,
         this.componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
-    rootView.injector = ngModule && ngModule.injector || null;
+    rootView[INJECTOR] = ngModule && ngModule.injector || null;
 
     // rootView is the parent when bootstrapping
     const oldView = enterView(rootView, null !);
@@ -145,7 +145,7 @@ export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
   componentType: Type<T>;
 
   constructor(
-      componentType: Type<T>, instance: T, rootView: LView, injector: Injector,
+      componentType: Type<T>, instance: T, rootView: LViewData, injector: Injector,
       hostNode: RElement) {
     super();
     this.instance = instance;
@@ -173,4 +173,4 @@ export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
     ngDevMode && assertDefined(this.destroyCbs, 'NgModule already destroyed');
     this.destroyCbs !.push(callback);
   }
-}
\ No newline at end of file
+}
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index a8a800f846..c6bac64a82 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -19,13 +19,14 @@ import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_Vie
 import {Type} from '../type';
 
 import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
-import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, createTView, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
-import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList} from './interfaces/definition';
+import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
+import {VIEWS} from './interfaces/container';
+import {ComponentTemplate, DirectiveDef} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
-import {LView, TView} from './interfaces/view';
+import {DIRECTIVES, HOST_NODE, INJECTOR, LViewData, QUERIES, TVIEW, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {detachView, getParentLNode, insertView, removeView} from './node_manipulation';
 import {notImplemented, stringify} from './util';
@@ -282,9 +283,9 @@ export function getOrCreateChangeDetectorRef(
 
   const currentNode = di.node;
   if (isComponent(currentNode.tNode)) {
-    return di.changeDetectorRef = new ViewRef(currentNode.data as LView, context);
+    return di.changeDetectorRef = new ViewRef(currentNode.data as LViewData, context);
   } else if (currentNode.tNode.type === TNodeType.Element) {
-    return di.changeDetectorRef = getOrCreateHostChangeDetector(currentNode.view.node);
+    return di.changeDetectorRef = getOrCreateHostChangeDetector(currentNode.view[HOST_NODE]);
   }
   return null !;
 }
@@ -299,9 +300,9 @@ function getOrCreateHostChangeDetector(currentNode: LViewNode | LElementNode):
   return existingRef ?
       existingRef :
       new ViewRef(
-          hostNode.data as LView,
-          hostNode.view
-              .directives ![hostNode.tNode.flags >> TNodeFlags.DirectiveStartingIndexShift]);
+          hostNode.data as LViewData,
+          hostNode
+              .view[DIRECTIVES] ![hostNode.tNode.flags >> TNodeFlags.DirectiveStartingIndexShift]);
 }
 
 /**
@@ -311,7 +312,7 @@ function getOrCreateHostChangeDetector(currentNode: LViewNode | LElementNode):
  */
 function getClosestComponentAncestor(node: LViewNode | LElementNode): LElementNode {
   while (node.tNode.type === TNodeType.View) {
-    node = node.view.node;
+    node = node.view[HOST_NODE];
   }
   return node as LElementNode;
 }
@@ -340,7 +341,7 @@ export function getOrCreateInjectable<T>(
   // If the token has a bloom hash, then it is a directive that is public to the injection system
   // (diPublic). If there is no hash, fall back to the module injector.
   if (bloomHash === null) {
-    const moduleInjector = getPreviousOrParentNode().view.injector;
+    const moduleInjector = getPreviousOrParentNode().view[INJECTOR];
     const formerInjector = setCurrentInjector(moduleInjector);
     try {
       return inject(token, flags);
@@ -370,14 +371,14 @@ export function getOrCreateInjectable<T>(
       if (count !== 0) {
         const start = nodeFlags >> TNodeFlags.DirectiveStartingIndexShift;
         const end = start + count;
-        const defs = node.view.tView.directives !;
+        const defs = node.view[TVIEW].directives !;
 
         for (let i = start; i < end; i++) {
           // Get the definition for the directive at this index and, if it is injectable (diPublic),
           // and matches the given token, return the directive instance.
           const directiveDef = defs[i] as DirectiveDef<any>;
           if (directiveDef.type === token && directiveDef.diPublic) {
-            return getDirectiveInstance(node.view.directives ![i]);
+            return getDirectiveInstance(node.view[DIRECTIVES] ![i]);
           }
         }
       }
@@ -405,12 +406,12 @@ export function getOrCreateInjectable<T>(
 }
 
 function searchMatchesQueuedForCreation<T>(node: LNode, token: any): T|null {
-  const matches = node.view.tView.currentMatches;
+  const matches = node.view[TVIEW].currentMatches;
   if (matches) {
     for (let i = 0; i < matches.length; i += 2) {
       const def = matches[i] as DirectiveDef<any>;
       if (def.type === token) {
-        return resolveDirective(def, i + 1, matches, node.view.tView);
+        return resolveDirective(def, i + 1, matches, node.view[TVIEW]);
       }
     }
   }
@@ -545,7 +546,7 @@ export const QUERY_READ_FROM_NODE =
     (new ReadFromInjectorFn<any>((injector: LInjector, node: LNode, directiveIdx: number) => {
       ngDevMode && assertNodeOfPossibleTypes(node, TNodeType.Container, TNodeType.Element);
       if (directiveIdx > -1) {
-        return node.view.directives ![directiveIdx];
+        return node.view[DIRECTIVES] ![directiveIdx];
       } else if (node.tNode.type === TNodeType.Element) {
         return getOrCreateElementRef(injector);
       } else if (node.tNode.type === TNodeType.Container) {
@@ -611,7 +612,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
   clear(): void {
     const lContainer = this._lContainerNode.data;
-    while (lContainer.views.length) {
+    while (lContainer[VIEWS].length) {
       this.remove(0);
     }
   }
@@ -620,7 +621,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
   get length(): number {
     const lContainer = this._lContainerNode.data;
-    return lContainer.views.length;
+    return lContainer[VIEWS].length;
   }
 
   createEmbeddedView<C>(templateRef: viewEngine_TemplateRef<C>, context?: C, index?: number):
@@ -679,12 +680,12 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
   private _adjustIndex(index?: number, shift: number = 0) {
     if (index == null) {
-      return this._lContainerNode.data.views.length + shift;
+      return this._lContainerNode.data[VIEWS].length + shift;
     }
     if (ngDevMode) {
       assertGreaterThan(index, -1, 'index must be positive');
       // +1 because it's legal to insert at the end.
-      assertLessThan(index, this._lContainerNode.data.views.length + 1 + shift, 'index');
+      assertLessThan(index, this._lContainerNode.data[VIEWS].length + 1 + shift, 'index');
     }
     return index;
   }
@@ -704,7 +705,8 @@ export function getOrCreateTemplateRef<T>(di: LInjector): viewEngine_TemplateRef
     const hostTNode = hostNode.tNode;
     ngDevMode && assertDefined(hostTNode.tViews, 'TView must be allocated');
     di.templateRef = new TemplateRef<any>(
-        getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(), hostNode.data.queries);
+        getOrCreateElementRef(di), hostTNode.tViews as TView, getRenderer(),
+        hostNode.data[QUERIES]);
   }
   return di.templateRef;
 }
diff --git a/packages/core/src/render3/hooks.ts b/packages/core/src/render3/hooks.ts
index 66ba2b0de1..5b49b24b78 100644
--- a/packages/core/src/render3/hooks.ts
+++ b/packages/core/src/render3/hooks.ts
@@ -9,7 +9,7 @@
 import {assertEqual} from './assert';
 import {DirectiveDef} from './interfaces/definition';
 import {TNodeFlags} from './interfaces/node';
-import {HookData, LView, LViewFlags, TView} from './interfaces/view';
+import {DIRECTIVES, FLAGS, HookData, LViewData, LViewFlags, TView} from './interfaces/view';
 
 
 /**
@@ -20,7 +20,7 @@ import {HookData, LView, LViewFlags, TView} from './interfaces/view';
  * directive index), then saved in the even indices of the initHooks array. The odd indices
  * hold the hook functions themselves.
  *
- * @param index The index of the directive in LView.data
+ * @param index The index of the directive in LViewData[DIRECTIVES]
  * @param hooks The static hooks map on the directive def
  * @param tView The current TView
  */
@@ -42,9 +42,8 @@ export function queueInitHooks(
  * Loops through the directives on a node and queues all their hooks except ngOnInit
  * and ngDoCheck, which are queued separately in directiveCreate.
  */
-export function queueLifecycleHooks(flags: number, currentView: LView): void {
-  const tView = currentView.tView;
-  if (tView.firstTemplatePass === true) {
+export function queueLifecycleHooks(flags: number, tView: TView): void {
+  if (tView.firstTemplatePass) {
     const start = flags >> TNodeFlags.DirectiveStartingIndexShift;
     const count = flags & TNodeFlags.DirectiveCountMask;
     const end = start + count;
@@ -97,10 +96,11 @@ function queueDestroyHooks(def: DirectiveDef<any>, tView: TView, i: number): voi
  *
  * @param currentView The current view
  */
-export function executeInitHooks(currentView: LView, tView: TView, creationMode: boolean): void {
-  if (currentView.flags & LViewFlags.RunInit) {
-    executeHooks(currentView.directives !, tView.initHooks, tView.checkHooks, creationMode);
-    currentView.flags &= ~LViewFlags.RunInit;
+export function executeInitHooks(
+    currentView: LViewData, tView: TView, creationMode: boolean): void {
+  if (currentView[FLAGS] & LViewFlags.RunInit) {
+    executeHooks(currentView[DIRECTIVES] !, tView.initHooks, tView.checkHooks, creationMode);
+    currentView[FLAGS] &= ~LViewFlags.RunInit;
   }
 }
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 442d94ae15..24d25effdf 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -13,17 +13,17 @@ import {Sanitizer} from '../sanitization/security';
 import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual, assertSame} from './assert';
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
 import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
-import {LContainer} from './interfaces/container';
+import {ACTIVE_INDEX, LContainer, RENDER_PARENT, VIEWS} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
-import {CurrentMatchesList, LView, LViewFlags, RootContext, TData, TView} from './interfaces/view';
+import {BINDING_INDEX, CLEANUP, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView,} from './interfaces/view';
 
 import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, DirectiveDefListOrFactory, PipeDefList, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
+import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
@@ -50,8 +50,21 @@ export type SanitizerFn = (value: any) => string;
  * Directive and element indices for top-level directive.
  *
  * Saved here to avoid re-instantiating an array on every change detection run.
+ *
+ * Note: Element is not actually stored at index 0 because of the LViewData
+ * header, but the host bindings function expects an index that is NOT adjusted
+ * because it will ultimately be fed to instructions like elementProperty.
  */
-export const _ROOT_DIRECTIVE_INDICES = [0, 0];
+const _ROOT_DIRECTIVE_INDICES = [0, 0];
+
+/**
+ * TView.data needs to fill the same number of slots as the LViewData header
+ * so the indices of nodes are consistent between LViewData and TView.data.
+ *
+ * It's much faster to keep a blueprint of the pre-filled array and slice it
+ * than it is to create a new array and fill it each time a TView is created.
+ */
+const HEADER_FILLER = new Array(HEADER_OFFSET).fill(null);
 
 /**
  * Token set in currentMatches while dependencies are being resolved.
@@ -87,7 +100,7 @@ export function getRenderer(): Renderer3 {
 }
 
 export function getCurrentSanitizer(): Sanitizer|null {
-  return currentView && currentView.sanitizer;
+  return viewData && viewData[SANITIZER];
 }
 
 /** Used to set the parent property when nodes are created. */
@@ -105,24 +118,7 @@ export function getPreviousOrParentNode(): LNode {
  */
 let isParent: boolean;
 
-/**
- * Static data that corresponds to the instance-specific data array on an LView.
- *
- * Each node's static data is stored in tData at the same index that it's stored
- * in the data array. Any nodes that do not have static data store a null value in
- * tData to avoid a sparse array.
- */
-let tData: TData;
-
-/**
- * State of the current view being processed.
- *
- * NOTE: we cheat here and initialize it to `null` even thought the type does not
- * contain `null`. This is because we expect this value to be not `null` as soon
- * as we enter the view. Declaring the type as `null` would require us to place `!`
- * in most instructions since they all assume that `currentView` is defined.
- */
-let currentView: LView = null !;
+let tView: TView;
 
 let currentQueries: LQueries|null;
 
@@ -142,10 +138,12 @@ export function getCreationMode(): boolean {
 }
 
 /**
+ * State of the current view being processed.
+ *
  * An array of nodes (text, element, container, etc), pipes, their bindings, and
  * any local variables that need to be stored between invocations.
  */
-let data: any[];
+let viewData: LViewData;
 
 /**
  * An array of directive instances in the current view.
@@ -155,13 +153,13 @@ let data: any[];
  */
 let directives: any[]|null;
 
-function getCleanup(view: LView): any[] {
+function getCleanup(view: LViewData): any[] {
   // top level variables should not be exported for performance reasons (PERF_NOTES.md)
-  return view.cleanupInstances || (view.cleanupInstances = []);
+  return view[CLEANUP] || (view[CLEANUP] = []);
 }
 
-function getTViewCleanup(view: LView): any[] {
-  return view.tView.cleanup || (view.tView.cleanup = []);
+function getTViewCleanup(view: LViewData): any[] {
+  return view[TVIEW].cleanup || (view[TVIEW].cleanup = []);
 }
 /**
  * In this mode, any changes in bindings will throw an ExpressionChangedAfterChecked error.
@@ -190,23 +188,23 @@ const enum BindingDirection {
  * @param host Element to which the View is a child of
  * @returns the previous state;
  */
-export function enterView(newView: LView, host: LElementNode | LViewNode | null): LView {
-  const oldView: LView = currentView;
-  data = newView && newView.data;
-  directives = newView && newView.directives;
-  tData = newView && newView.tView.data;
-  creationMode = newView && (newView.flags & LViewFlags.CreationMode) === LViewFlags.CreationMode;
-  firstTemplatePass = newView && newView.tView.firstTemplatePass;
+export function enterView(newView: LViewData, host: LElementNode | LViewNode | null): LViewData {
+  const oldView: LViewData = viewData;
+  directives = newView && newView[DIRECTIVES];
+  tView = newView && newView[TVIEW];
 
-  renderer = newView && newView.renderer;
+  creationMode = newView && (newView[FLAGS] & LViewFlags.CreationMode) === LViewFlags.CreationMode;
+  firstTemplatePass = newView && tView.firstTemplatePass;
+
+  renderer = newView && newView[RENDERER];
 
   if (host != null) {
     previousOrParentNode = host;
     isParent = true;
   }
 
-  currentView = newView;
-  currentQueries = newView && newView.queries;
+  viewData = newView;
+  currentQueries = newView && newView[QUERIES];
 
   return oldView;
 }
@@ -219,18 +217,16 @@ export function enterView(newView: LView, host: LElementNode | LViewNode | null)
  * @param creationOnly An optional boolean to indicate that the view was processed in creation mode
  * only, i.e. the first update will be done later. Only possible for dynamically created views.
  */
-export function leaveView(newView: LView, creationOnly?: boolean): void {
+export function leaveView(newView: LViewData, creationOnly?: boolean): void {
   if (!creationOnly) {
     if (!checkNoChangesMode) {
-      executeHooks(
-          directives !, currentView.tView.viewHooks, currentView.tView.viewCheckHooks,
-          creationMode);
+      executeHooks(directives !, tView.viewHooks, tView.viewCheckHooks, creationMode);
     }
     // Views are clean and in update mode after being checked, so these bits are cleared
-    currentView.flags &= ~(LViewFlags.CreationMode | LViewFlags.Dirty);
+    viewData[FLAGS] &= ~(LViewFlags.CreationMode | LViewFlags.Dirty);
   }
-  currentView.flags |= LViewFlags.RunInit;
-  currentView.bindingIndex = -1;
+  viewData[FLAGS] |= LViewFlags.RunInit;
+  viewData[BINDING_INDEX] = -1;
   enterView(newView, null);
 }
 
@@ -241,9 +237,8 @@ export function leaveView(newView: LView, creationOnly?: boolean): void {
  * Note: view hooks are triggered later when leaving the view.
  * */
 function refreshView() {
-  const tView = currentView.tView;
   if (!checkNoChangesMode) {
-    executeInitHooks(currentView, tView, creationMode);
+    executeInitHooks(viewData, tView, creationMode);
   }
   refreshDynamicChildren();
   if (!checkNoChangesMode) {
@@ -260,7 +255,7 @@ function refreshView() {
 /** Sets the host bindings for the current view. */
 export function setHostBindings(bindings: number[] | null): void {
   if (bindings != null) {
-    const defs = currentView.tView.directives !;
+    const defs = tView.directives !;
     for (let i = 0; i < bindings.length; i += 2) {
       const dirIndex = bindings[i];
       const def = defs[dirIndex] as DirectiveDef<any>;
@@ -280,34 +275,30 @@ function refreshChildComponents(components: number[] | null): void {
 
 export function executeInitAndContentHooks(): void {
   if (!checkNoChangesMode) {
-    const tView = currentView.tView;
-    executeInitHooks(currentView, tView, creationMode);
+    executeInitHooks(viewData, tView, creationMode);
     executeHooks(directives !, tView.contentHooks, tView.contentCheckHooks, creationMode);
   }
 }
 
-export function createLView<T>(
+export function createLViewData<T>(
     renderer: Renderer3, tView: TView, context: T | null, flags: LViewFlags,
-    sanitizer?: Sanitizer | null): LView {
-  const newView = {
-    parent: currentView,
-    flags: flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.RunInit,
-    node: null !,  // until we initialize it in createNode.
-    data: [],
-    directives: null,
-    tView: tView,
-    cleanupInstances: null,
-    renderer: renderer,
-    tail: null,
-    next: null,
-    bindingIndex: -1,
-    context: context,
-    queries: null,
-    injector: currentView && currentView.injector,
-    sanitizer: sanitizer || null
-  };
-
-  return newView;
+    sanitizer?: Sanitizer | null): LViewData {
+  return [
+    tView,                                                                       // tView
+    viewData,                                                                    // parent
+    null,                                                                        // next
+    null,                                                                        // queries
+    flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.RunInit,  // flags
+    null !,                                                                      // hostNode
+    -1,                                                                          // bindingIndex
+    null,                                                                        // directives
+    null,                                                                        // cleanupInstances
+    context,                                                                     // context
+    viewData && viewData[INJECTOR],                                              // injector
+    renderer,                                                                    // renderer
+    sanitizer || null,                                                           // sanitizer
+    null                                                                         // tail
+  ];
 }
 
 /**
@@ -316,7 +307,7 @@ export function createLView<T>(
  * (same properties assigned in the same order).
  */
 export function createLNodeObject(
-    type: TNodeType, currentView: LView, parent: LNode | null,
+    type: TNodeType, currentView: LViewData, parent: LNode | null,
     native: RText | RElement | null | undefined, state: any,
     queries: LQueries | null): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   return {
@@ -336,7 +327,7 @@ export function createLNodeObject(
  * keep the execution code monomorphic and fast.
  *
  * @param index The index at which the LNode should be saved (null if view, since they are not
- * saved)
+ * saved).
  * @param type The type of LNode to create
  * @param native The native element for this LNode, if applicable
  * @param name The tag name of the associated native element, if applicable
@@ -345,10 +336,10 @@ export function createLNodeObject(
  */
 export function createLNode(
     index: number, type: TNodeType.Element, native: RElement | RText | null, name: string | null,
-    attrs: TAttributes | null, lView?: LView | null): LElementNode;
+    attrs: TAttributes | null, lViewData?: LViewData | null): LElementNode;
 export function createLNode(
     index: number, type: TNodeType.View, native: null, name: null, attrs: null,
-    lView: LView): LViewNode;
+    lViewData: LViewData): LViewNode;
 export function createLNode(
     index: number, type: TNodeType.Container, native: undefined, name: string | null,
     attrs: TAttributes | null, lContainer: LContainer): LContainerNode;
@@ -357,45 +348,51 @@ export function createLNode(
     lProjection: LProjection): LProjectionNode;
 export function createLNode(
     index: number, type: TNodeType, native: RText | RElement | null | undefined,
-    name: string | null, attrs: TAttributes | null, state?: null | LView | LContainer |
+    name: string | null, attrs: TAttributes | null, state?: null | LViewData | LContainer |
         LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
                             previousOrParentNode && getParentLNode(previousOrParentNode) !as LNode;
   // Parents cannot cross component boundaries because components will be used in multiple places,
   // so it's only set if the view is the same.
   const tParent =
-      parent && parent.view === currentView ? parent.tNode as TElementNode | TContainerNode : null;
+      parent && parent.view === viewData ? parent.tNode as TElementNode | TContainerNode : null;
   let queries =
       (isParent ? currentQueries : previousOrParentNode && previousOrParentNode.queries) ||
       parent && parent.queries && parent.queries.child();
   const isState = state != null;
   const node =
-      createLNodeObject(type, currentView, parent, native, isState ? state as any : null, queries);
+      createLNodeObject(type, viewData, parent, native, isState ? state as any : null, queries);
 
   if (index === -1 || type === TNodeType.View) {
     // View nodes are not stored in data because they can be added / removed at runtime (which
     // would cause indices to change). Their TNodes are instead stored in TView.node.
-    node.tNode = (state as LView).tView.node || createTNode(type, index, null, null, tParent, null);
+    node.tNode =
+        (state as LViewData)[TVIEW].node || createTNode(type, index, null, null, tParent, null);
   } else {
+    const adjustedIndex = index + HEADER_OFFSET;
+
     // This is an element or container or projection node
-    ngDevMode && assertDataNext(index);
-    data[index] = node;
+    ngDevMode && assertDataNext(adjustedIndex);
+    const tData = tView.data;
+
+    viewData[adjustedIndex] = node;
 
     // Every node adds a value to the static data array to avoid a sparse array
-    if (index >= tData.length) {
-      const tNode = tData[index] = createTNode(type, index, name, attrs, tParent, null);
+    if (adjustedIndex >= tData.length) {
+      const tNode = tData[adjustedIndex] =
+          createTNode(type, adjustedIndex, name, attrs, tParent, null);
       if (!isParent && previousOrParentNode) {
         const previousTNode = previousOrParentNode.tNode;
         previousTNode.next = tNode;
         if (previousTNode.dynamicContainerNode) previousTNode.dynamicContainerNode.next = tNode;
       }
     }
-    node.tNode = tData[index] as TNode;
+    node.tNode = tData[adjustedIndex] as TNode;
 
     // Now link ourselves into the tree.
     if (isParent) {
       currentQueries = null;
-      if (previousOrParentNode.tNode.child == null && previousOrParentNode.view === currentView ||
+      if (previousOrParentNode.tNode.child == null && previousOrParentNode.view === viewData ||
           previousOrParentNode.tNode.type === TNodeType.View) {
         // We are in the same view, which means we are adding content node to the parent View.
         previousOrParentNode.tNode.child = node.tNode;
@@ -405,12 +402,11 @@ export function createLNode(
 
   // View nodes and host elements need to set their host node (components set host nodes later)
   if ((type & TNodeType.ViewOrElement) === TNodeType.ViewOrElement && isState) {
-    // Bit of a hack to bust through the readonly because there is a circular dep between
-    // LView and LNode.
-    ngDevMode &&
-        assertNotDefined((state as LView).node, 'LView.node should not have been initialized');
-    (state as{node: LNode}).node = node;
-    if (firstTemplatePass) (state as LView).tView.node = node.tNode;
+    const lViewData = state as LViewData;
+    ngDevMode && assertNotDefined(
+                     lViewData[HOST_NODE], 'lViewData[HOST_NODE] should not have been initialized');
+    lViewData[HOST_NODE] = node;
+    if (firstTemplatePass) lViewData[TVIEW].node = node.tNode;
   }
 
   previousOrParentNode = node;
@@ -452,7 +448,7 @@ export function renderTemplate<T>(
     const tView = getOrCreateTView(template, directives || null, pipes || null);
     host = createLNode(
         -1, TNodeType.Element, hostNode, null, null,
-        createLView(
+        createLViewData(
             providedRendererFactory.createRenderer(null, null), tView, {}, LViewFlags.CheckAlways,
             sanitizer));
   }
@@ -477,7 +473,7 @@ export function renderEmbeddedTemplate<T>(
     queries?: LQueries | null): LViewNode {
   const _isParent = isParent;
   const _previousOrParentNode = previousOrParentNode;
-  let oldView: LView;
+  let oldView: LViewData;
   let rf: RenderFlags = RenderFlags.Update;
   try {
     isParent = true;
@@ -485,10 +481,10 @@ export function renderEmbeddedTemplate<T>(
 
     if (viewNode == null) {
       const lView =
-          createLView(renderer, tView, context, LViewFlags.CheckAlways, getCurrentSanitizer());
+          createLViewData(renderer, tView, context, LViewFlags.CheckAlways, getCurrentSanitizer());
 
       if (queries) {
-        lView.queries = queries.createView();
+        lView[QUERIES] = queries.createView();
       }
 
       viewNode = createLNode(-1, TNodeType.View, null, null, null, lView);
@@ -500,7 +496,7 @@ export function renderEmbeddedTemplate<T>(
     if (rf & RenderFlags.Update) {
       refreshView();
     } else {
-      viewNode.data.tView.firstTemplatePass = firstTemplatePass = false;
+      viewNode.data[TVIEW].firstTemplatePass = firstTemplatePass = false;
     }
   } finally {
     // renderEmbeddedTemplate() is called twice in fact, once for creation only and then once for
@@ -514,7 +510,8 @@ export function renderEmbeddedTemplate<T>(
 }
 
 export function renderComponentOrTemplate<T>(
-    node: LElementNode, hostView: LView, componentOrContext: T, template?: ComponentTemplate<T>) {
+    node: LElementNode, hostView: LViewData, componentOrContext: T,
+    template?: ComponentTemplate<T>) {
   const oldView = enterView(hostView, node);
   try {
     if (rendererFactory.begin) {
@@ -530,7 +527,7 @@ export function renderComponentOrTemplate<T>(
       // Element was stored at 0 in data and directive was stored at 0 in directives
       // in renderComponent()
       setHostBindings(_ROOT_DIRECTIVE_INDICES);
-      componentRefresh(0, 0);
+      componentRefresh(0, HEADER_OFFSET);
     }
   } finally {
     if (rendererFactory.end) {
@@ -549,9 +546,9 @@ export function renderComponentOrTemplate<T>(
  * Dynamically created views do NOT use this configuration (update block and create block are
  * always run separately).
  */
-function getRenderFlags(view: LView): RenderFlags {
-  return view.flags & LViewFlags.CreationMode ? RenderFlags.Create | RenderFlags.Update :
-                                                RenderFlags.Update;
+function getRenderFlags(view: LViewData): RenderFlags {
+  return view[FLAGS] & LViewFlags.CreationMode ? RenderFlags.Create | RenderFlags.Update :
+                                                 RenderFlags.Update;
 }
 
 //////////////////////////
@@ -579,7 +576,7 @@ export function namespaceHTML() {
 /**
  * Create DOM element. The instruction must later be followed by `elementEnd()` call.
  *
- * @param index Index of the element in the data array
+ * @param index Index of the element in the LViewData array
  * @param name Name of the DOM Node
  * @param attrs Statically bound set of attributes to be written into the DOM element on creation.
  * @param localRefs A set of local reference bindings on the element.
@@ -592,7 +589,7 @@ export function elementStart(
     index: number, name: string, attrs?: TAttributes | null,
     localRefs?: string[] | null): RElement {
   ngDevMode &&
-      assertEqual(currentView.bindingIndex, -1, 'elements should be created before any bindings');
+      assertEqual(viewData[BINDING_INDEX], -1, 'elements should be created before any bindings');
 
   ngDevMode && ngDevMode.rendererCreateElement++;
 
@@ -614,7 +611,7 @@ export function elementStart(
       createLNode(index, TNodeType.Element, native !, name, attrs || null, null);
 
   if (attrs) setUpAttributes(native, attrs);
-  appendChild(getParentLNode(node), native, currentView);
+  appendChild(getParentLNode(node), native, viewData);
   createDirectivesAndLocals(localRefs);
   return native;
 }
@@ -629,7 +626,7 @@ function createDirectivesAndLocals(localRefs?: string[] | null) {
 
   if (firstTemplatePass) {
     ngDevMode && ngDevMode.firstTemplatePass++;
-    cacheMatchingDirectivesForNode(node.tNode, currentView.tView, localRefs || null);
+    cacheMatchingDirectivesForNode(node.tNode, tView, localRefs || null);
   } else {
     instantiateDirectivesDirectly();
   }
@@ -659,7 +656,7 @@ function cacheMatchingDirectivesForNode(
 
 /** Matches the current node against all available selectors. */
 function findDirectiveMatches(tNode: TNode): CurrentMatchesList|null {
-  const registry = currentView.tView.directiveRegistry;
+  const registry = tView.directiveRegistry;
   let matches: any[]|null = null;
   if (registry) {
     for (let i = 0; i < registry.length; i++) {
@@ -694,23 +691,24 @@ export function resolveDirective(
 /** Stores index of component's host element so it will be queued for view refresh during CD. */
 function queueComponentIndexForCheck(dirIndex: number): void {
   if (firstTemplatePass) {
-    (currentView.tView.components || (currentView.tView.components = [
-     ])).push(dirIndex, data.length - 1);
+    (tView.components || (tView.components = [])).push(dirIndex, viewData.length - 1);
   }
 }
 
 /** Stores index of directive and host element so it will be queued for binding refresh during CD.
  */
 function queueHostBindingForCheck(dirIndex: number): void {
+  // Must subtract the header offset because hostBindings functions are generated with
+  // instructions that expect element indices that are NOT adjusted (e.g. elementProperty).
   ngDevMode &&
       assertEqual(firstTemplatePass, true, 'Should only be called in first template pass.');
-  (currentView.tView.hostBindings || (currentView.tView.hostBindings = [
-   ])).push(dirIndex, data.length - 1);
+  (tView.hostBindings || (tView.hostBindings = [
+   ])).push(dirIndex, viewData.length - 1 - HEADER_OFFSET);
 }
 
 /** Sets the context for a ChangeDetectorRef to the given instance. */
 export function initChangeDetectorIfExisting(
-    injector: LInjector | null, instance: any, view: LView): void {
+    injector: LInjector | null, instance: any, view: LViewData): void {
   if (injector && injector.changeDetectorRef != null) {
     (injector.changeDetectorRef as ViewRef<any>)._setComponentContext(view, instance);
   }
@@ -730,7 +728,7 @@ function instantiateDirectivesDirectly() {
   if (count > 0) {
     const start = tNode.flags >> TNodeFlags.DirectiveStartingIndexShift;
     const end = start + count;
-    const tDirectives = currentView.tView.directives !;
+    const tDirectives = tView.directives !;
 
     for (let i = start; i < end; i++) {
       const def: DirectiveDef<any> = tDirectives[i];
@@ -771,7 +769,7 @@ function saveNameToExportMap(
 
 /**
  * Takes a list of local names and indices and pushes the resolved local variable values
- * to data[] in the same order as they are loaded in the template with load().
+ * to LViewData in the same order as they are loaded in the template with load().
  */
 function saveResolvedLocalsInData(): void {
   const localNames = previousOrParentNode.tNode.localNames;
@@ -779,7 +777,7 @@ function saveResolvedLocalsInData(): void {
     for (let i = 0; i < localNames.length; i += 2) {
       const index = localNames[i + 1] as number;
       const value = index === -1 ? previousOrParentNode.native : directives ![index];
-      data.push(value);
+      viewData.push(value);
     }
   }
 }
@@ -822,9 +820,9 @@ export function createTView(
     id: viewIndex,
     template: template,
     node: null !,
-    data: [],
-    childIndex: -1,         // Children set in addToViewTree(), if any
-    bindingStartIndex: -1,  // Set in initBindings()
+    data: HEADER_FILLER.slice(),  // Fill in to match HEADER_OFFSET in LViewData
+    childIndex: -1,               // Children set in addToViewTree(), if any
+    bindingStartIndex: -1,        // Set in initBindings()
     directives: null,
     firstTemplatePass: true,
     initHooks: null,
@@ -904,14 +902,14 @@ export function hostElement(
   resetApplicationState();
   const node = createLNode(
       0, TNodeType.Element, rNode, null, null,
-      createLView(
+      createLViewData(
           renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null,
           def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
     node.tNode.flags = TNodeFlags.isComponent;
     if (def.diPublic) def.diPublic(def);
-    currentView.tView.directives = [def];
+    tView.directives = [def];
   }
 
   return node;
@@ -938,17 +936,17 @@ export function listener(
   // In order to match current behavior, native DOM event listeners must be added for all
   // events (including outputs).
   if (isProceduralRenderer(renderer)) {
-    const wrappedListener = wrapListenerWithDirtyLogic(currentView, listenerFn);
+    const wrappedListener = wrapListenerWithDirtyLogic(viewData, listenerFn);
     const cleanupFn = renderer.listen(native, eventName, wrappedListener);
-    storeCleanupFn(currentView, cleanupFn);
+    storeCleanupFn(viewData, cleanupFn);
   } else {
-    const wrappedListener = wrapListenerWithDirtyAndDefault(currentView, listenerFn);
+    const wrappedListener = wrapListenerWithDirtyAndDefault(viewData, listenerFn);
     native.addEventListener(eventName, wrappedListener, useCapture);
-    const cleanupInstances = getCleanup(currentView);
+    const cleanupInstances = getCleanup(viewData);
     cleanupInstances.push(wrappedListener);
     if (firstTemplatePass) {
-      getTViewCleanup(currentView)
-          .push(eventName, node.tNode.index, cleanupInstances !.length - 1, useCapture);
+      getTViewCleanup(viewData).push(
+          eventName, node.tNode.index, cleanupInstances !.length - 1, useCapture);
     }
   }
 
@@ -974,7 +972,7 @@ function createOutput(outputs: PropertyAliasValue, listener: Function): void {
   for (let i = 0; i < outputs.length; i += 2) {
     ngDevMode && assertDataInRange(outputs[i] as number, directives !);
     const subscription = directives ![outputs[i] as number][outputs[i + 1]].subscribe(listener);
-    storeCleanupWithContext(currentView, subscription, subscription.unsubscribe);
+    storeCleanupWithContext(viewData, subscription, subscription.unsubscribe);
   }
 }
 
@@ -986,11 +984,12 @@ function createOutput(outputs: PropertyAliasValue, listener: Function): void {
  * - Index of context we just saved in LView.cleanupInstances
  */
 export function storeCleanupWithContext(
-    view: LView = currentView, context: any, cleanupFn: Function): void {
+    view: LViewData | null, context: any, cleanupFn: Function): void {
+  if (!view) view = viewData;
   getCleanup(view).push(context);
 
-  if (view.tView.firstTemplatePass) {
-    getTViewCleanup(view).push(cleanupFn, view.cleanupInstances !.length - 1);
+  if (view[TVIEW].firstTemplatePass) {
+    getTViewCleanup(view).push(cleanupFn, view[CLEANUP] !.length - 1);
   }
 }
 
@@ -1002,11 +1001,11 @@ export function storeCleanupWithContext(
  *
  * On the first template pass, the index of the cleanup function is saved in TView.
  */
-export function storeCleanupFn(view: LView, cleanupFn: Function): void {
+export function storeCleanupFn(view: LViewData, cleanupFn: Function): void {
   getCleanup(view).push(cleanupFn);
 
-  if (view.tView.firstTemplatePass) {
-    getTViewCleanup(view).push(view.cleanupInstances !.length - 1, null);
+  if (view[TVIEW].firstTemplatePass) {
+    getTViewCleanup(view).push(view[CLEANUP] !.length - 1, null);
   }
 }
 
@@ -1021,7 +1020,7 @@ export function elementEnd() {
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Element);
   const queries = previousOrParentNode.queries;
   queries && queries.addNode(previousOrParentNode);
-  queueLifecycleHooks(previousOrParentNode.tNode.flags, currentView);
+  queueLifecycleHooks(previousOrParentNode.tNode.flags, tView);
 }
 
 /**
@@ -1036,7 +1035,7 @@ export function elementEnd() {
 export function elementAttribute(
     index: number, name: string, value: any, sanitizer?: SanitizerFn): void {
   if (value !== NO_CHANGE) {
-    const element: LElementNode = data[index];
+    const element: LElementNode = load(index);
     if (value == null) {
       ngDevMode && ngDevMode.rendererRemoveAttribute++;
       isProceduralRenderer(renderer) ? renderer.removeAttribute(element.native, name) :
@@ -1067,7 +1066,7 @@ export function elementAttribute(
 export function elementProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn): void {
   if (value === NO_CHANGE) return;
-  const node = data[index] as LElementNode;
+  const node = load(index) as LElementNode;
   const tNode = node.tNode;
   // if tNode.inputs is undefined, a listener has created outputs, but inputs haven't
   // yet been checked
@@ -1097,7 +1096,7 @@ export function elementProperty<T>(
  * Constructs a TNode object from the arguments.
  *
  * @param type The type of the node
- * @param index The index of the TNode in TView.data
+ * @param adjustedIndex The index of the TNode in TView.data, adjusted for HEADER_OFFSET
  * @param tagName The tag name of the node
  * @param attrs The attributes defined on this node
  * @param parent The parent of this node
@@ -1105,12 +1104,12 @@ export function elementProperty<T>(
  * @returns the TNode object
  */
 export function createTNode(
-    type: TNodeType, index: number, tagName: string | null, attrs: TAttributes | null,
+    type: TNodeType, adjustedIndex: number, tagName: string | null, attrs: TAttributes | null,
     parent: TElementNode | TContainerNode | null, tViews: TView[] | null): TNode {
   ngDevMode && ngDevMode.tNode++;
   return {
     type: type,
-    index: index,
+    index: adjustedIndex,
     flags: 0,
     tagName: tagName,
     attrs: attrs,
@@ -1153,7 +1152,7 @@ function generatePropertyAliases(
     const start = tNodeFlags >> TNodeFlags.DirectiveStartingIndexShift;
     const end = start + count;
     const isInput = direction === BindingDirection.Input;
-    const defs = currentView.tView.directives !;
+    const defs = tView.directives !;
 
     for (let i = start; i < end; i++) {
       const directiveDef = defs[i] as DirectiveDef<any>;
@@ -1185,7 +1184,7 @@ function generatePropertyAliases(
  */
 export function elementClassNamed<T>(index: number, className: string, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
-    const lElement = data[index] as LElementNode;
+    const lElement = load(index) as LElementNode;
     if (value) {
       ngDevMode && ngDevMode.rendererAddClass++;
       isProceduralRenderer(renderer) ? renderer.addClass(lElement.native, className) :
@@ -1216,7 +1215,7 @@ export function elementClass<T>(index: number, value: T | NO_CHANGE): void {
     // TODO: This is a naive implementation which simply writes value to the `className`. In the
     // future
     // we will add logic here which would work with the animation code.
-    const lElement: LElementNode = data[index];
+    const lElement: LElementNode = load(index);
     ngDevMode && ngDevMode.rendererSetClassName++;
     isProceduralRenderer(renderer) ? renderer.setProperty(lElement.native, 'className', value) :
                                      lElement.native['className'] = stringify(value);
@@ -1242,7 +1241,7 @@ export function elementStyleNamed<T>(
     index: number, styleName: string, value: T | NO_CHANGE,
     suffixOrSanitizer?: string | SanitizerFn): void {
   if (value !== NO_CHANGE) {
-    const lElement: LElementNode = data[index];
+    const lElement: LElementNode = load(index);
     if (value == null) {
       ngDevMode && ngDevMode.rendererRemoveStyle++;
       isProceduralRenderer(renderer) ?
@@ -1266,7 +1265,7 @@ export function elementStyleNamed<T>(
  * This instruction is meant to handle the `[style]="exp"` usage.
  *
  *
- * @param index The index of the element to update in the data array
+ * @param index The index of the element to update in the LViewData array
  * @param value A value indicating if a given style should be added or removed.
  *   The expected shape of `value` is an object where keys are style names and the values
  *   are their corresponding values to set. If value is falsy, then the style is removed. An absence
@@ -1278,7 +1277,7 @@ export function elementStyle<T>(
   if (value !== NO_CHANGE) {
     // TODO: This is a naive implementation which simply writes value to the `style`. In the future
     // we will add logic here which would work with the animation code.
-    const lElement = data[index] as LElementNode;
+    const lElement = load(index) as LElementNode;
     if (isProceduralRenderer(renderer)) {
       ngDevMode && ngDevMode.rendererSetStyle++;
       renderer.setProperty(lElement.native, 'style', value);
@@ -1308,19 +1307,19 @@ export function elementStyle<T>(
 /**
  * Create static text node
  *
- * @param index Index of the node in the data array.
+ * @param index Index of the node in the data array
  * @param value Value to write. This value will be stringified.
  */
 export function text(index: number, value?: any): void {
   ngDevMode &&
-      assertEqual(currentView.bindingIndex, -1, 'text nodes should be created before bindings');
+      assertEqual(viewData[BINDING_INDEX], -1, 'text nodes should be created before bindings');
   ngDevMode && ngDevMode.rendererCreateTextNode++;
   const textNode = createTextNode(value, renderer);
   const node = createLNode(index, TNodeType.Element, textNode, null, null);
 
   // Text nodes are self closing.
   isParent = false;
-  appendChild(getParentLNode(node), textNode, currentView);
+  appendChild(getParentLNode(node), textNode, viewData);
 }
 
 /**
@@ -1332,8 +1331,8 @@ export function text(index: number, value?: any): void {
  */
 export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
-    ngDevMode && assertDataInRange(index);
-    const existingNode = data[index] as LTextNode;
+    ngDevMode && assertDataInRange(index + HEADER_OFFSET);
+    const existingNode = load(index) as LTextNode;
     ngDevMode && assertDefined(existingNode, 'LNode should exist');
     ngDevMode && assertDefined(existingNode.native, 'native element should exist');
     ngDevMode && ngDevMode.rendererSetText++;
@@ -1370,7 +1369,7 @@ export function directiveCreate<T>(
   if (firstTemplatePass) {
     // Init hooks are queued now so ngOnInit is called in host components before
     // any projected components.
-    queueInitHooks(index, directiveDef.onInit, directiveDef.doCheck, currentView.tView);
+    queueInitHooks(index, directiveDef.onInit, directiveDef.doCheck, tView);
 
     if (directiveDef.hostBindings) queueHostBindingForCheck(index);
   }
@@ -1382,27 +1381,26 @@ export function directiveCreate<T>(
   return instance;
 }
 
-function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>): void {
+function addComponentLogic<T>(directiveIndex: number, instance: T, def: ComponentDef<T>): void {
   const tView = getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs);
 
   // Only component views should be added to the view tree directly. Embedded views are
   // accessed through their containers because they may be removed / re-added later.
-  const hostView = addToViewTree(
-      currentView, previousOrParentNode.tNode.index as number,
-      createLView(
+  const componentView = addToViewTree(
+      viewData, previousOrParentNode.tNode.index as number,
+      createLViewData(
           rendererFactory.createRenderer(previousOrParentNode.native as RElement, def.rendererType),
           tView, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
           getCurrentSanitizer()));
 
   // We need to set the host node/data here because when the component LNode was created,
   // we didn't yet know it was a component (just an element).
-  (previousOrParentNode as{data: LView}).data = hostView;
-  (hostView as{node: LNode}).node = previousOrParentNode;
-  if (firstTemplatePass) tView.node = previousOrParentNode.tNode;
+  (previousOrParentNode as{data: LViewData}).data = componentView;
+  (componentView as LViewData)[HOST_NODE] = previousOrParentNode as LElementNode;
 
-  initChangeDetectorIfExisting(previousOrParentNode.nodeInjector, instance, hostView);
+  initChangeDetectorIfExisting(previousOrParentNode.nodeInjector, instance, componentView);
 
-  if (firstTemplatePass) queueComponentIndexForCheck(index);
+  if (firstTemplatePass) queueComponentIndexForCheck(directiveIndex);
 }
 
 /**
@@ -1414,13 +1412,13 @@ function addComponentLogic<T>(index: number, instance: T, def: ComponentDef<T>):
 export function baseDirectiveCreate<T>(
     index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
   ngDevMode &&
-      assertEqual(currentView.bindingIndex, -1, 'directives should be created before any bindings');
+      assertEqual(viewData[BINDING_INDEX], -1, 'directives should be created before any bindings');
   ngDevMode && assertPreviousIsParent();
 
   Object.defineProperty(
       directive, NG_HOST_SYMBOL, {enumerable: false, value: previousOrParentNode});
 
-  if (directives == null) currentView.directives = directives = [];
+  if (directives == null) viewData[DIRECTIVES] = directives = [];
 
   ngDevMode && assertDataNext(index, directives);
   directives[index] = directive;
@@ -1521,23 +1519,21 @@ function generateInitialInputs(
  *
  * @param parentLNode the LNode in which the container's content will be rendered
  * @param currentView The parent view of the LContainer
- * @param template Optional the inline template (ng-template instruction case)
  * @param isForViewContainerRef Optional a flag indicating the ViewContainerRef case
  * @returns LContainer
  */
 export function createLContainer(
-    parentLNode: LNode, currentView: LView, isForViewContainerRef?: boolean): LContainer {
+    parentLNode: LNode, currentView: LViewData, isForViewContainerRef?: boolean): LContainer {
   ngDevMode && assertDefined(parentLNode, 'containers should have a parent');
-  return <LContainer>{
-    views: [],
-    nextIndex: isForViewContainerRef ? null : 0,
-    // If the direct parent of the container is a view, its views will need to be added
-    // through insertView() when its parent view is being inserted:
-    renderParent: canInsertNativeNode(parentLNode, currentView) ? parentLNode : null,
-    next: null,
-    parent: currentView,
-    queries: null
-  };
+  return [
+    isForViewContainerRef ? null : 0,  // active index
+    currentView,                       // parent
+    null,                              // next
+    null,                              // queries
+    [],                                // views
+    canInsertNativeNode(parentLNode, currentView) ? parentLNode as LElementNode :
+                                                    null  // renderParent
+  ];
 }
 
 /**
@@ -1556,28 +1552,27 @@ export function container(
     localRefs?: string[] | null): void {
   ngDevMode &&
       assertEqual(
-          currentView.bindingIndex, -1, 'container nodes should be created before any bindings');
+          viewData[BINDING_INDEX], -1, 'container nodes should be created before any bindings');
 
   const currentParent = isParent ? previousOrParentNode : getParentLNode(previousOrParentNode) !;
-  const lContainer = createLContainer(currentParent, currentView);
+  const lContainer = createLContainer(currentParent, viewData);
 
   const node = createLNode(
       index, TNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
 
   if (firstTemplatePass) {
-    const tView = currentView.tView;
     node.tNode.tViews =
         template ? createTView(-1, template, tView.directiveRegistry, tView.pipeRegistry) : [];
   }
 
   // Containers are added to the current view tree instead of their embedded views
   // because views can be removed and re-inserted.
-  addToViewTree(currentView, index, node.data);
+  addToViewTree(viewData, index + HEADER_OFFSET, node.data);
 
   const queries = node.queries;
   if (queries) {
     // prepare place for matching nodes from views inserted into a given container
-    lContainer.queries = queries.container();
+    lContainer[QUERIES] = queries.container();
   }
 
   createDirectivesAndLocals(localRefs);
@@ -1596,11 +1591,10 @@ export function container(
  * @param index The index of the container in the data array
  */
 export function containerRefreshStart(index: number): void {
-  ngDevMode && assertDataInRange(index);
-  previousOrParentNode = data[index] as LNode;
+  previousOrParentNode = load(index) as LNode;
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   isParent = true;
-  (previousOrParentNode as LContainerNode).data.nextIndex = 0;
+  (previousOrParentNode as LContainerNode).data[ACTIVE_INDEX] = 0;
   ngDevMode && assertSame(
                    (previousOrParentNode as LContainerNode).native, undefined,
                    `the container's native element should not have been set yet.`);
@@ -1608,7 +1602,7 @@ export function containerRefreshStart(index: number): void {
   if (!checkNoChangesMode) {
     // We need to execute init hooks here so ngOnInit hooks are called in top level views
     // before they are called in embedded views (for backwards compatibility).
-    executeInitHooks(currentView, currentView.tView, creationMode);
+    executeInitHooks(viewData, tView, creationMode);
   }
 }
 
@@ -1629,34 +1623,33 @@ export function containerRefreshEnd(): void {
   const container = previousOrParentNode as LContainerNode;
   container.native = undefined;
   ngDevMode && assertNodeType(container, TNodeType.Container);
-  const nextIndex = container.data.nextIndex !;
+  const nextIndex = container.data[ACTIVE_INDEX] !;
 
   // remove extra views at the end of the container
-  while (nextIndex < container.data.views.length) {
+  while (nextIndex < container.data[VIEWS].length) {
     removeView(container, nextIndex);
   }
 }
 
 function refreshDynamicChildren() {
-  for (let current = getLViewChild(currentView); current !== null; current = current.next) {
-    // Note: current can be a LView or a LContainer, but here we are only interested in LContainer.
-    // The distinction is made because nextIndex and views do not exist on LView.
-    if (isLContainer(current)) {
+  for (let current = getLViewChild(viewData); current !== null; current = current[NEXT]) {
+    // Note: current can be an LViewData or an LContainer instance, but here we are only interested
+    // in LContainer. We can tell it's an LContainer because its length is less than the LViewData
+    // header.
+    if (current.length < HEADER_OFFSET && current[ACTIVE_INDEX] === null) {
       const container = current as LContainer;
-      for (let i = 0; i < container.views.length; i++) {
-        const lViewNode = container.views[i];
+      for (let i = 0; i < container[VIEWS].length; i++) {
+        const lViewNode = container[VIEWS][i];
         // The directives and pipes are not needed here as an existing view is only being refreshed.
-        const dynamicView = lViewNode.data;
-        ngDevMode && assertDefined(dynamicView.tView, 'TView must be allocated');
-        renderEmbeddedTemplate(lViewNode, dynamicView.tView, dynamicView.context !, renderer);
+        const dynamicViewData = lViewNode.data;
+        ngDevMode && assertDefined(dynamicViewData[TVIEW], 'TView must be allocated');
+        renderEmbeddedTemplate(
+            lViewNode, dynamicViewData[TVIEW], dynamicViewData[CONTEXT] !, renderer);
       }
     }
   }
 }
 
-function isLContainer(node: LView | LContainer): node is LContainer {
-  return (node as LContainer).nextIndex == null && (node as LContainer).views != null;
-}
 
 /**
  * Looks for a view with a given view block id inside a provided LContainer.
@@ -1669,9 +1662,9 @@ function isLContainer(node: LView | LContainer): node is LContainer {
  */
 function scanForView(
     containerNode: LContainerNode, startIdx: number, viewBlockId: number): LViewNode|null {
-  const views = containerNode.data.views;
+  const views = containerNode.data[VIEWS];
   for (let i = startIdx; i < views.length; i++) {
-    const viewAtPositionId = views[i].data.tView.id;
+    const viewAtPositionId = views[i].data[TVIEW].id;
     if (viewAtPositionId === viewBlockId) {
       return views[i];
     } else if (viewAtPositionId < viewBlockId) {
@@ -1698,7 +1691,7 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
       (isParent ? previousOrParentNode : getParentLNode(previousOrParentNode)) as LContainerNode;
   ngDevMode && assertNodeType(container, TNodeType.Container);
   const lContainer = container.data;
-  let viewNode: LViewNode|null = scanForView(container, lContainer.nextIndex !, viewBlockId);
+  let viewNode: LViewNode|null = scanForView(container, lContainer[ACTIVE_INDEX] !, viewBlockId);
 
   if (viewNode) {
     previousOrParentNode = viewNode;
@@ -1707,12 +1700,12 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
     enterView(viewNode.data, viewNode);
   } else {
     // When we create a new LView, we always reset the state of the instructions.
-    const newView = createLView(
+    const newView = createLViewData(
         renderer, getOrCreateEmbeddedTView(viewBlockId, container), null, LViewFlags.CheckAlways,
         getCurrentSanitizer());
 
-    if (lContainer.queries) {
-      newView.queries = lContainer.queries.createView();
+    if (lContainer[QUERIES]) {
+      newView[QUERIES] = lContainer[QUERIES] !.createView();
     }
 
     enterView(
@@ -1738,7 +1731,6 @@ function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TV
   ngDevMode && assertDefined(containerTViews, 'TView expected');
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
-    const tView = currentView.tView;
     containerTViews[viewIndex] =
         createTView(viewIndex, null, tView.directiveRegistry, tView.pipeRegistry);
   }
@@ -1749,7 +1741,7 @@ function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TV
 export function embeddedViewEnd(): void {
   refreshView();
   isParent = false;
-  const viewNode = previousOrParentNode = currentView.node as LViewNode;
+  const viewNode = previousOrParentNode = viewData[HOST_NODE] as LViewNode;
   const containerNode = getParentLNode(previousOrParentNode) as LContainerNode;
   if (containerNode) {
     ngDevMode && assertNodeType(viewNode, TNodeType.View);
@@ -1759,14 +1751,14 @@ export function embeddedViewEnd(): void {
     if (creationMode) {
       // When projected nodes are going to be inserted, the renderParent of the dynamic container
       // used by the ViewContainerRef must be set.
-      setRenderParentInProjectedNodes(lContainer.renderParent, viewNode);
+      setRenderParentInProjectedNodes(lContainer[RENDER_PARENT], viewNode);
       // it is a new view, insert it into collection of views for a given container
-      insertView(containerNode, viewNode, lContainer.nextIndex !);
+      insertView(containerNode, viewNode, lContainer[ACTIVE_INDEX] !);
     }
 
-    lContainer.nextIndex !++;
+    lContainer[ACTIVE_INDEX] !++;
   }
-  leaveView(currentView !.parent !);
+  leaveView(viewData[PARENT] !);
   ngDevMode && assertEqual(isParent, false, 'isParent');
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
 }
@@ -1787,7 +1779,7 @@ function setRenderParentInProjectedNodes(
         const lastNodeToProject = (node as LProjectionNode).data.tail;
         while (nodeToProject) {
           if (nodeToProject.dynamicLContainerNode) {
-            nodeToProject.dynamicLContainerNode.data.renderParent = renderParent;
+            nodeToProject.dynamicLContainerNode.data[RENDER_PARENT] = renderParent;
           }
           nodeToProject = nodeToProject === lastNodeToProject ? null : nodeToProject.pNextOrParent;
         }
@@ -1802,26 +1794,27 @@ function setRenderParentInProjectedNodes(
 /**
  * Refreshes components by entering the component view and processing its bindings, queries, etc.
  *
- * @param directiveIndex
- * @param elementIndex
+ * @param directiveIndex Directive index in LViewData[DIRECTIVES]
+ * @param adjustedElementIndex  Element index in LViewData[] (adjusted for HEADER_OFFSET)
  */
-export function componentRefresh<T>(directiveIndex: number, elementIndex: number): void {
-  ngDevMode && assertDataInRange(elementIndex);
-  const element = data ![elementIndex] as LElementNode;
+export function componentRefresh<T>(directiveIndex: number, adjustedElementIndex: number): void {
+  ngDevMode && assertDataInRange(adjustedElementIndex);
+  const element = viewData[adjustedElementIndex] as LElementNode;
   ngDevMode && assertNodeType(element, TNodeType.Element);
-  ngDevMode && assertDefined(element.data, `Component's host node should have an LView attached.`);
+  ngDevMode &&
+      assertDefined(element.data, `Component's host node should have an LViewData attached.`);
   const hostView = element.data !;
 
   // Only attached CheckAlways components or attached, dirty OnPush components should be checked
-  if (viewAttached(hostView) && hostView.flags & (LViewFlags.CheckAlways | LViewFlags.Dirty)) {
+  if (viewAttached(hostView) && hostView[FLAGS] & (LViewFlags.CheckAlways | LViewFlags.Dirty)) {
     ngDevMode && assertDataInRange(directiveIndex, directives !);
     detectChangesInternal(hostView, element, getDirectiveInstance(directives ![directiveIndex]));
   }
 }
 
 /** Returns a boolean for whether the view is attached */
-function viewAttached(view: LView): boolean {
-  return (view.flags & LViewFlags.Attached) === LViewFlags.Attached;
+export function viewAttached(view: LViewData): boolean {
+  return (view[FLAGS] & LViewFlags.Attached) === LViewFlags.Attached;
 }
 
 /**
@@ -1853,7 +1846,7 @@ export function projectionDef(
     distributedNodes[i] = [];
   }
 
-  const componentNode: LElementNode = findComponentHost(currentView);
+  const componentNode: LElementNode = findComponentHost(viewData);
   let componentChild: LNode|null = getChildLNode(componentNode);
 
   while (componentChild !== null) {
@@ -1870,8 +1863,8 @@ export function projectionDef(
     componentChild = getNextLNode(componentChild);
   }
 
-  ngDevMode && assertDataNext(index);
-  data[index] = distributedNodes;
+  ngDevMode && assertDataNext(index + HEADER_OFFSET);
+  store(index, distributedNodes);
 }
 
 /**
@@ -1921,9 +1914,10 @@ export function projection(
   isParent = false;
 
   // re-distribution of projectable nodes is memorized on a component's view level
-  const componentNode = findComponentHost(currentView);
-  const componentLView = componentNode.data !;
-  const nodesForSelector = componentLView.data ![localIndex][selectorIndex];
+  const componentNode = findComponentHost(viewData);
+  const componentLView = componentNode.data as LViewData;
+  const distributedNodes = loadInternal(localIndex, componentLView) as Array<LNode[]>;
+  const nodesForSelector = distributedNodes[selectorIndex];
 
   // build the linked list of projected nodes:
   for (let i = 0; i < nodesForSelector.length; i++) {
@@ -1941,7 +1935,7 @@ export function projection(
   }
 
   const currentParent = getParentLNode(node);
-  if (canInsertNativeNode(currentParent, currentView)) {
+  if (canInsertNativeNode(currentParent, viewData)) {
     ngDevMode && assertNodeType(currentParent, TNodeType.Element);
     // process each node in the list of projected nodes:
     let nodeToProject: LNode|null = node.data.head;
@@ -1949,7 +1943,7 @@ export function projection(
     while (nodeToProject) {
       appendProjectedNode(
           nodeToProject as LTextNode | LElementNode | LContainerNode, currentParent as LElementNode,
-          currentView);
+          viewData);
       nodeToProject = nodeToProject === lastNodeToProject ? null : nodeToProject.pNextOrParent;
     }
   }
@@ -1958,15 +1952,16 @@ export function projection(
 /**
  * Given a current view, finds the nearest component's host (LElement).
  *
- * @param lView LView for which we want a host element node
+ * @param lViewData LViewData for which we want a host element node
  * @returns The host node
  */
-function findComponentHost(lView: LView): LElementNode {
-  let viewRootLNode = lView.node;
+function findComponentHost(lViewData: LViewData): LElementNode {
+  let viewRootLNode = lViewData[HOST_NODE];
+
   while (viewRootLNode.tNode.type === TNodeType.View) {
-    ngDevMode && assertDefined(lView.parent, 'lView.parent');
-    lView = lView.parent !;
-    viewRootLNode = lView.node;
+    ngDevMode && assertDefined(lViewData[PARENT], 'lViewData.parent');
+    lViewData = lViewData[PARENT] !;
+    viewRootLNode = lViewData[HOST_NODE];
   }
 
   ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
@@ -1976,25 +1971,24 @@ function findComponentHost(lView: LView): LElementNode {
 }
 
 /**
- * Adds a LView or a LContainer to the end of the current view tree.
+ * Adds LViewData or LContainer to the end of the current view tree.
  *
  * This structure will be used to traverse through nested views to remove listeners
  * and call onDestroy callbacks.
  *
- * @param currentView The view where LView or LContainer should be added
- * @param hostIndex Index of the view's host node in data[]
- * @param state The LView or LContainer to add to the view tree
+ * @param currentView The view where LViewData or LContainer should be added
+ * @param adjustedHostIndex Index of the view's host node in LViewData[], adjusted for header
+ * @param state The LViewData or LContainer to add to the view tree
  * @returns The state passed in
  */
-export function addToViewTree<T extends LView|LContainer>(
-    currentView: LView, hostIndex: number, state: T): T {
-  // TODO(kara): move next and tail properties off of LView
-  if (currentView.tail) {
-    currentView.tail.next = state;
+export function addToViewTree<T extends LViewData|LContainer>(
+    currentView: LViewData, adjustedHostIndex: number, state: T): T {
+  if (currentView[TAIL]) {
+    currentView[TAIL] ![NEXT] = state;
   } else if (firstTemplatePass) {
-    currentView.tView.childIndex = hostIndex;
+    tView.childIndex = adjustedHostIndex;
   }
-  currentView.tail = state;
+  currentView[TAIL] = state;
   return state;
 }
 
@@ -2002,11 +1996,11 @@ export function addToViewTree<T extends LView|LContainer>(
 //// Change detection
 ///////////////////////////////
 
-/** If node is an OnPush component, marks its LView dirty. */
+/** If node is an OnPush component, marks its LViewData dirty. */
 export function markDirtyIfOnPush(node: LElementNode): void {
   // Because data flows down the component tree, ancestors do not need to be marked dirty
-  if (node.data && !(node.data.flags & LViewFlags.CheckAlways)) {
-    node.data.flags |= LViewFlags.Dirty;
+  if (node.data && !(node.data[FLAGS] & LViewFlags.CheckAlways)) {
+    node.data[FLAGS] |= LViewFlags.Dirty;
   }
 }
 
@@ -2014,8 +2008,8 @@ export function markDirtyIfOnPush(node: LElementNode): void {
  * Wraps an event listener so its host view and its ancestor views will be marked dirty
  * whenever the event fires. Necessary to support OnPush components.
  */
-export function wrapListenerWithDirtyLogic(view: LView, listenerFn: (e?: any) => any): (e: Event) =>
-    any {
+export function wrapListenerWithDirtyLogic(
+    view: LViewData, listenerFn: (e?: any) => any): (e: Event) => any {
   return function(e: any) {
     markViewDirty(view);
     return listenerFn(e);
@@ -2027,7 +2021,7 @@ export function wrapListenerWithDirtyLogic(view: LView, listenerFn: (e?: any) =>
  * whenever the event fires. Also wraps with preventDefault behavior.
  */
 export function wrapListenerWithDirtyAndDefault(
-    view: LView, listenerFn: (e?: any) => any): EventListener {
+    view: LViewData, listenerFn: (e?: any) => any): EventListener {
   return function wrapListenerIn_markViewDirty(e: Event) {
     markViewDirty(view);
     if (listenerFn(e) === false) {
@@ -2039,17 +2033,16 @@ export function wrapListenerWithDirtyAndDefault(
 }
 
 /** Marks current view and all ancestors dirty */
-export function markViewDirty(view: LView): void {
-  let currentView: LView|null = view;
+export function markViewDirty(view: LViewData): void {
+  let currentView: LViewData = view;
 
-  while (currentView.parent != null) {
-    currentView.flags |= LViewFlags.Dirty;
-    currentView = currentView.parent;
+  while (currentView[PARENT] != null) {
+    currentView[FLAGS] |= LViewFlags.Dirty;
+    currentView = currentView[PARENT] !;
   }
-  currentView.flags |= LViewFlags.Dirty;
-
-  ngDevMode && assertDefined(currentView !.context, 'rootContext');
-  scheduleTick(currentView !.context as RootContext);
+  currentView[FLAGS] |= LViewFlags.Dirty;
+  ngDevMode && assertDefined(currentView[CONTEXT], 'rootContext');
+  scheduleTick(currentView[CONTEXT] as RootContext);
 }
 
 
@@ -2090,7 +2083,7 @@ export function scheduleTick<T>(rootContext: RootContext) {
  */
 export function tick<T>(component: T): void {
   const rootView = getRootView(component);
-  const rootContext = rootView.context as RootContext;
+  const rootContext = rootView[CONTEXT] as RootContext;
   tickRootContext(rootContext);
 }
 
@@ -2105,20 +2098,20 @@ function tickRootContext(rootContext: RootContext) {
 }
 
 /**
- * Retrieve the root view from any component by walking the parent `LView` until
- * reaching the root `LView`.
+ * Retrieve the root view from any component by walking the parent `LViewData` until
+ * reaching the root `LViewData`.
  *
  * @param component any component
  */
 
-export function getRootView(component: any): LView {
+export function getRootView(component: any): LViewData {
   ngDevMode && assertDefined(component, 'component');
   const lElementNode = _getComponentHostLElementNode(component);
-  let lView = lElementNode.view;
-  while (lView.parent) {
-    lView = lView.parent;
+  let lViewData = lElementNode.view;
+  while (lViewData[PARENT]) {
+    lViewData = lViewData[PARENT] !;
   }
-  return lView;
+  return lViewData;
 }
 
 /**
@@ -2136,8 +2129,10 @@ export function getRootView(component: any): LView {
  */
 export function detectChanges<T>(component: T): void {
   const hostNode = _getComponentHostLElementNode(component);
-  ngDevMode && assertDefined(hostNode.data, 'Component host node should be attached to an LView');
-  detectChangesInternal(hostNode.data as LView, hostNode, component);
+  ngDevMode &&
+      assertDefined(
+          hostNode.data, 'Component host node should be attached to an LViewData instance.');
+  detectChangesInternal(hostNode.data as LViewData, hostNode, component);
 }
 
 
@@ -2157,9 +2152,10 @@ export function checkNoChanges<T>(component: T): void {
 }
 
 /** Checks the view of the component provided. Does not gate on dirty checks or execute doCheck. */
-export function detectChangesInternal<T>(hostView: LView, hostNode: LElementNode, component: T) {
+export function detectChangesInternal<T>(
+    hostView: LViewData, hostNode: LElementNode, component: T) {
   const oldView = enterView(hostView, hostNode);
-  const template = hostView.tView.template !;
+  const template = hostView[TVIEW].template !;
 
   try {
     namespaceHTML();
@@ -2211,12 +2207,12 @@ export const NO_CHANGE = {} as NO_CHANGE;
  */
 function initBindings() {
   ngDevMode && assertEqual(
-                   currentView.bindingIndex, -1,
-                   'Binding index should not yet be set ' + currentView.bindingIndex);
-  if (currentView.tView.bindingStartIndex === -1) {
-    currentView.tView.bindingStartIndex = data.length;
+                   viewData[BINDING_INDEX], -1,
+                   'Binding index should not yet be set ' + viewData[BINDING_INDEX]);
+  if (tView.bindingStartIndex === -1) {
+    tView.bindingStartIndex = viewData.length;
   }
-  currentView.bindingIndex = currentView.tView.bindingStartIndex;
+  viewData[BINDING_INDEX] = tView.bindingStartIndex;
 }
 
 /**
@@ -2249,8 +2245,8 @@ export function reserveSlots(numSlots: number) {
   // Init the slots with a unique `NO_CHANGE` value so that the first change is always detected
   // whether it happens or not during the first change detection pass - pure functions checks
   // might be skipped when short-circuited.
-  data.length += numSlots;
-  data.fill(NO_CHANGE, -numSlots);
+  viewData.length += numSlots;
+  viewData.fill(NO_CHANGE, -numSlots);
   // We need to initialize the binding in case a `pureFunctionX` kind of binding instruction is
   // called first in the update section.
   initBindings();
@@ -2264,8 +2260,8 @@ export function reserveSlots(numSlots: number) {
  * {@link reserveSlots}
  */
 export function moveBindingIndexToReservedSlot(offset: number): number {
-  const currentSlot = currentView.bindingIndex;
-  currentView.bindingIndex = currentView.tView.bindingStartIndex - offset;
+  const currentSlot = viewData[BINDING_INDEX];
+  viewData[BINDING_INDEX] = tView.bindingStartIndex - offset;
   return currentSlot;
 }
 
@@ -2276,7 +2272,7 @@ export function moveBindingIndexToReservedSlot(offset: number): number {
  * been executed.
  */
 export function restoreBindingIndex(index: number): void {
-  currentView.bindingIndex = index;
+  viewData[BINDING_INDEX] = index;
 }
 
 /**
@@ -2418,16 +2414,22 @@ export function interpolation8(
 export function store<T>(index: number, value: T): void {
   // We don't store any static data for local variables, so the first time
   // we see the template, we should store as null to avoid a sparse array
-  if (index >= tData.length) {
-    tData[index] = null;
+  const adjustedIndex = index + HEADER_OFFSET;
+  if (adjustedIndex >= tView.data.length) {
+    tView.data[adjustedIndex] = null;
   }
-  data[index] = value;
+  viewData[adjustedIndex] = value;
 }
 
-/** Retrieves a value from the `data`. */
+/** Retrieves a value from current `viewData`. */
 export function load<T>(index: number): T {
-  ngDevMode && assertDataInRange(index);
-  return data[index];
+  return loadInternal<T>(index, viewData);
+}
+
+/** Retrieves a value from any `LViewData`. */
+export function loadInternal<T>(index: number, arr: LViewData): T {
+  ngDevMode && assertDataInRange(index + HEADER_OFFSET, arr);
+  return arr[index + HEADER_OFFSET];
 }
 
 /** Retrieves a value from the `directives` array. */
@@ -2439,26 +2441,26 @@ export function loadDirective<T>(index: number): T {
 
 /** Gets the current binding value and increments the binding index. */
 export function consumeBinding(): any {
-  ngDevMode && assertDataInRange(currentView.bindingIndex);
+  ngDevMode && assertDataInRange(viewData[BINDING_INDEX]);
   ngDevMode &&
       assertNotEqual(
-          data[currentView.bindingIndex], NO_CHANGE, 'Stored value should never be NO_CHANGE.');
-  return data[currentView.bindingIndex++];
+          viewData[viewData[BINDING_INDEX]], NO_CHANGE, 'Stored value should never be NO_CHANGE.');
+  return viewData[viewData[BINDING_INDEX]++];
 }
 
 /** Updates binding if changed, then returns whether it was updated. */
 export function bindingUpdated(value: any): boolean {
   ngDevMode && assertNotEqual(value, NO_CHANGE, 'Incoming value should never be NO_CHANGE.');
-  if (currentView.bindingIndex === -1) initBindings();
+  if (viewData[BINDING_INDEX] === -1) initBindings();
+  const bindingIndex = viewData[BINDING_INDEX];
 
-  if (currentView.bindingIndex >= data.length) {
-    data[currentView.bindingIndex++] = value;
-  } else if (isDifferent(data[currentView.bindingIndex], value)) {
-    throwErrorIfNoChangesMode(
-        creationMode, checkNoChangesMode, data[currentView.bindingIndex], value);
-    data[currentView.bindingIndex++] = value;
+  if (bindingIndex >= viewData.length) {
+    viewData[viewData[BINDING_INDEX]++] = value;
+  } else if (isDifferent(viewData[bindingIndex], value)) {
+    throwErrorIfNoChangesMode(creationMode, checkNoChangesMode, viewData[bindingIndex], value);
+    viewData[viewData[BINDING_INDEX]++] = value;
   } else {
-    currentView.bindingIndex++;
+    viewData[BINDING_INDEX]++;
     return false;
   }
   return true;
@@ -2483,7 +2485,7 @@ export function bindingUpdated4(exp1: any, exp2: any, exp3: any, exp4: any): boo
 }
 
 export function getTView(): TView {
-  return currentView.tView;
+  return tView;
 }
 
 export function getDirectiveInstance<T>(instanceOrArray: T | [T]): T {
@@ -2501,12 +2503,12 @@ function assertHasParent() {
 }
 
 function assertDataInRange(index: number, arr?: any[]) {
-  if (arr == null) arr = data;
+  if (arr == null) arr = viewData;
   assertLessThan(index, arr ? arr.length : 0, 'index expected to be a valid data index');
 }
 
 function assertDataNext(index: number, arr?: any[]) {
-  if (arr == null) arr = data;
+  if (arr == null) arr = viewData;
   assertEqual(
       arr.length, index, `index ${index} expected to be at the end of arr (length ${arr.length})`);
 }
@@ -2518,10 +2520,10 @@ function assertDataNext(index: number, arr?: any[]) {
  */
 export function assertReservedSlotInitialized(slotOffset: number, numSlots: number) {
   if (firstTemplatePass) {
-    const startIndex = currentView.tView.bindingStartIndex - slotOffset;
+    const startIndex = tView.bindingStartIndex - slotOffset;
     for (let i = 0; i < numSlots; i++) {
       assertEqual(
-          data[startIndex + i], NO_CHANGE,
+          viewData[startIndex + i], NO_CHANGE,
           'The reserved slots should be set to `NO_CHANGE` on first template pass');
     }
   }
diff --git a/packages/core/src/render3/interfaces/container.ts b/packages/core/src/render3/interfaces/container.ts
index 5ea41442d8..402aa95afc 100644
--- a/packages/core/src/render3/interfaces/container.ts
+++ b/packages/core/src/render3/interfaces/container.ts
@@ -6,14 +6,30 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LContainerNode, LElementNode, LViewNode} from './node';
+import {LElementNode, LViewNode} from './node';
 import {LQueries} from './query';
-import {LView, TView} from './view';
+import {LViewData, NEXT, PARENT, QUERIES} from './view';
 
+/**
+ * Below are constants for LContainer indices to help us look up LContainer members
+ * without having to remember the specific indices.
+ * Uglify will inline these when minifying so there shouldn't be a cost.
+ */
+export const ACTIVE_INDEX = 0;
+// PARENT, NEXT, and QUERIES are indices 1, 2, and 3.
+// As we already have these constants in LViewData, we don't need to re-create them.
+export const VIEWS = 4;
+export const RENDER_PARENT = 5;
 
-
-/** The state associated with an LContainer */
-export interface LContainer {
+/**
+ * The state associated with an LContainerNode.
+ *
+ * This is an array so that its structure is closer to LViewData. This helps
+ * when traversing the view tree (which is a mix of containers and component
+ * views), so we can jump to viewOrContainer[NEXT] in the same way regardless
+ * of type.
+ */
+export interface LContainer extends Array<any> {
   /**
    * The next active index in the views array to read or write to. This helps us
    * keep track of where we are in the views array.
@@ -21,19 +37,25 @@ export interface LContainer {
    * it is set to null to identify this scenario, as indices are "absolute" in that case,
    * i.e. provided directly by the user of the ViewContainerRef API.
    */
-  nextIndex: number|null;
-
-  /**
-   * This allows us to jump from a container to a sibling container or
-   * component view with the same parent, so we can remove listeners efficiently.
-   */
-  next: LView|LContainer|null;
+  [ACTIVE_INDEX]: number|null;
 
   /**
    * Access to the parent view is necessary so we can propagate back
-   * up from inside a container to parent.next.
+   * up from inside a container to parent[NEXT].
    */
-  parent: LView|null;
+  [PARENT]: LViewData|null;
+
+  /**
+   * This allows us to jump from a container to a sibling container or component
+   * view with the same parent, so we can remove listeners efficiently.
+   */
+  [NEXT]: LViewData|LContainer|null;
+
+  /**
+   * Queries active for this container - all the views inserted to / removed from
+   * this container are reported to queries referenced here.
+   */
+  [QUERIES]: LQueries|null;
 
   /**
    * A list of the container's currently active child views. Views will be inserted
@@ -42,7 +64,7 @@ export interface LContainer {
    * (and don't need to be re-added) and so we can remove views from the DOM when they
    * are no longer required.
    */
-  readonly views: LViewNode[];
+  [VIEWS]: LViewNode[];
 
   /**
    * Parent Element which will contain the location where all of the Views will be
@@ -64,13 +86,7 @@ export interface LContainer {
    * - not `null`, then use the `projectedParent.native` as the `RElement` to insert
    *   `LViewNode`s into.
    */
-  renderParent: LElementNode|null;
-
-  /**
-   * Queries active for this container - all the views inserted to / removed from
-   * this container are reported to queries referenced here.
-   */
-  queries: LQueries|null;
+  [RENDER_PARENT]: LElementNode|null;
 }
 
 // Note: This hack is necessary so we don't erroneously get a circular dependency
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index d4ac991ada..b295a49ef0 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -10,8 +10,8 @@ import {LContainer} from './container';
 import {LInjector} from './injector';
 import {LProjection} from './projection';
 import {LQueries} from './query';
-import {RElement, RNode, RText} from './renderer';
-import {LView, TData, TView} from './view';
+import {RElement, RText} from './renderer';
+import {LViewData, TView} from './view';
 
 
 
@@ -72,7 +72,7 @@ export interface LNode {
    * If LContainerNode, then `data` contains LContainer.
    * If LProjectionNode, then `data` contains LProjection.
    */
-  readonly data: LView|LContainer|LProjection|null;
+  readonly data: LViewData|LContainer|LProjection|null;
 
 
   /**
@@ -80,7 +80,7 @@ export interface LNode {
    *
    * When the injector is walking up a tree, it needs access to the `directives` (part of view).
    */
-  readonly view: LView;
+  readonly view: LViewData;
 
   /** The injector associated with this node. Necessary for DI. */
   nodeInjector: LInjector|null;
@@ -120,7 +120,7 @@ export interface LElementNode extends LNode {
   readonly native: RElement;
 
   /** If Component then data has LView (light DOM) */
-  readonly data: LView|null;
+  readonly data: LViewData|null;
 }
 
 /** LNode representing a #text node. */
@@ -134,7 +134,7 @@ export interface LTextNode extends LNode {
 /** Abstract node which contains root nodes of a view. */
 export interface LViewNode extends LNode {
   readonly native: null;
-  readonly data: LView;
+  readonly data: LViewData;
   dynamicLContainerNode: null;
 }
 
diff --git a/packages/core/src/render3/interfaces/query.ts b/packages/core/src/render3/interfaces/query.ts
index 57822a0815..93fe026799 100644
--- a/packages/core/src/render3/interfaces/query.ts
+++ b/packages/core/src/render3/interfaces/query.ts
@@ -13,7 +13,7 @@ import {LNode} from './node';
 /** Used for tracking queries (e.g. ViewChild, ContentChild). */
 export interface LQueries {
   /**
-   * Used to ask queries if those should be cloned to the child element.
+   * Used to ask querieis if those should be cloned to the child element.
    *
    * For example in the case of deep queries the `child()` returns
    * queries for the child node. In case of shallow queries it returns
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 204c1e0960..cbedb714e8 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -15,28 +15,68 @@ import {LElementNode, LViewNode, TNode} from './node';
 import {LQueries} from './query';
 import {Renderer3} from './renderer';
 
+/** Size of LViewData's header. Necessary to adjust for it when setting slots.  */
+export const HEADER_OFFSET = 14;
 
+// Below are constants for LViewData indices to help us look up LViewData members
+// without having to remember the specific indices.
+// Uglify will inline these when minifying so there shouldn't be a cost.
+export const TVIEW = 0;
+export const PARENT = 1;
+export const NEXT = 2;
+export const QUERIES = 3;
+export const FLAGS = 4;
+export const HOST_NODE = 5;
+export const BINDING_INDEX = 6;
+export const DIRECTIVES = 7;
+export const CLEANUP = 8;
+export const CONTEXT = 9;
+export const INJECTOR = 10;
+export const RENDERER = 11;
+export const SANITIZER = 12;
+export const TAIL = 13;
 
 /**
- * `LView` stores all of the information needed to process the instructions as
+ * `LViewData` stores all of the information needed to process the instructions as
  * they are invoked from the template. Each embedded view and component view has its
- * own `LView`. When processing a particular view, we set the `currentView` to that
- * `LView`. When that view is done processing, the `currentView` is set back to
- * whatever the original `currentView` was before (the parent `LView`).
+ * own `LViewData`. When processing a particular view, we set the `viewData` to that
+ * `LViewData`. When that view is done processing, the `viewData` is set back to
+ * whatever the original `viewData` was before (the parent `LViewData`).
  *
  * Keeping separate state for each view facilities view insertion / deletion, so we
  * don't have to edit the data array based on which views are present.
  */
-export interface LView {
-  /** Flags for this view (see LViewFlags for definition of each bit). */
-  flags: LViewFlags;
+export interface LViewData extends Array<any> {
+  /**
+   * The static data for this view. We need a reference to this so we can easily walk up the
+   * node tree in DI and get the TView.data array associated with a node (where the
+   * directive defs are stored).
+   */
+  [TVIEW]: TView;
 
   /**
    * The parent view is needed when we exit the view and must restore the previous
-   * `LView`. Without this, the render method would have to keep a stack of
+   * `LViewData`. Without this, the render method would have to keep a stack of
    * views as it is recursively rendering templates.
    */
-  readonly parent: LView|null;
+  [PARENT]: LViewData|null;
+
+  /**
+   *
+   * The next sibling LViewData or LContainer.
+   *
+   * Allows us to propagate between sibling view states that aren't in the same
+   * container. Embedded views already have a node.next, but it is only set for
+   * views in the same container. We need a way to link component views and views
+   * across containers as well.
+   */
+  [NEXT]: LViewData|LContainer|null;
+
+  /** Queries active for this view - nodes from a view are reported to those queries. */
+  [QUERIES]: LQueries|null;
+
+  /** Flags for this view. See LViewFlags for more info. */
+  [FLAGS]: LViewFlags;
 
   /**
    * Pointer to the `LViewNode` or `LElementNode` which represents the root of the view.
@@ -46,11 +86,8 @@ export interface LView {
    *
    * If `LElementNode`, this is the LView of a component.
    */
-  // TODO(kara): Remove when we have parent/child on TNodes
-  readonly node: LViewNode|LElementNode;
-
-  /** Renderer to be used for this view. */
-  readonly renderer: Renderer3;
+  // TODO(kara): Replace with index
+  [HOST_NODE]: LViewNode|LElementNode;
 
   /**
    * The binding index we should access next.
@@ -59,7 +96,16 @@ export interface LView {
    * if a view is left midway through processing bindings (e.g. if there is
    * a setter that creates an embedded view, like in ngIf).
    */
-  bindingIndex: number;
+  [BINDING_INDEX]: number;
+
+  /**
+   * An array of directive instances in the current view.
+   *
+   * These must be stored separately from LNodes because their presence is
+   * unknown at compile-time and thus space cannot be reserved in data[].
+   */
+  // TODO: flatten into LViewData[]
+  [DIRECTIVES]: any[]|null;
 
   /**
    * When a view is destroyed, listeners need to be released and outputs need to be
@@ -69,79 +115,36 @@ export interface LView {
    * These change per LView instance, so they cannot be stored on TView. Instead,
    * TView.cleanup saves an index to the necessary context in this array.
    */
-  // TODO: collapse into data[]
-  cleanupInstances: any[]|null;
-
-  /**
-   * The last LView or LContainer beneath this LView in the hierarchy.
-   *
-   * The tail allows us to quickly add a new state to the end of the view list
-   * without having to propagate starting from the first child.
-   */
-  tail: LView|LContainer|null;
-
-  /**
-   * The next sibling LView or LContainer.
-   *
-   * Allows us to propagate between sibling view states that aren't in the same
-   * container. Embedded views already have a node.next, but it is only set for
-   * views in the same container. We need a way to link component views and views
-   * across containers as well.
-   */
-  next: LView|LContainer|null;
-
-  /**
-   * This array stores all element/text/container nodes created inside this view
-   * and their bindings. Stored as an array rather than a linked list so we can
-   * look up nodes directly in the case of forward declaration or bindings
-   * (e.g. E(1)).
-   *
-   * All bindings for a given view are stored in the order in which they
-   * appear in the template, starting with `bindingStartIndex`.
-   * We use `bindingIndex` to internally keep track of which binding
-   * is currently active.
-   */
-  readonly data: any[];
-
-  /**
-   * An array of directive instances in the current view.
-   *
-   * These must be stored separately from LNodes because their presence is
-   * unknown at compile-time and thus space cannot be reserved in data[].
-   */
-  directives: any[]|null;
-
-  /**
-   * The static data for this view. We need a reference to this so we can easily walk up the
-   * node tree in DI and get the TView.data array associated with a node (where the
-   * directive defs are stored).
-   */
-  tView: TView;
+  // TODO: flatten into LViewData[]
+  [CLEANUP]: any[]|null;
 
   /**
    * - For embedded views, the context with which to render the template.
    * - For root view of the root component the context contains change detection data.
    * - `null` otherwise.
-   */
-  context: {}|RootContext|null;
+  */
+  [CONTEXT]: {}|RootContext|null;
+
+  /** An optional Module Injector to be used as fall back after Element Injectors are consulted. */
+  [INJECTOR]: Injector|null;
+
+  /** Renderer to be used for this view. */
+  [RENDERER]: Renderer3;
+
+  /** An optional custom sanitizer. */
+  [SANITIZER]: Sanitizer|null;
 
   /**
-   * Queries active for this view - nodes from a view are reported to those queries
+   * The last LViewData or LContainer beneath this LViewData in the hierarchy.
+   *
+   * The tail allows us to quickly add a new state to the end of the view list
+   * without having to propagate starting from the first child.
    */
-  queries: LQueries|null;
-
-  /**
-   * An optional Module Injector to be used as fall back after Element Injectors are consulted.
-   */
-  injector: Injector|null;
-
-  /**
-   * An optional custom sanitizer
-   */
-  sanitizer: Sanitizer|null;
+  // TODO: replace with global
+  [TAIL]: LViewData|LContainer|null;
 }
 
-/** Flags associated with an LView (saved in LView.flags) */
+/** Flags associated with an LView (saved in LViewData[FLAGS]) */
 export const enum LViewFlags {
   /**
    * Whether or not the view is in creationMode.
@@ -175,14 +178,6 @@ export const enum LViewFlags {
   Destroyed = 0b100000,
 }
 
-/** Interface necessary to work with view tree traversal */
-export interface LViewOrLContainer {
-  next: LView|LContainer|null;
-  views?: LViewNode[];
-  tView?: TView;
-  parent: LView|null;
-}
-
 /**
  * The static data for an LView (shared between all templates of a
  * given type).
@@ -388,7 +383,7 @@ export interface TView {
    * refreshed when the current view has finished its check.
    *
    * Even indices: Directive indices
-   * Odd indices: Element indices
+   * Odd indices: Element indices (adjusted for LViewData header offset)
    */
   components: number[]|null;
 
@@ -397,6 +392,9 @@ export interface TView {
    *
    * Even indices: Directive indices
    * Odd indices: Element indices
+   *
+   * Element indices are NOT adjusted for LViewData header offset because
+   * they will be fed into instructions that expect the raw index (e.g. elementProperty)
    */
   hostBindings: number[]|null;
 }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 716565fc71..c695f43457 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -6,13 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined} from './assert';
 import {callHooks} from './hooks';
-import {LContainer, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
+import {LContainer, RENDER_PARENT, VIEWS, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
+import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
-import {HookData, LView, LViewFlags, LViewOrLContainer, TView, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
+import {CLEANUP, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
 import {assertNodeType} from './node_assert';
 import {stringify} from './util';
 
@@ -69,17 +68,17 @@ function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElem
 export function getNextLNode(node: LNode): LNode|null {
   // View nodes don't have TNodes, so their next must be retrieved through their LView.
   if (node.tNode.type === TNodeType.View) {
-    const lView = node.data as LView;
-    return lView.next ? (lView.next as LView).node : null;
+    const viewData = node.data as LViewData;
+    return viewData[NEXT] ? (viewData[NEXT] as LViewData)[HOST_NODE] : null;
   }
-  return node.tNode.next ? node.view.data[node.tNode.next !.index] : null;
+  return node.tNode.next ? node.view[node.tNode.next !.index] : null;
 }
 
 /** Retrieves the first child of a given node */
 export function getChildLNode(node: LNode): LNode|null {
   if (node.tNode.child) {
-    const view = node.tNode.type === TNodeType.View ? node.data as LView : node.view;
-    return view.data[node.tNode.child.index];
+    const viewData = node.tNode.type === TNodeType.View ? node.data as LViewData : node.view;
+    return viewData[node.tNode.child.index];
   }
   return null;
 }
@@ -92,7 +91,7 @@ export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNo
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null {
   if (node.tNode.index === -1) return null;
   const parent = node.tNode.parent;
-  return parent ? node.view.data[parent.index] : node.view.node;
+  return parent ? node.view[parent.index] : node.view[HOST_NODE];
 }
 
 /**
@@ -213,10 +212,10 @@ function walkLNodeTree(
           lContainerNode.dynamicLContainerNode.data :
           lContainerNode.data;
       if (renderParentNode) {
-        childContainerData.renderParent = renderParentNode;
+        childContainerData[RENDER_PARENT] = renderParentNode;
       }
       nextNode =
-          childContainerData.views.length ? getChildLNode(childContainerData.views[0]) : null;
+          childContainerData[VIEWS].length ? getChildLNode(childContainerData[VIEWS][0]) : null;
     } else if (node.tNode.type === TNodeType.Projection) {
       // For Projection look at the first projected node
       nextNode = (node as LProjectionNode).data.head;
@@ -256,11 +255,11 @@ export function addRemoveViewFromContainer(
     beforeNode?: RNode | null): void {
   ngDevMode && assertNodeType(container, TNodeType.Container);
   ngDevMode && assertNodeType(rootNode, TNodeType.View);
-  const parentNode = container.data.renderParent;
+  const parentNode = container.data[RENDER_PARENT];
   const parent = parentNode ? parentNode.native : null;
   if (parent) {
     let node: LNode|null = getChildLNode(rootNode);
-    const renderer = container.view.renderer;
+    const renderer = container.view[RENDERER];
     walkLNodeTree(
         node, rootNode, insertMode ? WalkLNodeTreeAction.Insert : WalkLNodeTreeAction.Detach,
         renderer, parentNode, beforeNode);
@@ -280,38 +279,35 @@ export function addRemoveViewFromContainer(
  *
  *  @param rootView The view to destroy
  */
-export function destroyViewTree(rootView: LView): void {
+export function destroyViewTree(rootView: LViewData): void {
   // If the view has no children, we can clean it up and return early.
-  if (rootView.tView.childIndex === -1) {
+  if (rootView[TVIEW].childIndex === -1) {
     return cleanUpView(rootView);
   }
-  let viewOrContainer: LViewOrLContainer|null = getLViewChild(rootView);
+  let viewOrContainer: LViewData|LContainer|null = getLViewChild(rootView);
 
   while (viewOrContainer) {
-    let next: LViewOrLContainer|null = null;
+    let next: LViewData|LContainer|null = null;
 
-    if (viewOrContainer.views && viewOrContainer.views.length) {
-      next = viewOrContainer.views[0].data;
-    } else if (viewOrContainer.tView && viewOrContainer.tView.childIndex > -1) {
-      next = getLViewChild(viewOrContainer as LView);
-    } else if (viewOrContainer.next) {
-      // Only move to the side and clean if operating below rootView -
-      // otherwise we would start cleaning up sibling views of the rootView.
-      cleanUpView(viewOrContainer);
-      next = viewOrContainer.next;
+    if (viewOrContainer.length >= HEADER_OFFSET) {
+      // If LViewData, traverse down to child.
+      const view = viewOrContainer as LViewData;
+      if (view[TVIEW].childIndex > -1) next = getLViewChild(view);
+    } else {
+      // If container, traverse down to its first LViewData.
+      const container = viewOrContainer as LContainer;
+      if (container[VIEWS].length) next = container[VIEWS][0].data;
     }
 
     if (next == null) {
-      // If the viewOrContainer is the rootView and next is null it means that we are dealing
-      // with a root view that doesn't have children. We didn't descend into child views
-      // so no need to go back up the views tree.
-      while (viewOrContainer && !viewOrContainer !.next && viewOrContainer !== rootView) {
+      // Only clean up view when moving to the side or up, as destroy hooks
+      // should be called in order from the bottom up.
+      while (viewOrContainer && !viewOrContainer ![NEXT] && viewOrContainer !== rootView) {
         cleanUpView(viewOrContainer);
         viewOrContainer = getParentState(viewOrContainer, rootView);
       }
       cleanUpView(viewOrContainer || rootView);
-
-      next = viewOrContainer && viewOrContainer.next;
+      next = viewOrContainer && viewOrContainer ![NEXT];
     }
     viewOrContainer = next;
   }
@@ -333,31 +329,31 @@ export function destroyViewTree(rootView: LView): void {
 export function insertView(
     container: LContainerNode, viewNode: LViewNode, index: number): LViewNode {
   const state = container.data;
-  const views = state.views;
+  const views = state[VIEWS];
 
   if (index > 0) {
     // This is a new view, we need to add it to the children.
-    views[index - 1].data.next = viewNode.data as LView;
+    views[index - 1].data[NEXT] = viewNode.data as LViewData;
   }
 
   if (index < views.length) {
-    viewNode.data.next = views[index].data;
+    viewNode.data[NEXT] = views[index].data;
     views.splice(index, 0, viewNode);
   } else {
     views.push(viewNode);
-    viewNode.data.next = null;
+    viewNode.data[NEXT] = null;
   }
 
   // Notify query that a new view has been added
   const lView = viewNode.data;
-  if (lView.queries) {
-    lView.queries.insertView(index);
+  if (lView[QUERIES]) {
+    lView[QUERIES] !.insertView(index);
   }
 
   // If the container's renderParent is null, we know that it is a root node of its own parent view
   // and we should wait until that parent processes its nodes (otherwise, we will insert this view's
   // nodes twice - once now and once when its parent inserts its views).
-  if (container.data.renderParent !== null) {
+  if (container.data[RENDER_PARENT] !== null) {
     let beforeNode = findNextRNodeSibling(viewNode, container);
 
     if (!beforeNode) {
@@ -371,7 +367,7 @@ export function insertView(
   }
 
   // Sets the attached flag
-  viewNode.data.flags |= LViewFlags.Attached;
+  viewNode.data[FLAGS] |= LViewFlags.Attached;
 
   return viewNode;
 }
@@ -387,20 +383,20 @@ export function insertView(
  * @returns The detached view
  */
 export function detachView(container: LContainerNode, removeIndex: number): LViewNode {
-  const views = container.data.views;
+  const views = container.data[VIEWS];
   const viewNode = views[removeIndex];
   if (removeIndex > 0) {
-    views[removeIndex - 1].data.next = viewNode.data.next as LView;
+    views[removeIndex - 1].data[NEXT] = viewNode.data[NEXT] as LViewData;
   }
   views.splice(removeIndex, 1);
   addRemoveViewFromContainer(container, viewNode, false);
   // Notify query that view has been removed
   const removedLview = viewNode.data;
-  if (removedLview.queries) {
-    removedLview.queries.removeView(removeIndex);
+  if (removedLview[QUERIES]) {
+    removedLview[QUERIES] !.removeView(removeIndex);
   }
   // Unsets the attached flag
-  viewNode.data.flags &= ~LViewFlags.Attached;
+  viewNode.data[FLAGS] &= ~LViewFlags.Attached;
   return viewNode;
 }
 
@@ -412,17 +408,17 @@ export function detachView(container: LContainerNode, removeIndex: number): LVie
  * @returns The removed view
  */
 export function removeView(container: LContainerNode, removeIndex: number): LViewNode {
-  const viewNode = container.data.views[removeIndex];
+  const viewNode = container.data[VIEWS][removeIndex];
   detachView(container, removeIndex);
   destroyLView(viewNode.data);
   return viewNode;
 }
 
-/** Gets the child of the given LView */
-export function getLViewChild(view: LView): LView|LContainer|null {
-  if (view.tView.childIndex === -1) return null;
+/** Gets the child of the given LViewData */
+export function getLViewChild(viewData: LViewData): LViewData|LContainer|null {
+  if (viewData[TVIEW].childIndex === -1) return null;
 
-  const hostNode: LElementNode|LContainerNode = view.data[view.tView.childIndex];
+  const hostNode: LElementNode|LContainerNode = viewData[viewData[TVIEW].childIndex];
 
   return hostNode.data ? hostNode.data : (hostNode.dynamicLContainerNode as LContainerNode).data;
 }
@@ -433,14 +429,14 @@ export function getLViewChild(view: LView): LView|LContainer|null {
  *
  * @param view The view to be destroyed.
  */
-export function destroyLView(view: LView) {
-  const renderer = view.renderer;
+export function destroyLView(view: LViewData) {
+  const renderer = view[RENDERER];
   if (isProceduralRenderer(renderer) && renderer.destroyNode) {
-    walkLNodeTree(view.node, view.node, WalkLNodeTreeAction.Destroy, renderer);
+    walkLNodeTree(view[HOST_NODE], view[HOST_NODE], WalkLNodeTreeAction.Destroy, renderer);
   }
   destroyViewTree(view);
   // Sets the destroyed flag
-  view.flags |= LViewFlags.Destroyed;
+  view[FLAGS] |= LViewFlags.Destroyed;
 }
 
 /**
@@ -455,76 +451,77 @@ export function destroyLView(view: LView) {
  * @param rootView The rootView, so we don't propagate too far up the view tree
  * @returns The correct parent LViewOrLContainer
  */
-export function getParentState(state: LViewOrLContainer, rootView: LView): LViewOrLContainer|null {
+export function getParentState(state: LViewData | LContainer, rootView: LViewData): LViewData|
+    LContainer|null {
   let node;
-  if ((node = (state as LView) !.node) && node.tNode.type === TNodeType.View) {
+  if ((node = (state as LViewData) ![HOST_NODE]) && node.tNode.type === TNodeType.View) {
     // if it's an embedded view, the state needs to go up to the container, in case the
     // container has a next
     return getParentLNode(node) !.data as any;
   } else {
     // otherwise, use parent view for containers or component views
-    return state.parent === rootView ? null : state.parent;
+    return state[PARENT] === rootView ? null : state[PARENT];
   }
 }
 
 /**
  * Removes all listeners and call all onDestroys in a given view.
  *
- * @param view The LView to clean up
+ * @param view The LViewData to clean up
  */
-function cleanUpView(viewOrContainer: LViewOrLContainer): void {
-  if ((viewOrContainer as LView).tView) {
-    const view = viewOrContainer as LView;
+function cleanUpView(viewOrContainer: LViewData | LContainer): void {
+  if ((viewOrContainer as LViewData)[TVIEW]) {
+    const view = viewOrContainer as LViewData;
     removeListeners(view);
     executeOnDestroys(view);
     executePipeOnDestroys(view);
     // For component views only, the local renderer is destroyed as clean up time.
-    if (view.tView.id === -1 && isProceduralRenderer(view.renderer)) {
+    if (view[TVIEW].id === -1 && isProceduralRenderer(view[RENDERER])) {
       ngDevMode && ngDevMode.rendererDestroy++;
-      view.renderer.destroy();
+      (view[RENDERER] as ProceduralRenderer3).destroy();
     }
   }
 }
 
 /** Removes listeners and unsubscribes from output subscriptions */
-function removeListeners(view: LView): void {
-  const cleanup = view.tView.cleanup !;
+function removeListeners(viewData: LViewData): void {
+  const cleanup = viewData[TVIEW].cleanup !;
   if (cleanup != null) {
     for (let i = 0; i < cleanup.length - 1; i += 2) {
       if (typeof cleanup[i] === 'string') {
         // This is a listener with the native renderer
-        const native = view.data[cleanup[i + 1]].native;
-        const listener = view.cleanupInstances ![cleanup[i + 2]];
+        const native = viewData[cleanup[i + 1]].native;
+        const listener = viewData[CLEANUP] ![cleanup[i + 2]];
         native.removeEventListener(cleanup[i], listener, cleanup[i + 3]);
         i += 2;
       } else if (typeof cleanup[i] === 'number') {
         // This is a listener with renderer2 (cleanup fn can be found by index)
-        const cleanupFn = view.cleanupInstances ![cleanup[i]];
+        const cleanupFn = viewData[CLEANUP] ![cleanup[i]];
         cleanupFn();
       } else {
         // This is a cleanup function that is grouped with the index of its context
-        const context = view.cleanupInstances ![cleanup[i + 1]];
+        const context = viewData[CLEANUP] ![cleanup[i + 1]];
         cleanup[i].call(context);
       }
     }
-    view.cleanupInstances = null;
+    viewData[CLEANUP] = null;
   }
 }
 
 /** Calls onDestroy hooks for this view */
-function executeOnDestroys(view: LView): void {
-  const tView = view.tView;
+function executeOnDestroys(view: LViewData): void {
+  const tView = view[TVIEW];
   let destroyHooks: HookData|null;
   if (tView != null && (destroyHooks = tView.destroyHooks) != null) {
-    callHooks(view.directives !, destroyHooks);
+    callHooks(view[DIRECTIVES] !, destroyHooks);
   }
 }
 
 /** Calls pipe destroy hooks for this view */
-function executePipeOnDestroys(view: LView): void {
-  const pipeDestroyHooks = view.tView && view.tView.pipeDestroyHooks;
+function executePipeOnDestroys(viewData: LViewData): void {
+  const pipeDestroyHooks = viewData[TVIEW] && viewData[TVIEW].pipeDestroyHooks;
   if (pipeDestroyHooks) {
-    callHooks(view.data !, pipeDestroyHooks);
+    callHooks(viewData !, pipeDestroyHooks);
   }
 }
 
@@ -545,7 +542,7 @@ function executePipeOnDestroys(view: LView): void {
  * @param currentView The LView being processed
  * @return boolean Whether the child element should be inserted.
  */
-export function canInsertNativeNode(parent: LNode, currentView: LView): boolean {
+export function canInsertNativeNode(parent: LNode, currentView: LViewData): boolean {
   const parentIsElement = parent.tNode.type === TNodeType.Element;
 
   return parentIsElement &&
@@ -562,10 +559,10 @@ export function canInsertNativeNode(parent: LNode, currentView: LView): boolean
  * @param currentView The current LView
  * @returns Whether or not the child was appended
  */
-export function appendChild(parent: LNode, child: RNode | null, currentView: LView): boolean {
+export function appendChild(parent: LNode, child: RNode | null, currentView: LViewData): boolean {
   if (child !== null && canInsertNativeNode(parent, currentView)) {
     // We only add element if not in View or not projected.
-    const renderer = currentView.renderer;
+    const renderer = currentView[RENDERER];
     isProceduralRenderer(renderer) ? renderer.appendChild(parent.native !as RElement, child) :
                                      parent.native !.appendChild(child);
     return true;
@@ -583,7 +580,7 @@ export function appendChild(parent: LNode, child: RNode | null, currentView: LVi
  */
 export function appendProjectedNode(
     node: LElementNode | LTextNode | LContainerNode, currentParent: LElementNode,
-    currentView: LView): void {
+    currentView: LViewData): void {
   if (node.tNode.type !== TNodeType.Container) {
     appendChild(currentParent, (node as LElementNode | LTextNode).native, currentView);
   } else {
@@ -593,13 +590,13 @@ export function appendProjectedNode(
     // and can't be re-projected (as not content of any component).
     // Assignee the final projection location in those cases.
     const lContainer = (node as LContainerNode).data;
-    lContainer.renderParent = currentParent;
-    const views = lContainer.views;
+    lContainer[RENDER_PARENT] = currentParent;
+    const views = lContainer[VIEWS];
     for (let i = 0; i < views.length; i++) {
       addRemoveViewFromContainer(node as LContainerNode, views[i], true, null);
     }
   }
   if (node.dynamicLContainerNode) {
-    node.dynamicLContainerNode.data.renderParent = currentParent;
+    node.dynamicLContainerNode.data[RENDER_PARENT] = currentParent;
   }
 }
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index 7f736721f7..2bd2ef7cfe 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -10,6 +10,7 @@ import {PipeTransform} from '../change_detection/pipe_transform';
 
 import {getTView, load, store} from './instructions';
 import {PipeDef, PipeDefList} from './interfaces/definition';
+import {HEADER_OFFSET} from './interfaces/view';
 import {pureFunction1, pureFunction2, pureFunction3, pureFunction4, pureFunctionV} from './pure_function';
 
 /**
@@ -22,15 +23,17 @@ import {pureFunction1, pureFunction2, pureFunction3, pureFunction4, pureFunction
 export function pipe(index: number, pipeName: string): any {
   const tView = getTView();
   let pipeDef: PipeDef<any>;
+  const adjustedIndex = index + HEADER_OFFSET;
 
   if (tView.firstTemplatePass) {
     pipeDef = getPipeDef(pipeName, tView.pipeRegistry);
-    tView.data[index] = pipeDef;
+    tView.data[adjustedIndex] = pipeDef;
     if (pipeDef.onDestroy) {
-      (tView.pipeDestroyHooks || (tView.pipeDestroyHooks = [])).push(index, pipeDef.onDestroy);
+      (tView.pipeDestroyHooks || (tView.pipeDestroyHooks = [
+       ])).push(adjustedIndex, pipeDef.onDestroy);
     }
   } else {
-    pipeDef = tView.data[index] as PipeDef<any>;
+    pipeDef = tView.data[adjustedIndex] as PipeDef<any>;
   }
 
   const pipeInstance = pipeDef.factory();
@@ -148,5 +151,5 @@ export function pipeBindV(index: number, slotOffset: number, values: any[]): any
 }
 
 function isPure(index: number): boolean {
-  return (<PipeDef<any>>getTView().data[index]).pure;
+  return (<PipeDef<any>>getTView().data[index + HEADER_OFFSET]).pure;
 }
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index c04f3f48c8..f2cdec8a15 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -22,6 +22,7 @@ import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfac
 import {LInjector, unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {LContainerNode, LElementNode, LNode, TNode, TNodeFlags, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
 import {LQueries, QueryReadType, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
+import {DIRECTIVES, TVIEW} from './interfaces/view';
 import {flatten} from './util';
 
 const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4;
@@ -222,7 +223,7 @@ function getIdxOfMatchingSelector(tNode: TNode, selector: string): number|null {
  * @returns Index of a found directive or null when none found.
  */
 function getIdxOfMatchingDirective(node: LNode, type: Type<any>): number|null {
-  const defs = node.view.tView.directives !;
+  const defs = node.view[TVIEW].directives !;
   const flags = node.tNode.flags;
   const count = flags & TNodeFlags.DirectiveCountMask;
   const start = flags >> TNodeFlags.DirectiveStartingIndexShift;
@@ -244,7 +245,7 @@ function readFromNodeInjector(
   } else {
     const matchingIdx = getIdxOfMatchingDirective(node, read as Type<any>);
     if (matchingIdx !== null) {
-      return node.view.directives ![matchingIdx];
+      return node.view[DIRECTIVES] ![matchingIdx];
     }
   }
   return null;
@@ -416,7 +417,7 @@ export function query<T>(
   const queryList = new QueryList<T>();
   const queries = getCurrentQueries(LQueries_);
   queries.track(queryList, predicate, descend, read);
-  storeCleanupWithContext(undefined, queryList, queryList.destroy);
+  storeCleanupWithContext(null, queryList, queryList.destroy);
   if (memoryIndex != null) {
     store(memoryIndex, queryList);
   }
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 17a7beb5a8..432ab7b4ff 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -11,10 +11,10 @@ import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detec
 import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
 
-import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn} from './instructions';
+import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn, viewAttached} from './instructions';
 import {ComponentTemplate} from './interfaces/definition';
 import {LViewNode} from './interfaces/node';
-import {LView, LViewFlags} from './interfaces/view';
+import {FLAGS, LViewData, LViewFlags} from './interfaces/view';
 import {destroyLView} from './node_manipulation';
 
 // Needed due to tsickle downleveling where multiple `implements` with classes creates
@@ -29,16 +29,16 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
   context: T;
   rootNodes: any[];
 
-  constructor(protected _view: LView, context: T|null) { this.context = context !; }
+  constructor(protected _view: LViewData, context: T|null) { this.context = context !; }
 
   /** @internal */
-  _setComponentContext(view: LView, context: T) {
+  _setComponentContext(view: LViewData, context: T) {
     this._view = view;
     this.context = context;
   }
 
   get destroyed(): boolean {
-    return (this._view.flags & LViewFlags.Destroyed) === LViewFlags.Destroyed;
+    return (this._view[FLAGS] & LViewFlags.Destroyed) === LViewFlags.Destroyed;
   }
 
   destroy(): void { destroyLView(this._view); }
@@ -132,7 +132,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    * }
    * ```
    */
-  detach(): void { this._view.flags &= ~LViewFlags.Attached; }
+  detach(): void { this._view[FLAGS] &= ~LViewFlags.Attached; }
 
   /**
    * Re-attaches a view to the change detection tree.
@@ -189,7 +189,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    * }
    * ```
    */
-  reattach(): void { this._view.flags |= LViewFlags.Attached; }
+  reattach(): void { this._view[FLAGS] |= LViewFlags.Attached; }
 
   /**
    * Checks the view and its children.
@@ -240,8 +240,7 @@ export class EmbeddedViewRef<T> extends ViewRef<T> {
   }
 
   destroy(): void {
-    if (this._viewContainerRef &&
-        (this._view.flags & LViewFlags.Attached) === LViewFlags.Attached) {
+    if (this._viewContainerRef && viewAttached(this._view)) {
       this._viewContainerRef.detach(this._viewContainerRef.indexOf(this));
       this._viewContainerRef = null;
     }
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index c1c0de6f38..6fc22af83c 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -1,31 +1,82 @@
 [
+  {
+    "name": "ACTIVE_INDEX"
+  },
+  {
+    "name": "BINDING_INDEX"
+  },
   {
     "name": "CLEAN_PROMISE"
   },
+  {
+    "name": "CONTEXT"
+  },
+  {
+    "name": "DIRECTIVES"
+  },
   {
     "name": "EMPTY$2"
   },
   {
     "name": "EMPTY_RENDERER_TYPE_ID"
   },
+  {
+    "name": "FLAGS"
+  },
+  {
+    "name": "HEADER_FILLER"
+  },
+  {
+    "name": "HEADER_OFFSET"
+  },
+  {
+    "name": "HOST_NODE"
+  },
   {
     "name": "HelloWorld"
   },
+  {
+    "name": "INJECTOR$1"
+  },
   {
     "name": "INeedToExistEvenThoughIAmNotNeeded"
   },
+  {
+    "name": "NEXT"
+  },
   {
     "name": "NG_HOST_SYMBOL"
   },
   {
     "name": "NG_PROJECT_AS_ATTR_NAME"
   },
+  {
+    "name": "QUERIES"
+  },
+  {
+    "name": "RENDERER"
+  },
   {
     "name": "ROOT_DIRECTIVE_INDICES"
   },
+  {
+    "name": "SANITIZER"
+  },
+  {
+    "name": "TVIEW"
+  },
   {
     "name": "UNDEFINED_RENDERER_TYPE_ID"
   },
+  {
+    "name": "VIEWS"
+  },
+  {
+    "name": "_CLEAN_PROMISE"
+  },
+  {
+    "name": "_ROOT_DIRECTIVE_INDICES"
+  },
   {
     "name": "_renderCompCount"
   },
@@ -54,7 +105,7 @@
     "name": "createLNodeObject"
   },
   {
-    "name": "createLView"
+    "name": "createLViewData"
   },
   {
     "name": "createRootContext"
@@ -68,9 +119,6 @@
   {
     "name": "createTextNode"
   },
-  {
-    "name": "currentView"
-  },
   {
     "name": "defineComponent"
   },
@@ -131,9 +179,6 @@
   {
     "name": "invertObject"
   },
-  {
-    "name": "isLContainer"
-  },
   {
     "name": "isProceduralRenderer"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index e1929f512a..08d05da9a9 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1,16 +1,31 @@
 [
+  {
+    "name": "ACTIVE_INDEX"
+  },
+  {
+    "name": "BINDING_INDEX"
+  },
   {
     "name": "BLOOM_SIZE"
   },
   {
     "name": "CIRCULAR$2"
   },
+  {
+    "name": "CLEANUP"
+  },
   {
     "name": "CLEAN_PROMISE"
   },
+  {
+    "name": "CONTEXT"
+  },
   {
     "name": "CommonModule"
   },
+  {
+    "name": "DIRECTIVES"
+  },
   {
     "name": "DefaultIterableDiffer"
   },
@@ -29,12 +44,30 @@
   {
     "name": "EmbeddedViewRef$1"
   },
+  {
+    "name": "FLAGS"
+  },
+  {
+    "name": "HEADER_FILLER"
+  },
+  {
+    "name": "HEADER_OFFSET"
+  },
+  {
+    "name": "HOST_NODE"
+  },
+  {
+    "name": "INJECTOR$1"
+  },
   {
     "name": "IterableChangeRecord_"
   },
   {
     "name": "IterableDiffers"
   },
+  {
+    "name": "NEXT"
+  },
   {
     "name": "NG_ELEMENT_ID"
   },
@@ -65,15 +98,36 @@
   {
     "name": "PARAMETERS"
   },
+  {
+    "name": "PARENT"
+  },
+  {
+    "name": "QUERIES"
+  },
+  {
+    "name": "RENDERER"
+  },
+  {
+    "name": "RENDER_PARENT"
+  },
   {
     "name": "ROOT_DIRECTIVE_INDICES"
   },
   {
     "name": "RecordViewTuple"
   },
+  {
+    "name": "SANITIZER"
+  },
   {
     "name": "SkipSelf"
   },
+  {
+    "name": "TAIL"
+  },
+  {
+    "name": "TVIEW"
+  },
   {
     "name": "TemplateRef$1"
   },
@@ -92,6 +146,9 @@
   {
     "name": "UNDEFINED_RENDERER_TYPE_ID"
   },
+  {
+    "name": "VIEWS"
+  },
   {
     "name": "ViewContainerRef$1"
   },
@@ -264,7 +321,7 @@
     "name": "createLNodeObject"
   },
   {
-    "name": "createLView"
+    "name": "createLViewData"
   },
   {
     "name": "createOutput"
@@ -281,9 +338,6 @@
   {
     "name": "createTextNode"
   },
-  {
-    "name": "currentView"
-  },
   {
     "name": "defineComponent"
   },
@@ -500,9 +554,6 @@
   {
     "name": "isJsObject"
   },
-  {
-    "name": "isLContainer"
-  },
   {
     "name": "isListLikeIterable"
   },
@@ -530,6 +581,9 @@
   {
     "name": "load"
   },
+  {
+    "name": "loadInternal"
+  },
   {
     "name": "locateHostElement"
   },
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index ea3d413d31..66e0f67d09 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -12,7 +12,7 @@ import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
 import {defineComponent} from '../../src/render3/definition';
 import {bloomAdd, bloomFindPossibleInjector, getOrCreateNodeInjector, injectAttribute} from '../../src/render3/di';
 import {NgOnChangesFeature, PublicFeature, defineDirective, directiveInject, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, createLNode, createLView, createTView, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, load, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, createLNode, createLViewData, createTView, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, load, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {LInjector} from '../../src/render3/interfaces/injector';
 import {AttributeMarker, TNodeType} from '../../src/render3/interfaces/node';
 import {LViewFlags} from '../../src/render3/interfaces/view';
@@ -1404,7 +1404,7 @@ describe('di', () => {
   describe('getOrCreateNodeInjector', () => {
     it('should handle initial undefined state', () => {
       const contentView =
-          createLView(null !, createTView(-1, null, null, null), null, LViewFlags.CheckAlways);
+          createLViewData(null !, createTView(-1, null, null, null), null, LViewFlags.CheckAlways);
       const oldView = enterView(contentView, null !);
       try {
         const parent = createLNode(0, TNodeType.Element, null, null, null, null);
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index fce716580d..37e0729b91 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -9,8 +9,8 @@
 import {RenderFlags} from '@angular/core/src/render3';
 
 import {defineComponent, defineDirective} from '../../src/render3/index';
-import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, elementStyleNamed, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
-import {LViewFlags} from '../../src/render3/interfaces/view';
+import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, elementStyleNamed, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding,} from '../../src/render3/instructions';
+import {HEADER_OFFSET} from '../../src/render3/interfaces/view';
 import {sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
@@ -849,8 +849,8 @@ describe('render3 integration test', () => {
       renderToHtml(Template, {condition: true});
 
       const oldTemplateData = (Template as any).ngPrivateData;
-      const oldContainerData = (oldTemplateData as any).data[0];
-      const oldElementData = oldContainerData.tViews[0][0];
+      const oldContainerData = (oldTemplateData as any).data[HEADER_OFFSET];
+      const oldElementData = oldContainerData.tViews[0][HEADER_OFFSET];
       expect(oldContainerData).not.toBeNull();
       expect(oldElementData).not.toBeNull();
 
@@ -858,8 +858,8 @@ describe('render3 integration test', () => {
       renderToHtml(Template, {condition: true});
 
       const newTemplateData = (Template as any).ngPrivateData;
-      const newContainerData = (oldTemplateData as any).data[0];
-      const newElementData = oldContainerData.tViews[0][0];
+      const newContainerData = (oldTemplateData as any).data[HEADER_OFFSET];
+      const newElementData = oldContainerData.tViews[0][HEADER_OFFSET];
       expect(newTemplateData === oldTemplateData).toBe(true);
       expect(newContainerData === oldContainerData).toBe(true);
       expect(newElementData === oldElementData).toBe(true);

From ea143e7498f1add7c303de1f2987bcbf02378004 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 8 Jun 2018 12:55:15 +0300
Subject: [PATCH 242/582] build(docs-infra): upgrade preview server to latest
 `@types/shelljs` (#24372)

PR Close #24372
---
 .../dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts    | 3 +--
 .../scripts-js/lib/upload-server/build-creator.ts           | 3 +--
 .../dockerbuild/scripts-js/lib/verify-setup/helper.ts       | 3 +--
 aio/aio-builds-setup/dockerbuild/scripts-js/package.json    | 2 +-
 aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock       | 6 +++---
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts
index 3a23b19096..a5fef4bb4b 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts
@@ -52,8 +52,7 @@ export class BuildCleaner {
   protected removeDir(dir: string) {
     try {
       if (shell.test('-d', dir)) {
-        // Undocumented signature (see https://github.com/shelljs/shelljs/pull/663).
-        (shell as any).chmod('-R', 'a+w', dir);
+        shell.chmod('-R', 'a+w', dir);
         shell.rm('-rf', dir);
       }
     } catch (err) {
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts
index cfb3ba616f..899b3ab7be 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts
@@ -106,8 +106,7 @@ export class BuildCreator extends EventEmitter {
         }
 
         try {
-          // Undocumented signature (see https://github.com/shelljs/shelljs/pull/663).
-          (shell as any).chmod('-R', 'a-w', outputDir);
+          shell.chmod('-R', 'a-w', outputDir);
           shell.rm('-f', inputFile);
           resolve();
         } catch (err) {
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts
index 7a61b22756..e5b2322494 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts
@@ -98,8 +98,7 @@ class Helper {
     const prDir = this.getPrDir(pr, isPublic);
 
     if (fs.existsSync(prDir)) {
-      // Undocumented signature (see https://github.com/shelljs/shelljs/pull/663).
-      (shell as any).chmod('-R', 'a+w', prDir);
+      shell.chmod('-R', 'a+w', prDir);
       shell.rm('-rf', prDir);
     }
   }
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
index 118efadfbb..3ca9ff2d57 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
@@ -33,7 +33,7 @@
     "@types/jasmine": "^2.6.0",
     "@types/jsonwebtoken": "^7.2.3",
     "@types/node": "^8.0.30",
-    "@types/shelljs": "^0.7.4",
+    "@types/shelljs": "^0.8.0",
     "@types/supertest": "^2.0.3",
     "concurrently": "^3.5.0",
     "nodemon": "^1.12.1",
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock b/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
index 68f3584307..73ef310751 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
@@ -69,9 +69,9 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/shelljs@^0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.4.tgz#137b5f31306eaff4de120ffe5b9d74b297809cfc"
+"@types/shelljs@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.0.tgz#0caa56b68baae4f68f44e0dd666ab30b098e3632"
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"

From 5e8bf2f88dcaba1f973534f5a75312329c137918 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 8 Jun 2018 12:56:01 +0300
Subject: [PATCH 243/582] build(docs-infra): ensure `dist/` directory is
 cleaned before running `tsc --watch` (#24372)

PR Close #24372
---
 aio/aio-builds-setup/dockerbuild/scripts-js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
index 3ca9ff2d57..05ba8a807c 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "prebuild": "yarn clean-dist",
     "build": "tsc",
-    "build-watch": "yarn tsc --watch",
+    "build-watch": "yarn build --watch",
     "clean-dist": "node --eval \"require('shelljs').rm('-rf', 'dist')\"",
     "dev": "concurrently --kill-others --raw --success first \"yarn build-watch\" \"yarn test-watch\"",
     "lint": "tslint --project tsconfig.json",

From 014949f74c0b736f62622157cece6d2e07db753e Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Mon, 11 Jun 2018 11:51:16 +0200
Subject: [PATCH 244/582] fix(ivy): correctly handle queries with embedded
 views (#24418)

This PR takes care of all the remaining cases where embedded view definition
and insertion points are different.

PR Close #24418
---
 packages/core/src/render3/interfaces/query.ts |  2 +-
 .../core/src/render3/node_manipulation.ts     |  2 +-
 packages/core/src/render3/query.ts            |  7 +-
 packages/core/test/render3/query_spec.ts      | 88 +++++++++++++++++--
 4 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/render3/interfaces/query.ts b/packages/core/src/render3/interfaces/query.ts
index 93fe026799..331b3be81f 100644
--- a/packages/core/src/render3/interfaces/query.ts
+++ b/packages/core/src/render3/interfaces/query.ts
@@ -49,7 +49,7 @@ export interface LQueries {
    * Notify `LQueries` that an `LView` has been removed from `LContainer`. As a result all
    * the matching nodes from this view should be removed from container's queries.
    */
-  removeView(removeIndex: number): void;
+  removeView(): void;
 
   /**
    * Add additional `QueryList` to track.
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index c695f43457..a04d6359ec 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -393,7 +393,7 @@ export function detachView(container: LContainerNode, removeIndex: number): LVie
   // Notify query that view has been removed
   const removedLview = viewNode.data;
   if (removedLview[QUERIES]) {
-    removedLview[QUERIES] !.removeView(removeIndex);
+    removedLview[QUERIES] !.removeView();
   }
   // Unsets the attached flag
   viewNode.data[FLAGS] &= ~LViewFlags.Attached;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index f2cdec8a15..241df49d51 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -176,13 +176,16 @@ export class LQueries_ implements LQueries {
     add(this.deep, node);
   }
 
-  removeView(index: number): void {
+  removeView(): void {
     let query = this.deep;
     while (query) {
       ngDevMode &&
           assertDefined(
               query.containerValues, 'View queries need to have a pointer to container values.');
-      const removed = query.containerValues !.splice(index, 1);
+
+      const containerValues = query.containerValues !;
+      const viewValuesIdx = containerValues.indexOf(query.values);
+      const removed = containerValues.splice(viewValuesIdx, 1);
 
       // mark a query as dirty only when removed view had matching modes
       ngDevMode && assertEqual(removed.length, 1, 'removed.length');
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 7382fabfa3..9c87c9edeb 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -693,15 +693,17 @@ describe('query', () => {
 
     describe('ViewContainerRef', () => {
 
-      let directiveInstance: ViewContainerManipulatorDirective|null = null;
+      let directiveInstances: ViewContainerManipulatorDirective[] = [];
 
       class ViewContainerManipulatorDirective {
         static ngDirectiveDef = defineDirective({
           type: ViewContainerManipulatorDirective,
           selectors: [['', 'vc', '']],
           factory: () => {
-            return directiveInstance =
-                       new ViewContainerManipulatorDirective(injectViewContainerRef());
+            const directiveInstance =
+                new ViewContainerManipulatorDirective(injectViewContainerRef());
+            directiveInstances.push(directiveInstance);
+            return directiveInstance;
           }
         });
 
@@ -714,7 +716,7 @@ describe('query', () => {
         remove(index?: number) { this._vcRef.remove(index); }
       }
 
-      beforeEach(() => { directiveInstance = null; });
+      beforeEach(() => { directiveInstances = []; });
 
       it('should report results in views inserted / removed by ngIf', () => {
 
@@ -873,8 +875,8 @@ describe('query', () => {
            expect(qList.length).toBe(1);
            expect(qList.first.nativeElement.getAttribute('id')).toBe('middle');
 
-           directiveInstance !.insertTpl(tpl1 !, {idx: 0}, 0);
-           directiveInstance !.insertTpl(tpl2 !, {idx: 1}, 1);
+           directiveInstances[0].insertTpl(tpl1 !, {idx: 0}, 0);
+           directiveInstances[0].insertTpl(tpl2 !, {idx: 1}, 1);
            fixture.update();
            expect(qList.length).toBe(3);
            let qListArr = qList.toArray();
@@ -882,7 +884,7 @@ describe('query', () => {
            expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
            expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
 
-           directiveInstance !.insertTpl(tpl1 !, {idx: 1}, 1);
+           directiveInstances[0].insertTpl(tpl1 !, {idx: 1}, 1);
            fixture.update();
            expect(qList.length).toBe(4);
            qListArr = qList.toArray();
@@ -891,13 +893,83 @@ describe('query', () => {
            expect(qListArr[2].nativeElement.getAttribute('id')).toBe('middle');
            expect(qListArr[3].nativeElement.getAttribute('id')).toBe('foo2_1');
 
-           directiveInstance !.remove(1);
+           directiveInstances[0].remove(1);
            fixture.update();
            expect(qList.length).toBe(3);
            qListArr = qList.toArray();
            expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
            expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
            expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
+
+           directiveInstances[0].remove(1);
+           fixture.update();
+           expect(qList.length).toBe(2);
+           qListArr = qList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
+         });
+
+      // https://stackblitz.com/edit/angular-7vvo9j?file=src%2Fapp%2Fapp.component.ts
+      it('should report results when the same TemplateRef is inserted into different ViewContainerRefs',
+         () => {
+           let tpl: TemplateRef<{}>;
+
+           /**
+            * <ng-template #tpl let-idx="idx" let-container_idx="container_idx">
+            *   <div #foo [id]="'foo_'+container_idx+'_'+idx"></div>
+            * </ng-template>
+            *
+            * <ng-template viewInserter #vi1="vi"></ng-template>
+            * <ng-template viewInserter #vi2="vi"></ng-template>
+            */
+           const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
+             let tmp: any;
+             if (rf & RenderFlags.Create) {
+               query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+
+               container(1, (rf: RenderFlags, ctx: {idx: number, container_idx: number}) => {
+                 if (rf & RenderFlags.Create) {
+                   elementStart(0, 'div', null, ['foo', '']);
+                   elementEnd();
+                 }
+                 if (rf & RenderFlags.Update) {
+                   elementProperty(0, 'id', bind('foo_' + ctx.container_idx + '_' + ctx.idx));
+                 }
+               }, null, []);
+
+               container(2, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
+               container(3, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
+             }
+
+             if (rf & RenderFlags.Update) {
+               tpl = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
+               queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+             }
+
+           }, [ViewContainerManipulatorDirective]);
+
+           const fixture = new ComponentFixture(Cmpt);
+           const qList = fixture.component.query;
+
+           expect(qList.length).toBe(0);
+
+           directiveInstances[0].insertTpl(tpl !, {idx: 0, container_idx: 0}, 0);
+           directiveInstances[1].insertTpl(tpl !, {idx: 0, container_idx: 1}, 0);
+           fixture.update();
+           expect(qList.length).toBe(2);
+           let qListArr = qList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo_1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('foo_0_0');
+
+           directiveInstances[0].remove();
+           fixture.update();
+           expect(qList.length).toBe(1);
+           qListArr = qList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo_1_0');
+
+           directiveInstances[1].remove();
+           fixture.update();
+           expect(qList.length).toBe(0);
          });
     });
 

From 8dd99ac550b454fd3230eca3912c090355bc4e3f Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 8 Jun 2018 10:48:27 -0700
Subject: [PATCH 245/582] refactor(ivy): add element instruction, reducing
 output size (#24379)

- Adds an element instruction
- Reduces size of compiled output slightly

PR Close #24379
---
 .../compiler/src/render3/r3_identifiers.ts    |  4 +-
 .../compiler/src/render3/view/template.ts     | 62 ++++++++++++-------
 .../render3/r3_compiler_compliance_spec.ts    | 45 +++++---------
 .../render3/r3_view_compiler_binding_spec.ts  |  6 +-
 .../render3/r3_view_compiler_i18n_spec.ts     |  3 +-
 .../render3/r3_view_compiler_styling_spec.ts  |  6 +-
 .../core/src/core_render3_private_export.ts   |  1 +
 packages/core/src/render3/index.ts            |  1 +
 packages/core/src/render3/instructions.ts     | 14 +++++
 packages/core/src/render3/jit/environment.ts  |  1 +
 .../component_directives_spec.ts              | 36 ++++-------
 .../content_projection_spec.ts                |  9 +--
 .../compiler_canonical/elements_spec.ts       | 21 +++----
 .../compiler_canonical/injection_spec.ts      |  6 +-
 .../compiler_canonical/life_cycle_spec.ts     |  6 +-
 .../local_reference_spec.ts                   |  3 +-
 .../render3/compiler_canonical/query_spec.ts  |  6 +-
 .../compiler_canonical/sanitize_spec.ts       |  6 +-
 .../core/test/render3/instructions_spec.ts    | 19 +++++-
 19 files changed, 127 insertions(+), 128 deletions(-)

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index e5fb36727e..f665b557dd 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -23,7 +23,9 @@ export class Identifiers {
 
   static namespaceSVG: o.ExternalReference = {name: 'ɵNS', moduleName: CORE};
 
-  static createElement: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
+  static element: o.ExternalReference = {name: 'ɵEe', moduleName: CORE};
+
+  static elementStart: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
 
   static elementEnd: o.ExternalReference = {name: 'ɵe', moduleName: CORE};
 
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index eca3a45a39..57ab502aa6 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -357,32 +357,44 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this.addNamespaceInstruction(currentNamespace, element);
     }
 
-    this.instruction(
-        this._creationCode, element.sourceSpan, R3.createElement, ...trimTrailingNulls(parameters));
+    const isEmptyElement = element.children.length === 0 && element.outputs.length === 0;
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    // Generate Listeners (outputs)
-    element.outputs.forEach((outputAst: t.BoundEvent) => {
-      const elName = sanitizeIdentifier(element.name);
-      const evName = sanitizeIdentifier(outputAst.name);
-      const functionName = `${this.templateName}_${elName}_${evName}_listener`;
-      const localVars: o.Statement[] = [];
-      const bindingScope =
-          this._bindingScope.nestedScope((lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => {
-            localVars.push(
-                lhsVar.set(rhsExpression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
-          });
-      const bindingExpr = convertActionBinding(
-          bindingScope, implicit, outputAst.handler, 'b', () => error('Unexpected interpolation'));
-      const handler = o.fn(
-          [new o.FnParam('$event', o.DYNAMIC_TYPE)], [...localVars, ...bindingExpr.render3Stmts],
-          o.INFERRED_TYPE, null, functionName);
+    if (isEmptyElement) {
       this.instruction(
-          this._creationCode, outputAst.sourceSpan, R3.listener, o.literal(outputAst.name),
-          handler);
-    });
+          this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
+    } else {
+      // Generate the instruction create element instruction
+      if (i18nMessages.length > 0) {
+        this._creationCode.push(...i18nMessages);
+      }
+      this.instruction(
+          this._creationCode, element.sourceSpan, R3.elementStart,
+          ...trimTrailingNulls(parameters));
 
+      // Generate Listeners (outputs)
+      element.outputs.forEach((outputAst: t.BoundEvent) => {
+        const elName = sanitizeIdentifier(element.name);
+        const evName = sanitizeIdentifier(outputAst.name);
+        const functionName = `${this.templateName}_${elName}_${evName}_listener`;
+        const localVars: o.Statement[] = [];
+        const bindingScope =
+            this._bindingScope.nestedScope((lhsVar: o.ReadVarExpr, rhsExpression: o.Expression) => {
+              localVars.push(
+                  lhsVar.set(rhsExpression).toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
+            });
+        const bindingExpr = convertActionBinding(
+            bindingScope, implicit, outputAst.handler, 'b',
+            () => error('Unexpected interpolation'));
+        const handler = o.fn(
+            [new o.FnParam('$event', o.DYNAMIC_TYPE)], [...localVars, ...bindingExpr.render3Stmts],
+            o.INFERRED_TYPE, null, functionName);
+        this.instruction(
+            this._creationCode, outputAst.sourceSpan, R3.listener, o.literal(outputAst.name),
+            handler);
+      });
+    }
 
     // Generate element input bindings
     element.inputs.forEach((input: t.BoundAttribute) => {
@@ -422,9 +434,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       t.visitAll(this, element.children);
     }
 
-    // Finish element construction mode.
-    this.instruction(
-        this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
+    if (!isEmptyElement) {
+      // Finish element construction mode.
+      this.instruction(
+          this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
+    }
 
     // Restore the state before exiting this node
     this._inI18nSection = wasInI18nSection;
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index f0371076b3..a61016f656 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -52,8 +52,7 @@ describe('compiler compliance', () => {
             $r3$.ɵE(0, 'div', $c1$);
             $r3$.ɵNS();
             $r3$.ɵE(1, 'svg');
-            $r3$.ɵE(2, 'circle', $c2$);
-            $r3$.ɵe();
+            $r3$.ɵEe(2, 'circle', $c2$);
             $r3$.ɵe();
             $r3$.ɵNH();
             $r3$.ɵE(3, 'p');
@@ -101,8 +100,7 @@ describe('compiler compliance', () => {
             $r3$.ɵE(0, 'div', $c1$);
             $r3$.ɵNM();
             $r3$.ɵE(1, 'math');
-            $r3$.ɵE(2, 'infinity');
-            $r3$.ɵe();
+            $r3$.ɵEe(2, 'infinity');
             $r3$.ɵe();
             $r3$.ɵNH();
             $r3$.ɵE(3, 'p');
@@ -189,8 +187,7 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div');
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.id));
@@ -234,9 +231,8 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
+            $r3$.ɵEe(0, 'div');
             $r3$.ɵPp(1,'pipe');
-            $r3$.ɵe();
             $r3$.ɵrS(10);
           }
           if (rf & 2) {
@@ -280,8 +276,7 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div');
           }
           if (rf & 2) {
             $r3$.ɵkn(0, 'error', $r3$.ɵb(ctx.error));
@@ -353,8 +348,7 @@ describe('compiler compliance', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'child', $c1$);
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'child', $c1$);
               $r3$.ɵT(1, '!');
             }
           },
@@ -560,8 +554,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'my-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'my-comp');
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
@@ -640,8 +633,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'my-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'my-comp');
                 $r3$.ɵrS(10);
               }
               if (rf & 2) {
@@ -702,8 +694,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'object-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'object-comp');
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
@@ -768,8 +759,7 @@ describe('compiler compliance', () => {
             factory: function MyApp_Factory() { return new MyApp(); },
             template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'nested-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'nested-comp');
                 $r3$.ɵrS(7);
               }
               if (rf & 2) {
@@ -913,8 +903,7 @@ describe('compiler compliance', () => {
               var $tmp$: $any$;
               if (rf & 1) {
                 $r3$.ɵQ(0, SomeDirective, true);
-                $r3$.ɵE(1, 'div', $e0_attrs$);
-                $r3$.ɵe();
+                $r3$.ɵEe(1, 'div', $e0_attrs$);
               }
               if (rf & 2) {
                 ($r3$.ɵqR(($tmp$ = $r3$.ɵld(0))) && (ctx.someDir = $tmp$.first));
@@ -1108,8 +1097,7 @@ describe('compiler compliance', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'input', null, $c1$);
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'input', null, $c1$);
               $r3$.ɵT(2);
             }
             const $user$ = $r3$.ɵld(1);
@@ -1188,10 +1176,8 @@ describe('compiler compliance', () => {
             factory: function SimpleLayout_Factory() { return new SimpleLayout(); },
             template: function SimpleLayout_Template(rf: IDENT, ctx: IDENT) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'lifecycle-comp');
-                $r3$.ɵe();
-                $r3$.ɵE(1, 'lifecycle-comp');
-                $r3$.ɵe();
+                $r3$.ɵEe(0, 'lifecycle-comp');
+                $r3$.ɵEe(1, 'lifecycle-comp');
               }
               if (rf & 2) {
                 $r3$.ɵp(0, 'name', $r3$.ɵb(ctx.name1));
@@ -1319,8 +1305,7 @@ describe('compiler compliance', () => {
                     if (rf & 1) {
                       $r3$.ɵNS();
                       $r3$.ɵE(0,'g');
-                      $r3$.ɵE(1,'circle');
-                      $r3$.ɵe();
+                      $r3$.ɵEe(1,'circle');
                       $r3$.ɵe();
                     }
                   }
diff --git a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
index 8b0a9edcbe..a9f4f3672e 100644
--- a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
@@ -75,8 +75,7 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
         if (rf & 1) {
-          $i0$.ɵE(0, 'a');
-          $i0$.ɵe();
+          $i0$.ɵEe(0, 'a');
         }
         if (rf & 2) {
           $i0$.ɵp(0, 'title', $i0$.ɵb($ctx$.title));
@@ -108,8 +107,7 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
         if (rf & 1) {
-          $i0$.ɵE(0, 'a');
-          $i0$.ɵe();
+          $i0$.ɵEe(0, 'a');
         }
         if (rf & 2) {
           $i0$.ɵp(0, 'title', $i0$.ɵi1('Hello ', $ctx$.name, ''));
diff --git a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
index 3839df2615..1065b3acb9 100644
--- a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
@@ -148,8 +148,7 @@ describe('i18n support in the view compiler', () => {
       …
       template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
         if (rf & 1) {
-          $r3$.ɵE(0, 'div', $c1$);
-          $r3$.ɵe();
+          $r3$.ɵEe(0, 'div', $c1$);
         }
       }
     `;
diff --git a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
index df527a99d5..05249bcd1e 100644
--- a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
@@ -40,8 +40,7 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵs(0,$r3$.ɵb($ctx$.myStyleExp));
@@ -78,8 +77,7 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵk(0,$r3$.ɵb($ctx$.myClassExp));
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 60df2a44cd..c944bace23 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -33,6 +33,7 @@ export {
   NH as ɵNH,
   NM as ɵNM,
   NS as ɵNS,
+  Ee as ɵEe,
   L as ɵL,
   T as ɵT,
   V as ɵV,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index e57520dc1c..df2efee76c 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -44,6 +44,7 @@ export {
   containerRefreshStart as cR,
   containerRefreshEnd as cr,
 
+  element as Ee,
   elementAttribute as a,
   elementClass as k,
   elementClassNamed as kn,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 24d25effdf..133decaf37 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -573,6 +573,20 @@ export function namespaceHTML() {
 //// Element
 //////////////////////////
 
+/**
+ * Creates an empty element using {@link elementStart} and {@link elementEnd}
+ *
+ * @param index Index of the element in the data array
+ * @param name Name of the DOM Node
+ * @param attrs Statically bound set of attributes to be written into the DOM element on creation.
+ * @param localRefs A set of local reference bindings on the element.
+ */
+export function element(
+    index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
+  elementStart(index, name, attrs, localRefs);
+  elementEnd();
+}
+
 /**
  * Create DOM element. The instruction must later be followed by `elementEnd()` call.
  *
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 0496c64a8b..3db548c1da 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -41,6 +41,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵNS': r3.NS,
   'ɵE': r3.E,
   'ɵe': r3.e,
+  'ɵEe': r3.Ee,
   'ɵf0': r3.f0,
   'ɵf1': r3.f1,
   'ɵf2': r3.f2,
diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index 7c1e6a7845..d15391a594 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -69,8 +69,7 @@ describe('components & directives', () => {
         factory: () => new MyComponent(),
         template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'child', $e0_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'child', $e0_attrs$);
             $r3$.ɵT(1, '!');
           }
         }
@@ -121,8 +120,7 @@ describe('components & directives', () => {
         factory: function MyApp_Factory() { return new MyApp(); },
         template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div', $e0_attrs$);
           }
         }
       });
@@ -217,8 +215,7 @@ describe('components & directives', () => {
         factory: function MyApp_Factory() { return new MyApp(); },
         template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div', $e0_attrs$);
           }
         }
       });
@@ -265,8 +262,7 @@ describe('components & directives', () => {
         factory: function MyApp_Factory() { return new MyApp(); },
         template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div', $e0_attrs$);
           }
         }
       });
@@ -325,8 +321,7 @@ describe('components & directives', () => {
         factory: function MyApp_Factory() { return new MyApp(); },
         template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'my-comp');
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'my-comp');
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'name', $r3$.ɵb(ctx.name));
@@ -455,8 +450,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-array-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-array-comp');
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'names', rf & 1 ? $e0_arr$ : $r3$.ɵNC);
@@ -500,8 +494,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-array-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-array-comp');
               $r3$.ɵrS(1);
             }
             if (rf & 2) {
@@ -562,8 +555,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-comp');
               $r3$.ɵrS(1);
             }
             if (rf & 2) {
@@ -606,8 +598,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-array-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-array-comp');
               $r3$.ɵrS(2);
             }
             if (rf & 2) {
@@ -717,8 +708,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, c: $any$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-comp');
               $r3$.ɵrS(10);
             }
             if (rf & 2) {
@@ -796,8 +786,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'object-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'object-comp');
               $r3$.ɵrS(2);
             }
             if (rf & 2) {
@@ -882,8 +871,7 @@ describe('components & directives', () => {
           factory: function MyApp_Factory() { return new MyApp(); },
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'nested-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'nested-comp');
               $r3$.ɵrS(7);
             }
             if (rf & 2) {
diff --git a/packages/core/test/render3/compiler_canonical/content_projection_spec.ts b/packages/core/test/render3/compiler_canonical/content_projection_spec.ts
index 12171ea99a..c7a35758c0 100644
--- a/packages/core/test/render3/compiler_canonical/content_projection_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/content_projection_spec.ts
@@ -28,9 +28,8 @@ describe('content projection', () => {
         template: function(rf: $RenderFlags$, ctx: $SimpleComponent$) {
           if (rf & 1) {
             $r3$.ɵpD(0);
-            $r3$.ɵE(1, 'div');
+            $r3$.ɵEe(1, 'div');
             $r3$.ɵP(2, 0);
-            $r3$.ɵe();
           }
         }
       });
@@ -58,12 +57,10 @@ describe('content projection', () => {
         template: function(rf: $RenderFlags$, ctx: $ComplexComponent$) {
           if (rf & 1) {
             $r3$.ɵpD(0, $pD_0P$, $pD_0R$);
-            $r3$.ɵE(1, 'div', ['id', 'first']);
+            $r3$.ɵEe(1, 'div', ['id', 'first']);
             $r3$.ɵP(2, 0, 1);
-            $r3$.ɵe();
-            $r3$.ɵE(3, 'div', ['id', 'second']);
+            $r3$.ɵEe(3, 'div', ['id', 'second']);
             $r3$.ɵP(4, 0, 2);
-            $r3$.ɵe();
           }
         }
       });
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index 1155b8b229..0f1dd08873 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -91,8 +91,7 @@ describe('elements', () => {
           let $tmp$: any;
           let $tmp_2$: any;
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $e0_attrs$, $e0_locals$);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div', $e0_attrs$, $e0_locals$);
             $r3$.ɵT(3);
           }
           if (rf & 2) {
@@ -165,8 +164,7 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.someProperty));
@@ -197,8 +195,7 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵa(0, 'title', $r3$.ɵb(ctx.someAttribute));
@@ -229,8 +226,7 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵkn(0, 'foo', $r3$.ɵb(ctx.someFlag));
@@ -265,8 +261,7 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵsn(0, 'color', $r3$.ɵb(ctx.someColor));
@@ -315,8 +310,7 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div', $e0_attrs$);
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div', $e0_attrs$);
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.someString + 1));
@@ -351,8 +345,7 @@ describe('elements', () => {
           factory: function StyleComponent_Factory() { return new StyleComponent(); },
           template: function StyleComponent_Template(rf: $RenderFlags$, ctx: $StyleComponent$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'div');
             }
             if (rf & 2) {
               $r3$.ɵk(0, $r3$.ɵb(ctx.classExp));
diff --git a/packages/core/test/render3/compiler_canonical/injection_spec.ts b/packages/core/test/render3/compiler_canonical/injection_spec.ts
index 827cd27a77..9dc873476a 100644
--- a/packages/core/test/render3/compiler_canonical/injection_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/injection_spec.ts
@@ -54,8 +54,7 @@ describe('injection', () => {
           /** <my-comp></my-comp> */
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-comp');
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-comp');
             }
           },
           directives: () => [MyComp]
@@ -101,8 +100,7 @@ describe('injection', () => {
           /** <my-comp></my-comp> */
           template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'my-comp', e0_attrs);
-              $r3$.ɵe();
+              $r3$.ɵEe(0, 'my-comp', e0_attrs);
             }
           },
           directives: () => [MyComp]
diff --git a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
index 0f4f5113a0..6577777e51 100644
--- a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
@@ -70,10 +70,8 @@ describe('lifecycle hooks', () => {
       factory: function SimpleLayout_Factory() { return simpleLayout = new SimpleLayout(); },
       template: function SimpleLayout_Template(rf: $RenderFlags$, ctx: $SimpleLayout$) {
         if (rf & 1) {
-          $r3$.ɵE(0, 'lifecycle-comp');
-          $r3$.ɵe();
-          $r3$.ɵE(1, 'lifecycle-comp');
-          $r3$.ɵe();
+          $r3$.ɵEe(0, 'lifecycle-comp');
+          $r3$.ɵEe(1, 'lifecycle-comp');
         }
         if (rf & 2) {
           $r3$.ɵp(0, 'name', $r3$.ɵb(ctx.name1));
diff --git a/packages/core/test/render3/compiler_canonical/local_reference_spec.ts b/packages/core/test/render3/compiler_canonical/local_reference_spec.ts
index 99b6c6ecbf..a5c404814c 100644
--- a/packages/core/test/render3/compiler_canonical/local_reference_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/local_reference_spec.ts
@@ -28,8 +28,7 @@ describe('local references', () => {
         template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
           let l1_user: any;
           if (rf & 1) {
-            $r3$.ɵE(0, 'input', null, ['user', '']);
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'input', null, ['user', '']);
             $r3$.ɵT(2);
           }
           if (rf & 2) {
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index d3e19413e3..10f6f1221e 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -58,8 +58,7 @@ describe('queries', () => {
           if (rf & 1) {
             $r3$.ɵQ(0, SomeDirective, false);
             $r3$.ɵQ(1, SomeDirective, false);
-            $r3$.ɵE(2, 'div', $e1_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(2, 'div', $e1_attrs$);
           }
           if (rf & 2) {
             $r3$.ɵqR($tmp$ = $r3$.ɵld<QueryList<any>>(0)) && (ctx.someDir = $tmp$.first);
@@ -147,8 +146,7 @@ describe('queries', () => {
           if (rf & 1) {
             $r3$.ɵE(0, 'content-query-component');
             contentQueryComp = $r3$.ɵd<any[]>(0)[0];
-            $r3$.ɵE(1, 'div', $e2_attrs$);
-            $r3$.ɵe();
+            $r3$.ɵEe(1, 'div', $e2_attrs$);
             $r3$.ɵe();
           }
         }
diff --git a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
index 8137445076..bc73d1e105 100644
--- a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
@@ -43,10 +43,8 @@ describe('compiler sanitization', () => {
         factory: function MyComponent_Factory() { return new MyComponent(); },
         template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
-            $r3$.ɵe();
-            $r3$.ɵE(1, 'img');
-            $r3$.ɵe();
+            $r3$.ɵEe(0, 'div');
+            $r3$.ɵEe(1, 'img');
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'innerHTML', $r3$.ɵb(ctx.innerHTML), $r3$.ɵsanitizeHtml);
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 7a59ec8834..d3302788eb 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
 import {LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
@@ -72,6 +72,23 @@ describe('instructions', () => {
     });
   });
 
+  describe('element', () => {
+    it('should create an element', () => {
+      const t = new TemplateFixture(() => { element(0, 'div', ['id', 'test', 'title', 'Hello']); });
+
+      const div = (t.hostNode.native as HTMLElement).querySelector('div') !;
+      expect(div.id).toEqual('test');
+      expect(div.title).toEqual('Hello');
+
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 1,
+        tNode: 2,  // 1 for div, 1 for host element
+        tView: 1,
+        rendererCreateElement: 1,
+      });
+    });
+  });
+
   describe('elementAttribute', () => {
     it('should use sanitizer function', () => {
       const t = new TemplateFixture(createDiv);

From dbfb6b9d45f6c4e3e662928d065f0420beca66f6 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 28 May 2018 16:27:07 +0300
Subject: [PATCH 246/582] refactor(service-worker): minor mocks refactoring
 (#24162)

PR Close #24162
---
 .../service-worker/test/integration_spec.ts     |  2 +-
 packages/service-worker/testing/mock.ts         | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/service-worker/test/integration_spec.ts b/packages/service-worker/test/integration_spec.ts
index acd1ed0b81..93cf7021f7 100644
--- a/packages/service-worker/test/integration_spec.ts
+++ b/packages/service-worker/test/integration_spec.ts
@@ -90,7 +90,7 @@ const serverUpdate =
       mock.messages.subscribe(msg => { scope.handleMessage(msg, 'default'); });
 
       mock.setupSw();
-      reg = await mock.mockRegistration;
+      reg = mock.mockRegistration !;
 
       await Promise.all(scope.handleFetch(new MockRequest('/only.txt'), 'default'));
       await driver.initialized;
diff --git a/packages/service-worker/testing/mock.ts b/packages/service-worker/testing/mock.ts
index 879a1f9d8b..4c1cd60355 100644
--- a/packages/service-worker/testing/mock.ts
+++ b/packages/service-worker/testing/mock.ts
@@ -11,9 +11,8 @@ import {Subject} from 'rxjs';
 export class MockServiceWorkerContainer {
   private onControllerChange: Function[] = [];
   private onMessage: Function[] = [];
-  private registration: MockServiceWorkerRegistration|null = null;
+  mockRegistration: MockServiceWorkerRegistration|null = null;
   controller: MockServiceWorker|null = null;
-
   messages = new Subject();
 
   addEventListener(event: 'controllerchange'|'message', handler: Function) {
@@ -34,16 +33,14 @@ export class MockServiceWorkerContainer {
 
   async register(url: string): Promise<void> { return; }
 
-  async getRegistration(): Promise<ServiceWorkerRegistration> { return this.registration as any; }
-
-  setupSw(url: string = '/ngsw-worker.js'): void {
-    this.registration = new MockServiceWorkerRegistration();
-    this.controller = new MockServiceWorker(this, url);
-    this.onControllerChange.forEach(onChange => onChange(this.controller));
+  async getRegistration(): Promise<ServiceWorkerRegistration> {
+    return this.mockRegistration as any;
   }
 
-  get mockRegistration(): Promise<MockServiceWorkerRegistration> {
-    return Promise.resolve(this.registration !);
+  setupSw(url: string = '/ngsw-worker.js'): void {
+    this.mockRegistration = new MockServiceWorkerRegistration();
+    this.controller = new MockServiceWorker(this, url);
+    this.onControllerChange.forEach(onChange => onChange(this.controller));
   }
 
   sendMessage(value: Object): void {

From 86bf5f39128bb08053371a0a081973a6f6488e0d Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 28 May 2018 16:28:32 +0300
Subject: [PATCH 247/582] test(service-worker): add tests for `SwPush` (#24162)

PR Close #24162
---
 packages/service-worker/test/comm_spec.ts | 238 ++++++++++++++++++++--
 packages/service-worker/testing/mock.ts   |  23 ++-
 2 files changed, 239 insertions(+), 22 deletions(-)

diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts
index 49a5a312fb..6b44da30e1 100644
--- a/packages/service-worker/test/comm_spec.ts
+++ b/packages/service-worker/test/comm_spec.ts
@@ -13,16 +13,19 @@ import {NgswCommChannel} from '../src/low_level';
 import {RegistrationOptions, ngswCommChannelFactory} from '../src/module';
 import {SwPush} from '../src/push';
 import {SwUpdate} from '../src/update';
-import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../testing/mock';
+import {MockPushManager, MockPushSubscription, MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../testing/mock';
+import {async_fit, async_it} from './async';
 
 {
   describe('ServiceWorker library', () => {
     let mock: MockServiceWorkerContainer;
     let comm: NgswCommChannel;
+
     beforeEach(() => {
       mock = new MockServiceWorkerContainer();
       comm = new NgswCommChannel(mock as any);
     });
+
     describe('NgswCommsChannel', () => {
       it('can access the registration when it comes before subscription', (done: DoneFn) => {
         const mock = new MockServiceWorkerContainer();
@@ -43,6 +46,7 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
         mock.setupSw();
       });
     });
+
     describe('ngswCommChannelFactory', () => {
       it('gives disabled NgswCommChannel for platform-server', () => {
         TestBed.configureTestingModule({
@@ -131,26 +135,15 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
            }
          });
     });
+
     describe('SwPush', () => {
       let push: SwPush;
+
       beforeEach(() => {
         push = new SwPush(comm);
         mock.setupSw();
       });
-      it('receives push messages', (done: DoneFn) => {
-        push.messages.subscribe(msg => {
-          expect(msg).toEqual({
-            message: 'this was a push message',
-          });
-          done();
-        });
-        mock.sendMessage({
-          type: 'PUSH',
-          data: {
-            message: 'this was a push message',
-          },
-        });
-      });
+
       it('is injectable', () => {
         TestBed.configureTestingModule({
           providers: [
@@ -160,25 +153,228 @@ import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../test
         });
         expect(() => TestBed.get(SwPush)).not.toThrow();
       });
+
+      describe('requestSubscription()', () => {
+        async_it('returns a promise that resolves to the subscription', async() => {
+          const promise = push.requestSubscription({serverPublicKey: 'test'});
+          expect(promise).toEqual(jasmine.any(Promise));
+
+          const sub = await promise;
+          expect(sub).toEqual(jasmine.any(MockPushSubscription));
+        });
+
+        async_it('calls `PushManager.subscribe()` (with appropriate options)', async() => {
+          // atob('c3ViamVjdHM/') === 'subjects?'
+          const serverPublicKey = 'c3ViamVjdHM_';
+          const appServerKeyStr  ='subjects?';
+
+          const pmSubscribeSpy = spyOn(MockPushManager.prototype, 'subscribe').and.callThrough();
+          await push.requestSubscription({serverPublicKey});
+
+          expect(pmSubscribeSpy).toHaveBeenCalledTimes(1);
+          expect(pmSubscribeSpy).toHaveBeenCalledWith({
+            applicationServerKey: jasmine.any(Uint8Array),
+            userVisibleOnly: true,
+          });
+
+          const actualAppServerKey = pmSubscribeSpy.calls.first().args[0].applicationServerKey;
+          const actualAppServerKeyStr = new TextDecoder('utf-8').decode(actualAppServerKey);
+          expect(actualAppServerKeyStr).toBe(appServerKeyStr);
+        });
+
+        async_it('emits the new `PushSubscription` on `SwPush.subscription`', async() => {
+          const subscriptionSpy = jasmine.createSpy('subscriptionSpy');
+          push.subscription.subscribe(subscriptionSpy);
+          const sub = await push.requestSubscription({serverPublicKey: 'test'});
+
+          expect(subscriptionSpy).toHaveBeenCalledWith(sub);
+        });
+      });
+
+      describe('unsubscribe()', () => {
+        let psUnsubscribeSpy: jasmine.Spy;
+
+        beforeEach(() => {
+          psUnsubscribeSpy = spyOn(MockPushSubscription.prototype, 'unsubscribe').and.callThrough();
+        });
+
+        async_it('rejects if currently not subscribed to push notifications', async() => {
+          try {
+            await push.unsubscribe();
+            throw new Error('`unsubscribe()` should fail');
+          } catch (err) {
+            expect(err.message).toBe('Not subscribed to push notifications.');
+          }
+        });
+
+        async_it('calls `PushSubscription.unsubscribe()`', async() => {
+          await push.requestSubscription({serverPublicKey: 'test'});
+          await push.unsubscribe();
+
+          expect(psUnsubscribeSpy).toHaveBeenCalledTimes(1);
+        });
+
+        async_it('rejects if `PushSubscription.unsubscribe()` fails', async() => {
+          psUnsubscribeSpy.and.callFake(() => { throw new Error('foo'); });
+
+          try {
+            await push.requestSubscription({serverPublicKey: 'test'});
+            await push.unsubscribe();
+            throw new Error('`unsubscribe()` should fail');
+          } catch (err) {
+            expect(err.message).toBe('foo');
+          }
+        });
+
+        async_it('rejects if `PushSubscription.unsubscribe()` returns false', async() => {
+          psUnsubscribeSpy.and.returnValue(Promise.resolve(false));
+
+          try {
+            await push.requestSubscription({serverPublicKey: 'test'});
+            await push.unsubscribe();
+            throw new Error('`unsubscribe()` should fail');
+          } catch (err) {
+            expect(err.message).toBe('Unsubscribe failed!');
+          }
+        });
+
+        async_it('emits `null` on `SwPush.subscription`', async() => {
+          const subscriptionSpy = jasmine.createSpy('subscriptionSpy');
+          push.subscription.subscribe(subscriptionSpy);
+
+          await push.requestSubscription({serverPublicKey: 'test'});
+          await push.unsubscribe();
+
+          expect(subscriptionSpy).toHaveBeenCalledWith(null);
+        });
+
+        async_it('does not emit on `SwPush.subscription` on failure', async() => {
+          const subscriptionSpy = jasmine.createSpy('subscriptionSpy');
+          const initialSubEmit = new Promise(resolve => subscriptionSpy.and.callFake(resolve));
+
+          push.subscription.subscribe(subscriptionSpy);
+          await initialSubEmit;
+          subscriptionSpy.calls.reset();
+
+          // Error due to no subscription.
+          await push.unsubscribe().catch(() => undefined);
+          expect(subscriptionSpy).not.toHaveBeenCalled();
+
+          // Subscribe.
+          await push.requestSubscription({serverPublicKey: 'test'});
+          subscriptionSpy.calls.reset();
+
+          // Error due to `PushSubscription.unsubscribe()` error.
+          psUnsubscribeSpy.and.callFake(() => { throw new Error('foo'); });
+          await push.unsubscribe().catch(() => undefined);
+          expect(subscriptionSpy).not.toHaveBeenCalled();
+
+          // Error due to `PushSubscription.unsubscribe()` failure.
+          psUnsubscribeSpy.and.returnValue(Promise.resolve(false));
+          await push.unsubscribe().catch(() => undefined);
+          expect(subscriptionSpy).not.toHaveBeenCalled();
+        });
+      });
+
+      describe('messages', () => {
+        it('receives push messages', () => {
+          const sendMessage = (type: string, message: string) =>
+            mock.sendMessage({type, data: {message}});
+
+          const receivedMessages: string[] = [];
+          push.messages.subscribe((msg: {message: string}) => receivedMessages.push(msg.message));
+
+          sendMessage('PUSH', 'this was a push message');
+          sendMessage('NOTPUSH', 'this was not a push message');
+          sendMessage('PUSH', 'this was a push message too');
+          sendMessage('HSUP', 'this was a HSUP message');
+
+          expect(receivedMessages).toEqual([
+            'this was a push message',
+            'this was a push message too',
+          ]);
+        });
+      });
+
+      describe('subscription', () => {
+        let nextSubEmitResolve: () => void;
+        let nextSubEmitPromise: Promise<void>;
+        let subscriptionSpy: jasmine.Spy;
+
+        beforeEach(() => {
+          nextSubEmitPromise = new Promise(resolve => nextSubEmitResolve = resolve);
+          subscriptionSpy = jasmine.createSpy('subscriptionSpy').and.callFake(() => {
+            nextSubEmitResolve();
+            nextSubEmitPromise = new Promise(resolve => nextSubEmitResolve = resolve);
+          });
+
+          push.subscription.subscribe(subscriptionSpy);
+        });
+
+        async_it('emits on worker-driven changes (i.e. when the controller changes)', async() => {
+          // Initial emit for the current `ServiceWorkerController`.
+          await nextSubEmitPromise;
+          expect(subscriptionSpy).toHaveBeenCalledTimes(1);
+          expect(subscriptionSpy).toHaveBeenCalledWith(null);
+
+          subscriptionSpy.calls.reset();
+
+          // Simulate a `ServiceWorkerController` change.
+          mock.setupSw();
+          await nextSubEmitPromise;
+          expect(subscriptionSpy).toHaveBeenCalledTimes(1);
+          expect(subscriptionSpy).toHaveBeenCalledWith(null);
+        });
+
+        async_it('emits on subscription changes (i.e. when subscribing/unsubscribing)', async() => {
+          await nextSubEmitPromise;
+          subscriptionSpy.calls.reset();
+
+          // Subscribe.
+          push.requestSubscription({serverPublicKey: 'test'});
+          await nextSubEmitPromise;
+          expect(subscriptionSpy).toHaveBeenCalledTimes(1);
+          expect(subscriptionSpy).toHaveBeenCalledWith(jasmine.any(MockPushSubscription));
+
+          subscriptionSpy.calls.reset();
+
+          // Subscribe again.
+          push.requestSubscription({serverPublicKey: 'test'});
+          await nextSubEmitPromise;
+          expect(subscriptionSpy).toHaveBeenCalledTimes(1);
+          expect(subscriptionSpy).toHaveBeenCalledWith(jasmine.any(MockPushSubscription));
+
+          subscriptionSpy.calls.reset();
+
+          // Unsubscribe.
+          push.unsubscribe();
+          await nextSubEmitPromise;
+          expect(subscriptionSpy).toHaveBeenCalledTimes(1);
+          expect(subscriptionSpy).toHaveBeenCalledWith(null);
+        });
+      });
+
       describe('with no SW', () => {
-        beforeEach(() => { comm = new NgswCommChannel(undefined); });
-        it('can be instantiated', () => { push = new SwPush(comm); });
-        it('does not crash on subscription to observables', () => {
+        beforeEach(() => {
+          comm = new NgswCommChannel(undefined);
           push = new SwPush(comm);
+        });
+
+        it('does not crash on subscription to observables', () => {
           push.messages.toPromise().catch(err => fail(err));
           push.subscription.toPromise().catch(err => fail(err));
         });
+
         it('gives an error when registering', done => {
-          push = new SwPush(comm);
           push.requestSubscription({serverPublicKey: 'test'}).catch(err => { done(); });
         });
-        it('gives an error when unsubscribing', done => {
 
-          push = new SwPush(comm);
+        it('gives an error when unsubscribing', done => {
           push.unsubscribe().catch(err => { done(); });
         });
       });
     });
+
     describe('SwUpdate', () => {
       let update: SwUpdate;
       beforeEach(() => {
diff --git a/packages/service-worker/testing/mock.ts b/packages/service-worker/testing/mock.ts
index 4c1cd60355..925219aef3 100644
--- a/packages/service-worker/testing/mock.ts
+++ b/packages/service-worker/testing/mock.ts
@@ -56,4 +56,25 @@ export class MockServiceWorker {
   postMessage(value: Object) { this.mock.messages.next(value); }
 }
 
-export class MockServiceWorkerRegistration {}
+export class MockServiceWorkerRegistration {
+  pushManager: PushManager = new MockPushManager() as any;
+}
+
+export class MockPushManager {
+  private subscription: PushSubscription|null = null;
+
+  getSubscription(): Promise<PushSubscription|null> {
+    return Promise.resolve(this.subscription);
+  }
+
+  subscribe(options?: PushSubscriptionOptionsInit): Promise<PushSubscription> {
+    this.subscription = new MockPushSubscription() as any;
+    return Promise.resolve(this.subscription !);
+  }
+}
+
+export class MockPushSubscription {
+  unsubscribe(): Promise<boolean> {
+    return Promise.resolve(true);
+  }
+}

From 4d55dfd9d9187c7da61a49dc13574d85e2e9d3d5 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 28 May 2018 18:27:51 +0300
Subject: [PATCH 248/582] test(service-worker): allow `SwPush` tests to run on
 Node.js (#24162)

PR Close #24162
---
 packages/service-worker/src/push.ts       |  5 ++--
 packages/service-worker/test/comm_spec.ts | 30 +++++++++++++----------
 packages/service-worker/testing/mock.ts   | 22 ++++++++++++-----
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/packages/service-worker/src/push.ts b/packages/service-worker/src/push.ts
index 265e01527b..c2d828fbf6 100644
--- a/packages/service-worker/src/push.ts
+++ b/packages/service-worker/src/push.ts
@@ -13,7 +13,6 @@ import {map, switchMap, take} from 'rxjs/operators';
 import {ERR_SW_NOT_SUPPORTED, NgswCommChannel} from './low_level';
 
 
-
 /**
  * Subscribe and listen to push notifications from the Service Worker.
  *
@@ -55,7 +54,7 @@ export class SwPush {
       return Promise.reject(new Error(ERR_SW_NOT_SUPPORTED));
     }
     const pushOptions: PushSubscriptionOptionsInit = {userVisibleOnly: true};
-    let key = atob(options.serverPublicKey.replace(/_/g, '/').replace(/-/g, '+'));
+    let key = this.decodeBase64(options.serverPublicKey.replace(/_/g, '/').replace(/-/g, '+'));
     let applicationServerKey = new Uint8Array(new ArrayBuffer(key.length));
     for (let i = 0; i < key.length; i++) {
       applicationServerKey[i] = key.charCodeAt(i);
@@ -90,4 +89,6 @@ export class SwPush {
     }));
     return unsubscribe.pipe(take(1)).toPromise();
   }
+
+  private decodeBase64(input: string): string { return atob(input); }
 }
diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts
index 6b44da30e1..7fcaf3c849 100644
--- a/packages/service-worker/test/comm_spec.ts
+++ b/packages/service-worker/test/comm_spec.ts
@@ -13,7 +13,7 @@ import {NgswCommChannel} from '../src/low_level';
 import {RegistrationOptions, ngswCommChannelFactory} from '../src/module';
 import {SwPush} from '../src/push';
 import {SwUpdate} from '../src/update';
-import {MockPushManager, MockPushSubscription, MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../testing/mock';
+import {MockPushManager, MockPushSubscription, MockServiceWorkerContainer, MockServiceWorkerRegistration, patchDecodeBase64} from '../testing/mock';
 import {async_fit, async_it} from './async';
 
 {
@@ -137,8 +137,13 @@ import {async_fit, async_it} from './async';
     });
 
     describe('SwPush', () => {
+      let unpatchDecodeBase64: () => void;
       let push: SwPush;
 
+      // Patch `SwPush.decodeBase64()` in Node.js (where `atob` is not available).
+      beforeAll(() => unpatchDecodeBase64 = patchDecodeBase64(SwPush.prototype as any));
+      afterAll(() => unpatchDecodeBase64());
+
       beforeEach(() => {
         push = new SwPush(comm);
         mock.setupSw();
@@ -164,9 +169,12 @@ import {async_fit, async_it} from './async';
         });
 
         async_it('calls `PushManager.subscribe()` (with appropriate options)', async() => {
+          const decode = (charCodeArr: Uint8Array) =>
+              Array.from(charCodeArr).map(c => String.fromCharCode(c)).join('');
+
           // atob('c3ViamVjdHM/') === 'subjects?'
           const serverPublicKey = 'c3ViamVjdHM_';
-          const appServerKeyStr  ='subjects?';
+          const appServerKeyStr = 'subjects?';
 
           const pmSubscribeSpy = spyOn(MockPushManager.prototype, 'subscribe').and.callThrough();
           await push.requestSubscription({serverPublicKey});
@@ -178,7 +186,7 @@ import {async_fit, async_it} from './async';
           });
 
           const actualAppServerKey = pmSubscribeSpy.calls.first().args[0].applicationServerKey;
-          const actualAppServerKeyStr = new TextDecoder('utf-8').decode(actualAppServerKey);
+          const actualAppServerKeyStr = decode(actualAppServerKey);
           expect(actualAppServerKeyStr).toBe(appServerKeyStr);
         });
 
@@ -279,7 +287,7 @@ import {async_fit, async_it} from './async';
       describe('messages', () => {
         it('receives push messages', () => {
           const sendMessage = (type: string, message: string) =>
-            mock.sendMessage({type, data: {message}});
+              mock.sendMessage({type, data: {message}});
 
           const receivedMessages: string[] = [];
           push.messages.subscribe((msg: {message: string}) => receivedMessages.push(msg.message));
@@ -331,24 +339,21 @@ import {async_fit, async_it} from './async';
           subscriptionSpy.calls.reset();
 
           // Subscribe.
-          push.requestSubscription({serverPublicKey: 'test'});
-          await nextSubEmitPromise;
+          await push.requestSubscription({serverPublicKey: 'test'});
           expect(subscriptionSpy).toHaveBeenCalledTimes(1);
           expect(subscriptionSpy).toHaveBeenCalledWith(jasmine.any(MockPushSubscription));
 
           subscriptionSpy.calls.reset();
 
           // Subscribe again.
-          push.requestSubscription({serverPublicKey: 'test'});
-          await nextSubEmitPromise;
+          await push.requestSubscription({serverPublicKey: 'test'});
           expect(subscriptionSpy).toHaveBeenCalledTimes(1);
           expect(subscriptionSpy).toHaveBeenCalledWith(jasmine.any(MockPushSubscription));
 
           subscriptionSpy.calls.reset();
 
           // Unsubscribe.
-          push.unsubscribe();
-          await nextSubEmitPromise;
+          await push.unsubscribe();
           expect(subscriptionSpy).toHaveBeenCalledTimes(1);
           expect(subscriptionSpy).toHaveBeenCalledWith(null);
         });
@@ -369,9 +374,8 @@ import {async_fit, async_it} from './async';
           push.requestSubscription({serverPublicKey: 'test'}).catch(err => { done(); });
         });
 
-        it('gives an error when unsubscribing', done => {
-          push.unsubscribe().catch(err => { done(); });
-        });
+        it('gives an error when unsubscribing',
+           done => { push.unsubscribe().catch(err => { done(); }); });
       });
     });
 
diff --git a/packages/service-worker/testing/mock.ts b/packages/service-worker/testing/mock.ts
index 925219aef3..3eb1cfe588 100644
--- a/packages/service-worker/testing/mock.ts
+++ b/packages/service-worker/testing/mock.ts
@@ -8,6 +8,20 @@
 
 import {Subject} from 'rxjs';
 
+export const patchDecodeBase64 = (proto: {decodeBase64: typeof atob}) => {
+  let unpatch: () => void = () => undefined;
+
+  if ((typeof atob === 'undefined') && (typeof Buffer === 'function')) {
+    const oldDecodeBase64 = proto.decodeBase64;
+    const newDecodeBase64 = (input: string) => Buffer.from(input, 'base64').toString('binary');
+
+    proto.decodeBase64 = newDecodeBase64;
+    unpatch = () => { proto.decodeBase64 = oldDecodeBase64; };
+  }
+
+  return unpatch;
+};
+
 export class MockServiceWorkerContainer {
   private onControllerChange: Function[] = [];
   private onMessage: Function[] = [];
@@ -63,9 +77,7 @@ export class MockServiceWorkerRegistration {
 export class MockPushManager {
   private subscription: PushSubscription|null = null;
 
-  getSubscription(): Promise<PushSubscription|null> {
-    return Promise.resolve(this.subscription);
-  }
+  getSubscription(): Promise<PushSubscription|null> { return Promise.resolve(this.subscription); }
 
   subscribe(options?: PushSubscriptionOptionsInit): Promise<PushSubscription> {
     this.subscription = new MockPushSubscription() as any;
@@ -74,7 +86,5 @@ export class MockPushManager {
 }
 
 export class MockPushSubscription {
-  unsubscribe(): Promise<boolean> {
-    return Promise.resolve(true);
-  }
+  unsubscribe(): Promise<boolean> { return Promise.resolve(true); }
 }

From 3ed2d75336aa39bebaace2cf3955f45b36527e01 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 28 May 2018 16:44:45 +0300
Subject: [PATCH 249/582] fix(service-worker): fix `SwPush.unsubscribe()`
 (#24162)

Fixes #24095

PR Close #24162
---
 packages/service-worker/src/push.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/service-worker/src/push.ts b/packages/service-worker/src/push.ts
index c2d828fbf6..9ea4cef004 100644
--- a/packages/service-worker/src/push.ts
+++ b/packages/service-worker/src/push.ts
@@ -73,21 +73,22 @@ export class SwPush {
     if (!this.sw.isEnabled) {
       return Promise.reject(new Error(ERR_SW_NOT_SUPPORTED));
     }
-    const unsubscribe = this.subscription.pipe(switchMap((sub: PushSubscription | null) => {
-      if (sub !== null) {
-        return sub.unsubscribe().then(success => {
-          if (success) {
-            this.subscriptionChanges.next(null);
-            return undefined;
-          } else {
-            throw new Error('Unsubscribe failed!');
-          }
-        });
-      } else {
+
+    const doUnsubscribe = (sub: PushSubscription | null) => {
+      if (sub === null) {
         throw new Error('Not subscribed to push notifications.');
       }
-    }));
-    return unsubscribe.pipe(take(1)).toPromise();
+
+      return sub.unsubscribe().then(success => {
+        if (!success) {
+          throw new Error('Unsubscribe failed!');
+        }
+
+        this.subscriptionChanges.next(null);
+      });
+    };
+
+    return this.subscription.pipe(take(1), switchMap(doUnsubscribe)).toPromise();
   }
 
   private decodeBase64(input: string): string { return atob(input); }

From 282d3510cf2b6c0dcf77bdff42860328b5271973 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Tue, 12 Jun 2018 08:55:16 -0700
Subject: [PATCH 250/582] fix(bazel): Allow ng_module to depend on targets w no
 deps (#24446)

PR Close #24446
---
 packages/bazel/src/ng_module.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index 8defd2ff4e..4244a74567 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -263,7 +263,7 @@ def _collect_summaries_aspect_impl(target, ctx):
   srcs = ctx.rule.attr.srcs if hasattr(ctx.rule.attr, "srcs") else []
 
   # "re-export" rules should expose all the files of their deps
-  if not srcs:
+  if not srcs and hasattr(ctx.rule.attr, "deps"):
     for dep in ctx.rule.attr.deps:
       if (hasattr(dep, "angular")):
         results = depset(dep.angular.summaries, transitive = [results])

From 131602474dd8cfed53b644acad7be77390fd0a09 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 11 Jun 2018 12:25:08 +0300
Subject: [PATCH 251/582] docs: change `aio` scope to `docs-infra` (#24410)

Related to #24295

PR Close #24410
---
 CONTRIBUTING.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1419eea496..44142a7d68 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -227,10 +227,15 @@ The following is the list of supported scopes:
 
 There are currently a few exceptions to the "use package name" rule:
 
-* **packaging**: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
+* **packaging**: used for changes that change the npm package layout in all of our packages, e.g.
+  public path changes, package.json changes done to all packages, d.ts file/format changes, changes
+  to bundles, etc.
 * **changelog**: used for updating the release notes in CHANGELOG.md
-* **aio**: used for docs-app (angular.io) related changes within the /aio directory of the repo
-* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)
+* **docs-infra**: used for docs-app (angular.io) related changes within the /aio directory of the
+  repo
+* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all
+  packages (e.g. `style: add missing semicolons`) and for docs changes that are not related to a
+  specific package (e.g. `docs: fix typo in tutorial`).
 
 ### Subject
 The subject contains a succinct description of the change:
@@ -269,7 +274,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
   * https://help.github.com/articles/about-commit-email-addresses/
   * https://help.github.com/articles/blocking-command-line-pushes-that-expose-your-personal-email-address/
 
-  Note that if you have more than one Git identity, it is important to verify that you are logged in with the same ID with which you signed the CLA, before you commit changes. If not, your PR will fail the CLA check.  
+  Note that if you have more than one Git identity, it is important to verify that you are logged in with the same ID with which you signed the CLA, before you commit changes. If not, your PR will fail the CLA check.
 
 <hr>
 

From 0d07d273dc7aa92ec078434b11edb0d8a70264bc Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 4 Jun 2018 10:30:34 -0700
Subject: [PATCH 252/582] build: update to Bazel 0.14.0 (#24296)

Also update usage of the ctx.actions.args to a newer preferred API

PR Close #24296
---
 .circleci/config.yml                         |  4 +-
 WORKSPACE                                    |  2 +-
 integration/bazel/WORKSPACE                  |  2 +-
 packages/bazel/src/ng_package/ng_package.bzl | 41 ++++++++++----------
 packages/bazel/src/ng_rollup_bundle.bzl      |  8 ++--
 tools/ngcontainer/Dockerfile                 |  2 +-
 tools/ngcontainer/README.md                  |  2 +-
 7 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ce1cfd6a8..7eb84168a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.3.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.0
+var_1: &docker_image angular/ngcontainer:0.3.1
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.1
 
 # Define common ENV vars
 var_3: &define_env_vars
diff --git a/WORKSPACE b/WORKSPACE
index 873e9e9b8f..783c1db17d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -77,7 +77,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.13.0")
+check_bazel_version("0.14.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 12dda52ee5..c5ca087d80 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -44,7 +44,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
 
-check_bazel_version("0.13.0")
+check_bazel_version("0.14.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 0e74959433..875b3728e7 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -80,14 +80,14 @@ def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, for
   map_output = ctx.actions.declare_file(js_output.basename + ".map", sibling = js_output)
 
   args = ctx.actions.args()
-  args.add(["--config", rollup_config.path])
+  args.add("--config", rollup_config)
 
-  args.add(["--input", entry_point])
-  args.add(["--output.file", js_output.path])
-  args.add(["--output.format", format])
+  args.add("--input", entry_point)
+  args.add("--output.file", js_output)
+  args.add("--output.format", format)
   if package_name:
-    args.add(["--output.name", _global_name(package_name)])
-    args.add(["--amd.id", package_name])
+    args.add("--output.name", _global_name(package_name))
+    args.add("--amd.id", package_name)
 
   # Note: if the input has external source maps then we need to also install and use
   #   `rollup-plugin-sourcemaps`, which will require us to use rollup.config.js file instead
@@ -95,14 +95,15 @@ def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, for
   args.add("--sourcemap")
 
   globals = dict(WELL_KNOWN_GLOBALS, **ctx.attr.globals)
-  args.add("--external")
   external = globals.keys()
   if not include_tslib:
     external.append("tslib")
-  args.add(external, join_with=",")
+  args.add_joined("--external", external, join_with=",")
 
-  args.add("--globals")
-  args.add(["%s:%s" % g for g in globals.items()], join_with=",")
+  args.add_joined(
+      "--globals",
+      ["%s:%s" % g for g in globals.items()],
+      join_with=",")
 
   args.add("--silent")
 
@@ -251,8 +252,8 @@ def _ng_package_impl(ctx):
   # The order of arguments matters here, as they are read in order in packager.ts.
   packager_args.add(npm_package_directory.path)
   packager_args.add(ctx.label.package)
-  packager_args.add([ctx.bin_dir.path, ctx.label.package], join_with="/")
-  packager_args.add([ctx.genfiles_dir.path, ctx.label.package], join_with="/")
+  packager_args.add_joined([ctx.bin_dir.path, ctx.label.package], join_with="/")
+  packager_args.add_joined([ctx.genfiles_dir.path, ctx.label.package], join_with="/")
 
   # Marshal the metadata into a JSON string so we can parse the data structure
   # in the TypeScript program easily.
@@ -273,19 +274,19 @@ def _ng_package_impl(ctx):
     # placeholder
     packager_args.add("")
 
-  packager_args.add(_flatten_paths(fesm2015), join_with=",")
-  packager_args.add(_flatten_paths(fesm5), join_with=",")
-  packager_args.add(_flatten_paths(esm2015), join_with=",")
-  packager_args.add(_flatten_paths(esm5), join_with=",")
-  packager_args.add(_flatten_paths(bundles), join_with=",")
-  packager_args.add([s.path for s in ctx.files.srcs], join_with=",")
+  packager_args.add_joined(_flatten_paths(fesm2015), join_with=",")
+  packager_args.add_joined(_flatten_paths(fesm5), join_with=",")
+  packager_args.add_joined(_flatten_paths(esm2015), join_with=",")
+  packager_args.add_joined(_flatten_paths(esm5), join_with=",")
+  packager_args.add_joined(_flatten_paths(bundles), join_with=",")
+  packager_args.add_joined([s.path for s in ctx.files.srcs], join_with=",")
 
   # TODO: figure out a better way to gather runfiles providers from the transitive closure.
-  packager_args.add([d.path for d in ctx.files.data], join_with=",")
+  packager_args.add_joined([d.path for d in ctx.files.data], join_with=",")
 
   if ctx.file.license_banner:
     packager_inputs.append(ctx.file.license_banner)
-    packager_args.add(ctx.file.license_banner.path)
+    packager_args.add(ctx.file.license_banner)
   else:
     # placeholder
     packager_args.add("")
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index e4584d6133..66603099d2 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -48,7 +48,7 @@ def _use_plain_rollup(ctx):
 
   strategy = ctx.var['compile']
   return strategy != 'legacy'
-  
+
 
 def run_brotli(ctx, input, output):
   ctx.actions.run(
@@ -61,10 +61,10 @@ def run_brotli(ctx, input, output):
 # Borrowed from bazelbuild/rules_nodejs
 def _run_tsc(ctx, input, output):
   args = ctx.actions.args()
-  args.add(["--target", "es5"])
+  args.add("--target", "es5")
   args.add("--allowJS")
-  args.add(input.path)
-  args.add(["--outFile", output.path])
+  args.add(input)
+  args.add("--outFile", output)
 
   ctx.action(
       executable = ctx.executable._tsc,
diff --git a/tools/ngcontainer/Dockerfile b/tools/ngcontainer/Dockerfile
index 0c3f41421f..f5df95ce06 100644
--- a/tools/ngcontainer/Dockerfile
+++ b/tools/ngcontainer/Dockerfile
@@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
 ###
 # Bazel install
 # See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
-RUN BAZEL_VERSION="0.13.0" \
+RUN BAZEL_VERSION="0.14.0" \
  && wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
  && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
  && apt-get update \
diff --git a/tools/ngcontainer/README.md b/tools/ngcontainer/README.md
index 0a9e0e9d9e..468f8aa87f 100644
--- a/tools/ngcontainer/README.md
+++ b/tools/ngcontainer/README.md
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
 - npm 5.5.1
 - yarn 1.3.2
 - Java 8 (for Closure Compiler and Bazel)
-- Bazel build tool v0.13.0 - http://bazel.build
+- Bazel build tool v0.14.0 - http://bazel.build
 - Google Chrome 63.0.3239.84
 - Mozilla Firefox 47.0.1
 - xvfb (virtual framebuffer) for headless testing

From c2b5ebfa2414aac454adf739df8e1a84734fbfe3 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 4 Jun 2018 10:45:27 -0700
Subject: [PATCH 253/582] build: update buildifier to latest (#24296)

this matches the version in ngcontainer:0.3.1

PR Close #24296
---
 WORKSPACE                                     |  4 +--
 integration/bazel/WORKSPACE                   |  8 ++---
 integration/bazel/src/BUILD.bazel             |  2 +-
 integration/bazel/src/hello-world/BUILD.bazel |  2 +-
 .../src/hello-world/hello-world.component.ts  |  2 +-
 integration/bazel/yarn.lock                   | 15 ++++++---
 integration/cli-hello-world/yarn.lock         | 16 +++-------
 integration/dynamic-compiler/yarn.lock        | 32 ++++++++++---------
 integration/hello_world__closure/yarn.lock    | 26 +++++++--------
 packages/common/locales/BUILD.bazel           |  2 +-
 packages/compiler-cli/BUILD.bazel             |  2 +-
 .../test/ngtsc/fake_core/BUILD.bazel          |  2 +-
 packages/compiler/BUILD.bazel                 |  2 +-
 .../test/bundling/hello_world/BUILD.bazel     |  2 +-
 .../bundling/hello_world_i18n/BUILD.bazel     |  2 +-
 .../test/bundling/hello_world_r2/BUILD.bazel  |  2 +-
 packages/core/test/bundling/todo/BUILD.bazel  |  2 +-
 packages/elements/schematics/BUILD.bazel      |  2 +-
 .../elements/schematics/ng-add/BUILD.bazel    |  2 +-
 packages/language-service/BUILD.bazel         |  2 +-
 packages/service-worker/cli/BUILD.bazel       |  2 +-
 tools/ts-api-guardian/BUILD.bazel             |  4 +--
 22 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 783c1db17d..290243dc3e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -34,13 +34,13 @@ http_archive(
 # This commit matches the version of buildifier in angular/ngcontainer
 # If you change this, also check if it matches the version in the angular/ngcontainer
 # version in /.circleci/config.yml
-BAZEL_BUILDTOOLS_VERSION = "fd9878fd5de921e0bbab3dcdcb932c2627812ee1"
+BAZEL_BUILDTOOLS_VERSION = "82b21607e00913b16fe1c51bec80232d9d6de31c"
 
 http_archive(
     name = "com_github_bazelbuild_buildtools",
     url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
     strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
-    sha256 = "27bb461ade23fd44ba98723ad98f84ee9c83cd3540b773b186a1bc5037f3d862",
+    sha256 = "edb24c2f9c55b10a820ec74db0564415c0cf553fa55e9fc709a6332fb6685eff",
 )
 
 # Fetching the Bazel source code allows us to compile the Skylark linter
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index c5ca087d80..ac95a4132e 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -33,9 +33,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_sass",
-    url = "https://github.com/bazelbuild/rules_sass/archive/0.0.3.zip",
-    strip_prefix = "rules_sass-0.0.3",
-    sha256 = "8fa98e7b48a5837c286a1ea254b5a5c592fced819ee9fe4fdd759768d97be868",
+    url = "https://github.com/bazelbuild/rules_sass/archive/0.1.0.zip",
+    strip_prefix = "rules_sass-0.1.0",
+    sha256 = "b243c4d64f054c174051785862ab079050d90b37a1cef7da93821c6981cb9ad4",
 )
 
 #
@@ -64,7 +64,7 @@ load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 
 sass_repositories()
 
diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index f82312302e..c7a0f0249b 100644
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@@ -27,7 +27,7 @@ ts_devserver(
     deps = ["//src"],
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "rollup_bundle")
 
 rollup_bundle(
     name = "bundle",
diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
index 8ee3e2ed1a..ebe071cc49 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -15,7 +15,7 @@ ng_module(
         ["*.ts"],
         exclude = ["*.spec.ts"],
     ),
-    assets = [":hello-world-styles.css"],
+    assets = [":hello-world-styles"],
     tsconfig = "//src:tsconfig.json",
     # FIXME(alexeagle): the rxjs dep should come from Angular, but if we use the
     # npm distro of angular there is no ts_library rule to propagate the dep.
diff --git a/integration/bazel/src/hello-world/hello-world.component.ts b/integration/bazel/src/hello-world/hello-world.component.ts
index d741a1833b..5386c63607 100644
--- a/integration/bazel/src/hello-world/hello-world.component.ts
+++ b/integration/bazel/src/hello-world/hello-world.component.ts
@@ -8,7 +8,7 @@ import {Component, NgModule} from '@angular/core';
     <input type="text" [value]="name" (input)="name = $event.target.value"/>
   `,
   // TODO: might be better to point to .scss so this looks valid at design-time
-  styleUrls: ['./hello-world-styles.css'],
+  styleUrls: ['./hello-world.component.css'],
 })
 export class HelloWorldComponent {
   name: string = 'world';
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index d7289ac005..2612d49100 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -10,6 +10,7 @@
 "@angular/bazel@file:../../dist/packages-dist/bazel":
   version "6.0.0-rc.5"
   dependencies:
+    "@bazel/typescript" "^0.15.0"
     "@types/node" "6.0.84"
     "@types/shelljs" "0.7.7"
     protobufjs "5.0.0"
@@ -26,7 +27,7 @@
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.27.2"
+    tsickle "^0.29.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
   version "6.0.0-rc.5"
@@ -48,6 +49,10 @@
   dependencies:
     tslib "^1.9.0"
 
+"@bazel/typescript@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.15.0.tgz#bd588b8b9fcc5763c3f14787fdb29ba4e127258d"
+
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
@@ -1515,9 +1520,9 @@ tree-kill@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 
-tsickle@^0.27.2:
-  version "0.27.5"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.5.tgz#41e1a41a5acf971cbb2b0558a9590779234d591f"
+tsickle@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -1539,7 +1544,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 "typescript@file:../../node_modules/typescript":
-  version "2.8.3"
+  version "2.7.2"
 
 ultron@1.0.x:
   version "1.0.2"
diff --git a/integration/cli-hello-world/yarn.lock b/integration/cli-hello-world/yarn.lock
index 9f776ee46c..2680a734eb 100644
--- a/integration/cli-hello-world/yarn.lock
+++ b/integration/cli-hello-world/yarn.lock
@@ -128,7 +128,7 @@
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.27.2"
+    tsickle "^0.29.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
   version "6.0.0-rc.5"
@@ -5599,14 +5599,8 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.0.0-beta.3, rxjs@^6.0.0-turbo-rc.4:
+rxjs@^6.0.0-beta.3, rxjs@^6.0.0-turbo-rc.4, "rxjs@file:../../node_modules/rxjs":
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
-  dependencies:
-    tslib "^1.9.0"
-
-"rxjs@file:../../node_modules/rxjs":
-  version "6.0.0-uncanny-rc.7"
   dependencies:
     tslib "^1.9.0"
 
@@ -6538,9 +6532,9 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
-tsickle@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
+tsickle@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
diff --git a/integration/dynamic-compiler/yarn.lock b/integration/dynamic-compiler/yarn.lock
index 2363e21a0e..b9d169b0b3 100644
--- a/integration/dynamic-compiler/yarn.lock
+++ b/integration/dynamic-compiler/yarn.lock
@@ -3,45 +3,45 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.27.2"
+    tsickle "^0.29.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@file:../../dist/packages-dist/platform-server":
-  version "6.0.0-beta.7-54970933bb"
+  version "6.0.0-rc.5"
   dependencies:
     domino "^2.0.1"
     tslib "^1.9.0"
@@ -1881,7 +1881,9 @@ rx@4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
 "rxjs@file:../../node_modules/rxjs":
-  version "6.0.0-alpha.3"
+  version "6.0.0"
+  dependencies:
+    tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
@@ -2223,9 +2225,9 @@ tree-kill@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 
-tsickle@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
+tsickle@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -2247,7 +2249,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 "typescript@file:../../node_modules/typescript":
-  version "2.6.2"
+  version "2.7.2"
 
 ua-parser-js@0.7.12:
   version "0.7.12"
@@ -2454,4 +2456,4 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
 "zone.js@file:../../node_modules/zone.js":
-  version "0.8.20"
+  version "0.8.26"
diff --git a/integration/hello_world__closure/yarn.lock b/integration/hello_world__closure/yarn.lock
index d36d0d2897..411a3193ca 100644
--- a/integration/hello_world__closure/yarn.lock
+++ b/integration/hello_world__closure/yarn.lock
@@ -3,40 +3,40 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.27.2"
+    tsickle "^0.29.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@file:../../dist/packages-dist/platform-server":
-  version "6.0.0-rc.1-461a08bdc1"
+  version "6.0.0-rc.5"
   dependencies:
     domino "^2.0.1"
     tslib "^1.9.0"
@@ -1835,7 +1835,7 @@ rx@4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
 "rxjs@file:../../node_modules/rxjs":
-  version "6.0.0-rc.0"
+  version "6.0.0"
   dependencies:
     tslib "^1.9.0"
 
@@ -2180,9 +2180,9 @@ tree-kill@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 
-tsickle@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
+tsickle@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -2424,4 +2424,4 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
 "zone.js@file:../../node_modules/zone.js":
-  version "0.8.20"
+  version "0.8.26"
diff --git a/packages/common/locales/BUILD.bazel b/packages/common/locales/BUILD.bazel
index 2c330e32ac..2ee8afc3a1 100644
--- a/packages/common/locales/BUILD.bazel
+++ b/packages/common/locales/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "npm_package")
+load("//tools:defaults.bzl", "npm_package", "ts_library")
 
 ts_library(
     name = "locales",
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index e10d0f4d2e..867afd5333 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "npm_package")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_config")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_config", "ts_library")
 
 ts_config(
     name = "tsconfig",
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel b/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel
index 9914a4e07f..b8af5238a3 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel
+++ b/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ng_package")
+load("//tools:defaults.bzl", "ng_package", "ts_library")
 
 ts_library(
     name = "fake_core",
diff --git a/packages/compiler/BUILD.bazel b/packages/compiler/BUILD.bazel
index 4c269ffb73..db8920628e 100644
--- a/packages/compiler/BUILD.bazel
+++ b/packages/compiler/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ng_package")
+load("//tools:defaults.bzl", "ng_package", "ts_library")
 
 ts_library(
     name = "compiler",
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index 786a215b92..ef122d93fa 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
+load("//tools:defaults.bzl", "ivy_ng_module", "ts_library")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
index 60b4084d98..5dcf0fe0de 100644
--- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
+load("//tools:defaults.bzl", "ivy_ng_module", "ts_library")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("//tools/http-server:http_server.bzl", "http_server")
 
diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
index 0051558e3b..28a561e7a0 100644
--- a/packages/core/test/bundling/hello_world_r2/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ng_module")
+load("//tools:defaults.bzl", "ng_module", "ts_library")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index e3fd43ba1a..ca386bde01 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
+load("//tools:defaults.bzl", "ivy_ng_module", "ts_library")
 load("//tools/http-server:http_server.bzl", "http_server")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
diff --git a/packages/elements/schematics/BUILD.bazel b/packages/elements/schematics/BUILD.bazel
index f95ea9c95a..1ab8a09b61 100644
--- a/packages/elements/schematics/BUILD.bazel
+++ b/packages/elements/schematics/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "npm_package")
+load("//tools:defaults.bzl", "npm_package", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 exports_files([
diff --git a/packages/elements/schematics/ng-add/BUILD.bazel b/packages/elements/schematics/ng-add/BUILD.bazel
index 432f02e661..fb9d93fc02 100644
--- a/packages/elements/schematics/ng-add/BUILD.bazel
+++ b/packages/elements/schematics/ng-add/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "npm_package")
+load("//tools:defaults.bzl", "npm_package", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
index b042e693b5..66acec4ca0 100644
--- a/packages/language-service/BUILD.bazel
+++ b/packages/language-service/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "npm_package")
+load("//tools:defaults.bzl", "npm_package", "ts_library")
 
 ts_library(
     name = "language-service",
diff --git a/packages/service-worker/cli/BUILD.bazel b/packages/service-worker/cli/BUILD.bazel
index 59cebe49a7..089d5b3ced 100644
--- a/packages/service-worker/cli/BUILD.bazel
+++ b/packages/service-worker/cli/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library", "npm_package")
+load("//tools:defaults.bzl", "npm_package", "ts_library")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 
 ts_library(
diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel
index 98a7fccd8b..977d9bf323 100644
--- a/tools/ts-api-guardian/BUILD.bazel
+++ b/tools/ts-api-guardian/BUILD.bazel
@@ -1,9 +1,9 @@
 load(
     "@build_bazel_rules_nodejs//:defs.bzl",
-    "nodejs_binary",
     "jasmine_node_test",
-    "npm_package",
     "node_modules_filegroup",
+    "nodejs_binary",
+    "npm_package",
 )
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 

From 70ef061fa6d8ed74e1e04d00bd1fafbd7a6b6297 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Wed, 13 Jun 2018 09:02:26 -0700
Subject: [PATCH 254/582] fix(ivy): remove debugger statement (#24480)

PR Close #24480
---
 packages/core/src/di/injector.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index e0286e80b4..0dedf6e2a4 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -34,7 +34,8 @@ export class NullInjector implements Injector {
     if (notFoundValue === _THROW_IF_NOT_FOUND) {
       // Intentionally left behind: With dev tools open the debugger will stop here. There is no
       // reason why correctly written application should cause this exception.
-      debugger;
+      // TODO(misko): uncomment the next line once `ngDevMode` works with closure.
+      // if(ngDevMode) debugger;
       throw new Error(`NullInjectorError: No provider for ${stringify(token)}!`);
     }
     return notFoundValue;

From 5731d0741ab418772b31548ec7a89305fe7d813c Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Fri, 6 Apr 2018 15:56:36 -0700
Subject: [PATCH 255/582] fix(router): fix lazy loading of aux routes (#23459)

Fixes #10981

PR Close #23459
---
 .../router/src/components/empty_outlet.ts     | 22 ++++++
 packages/router/src/config.ts                 | 20 ++++--
 packages/router/src/private_export.ts         |  1 +
 packages/router/src/router.ts                 |  4 +-
 packages/router/src/router_config_loader.ts   |  5 +-
 packages/router/src/router_module.ts          | 10 ++-
 packages/router/test/config.spec.ts           | 16 +++--
 packages/router/test/integration.spec.ts      | 70 +++++++++++++++++++
 8 files changed, 131 insertions(+), 17 deletions(-)
 create mode 100644 packages/router/src/components/empty_outlet.ts

diff --git a/packages/router/src/components/empty_outlet.ts b/packages/router/src/components/empty_outlet.ts
new file mode 100644
index 0000000000..d5e99f5e68
--- /dev/null
+++ b/packages/router/src/components/empty_outlet.ts
@@ -0,0 +1,22 @@
+/**
+ * @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';
+
+/**
+ * This component is used internally within the router to be a placeholder when an empty
+ * router-outlet is needed. For example, with a config such as:
+ *
+ * `{path: 'parent', outlet: 'nav', children: [...]}`
+ *
+ * In order to render, there needs to be a component on this config, which will default
+ * to this `EmptyOutletComponent`.
+ */
+@Component({template: `<router-outlet></router-outlet>`})
+export class EmptyOutletComponent {
+}
\ No newline at end of file
diff --git a/packages/router/src/config.ts b/packages/router/src/config.ts
index b1fe4b1e86..26512fbb28 100644
--- a/packages/router/src/config.ts
+++ b/packages/router/src/config.ts
@@ -8,6 +8,7 @@
 
 import {NgModuleFactory, NgModuleRef, Type} from '@angular/core';
 import {Observable} from 'rxjs';
+import {EmptyOutletComponent} from './components/empty_outlet';
 import {PRIMARY_OUTLET} from './shared';
 import {UrlSegment, UrlSegmentGroup} from './url_tree';
 
@@ -412,9 +413,10 @@ function validateNode(route: Route, fullPath: string): void {
   if (Array.isArray(route)) {
     throw new Error(`Invalid configuration of route '${fullPath}': Array cannot be specified`);
   }
-  if (!route.component && (route.outlet && route.outlet !== PRIMARY_OUTLET)) {
+  if (!route.component && !route.children && !route.loadChildren &&
+      (route.outlet && route.outlet !== PRIMARY_OUTLET)) {
     throw new Error(
-        `Invalid configuration of route '${fullPath}': a componentless route cannot have a named outlet set`);
+        `Invalid configuration of route '${fullPath}': a componentless route without children or loadChildren cannot have a named outlet set`);
   }
   if (route.redirectTo && route.children) {
     throw new Error(
@@ -477,8 +479,14 @@ function getFullPath(parentPath: string, currentRoute: Route): string {
   }
 }
 
-
-export function copyConfig(r: Route): Route {
-  const children = r.children && r.children.map(copyConfig);
-  return children ? {...r, children} : {...r};
+/**
+ * Makes a copy of the config and adds any default required properties.
+ */
+export function standardizeConfig(r: Route): Route {
+  const children = r.children && r.children.map(standardizeConfig);
+  const c = children ? {...r, children} : {...r};
+  if (!c.component && (children || c.loadChildren) && (c.outlet && c.outlet !== PRIMARY_OUTLET)) {
+    c.component = EmptyOutletComponent;
+  }
+  return c;
 }
diff --git a/packages/router/src/private_export.ts b/packages/router/src/private_export.ts
index 1075f6e4ce..aca5be0260 100644
--- a/packages/router/src/private_export.ts
+++ b/packages/router/src/private_export.ts
@@ -7,5 +7,6 @@
  */
 
 
+export {EmptyOutletComponent as ɵEmptyOutletComponent} from './components/empty_outlet';
 export {ROUTER_PROVIDERS as ɵROUTER_PROVIDERS} from './router_module';
 export {flatten as ɵflatten} from './utils/collection';
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index b4f28a84c0..f68be1ba97 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -12,7 +12,7 @@ import {BehaviorSubject, Observable, Subject, Subscription, of } from 'rxjs';
 import {concatMap, map, mergeMap} from 'rxjs/operators';
 
 import {applyRedirects} from './apply_redirects';
-import {LoadedRouterConfig, QueryParamsHandling, Route, Routes, copyConfig, validateConfig} from './config';
+import {LoadedRouterConfig, QueryParamsHandling, Route, Routes, standardizeConfig, validateConfig} from './config';
 import {createRouterState} from './create_router_state';
 import {createUrlTree} from './create_url_tree';
 import {ActivationEnd, ChildActivationEnd, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, NavigationTrigger, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RoutesRecognized} from './events';
@@ -357,7 +357,7 @@ export class Router {
    */
   resetConfig(config: Routes): void {
     validateConfig(config);
-    this.config = config.map(copyConfig);
+    this.config = config.map(standardizeConfig);
     this.navigated = false;
     this.lastSuccessfulId = -1;
   }
diff --git a/packages/router/src/router_config_loader.ts b/packages/router/src/router_config_loader.ts
index 861df08248..292dc669ac 100644
--- a/packages/router/src/router_config_loader.ts
+++ b/packages/router/src/router_config_loader.ts
@@ -10,7 +10,7 @@ import {Compiler, InjectionToken, Injector, NgModuleFactory, NgModuleFactoryLoad
 // TODO(i): switch to fromPromise once it's expored in rxjs
 import {Observable, from, of } from 'rxjs';
 import {map, mergeMap} from 'rxjs/operators';
-import {LoadChildren, LoadedRouterConfig, Route, copyConfig} from './config';
+import {LoadChildren, LoadedRouterConfig, Route, standardizeConfig} from './config';
 import {flatten, wrapIntoObservable} from './utils/collection';
 
 /**
@@ -39,7 +39,8 @@ export class RouterConfigLoader {
 
       const module = factory.create(parentInjector);
 
-      return new LoadedRouterConfig(flatten(module.injector.get(ROUTES)).map(copyConfig), module);
+      return new LoadedRouterConfig(
+          flatten(module.injector.get(ROUTES)).map(standardizeConfig), module);
     }));
   }
 
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index 8a0c1c8bd6..b4a7eca8bd 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -11,6 +11,7 @@ import {ANALYZE_FOR_ENTRY_COMPONENTS, APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, A
 import {ɵgetDOM as getDOM} from '@angular/platform-browser';
 import {Subject, of } from 'rxjs';
 
+import {EmptyOutletComponent} from './components/empty_outlet';
 import {Route, Routes} from './config';
 import {RouterLink, RouterLinkWithHref} from './directives/router_link';
 import {RouterLinkActive} from './directives/router_link_active';
@@ -36,7 +37,8 @@ import {flatten} from './utils/collection';
  *
  *
  */
-const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive];
+const ROUTER_DIRECTIVES =
+    [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, EmptyOutletComponent];
 
 /**
  * @description
@@ -128,7 +130,11 @@ export function routerNgProbeToken() {
  *
  *
  */
-@NgModule({declarations: ROUTER_DIRECTIVES, exports: ROUTER_DIRECTIVES})
+@NgModule({
+  declarations: ROUTER_DIRECTIVES,
+  exports: ROUTER_DIRECTIVES,
+  entryComponents: [EmptyOutletComponent]
+})
 export class RouterModule {
   // Note: We are injecting the Router so it gets created eagerly...
   constructor(@Optional() @Inject(ROUTER_FORROOT_GUARD) guard: any, @Optional() router: Router) {}
diff --git a/packages/router/test/config.spec.ts b/packages/router/test/config.spec.ts
index 9ef3037c69..1f419f2b0e 100644
--- a/packages/router/test/config.spec.ts
+++ b/packages/router/test/config.spec.ts
@@ -123,21 +123,27 @@ describe('config', () => {
          }).toThrowError(/Invalid configuration of route '{path: "", redirectTo: "b"}'/);
        });
 
-    it('should throw when pathPatch is invalid', () => {
+    it('should throw when pathMatch is invalid', () => {
       expect(() => { validateConfig([{path: 'a', pathMatch: 'invalid', component: ComponentB}]); })
           .toThrowError(
               /Invalid configuration of route 'a': pathMatch can only be set to 'prefix' or 'full'/);
     });
 
-    it('should throw when pathPatch is invalid', () => {
-      expect(() => { validateConfig([{path: 'a', outlet: 'aux', children: []}]); })
+    it('should throw when path/outlet combination is invalid', () => {
+      expect(() => { validateConfig([{path: 'a', outlet: 'aux'}]); })
           .toThrowError(
-              /Invalid configuration of route 'a': a componentless route cannot have a named outlet set/);
-
+              /Invalid configuration of route 'a': a componentless route without children or loadChildren cannot have a named outlet set/);
       expect(() => validateConfig([{path: 'a', outlet: '', children: []}])).not.toThrow();
       expect(() => validateConfig([{path: 'a', outlet: PRIMARY_OUTLET, children: []}]))
           .not.toThrow();
     });
+
+    it('should not throw when path/outlet combination is valid', () => {
+      expect(() => { validateConfig([{path: 'a', outlet: 'aux', children: []}]); }).not.toThrow();
+      expect(() => {
+        validateConfig([{path: 'a', outlet: 'aux', loadChildren: 'child'}]);
+      }).not.toThrow();
+    });
   });
 });
 
diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
index bdbfdb3f4d..80d4695ae1 100644
--- a/packages/router/test/integration.spec.ts
+++ b/packages/router/test/integration.spec.ts
@@ -3366,6 +3366,72 @@ describe('Integration', () => {
              expect(location.path()).toEqual('/lazy2/loaded');
            })));
 
+    it('should allow lazy loaded module in named outlet',
+       fakeAsync(inject(
+           [Router, NgModuleFactoryLoader], (router: Router, loader: SpyNgModuleFactoryLoader) => {
+
+             @Component({selector: 'lazy', template: 'lazy-loaded'})
+             class LazyComponent {
+             }
+
+             @NgModule({
+               declarations: [LazyComponent],
+               imports: [RouterModule.forChild([{path: '', component: LazyComponent}])]
+             })
+             class LazyLoadedModule {
+             }
+
+             loader.stubbedModules = {lazyModule: LazyLoadedModule};
+
+             const fixture = createRoot(router, RootCmp);
+
+             router.resetConfig([{
+               path: 'team/:id',
+               component: TeamCmp,
+               children: [
+                 {path: 'user/:name', component: UserCmp},
+                 {path: 'lazy', loadChildren: 'lazyModule', outlet: 'right'},
+               ]
+             }]);
+
+
+             router.navigateByUrl('/team/22/user/john');
+             advance(fixture);
+
+             expect(fixture.nativeElement).toHaveText('team 22 [ user john, right:  ]');
+
+             router.navigateByUrl('/team/22/(user/john//right:lazy)');
+             advance(fixture);
+
+             expect(fixture.nativeElement).toHaveText('team 22 [ user john, right: lazy-loaded ]');
+           })));
+
+    it('should allow componentless named outlet to render children',
+       fakeAsync(inject(
+           [Router, NgModuleFactoryLoader], (router: Router, loader: SpyNgModuleFactoryLoader) => {
+
+             const fixture = createRoot(router, RootCmp);
+
+             router.resetConfig([{
+               path: 'team/:id',
+               component: TeamCmp,
+               children: [
+                 {path: 'user/:name', component: UserCmp},
+                 {path: 'simple', outlet: 'right', children: [{path: '', component: SimpleCmp}]},
+               ]
+             }]);
+
+
+             router.navigateByUrl('/team/22/user/john');
+             advance(fixture);
+
+             expect(fixture.nativeElement).toHaveText('team 22 [ user john, right:  ]');
+
+             router.navigateByUrl('/team/22/(user/john//right:simple)');
+             advance(fixture);
+
+             expect(fixture.nativeElement).toHaveText('team 22 [ user john, right: simple ]');
+           })));
 
     describe('should use the injector of the lazily-loaded configuration', () => {
       class LazyLoadedServiceDefinedInModule {}
@@ -4102,6 +4168,10 @@ function createRoot(router: Router, type: any): ComponentFixture<any> {
   return f;
 }
 
+@Component({selector: 'lazy', template: 'lazy-loaded'})
+class LazyComponent {
+}
+
 
 @NgModule({
   imports: [RouterTestingModule, CommonModule],

From 153ba4dff3ac941ad38743b35e3f58522b8b29c9 Mon Sep 17 00:00:00 2001
From: Shaun Grady <grady@shaungrady.com>
Date: Thu, 22 Feb 2018 09:42:56 -0800
Subject: [PATCH 256/582] docs(aio): Reorganize style guide sections on
 prefixing components/directives (#22571)

Closes https://github.com/angular/angular/issues/22081

PR Close #22571
---
 aio/content/guide/styleguide.md | 142 ++++++++++++++++----------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/aio/content/guide/styleguide.md b/aio/content/guide/styleguide.md
index 8ddf7ab8b0..52fe100c7c 100644
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@@ -933,29 +933,18 @@ As always, strive for consistency.
 
 <a href="#toc">Back to top</a>
 
-{@a 02-06}
+{@a 05-02}
 
-### Directive selectors
+### Component selectors
 
-#### Style 02-06
+#### Style 05-02
 
 
 <div class="s-rule do">
 
 
 
-**Do** Use lower camel case for naming the selectors of directives.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** Keeps the names of the properties defined in the directives that are bound to the view consistent with the attribute names.
+**Do** use _dashed-case_ or _kebab-case_ for naming the element selectors of components.
 
 
 </div>
@@ -966,16 +955,40 @@ As always, strive for consistency.
 
 
 
-**Why?** The Angular HTML parser is case sensitive and recognizes lower camel case.
+**Why?** Keeps the element names consistent with the specification for [Custom Elements](https://www.w3.org/TR/custom-elements/).
 
 
 </div>
 
+
+
+<code-example path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+
+</code-example>
+
+
+
+
+
+<code-tabs>
+
+  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
+
+  </code-pane>
+
+  <code-pane title="app/app.component.html" path="styleguide/src/05-02/app/app.component.html">
+
+  </code-pane>
+
+</code-tabs>
+
+
+
 <a href="#toc">Back to top</a>
 
 {@a 02-07}
 
-### Custom prefix for components
+### Component custom prefix
 
 #### Style 02-07
 
@@ -1078,11 +1091,51 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the
 
 
 
+<a href="#toc">Back to top</a>
 
+{@a 02-06}
+
+### Directive selectors
+
+#### Style 02-06
+
+
+<div class="s-rule do">
+
+
+
+**Do** Use lower camel case for naming the selectors of directives.
+
+
+</div>
+
+
+
+<div class="s-why">
+
+
+
+**Why?** Keeps the names of the properties defined in the directives that are bound to the view consistent with the attribute names.
+
+
+</div>
+
+
+
+<div class="s-why-last">
+
+
+
+**Why?** The Angular HTML parser is case sensitive and recognizes lower camel case.
+
+
+</div>
+
+<a href="#toc">Back to top</a>
 
 {@a 02-08}
 
-### Custom prefix for directives
+### Directive custom prefix
 
 #### Style 02-08
 
@@ -3710,59 +3763,6 @@ A typical *lazy loaded folder* contains a *routing component*, its child compone
 
 ## Components
 
-{@a 05-02}
-
-### Component selector names
-
-#### Style 05-02
-
-
-<div class="s-rule do">
-
-
-
-**Do** use _dashed-case_ or _kebab-case_ for naming the element selectors of components.
-
-
-</div>
-
-
-
-<div class="s-why-last">
-
-
-
-**Why?** Keeps the element names consistent with the specification for [Custom Elements](https://www.w3.org/TR/custom-elements/).
-
-
-</div>
-
-
-
-<code-example path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
-
-</code-example>
-
-
-
-
-
-<code-tabs>
-
-  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
-
-  </code-pane>
-
-  <code-pane title="app/app.component.html" path="styleguide/src/05-02/app/app.component.html">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
-<a href="#toc">Back to top</a>
-
 {@a 05-03}
 
 ### Components as elements

From e3c54e4465e7387ec103f43a2cc615f088d163f2 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Wed, 6 Jun 2018 17:30:48 +0200
Subject: [PATCH 257/582] refactor(ivy): use comment nodes to mark view
 containers (#24346)

PR Close #24346
---
 packages/core/src/render3/STATUS.md           |   2 +-
 packages/core/src/render3/di.ts               |  14 +-
 packages/core/src/render3/instructions.ts     |  22 +-
 packages/core/src/render3/interfaces/node.ts  |  16 +-
 .../core/src/render3/interfaces/renderer.ts   |   4 +
 .../core/src/render3/node_manipulation.ts     | 211 +++++++-----------
 .../bundling/todo/bundle.golden_symbols.json  |  12 +-
 .../core/test/render3/control_flow_spec.ts    |  72 +++++-
 packages/core/test/render3/query_spec.ts      |   5 +-
 packages/core/test/render3/render_util.ts     |   9 +-
 .../test/render3/view_container_ref_spec.ts   |   2 +-
 11 files changed, 191 insertions(+), 178 deletions(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index a8de96258b..20f59c399a 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -266,7 +266,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `data()`                            |  n/a    |
 | `destroy()`                         |  ✅     |
 | `createElement()`                   |  ✅     |
-| `createComment()`                   |  n/a    |
+| `createComment()`                   |  ✅    |
 | `createText()`                      |  ✅     |
 | `destroyNode()`                     |  ✅     |
 | `appendChild()`                     |  ✅     |
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index c6bac64a82..3200038789 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -26,9 +26,9 @@ import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
-import {DIRECTIVES, HOST_NODE, INJECTOR, LViewData, QUERIES, TVIEW, TView} from './interfaces/view';
+import {DIRECTIVES, HOST_NODE, INJECTOR, LViewData, QUERIES, RENDERER, TVIEW, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
-import {detachView, getParentLNode, insertView, removeView} from './node_manipulation';
+import {appendChild, detachView, getParentLNode, insertView, removeView} from './node_manipulation';
 import {notImplemented, stringify} from './util';
 import {EmbeddedViewRef, ViewRef} from './view_ref';
 
@@ -526,8 +526,7 @@ export class ReadFromInjectorFn<T> {
  * @returns The ElementRef instance to use
  */
 export function getOrCreateElementRef(di: LInjector): viewEngine_ElementRef {
-  return di.elementRef || (di.elementRef = new ElementRef(
-                               di.node.tNode.type === TNodeType.Container ? null : di.node.native));
+  return di.elementRef || (di.elementRef = new ElementRef(di.node.native));
 }
 
 export const QUERY_READ_TEMPLATE_REF = <QueryReadType<viewEngine_TemplateRef<any>>>(
@@ -574,8 +573,10 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
     ngDevMode && assertNodeOfPossibleTypes(vcRefHost, TNodeType.Container, TNodeType.Element);
     const hostParent = getParentLNode(vcRefHost) !;
     const lContainer = createLContainer(hostParent, vcRefHost.view, true);
+    const comment = vcRefHost.view[RENDERER].createComment(ngDevMode ? 'container' : '');
     const lContainerNode: LContainerNode = createLNodeObject(
-        TNodeType.Container, vcRefHost.view, hostParent, undefined, lContainer, null);
+        TNodeType.Container, vcRefHost.view, hostParent, comment, lContainer, null);
+    appendChild(hostParent, comment, vcRefHost.view);
 
 
     if (vcRefHost.queries) {
@@ -648,9 +649,6 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
     (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
 
     insertView(this._lContainerNode, lViewNode, adjustedIdx);
-    // invalidate cache of next sibling RNode (we do similar operation in the containerRefreshEnd
-    // instruction)
-    this._lContainerNode.native = undefined;
 
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 133decaf37..d6debea1f8 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -24,7 +24,7 @@ import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
-import {RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
+import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
 
@@ -308,7 +308,7 @@ export function createLViewData<T>(
  */
 export function createLNodeObject(
     type: TNodeType, currentView: LViewData, parent: LNode | null,
-    native: RText | RElement | null | undefined, state: any,
+    native: RText | RElement | RComment | null, state: any,
     queries: LQueries | null): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
   return {
     native: native as any,
@@ -341,15 +341,15 @@ export function createLNode(
     index: number, type: TNodeType.View, native: null, name: null, attrs: null,
     lViewData: LViewData): LViewNode;
 export function createLNode(
-    index: number, type: TNodeType.Container, native: undefined, name: string | null,
+    index: number, type: TNodeType.Container, native: RComment, name: string | null,
     attrs: TAttributes | null, lContainer: LContainer): LContainerNode;
 export function createLNode(
     index: number, type: TNodeType.Projection, native: null, name: null, attrs: TAttributes | null,
     lProjection: LProjection): LProjectionNode;
 export function createLNode(
-    index: number, type: TNodeType, native: RText | RElement | null | undefined,
-    name: string | null, attrs: TAttributes | null, state?: null | LViewData | LContainer |
-        LProjection): LElementNode&LTextNode&LViewNode&LContainerNode&LProjectionNode {
+    index: number, type: TNodeType, native: RText | RElement | RComment | null, name: string | null,
+    attrs: TAttributes | null, state?: null | LViewData | LContainer | LProjection): LElementNode&
+    LTextNode&LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
                             previousOrParentNode && getParentLNode(previousOrParentNode) !as LNode;
   // Parents cannot cross component boundaries because components will be used in multiple places,
@@ -1571,8 +1571,10 @@ export function container(
   const currentParent = isParent ? previousOrParentNode : getParentLNode(previousOrParentNode) !;
   const lContainer = createLContainer(currentParent, viewData);
 
-  const node = createLNode(
-      index, TNodeType.Container, undefined, tagName || null, attrs || null, lContainer);
+  const comment = renderer.createComment(ngDevMode ? 'container' : '');
+  const node =
+      createLNode(index, TNodeType.Container, comment, tagName || null, attrs || null, lContainer);
+  appendChild(getParentLNode(node), comment, viewData);
 
   if (firstTemplatePass) {
     node.tNode.tViews =
@@ -1609,9 +1611,6 @@ export function containerRefreshStart(index: number): void {
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   isParent = true;
   (previousOrParentNode as LContainerNode).data[ACTIVE_INDEX] = 0;
-  ngDevMode && assertSame(
-                   (previousOrParentNode as LContainerNode).native, undefined,
-                   `the container's native element should not have been set yet.`);
 
   if (!checkNoChangesMode) {
     // We need to execute init hooks here so ngOnInit hooks are called in top level views
@@ -1635,7 +1634,6 @@ export function containerRefreshEnd(): void {
   }
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   const container = previousOrParentNode as LContainerNode;
-  container.native = undefined;
   ngDevMode && assertNodeType(container, TNodeType.Container);
   const nextIndex = container.data[ACTIVE_INDEX] !;
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index b295a49ef0..5b0034bbb0 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -10,7 +10,7 @@ import {LContainer} from './container';
 import {LInjector} from './injector';
 import {LProjection} from './projection';
 import {LQueries} from './query';
-import {RElement, RText} from './renderer';
+import {RComment, RElement, RText} from './renderer';
 import {LViewData, TView} from './view';
 
 
@@ -63,7 +63,7 @@ export interface LNode {
    *  - append children to their element parents in the DOM (e.g. `parent.native.appendChild(...)`)
    *  - retrieve the sibling elements of text nodes whose creation / insertion has been delayed
    */
-  readonly native: RElement|RText|null|undefined;
+  readonly native: RComment|RElement|RText|null;
 
   /**
    * If regular LElementNode, then `data` will be null.
@@ -141,13 +141,13 @@ export interface LViewNode extends LNode {
 /** Abstract node container which contains other views. */
 export interface LContainerNode extends LNode {
   /*
-   * Caches the reference of the first native node following this container in the same native
-   * parent.
-   * This is reset to undefined in containerRefreshEnd.
-   * When it is undefined, it means the value has not been computed yet.
-   * Otherwise, it contains the result of findBeforeNode(container, null).
+   * This comment node is appended to the container's parent element to mark where
+   * in the DOM the container's child views should be added.
+   *
+   * If the container is a root node of a view, this comment will not be appended
+   * until the parent view is processed.
    */
-  native: RElement|RText|null|undefined;
+  native: RComment;
   readonly data: LContainer;
 }
 
diff --git a/packages/core/src/render3/interfaces/renderer.ts b/packages/core/src/render3/interfaces/renderer.ts
index 2bc0775a00..46ec25e317 100644
--- a/packages/core/src/render3/interfaces/renderer.ts
+++ b/packages/core/src/render3/interfaces/renderer.ts
@@ -35,6 +35,7 @@ export type Renderer3 = ObjectOrientedRenderer3 | ProceduralRenderer3;
  * (reducing payload size).
  * */
 export interface ObjectOrientedRenderer3 {
+  createComment(data: string): RComment;
   createElement(tagName: string): RElement;
   createElementNS(namespace: string, tagName: string): RElement;
   createTextNode(data: string): RText;
@@ -57,6 +58,7 @@ export function isProceduralRenderer(renderer: ProceduralRenderer3 | ObjectOrien
  */
 export interface ProceduralRenderer3 {
   destroy(): void;
+  createComment(value: string): RComment;
   createElement(name: string, namespace?: string|null): RElement;
   createText(value: string): RText;
   /**
@@ -144,6 +146,8 @@ export interface RDomTokenList {
 
 export interface RText extends RNode { textContent: string|null; }
 
+export interface RComment extends RNode {}
+
 // Note: This hack is necessary so we don't erroneously get a circular dependency
 // failure based on types.
 export const unusedValueExportToPlacateAjd = 1;
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index a04d6359ec..743a453f5c 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -10,60 +10,13 @@ import {callHooks} from './hooks';
 import {LContainer, RENDER_PARENT, VIEWS, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
 import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
-import {ProceduralRenderer3, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
+import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {CLEANUP, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
 import {assertNodeType} from './node_assert';
 import {stringify} from './util';
 
 const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4 + unused5;
 
-/**
- * Returns the first RNode following the given LNode in the same parent DOM element.
- *
- * This is needed in order to insert the given node with insertBefore.
- *
- * @param node The node whose following DOM node must be found.
- * @param stopNode A parent node at which the lookup in the tree should be stopped, or null if the
- * lookup should not be stopped until the result is found.
- * @returns RNode before which the provided node should be inserted or null if the lookup was
- * stopped
- * or if there is no native node after the given logical node in the same native parent.
- */
-function findNextRNodeSibling(node: LNode | null, stopNode: LNode | null): RElement|RText|null {
-  let currentNode = node;
-  while (currentNode && currentNode !== stopNode) {
-    let pNextOrParent = currentNode.pNextOrParent;
-    if (pNextOrParent) {
-      while (pNextOrParent.tNode.type !== TNodeType.Projection) {
-        const nativeNode = findFirstRNode(pNextOrParent);
-        if (nativeNode) {
-          return nativeNode;
-        }
-        pNextOrParent = pNextOrParent.pNextOrParent !;
-      }
-      currentNode = pNextOrParent;
-    } else {
-      let currentSibling = getNextLNode(currentNode);
-      while (currentSibling) {
-        const nativeNode = findFirstRNode(currentSibling);
-        if (nativeNode) {
-          return nativeNode;
-        }
-        currentSibling = getNextLNode(currentSibling);
-      }
-      const parentNode = getParentLNode(currentNode);
-      currentNode = null;
-      if (parentNode) {
-        const parentType = parentNode.tNode.type;
-        if (parentType === TNodeType.Container || parentType === TNodeType.View) {
-          currentNode = parentNode;
-        }
-      }
-    }
-  }
-  return null;
-}
-
 /** Retrieves the sibling node for the given node. */
 export function getNextLNode(node: LNode): LNode|null {
   // View nodes don't have TNodes, so their next must be retrieved through their LView.
@@ -84,8 +37,8 @@ export function getChildLNode(node: LNode): LNode|null {
 }
 
 /** Retrieves the parent LNode of a given node. */
-export function getParentLNode(node: LElementNode | LTextNode | LProjectionNode): LElementNode|
-    LViewNode;
+export function getParentLNode(node: LContainerNode | LElementNode | LTextNode | LProjectionNode):
+    LElementNode|LViewNode;
 export function getParentLNode(node: LViewNode): LContainerNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null {
@@ -115,98 +68,47 @@ function getNextLNodeWithProjection(node: LNode): LNode|null {
   return getNextLNode(node);
 }
 
-/**
- * Find the next node in the LNode tree, taking into account the place where a node is
- * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
- *
- * If there is no sibling node, this function goes to the next sibling of the parent node...
- * until it reaches rootNode (at which point null is returned).
- *
- * @param initialNode The node whose following node in the LNode tree must be found.
- * @param rootNode The root node at which the lookup should stop.
- * @return LNode|null The following node in the LNode tree.
- */
-function getNextOrParentSiblingNode(initialNode: LNode, rootNode: LNode): LNode|null {
-  let node: LNode|null = initialNode;
-  let nextNode = getNextLNodeWithProjection(node);
-  while (node && !nextNode) {
-    // if node.pNextOrParent is not null here, it is not the next node
-    // (because, at this point, nextNode is null, so it is the parent)
-    node = node.pNextOrParent || getParentLNode(node);
-    if (node === rootNode) {
-      return null;
-    }
-    nextNode = node && getNextLNodeWithProjection(node);
-  }
-  return nextNode;
-}
-
-/**
- * Returns the first RNode inside the given LNode.
- *
- * @param node The node whose first DOM node must be found
- * @returns RNode The first RNode of the given LNode or null if there is none.
- */
-function findFirstRNode(rootNode: LNode): RElement|RText|null {
-  return walkLNodeTree(rootNode, rootNode, WalkLNodeTreeAction.Find) || null;
-}
-
 const enum WalkLNodeTreeAction {
-  /** returns the first available native node */
-  Find = 0,
-
   /** node insert in the native environment */
-  Insert = 1,
+  Insert = 0,
 
   /** node detach from the native environment */
-  Detach = 2,
+  Detach = 1,
 
   /** node destruction using the renderer's API */
-  Destroy = 3,
+  Destroy = 2,
 }
 
 /**
  * Walks a tree of LNodes, applying a transformation on the LElement nodes, either only on the first
  * one found, or on all of them.
- * NOTE: for performance reasons, the possible actions are inlined within the function instead of
- * being passed as an argument.
  *
  * @param startingNode the node from which the walk is started.
  * @param rootNode the root node considered.
- * @param action Identifies the action to be performed on the LElement nodes.
- * @param renderer Optional the current renderer, required for action modes 1, 2 and 3.
- * @param renderParentNode Optionnal the render parent node to be set in all LContainerNodes found,
- * required for action modes 1 and 2.
- * @param beforeNode Optionnal the node before which elements should be added, required for action
- * modes 1.
+ * @param action identifies the action to be performed on the LElement nodes.
+ * @param renderer the current renderer.
+ * @param renderParentNode Optional the render parent node to be set in all LContainerNodes found,
+ * required for action modes Insert and Destroy.
+ * @param beforeNode Optional the node before which elements should be added, required for action
+ * Insert.
  */
 function walkLNodeTree(
-    startingNode: LNode | null, rootNode: LNode, action: WalkLNodeTreeAction, renderer?: Renderer3,
+    startingNode: LNode | null, rootNode: LNode, action: WalkLNodeTreeAction, renderer: Renderer3,
     renderParentNode?: LElementNode | null, beforeNode?: RNode | null) {
   let node: LNode|null = startingNode;
   while (node) {
     let nextNode: LNode|null = null;
+    const parent = renderParentNode ? renderParentNode.native : null;
     if (node.tNode.type === TNodeType.Element) {
       // Execute the action
-      if (action === WalkLNodeTreeAction.Find) {
-        return node.native;
-      } else if (action === WalkLNodeTreeAction.Insert) {
-        const parent = renderParentNode !.native;
-        isProceduralRenderer(renderer !) ?
-            (renderer as ProceduralRenderer3)
-                .insertBefore(parent !, node.native !, beforeNode as RNode | null) :
-            parent !.insertBefore(node.native !, beforeNode as RNode | null, true);
-      } else if (action === WalkLNodeTreeAction.Detach) {
-        const parent = renderParentNode !.native;
-        isProceduralRenderer(renderer !) ?
-            (renderer as ProceduralRenderer3).removeChild(parent as RElement, node.native !) :
-            parent !.removeChild(node.native !);
-      } else if (action === WalkLNodeTreeAction.Destroy) {
-        ngDevMode && ngDevMode.rendererDestroyNode++;
-        (renderer as ProceduralRenderer3).destroyNode !(node.native !);
+      executeNodeAction(action, renderer, parent, node.native !, beforeNode);
+      if (node.dynamicLContainerNode) {
+        executeNodeAction(
+            action, renderer, parent, node.dynamicLContainerNode.native !, beforeNode);
       }
       nextNode = getNextLNode(node);
     } else if (node.tNode.type === TNodeType.Container) {
+      executeNodeAction(action, renderer, parent, node.native !, beforeNode);
       const lContainerNode: LContainerNode = (node as LContainerNode);
       const childContainerData: LContainer = lContainerNode.dynamicLContainerNode ?
           lContainerNode.dynamicLContainerNode.data :
@@ -216,6 +118,13 @@ function walkLNodeTree(
       }
       nextNode =
           childContainerData[VIEWS].length ? getChildLNode(childContainerData[VIEWS][0]) : null;
+      if (nextNode) {
+        // When the walker enters a container, then the beforeNode has to become the local native
+        // comment node.
+        beforeNode = lContainerNode.dynamicLContainerNode ?
+            lContainerNode.dynamicLContainerNode.native :
+            lContainerNode.native;
+      }
     } else if (node.tNode.type === TNodeType.Projection) {
       // For Projection look at the first projected node
       nextNode = (node as LProjectionNode).data.head;
@@ -224,7 +133,55 @@ function walkLNodeTree(
       nextNode = getChildLNode(node as LViewNode);
     }
 
-    node = nextNode === null ? getNextOrParentSiblingNode(node, rootNode) : nextNode;
+    if (nextNode == null) {
+      /**
+       * Find the next node in the LNode tree, taking into account the place where a node is
+       * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
+       *
+       * If there is no sibling node, then it goes to the next sibling of the parent node...
+       * until it reaches rootNode (at which point null is returned).
+       */
+      let currentNode: LNode|null = node;
+      node = getNextLNodeWithProjection(currentNode);
+      while (currentNode && !node) {
+        // if node.pNextOrParent is not null here, it is not the next node
+        // (because, at this point, nextNode is null, so it is the parent)
+        currentNode = currentNode.pNextOrParent || getParentLNode(currentNode);
+        if (currentNode === rootNode) {
+          return null;
+        }
+        // When the walker exits a container, the beforeNode has to be restored to the previous
+        // value.
+        if (currentNode && !currentNode.pNextOrParent &&
+            currentNode.tNode.type === TNodeType.Container) {
+          beforeNode = currentNode.native;
+        }
+        node = currentNode && getNextLNodeWithProjection(currentNode);
+      }
+    } else {
+      node = nextNode;
+    }
+  }
+}
+
+/**
+ * NOTE: for performance reasons, the possible actions are inlined within the function instead of
+ * being passed as an argument.
+ */
+function executeNodeAction(
+    action: WalkLNodeTreeAction, renderer: Renderer3, parent: RElement | null,
+    node: RComment | RElement | RText, beforeNode?: RNode | null) {
+  if (action === WalkLNodeTreeAction.Insert) {
+    isProceduralRenderer(renderer !) ?
+        (renderer as ProceduralRenderer3).insertBefore(parent !, node, beforeNode as RNode | null) :
+        parent !.insertBefore(node, beforeNode as RNode | null, true);
+  } else if (action === WalkLNodeTreeAction.Detach) {
+    isProceduralRenderer(renderer !) ?
+        (renderer as ProceduralRenderer3).removeChild(parent !, node) :
+        parent !.removeChild(node);
+  } else if (action === WalkLNodeTreeAction.Destroy) {
+    ngDevMode && ngDevMode.rendererDestroyNode++;
+    (renderer as ProceduralRenderer3).destroyNode !(node);
   }
 }
 
@@ -354,15 +311,9 @@ export function insertView(
   // and we should wait until that parent processes its nodes (otherwise, we will insert this view's
   // nodes twice - once now and once when its parent inserts its views).
   if (container.data[RENDER_PARENT] !== null) {
-    let beforeNode = findNextRNodeSibling(viewNode, container);
-
-    if (!beforeNode) {
-      let containerNextNativeNode = container.native;
-      if (containerNextNativeNode === undefined) {
-        containerNextNativeNode = container.native = findNextRNodeSibling(container, null);
-      }
-      beforeNode = containerNextNativeNode;
-    }
+    // Find the node to insert in front of
+    const beforeNode =
+        index + 1 < views.length ? (getChildLNode(views[index + 1]) !).native : container.native;
     addRemoveViewFromContainer(container, viewNode, true, beforeNode);
   }
 
@@ -581,9 +532,8 @@ export function appendChild(parent: LNode, child: RNode | null, currentView: LVi
 export function appendProjectedNode(
     node: LElementNode | LTextNode | LContainerNode, currentParent: LElementNode,
     currentView: LViewData): void {
-  if (node.tNode.type !== TNodeType.Container) {
-    appendChild(currentParent, (node as LElementNode | LTextNode).native, currentView);
-  } else {
+  appendChild(currentParent, node.native, currentView);
+  if (node.tNode.type === TNodeType.Container) {
     // The node we are adding is a Container and we are adding it to Element which
     // is not a component (no more re-projection).
     // Alternatively a container is projected at the root of a component's template
@@ -598,5 +548,6 @@ export function appendProjectedNode(
   }
   if (node.dynamicLContainerNode) {
     node.dynamicLContainerNode.data[RENDER_PARENT] = currentParent;
+    appendChild(currentParent, node.dynamicLContainerNode.native, currentView);
   }
 }
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 08d05da9a9..7e32c98327 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -398,6 +398,9 @@
   {
     "name": "executeInitHooks"
   },
+  {
+    "name": "executeNodeAction"
+  },
   {
     "name": "executeOnDestroys"
   },
@@ -419,12 +422,6 @@
   {
     "name": "findDirectiveMatches"
   },
-  {
-    "name": "findFirstRNode"
-  },
-  {
-    "name": "findNextRNodeSibling"
-  },
   {
     "name": "firstTemplatePass"
   },
@@ -455,9 +452,6 @@
   {
     "name": "getNextLNodeWithProjection"
   },
-  {
-    "name": "getNextOrParentSiblingNode"
-  },
   {
     "name": "getOrCreateContainerRef"
   },
diff --git a/packages/core/test/render3/control_flow_spec.ts b/packages/core/test/render3/control_flow_spec.ts
index 1a0ffabaec..a96c23a8b2 100644
--- a/packages/core/test/render3/control_flow_spec.ts
+++ b/packages/core/test/render3/control_flow_spec.ts
@@ -9,7 +9,7 @@
 import {defineComponent} from '../../src/render3/definition';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {ComponentFixture, createComponent, renderToHtml} from './render_util';
+import {ComponentFixture, TemplateFixture, createComponent, renderToHtml} from './render_util';
 
 describe('JS control flow', () => {
   it('should work with if block', () => {
@@ -134,6 +134,76 @@ describe('JS control flow', () => {
     expect(renderToHtml(Template, ctx)).toEqual('<div><span>Hello</span></div>');
   });
 
+  it('should work with nested adjacent if blocks', () => {
+    const ctx: {condition: boolean,
+                condition2: boolean,
+                condition3: boolean} = {condition: true, condition2: false, condition3: true};
+
+    /**
+     * % if(ctx.condition) {
+     *   % if(ctx.condition2) {
+     *     Hello
+     *   % }
+     *   % if(ctx.condition3) {
+     *     World
+     *   % }
+     * % }
+     */
+    function createTemplate() { container(0); }
+
+    function updateTemplate() {
+      containerRefreshStart(0);
+      {
+        if (ctx.condition) {
+          let rf1 = embeddedViewStart(1);
+          {
+            if (rf1 & RenderFlags.Create) {
+              { container(0); }
+              { container(1); }
+            }
+            if (rf1 & RenderFlags.Update) {
+              containerRefreshStart(0);
+              {
+                if (ctx.condition2) {
+                  let rf2 = embeddedViewStart(2);
+                  {
+                    if (rf2 & RenderFlags.Create) {
+                      text(0, 'Hello');
+                    }
+                  }
+                  embeddedViewEnd();
+                }
+              }
+              containerRefreshEnd();
+              containerRefreshStart(1);
+              {
+                if (ctx.condition3) {
+                  let rf2 = embeddedViewStart(2);
+                  {
+                    if (rf2 & RenderFlags.Create) {
+                      text(0, 'World');
+                    }
+                  }
+                  embeddedViewEnd();
+                }
+              }
+              containerRefreshEnd();
+            }
+          }
+          embeddedViewEnd();
+        }
+      }
+      containerRefreshEnd();
+    }
+
+    const fixture = new TemplateFixture(createTemplate, updateTemplate);
+    expect(fixture.html).toEqual('World');
+
+    ctx.condition2 = true;
+    fixture.update();
+    expect(fixture.html).toEqual('HelloWorld');
+  });
+
   it('should work with adjacent if blocks managing views in the same container', () => {
 
     const ctx = {condition1: true, condition2: true, condition3: true};
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 9c87c9edeb..1c127d4b92 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -361,7 +361,7 @@ describe('query', () => {
       expect(isViewContainerRef(qList.first)).toBeTruthy();
     });
 
-    it('should no longer read ElementRef with a native element pointing to comment DOM node from containers',
+    it('should read ElementRef with a native element pointing to comment DOM node from containers',
        () => {
          /**
           * <ng-template #foo></ng-template>
@@ -383,7 +383,8 @@ describe('query', () => {
          const cmptInstance = renderComponent(Cmpt);
          const qList = (cmptInstance.query as QueryList<any>);
          expect(qList.length).toBe(1);
-         expect(qList.first.nativeElement).toBe(null);
+         expect(isElementRef(qList.first)).toBeTruthy();
+         expect(qList.first.nativeElement.nodeType).toBe(8);  // Node.COMMENT_NODE = 8
        });
 
     it('should read TemplateRef from container nodes by default', () => {
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 0a68b1ead8..5d08734f11 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -32,11 +32,7 @@ export abstract class BaseFixture {
   /**
    * Current state of rendered HTML.
    */
-  get html(): string {
-    return (this.hostElement as any as Element)
-        .innerHTML.replace(/ style=""/g, '')
-        .replace(/ class=""/g, '');
-  }
+  get html(): string { return toHtml(this.hostElement as any as Element); }
 }
 
 function noop() {}
@@ -223,9 +219,10 @@ export function toHtml<T>(componentOrElement: T | RElement): string {
   } else {
     return stringifyElement(componentOrElement)
         .replace(/^<div host="">/, '')
+        .replace(/^<div fixture="mark">/, '')
         .replace(/<\/div>$/, '')
         .replace(' style=""', '')
-        .replace(/<!--[\w]*-->/g, '');
+        .replace(/<!--container-->/g, '');
   }
 }
 
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 94ec687f7b..d8282f76e7 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -595,7 +595,7 @@ describe('ViewContainerRef', () => {
         expect(fixture.html).toEqual('<p vcref=""></p>ABC');
 
         // The DOM is manually modified here to ensure that the text node is actually moved
-        fixture.hostElement.childNodes[1].nodeValue = '**A**';
+        fixture.hostElement.childNodes[2].nodeValue = '**A**';
         expect(fixture.html).toEqual('<p vcref=""></p>**A**BC');
 
         let viewRef = directiveInstance !.vcref.get(0);

From d9bf6e37ae1ac237dbf6109c40ef7840b1fb3eeb Mon Sep 17 00:00:00 2001
From: Kapunahele Wong <kapunahelewong@gmail.com>
Date: Fri, 8 Jun 2018 16:38:31 -0400
Subject: [PATCH 258/582] docs: fix wording in 4-10 (#24385)

PR Close #24385
---
 aio/content/guide/styleguide.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/styleguide.md b/aio/content/guide/styleguide.md
index 52fe100c7c..7abf5b70b4 100644
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@@ -3109,9 +3109,9 @@ module are referenced across the entire application.
 
 
 
-**Avoid** providing services in shared modules. Services are usually
+**Consider** _not_ providing services in shared modules. Services are usually
 singletons that are provided once for the entire application or
-in a particular feature module.
+in a particular feature module. There are exceptions, however. For example, in the sample code that follows, notice that the `SharedModule` provides `FilterTextService`. This is acceptable here because the service is stateless;that is, the consumers of the service aren't impacted by new instances.
 
 
 </div>

From c8e865ac8e2c5e09ea1e06ff609f491a035a8180 Mon Sep 17 00:00:00 2001
From: Kirankumar Sripati <kirankumar.sripati@netcore.co.in>
Date: Wed, 13 Jun 2018 18:36:22 +0530
Subject: [PATCH 259/582] docs: fix typo (#24470)

PR Close #24470
---
 aio/content/guide/testing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index a8e87ecdf9..1509483b66 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -398,7 +398,7 @@ But a component is more than just its class.
 A component interacts with the DOM and with other components.
 The _class-only_ tests can tell you about class behavior.
 They cannot tell you if the component is going to render properly,
-respond to user input and gestures, or integrate with its parent and and child components.
+respond to user input and gestures, or integrate with its parent and child components.
 
 None of the _class-only_ tests above can answer key questions about how the
 components actually behave on screen.

From 82c5313740ee39ff55b952e74bfb13295387b284 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 8 Jun 2018 15:25:39 -0700
Subject: [PATCH 260/582] feat(ivy): namespaced attributes added to output
 instructions (#24386)

NOTE: This does NOT add parsing of namespaced attributes

- Adds AttributeMarker for namespaced attributes
- Adds test for namespaced attributes
- Updates AttributeMarker enum to use CamelCase, and not UPPER_CASE names

PR Close #24386
---
 .../render3/r3_compiler_compliance_spec.ts    | 47 ++++++++++++++++
 packages/core/src/render3/STATUS.md           |  1 +
 packages/core/src/render3/di.ts               |  2 +-
 packages/core/src/render3/instructions.ts     | 46 +++++++++++----
 packages/core/src/render3/interfaces/node.ts  | 11 +++-
 .../core/src/render3/node_selector_matcher.ts | 47 ++++++++++++----
 .../compiler_canonical/elements_spec.ts       | 56 +++++++++++++++++++
 packages/core/test/render3/content_spec.ts    |  2 +-
 packages/core/test/render3/di_spec.ts         |  4 +-
 packages/core/test/render3/directive_spec.ts  | 10 ++--
 .../core/test/render3/instructions_spec.ts    | 43 +++++++++++++-
 .../render3/node_selector_matcher_spec.ts     | 12 +++-
 packages/core/test/render3/query_spec.ts      |  6 +-
 13 files changed, 247 insertions(+), 40 deletions(-)

diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index a61016f656..ee6b53d123 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -163,6 +163,53 @@ describe('compiler compliance', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
+    // TODO(https://github.com/angular/angular/issues/24426): We need to support the parser actually
+    // building the proper attributes based off of xmlns atttribuates.
+    xit('should support namspaced attributes', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div xmlns:foo="http://someuri/foo" class="my-app" foo:bar="baz" title="Hello" foo:qux="quacks">Hello <b>World</b>!</div>\`
+                })
+                export class MyComponent {}
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+        }
+      };
+
+      // The factory should look like this:
+      const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
+
+      // The template should look like this (where IDENT is a wild card for an identifier):
+      const template = `
+          const $c1$ = ['class', 'my-app', 0, 'http://someuri/foo', 'foo:bar', 'baz', 'title', 'Hello', 0, 'http://someuri/foo', 'foo:qux', 'quacks'];
+          …
+          template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+            if (rf & 1) {
+              $r3$.ɵE(0, 'div', $e0_attrs$);
+              $r3$.ɵT(1, 'Hello ');
+              $r3$.ɵE(2, 'b');
+              $r3$.ɵT(3, 'World');
+              $r3$.ɵe();
+              $r3$.ɵT(4, '!');
+              $r3$.ɵe();
+            }
+          }
+        `;
+
+
+      const result = compile(files, angularFiles);
+
+      expectEmit(result.source, factory, 'Incorrect factory');
+      expectEmit(result.source, template, 'Incorrect template');
+    });
+
     it('should bind to element properties', () => {
       const files = {
         app: {
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 20f59c399a..bf1f5d0c10 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -147,6 +147,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `<div style="literal">`                     |  ✅     |  ✅      |  ✅      |
 | `<div [style]="exp">`                       |  ✅     |  ✅      |  ✅      |
 | `<div [style.foo]="exp">`                   |  ✅     |  ✅      |  ✅      |
+| `<div xmlns:foo="url" foo:bar="baz">` <br/>Compiler still needs to be updated to process templates with namespaced attributes. ([see #24386](https://github.com/angular/angular/pull/24386))       |  ✅     |  ✅      |  ❌      |
 | `{{ ['literal', exp ] }}`                   |  ✅     |  ✅      |  ✅      |
 | `{{ { a: 'literal', b: exp } }}`            |  ✅     |  ✅      |  ✅      |
 | `{{ exp \| pipe: arg }}`                    |  ✅     |  ✅      |  ✅      |
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 3200038789..b5b9ad78d3 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -262,7 +262,7 @@ export function injectAttribute(attrNameToInject: string): string|undefined {
   if (attrs) {
     for (let i = 0; i < attrs.length; i = i + 2) {
       const attrName = attrs[i];
-      if (attrName === AttributeMarker.SELECT_ONLY) break;
+      if (attrName === AttributeMarker.SelectOnly) break;
       if (attrName == attrNameToInject) {
         return attrs[i + 1] as string;
       }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index d6debea1f8..c9c775a8fd 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -858,16 +858,34 @@ export function createTView(
 
 function setUpAttributes(native: RElement, attrs: TAttributes): void {
   const isProc = isProceduralRenderer(renderer);
-  for (let i = 0; i < attrs.length; i += 2) {
+  let i = 0;
+
+  while (i < attrs.length) {
     const attrName = attrs[i];
-    if (attrName === AttributeMarker.SELECT_ONLY) break;
-    if (attrName !== NG_PROJECT_AS_ATTR_NAME) {
-      const attrVal = attrs[i + 1];
+    if (attrName === AttributeMarker.SelectOnly) break;
+    if (attrName === NG_PROJECT_AS_ATTR_NAME) {
+      i += 2;
+    } else {
       ngDevMode && ngDevMode.rendererSetAttribute++;
-      isProc ?
-          (renderer as ProceduralRenderer3)
-              .setAttribute(native, attrName as string, attrVal as string) :
-          native.setAttribute(attrName as string, attrVal as string);
+      if (attrName === AttributeMarker.NamespaceURI) {
+        // Namespaced attributes
+        const namespaceURI = attrs[i + 1] as string;
+        const attrName = attrs[i + 2] as string;
+        const attrVal = attrs[i + 3] as string;
+        isProc ?
+            (renderer as ProceduralRenderer3)
+                .setAttribute(native, attrName, attrVal, namespaceURI) :
+            native.setAttributeNS(namespaceURI, attrName, attrVal);
+        i += 4;
+      } else {
+        // Standard attributes
+        const attrVal = attrs[i + 1];
+        isProc ?
+            (renderer as ProceduralRenderer3)
+                .setAttribute(native, attrName as string, attrVal as string) :
+            native.setAttribute(attrName as string, attrVal as string);
+        i += 2;
+      }
     }
   }
 }
@@ -1509,17 +1527,25 @@ function generateInitialInputs(
   initialInputData[directiveIndex] = null;
 
   const attrs = tNode.attrs !;
-  for (let i = 0; i < attrs.length; i += 2) {
+  let i = 0;
+  while (i < attrs.length) {
     const attrName = attrs[i];
+    if (attrName === AttributeMarker.SelectOnly) break;
+    if (attrName === AttributeMarker.NamespaceURI) {
+      // We do not allow inputs on namespaced attributes.
+      i += 4;
+      continue;
+    }
     const minifiedInputName = inputs[attrName];
     const attrValue = attrs[i + 1];
 
-    if (attrName === AttributeMarker.SELECT_ONLY) break;
     if (minifiedInputName !== undefined) {
       const inputsToStore: InitialInputs =
           initialInputData[directiveIndex] || (initialInputData[directiveIndex] = []);
       inputsToStore.push(minifiedInputName, attrValue as string);
     }
+
+    i += 2;
   }
   return initialInputData;
 }
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 5b0034bbb0..f4c1af3080 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -163,15 +163,20 @@ export interface LProjectionNode extends LNode {
  * items are not regular attributes and the processing should be adapted accordingly.
  */
 export const enum AttributeMarker {
-  NS = 0,  // namespace. Has to be repeated.
+  /**
+   * Marker indicates that the following 3 values in the attributes array are:
+   * namespaceUri, attributeName, attributeValue
+   * in that order.
+   */
+  NamespaceURI = 0,
 
   /**
    * This marker indicates that the following attribute names were extracted from bindings (ex.:
    * [foo]="exp") and / or event handlers (ex. (bar)="doSth()").
    * Taking the above bindings and outputs as an example an attributes array could look as follows:
-   * ['class', 'fade in', AttributeMarker.SELECT_ONLY, 'foo', 'bar']
+   * ['class', 'fade in', AttributeMarker.SelectOnly, 'foo', 'bar']
    */
-  SELECT_ONLY = 1
+  SelectOnly = 1
 }
 
 /**
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index db94094e24..f4bd4cde68 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -8,7 +8,7 @@
 
 import './ng_dev_mode';
 
-import {assertDefined} from './assert';
+import {assertDefined, assertNotEqual} from './assert';
 import {AttributeMarker, TAttributes, TNode, unusedValueExportToPlacateAjd as unused1} from './interfaces/node';
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags, unusedValueExportToPlacateAjd as unused2} from './interfaces/projection';
 
@@ -40,7 +40,7 @@ export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boo
 
   let mode: SelectorFlags = SelectorFlags.ELEMENT;
   const nodeAttrs = tNode.attrs !;
-  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SELECT_ONLY) : -1;
+  const selectOnlyMarkerIdx = nodeAttrs ? nodeAttrs.indexOf(AttributeMarker.SelectOnly) : -1;
 
   // When processing ":not" selectors, we skip to the next ":not" if the
   // current one doesn't match
@@ -81,9 +81,16 @@ export function isNodeMatchingSelector(tNode: TNode, selector: CssSelector): boo
 
       const selectorAttrValue = mode & SelectorFlags.CLASS ? current : selector[++i];
       if (selectorAttrValue !== '') {
-        const nodeAttrValue = selectOnlyMarkerIdx > -1 && attrIndexInNode > selectOnlyMarkerIdx ?
-            '' :
-            nodeAttrs[attrIndexInNode + 1];
+        let nodeAttrValue: string;
+        const maybeAttrName = nodeAttrs[attrIndexInNode];
+        if (selectOnlyMarkerIdx > -1 && attrIndexInNode > selectOnlyMarkerIdx) {
+          nodeAttrValue = '';
+        } else {
+          ngDevMode && assertNotEqual(
+                           maybeAttrName, AttributeMarker.NamespaceURI,
+                           'We do not match directives on namespaced attributes');
+          nodeAttrValue = nodeAttrs[attrIndexInNode + 1] as string;
+        }
         if (mode & SelectorFlags.CLASS &&
                 !isCssClassMatching(nodeAttrValue as string, selectorAttrValue as string) ||
             mode & SelectorFlags.ATTRIBUTE && selectorAttrValue !== nodeAttrValue) {
@@ -101,16 +108,34 @@ function isPositive(mode: SelectorFlags): boolean {
   return (mode & SelectorFlags.NOT) === 0;
 }
 
+/**
+ * Examines an attributes definition array from a node to find the index of the
+ * attribute with the specified name.
+ *
+ * NOTE: Will not find namespaced attributes.
+ *
+ * @param name the name of the attribute to find
+ * @param attrs the attribute array to examine
+ */
 function findAttrIndexInNode(name: string, attrs: TAttributes | null): number {
-  let step = 2;
   if (attrs === null) return -1;
-  for (let i = 0; i < attrs.length; i += step) {
-    const attrName = attrs[i];
-    if (attrName === name) return i;
-    if (attrName === AttributeMarker.SELECT_ONLY) {
-      step = 1;
+  let selectOnlyMode = false;
+  let i = 0;
+  while (i < attrs.length) {
+    const maybeAttrName = attrs[i];
+    if (maybeAttrName === name) {
+      return i;
+    } else if (maybeAttrName === AttributeMarker.NamespaceURI) {
+      // NOTE(benlesh): will not find namespaced attributes. This is by design.
+      i += 4;
+    } else {
+      if (maybeAttrName === AttributeMarker.SelectOnly) {
+        selectOnlyMode = true;
+      }
+      i += selectOnlyMode ? 1 : 2;
     }
   }
+
   return -1;
 }
 
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index 0f1dd08873..e82fbf5f04 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -10,10 +10,12 @@ import {browserDetection} from '@angular/platform-browser/testing/src/browser_ut
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
+import {AttributeMarker} from '../../../src/render3';
 import {ComponentDef} from '../../../src/render3/interfaces/definition';
 import {ComponentFixture, renderComponent, toHtml} from '../render_util';
 
 
+
 /// See: `normative.md`
 describe('elements', () => {
   // Saving type as $any$, etc to simplify testing for compiler, as types aren't saved
@@ -150,6 +152,60 @@ describe('elements', () => {
     expect(toHtml(listenerComp)).toEqual('<button>Click</button>');
   });
 
+  it('should support namespaced attributes', () => {
+    type $MyComponent$ = MyComponent;
+
+    // Important: keep arrays outside of function to not create new instances.
+    const $e0_attrs$ = [
+      // class="my-app"
+      'class',
+      'my-app',
+      // foo:bar="baz"
+      AttributeMarker.NamespaceURI,
+      'http://someuri/foo',
+      'foo:bar',
+      'baz',
+      // title="Hello"
+      'title',
+      'Hello',
+      // foo:qux="quacks"
+      AttributeMarker.NamespaceURI,
+      'http://someuri/foo',
+      'foo:qux',
+      'quacks',
+    ];
+
+    @Component({
+      selector: 'my-component',
+      template:
+          `<div xmlns:foo="http://someuri/foo" class="my-app" foo:bar="baz" title="Hello" foo:qux="quacks">Hello <b>World</b>!</div>`
+    })
+    class MyComponent {
+      // NORMATIVE
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyComponent,
+        selectors: [['my-component']],
+        factory: () => new MyComponent(),
+        template: function(rf: $RenderFlags$, ctx: $MyComponent$) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div', $e0_attrs$);
+            $r3$.ɵT(1, 'Hello ');
+            $r3$.ɵE(2, 'b');
+            $r3$.ɵT(3, 'World');
+            $r3$.ɵe();
+            $r3$.ɵT(4, '!');
+            $r3$.ɵe();
+          }
+        }
+      });
+      // /NORMATIVE
+    }
+
+    expect(toHtml(renderComponent(MyComponent)))
+        .toEqual(
+            '<div class="my-app" foo:bar="baz" foo:qux="quacks" title="Hello">Hello <b>World</b>!</div>');
+  });
+
   describe('bindings', () => {
     it('should bind to property', () => {
       type $MyComponent$ = MyComponent;
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 71d7dda90b..058be8ca4b 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -605,7 +605,7 @@ describe('content projection', () => {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'child');
           {
-            elementStart(1, 'span', [AttributeMarker.SELECT_ONLY, 'title']);
+            elementStart(1, 'span', [AttributeMarker.SelectOnly, 'title']);
             { text(2, 'Has title'); }
             elementEnd();
           }
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 66e0f67d09..31db90bae7 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1225,7 +1225,7 @@ describe('di', () => {
 
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SELECT_ONLY, 'nonExist']);
+          elementStart(0, 'div', ['exist', 'existValue', AttributeMarker.SelectOnly, 'nonExist']);
           exist = injectAttribute('exist');
           nonExist = injectAttribute('nonExist');
         }
@@ -1243,7 +1243,7 @@ describe('di', () => {
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'div', [
-            'exist', 'existValue', AttributeMarker.SELECT_ONLY, 'binding1', 'nonExist', 'binding2'
+            'exist', 'existValue', AttributeMarker.SelectOnly, 'binding1', 'nonExist', 'binding2'
           ]);
           exist = injectAttribute('exist');
           nonExist = injectAttribute('nonExist');
diff --git a/packages/core/test/render3/directive_spec.ts b/packages/core/test/render3/directive_spec.ts
index 58f0c22349..a84c9008b9 100644
--- a/packages/core/test/render3/directive_spec.ts
+++ b/packages/core/test/render3/directive_spec.ts
@@ -34,7 +34,7 @@ describe('directive', () => {
       }
 
       function Template() {
-        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'dir']);
+        elementStart(0, 'span', [AttributeMarker.SelectOnly, 'dir']);
         elementEnd();
       }
 
@@ -82,7 +82,7 @@ describe('directive', () => {
        */
       function createTemplate() {
         // using 2 bindings to show example shape of attributes array
-        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'test', 'other']);
+        elementStart(0, 'span', ['class', 'fade', AttributeMarker.SelectOnly, 'test', 'other']);
         elementEnd();
       }
 
@@ -127,12 +127,12 @@ describe('directive', () => {
          }
 
          /**
-          * <span [prop1]="true" [test]="false" [prop2]="true"></span>
+          * <span class="fade" [prop1]="true" [test]="false" [prop2]="true"></span>
           */
          function createTemplate() {
            // putting name (test) in the "usual" value position
            elementStart(
-               0, 'span', ['class', 'fade', AttributeMarker.SELECT_ONLY, 'prop1', 'test', 'prop2']);
+               0, 'span', ['class', 'fade', AttributeMarker.SelectOnly, 'prop1', 'test', 'prop2']);
            elementEnd();
          }
 
@@ -168,7 +168,7 @@ describe('directive', () => {
        * <span (out)="someVar = true"></span>
        */
       function createTemplate() {
-        elementStart(0, 'span', [AttributeMarker.SELECT_ONLY, 'out']);
+        elementStart(0, 'span', [AttributeMarker.SelectOnly, 'out']);
         { listener('out', () => {}); }
         elementEnd();
       }
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index d3302788eb..50d643dc28 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -11,7 +11,7 @@ import {NgForOfContext} from '@angular/common';
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
 import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
-import {LElementNode, LNode} from '../../src/render3/interfaces/node';
+import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -79,12 +79,53 @@ describe('instructions', () => {
       const div = (t.hostNode.native as HTMLElement).querySelector('div') !;
       expect(div.id).toEqual('test');
       expect(div.title).toEqual('Hello');
+      expect(ngDevMode).toHaveProperties({
+        firstTemplatePass: 1,
+        tNode: 2,  // 1 for div, 1 for host element
+        tView: 1,
+        rendererCreateElement: 1,
+      });
+    });
+
+    it('should allow setting namespaced attributes', () => {
+      const t = new TemplateFixture(() => {
+        elementStart(0, 'div', [
+          // id="test"
+          'id',
+          'test',
+          // test:foo="bar"
+          AttributeMarker.NamespaceURI,
+          'http://someuri.com/2018/test',
+          'test:foo',
+          'bar',
+          // title="Hello"
+          'title',
+          'Hello',
+        ]);
+        elementEnd();
+      });
+
+      const div = (t.hostNode.native as HTMLElement).querySelector('div') !;
+      const attrs: any = div.attributes;
+
+      expect(attrs['id'].name).toEqual('id');
+      expect(attrs['id'].namespaceURI).toEqual(null);
+      expect(attrs['id'].value).toEqual('test');
+
+      expect(attrs['test:foo'].name).toEqual('test:foo');
+      expect(attrs['test:foo'].namespaceURI).toEqual('http://someuri.com/2018/test');
+      expect(attrs['test:foo'].value).toEqual('bar');
+
+      expect(attrs['title'].name).toEqual('title');
+      expect(attrs['title'].namespaceURI).toEqual(null);
+      expect(attrs['title'].value).toEqual('Hello');
 
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
         tNode: 2,  // 1 for div, 1 for host element
         tView: 1,
         rendererCreateElement: 1,
+        rendererSetAttribute: 3
       });
     });
   });
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 3a143bcadf..cf5c2aca36 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -86,6 +86,12 @@ describe('css selector matching', () => {
         ])).toBeFalsy(`Selector '[other]' should NOT match <span title="">'`);
       });
 
+      it('should match namespaced attributes', () => {
+        expect(isMatching(
+            'span', [AttributeMarker.NamespaceURI, 'http://some/uri', 'title', 'name'],
+            ['', 'title', '']));
+      });
+
       it('should match selector with one attribute without value when element has several attributes',
          () => {
            expect(isMatching('span', ['id', 'my_id', 'title', 'test_title'], [
@@ -179,14 +185,14 @@ describe('css selector matching', () => {
       });
 
       it('should take optional binding attribute names into account', () => {
-        expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
+        expect(isMatching('span', [AttributeMarker.SelectOnly, 'directive'], [
           '', 'directive', ''
         ])).toBeTruthy(`Selector '[directive]' should match <span [directive]="exp">`);
       });
 
       it('should not match optional binding attribute names if attribute selector has value',
          () => {
-           expect(isMatching('span', [AttributeMarker.SELECT_ONLY, 'directive'], [
+           expect(isMatching('span', [AttributeMarker.SelectOnly, 'directive'], [
              '', 'directive', 'value'
            ])).toBeFalsy(`Selector '[directive=value]' should not match <span [directive]="exp">`);
          });
@@ -194,7 +200,7 @@ describe('css selector matching', () => {
       it('should not match optional binding attribute names if attribute selector has value and next name equals to value',
          () => {
            expect(isMatching(
-                      'span', [AttributeMarker.SELECT_ONLY, 'directive', 'value'],
+                      'span', [AttributeMarker.SelectOnly, 'directive', 'value'],
                       ['', 'directive', 'value']))
                .toBeFalsy(
                    `Selector '[directive=value]' should not match <span [directive]="exp" [value]="otherExp">`);
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 1c127d4b92..b94e8d26fc 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -859,7 +859,7 @@ describe('query', () => {
                  }
                }, null, []);
 
-               container(5, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
+               container(5, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
              }
 
              if (rf & RenderFlags.Update) {
@@ -938,8 +938,8 @@ describe('query', () => {
                  }
                }, null, []);
 
-               container(2, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
-               container(3, undefined, null, [AttributeMarker.SELECT_ONLY, 'vc']);
+               container(2, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
+               container(3, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
              }
 
              if (rf & RenderFlags.Update) {

From 0bd2d7bac60f1c620e0ef644de7a033bd2977229 Mon Sep 17 00:00:00 2001
From: vovchik-manko <vmanko1@gmail.com>
Date: Tue, 5 Jun 2018 23:38:32 +0300
Subject: [PATCH 261/582] docs: add message property to compose-message
 component (#24310)

PR Close #24310
---
 aio/content/examples/router/src/app/compose-message.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aio/content/examples/router/src/app/compose-message.component.ts b/aio/content/examples/router/src/app/compose-message.component.ts
index 6e83e3502b..f2d95de745 100644
--- a/aio/content/examples/router/src/app/compose-message.component.ts
+++ b/aio/content/examples/router/src/app/compose-message.component.ts
@@ -15,6 +15,7 @@ export class ComposeMessageComponent {
   @HostBinding('style.position')  position = 'absolute';
 
   details: string;
+  message: string;
   sending = false;
 
   constructor(private router: Router) {}

From 513f645894edc72e7f2dbcbe3514dae6c51503b0 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 17 May 2018 11:23:55 -0500
Subject: [PATCH 262/582] docs(aio): remove links to outdated live examples
 from the API documenation (#23966)

Closes #21525

PR Close #23966
---
 .../change_detection/change_detector_ref.ts    |  4 ++--
 .../src/change_detection/pipe_transform.ts     |  2 +-
 packages/core/src/di/forward_ref.ts            |  2 +-
 packages/core/src/di/reflective_errors.ts      | 12 ++++++------
 packages/core/src/di/reflective_injector.ts    | 18 +++++++++---------
 packages/core/src/di/reflective_provider.ts    |  2 +-
 packages/core/src/linker/query_list.ts         |  2 +-
 packages/core/src/metadata/directives.ts       |  8 ++++----
 packages/core/src/render3/view_ref.ts          |  4 ++--
 packages/http/src/base_response_options.ts     |  8 ++++----
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/core/src/change_detection/change_detector_ref.ts b/packages/core/src/change_detection/change_detector_ref.ts
index 89f5244de4..743f5f66ae 100644
--- a/packages/core/src/change_detection/change_detector_ref.ts
+++ b/packages/core/src/change_detection/change_detector_ref.ts
@@ -16,7 +16,7 @@ export abstract class ChangeDetectorRef {
    *
    * <!-- TODO: Add a link to a chapter on OnPush components -->
    *
-   * ### Example ([live demo](https://stackblitz.com/edit/angular-kx7rrw))
+   * ### Example
    *
    * ```typescript
    * @Component({
@@ -131,7 +131,7 @@ export abstract class ChangeDetectorRef {
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    *
-   * ### Example ([live demo](https://stackblitz.com/edit/angular-ymgsxw))
+   * ### Example
    *
    * The following example creates a component displaying `live` data. The component will detach
    * its change detector from the main change detector tree when the component's live property
diff --git a/packages/core/src/change_detection/pipe_transform.ts b/packages/core/src/change_detection/pipe_transform.ts
index 4e6d120931..e835d7f610 100644
--- a/packages/core/src/change_detection/pipe_transform.ts
+++ b/packages/core/src/change_detection/pipe_transform.ts
@@ -16,7 +16,7 @@
  *
  * `value | pipeName[:arg0[:arg1...]]`
  *
- * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+ * ### Example
  *
  * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
  *
diff --git a/packages/core/src/di/forward_ref.ts b/packages/core/src/di/forward_ref.ts
index 8800543923..6837df128c 100644
--- a/packages/core/src/di/forward_ref.ts
+++ b/packages/core/src/di/forward_ref.ts
@@ -44,7 +44,7 @@ export function forwardRef(forwardRefFn: ForwardRefFn): Type<any> {
  *
  * Acts as the identity function when given a non-forward-ref value.
  *
- * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+ * ### Example
  *
  * {@example core/di/ts/forward_ref/forward_ref_spec.ts region='resolve_forward_ref'}
  *
diff --git a/packages/core/src/di/reflective_errors.ts b/packages/core/src/di/reflective_errors.ts
index 51f223c383..7351ebb99a 100644
--- a/packages/core/src/di/reflective_errors.ts
+++ b/packages/core/src/di/reflective_errors.ts
@@ -70,7 +70,7 @@ function addKey(this: InjectionError, injector: ReflectiveInjector, key: Reflect
  * Thrown when trying to retrieve a dependency by key from {@link Injector}, but the
  * {@link Injector} does not have a {@link Provider} for the given key.
  *
- * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+ * ### Example
  *
  * ```typescript
  * class A {
@@ -90,7 +90,7 @@ export function noProviderError(injector: ReflectiveInjector, key: ReflectiveKey
 /**
  * Thrown when dependencies form a cycle.
  *
- * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+ * ### Example
  *
  * ```typescript
  * var injector = Injector.resolveAndCreate([
@@ -116,7 +116,7 @@ export function cyclicDependencyError(
  * The `InstantiationError` class contains the original error plus the dependency graph which caused
  * this object to be instantiated.
  *
- * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+ * ### Example
  *
  * ```typescript
  * class A {
@@ -149,7 +149,7 @@ export function instantiationError(
  * Thrown when an object other then {@link Provider} (or `Type`) is passed to {@link Injector}
  * creation.
  *
- * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+ * ### Example
  *
  * ```typescript
  * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
@@ -166,7 +166,7 @@ export function invalidProviderError(provider: any) {
  * Lack of annotation information prevents the {@link Injector} from determining which dependencies
  * need to be injected into the constructor.
  *
- * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+ * ### Example
  *
  * ```typescript
  * class A {
@@ -209,7 +209,7 @@ export function noAnnotationError(typeOrFunc: Type<any>| Function, params: any[]
 /**
  * Thrown when getting an object by index.
  *
- * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+ * ### Example
  *
  * ```typescript
  * class A {}
diff --git a/packages/core/src/di/reflective_injector.ts b/packages/core/src/di/reflective_injector.ts
index 3de3d6184a..d7784cb38e 100644
--- a/packages/core/src/di/reflective_injector.ts
+++ b/packages/core/src/di/reflective_injector.ts
@@ -26,7 +26,7 @@ const UNDEFINED = new Object();
  * In typical use, application code asks for the dependencies in the constructor and they are
  * resolved by the `Injector`.
  *
- * ### Example ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+ * ### Example
  *
  * The following example creates an `Injector` configured to create `Engine` and `Car`.
  *
@@ -58,7 +58,7 @@ export abstract class ReflectiveInjector implements Injector {
    * A resolution is a process of flattening multiple nested arrays and converting individual
    * providers into an array of {@link ResolvedReflectiveProvider}s.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+   * ### Example
    *
    * ```typescript
    * @Injectable()
@@ -95,7 +95,7 @@ export abstract class ReflectiveInjector implements Injector {
    * The passed-in providers can be an array of `Type`, {@link Provider},
    * or a recursive array of more providers.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+   * ### Example
    *
    * ```typescript
    * @Injectable()
@@ -126,7 +126,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * This API is the recommended way to construct injectors in performance-sensitive parts.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+   * ### Example
    *
    * ```typescript
    * @Injectable()
@@ -156,7 +156,7 @@ export abstract class ReflectiveInjector implements Injector {
    * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
    * -->
    *
-   * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+   * ### Example
    *
    * ```typescript
    * var parent = ReflectiveInjector.resolveAndCreate([]);
@@ -175,7 +175,7 @@ export abstract class ReflectiveInjector implements Injector {
    * The passed-in providers can be an array of `Type`, {@link Provider},
    * or a recursive array of more providers.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+   * ### Example
    *
    * ```typescript
    * class ParentProvider {}
@@ -204,7 +204,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * This API is the recommended way to construct injectors in performance-sensitive parts.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+   * ### Example
    *
    * ```typescript
    * class ParentProvider {}
@@ -228,7 +228,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * The created object does not get cached by the injector.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+   * ### Example
    *
    * ```typescript
    * @Injectable()
@@ -254,7 +254,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * The created object does not get cached by the injector.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+   * ### Example
    *
    * ```typescript
    * @Injectable()
diff --git a/packages/core/src/di/reflective_provider.ts b/packages/core/src/di/reflective_provider.ts
index 1def0e83c0..f66bc9a02e 100644
--- a/packages/core/src/di/reflective_provider.ts
+++ b/packages/core/src/di/reflective_provider.ts
@@ -42,7 +42,7 @@ const _EMPTY_LIST: any[] = [];
  *
  * It can be created manually, as follows:
  *
- * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+ * ### Example
  *
  * ```typescript
  * var resolvedProviders = Injector.resolve([{ provide: 'message', useValue: 'Hello' }]);
diff --git a/packages/core/src/linker/query_list.ts b/packages/core/src/linker/query_list.ts
index 3d7739a471..dc72fd1588 100644
--- a/packages/core/src/linker/query_list.ts
+++ b/packages/core/src/linker/query_list.ts
@@ -27,7 +27,7 @@ import {getSymbolIterator} from '../util';
  *
  * NOTE: In the future this class will implement an `Observable` interface.
  *
- * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
+ * ### Example
  * ```typescript
  * @Component({...})
  * class Container {
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index ddc1756b63..afe89547fa 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -124,7 +124,7 @@ export interface Directive {
    *
    * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
+   * ### Example
    *
    * The following example creates a component with two data-bound properties.
    *
@@ -169,7 +169,7 @@ export interface Directive {
    * - `directiveProperty` specifies the component property that emits events.
    * - `bindingProperty` specifies the DOM property the event handler is attached to.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+   * ### Example
    *
    * ```typescript
    * @Directive({
@@ -220,7 +220,7 @@ export interface Directive {
    *
    * When writing a directive event binding, you can also refer to the $event local variable.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
+   * ### Example
    *
    * The following example declares a directive that attaches a click listener to the button and
    * counts clicks.
@@ -254,7 +254,7 @@ export interface Directive {
    * Angular automatically checks host property bindings during change detection.
    * If a binding changes, it will update the host element of the directive.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+   * ### Example
    *
    * The following example creates a directive that sets the `valid` and `invalid` classes
    * on the DOM element that has ngModel directive on it.
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 432ab7b4ff..bf6a6d2fb9 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -57,7 +57,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    *
    * <!-- TODO: Add a link to a chapter on OnPush components -->
    *
-   * ### Example ([live demo](https://stackblitz.com/edit/angular-kx7rrw))
+   * ### Example
    *
    * ```typescript
    * @Component({
@@ -142,7 +142,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    *
-   * ### Example ([live demo](https://stackblitz.com/edit/angular-ymgsxw))
+   * ### Example
    *
    * The following example creates a component displaying `live` data. The component will detach
    * its change detector from the main change detector tree when the component's live property
diff --git a/packages/http/src/base_response_options.ts b/packages/http/src/base_response_options.ts
index b39c456ae3..6c82cb62d7 100644
--- a/packages/http/src/base_response_options.ts
+++ b/packages/http/src/base_response_options.ts
@@ -26,7 +26,7 @@ import {ResponseOptionsArgs} from './interfaces';
  * This class may be used in tests to build {@link Response Responses} for
  * mock responses (see {@link MockBackend}).
  *
- * ### Example ([live demo](http://plnkr.co/edit/P9Jkk8e8cz6NVzbcxEsD?p=preview))
+ * ### Example
  *
  * ```typescript
  * import {ResponseOptions, Response} from '@angular/http';
@@ -84,7 +84,7 @@ export class ResponseOptions {
    * This may be useful when sharing a base `ResponseOptions` object inside tests,
    * where certain properties may change from test to test.
    *
-   * ### Example ([live demo](http://plnkr.co/edit/1lXquqFfgduTFBWjNoRE?p=preview))
+   * ### Example
    *
    * ```typescript
    * import {ResponseOptions, Response} from '@angular/http';
@@ -123,7 +123,7 @@ export class ResponseOptions {
  * when configuring an {@link Injector}, in order to override the default options
  * used by {@link Http} to create {@link Response Responses}.
  *
- * ### Example ([live demo](http://plnkr.co/edit/qv8DLT?p=preview))
+ * ### Example
  *
  * ```typescript
  * import {provide} from '@angular/core';
@@ -142,7 +142,7 @@ export class ResponseOptions {
  * The options could also be extended when manually creating a {@link Response}
  * object.
  *
- * ### Example ([live demo](http://plnkr.co/edit/VngosOWiaExEtbstDoix?p=preview))
+ * ### Example
  *
  * ```
  * import {BaseResponseOptions, Response} from '@angular/http';

From 92b278c097b066ae435c8ef3e1c4cf7487530828 Mon Sep 17 00:00:00 2001
From: Fabian Wiles <fabianwiles@live.com>
Date: Wed, 6 Jun 2018 21:30:21 +1200
Subject: [PATCH 263/582] feat(core): export defaultKeyValueDiffers to private
 api (#24319)

PR Close #24319
---
 packages/core/src/core_private_export.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index f56c13e4e5..5b35140710 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -8,7 +8,7 @@
 
 export {ALLOW_MULTIPLE_PLATFORMS as ɵALLOW_MULTIPLE_PLATFORMS} from './application_ref';
 export {APP_ID_RANDOM_PROVIDER as ɵAPP_ID_RANDOM_PROVIDER} from './application_tokens';
-export {defaultIterableDiffers as ɵdefaultIterableDiffers} from './change_detection/change_detection';
+export {defaultIterableDiffers as ɵdefaultIterableDiffers, defaultKeyValueDiffers as ɵdefaultKeyValueDiffers} from './change_detection/change_detection';
 export {devModeEqual as ɵdevModeEqual} from './change_detection/change_detection_util';
 export {isListLikeIterable as ɵisListLikeIterable} from './change_detection/change_detection_util';
 export {ChangeDetectorStatus as ɵChangeDetectorStatus, isDefaultChangeDetectionStrategy as ɵisDefaultChangeDetectionStrategy} from './change_detection/constants';

From 2b49bf77afc22ae9b10323880d3e06efc783bc28 Mon Sep 17 00:00:00 2001
From: Fabian Wiles <fabianwiles@live.com>
Date: Wed, 6 Jun 2018 21:31:22 +1200
Subject: [PATCH 264/582] feat(common): introduce KeyValuePipe (#24319)

PR Close #24319
---
 packages/common/src/common.ts                 |   2 +-
 packages/common/src/pipes/index.ts            |   6 +-
 packages/common/src/pipes/keyvalue_pipe.ts    | 110 +++++++++++++
 .../common/test/pipes/keyvalue_pipe_spec.ts   | 152 ++++++++++++++++++
 .../differs/keyvalue_differs.ts               |   4 +-
 .../common/pipes/ts/e2e_test/pipe_spec.ts     |  10 ++
 .../examples/common/pipes/ts/keyvalue_pipe.ts |  29 ++++
 packages/examples/common/pipes/ts/module.ts   |   8 +-
 tools/public_api_guard/common/common.d.ts     |  17 ++
 9 files changed, 332 insertions(+), 6 deletions(-)
 create mode 100644 packages/common/src/pipes/keyvalue_pipe.ts
 create mode 100644 packages/common/test/pipes/keyvalue_pipe_spec.ts
 create mode 100644 packages/examples/common/pipes/ts/keyvalue_pipe.ts

diff --git a/packages/common/src/common.ts b/packages/common/src/common.ts
index 1ad85ea133..1bfa538ce0 100644
--- a/packages/common/src/common.ts
+++ b/packages/common/src/common.ts
@@ -21,7 +21,7 @@ export {parseCookieValue as ɵparseCookieValue} from './cookie';
 export {CommonModule, DeprecatedI18NPipesModule} from './common_module';
 export {NgClass, NgForOf, NgForOfContext, NgIf, NgIfContext, NgPlural, NgPluralCase, NgStyle, NgSwitch, NgSwitchCase, NgSwitchDefault, NgTemplateOutlet, NgComponentOutlet} from './directives/index';
 export {DOCUMENT} from './dom_tokens';
-export {AsyncPipe, DatePipe, I18nPluralPipe, I18nSelectPipe, JsonPipe, LowerCasePipe, CurrencyPipe, DecimalPipe, PercentPipe, SlicePipe, UpperCasePipe, TitleCasePipe} from './pipes/index';
+export {AsyncPipe, DatePipe, I18nPluralPipe, I18nSelectPipe, JsonPipe, LowerCasePipe, CurrencyPipe, DecimalPipe, PercentPipe, SlicePipe, UpperCasePipe, TitleCasePipe, KeyValuePipe, KeyValue} from './pipes/index';
 export {DeprecatedDatePipe, DeprecatedCurrencyPipe, DeprecatedDecimalPipe, DeprecatedPercentPipe} from './pipes/deprecated/index';
 export {PLATFORM_BROWSER_ID as ɵPLATFORM_BROWSER_ID, PLATFORM_SERVER_ID as ɵPLATFORM_SERVER_ID, PLATFORM_WORKER_APP_ID as ɵPLATFORM_WORKER_APP_ID, PLATFORM_WORKER_UI_ID as ɵPLATFORM_WORKER_UI_ID, isPlatformBrowser, isPlatformServer, isPlatformWorkerApp, isPlatformWorkerUi} from './platform_id';
 export {VERSION} from './version';
diff --git a/packages/common/src/pipes/index.ts b/packages/common/src/pipes/index.ts
index 7014c6275d..9dc1e8d10a 100644
--- a/packages/common/src/pipes/index.ts
+++ b/packages/common/src/pipes/index.ts
@@ -17,6 +17,7 @@ import {DatePipe} from './date_pipe';
 import {I18nPluralPipe} from './i18n_plural_pipe';
 import {I18nSelectPipe} from './i18n_select_pipe';
 import {JsonPipe} from './json_pipe';
+import {KeyValue, KeyValuePipe} from './keyvalue_pipe';
 import {CurrencyPipe, DecimalPipe, PercentPipe} from './number_pipe';
 import {SlicePipe} from './slice_pipe';
 
@@ -25,6 +26,8 @@ export {
   CurrencyPipe,
   DatePipe,
   DecimalPipe,
+  KeyValue,
+  KeyValuePipe,
   I18nPluralPipe,
   I18nSelectPipe,
   JsonPipe,
@@ -32,7 +35,7 @@ export {
   PercentPipe,
   SlicePipe,
   TitleCasePipe,
-  UpperCasePipe
+  UpperCasePipe,
 };
 
 
@@ -52,4 +55,5 @@ export const COMMON_PIPES = [
   DatePipe,
   I18nPluralPipe,
   I18nSelectPipe,
+  KeyValuePipe,
 ];
diff --git a/packages/common/src/pipes/keyvalue_pipe.ts b/packages/common/src/pipes/keyvalue_pipe.ts
new file mode 100644
index 0000000000..0c58273af7
--- /dev/null
+++ b/packages/common/src/pipes/keyvalue_pipe.ts
@@ -0,0 +1,110 @@
+/**
+ * @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 {KeyValueChangeRecord, KeyValueChanges, KeyValueDiffer, KeyValueDiffers, Pipe, PipeTransform} from '@angular/core';
+
+function makeKeyValuePair<K, V>(key: K, value: V): KeyValue<K, V> {
+  return {key: key, value: value};
+}
+
+/**
+ * A key value pair.
+ * Usually used to represent the key value pairs from a Map or Object.
+ */
+export interface KeyValue<K, V> {
+  key: K;
+  value: V;
+}
+
+/**
+ * @ngModule CommonModule
+ * @description
+ *
+ * Transforms Object or Map into an array of key value pairs.
+ *
+ * The output array will be ordered by keys.
+ * By default the comparator will be by Unicode point value.
+ * You can optionally pass a compareFn if your keys are complex types.
+ *
+ * ## Examples
+ *
+ * This examples show how an Object or a Map and be iterated by ngFor with the use of this keyvalue
+ * pipe.
+ *
+ * {@example common/pipes/ts/keyvalue_pipe.ts region='KeyValuePipe'}
+ */
+@Pipe({name: 'keyvalue', pure: false})
+export class KeyValuePipe implements PipeTransform {
+  constructor(private readonly differs: KeyValueDiffers) {}
+
+  private differ: KeyValueDiffer<any, any>;
+  private keyValues: Array<KeyValue<any, any>>;
+
+  transform<K, V>(input: null, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): null;
+  transform<V>(
+      input: {[key: string]: V}|Map<string, V>,
+      compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number):
+      Array<KeyValue<string, V>>;
+  transform<V>(
+      input: {[key: number]: V}|Map<number, V>,
+      compareFn?: (a: KeyValue<number, V>, b: KeyValue<number, V>) => number):
+      Array<KeyValue<number, V>>;
+  transform<K, V>(input: Map<K, V>, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number):
+      Array<KeyValue<K, V>>;
+  transform<K, V>(
+      input: null|{[key: string]: V, [key: number]: V}|Map<K, V>,
+      compareFn: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number = defaultComparator):
+      Array<KeyValue<K, V>>|null {
+    if (!input || (!(input instanceof Map) && typeof input !== 'object')) {
+      return null;
+    }
+
+    if (!this.differ) {
+      // make a differ for whatever type we've been passed in
+      this.differ = this.differs.find(input).create();
+    }
+
+    const differChanges: KeyValueChanges<K, V>|null = this.differ.diff(input as any);
+
+    if (differChanges) {
+      this.keyValues = [];
+      differChanges.forEachItem((r: KeyValueChangeRecord<K, V>) => {
+        this.keyValues.push(makeKeyValuePair(r.key, r.currentValue !));
+      });
+      this.keyValues.sort(compareFn);
+    }
+    return this.keyValues;
+  }
+}
+
+export function defaultComparator<K, V>(
+    keyValueA: KeyValue<K, V>, keyValueB: KeyValue<K, V>): number {
+  const a = keyValueA.key;
+  const b = keyValueB.key;
+  // if same exit with 0;
+  if (a === b) return 0;
+  // make sure that undefined are at the end of the sort.
+  if (a === undefined) return 1;
+  if (b === undefined) return -1;
+  // make sure that nulls are at the end of the sort.
+  if (a === null) return 1;
+  if (b === null) return -1;
+  if (typeof a == 'string' && typeof b == 'string') {
+    return a < b ? -1 : 1;
+  }
+  if (typeof a == 'number' && typeof b == 'number') {
+    return a - b;
+  }
+  if (typeof a == 'boolean' && typeof b == 'boolean') {
+    return a < b ? -1 : 1;
+  }
+  // `a` and `b` are of different types. Compare their string values.
+  const aString = String(a);
+  const bString = String(b);
+  return aString == bString ? 0 : aString < bString ? -1 : 1;
+}
diff --git a/packages/common/test/pipes/keyvalue_pipe_spec.ts b/packages/common/test/pipes/keyvalue_pipe_spec.ts
new file mode 100644
index 0000000000..484531dd9e
--- /dev/null
+++ b/packages/common/test/pipes/keyvalue_pipe_spec.ts
@@ -0,0 +1,152 @@
+/**
+ * @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 {KeyValuePipe} from '@angular/common';
+import {EventEmitter, KeyValueDiffers, WrappedValue, ɵdefaultKeyValueDiffers as defaultKeyValueDiffers} from '@angular/core';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
+import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
+import {browserDetection} from '@angular/platform-browser/testing/src/browser_util';
+
+import {defaultComparator} from '../../src/pipes/keyvalue_pipe';
+import {SpyChangeDetectorRef} from '../spies';
+
+describe('KeyValuePipe', () => {
+  it('should return null when given null', () => {
+    const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+    expect(pipe.transform(null)).toEqual(null);
+  });
+  it('should return null when given undefined', () => {
+    const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+    expect(pipe.transform(undefined as any)).toEqual(null);
+  });
+  it('should return null for an unsupported type', () => {
+    const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+    const fn = () => {};
+    expect(pipe.transform(fn as any)).toEqual(null);
+  });
+  describe('object dictionary', () => {
+    it('should transform a basic dictionary', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform({1: 2})).toEqual([{key: '1', value: 2}]);
+    });
+    it('should order by alpha', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform({'b': 1, 'a': 1})).toEqual([
+        {key: 'a', value: 1}, {key: 'b', value: 1}
+      ]);
+    });
+    it('should order by numerical', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform({2: 1, 1: 1})).toEqual([{key: '1', value: 1}, {key: '2', value: 1}]);
+    });
+    it('should order by numerical and alpha', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const input = {2: 1, 1: 1, 'b': 1, 0: 1, 3: 1, 'a': 1};
+      expect(pipe.transform(input)).toEqual([
+        {key: '0', value: 1}, {key: '1', value: 1}, {key: '2', value: 1}, {key: '3', value: 1},
+        {key: 'a', value: 1}, {key: 'b', value: 1}
+      ]);
+    });
+    it('should return the same ref if nothing changes', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const transform1 = pipe.transform({1: 2});
+      const transform2 = pipe.transform({1: 2});
+      expect(transform1 === transform2).toEqual(true);
+    });
+    it('should return a new ref if something changes', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const transform1 = pipe.transform({1: 2});
+      const transform2 = pipe.transform({1: 3});
+      expect(transform1 !== transform2).toEqual(true);
+    });
+  });
+
+  describe('Map', () => {
+    it('should transform a basic Map', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform(new Map([[1, 2]]))).toEqual([{key: 1, value: 2}]);
+    });
+    it('should order by alpha', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform(new Map([['b', 1], ['a', 1]]))).toEqual([
+        {key: 'a', value: 1}, {key: 'b', value: 1}
+      ]);
+    });
+    it('should order by numerical', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform(new Map([[2, 1], [1, 1]]))).toEqual([
+        {key: 1, value: 1}, {key: 2, value: 1}
+      ]);
+    });
+    it('should order by numerical and alpha', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const input = [[2, 1], [1, 1], ['b', 1], [0, 1], [3, 1], ['a', 1]];
+      expect(pipe.transform(new Map(input as any))).toEqual([
+        {key: 0, value: 1}, {key: 1, value: 1}, {key: 2, value: 1}, {key: 3, value: 1},
+        {key: 'a', value: 1}, {key: 'b', value: 1}
+      ]);
+    });
+    it('should order by complex types with compareFn', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const input = new Map([[{id: 1}, 1], [{id: 0}, 1]]);
+      expect(pipe.transform<{id: number}, number>(input, (a, b) => a.key.id > b.key.id ? 1 : -1))
+          .toEqual([
+            {key: {id: 0}, value: 1},
+            {key: {id: 1}, value: 1},
+          ]);
+    });
+    it('should return the same ref if nothing changes', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const transform1 = pipe.transform(new Map([[1, 2]]));
+      const transform2 = pipe.transform(new Map([[1, 2]]));
+      expect(transform1 === transform2).toEqual(true);
+    });
+    it('should return a new ref if something changes', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      const transform1 = pipe.transform(new Map([[1, 2]]));
+      const transform2 = pipe.transform(new Map([[1, 3]]));
+      expect(transform1 !== transform2).toEqual(true);
+    });
+  });
+});
+
+describe('defaultComparator', () => {
+  it('should remain the same order when keys are equal', () => {
+    const key = 1;
+    const values = [{key, value: 2}, {key, value: 1}];
+    expect(values.sort(defaultComparator)).toEqual(values);
+  });
+  it('should sort undefined keys to the end', () => {
+    const values = [{key: 3, value: 1}, {key: undefined, value: 3}, {key: 1, value: 2}];
+    expect(values.sort(defaultComparator)).toEqual([
+      {key: 1, value: 2}, {key: 3, value: 1}, {key: undefined, value: 3}
+    ]);
+  });
+  it('should sort null keys to the end', () => {
+    const values = [{key: 3, value: 1}, {key: null, value: 3}, {key: 1, value: 2}];
+    expect(values.sort(defaultComparator)).toEqual([
+      {key: 1, value: 2}, {key: 3, value: 1}, {key: null, value: 3}
+    ]);
+  });
+  it('should sort strings in alpha ascending', () => {
+    const values = [{key: 'b', value: 1}, {key: 'a', value: 3}];
+    expect(values.sort(defaultComparator)).toEqual([{key: 'a', value: 3}, {key: 'b', value: 1}]);
+  });
+  it('should sort numbers in numerical ascending', () => {
+    const values = [{key: 2, value: 1}, {key: 1, value: 3}];
+    expect(values.sort(defaultComparator)).toEqual([{key: 1, value: 3}, {key: 2, value: 1}]);
+  });
+  it('should sort boolean in false (0) -> true (1)', () => {
+    const values = [{key: true, value: 3}, {key: false, value: 1}];
+    expect(values.sort(defaultComparator)).toEqual([{key: false, value: 1}, {key: true, value: 3}]);
+  });
+  it('should sort numbers as strings in numerical ascending', () => {
+    const values = [{key: '2', value: 1}, {key: 1, value: 3}];
+    expect(values.sort(defaultComparator)).toEqual([{key: 1, value: 3}, {key: '2', value: 1}]);
+  });
+});
diff --git a/packages/core/src/change_detection/differs/keyvalue_differs.ts b/packages/core/src/change_detection/differs/keyvalue_differs.ts
index c8e35cced3..6a9807c587 100644
--- a/packages/core/src/change_detection/differs/keyvalue_differs.ts
+++ b/packages/core/src/change_detection/differs/keyvalue_differs.ts
@@ -22,7 +22,7 @@ export interface KeyValueDiffer<K, V> {
    * @returns an object describing the difference. The return value is only valid until the next
    * `diff()` invocation.
    */
-  diff(object: Map<K, V>): KeyValueChanges<K, V>;
+  diff(object: Map<K, V>): KeyValueChanges<K, V>|null;
 
   /**
    * Compute a difference between the previous state and the new `object` state.
@@ -31,7 +31,7 @@ export interface KeyValueDiffer<K, V> {
    * @returns an object describing the difference. The return value is only valid until the next
    * `diff()` invocation.
    */
-  diff(object: {[key: string]: V}): KeyValueChanges<string, V>;
+  diff(object: {[key: string]: V}): KeyValueChanges<string, V>|null;
   // TODO(TS2.1): diff<KP extends string>(this: KeyValueDiffer<KP, V>, object: Record<KP, V>):
   // KeyValueDiffer<KP, V>;
 }
diff --git a/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts b/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
index df4d1e28a8..818679e63e 100644
--- a/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
+++ b/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
@@ -57,4 +57,14 @@ describe('pipe', () => {
       expect(element.all(by.css('titlecase-pipe p')).get(5).getText()).toEqual('Foo-vs-bar');
     });
   });
+  describe('titlecase', () => {
+    it('should work properly', () => {
+      browser.get(URL);
+      waitForElement('keyvalue-pipe');
+      expect(element.all(by.css('keyvalue-pipe div')).get(0).getText()).toEqual('1:bar');
+      expect(element.all(by.css('keyvalue-pipe div')).get(1).getText()).toEqual('2:foo');
+      expect(element.all(by.css('keyvalue-pipe div')).get(2).getText()).toEqual('1:bar');
+      expect(element.all(by.css('keyvalue-pipe div')).get(3).getText()).toEqual('2:foo');
+    });
+  });
 });
diff --git a/packages/examples/common/pipes/ts/keyvalue_pipe.ts b/packages/examples/common/pipes/ts/keyvalue_pipe.ts
new file mode 100644
index 0000000000..3f482a3b3e
--- /dev/null
+++ b/packages/examples/common/pipes/ts/keyvalue_pipe.ts
@@ -0,0 +1,29 @@
+/**
+ * @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';
+
+// #docregion KeyValuePipe
+@Component({
+  selector: 'keyvalue-pipe',
+  template: `<span>
+    <p>Object</p>
+    <div *ngFor="let item of object | keyvalue">
+      {{item.key}}:{{item.value}}
+    </div>
+    <p>Map</p>
+    <div *ngFor="let item of map | keyvalue">
+      {{item.key}}:{{item.value}}
+    </div>
+  </span>`
+})
+export class KeyValuePipeComponent {
+  object: {[key: number]: string} = {2: 'foo', 1: 'bar'};
+  map = new Map([[2, 'foo'], [1, 'bar']]);
+}
+// #enddocregion
diff --git a/packages/examples/common/pipes/ts/module.ts b/packages/examples/common/pipes/ts/module.ts
index 3c80533dc7..f21d3af8b1 100644
--- a/packages/examples/common/pipes/ts/module.ts
+++ b/packages/examples/common/pipes/ts/module.ts
@@ -14,6 +14,7 @@ import {CurrencyPipeComponent, DeprecatedCurrencyPipeComponent} from './currency
 import {DatePipeComponent, DeprecatedDatePipeComponent} from './date_pipe';
 import {I18nPluralPipeComponent, I18nSelectPipeComponent} from './i18n_pipe';
 import {JsonPipeComponent} from './json_pipe';
+import {KeyValuePipeComponent} from './keyvalue_pipe';
 import {LowerUpperPipeComponent} from './lowerupper_pipe';
 import {DeprecatedNumberPipeComponent, NumberPipeComponent} from './number_pipe';
 import {DeprecatedPercentPipeComponent, PercentPipeComponent} from './percent_pipe';
@@ -31,7 +32,7 @@ import {TitleCasePipeComponent} from './titlecase_pipe';
 
     <h2><code>date</code></h2>
     <date-pipe></date-pipe>
-    
+
     <h2><code>json</code></h2>
     <json-pipe></json-pipe>
 
@@ -53,6 +54,9 @@ import {TitleCasePipeComponent} from './titlecase_pipe';
     <h2><code>i18n</code></h2>
     <i18n-plural-pipe></i18n-plural-pipe>
     <i18n-select-pipe></i18n-select-pipe>
+
+    <h2><code>keyvalue</code></h2>
+    <keyvalue-pipe></keyvalue-pipe>
   `
 })
 export class ExampleAppComponent {
@@ -64,7 +68,7 @@ export class ExampleAppComponent {
     DatePipeComponent, DeprecatedDatePipeComponent, LowerUpperPipeComponent, TitleCasePipeComponent,
     NumberPipeComponent, PercentPipeComponent, DeprecatedPercentPipeComponent,
     CurrencyPipeComponent, DeprecatedCurrencyPipeComponent, SlicePipeStringComponent,
-    SlicePipeListComponent, I18nPluralPipeComponent, I18nSelectPipeComponent
+    SlicePipeListComponent, I18nPluralPipeComponent, I18nSelectPipeComponent, KeyValuePipeComponent
   ],
   imports: [BrowserModule],
   bootstrap: [ExampleAppComponent]
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index 26ab3bd1b2..9c77a29a94 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -175,6 +175,23 @@ export declare class JsonPipe implements PipeTransform {
     transform(value: any): string;
 }
 
+export interface KeyValue<K, V> {
+    key: K;
+    value: V;
+}
+
+export declare class KeyValuePipe implements PipeTransform {
+    constructor(differs: KeyValueDiffers);
+    transform<K, V>(input: null, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): null;
+    transform<V>(input: {
+        [key: string]: V;
+    } | Map<string, V>, compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number): Array<KeyValue<string, V>>;
+    transform<V>(input: {
+        [key: number]: V;
+    } | Map<number, V>, compareFn?: (a: KeyValue<number, V>, b: KeyValue<number, V>) => number): Array<KeyValue<number, V>>;
+    transform<K, V>(input: Map<K, V>, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>;
+}
+
 export declare class Location {
     constructor(platformStrategy: LocationStrategy);
     back(): void;

From 52ce9d5dcbcce6b54c84b74440ceb54fb20a36e0 Mon Sep 17 00:00:00 2001
From: Fabian Wiles <fabianwiles@live.com>
Date: Wed, 13 Jun 2018 20:34:48 +1200
Subject: [PATCH 265/582] feat(core): KeyValueDiffer#diff allows null values
 (#24319)

PR Close #24319
---
 tools/public_api_guard/core/core.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 7c6a03a6e3..a522d23f7f 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -468,10 +468,10 @@ export interface KeyValueChanges<K, V> {
 }
 
 export interface KeyValueDiffer<K, V> {
-    diff(object: Map<K, V>): KeyValueChanges<K, V>;
+    diff(object: Map<K, V>): KeyValueChanges<K, V> | null;
     diff(object: {
         [key: string]: V;
-    }): KeyValueChanges<string, V>;
+    }): KeyValueChanges<string, V> | null;
 }
 
 export interface KeyValueDifferFactory {

From a577c9e1f484780e8798f0ed519e9c3ec8adda0b Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Thu, 3 May 2018 10:54:51 -0700
Subject: [PATCH 266/582] docs: edit api doc comments for new template and
 style (#23682)

PR Close #23682
---
 packages/animations/src/animation_metadata.ts | 1309 +++++++++--------
 .../animations/animations.d.ts                |   32 -
 2 files changed, 666 insertions(+), 675 deletions(-)

diff --git a/packages/animations/src/animation_metadata.ts b/packages/animations/src/animation_metadata.ts
index cd0e463c06..c2c4afad43 100755
--- a/packages/animations/src/animation_metadata.ts
+++ b/packages/animations/src/animation_metadata.ts
@@ -5,275 +5,436 @@
  * 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
  */
+
+/**
+ * Represents a set of CSS styles for use in an animation style.
+ */
 export interface ɵStyleData { [key: string]: string|number; }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are created internally
- * within the Angular animation DSL.
- *
- * @experimental Animation support is experimental.
- */
+* Represents animation-step timing parameters for an animation step.  
+* @see `animate()`
+*/
 export declare type AnimateTimings = {
+  /**
+   * The full duration of an animation step. A number and optional time unit,
+   * such as "1s" or "10ms" for one second and 10 milliseconds, respectively.
+   * The default unit is milliseconds.
+   */
   duration: number,
+  /**
+   * The delay in applying an animation step. A number and optional time unit.
+   * The default unit is milliseconds.
+   */
   delay: number,
+  /**
+   * An easing style that controls how an animations step accelerates
+   * and decelerates during its run time. An easing function such as `cubic-bezier()`,
+   * or one of the following constants:
+   * - `ease-in`
+   * - `ease-out`
+   * - `ease-in-and-out`
+   */
   easing: string | null
 };
 
 /**
- * `AnimationOptions` represents options that can be passed into most animation DSL methods.
- * When options are provided, the delay value of an animation can be changed and animation input
- * parameters can be passed in to change styling and timing data when an animation is started.
+ * @description Options that control animation styling and timing.
+ * The following animation functions accept `AnimationOptions` data:
  *
- * The following animation DSL functions are able to accept animation option data:
+ * - `transition`
+ * - `sequence`
+ * - `group()`
+ * - `query()`
+ * - `animation()`
+ * - `useAnimation()`
+ * - `animateChild()`
  *
- * - {@link transition transition()}
- * - {@link sequence sequence()}
- * - {@link group group()}
- * - {@link query query()}
- * - {@link animation animation()}
- * - {@link useAnimation useAnimation()}
- * - {@link animateChild animateChild()}
- *
- * Programmatic animations built using {@link AnimationBuilder the AnimationBuilder service} also
- * make use of AnimationOptions.
- *
- * @experimental Animation support is experimental.
+ * Programmatic animations built using the `AnimationBuilder` service also
+ * make use of `AnimationOptions`.
  */
 export declare interface AnimationOptions {
+  /**
+   * Sets a time-delay for initiating an animation action.
+   * A number and optional time unit, such as "1s" or "10ms" for one second
+   * and 10 milliseconds, respectively.The default unit is milliseconds.
+   * Default value is 0, meaning no delay.
+   */
   delay?: number|string;
+  /**
+  * A set of developer-defined parameters that modify styling and timing
+  * when an animation action starts. An array of key-value pairs, where the provided value
+  * is used as a default.
+  */
   params?: {[name: string]: any};
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are created internally
- * within the Angular animation DSL when {@link animateChild animateChild()} is used.
+ * Adds duration options to control animation styling and timing for a child animation.
  *
- * @experimental Animation support is experimental.
+ * @see `animateChild()`
  */
 export declare interface AnimateChildOptions extends AnimationOptions { duration?: number|string; }
 
 /**
- * Metadata representing the entry of animations. Usages of this enum are created
- * each time an animation DSL function is used.
+ * @description Constants for the categories of parameters that can be defined for animations.
  *
- * @experimental Animation support is experimental.
+ * A corresponding function defines a set of parameters for each category, and
+ * collects them into a corresponding `AnimationMetadata` object.
  */
 export const enum AnimationMetadataType {
+  /**
+   * Associates a named animation state with a set of CSS styles.
+   * See `state()`
+   */
   State = 0,
+  /**
+   * Data for a transition from one animation state to another.
+   * See `transition()`
+   */
   Transition = 1,
+  /**
+   * Contains a set of animation steps.
+   * See `sequence()`
+   */
   Sequence = 2,
+  /**
+   * Contains a set of animation steps.
+   * See `group()`
+   */
   Group = 3,
+  /**
+   * Contains an animation step.
+   * See `animate()`
+   */
   Animate = 4,
+  /**
+   * Contains a set of animation steps.
+   * See `keyframes()`
+   */
   Keyframes = 5,
+  /**
+   * Contains a set of CSS property-value pairs into a named style.
+   * See `style()`
+   */
   Style = 6,
+  /**
+   * Associates an animation with an entry trigger that can be attached to an element.
+   * See `trigger()`
+   */
   Trigger = 7,
+  /**
+   * Contains a re-usable animation.
+   * See `animation()`
+   */
   Reference = 8,
+  /**
+   * Contains data to use in executing child animations returned by a query.
+   * See `animateChild()`
+   */
   AnimateChild = 9,
+  /**
+   * Contains animation parameters for a re-usable animation.
+   * See `useAnimation()`
+   */
   AnimateRef = 10,
+  /**
+   * Contains child-animation query data.
+   * See `query()`
+   */
   Query = 11,
+  /**
+   * Contains data for staggering an animation sequence.
+   * See `stagger()`
+   */
   Stagger = 12
 }
 
 /**
- * @experimental Animation support is experimental.
+ * Specifies automatic styling.
  */
 export const AUTO_STYLE = '*';
 
 /**
- * @experimental Animation support is experimental.
+ * Base for animation data structures.
  */
 export interface AnimationMetadata { type: AnimationMetadataType; }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link trigger trigger animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Contains an animation trigger. Instantiated and returned by the
+ * `trigger()` function.
  */
 export interface AnimationTriggerMetadata extends AnimationMetadata {
+  /**
+    * The trigger name, used to associate it with an element. Unique within the component.
+    */
   name: string;
+  /**
+   * An animation definition object, containing an array of state and transition declarations.
+   */
   definitions: AnimationMetadata[];
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: {params?: {[name: string]: any}}|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link state state animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates an animation state by associating a state name with a set of CSS styles.
+ * Instantiated and returned by the `state()` function.
  */
 export interface AnimationStateMetadata extends AnimationMetadata {
+  /**
+   * The state name, unique within the component.
+   */
   name: string;
+  /**
+   *  The CSS styles associated with this state.
+   */
   styles: AnimationStyleMetadata;
+  /**
+   * An options object containing
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation.
+   */
   options?: {params: {[name: string]: any}};
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link transition transition animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates an animation transition. Instantiated and returned by the
+ * `transition()` function.
  */
 export interface AnimationTransitionMetadata extends AnimationMetadata {
+  /**
+   * An expression that describes a state change.
+   */
   expr: string|
       ((fromState: string, toState: string, element?: any,
         params?: {[key: string]: any}) => boolean);
+  /**
+   * One or more animation objects to which this transition applies.
+   */
   animation: AnimationMetadata|AnimationMetadata[];
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: AnimationOptions|null;
 }
 
 /**
- * @experimental Animation support is experimental.
+ * Encapsulates a reusable animation, which is a collection of individual animation steps.
+ * Instantiated and returned by the `animation()` function, and
+ * passed to the `useAnimation()` function.
  */
 export interface AnimationReferenceMetadata extends AnimationMetadata {
+  /**
+   *  One or more animation step objects.
+   */
   animation: AnimationMetadata|AnimationMetadata[];
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: AnimationOptions|null;
 }
 
 /**
- * @experimental Animation support is experimental.
+ * Encapsulates an animation query. Instantiated and returned by
+ * the `query()` function.
  */
 export interface AnimationQueryMetadata extends AnimationMetadata {
+  /**
+   *  The CSS selector for this query.
+   */
   selector: string;
+  /**
+   * One or more animation step objects.
+   */
   animation: AnimationMetadata|AnimationMetadata[];
+  /**
+   * A query options object.
+   */
   options: AnimationQueryOptions|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link keyframes keyframes animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates a keyframes sequence. Instantiated and returned by
+ * the `keyframes()` function.
  */
 export interface AnimationKeyframesSequenceMetadata extends AnimationMetadata {
+  /**
+   * An array of animation styles.
+   */
   steps: AnimationStyleMetadata[];
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link style style animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates an animation style. Instantiated and returned by
+ * the `style()` function.
  */
 export interface AnimationStyleMetadata extends AnimationMetadata {
+  /**
+   * A set of CSS style properties.
+   */
   styles: '*'|{[key: string]: string | number}|Array<{[key: string]: string | number}|'*'>;
+  /**
+   * A percentage of the total animate time at which the style is to be applied.
+   */
   offset: number|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link animate animate animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates an animation step. Instantiated and returned by
+ * the `animate()` function.
  */
 export interface AnimationAnimateMetadata extends AnimationMetadata {
+  /**
+   * The timing data for the step.
+   */
   timings: string|number|AnimateTimings;
+  /**
+   * A set of styles used in the step.
+   */
   styles: AnimationStyleMetadata|AnimationKeyframesSequenceMetadata|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link animateChild animateChild animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates a child animation, that can be run explicitly when the parent is run.
+ * Instantiated and returned by the `animateChild` function.
  */
 export interface AnimationAnimateChildMetadata extends AnimationMetadata {
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: AnimationOptions|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link useAnimation useAnimation animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates a reusable animation.
+ * Instantiated and returned by the `useAnimation()` function.
  */
 export interface AnimationAnimateRefMetadata extends AnimationMetadata {
+  /**
+   * An animation reference object.
+   */
   animation: AnimationReferenceMetadata;
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: AnimationOptions|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link sequence sequence animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates an animation sequence.
+ * Instantiated and returned by the `sequence()` function.
  */
 export interface AnimationSequenceMetadata extends AnimationMetadata {
+  /**
+   *  An array of animation step objects.
+   */
   steps: AnimationMetadata[];
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: AnimationOptions|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link group group animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates an animation group.
+ * Instantiated and returned by the `group()` function.
  */
 export interface AnimationGroupMetadata extends AnimationMetadata {
+  /**
+   * One or more animation or style steps that form this group.
+   */
   steps: AnimationMetadata[];
+  /**
+   * An options object containing a delay and
+   * developer-defined parameters that provide styling defaults and
+   * can be overridden on invocation. Default delay is 0.
+   */
   options: AnimationOptions|null;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link query query animation function} is called.
- *
- * @experimental Animation support is experimental.
+ * Encapsulates animation query options.
+ * Passed to the `query()` function.
  */
 export declare interface AnimationQueryOptions extends AnimationOptions {
+  /**
+   * True if this query is optional, false if it is required. Default is false.
+   * A required query throws an error if no elements are retrieved when
+   * the query is executed. An optional query does not.
+   *
+   */
   optional?: boolean;
   /**
-   * Used to limit the total amount of results from the start of the query list.
-   *
-   * If a negative value is provided then the queried results will be limited from the
-   * end of the query list towards the beginning (e.g. if `limit: -3` is used then the
-   * final 3 (or less) queried results will be used for the animation).
+   * A maximum total number of results to return from the query.
+   * If negative, results are limited from the end of the query list towards the beginning.
+   * By default, results are not limited.
    */
   limit?: number;
 }
 
 /**
- * Metadata representing the entry of animations. Instances of this interface are provided via the
- * animation DSL when the {@link stagger stagger animation function} is called.
- *
-* @experimental Animation support is experimental.
-*/
+ * Encapsulates parameters for staggering the start times of a set of animation steps.
+ * Instantiated and returned by the `stagger()` function.
+ **/
 export interface AnimationStaggerMetadata extends AnimationMetadata {
+  /**
+   * The timing data for the steps.
+   */
   timings: string|number;
+  /**
+   * One or more animation steps.
+   */
   animation: AnimationMetadata|AnimationMetadata[];
 }
 
 /**
- * `trigger` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the
- * {@link Component#animations component animations metadata page} to gain a better
- * understanding of how animations in Angular are used.
- *
- * `trigger` Creates an animation trigger which will a list of {@link state state} and
- * {@link transition transition} entries that will be evaluated when the expression
+ * Creates a named animation trigger, containing a  list of `state()`
+ * and `transition()` entries to be evaluated when the expression
  * bound to the trigger changes.
  *
- * Triggers are registered within the component annotation data under the
- * {@link Component#animations animations section}. An animation trigger can be placed on an element
- * within a template by referencing the name of the trigger followed by the expression value that
- the
- * trigger is bound to (in the form of `[@triggerName]="expression"`.
+ * @param name An identifying string.
+ * @param definitions  An animation definition object, containing an array of `state()`
+ * and `transition()` declarations.
  *
- * Animation trigger bindings strigify values and then match the previous and current values against
- * any linked transitions. If a boolean value is provided into the trigger binding then it will both
- * be represented as `1` or `true` and `0` or `false` for a true and false boolean values
- * respectively.
+ * @return An object that encapsulates the trigger data.
+ * 
+ * @usageNotes
+ * Define an animation trigger in the `animations` section of `@Component` metadata.
+ * In the template, reference the trigger by name and bind it to a trigger expression that
+ * evaluates to a defined animation state, using the following format:
  *
- * ### Usage
+ * `[@triggerName]="expression"`
  *
- * `trigger` will create an animation trigger reference based on the provided `name` value. The
- * provided `animation` value is expected to be an array consisting of {@link state state} and
- * {@link transition transition} declarations.
+ * Animation trigger bindings convert all values to strings, and then match the 
+ * previous and current values against any linked transitions.
+ * Booleans can be specified as `1` or `true` and `0` or `false`.
+ *
+ * ### Usage Example
+ * 
+ * The following example creates an animation trigger reference based on the provided
+ * name value.
+ * The provided animation value is expected to be an array consisting of state and
+ * transition declarations.
  *
  * ```typescript
  * @Component({
- *   selector: 'my-component',
- *   templateUrl: 'my-component-tpl.html',
+ *   selector: "my-component",
+ *   templateUrl: "my-component-tpl.html",
  *   animations: [
  *     trigger("myAnimationTrigger", [
  *       state(...),
@@ -288,8 +449,8 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * }
  * ```
  *
- * The template associated with this component will make use of the `myAnimationTrigger` animation
- trigger by binding to an element within its template code.
+ * The template associated with this component makes use of the defined trigger
+ * by binding to an element within its template code.
  *
  * ```html
  * <!-- somewhere inside of my-component-tpl.html -->
@@ -300,9 +461,8 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * The `transition` animation method also supports reading an inline function which can decide
  * if its associated animation should be run.
  *
- * ```
- * // this method will be run each time the `myAnimationTrigger`
- * // trigger value changes...
+ * ```typescript
+ * // this method is run each time the `myAnimationTrigger` trigger value changes.
  * function myInlineMatcherFn(fromState: string, toState: string, element: any, params: {[key:
  string]: any}): boolean {
  *   // notice that `element` and `params` are also available here
@@ -325,18 +485,16 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * }
  * ```
  *
- * The inline method will be run each time the trigger
- * value changes
+ * ### Disabling Animations
+ * When true, the special animation control binding `@.disabled` binding prevents 
+ * all animations from rendering.
+ * Place the  `@.disabled` binding on an element to disable
+ * animations on the element itself, as well as any inner animation triggers
+ * within the element.
  *
- * ## Disable Animations
- * A special animation control binding called `@.disabled` can be placed on an element which will
- then disable animations for any inner animation triggers situated within the element as well as
- any animations on the element itself.
+ * The following example shows how to use this feature:
  *
- * When true, the `@.disabled` binding will prevent all animations from rendering. The example
- below shows how to use this feature:
- *
- * ```ts
+ * ```typescript
  * @Component({
  *   selector: 'my-component',
  *   template: `
@@ -356,19 +514,16 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * }
  * ```
  *
- * The `@childAnimation` trigger will not animate because `@.disabled` prevents it from happening
- (when true).
+ * When `@.disabled` is true, it prevents the `@childAnimation` trigger from animating,
+ * along with any inner animations.
  *
- * Note that `@.disabled` will only disable all animations (this means any animations running on
- * the same element will also be disabled).
+ * ### Disable animations application-wide
+ * When an area of the template is set to have animations disabled, 
+ * **all** inner components have their animations disabled as well.
+ * This means that you can disable all animations for an app
+ * by placing a host binding set on `@.disabled` on the topmost Angular component.
  *
- * ### Disabling Animations Application-wide
- * When an area of the template is set to have animations disabled, **all** inner components will
- also have their animations disabled as well. This means that all animations for an angular
- application can be disabled by placing a host binding set on `@.disabled` on the topmost Angular
- component.
- *
- * ```ts
+ * ```typescript
  * import {Component, HostBinding} from '@angular/core';
  *
  * @Component({
@@ -381,19 +536,17 @@ export interface AnimationStaggerMetadata extends AnimationMetadata {
  * }
  * ```
  *
- * ### What about animations that us `query()` and `animateChild()`?
- * Despite inner animations being disabled, a parent animation can {@link query query} for inner
- elements located in disabled areas of the template and still animate them as it sees fit. This is
- also the case for when a sub animation is queried by a parent and then later animated using {@link
- animateChild animateChild}.
-
- * ### Detecting when an animation is disabled
- * If a region of the DOM (or the entire application) has its animations disabled, then animation
- * trigger callbacks will still fire just as normal (only for zero seconds).
+ * ### Overriding disablement of inner animations
+ * Despite inner animations being disabled, a parent animation can `query()`
+ * for inner elements located in disabled areas of the template and still animate 
+ * them if needed. This is also the case for when a sub animation is 
+ * queried by a parent and then later animated using `animateChild()`.
  *
- * When a trigger callback fires it will provide an instance of an {@link AnimationEvent}. If
- animations
- * are disabled then the `.disabled` flag on the event will be true.
+ * ### Detecting when an animation is disabled
+ * If a region of the DOM (or the entire application) has its animations disabled, the animation
+ * trigger callbacks still fire, but for zero seconds. When the callback fires, it provides
+ * an instance of an `AnimationEvent`. If animations are disabled,
+ * the `.disabled` flag on the event is true.
  *
  * @experimental Animation support is experimental.
  */
@@ -402,49 +555,60 @@ export function trigger(name: string, definitions: AnimationMetadata[]): Animati
 }
 
 /**
- * `animate` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
+ * Defines an animation step that combines styling information with timing information.
  *
- * `animate` specifies an animation step that will apply the provided `styles` data for a given
- * amount of time based on the provided `timing` expression value. Calls to `animate` are expected
- * to be used within {@link sequence an animation sequence}, {@link group group}, or {@link
- * transition transition}.
+ * @param timings Sets `AnimateTimings` for the parent animation.
+ * A string in the format "duration [delay] [easing]".
+ *  - Duration and delay are expressed as a number and optional time unit,
+ * such as "1s" or "10ms" for one second and 10 milliseconds, respectively.
+ * The default unit is milliseconds.
+ *  - The easing value controls how the animation accelerates and decelerates
+ * during its runtime. Value is one of  `ease`, `ease-in`, `ease-out`,
+ * `ease-in-out`, or a `cubic-bezier()` function call.
+ * If not supplied, no easing is applied.
  *
- * ### Usage
+ * For example, the string "1s 100ms ease-out" specifies a duration of
+ * 1000 milliseconds, and delay of 100 ms, and the "ease-out" easing style,
+ * which decelerates near the end of the duration.
+ * @param styles Sets AnimationStyles for the parent animation.
+ * A function call to either `style()` or `keyframes()`
+ * that returns a collection of CSS style entries to be applied to the parent animation.
+ * When null, uses the styles from the destination state.
+ * This is useful when describing an animation step that will complete an animation;
+ * see "Animating to the final state" in `transitions()`.
+ * @returns An object that encapsulates the animation step.
  *
- * The `animate` function accepts two input parameters: `timing` and `styles`:
+ * @usageNotes
+ * Call within an animation `sequence()`, `group()`, or
+ * `transition()` call to specify an animation step
+ * that applies given style data to the parent animation for a given amount of time.
  *
- * - `timing` is a string based value that can be a combination of a duration with optional delay
- * and easing values. The format for the expression breaks down to `duration delay easing`
- * (therefore a value such as `1s 100ms ease-out` will be parse itself into `duration=1000,
- * delay=100, easing=ease-out`. If a numeric value is provided then that will be used as the
- * `duration` value in millisecond form.
- * - `styles` is the style input data which can either be a call to {@link style style} or {@link
- * keyframes keyframes}. If left empty then the styles from the destination state will be collected
- * and used (this is useful when describing an animation step that will complete an animation by
- * {@link transition#the-final-animate-call animating to the final state}).
+ * ### Syntax Examples
+ * **Timing examples**
  *
+ * The following examples show various `timings` specifications.
+ * - `animate(500)` : Duration is 500 milliseconds.
+ * - `animate("1s")` : Duration is 1000 milliseconds.
+ * - `animate("100ms 0.5s")` : Duration is 100 milliseconds, delay is 500 milliseconds.
+ * - `animate("5s ease-in")` : Duration is 5000 milliseconds, easing in.
+ * - `animate("5s 10ms cubic-bezier(.17,.67,.88,.1)")` : Duration is 5000 milliseconds, delay is 10
+ * milliseconds, easing according to a bezier curve.
+ *
+ * **Style examples**
+ *
+ * The following example calls `style()` to set a single CSS style.
  * ```typescript
- * // various functions for specifying timing data
- * animate(500, style(...))
- * animate("1s", style(...))
- * animate("100ms 0.5s", style(...))
- * animate("5s ease", style(...))
- * animate("5s 10ms cubic-bezier(.17,.67,.88,.1)", style(...))
- *
- * // either style() of keyframes() can be used
  * animate(500, style({ background: "red" }))
- * animate(500, keyframes([
+ * ```
+ * The following example calls `keyframes()` to set a CSS style
+ * to different values for successive keyframes.
+ * ```typescript
+ * animate(500, keyframes(
+ *  [
  *   style({ background: "blue" })),
  *   style({ background: "red" }))
- * ])
+ *  ])
  * ```
- *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
- *
- * @experimental Animation support is experimental.
  */
 export function animate(
     timings: string | number, styles: AnimationStyleMetadata | AnimationKeyframesSequenceMetadata |
@@ -453,25 +617,15 @@ export function animate(
 }
 
 /**
- * `group` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
- *
- * `group` specifies a list of animation steps that are all run in parallel. Grouped animations are
- * useful when a series of styles must be animated/closed off at different starting/ending times.
- *
- * The `group` function can either be used within a {@link sequence sequence} or a {@link transition
- * transition} and it will only continue to the next instruction once all of the inner animation
- * steps have completed.
- *
- * ### Usage
- *
- * The `steps` data that is passed into the `group` animation function can either consist of {@link
- * style style} or {@link animate animate} function calls. Each call to `style()` or `animate()`
- * within a group will be executed instantly (use {@link keyframes keyframes} or a {@link
- * animate#usage animate() with a delay value} to offset styles to be applied at a later time).
+ * @description Defines a list of animation steps to be run in parallel.
  *
+ * @param steps An array of animation step objects.
+ * - When steps are defined by `style()` or `animate()`
+ * function calls, each call within the group is executed instantly.
+ * - To specify offset styles to be applied at a later time, define steps with
+ * `keyframes()`, or use `animate()` calls with a delay value.
+ * For example:
+ * 
  * ```typescript
  * group([
  *   animate("1s", { background: "black" }))
@@ -479,9 +633,19 @@ export function animate(
  * ])
  * ```
  *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
+ * @param options An options object containing a delay and
+ * developer-defined parameters that provide styling defaults and
+ * can be overridden on invocation.
  *
- * @experimental Animation support is experimental.
+ * @return An object that encapsulates the group data.
+ *
+ * @usageNotes
+ * Grouped animations are useful when a series of styles must be 
+ * animated at different starting times and closed off at different ending times.
+ *
+ * When called within a `sequence()` or a
+ * `transition()` call, does not continue to the next
+ * instruction until all of the inner animation steps have completed.
  */
 export function group(
     steps: AnimationMetadata[], options: AnimationOptions | null = null): AnimationGroupMetadata {
@@ -489,27 +653,12 @@ export function group(
 }
 
 /**
- * `sequence` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
+ * Defines a list of animation steps to be run sequentially, one by one.
  *
- * `sequence` Specifies a list of animation steps that are run one by one. (`sequence` is used by
- * default when an array is passed as animation data into {@link transition transition}.)
- *
- * The `sequence` function can either be used within a {@link group group} or a {@link transition
- * transition} and it will only continue to the next instruction once each of the inner animation
- * steps have completed.
- *
- * To perform animation styling in parallel with other animation steps then have a look at the
- * {@link group group} animation function.
- *
- * ### Usage
- *
- * The `steps` data that is passed into the `sequence` animation function can either consist of
- * {@link style style} or {@link animate animate} function calls. A call to `style()` will apply the
- * provided styling data immediately while a call to `animate()` will apply its styling data over a
- * given time depending on its timing data.
+ * @param steps An array of animation step objects.
+ * - Steps defined by `style()` calls apply the styling data immediately.
+ * - Steps defined by `animate()` calls apply the styling data over time
+ *   as specified by the timing data.
  *
  * ```typescript
  * sequence([
@@ -518,57 +667,65 @@ export function group(
  * ])
  * ```
  *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
+ * @param options An options object containing a delay and
+ * developer-defined parameters that provide styling defaults and
+ * can be overridden on invocation.
  *
- * @experimental Animation support is experimental.
- */
+ * @return An object that encapsulates the sequence data.
+ *
+ * @usageNotes
+ * When you pass an array of steps to a
+ * `transition()` call, the steps run sequentially by default.
+ * Compare this to the `group()` call, which runs animation steps in parallel.
+ *
+ * When a sequence is used within a `group()` or a `transition()` call,
+ * execution continues to the next instruction only after each of the inner animation
+ * steps have completed.
+ *
+ **/
 export function sequence(steps: AnimationMetadata[], options: AnimationOptions | null = null):
     AnimationSequenceMetadata {
   return {type: AnimationMetadataType.Sequence, steps, options};
 }
 
 /**
- * `style` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
+ * Declares a key/value object containing CSS properties/styles that
+ * can then be used for an animation `state`, within an animation `sequence`,
+ * or as styling data for calls to `animate()` and `keyframes()`.
  *
- * `style` declares a key/value object containing CSS properties/styles that can then be used for
- * {@link state animation states}, within an {@link sequence animation sequence}, or as styling data
- * for both {@link animate animate} and {@link keyframes keyframes}.
+ * @param tokens A set of CSS styles or HTML styles associated with an animation state.
+ * The value can be any of the following:
+ * - A key-value style pair associating a CSS property with a value.
+ * - An array of key-value style pairs.
+ * - An asterisk (*), to use auto-styling, where styles are derived from the element
+ * being animated and applied to the animation when it starts.
  *
- * ### Usage
+ * Auto-styling can be used to define a state that depends on layout or other 
+ * environmental factors.
  *
- * `style` takes in a key/value string map as data and expects one or more CSS property/value pairs
- * to be defined.
+ * @return An object that encapsulates the style data.
  *
+ * @usageNotes
+ * The following examples create animation styles that collect a set of
+ * CSS property values:
+ * 
  * ```typescript
- * // string values are used for css properties
+ * // string values for CSS properties
  * style({ background: "red", color: "blue" })
  *
- * // numerical (pixel) values are also supported
+ * // numerical pixel values
  * style({ width: 100, height: 0 })
  * ```
  *
- * #### Auto-styles (using `*`)
+ * The following example uses auto-styling to allow a component to animate from
+ * a height of 0 up to the height of the parent element:
  *
- * When an asterix (`*`) character is used as a value then it will be detected from the element
- * being animated and applied as animation data when the animation starts.
- *
- * This feature proves useful for a state depending on layout and/or environment factors; in such
- * cases the styles are calculated just before the animation starts.
- *
- * ```typescript
- * // the steps below will animate from 0 to the
- * // actual height of the element
+ * ```
  * style({ height: 0 }),
  * animate("1s", style({ height: "*" }))
  * ```
  *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
- *
- * @experimental Animation support is experimental.
- */
+ **/
 export function style(
     tokens: '*' | {[key: string]: string | number} |
     Array<'*'|{[key: string]: string | number}>): AnimationStyleMetadata {
@@ -576,53 +733,32 @@ export function style(
 }
 
 /**
- * `state` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
+ * Declares an animation state within a trigger attached to an element.
  *
- * `state` declares an animation state within the given trigger. When a state is active within a
- * component then its associated styles will persist on the element that the trigger is attached to
- * (even when the animation ends).
+ * @param name One or more names for the defined state in a comma-separated string.
+ * The following reserved state names can be supplied to define a style for specific use
+ * cases:
  *
- * To animate between states, have a look at the animation {@link transition transition} DSL
- * function. To register states to an animation trigger please have a look at the {@link trigger
- * trigger} function.
+ * - `void` You can associate styles with this name to be used when
+ * the element is detached from the application. For example, when an `ngIf` evaluates
+ * to false, the state of the associated element is void.
+ *  - `*` (asterisk) Indicates the default state. You can associate styles with this name
+ * to be used as the fallback when the state that is being animated is not declared
+ * within the trigger.
  *
- * #### The `void` state
+ * @param styles A set of CSS styles associated with this state, created using the
+ * `style()` function.
+ * This set of styles persists on the element once the state has been reached.
+ * @param options Parameters that can be passed to the state when it is invoked.
+ * 0 or more key-value pairs.
+ * @return An object that encapsulates the new state data.
  *
- * The `void` state value is a reserved word that angular uses to determine when the element is not
- * apart of the application anymore (e.g. when an `ngIf` evaluates to false then the state of the
- * associated element is void).
- *
- * #### The `*` (default) state
- *
- * The `*` state (when styled) is a fallback state that will be used if the state that is being
- * animated is not declared within the trigger.
- *
- * ### Usage
- *
- * `state` will declare an animation state with its associated styles
- * within the given trigger.
- *
- * - `stateNameExpr` can be one or more state names separated by commas.
- * - `styles` refers to the {@link style styling data} that will be persisted on the element once
- * the state has been reached.
- *
- * ```typescript
- * // "void" is a reserved name for a state and is used to represent
- * // the state in which an element is detached from from the application.
- * state("void", style({ height: 0 }))
- *
- * // user-defined states
- * state("closed", style({ height: 0 }))
- * state("open, visible", style({ height: "*" }))
- * ```
- *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
- *
- * @experimental Animation support is experimental.
- */
+ * @usageNotes
+ * Use the `trigger()` function to register states to an animation trigger.
+ * Use the `transition()` function to animate between states.
+ * When a state is active within a component, its associated styles persist on the element,
+ * even when the animation ends.
+ **/
 export function state(
     name: string, styles: AnimationStyleMetadata,
     options?: {params: {[name: string]: any}}): AnimationStateMetadata {
@@ -630,26 +766,28 @@ export function state(
 }
 
 /**
- * `keyframes` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
+ * Defines a set of animation styles, associating each style with an optional `offset` value.
  *
- * `keyframes` specifies a collection of {@link style style} entries each optionally characterized
- * by an `offset` value.
+ * @param steps A set of animation styles with optional offset data.
+ * The optional `offset` value for a style specifies a percentage of the total animation
+ * time at which that style is applied.
+ * @returns An object that encapsulates the keyframes data.
+ *
+ * @usageNotes
+ * Use with the `animate()` call. Instead of applying animations
+ * from the current state
+ * to the destination state, keyframes describe how each style entry is applied and at what point
+ * within the animation arc.
+ * Compare [CSS Keyframe Animations](https://www.w3schools.com/css/css3_animations.asp).
  *
  * ### Usage
  *
- * The `keyframes` animation function is designed to be used alongside the {@link animate animate}
- * animation function. Instead of applying animations from where they are currently to their
- * destination, keyframes can describe how each style entry is applied and at what point within the
- * animation arc (much like CSS Keyframe Animations do).
- *
- * For each `style()` entry an `offset` value can be set. Doing so allows to specify at what
- * percentage of the animate time the styles will be applied.
+ * In the following example, the offset values describe
+ * when each `backgroundColor` value is applied. The color is red at the start, and changes to
+ * blue when 20% of the total time has elapsed.
  *
  * ```typescript
- * // the provided offset values describe when each backgroundColor value is applied.
+ * // the provided offset values
  * animate("5s", keyframes([
  *   style({ backgroundColor: "red", offset: 0 }),
  *   style({ backgroundColor: "blue", offset: 0.2 }),
@@ -658,8 +796,8 @@ export function state(
  * ]))
  * ```
  *
- * Alternatively, if there are no `offset` values used within the style entries then the offsets
- * will be calculated automatically.
+ * If there are no `offset` values specified in the style entries, the offsets
+ * are calculated automatically.
  *
  * ```typescript
  * animate("5s", keyframes([
@@ -668,127 +806,170 @@ export function state(
  *   style({ backgroundColor: "orange" }) // offset = 0.66
  *   style({ backgroundColor: "black" }) // offset = 1
  * ]))
- * ```
- *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
- *
- * @experimental Animation support is experimental.
+ *```
  */
 export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSequenceMetadata {
   return {type: AnimationMetadataType.Keyframes, steps};
 }
 
 /**
- * `transition` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. If this information is new, please navigate to the {@link
- * Component#animations component animations metadata page} to gain a better understanding of
- * how animations in Angular are used.
- *
- * `transition` declares the {@link sequence sequence of animation steps} that will be run when the
- * provided `stateChangeExpr` value is satisfied. The `stateChangeExpr` consists of a `state1 =>
- * state2` which consists of two known states (use an asterix (`*`) to refer to a dynamic starting
- * and/or ending state).
- *
- * A function can also be provided as the `stateChangeExpr` argument for a transition and this
- * function will be executed each time a state change occurs. If the value returned within the
- * function is true then the associated animation will be run.
- *
- * Animation transitions are placed within an {@link trigger animation trigger}. For an transition
- * to animate to a state value and persist its styles then one or more {@link state animation
- * states} is expected to be defined.
- *
- * ### Usage
- *
- * An animation transition is kicked off the `stateChangeExpr` predicate evaluates to true based on
- * what the previous state is and what the current state has become. In other words, if a transition
- * is defined that matches the old/current state criteria then the associated animation will be
+ * Declares an animation transition as a sequence of animation steps to run when a given
+ * condition is satisfied. The condition is a Boolean expression or function that compares
+ * the previous and current animation states, and returns true if this transition should occur.
+ * When the state criteria of a defined transition are met, the associated animation is
  * triggered.
  *
- * ```typescript
- * // all transition/state changes are defined within an animation trigger
- * trigger("myAnimationTrigger", [
- *   // if a state is defined then its styles will be persisted when the
- *   // animation has fully completed itself
- *   state("on", style({ background: "green" })),
- *   state("off", style({ background: "grey" })),
+ * @param stateChangeExpr A Boolean expression or function that compares the previous and current
+ * animation states, and returns true if this transition should occur. Note that  "true" and "false"
+ * match 1 and 0, respectively. An expression is evaluated each time a state change occurs in the
+ * animation trigger element.
+ * The animation steps run when the expression evaluates to true.
  *
- *   // a transition animation that will be kicked off when the state value
- *   // bound to "myAnimationTrigger" changes from "on" to "off"
- *   transition("on => off", animate(500)),
+ * - A state-change string takes the form "state1 => state2", where each side is a defined animation
+ * state, or an asterix (*) to refer to a dynamic start or end state.
+ *   - The expression string can contain multiple comma-separated statements;
+ * for example "state1 => state2, state3 => state4".
+ *   - Special values `:enter` and `:leave` initiate a transition on the entry and exit states,
+ * equivalent to  "void => *"  and "* => void".
+ *   - Special values `:increment` and `:decrement` initiate a transition when a numeric value has
+ * increased or decreased in value.
+ * - A function is executed each time a state change occurs in the animation trigger element.
+ * The animation steps run when the function returns true.
  *
- *   // it is also possible to do run the same animation for both directions
- *   transition("on <=> off", animate(500)),
+ * @param steps One or more animation objects, as returned by the `animate()` or
+ * `sequence()` function, that form a transformation from one state to another.
+ * A sequence is used by default when you pass an array.
+ * @param options An options object that can contain a delay value for the start of the animation,
+ * and additional developer-defined parameters. Provided values for additional parameters are used
+ * as defaults, and override values can be passed to the caller on invocation.
+ * @returns An object that encapsulates the transition data.
  *
- *   // or to define multiple states pairs separated by commas
- *   transition("on => off, off => void", animate(500)),
+ * @usageNotes
+ * The template associated with a component binds an animation trigger to an element.
  *
- *   // this is a catch-all state change for when an element is inserted into
- *   // the page and the destination state is unknown
- *   transition("void => *", [
- *     style({ opacity: 0 }),
- *     animate(500)
- *   ]),
- *
- *   // this will capture a state change between any states
- *   transition("* => *", animate("1s 0s")),
- *
- *   // you can also go full out and include a function
- *   transition((fromState, toState) => {
- *     // when `true` then it will allow the animation below to be invoked
- *     return fromState == "off" && toState == "on";
- *   }, animate("1s 0s"))
- * ])
- * ```
- *
- * The template associated with this component will make use of the `myAnimationTrigger` animation
- * trigger by binding to an element within its template code.
- *
- * ```html
+ * ```HTML
  * <!-- somewhere inside of my-component-tpl.html -->
  * <div [@myAnimationTrigger]="myStatusExp">...</div>
  * ```
  *
- * #### The final `animate` call
- *
- * If the final step within the transition steps is a call to `animate()` that **only** uses a
- * timing value with **no style data** then it will be automatically used as the final animation arc
- * for the element to animate itself to the final state. This involves an automatic mix of
- * adding/removing CSS styles so that the element will be in the exact state it should be for the
- * applied state to be presented correctly.
+ * All transitions are defined within an animation trigger,
+ * along with named states that the transitions change to and from.
  *
+ * ```typescript
+ * trigger("myAnimationTrigger", [
+ *  // define states
+ *  state("on", style({ background: "green" })),
+ *  state("off", style({ background: "grey" })),
+ *  ...]
  * ```
- * // start off by hiding the element, but make sure that it animates properly to whatever state
- * // is currently active for "myAnimationTrigger"
+ *
+ * Note that when you call the `sequence()` function within a `group()`
+ * or a `transition()` call, execution does not continue to the next instruction
+ * until each of the inner animation steps have completed.
+ *
+ * ### Syntax examples
+ *
+ * The following examples define transitions between the two defined states (and default states),
+ * using various options:
+ *
+ * ```typescript
+ * // Transition occurs when the state value
+ * // bound to "myAnimationTrigger" changes from "on" to "off"
+ * transition("on => off", animate(500))
+ * // Run the same animation for both directions
+ * transition("on <=> off", animate(500))
+ * // Define multiple state-change pairs separated by commas
+ * transition("on => off, off => void", animate(500))
+ * ```
+ *
+ * ### Special values for state-change expressions
+ *
+ * - Catch-all state change for when an element is inserted into the page and the
+ * destination state is unknown:
+ *
+ * ```typescript
  * transition("void => *", [
- *   style({ opacity: 0 }),
- *   animate(500)
- * ])
+ *  style({ opacity: 0 }),
+ *  animate(500)
+ *  ])
  * ```
  *
- * ### Using :enter and :leave
+ * - Capture a state change between any states:
  *
- * Given that enter (insertion) and leave (removal) animations are so common, the `transition`
- * function accepts both `:enter` and `:leave` values which are aliases for the `void => *` and `*
- * => void` state changes.
+ *  `transition("* => *", animate("1s 0s"))`
  *
- * ```
+ * - Entry and exit transitions:
+ *
+ * ```typescript
  * transition(":enter", [
  *   style({ opacity: 0 }),
  *   animate(500, style({ opacity: 1 }))
- * ]),
+ *   ]),
  * transition(":leave", [
  *   animate(500, style({ opacity: 0 }))
- * ])
+ *   ])
  * ```
  *
- * ### Boolean values
- * if a trigger binding value is a boolean value then it can be matched using a transition
- * expression that compares `true` and `false` or `1` and `0`.
+ * - Use `:increment` and `:decrement` to initiate transitions:
+ *
+ * ```typescript
+ * transition(":increment", group([
+ *  query(':enter', [
+ *     style({ left: '100%' }),
+ *     animate('0.5s ease-out', style('*'))
+ *   ]),
+ *  query(':leave', [
+ *     animate('0.5s ease-out', style({ left: '-100%' }))
+ *  ])
+ * ]))
+ *
+ * transition(":decrement", group([
+ *  query(':enter', [
+ *     style({ left: '100%' }),
+ *     animate('0.5s ease-out', style('*'))
+ *   ]),
+ *  query(':leave', [
+ *     animate('0.5s ease-out', style({ left: '-100%' }))
+ *  ])
+ * ]))
+ * ```
+ *
+ * ### State-change functions
+ *
+ * Here is an example of a `fromState` specified as a state-change function that invokes an
+ * animation when true:
+ *
+ * ```typescript
+ * transition((fromState, toState) =>
+ *  {
+ *   return fromState == "off" && toState == "on";
+ *  },
+ *  animate("1s 0s"))
+ * ```
+ *
+ * ### Animating to the final state
+ *
+ * If the final step in a transition is a call to `animate()` that uses a timing value
+ * with no style data, that step is automatically considered the final animation arc,
+ * for the element to reach the final state. Angular automatically adds or removes
+ * CSS styles to ensure that the element is in the correct final state.
+ *
+ * The following example defines a transition that starts by hiding the element,
+ * then makes sure that it animates properly to whatever state is currently active for trigger:
+ *
+ * ```typescript
+ * transition("void => *", [
+ *   style({ opacity: 0 }),
+ *   animate(500)
+ *  ])
+ * ```
+ * ### Boolean value matching
+ * If a trigger binding value is a Boolean, it can be matched using a transition expression
+ * that compares true and false or 1 and 0. For example:
  *
  * ```
  * // in the template
  * <div [@openClose]="open ? true : false">...</div>
- *
  * // in the component metadata
  * trigger('openClose', [
  *   state('true', style({ height: '*' })),
@@ -796,87 +977,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  *   transition('false <=> true', animate(500))
  * ])
  * ```
- *
- * ### Using :increment and :decrement
- * In addition to the :enter and :leave transition aliases, the :increment and :decrement aliases
- * can be used to kick off a transition when a numeric value has increased or decreased in value.
- *
- * ```
- * import {group, animate, query, transition, style, trigger} from '@angular/animations';
- * import {Component} from '@angular/core';
- *
- * @Component({
- *   selector: 'banner-carousel-component',
- *   styles: [`
- *     .banner-container {
- *        position:relative;
- *        height:500px;
- *        overflow:hidden;
- *      }
- *     .banner-container > .banner {
- *        position:absolute;
- *        left:0;
- *        top:0;
- *        font-size:200px;
- *        line-height:500px;
- *        font-weight:bold;
- *        text-align:center;
- *        width:100%;
- *      }
- *   `],
- *   template: `
- *     <button (click)="previous()">Previous</button>
- *     <button (click)="next()">Next</button>
- *     <hr>
- *     <div [@bannerAnimation]="selectedIndex" class="banner-container">
- *       <div class="banner" *ngFor="let banner of banners"> {{ banner }} </div>
- *     </div>
- *   `,
- *   animations: [
- *     trigger('bannerAnimation', [
- *       transition(":increment", group([
- *         query(':enter', [
- *           style({ left: '100%' }),
- *           animate('0.5s ease-out', style('*'))
- *         ]),
- *         query(':leave', [
- *           animate('0.5s ease-out', style({ left: '-100%' }))
- *         ])
- *       ])),
- *       transition(":decrement", group([
- *         query(':enter', [
- *           style({ left: '-100%' }),
- *           animate('0.5s ease-out', style('*'))
- *         ]),
- *         query(':leave', [
- *           animate('0.5s ease-out', style({ left: '100%' }))
- *         ])
- *       ]))
- *     ])
- *   ]
- * })
- * class BannerCarouselComponent {
- *   allBanners: string[] = ['1', '2', '3', '4'];
- *   selectedIndex: number = 0;
- *
- *   get banners() {
- *      return [this.allBanners[this.selectedIndex]];
- *   }
- *
- *   previous() {
- *     this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
- *   }
- *
- *   next() {
- *     this.selectedIndex = Math.min(this.selectedIndex + 1, this.allBanners.length - 1);
- *   }
- * }
- * ```
- *
- * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
- *
- * @experimental Animation support is experimental.
- */
+ **/
 export function transition(
     stateChangeExpr: string | ((fromState: string, toState: string, element?: any,
                                 params?: {[key: string]: any}) => boolean),
@@ -886,27 +987,35 @@ export function transition(
 }
 
 /**
- * `animation` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language.
+ * Produces a reusable animation that can be invoked in another animation or sequence,
+ * by calling the `useAnimation()` function.
  *
- * `var myAnimation = animation(...)` is designed to produce a reusable animation that can be later
- * invoked in another animation or sequence. Reusable animations are designed to make use of
- * animation parameters and the produced animation can be used via the `useAnimation` method.
+ * @param steps One or more animation objects, as returned by the `animate()`
+ * or `sequence()` function, that form a transformation from one state to another.
+ * A sequence is used by default when you pass an array.
+ * @param options An options object that can contain a delay value for the start of the
+ * animation, and additional developer-defined parameters.
+ * Provided values for additional parameters are used as defaults,
+ * and override values can be passed to the caller on invocation.
+ * @returns An object that encapsulates the animation data.
  *
- * ```
+ * @usageNotes
+ * The following example defines a reusable animation, providing some default parameter
+ * values.
+ *
+ * ```typescript
  * var fadeAnimation = animation([
  *   style({ opacity: '{{ start }}' }),
  *   animate('{{ time }}',
- *     style({ opacity: '{{ end }}'}))
- * ], { params: { time: '1000ms', start: 0, end: 1 }});
+ *   style({ opacity: '{{ end }}'}))
+ *   ],
+ *   { params: { time: '1000ms', start: 0, end: 1 }});
  * ```
  *
- * If parameters are attached to an animation then they act as **default parameter values**. When an
- * animation is invoked via `useAnimation` then parameter values are allowed to be passed in
- * directly. If any of the passed in parameter values are missing then the default values will be
- * used.
+ * The following invokes the defined animation with a call to `useAnimation()`,
+ * passing in override parameter values.
  *
- * ```
+ * ```js
  * useAnimation(fadeAnimation, {
  *   params: {
  *     time: '2s',
@@ -916,9 +1025,9 @@ export function transition(
  * })
  * ```
  *
- * If one or more parameter values are missing before animated then an error will be thrown.
- *
- * @experimental Animation support is experimental.
+ * If any of the passed-in parameter values are missing from this call,
+ * the default values are used. If one or more parameter values are missing before a step is
+ * animated, `useAnimation()` throws an error.
  */
 export function animation(
     steps: AnimationMetadata | AnimationMetadata[],
@@ -927,101 +1036,21 @@ export function animation(
 }
 
 /**
- * `animateChild` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. It works by allowing a queried element to execute its own
- * animation within the animation sequence.
+ * Executes a queried inner animation element within an animation sequence.
  *
- * Each time an animation is triggered in angular, the parent animation
- * will always get priority and any child animations will be blocked. In order
+ * @param options An options object that can contain a delay value for the start of the
+ * animation, and additional override values for developer-defined parameters.
+ * @return An object that encapsulates the child animation data.
+ *
+ * @usageNotes
+ * Each time an animation is triggered in Angular, the parent animation
+ * has priority and any child animations are blocked. In order
  * for a child animation to run, the parent animation must query each of the elements
- * containing child animations and then allow the animations to run using `animateChild`.
+ * containing child animations, and run them using this function.
  *
- * The example HTML code below shows both parent and child elements that have animation
- * triggers that will execute at the same time.
- *
- * ```html
- * <!-- parent-child.component.html -->
- * <button (click)="exp =! exp">Toggle</button>
- * <hr>
- *
- * <div [@parentAnimation]="exp">
- *   <header>Hello</header>
- *   <div [@childAnimation]="exp">
- *       one
- *   </div>
- *   <div [@childAnimation]="exp">
- *       two
- *   </div>
- *   <div [@childAnimation]="exp">
- *       three
- *   </div>
- * </div>
- * ```
- *
- * Now when the `exp` value changes to true, only the `parentAnimation` animation will animate
- * because it has priority. However, using `query` and `animateChild` each of the inner animations
- * can also fire:
- *
- * ```ts
- * // parent-child.component.ts
- * import {trigger, transition, animate, style, query, animateChild} from '@angular/animations';
- * @Component({
- *   selector: 'parent-child-component',
- *   animations: [
- *     trigger('parentAnimation', [
- *       transition('false => true', [
- *         query('header', [
- *           style({ opacity: 0 }),
- *           animate(500, style({ opacity: 1 }))
- *         ]),
- *         query('@childAnimation', [
- *           animateChild()
- *         ])
- *       ])
- *     ]),
- *     trigger('childAnimation', [
- *       transition('false => true', [
- *         style({ opacity: 0 }),
- *         animate(500, style({ opacity: 1 }))
- *       ])
- *     ])
- *   ]
- * })
- * class ParentChildCmp {
- *   exp: boolean = false;
- * }
- * ```
- *
- * In the animation code above, when the `parentAnimation` transition kicks off it first queries to
- * find the header element and fades it in. It then finds each of the sub elements that contain the
- * `@childAnimation` trigger and then allows for their animations to fire.
- *
- * This example can be further extended by using stagger:
- *
- * ```ts
- * query('@childAnimation', stagger(100, [
- *   animateChild()
- * ]))
- * ```
- *
- * Now each of the sub animations start off with respect to the `100ms` staggering step.
- *
- * ## The first frame of child animations
- * When sub animations are executed using `animateChild` the animation engine will always apply the
- * first frame of every sub animation immediately at the start of the animation sequence. This way
- * the parent animation does not need to set any initial styling data on the sub elements before the
- * sub animations kick off.
- *
- * In the example above the first frame of the `childAnimation`'s `false => true` transition
- * consists of a style of `opacity: 0`. This is applied immediately when the `parentAnimation`
- * animation transition sequence starts. Only then when the `@childAnimation` is queried and called
- * with `animateChild` will it then animate to its destination of `opacity: 1`.
- *
- * Note that this feature designed to be used alongside {@link query query()} and it will only work
- * with animations that are assigned using the Angular animation DSL (this means that CSS keyframes
- * and transitions are not handled by this API).
- *
- * @experimental Animation support is experimental.
+ * Note that this feature designed to be used with `query()` and it will only work
+ * with animations that are assigned using the Angular animation library. CSS keyframes
+ * and transitions are not handled by this API.
  */
 export function animateChild(options: AnimateChildOptions | null = null):
     AnimationAnimateChildMetadata {
@@ -1029,11 +1058,12 @@ export function animateChild(options: AnimateChildOptions | null = null):
 }
 
 /**
- * `useAnimation` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. It is used to kick off a reusable animation that is created using {@link
- * animation animation()}.
+ * Starts a reusable animation that is created using the `animation()` function.
  *
- * @experimental Animation support is experimental.
+ * @param animation The reusable animation to start.
+ * @param options An options object that can contain a delay value for the start of 
+ * the animation, and additional override values for developer-defined parameters.
+ * @return An object that contains the animation parameters.
  */
 export function useAnimation(
     animation: AnimationReferenceMetadata,
@@ -1042,19 +1072,33 @@ export function useAnimation(
 }
 
 /**
- * `query` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language.
+ * Finds one or more inner elements within the current element that is
+ * being animated within a sequence. Use with `animateChild()`.
  *
- * query() is used to find one or more inner elements within the current element that is
- * being animated within the sequence. The provided animation steps are applied
- * to the queried element (by default, an array is provided, then this will be
- * treated as an animation sequence).
+ * @param selector The element to query, or a set of elements that contain Angular-specific
+ * characteristics, specified with one or more of the following tokens.
+ *  - `query(":enter")` or `query(":leave")` : Query for newly inserted/removed elements.
+ *  - `query(":animating")` : Query all currently animating elements.
+ *  - `query("@triggerName")` : Query elements that contain an animation trigger.
+ *  - `query("@*")` : Query all elements that contain an animation triggers.
+ *  - `query(":self")` : Include the current element into the animation sequence.
  *
- * ### Usage
+ * @param animation One or more animation steps to apply to the queried element or elements.
+ * An array is treated as an animation sequence.
+ * @param options An options object. Use the 'limit' field to limit the total number of
+ * items to collect.
+ * @return An object that encapsulates the query data.
  *
- * query() is designed to collect multiple elements and works internally by using
- * `element.querySelectorAll`. An additional options object can be provided which
- * can be used to limit the total amount of items to be collected.
+ * @usageNotes
+ * Tokens can be merged into a combined query selector string. For example:
+ *
+ * ```typescript
+ *  query(':self, .record:enter, .record:leave, @subTrigger', [...])
+ * ```
+ *
+ * The `query()` function collects multiple elements and works internally by using
+ * `element.querySelectorAll`. Use the `limit` field of an options object to limit
+ * the total number of items to be collected. For example:
  *
  * ```js
  * query('div', [
@@ -1063,8 +1107,8 @@ export function useAnimation(
  * ], { limit: 1 })
  * ```
  *
- * query(), by default, will throw an error when zero items are found. If a query
- * has the `optional` flag set to true then this error will be ignored.
+ * By default, throws an error when zero items are found. Set the
+ * `optional` flag to ignore this error. For example:
  *
  * ```js
  * query('.some-element-that-may-not-be-there', [
@@ -1073,31 +1117,12 @@ export function useAnimation(
  * ], { optional: true })
  * ```
  *
- * ### Special Selector Values
+ * ### Usage Example
  *
- * The selector value within a query can collect elements that contain angular-specific
- * characteristics
- * using special pseudo-selectors tokens.
+ * The following example queries for inner elements and animates them
+ * individually using `animateChild()`. 
  *
- * These include:
- *
- *  - Querying for newly inserted/removed elements using `query(":enter")`/`query(":leave")`
- *  - Querying all currently animating elements using `query(":animating")`
- *  - Querying elements that contain an animation trigger using `query("@triggerName")`
- *  - Querying all elements that contain an animation triggers using `query("@*")`
- *  - Including the current element into the animation sequence using `query(":self")`
- *
- *
- *  Each of these pseudo-selector tokens can be merged together into a combined query selector
- * string:
- *
- *  ```
- *  query(':self, .record:enter, .record:leave, @subTrigger', [...])
- *  ```
- *
- * ### Demo
- *
- * ```
+ * ```typescript
  * @Component({
  *   selector: 'inner',
  *   template: `
@@ -1130,8 +1155,6 @@ export function useAnimation(
  *   }
  * }
  * ```
- *
- * @experimental Animation support is experimental.
  */
 export function query(
     selector: string, animation: AnimationMetadata | AnimationMetadata[],
@@ -1140,16 +1163,23 @@ export function query(
 }
 
 /**
- * `stagger` is an animation-specific function that is designed to be used inside of Angular's
- * animation DSL language. It is designed to be used inside of an animation {@link query query()}
- * and works by issuing a timing gap between after each queried item is animated.
+ * Use within an animation `query()` call to issue a timing gap after
+ * each queried item is animated.
  *
- * ### Usage
+ * @param timings A delay value.
+ * @param animation One ore more animation steps.
+ * @returns An object that encapsulates the stagger data.
  *
- * In the example below there is a container element that wraps a list of items stamped out
- * by an ngFor. The container element contains an animation trigger that will later be set
+ * @usageNotes
+ * In the following example, a container element wraps a list of items stamped out
+ * by an `ngFor`. The container element contains an animation trigger that will later be set
  * to query for each of the inner items.
  *
+ * Each time items are added, the opacity fade-in animation runs,
+ * and each removed item is faded out.
+ * When either of these animations occur, the stagger effect is
+ * applied after each item's animation is started.
+ *
  * ```html
  * <!-- list.component.html -->
  * <button (click)="toggle()">Show / Hide Items</button>
@@ -1161,15 +1191,15 @@ export function query(
  * </div>
  * ```
  *
- * The component code for this looks as such:
+ * Here is the component code:
  *
- * ```ts
+ * ```typescript
  * import {trigger, transition, style, animate, query, stagger} from '@angular/animations';
  * @Component({
  *   templateUrl: 'list.component.html',
  *   animations: [
  *     trigger('listAnimation', [
- *        //...
+ *     ...
  *     ])
  *   ]
  * })
@@ -1186,13 +1216,13 @@ export function query(
  *
  *   toggle() {
  *     this.items.length ? this.hideItems() : this.showItems();
- *   }
- * }
+ *    }
+ *  }
  * ```
  *
- * And now for the animation trigger code:
+ * Here is the animation trigger code:
  *
- * ```ts
+ * ```typescript
  * trigger('listAnimation', [
  *   transition('* => *', [ // each time the binding value changes
  *     query(':leave', [
@@ -1209,13 +1239,6 @@ export function query(
  *   ])
  * ])
  * ```
- *
- * Now each time the items are added/removed then either the opacity
- * fade-in animation will run or each removed item will be faded out.
- * When either of these animations occur then a stagger effect will be
- * applied after each item's animation is started.
- *
- * @experimental Animation support is experimental.
  */
 export function stagger(
     timings: string | number,
diff --git a/tools/public_api_guard/animations/animations.d.ts b/tools/public_api_guard/animations/animations.d.ts
index 07f51a54f8..2f85467bdc 100644
--- a/tools/public_api_guard/animations/animations.d.ts
+++ b/tools/public_api_guard/animations/animations.d.ts
@@ -1,36 +1,28 @@
-/** @experimental */
 export declare function animate(timings: string | number, styles?: AnimationStyleMetadata | AnimationKeyframesSequenceMetadata | null): AnimationAnimateMetadata;
 
-/** @experimental */
 export declare function animateChild(options?: AnimateChildOptions | null): AnimationAnimateChildMetadata;
 
-/** @experimental */
 export interface AnimateChildOptions extends AnimationOptions {
     duration?: number | string;
 }
 
-/** @experimental */
 export declare type AnimateTimings = {
     duration: number;
     delay: number;
     easing: string | null;
 };
 
-/** @experimental */
 export declare function animation(steps: AnimationMetadata | AnimationMetadata[], options?: AnimationOptions | null): AnimationReferenceMetadata;
 
-/** @experimental */
 export interface AnimationAnimateChildMetadata extends AnimationMetadata {
     options: AnimationOptions | null;
 }
 
-/** @experimental */
 export interface AnimationAnimateMetadata extends AnimationMetadata {
     styles: AnimationStyleMetadata | AnimationKeyframesSequenceMetadata | null;
     timings: string | number | AnimateTimings;
 }
 
-/** @experimental */
 export interface AnimationAnimateRefMetadata extends AnimationMetadata {
     animation: AnimationReferenceMetadata;
     options: AnimationOptions | null;
@@ -57,23 +49,19 @@ export declare abstract class AnimationFactory {
     abstract create(element: any, options?: AnimationOptions): AnimationPlayer;
 }
 
-/** @experimental */
 export interface AnimationGroupMetadata extends AnimationMetadata {
     options: AnimationOptions | null;
     steps: AnimationMetadata[];
 }
 
-/** @experimental */
 export interface AnimationKeyframesSequenceMetadata extends AnimationMetadata {
     steps: AnimationStyleMetadata[];
 }
 
-/** @experimental */
 export interface AnimationMetadata {
     type: AnimationMetadataType;
 }
 
-/** @experimental */
 export declare const enum AnimationMetadataType {
     State = 0,
     Transition = 1,
@@ -90,7 +78,6 @@ export declare const enum AnimationMetadataType {
     Stagger = 12,
 }
 
-/** @experimental */
 export interface AnimationOptions {
     delay?: number | string;
     params?: {
@@ -118,38 +105,32 @@ export interface AnimationPlayer {
     setPosition(p: any): void;
 }
 
-/** @experimental */
 export interface AnimationQueryMetadata extends AnimationMetadata {
     animation: AnimationMetadata | AnimationMetadata[];
     options: AnimationQueryOptions | null;
     selector: string;
 }
 
-/** @experimental */
 export interface AnimationQueryOptions extends AnimationOptions {
     limit?: number;
     optional?: boolean;
 }
 
-/** @experimental */
 export interface AnimationReferenceMetadata extends AnimationMetadata {
     animation: AnimationMetadata | AnimationMetadata[];
     options: AnimationOptions | null;
 }
 
-/** @experimental */
 export interface AnimationSequenceMetadata extends AnimationMetadata {
     options: AnimationOptions | null;
     steps: AnimationMetadata[];
 }
 
-/** @experimental */
 export interface AnimationStaggerMetadata extends AnimationMetadata {
     animation: AnimationMetadata | AnimationMetadata[];
     timings: string | number;
 }
 
-/** @experimental */
 export interface AnimationStateMetadata extends AnimationMetadata {
     name: string;
     options?: {
@@ -160,7 +141,6 @@ export interface AnimationStateMetadata extends AnimationMetadata {
     styles: AnimationStyleMetadata;
 }
 
-/** @experimental */
 export interface AnimationStyleMetadata extends AnimationMetadata {
     offset: number | null;
     styles: '*' | {
@@ -170,7 +150,6 @@ export interface AnimationStyleMetadata extends AnimationMetadata {
     } | '*'>;
 }
 
-/** @experimental */
 export interface AnimationTransitionMetadata extends AnimationMetadata {
     animation: AnimationMetadata | AnimationMetadata[];
     expr: string | ((fromState: string, toState: string, element?: any, params?: {
@@ -179,7 +158,6 @@ export interface AnimationTransitionMetadata extends AnimationMetadata {
     options: AnimationOptions | null;
 }
 
-/** @experimental */
 export interface AnimationTriggerMetadata extends AnimationMetadata {
     definitions: AnimationMetadata[];
     name: string;
@@ -190,13 +168,10 @@ export interface AnimationTriggerMetadata extends AnimationMetadata {
     } | null;
 }
 
-/** @experimental */
 export declare const AUTO_STYLE = "*";
 
-/** @experimental */
 export declare function group(steps: AnimationMetadata[], options?: AnimationOptions | null): AnimationGroupMetadata;
 
-/** @experimental */
 export declare function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSequenceMetadata;
 
 /** @experimental */
@@ -219,30 +194,24 @@ export declare class NoopAnimationPlayer implements AnimationPlayer {
     setPosition(p: number): void;
 }
 
-/** @experimental */
 export declare function query(selector: string, animation: AnimationMetadata | AnimationMetadata[], options?: AnimationQueryOptions | null): AnimationQueryMetadata;
 
-/** @experimental */
 export declare function sequence(steps: AnimationMetadata[], options?: AnimationOptions | null): AnimationSequenceMetadata;
 
-/** @experimental */
 export declare function stagger(timings: string | number, animation: AnimationMetadata | AnimationMetadata[]): AnimationStaggerMetadata;
 
-/** @experimental */
 export declare function state(name: string, styles: AnimationStyleMetadata, options?: {
     params: {
         [name: string]: any;
     };
 }): AnimationStateMetadata;
 
-/** @experimental */
 export declare function style(tokens: '*' | {
     [key: string]: string | number;
 } | Array<'*' | {
     [key: string]: string | number;
 }>): AnimationStyleMetadata;
 
-/** @experimental */
 export declare function transition(stateChangeExpr: string | ((fromState: string, toState: string, element?: any, params?: {
     [key: string]: any;
 }) => boolean), steps: AnimationMetadata | AnimationMetadata[], options?: AnimationOptions | null): AnimationTransitionMetadata;
@@ -250,5 +219,4 @@ export declare function transition(stateChangeExpr: string | ((fromState: string
 /** @experimental */
 export declare function trigger(name: string, definitions: AnimationMetadata[]): AnimationTriggerMetadata;
 
-/** @experimental */
 export declare function useAnimation(animation: AnimationReferenceMetadata, options?: AnimationOptions | null): AnimationAnimateRefMetadata;

From 503a524d276d14a8214baa8afb66f6390694ca48 Mon Sep 17 00:00:00 2001
From: Vani <psreep@gmail.com>
Date: Mon, 23 Apr 2018 11:09:51 -0700
Subject: [PATCH 267/582] docs: change capitalization for css hex color values
 (#23511)

PR Close #23511
---
 aio/content/examples/toh-pt5/src/app/app.component.css        | 4 ++--
 .../toh-pt5/src/app/dashboard/dashboard.component.css         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/examples/toh-pt5/src/app/app.component.css b/aio/content/examples/toh-pt5/src/app/app.component.css
index bf741e4575..7cf19e6ede 100644
--- a/aio/content/examples/toh-pt5/src/app/app.component.css
+++ b/aio/content/examples/toh-pt5/src/app/app.component.css
@@ -18,11 +18,11 @@ nav a {
   border-radius: 4px;
 }
 nav a:visited, a:link {
-  color: #607D8B;
+  color: #607d8b;
 }
 nav a:hover {
   color: #039be5;
-  background-color: #CFD8DC;
+  background-color: #cfd8dc;
 }
 nav a.active {
   color: #039be5;
diff --git a/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css b/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
index 3822cc56bb..8dc6701a78 100644
--- a/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
+++ b/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
@@ -33,11 +33,11 @@ h4 {
   color: #eee;
   max-height: 120px;
   min-width: 120px;
-  background-color: #607D8B;
+  background-color: #607d8b;
   border-radius: 2px;
 }
 .module:hover {
-  background-color: #EEE;
+  background-color: #eee;
   cursor: pointer;
   color: #607d8b;
 }

From 2ea197b99f6389d74a473202f127481bd187566f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 13 Jun 2018 15:00:28 -0700
Subject: [PATCH 268/582] release: cut the v6.0.5 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 617138e77f..8e4e917fc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="6.0.5"></a>
+## [6.0.5](https://github.com/angular/angular/compare/6.0.4...6.0.5) (2018-06-13)
+
+* **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([0139173](https://github.com/angular/angular/commit/0139173))
+* **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([ea3669e](https://github.com/angular/angular/commit/ea3669e))
+* **docs-infra:** use script nomodule to load IE polyfills, skip other polyfills ([#24317](https://github.com/angular/angular/issues/24317)) ([e876535](https://github.com/angular/angular/commit/e876535)), closes [#23647](https://github.com/angular/angular/issues/23647)
+* **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([d20877b](https://github.com/angular/angular/commit/d20877b)), closes [#10981](https://github.com/angular/angular/issues/10981)
+* **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([ea2987c](https://github.com/angular/angular/commit/ea2987c)), closes [#24095](https://github.com/angular/angular/issues/24095)
+
+
+
 <a name="6.1.0-beta.0"></a>
 ## [6.1.0-beta.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0-beta.0) (2018-06-06)
 

From 3ccb4490a43ede51088615fd6bcffdcb98fdc45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 13 Jun 2018 16:08:29 -0700
Subject: [PATCH 269/582] release: cut the v6.1.0-beta.1 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e4e917fc1..ab09260578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+<a name="6.1.0-beta.1"></a>
+# [6.1.0-beta.1](https://github.com/angular/angular/compare/6.1.0-beta.0...6.1.0-beta.1) (2018-06-13)
+
+
+### Bug Fixes
+
+* **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([dc4a3d0](https://github.com/angular/angular/commit/dc4a3d0))
+* **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([282d351](https://github.com/angular/angular/commit/282d351))
+* **docs-infra:** use script nomodule to load IE polyfills, skip other polyfills ([#24317](https://github.com/angular/angular/issues/24317)) ([8be6892](https://github.com/angular/angular/commit/8be6892)), closes [#23647](https://github.com/angular/angular/issues/23647)
+* **ivy:** compute transitive scopes from NgModuleDef only ([#24334](https://github.com/angular/angular/issues/24334)) ([1135563](https://github.com/angular/angular/commit/1135563))
+* **ivy:** correctly handle queries with embedded views ([#24418](https://github.com/angular/angular/issues/24418)) ([014949f](https://github.com/angular/angular/commit/014949f))
+* **ivy:** remove debugger statement ([#24480](https://github.com/angular/angular/issues/24480)) ([70ef061](https://github.com/angular/angular/commit/70ef061))
+* **ivy:** special case [style] and [class] bindings for future use ([#23232](https://github.com/angular/angular/issues/23232)) ([1b253e1](https://github.com/angular/angular/commit/1b253e1))
+* **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([5731d07](https://github.com/angular/angular/commit/5731d07)), closes [#10981](https://github.com/angular/angular/issues/10981)
+* **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([3ed2d75](https://github.com/angular/angular/commit/3ed2d75)), closes [#24095](https://github.com/angular/angular/issues/24095)
+
+
+### Features
+
+* **common:** introduce KeyValuePipe ([#24319](https://github.com/angular/angular/issues/24319)) ([2b49bf7](https://github.com/angular/angular/commit/2b49bf7))
+* **core:** export defaultKeyValueDiffers to private api ([#24319](https://github.com/angular/angular/issues/24319)) ([92b278c](https://github.com/angular/angular/commit/92b278c))
+* **core:** expose a Compiler API for accessing module ids from NgModule types ([#24258](https://github.com/angular/angular/issues/24258)) ([bd02b27](https://github.com/angular/angular/commit/bd02b27))
+* **core:** KeyValueDiffer#diff allows null values ([#24319](https://github.com/angular/angular/issues/24319)) ([52ce9d5](https://github.com/angular/angular/commit/52ce9d5))
+* **ivy:** a generic visitor which allows prefixing nodes for ngtsc ([#24230](https://github.com/angular/angular/issues/24230)) ([ca79e11](https://github.com/angular/angular/commit/ca79e11))
+* **ivy:** add support of ApplicationRef.bootstrapModuleFactory ([#23811](https://github.com/angular/angular/issues/23811)) ([e3759f7](https://github.com/angular/angular/commit/e3759f7))
+* **ivy:** namespaced attributes added to output instructions ([#24386](https://github.com/angular/angular/issues/24386)) ([82c5313](https://github.com/angular/angular/commit/82c5313))
+* **ivy:** now supports SVG and MathML elements ([#24377](https://github.com/angular/angular/issues/24377)) ([8c1ac28](https://github.com/angular/angular/commit/8c1ac28))
+* **router:** implement scrolling restoration service ([#20030](https://github.com/angular/angular/issues/20030)) ([49c5234](https://github.com/angular/angular/commit/49c5234)), closes [#13636](https://github.com/angular/angular/issues/13636) [#10929](https://github.com/angular/angular/issues/10929) [#7791](https://github.com/angular/angular/issues/7791) [#6595](https://github.com/angular/angular/issues/6595)
+
+
+
 <a name="6.0.5"></a>
 ## [6.0.5](https://github.com/angular/angular/compare/6.0.4...6.0.5) (2018-06-13)
 
diff --git a/package.json b/package.json
index a547b4ef29..68d50f1a8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.1.0-beta.0",
+  "version": "6.1.0-beta.1",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 03f93b3772340e3728254342e23c67ca3e130693 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 13 Jun 2018 15:30:54 -0700
Subject: [PATCH 270/582] Revert "build: update to Bazel 0.14.0 (#24296)"
 (#24492)

This reverts commit 0d07d273dc7aa92ec078434b11edb0d8a70264bc.

Fixes #24484

PR Close #24492
---
 .circleci/config.yml                         |  4 +-
 WORKSPACE                                    |  2 +-
 integration/bazel/WORKSPACE                  |  2 +-
 packages/bazel/src/ng_package/ng_package.bzl | 41 ++++++++++----------
 packages/bazel/src/ng_rollup_bundle.bzl      |  8 ++--
 tools/ngcontainer/Dockerfile                 |  2 +-
 tools/ngcontainer/README.md                  |  2 +-
 7 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7eb84168a4..4ce1cfd6a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.3.1
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.1
+var_1: &docker_image angular/ngcontainer:0.3.0
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.0
 
 # Define common ENV vars
 var_3: &define_env_vars
diff --git a/WORKSPACE b/WORKSPACE
index 290243dc3e..7fc3008e67 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -77,7 +77,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.14.0")
+check_bazel_version("0.13.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index ac95a4132e..4dd7f9fa78 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -44,7 +44,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
 
-check_bazel_version("0.14.0")
+check_bazel_version("0.13.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 875b3728e7..0e74959433 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -80,14 +80,14 @@ def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, for
   map_output = ctx.actions.declare_file(js_output.basename + ".map", sibling = js_output)
 
   args = ctx.actions.args()
-  args.add("--config", rollup_config)
+  args.add(["--config", rollup_config.path])
 
-  args.add("--input", entry_point)
-  args.add("--output.file", js_output)
-  args.add("--output.format", format)
+  args.add(["--input", entry_point])
+  args.add(["--output.file", js_output.path])
+  args.add(["--output.format", format])
   if package_name:
-    args.add("--output.name", _global_name(package_name))
-    args.add("--amd.id", package_name)
+    args.add(["--output.name", _global_name(package_name)])
+    args.add(["--amd.id", package_name])
 
   # Note: if the input has external source maps then we need to also install and use
   #   `rollup-plugin-sourcemaps`, which will require us to use rollup.config.js file instead
@@ -95,15 +95,14 @@ def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, for
   args.add("--sourcemap")
 
   globals = dict(WELL_KNOWN_GLOBALS, **ctx.attr.globals)
+  args.add("--external")
   external = globals.keys()
   if not include_tslib:
     external.append("tslib")
-  args.add_joined("--external", external, join_with=",")
+  args.add(external, join_with=",")
 
-  args.add_joined(
-      "--globals",
-      ["%s:%s" % g for g in globals.items()],
-      join_with=",")
+  args.add("--globals")
+  args.add(["%s:%s" % g for g in globals.items()], join_with=",")
 
   args.add("--silent")
 
@@ -252,8 +251,8 @@ def _ng_package_impl(ctx):
   # The order of arguments matters here, as they are read in order in packager.ts.
   packager_args.add(npm_package_directory.path)
   packager_args.add(ctx.label.package)
-  packager_args.add_joined([ctx.bin_dir.path, ctx.label.package], join_with="/")
-  packager_args.add_joined([ctx.genfiles_dir.path, ctx.label.package], join_with="/")
+  packager_args.add([ctx.bin_dir.path, ctx.label.package], join_with="/")
+  packager_args.add([ctx.genfiles_dir.path, ctx.label.package], join_with="/")
 
   # Marshal the metadata into a JSON string so we can parse the data structure
   # in the TypeScript program easily.
@@ -274,19 +273,19 @@ def _ng_package_impl(ctx):
     # placeholder
     packager_args.add("")
 
-  packager_args.add_joined(_flatten_paths(fesm2015), join_with=",")
-  packager_args.add_joined(_flatten_paths(fesm5), join_with=",")
-  packager_args.add_joined(_flatten_paths(esm2015), join_with=",")
-  packager_args.add_joined(_flatten_paths(esm5), join_with=",")
-  packager_args.add_joined(_flatten_paths(bundles), join_with=",")
-  packager_args.add_joined([s.path for s in ctx.files.srcs], join_with=",")
+  packager_args.add(_flatten_paths(fesm2015), join_with=",")
+  packager_args.add(_flatten_paths(fesm5), join_with=",")
+  packager_args.add(_flatten_paths(esm2015), join_with=",")
+  packager_args.add(_flatten_paths(esm5), join_with=",")
+  packager_args.add(_flatten_paths(bundles), join_with=",")
+  packager_args.add([s.path for s in ctx.files.srcs], join_with=",")
 
   # TODO: figure out a better way to gather runfiles providers from the transitive closure.
-  packager_args.add_joined([d.path for d in ctx.files.data], join_with=",")
+  packager_args.add([d.path for d in ctx.files.data], join_with=",")
 
   if ctx.file.license_banner:
     packager_inputs.append(ctx.file.license_banner)
-    packager_args.add(ctx.file.license_banner)
+    packager_args.add(ctx.file.license_banner.path)
   else:
     # placeholder
     packager_args.add("")
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index 66603099d2..e4584d6133 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -48,7 +48,7 @@ def _use_plain_rollup(ctx):
 
   strategy = ctx.var['compile']
   return strategy != 'legacy'
-
+  
 
 def run_brotli(ctx, input, output):
   ctx.actions.run(
@@ -61,10 +61,10 @@ def run_brotli(ctx, input, output):
 # Borrowed from bazelbuild/rules_nodejs
 def _run_tsc(ctx, input, output):
   args = ctx.actions.args()
-  args.add("--target", "es5")
+  args.add(["--target", "es5"])
   args.add("--allowJS")
-  args.add(input)
-  args.add("--outFile", output)
+  args.add(input.path)
+  args.add(["--outFile", output.path])
 
   ctx.action(
       executable = ctx.executable._tsc,
diff --git a/tools/ngcontainer/Dockerfile b/tools/ngcontainer/Dockerfile
index f5df95ce06..0c3f41421f 100644
--- a/tools/ngcontainer/Dockerfile
+++ b/tools/ngcontainer/Dockerfile
@@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
 ###
 # Bazel install
 # See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
-RUN BAZEL_VERSION="0.14.0" \
+RUN BAZEL_VERSION="0.13.0" \
  && wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
  && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
  && apt-get update \
diff --git a/tools/ngcontainer/README.md b/tools/ngcontainer/README.md
index 468f8aa87f..0a9e0e9d9e 100644
--- a/tools/ngcontainer/README.md
+++ b/tools/ngcontainer/README.md
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
 - npm 5.5.1
 - yarn 1.3.2
 - Java 8 (for Closure Compiler and Bazel)
-- Bazel build tool v0.14.0 - http://bazel.build
+- Bazel build tool v0.13.0 - http://bazel.build
 - Google Chrome 63.0.3239.84
 - Mozilla Firefox 47.0.1
 - xvfb (virtual framebuffer) for headless testing

From 5fb0b567ce8c6f29a49a305c9fa41b3ddcdf9a25 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 16 May 2018 16:20:51 +0100
Subject: [PATCH 271/582] build(aio): don't render `@Annotation` tags (#24000)

Because we were "ignoring" these tags they were being
rendered as part of the previous tag.
What we really want to do is know about them, so that we
don't break the doc-gen but then ignore them when rendering.

PR Close #24000
---
 .../transforms/angular-api-package/tag-defs/Annotation.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/tag-defs/Annotation.js b/aio/tools/transforms/angular-api-package/tag-defs/Annotation.js
index 4e9c8714cb..49f55d5eec 100644
--- a/aio/tools/transforms/angular-api-package/tag-defs/Annotation.js
+++ b/aio/tools/transforms/angular-api-package/tag-defs/Annotation.js
@@ -1,4 +1,5 @@
-// A ts2dart compiler annotation that can be ignored in API docs.
+// A ts2dart compiler annotation that we don't care about for API docs.
+// But, if we don't have a tag-def for it the doc-gen will error.
 module.exports = function() {
-  return {name: 'Annotation', ignore: true};
+  return {name: 'Annotation'};
 };

From 131d0d8e8a0bcb4dd495845c7e8a1b426c87c940 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 16 May 2018 17:41:32 +0100
Subject: [PATCH 272/582] build(aio): do not try to auto-link to internal API
 items (#24000)

This would cause dangling links since the target, being internal,
would not exist in the docs.

PR Close #24000
---
 .../angular-base-package/post-processors/auto-link-code.js | 4 +++-
 .../post-processors/auto-link-code.spec.js                 | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.js b/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.js
index fae9ba475e..92f5cf06ee 100644
--- a/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.js
+++ b/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.js
@@ -65,7 +65,9 @@ module.exports = function autoLinkCode(getDocFromAlias) {
     };
   }
   function foundValidDoc(docs) {
-    return docs.length === 1 && autoLinkCodeImpl.docTypes.indexOf(docs[0].docType) !== -1;
+    return docs.length === 1 &&
+           !docs[0].internal &&
+           autoLinkCodeImpl.docTypes.indexOf(docs[0].docType) !== -1;
   }
 
   function createLinkNode(doc, text) {
diff --git a/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.spec.js b/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.spec.js
index f300487aed..c5fabf43d3 100644
--- a/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.spec.js
+++ b/aio/tools/transforms/angular-base-package/post-processors/auto-link-code.spec.js
@@ -79,6 +79,13 @@ describe('autoLinkCode post-processor', () => {
                                         '</code>');
   });
 
+  it('should ignore code items that match an internal API doc', () => {
+    aliasMap.addDoc({ docType: 'class', id: 'MyClass', aliases: ['MyClass'], path: 'a/b/myclass', internal: true });
+    const doc = { docType: 'test-doc', renderedContent: '<code>MyClass</code>' };
+    processor.$process([doc]);
+    expect(doc.renderedContent).toEqual('<code>MyClass</code>');
+  });
+
   it('should insert anchors for individual text nodes within a code block', () => {
     aliasMap.addDoc({ docType: 'class', id: 'MyClass', aliases: ['MyClass'], path: 'a/b/myclass' });
     const doc = { docType: 'test-doc', renderedContent: '<code><span>MyClass</span><span>MyClass</span></code>' };

From 293ec78069662311a876da75481a7f7456477030 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 16 May 2018 17:48:33 +0100
Subject: [PATCH 273/582] build(aio): don't constrain `checkContentRules` to
 run before another processor (#24000)

We don't really care when this processor runs as long as it happens
after the tags have been extracted.
By not constraining its `runBefore` property we can ensure that other
processors can be run before it.

PR Close #24000
---
 .../angular-base-package/processors/checkContentRules.js        | 2 +-
 .../angular-base-package/processors/checkContentRules.spec.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/tools/transforms/angular-base-package/processors/checkContentRules.js b/aio/tools/transforms/angular-base-package/processors/checkContentRules.js
index 148311b969..f12480dbca 100644
--- a/aio/tools/transforms/angular-base-package/processors/checkContentRules.js
+++ b/aio/tools/transforms/angular-base-package/processors/checkContentRules.js
@@ -32,7 +32,7 @@ module.exports = function checkContentRules(log, createDocMessage) {
     docTypeRules: {},
     failOnContentErrors: false,
     $runAfter: ['tags-extracted'],
-    $runBefore: ['processing-docs'],
+    $runBefore: [],
     $process(docs) {
       const logMessage = this.failOnContentErrors ? log.error.bind(log) : log.warn.bind(log);
       const errors = [];
diff --git a/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js b/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js
index a5be9e5e59..8c0f500acd 100644
--- a/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js
+++ b/aio/tools/transforms/angular-base-package/processors/checkContentRules.spec.js
@@ -18,7 +18,7 @@ describe('checkContentRules processor', function() {
 
   it('shpuld run at the right time', () => {
     expect(processor.$runAfter).toEqual(['tags-extracted']);
-    expect(processor.$runBefore).toEqual(['processing-docs']);
+    expect(processor.$runBefore).toEqual([]);
   });
 
   it('should do nothing if not configured', () => {

From 4168c946c6ce9300896337e2bd3b771026907be9 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 16 May 2018 17:51:35 +0100
Subject: [PATCH 274/582] build(aio): add content rule to prevent usageNotes in
 non-export API docs (#24000)

This commit also factors out `API_CONTAINED_DOC_TYPES` to be used by
both `filterContainedDocs` and `addAllowedPropertiesRules`.

PR Close #24000
---
 .../transforms/angular-api-package/index.js   | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index 6eef84a819..0ac6a3dc68 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -42,12 +42,19 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'pipe', 'module']);
   })
 
+  /**
+   * These are the doc types that are contained within other docs
+   */
+  .factory(function API_CONTAINED_DOC_TYPES() {
+    return ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'];
+  })
+
   /**
    * These are the doc types that are API docs, including ones that will be merged into container docs,
    * such as members and overloads.
    */
-  .factory(function API_DOC_TYPES(API_DOC_TYPES_TO_RENDER) {
-    return API_DOC_TYPES_TO_RENDER.concat(['member', 'function-overload']);
+  .factory(function API_DOC_TYPES(API_DOC_TYPES_TO_RENDER, API_CONTAINED_DOC_TYPES) {
+    return API_DOC_TYPES_TO_RENDER.concat(API_CONTAINED_DOC_TYPES);
   })
 
   // Where do we get the source files?
@@ -155,6 +162,16 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     });
   })
 
+  .config(function(filterContainedDocs, API_CONTAINED_DOC_TYPES) {
+    filterContainedDocs.docTypes = API_CONTAINED_DOC_TYPES;
+  })
+
+  .config(function(checkContentRules, EXPORT_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
+    addMinLengthRules(checkContentRules);
+    addHeadingRules(checkContentRules, EXPORT_DOC_TYPES);
+    addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES);
+  })
+
   .config(function(computePathsProcessor, EXPORT_DOC_TYPES, generateApiListDoc) {
 
     const API_SEGMENT = 'api';
@@ -188,3 +205,41 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     autoLinkCode.docTypes = API_DOC_TYPES;
     autoLinkCode.codeElements = ['code', 'code-example', 'code-pane'];
   });
+
+
+function addMinLengthRules(checkContentRules) {
+  const createMinLengthRule = require('./content-rules/minLength');
+  const paramRuleSet = checkContentRules.docTypeRules['parameter'] = checkContentRules.docTypeRules['parameter'] || {};
+  const paramRules = paramRuleSet['name'] = paramRuleSet['name'] || [];
+  paramRules.push(createMinLengthRule());
+}
+
+function addHeadingRules(checkContentRules, EXPORT_DOC_TYPES) {
+  const createNoMarkdownHeadingsRule = require('./content-rules/noMarkdownHeadings');
+  const noMarkdownHeadings = createNoMarkdownHeadingsRule();
+  const allowOnlyLevel3Headings = createNoMarkdownHeadingsRule(1, 2, '4,');
+  const DOC_TYPES_TO_CHECK = EXPORT_DOC_TYPES.concat(['member', 'overload-info']);
+  const PROPS_TO_CHECK = ['description', 'shortDescription'];
+
+  DOC_TYPES_TO_CHECK.forEach(docType => {
+    const ruleSet = checkContentRules.docTypeRules[docType] = checkContentRules.docTypeRules[docType] || {};
+    PROPS_TO_CHECK.forEach(prop => {
+      const rules = ruleSet[prop] = ruleSet[prop] || [];
+      rules.push(noMarkdownHeadings);
+    });
+    const rules = ruleSet['usageNotes'] = ruleSet['usageNotes'] || [];
+    rules.push(allowOnlyLevel3Headings);
+  });
+}
+
+function addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES) {
+  const PROPS_TO_DISALLOW = ['usageNotes'];
+
+  API_CONTAINED_DOC_TYPES.forEach(docType => {
+    const ruleSet = checkContentRules.docTypeRules[docType] = checkContentRules.docTypeRules[docType] || {};
+    PROPS_TO_DISALLOW.forEach(prop => {
+      const rules = ruleSet[prop] = ruleSet[prop] || [];
+      rules.push((doc, prop, value) => value && `Invalid property: "${prop}" is not allowed on "${doc.docType}" docs.`);
+    });
+  });
+}

From 3c1eb9413fb97d33f84fb7070e32b1648b48d8f5 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 16 May 2018 18:37:09 +0100
Subject: [PATCH 275/582] build(aio): update to latest dgeni-packages@0.26.2
 (#24000)

This update allows us to autolink to methods and properties, which
means that we can change things like `{@link transition transition()}`
to just `transition()`.

PR Close #24000
---
 aio/package.json | 2 +-
 aio/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/package.json b/aio/package.json
index b8bc9757e7..6fde4027d0 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -112,7 +112,7 @@
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
     "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.26.1",
+    "dgeni-packages": "^0.26.2",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
diff --git a/aio/yarn.lock b/aio/yarn.lock
index b143e7eff2..32589bffcb 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -3086,9 +3086,9 @@ devtools-timeline-model@1.1.6:
     chrome-devtools-frontend "1.0.401423"
     resolve "1.1.7"
 
-dgeni-packages@^0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.26.1.tgz#34b5ed880be2f91862095b15085c50cc84507aa8"
+dgeni-packages@^0.26.2:
+  version "0.26.2"
+  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.26.2.tgz#dac22d7e861d4d72ed42af5272714f42b6b5bf3d"
   dependencies:
     canonical-path "0.0.2"
     catharsis "^0.8.1"

From 62443b04a07b37d933ae32a0b9c48e21a5374844 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 06:33:12 +0100
Subject: [PATCH 276/582] build(aio): do not allow `@usageNotes` on properties
 (#24000)

PR Close #24000
---
 aio/tools/transforms/angular-api-package/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index 0ac6a3dc68..b867a1159e 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -239,7 +239,15 @@ function addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES) {
     const ruleSet = checkContentRules.docTypeRules[docType] = checkContentRules.docTypeRules[docType] || {};
     PROPS_TO_DISALLOW.forEach(prop => {
       const rules = ruleSet[prop] = ruleSet[prop] || [];
-      rules.push((doc, prop, value) => value && `Invalid property: "${prop}" is not allowed on "${doc.docType}" docs.`);
+      rules.push((doc, prop, value) => {
+        return value &&
+               !isMethod(doc) &&
+               `Invalid property: "${prop}" is not allowed on "${doc.docType}" docs.`;
+      });
     });
   });
 }
+
+function isMethod(doc) {
+  return doc.hasOwnProperty('parameters') && !doc.isGetAccessor && !doc.isSetAccessor;
+}

From d4d8125b2d5637c4a46ce0ff92a714ae030ea8a1 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 06:33:42 +0100
Subject: [PATCH 277/582] build(aio): refactor the decorator doc processing
 (#24000)

PR Close #24000
---
 .../processors/mergeDecoratorDocs.js          | 56 +++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
index b15b28bc98..956f2f4318 100644
--- a/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
+++ b/aio/tools/transforms/angular-api-package/processors/mergeDecoratorDocs.js
@@ -48,64 +48,62 @@ const {mergeProperties} = require('../../helpers/utils');
 module.exports = function mergeDecoratorDocs(log) {
   return {
     $runAfter: ['processing-docs'],
-    $runBefore: ['docs-processed'],
+    $runBefore: ['docs-processed', 'checkContentRules'],
     propertiesToMerge: [],
     makeDecoratorCalls: [
       {type: '', description: 'toplevel', functionName: 'makeDecorator'},
       {type: 'Prop', description: 'property', functionName: 'makePropDecorator'},
       {type: 'Param', description: 'parameter', functionName: 'makeParamDecorator'},
     ],
-    $process: function(docs) {
+    $process(docs) {
 
-      var makeDecoratorCalls = this.makeDecoratorCalls;
-      var propertiesToMerge = this.propertiesToMerge;
-      var docsToMerge = Object.create(null);
+      const decoratorDocs = Object.create(null);
 
-      docs.forEach(function(doc) {
+      // find all the decorators, signified by a call to `make...Decorator<Decorator>(metadata)`
+      docs.forEach(doc => {
         const initializer = getInitializer(doc);
         if (initializer) {
-          makeDecoratorCalls.forEach(function(call) {
-            // find all the decorators, signified by a call to `make...Decorator<Decorator>(metadata)`
+          this.makeDecoratorCalls.forEach(function(call) {
             if (initializer.expression && initializer.expression.text === call.functionName) {
-              log.debug('mergeDecoratorDocs: found decorator', doc.docType, doc.name);
-              doc.docType = 'decorator';
-              doc.decoratorLocation = call.description;
               // Get the type of the decorator metadata from the first "type" argument of the call.
               // For example the `X` of `createDecorator<X>(...)`.
-              doc.decoratorType = initializer.arguments[0].text;
-              // clear the symbol type named since it is not needed
-              doc.symbolTypeName = undefined;
+              const decoratorType = initializer.arguments[0].text;
 
-              // keep track of the names of the metadata interface that will need to be merged into this decorator doc
-              docsToMerge[doc.name + 'Decorator'] = doc;
+              log.debug('mergeDecoratorDocs: found decorator', doc.docType, doc.name, decoratorType);
+
+              doc.docType = 'decorator';
+              doc.decoratorLocation = call.description;
+              doc.decoratorType = decoratorType;
+
+              decoratorDocs[doc.name + 'Decorator'] = doc;
             }
           });
         }
       });
 
-      // merge the metadata docs into the decorator docs
-      docs = docs.filter(function(doc) {
-        if (docsToMerge[doc.name]) {
+      // merge the info from the associated metadata interfaces into the decorator docs
+      docs = docs.filter(doc => {
+        if (decoratorDocs[doc.name]) {
+
           // We have found an `XxxDecorator` document that will hold the call signature of the decorator
-          var decoratorDoc = docsToMerge[doc.name];
-          var callMember = doc.members.filter(function(member) { return member.isCallMember; })[0];
+          var decoratorDoc = decoratorDocs[doc.name];
+          var callMember = doc.members.find(member => member.isCallMember);
+
           log.debug(
               'mergeDecoratorDocs: merging', doc.name, 'into', decoratorDoc.name,
               callMember.description.substring(0, 50));
 
           // Merge the documentation found in this call signature into the original decorator
-          mergeProperties(decoratorDoc, callMember, propertiesToMerge);
+          mergeProperties(decoratorDoc, callMember, this.propertiesToMerge);
 
           // remove doc from its module doc's exports
-          doc.moduleDoc.exports =
-              doc.moduleDoc.exports.filter(function(exportDoc) { return exportDoc !== doc; });
-
-
-          // remove from the overall list of docs to be rendered
-          return false;
+          doc.moduleDoc.exports = doc.moduleDoc.exports.filter(exportDoc => exportDoc !== doc);
         }
-        return true;
+
+        return !decoratorDocs[doc.name];
       });
+
+      return docs;
     }
   };
 };

From 8977b9690ed1379bcfed69fe72c17585ce55b95e Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 06:35:06 +0100
Subject: [PATCH 278/582] docs(aio): remove unused guide doc (#24000)

This was erroneously committed into master, when it was really only
supposed to demo what the pages might look like.

PR Close #24000
---
 aio/content/guide/api-page-class.md | 175 ----------------------------
 1 file changed, 175 deletions(-)
 delete mode 100644 aio/content/guide/api-page-class.md

diff --git a/aio/content/guide/api-page-class.md b/aio/content/guide/api-page-class.md
deleted file mode 100644
index 989bd0f327..0000000000
--- a/aio/content/guide/api-page-class.md
+++ /dev/null
@@ -1,175 +0,0 @@
-<div class="breadcrumb">
-    <a href="#">API<a> / <a href="#">@core<a>
-</div>
-<header class="api-header">
-    <h1><label class="api-status-label experimental">experimental</label><label class="api-type-label class">class</label>Class Name</h1>
-</header>
-<div class="page-actions">
-    <a href="#"><label class="raised page-label"><i class="material-icons">mode_edit</i>suggest edits</label></a>
-    <a href="#"><label class="raised page-label"><i class="material-icons">code</i>view source</label></a>
-</div>
-<p>Class description goes here. This is a short and to the point one or two sentence description that easily introduces the reader to the class.</p>
-<div class="api-body">
-    <section>
-        <h2>Overview</h2>
-        <code-example language="ts" hidecopy="true" ng-version="5.2.0"><aio-code class="simple-code" ng-reflect-ng-class="[object Object]" ng-reflect-code="
-    class <a href=&quot;api/core/Compi" ng-reflect-hide-copy="true" ng-reflect-language="ts" ng-reflect-linenums="" ng-reflect-path="" ng-reflect-region="" ng-reflect-title=""><pre class="prettyprint lang-ts">
-        <code class="animated fadeIn"><span class="kwd">class</span><span class="pln"> </span><a href="api/core/Compiler" class="code-anchor"><span class="typ">Compiler</span></a><span class="pln"> </span><span class="pun">{</span><span class="pln">
-    </span><a class="code-anchor" href="api/core/Compiler#compileModuleSync"><span class="pln">compileModuleSync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">NgModuleFactory</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;</span></a><span class="pln">
-    </span><a class="code-anchor" href="api/core/Compiler#compileModuleAsync"><span class="pln">compileModuleAsync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">Promise</span><span class="pun">&lt;</span><span class="typ">NgModuleFactory</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;&gt;</span></a><span class="pln">
-    </span><a class="code-anchor" href="api/core/Compiler#compileModuleAndAllComponentsSync"><span class="pln">compileModuleAndAllComponentsSync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">ModuleWithComponentFactories</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;</span></a><span class="pln">
-    </span><a class="code-anchor" href="api/core/Compiler#compileModuleAndAllComponentsAsync"><span class="pln">compileModuleAndAllComponentsAsync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">Promise</span><span class="pun">&lt;</span><span class="typ">ModuleWithComponentFactories</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;&gt;</span></a><span class="pln">
-    </span><a class="code-anchor" href="api/core/Compiler#clearCache"><span class="pln">clearCache</span><span class="pun">():</span><span class="pln"> </span><span class="kwd">void</span></a><span class="pln">
-    </span><a class="code-anchor" href="api/core/Compiler#clearCacheFor"><span class="pln">clearCacheFor</span><span class="pun">(</span><span class="pln">type</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">any</span><span class="pun">&gt;)</span></a><span class="pln">
-    </span><span class="pun">}</span></code>
-        </pre></aio-code></code-example>
-    </section>
-    <section>
-        <h2>Description</h2>
-        <p>The longer class description goes here which can include multiple paragraphs.</p>
-        </p>Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball. Ham hock picanha burgdoggen pork belly rump bacon cupim. Bacon kielbasa sirloin shank strip steak ground round. Bresaola cow salami meatloaf pork chop leberkas flank turducken biltong meatball chuck pork tri-tip chicken. Ribeye corned beef shoulder, meatloaf strip steak jerky porchetta capicola alcatra ham.</p>
-        <h3>Subclasses</h3>
-        <ul>
-            <li><a href="#">Subclass1</a></li>
-            <li><a href="#">Subclass2</a></li>
-            <li><a href="#">Subclass3</a></li>
-        </ul>
-        <h3>See Also</h3>
-        <ul>
-            <li><a href="#">Link1</a></li>
-            <li><a href="#">Link2</a></li>
-        </ul>
-    </section>
-    <section>
-        <h2>Constructor</h2>
-        <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
-        <aio-code class="simple-code"><pre class="prettyprint lang-">   
-        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
-        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
-    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
-        </pre></aio-code></code-example>
-    </section>
-    <section>
-        <h2>Properties</h2>
-        <table class="is-full-width list-table">
-        <thead>
-        <tr>
-        <th>Property</th>
-        <th>Type</th>
-        <th>Description</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-        <td>
-            <code><strong>Property1</strong></code>
-        </td>
-        <td><label class="property-type-label type">Type</label></td>
-        <td>Description goes here</td>
-        </tr>
-        <tr>
-        <td>
-            <code><strong>Property2</strong></code>
-        </td>
-        <td>Type</td>
-        <td>Description goes here</td>
-        </tr>
-        <tr>
-        <td>
-            <code><strong>Property3</strong></code>
-        </td>
-        <td>Type</td>
-        <td>Description goes here</td>
-        </tr>
-        </tbody>
-    </table>
-    </section>
-    <section class="api-method">
-        <h2>Methods</h2>
-        <table class="is-full-width item-table">
-        <thead>
-        <tr>
-        <th>Method1Name( )</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-        <td>
-            <p>Description goes here</p>
-            <br>
-            <p>Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball. Ham hock picanha burgdoggen pork belly rump bacon cupim. Bacon kielbasa sirloin shank strip steak ground round. Bresaola cow salami meatloaf pork chop leberkas flank turducken biltong meatball chuck pork tri-tip chicken. Ribeye corned beef shoulder, meatloaf strip steak jerky porchetta capicola alcatra ham.</p>
-        </td>
-        </tr>
-        </tbody>
-    </table>
-    <table class="is-full-width api-method item-table">
-        <thead>
-        <tr>
-        <th>Method2Name( )</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-        <td>
-            <p>Description goes here</p>
-            <hr>
-            <h5>Declaration</h5>
-            <code-example language="ts" hidecopy="true" ng-version="5.2.0">
-                <aio-code class="simple-code"><pre class="prettyprint lang-ts">
-                    <code class="animated fadeIn"><span class="kwd">class</span><span class="pln"> </span><a href="api/animations/AnimationBuilder" class="code-anchor"><span class="typ">AnimationBuilder</span></a><span class="pln"> </span><span class="pun">{</span><span class="pln"></span><a class="code-anchor" href="api/animations/AnimationBuilder#build"><span class="pln">build</span><span class="pun">(</span><span class="pln">animation</span><span class="pun">:</span><span class="pln"> </span><span class="typ">AnimationMetadata</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> </span><span class="typ">AnimationMetadata</span><span class="pun">[]):</span><span class="pln"> </span><span class="typ">AnimationFactory</span></a><span class="pln"></span><span class="pun">}</span></code></pre>
-                </aio-code>
-            </code-example>
-            <h6>Parameters</h6>
-            <h6>Returns</h6>
-            <p>Returns information and results goes here.</p>
-            <h6>Errors</h6>
-            <p>Error information goes here</p>
-            <hr>
-            <p>Further details provided as needed. Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball.</p><hr>
-            <h6>Overloads</h6>
-                <table class="is-full-width">
-                <tbody>
-                <tr>
-                <td>
-                    <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
-        <aio-code class="simple-code"><pre class="prettyprint lang-">   
-        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
-        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
-    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
-        </pre></aio-code></code-example>
-                </td>
-                <td>Description goes here</td>
-                </tr>
-                <tr>
-                <td>
-                    <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
-        <aio-code class="simple-code"><pre class="prettyprint lang-">   
-        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
-        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
-    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
-        </pre></aio-code></code-example>
-                </td>
-                <td>Description goes here</td>
-                </tr>
-                </tbody>
-            </table>
-            <hr>
-            <h5>Example: Descriptive Title of Method Example</h5>
-            <p>Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball. Ham hock picanha burgdoggen pork belly rump bacon cupim. Bacon kielbasa sirloin shank strip steak ground round. Bresaola cow salami meatloaf pork chop leberkas flank turducken biltong meatball chuck pork tri-tip chicken. Ribeye corned beef shoulder, meatloaf strip steak jerky porchetta capicola alcatra ham.</p>
-        </td>
-        </tr>
-        </tbody>
-    </table>
-    </section>
-    <section>
-        <h2>Example: Descriptive Title of Combined Example Goes Here</h2>
-        <p>Intro description text about what the example is and how it can be used.</p>
-            <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
-        <aio-code class="simple-code"><pre class="prettyprint lang-">   
-        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
-        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
-    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
-        </pre></aio-code></code-example>
-        <p>Further explanation provided as needed. Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball.</p>
-    </section>
-</div>
\ No newline at end of file

From e7b392bf3a329e96e0d563cc4b4206ff25b3b716 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 12:08:00 +0100
Subject: [PATCH 279/582] build(aio): improve automatic linking of code items
 (#24000)

This commit adds new link disambiguators that mean that more
code links can be generated automatically in a sensible way.

The best example is the use of properties within class, interface and
enum documentation.

PR Close #24000
---
 aio/tools/transforms/links-package/index.js   |  8 +++--
 .../disambiguators/disambiguateByContainer.js | 19 +++++++++++
 .../disambiguateByContainer.spec.js           | 34 +++++++++++++++++++
 .../disambiguators/disambiguateByNonMember.js | 14 ++++++++
 .../disambiguateByNonMember.spec.js           | 23 +++++++++++++
 5 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.js
 create mode 100644 aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.spec.js
 create mode 100644 aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.js
 create mode 100644 aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.spec.js

diff --git a/aio/tools/transforms/links-package/index.js b/aio/tools/transforms/links-package/index.js
index 2f6964cfaf..e6b93b093e 100644
--- a/aio/tools/transforms/links-package/index.js
+++ b/aio/tools/transforms/links-package/index.js
@@ -8,16 +8,20 @@ module.exports =
         .factory(require('./services/getAliases'))
         .factory(require('./services/getDocFromAlias'))
         .factory(require('./services/getLinkInfo'))
+        .factory(require('./services/disambiguators/disambiguateByContainer'))
         .factory(require('./services/disambiguators/disambiguateByDeprecated'))
         .factory(require('./services/disambiguators/disambiguateByModule'))
+        .factory(require('./services/disambiguators/disambiguateByNonMember'))
 
         .config(function(inlineTagProcessor, linkInlineTagDef) {
           inlineTagProcessor.inlineTagDefinitions.push(linkInlineTagDef);
         })
 
-        .config(function(getDocFromAlias, disambiguateByDeprecated, disambiguateByModule) {
+        .config(function(getDocFromAlias, disambiguateByContainer, disambiguateByDeprecated, disambiguateByModule, disambiguateByNonMember) {
           getDocFromAlias.disambiguators = [
+            disambiguateByContainer,
             disambiguateByDeprecated,
-            disambiguateByModule
+            disambiguateByModule,
+            disambiguateByNonMember,
           ];
         });
diff --git a/aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.js b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.js
new file mode 100644
index 0000000000..abd68a4854
--- /dev/null
+++ b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.js
@@ -0,0 +1,19 @@
+/**
+ * This link disambiguator looks for matching docs that have a common container with the
+ * originatingDoc and will return just those.
+ */
+module.exports = function disambiguateByContainer() {
+  return _disambiguate;
+};
+
+function _disambiguate(alias, originatingDoc, docs) {
+  if (originatingDoc) {
+    const filteredDocs = docs.filter(doc => doc.containerDoc === originatingDoc);
+    if (filteredDocs.length === 0) {
+      // No docs match so let's look at the containers container
+      return _disambiguate(alias, originatingDoc.containerDoc, docs);
+    }
+    return filteredDocs;
+  }
+  return docs;
+}
diff --git a/aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.spec.js b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.spec.js
new file mode 100644
index 0000000000..310133800f
--- /dev/null
+++ b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByContainer.spec.js
@@ -0,0 +1,34 @@
+const disambiguateByContainer = require('./disambiguateByContainer')();
+const containerA = { name: 'a' };
+const containerB = { name: 'b' };
+const docs = [
+  { id: 'doc1', containerDoc: containerA },
+  { id: 'doc2', containerDoc: containerA },
+  { id: 'doc3', containerDoc: containerB },
+];
+
+describe('disambiguateByContainer', () => {
+  it('should return all docs if the originating doc has no containerDoc', () => {
+    expect(disambiguateByContainer('alias', { }, docs)).toEqual(docs);
+  });
+
+  it('should return all docs if no docs match the originating doc containerDoc', () => {
+    expect(disambiguateByContainer('alias', { containerDoc: { name: 'c' } }, docs)).toEqual(docs);
+  });
+
+  it('should return only docs that are contained by the originating doc or its containers', () => {
+    expect(disambiguateByContainer('alias', containerB, docs)).toEqual([
+      { id: 'doc3', containerDoc: containerB },
+    ]);
+
+    expect(disambiguateByContainer('alias', { containerDoc: containerA }, docs)).toEqual([
+      { id: 'doc1', containerDoc: containerA },
+      { id: 'doc2', containerDoc: containerA },
+    ]);
+
+    expect(disambiguateByContainer('alias', { containerDoc: containerB }, docs)).toEqual([
+      { id: 'doc3', containerDoc: containerB },
+    ]);
+
+  });
+});
\ No newline at end of file
diff --git a/aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.js b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.js
new file mode 100644
index 0000000000..0f6cd1dd1f
--- /dev/null
+++ b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.js
@@ -0,0 +1,14 @@
+/**
+ * This link disambiguator will remove all the members from the list of ambiguous links
+ * if there is at least one link to a doc that is not a member.
+ *
+ * The heuristic is that exports are more important than members when linking, and that
+ * in general members will be linked to via a more explicit code links such as
+ * `MyClass.member` rather than simply `member`.
+ */
+module.exports = function disambiguateByNonMember() {
+  return (alias, originatingDoc, docs) => {
+    const filteredDocs = docs.filter(doc => doc.docType !== 'member');
+    return filteredDocs.length > 0 ? filteredDocs : docs;
+  };
+};
diff --git a/aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.spec.js b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.spec.js
new file mode 100644
index 0000000000..fd2afca6fd
--- /dev/null
+++ b/aio/tools/transforms/links-package/services/disambiguators/disambiguateByNonMember.spec.js
@@ -0,0 +1,23 @@
+const disambiguateByNonMember = require('./disambiguateByNonMember')();
+const doc1 = { id: 'doc1', docType: 'function', containerDoc: {} };
+const doc2 = { id: 'doc2', docType: 'member', containerDoc: {} };
+const doc3 = { id: 'doc3', docType: 'member', containerDoc: {} };
+const doc4 = { id: 'doc4', docType: 'class', containerDoc: {} };
+const doc5 = { id: 'doc5', docType: 'member', containerDoc: {} };
+
+describe('disambiguateByNonMember', () => {
+  it('should filter out docs that are not members', () => {
+    const docs = [doc1, doc2, doc3, doc4, doc5];
+    expect(disambiguateByNonMember('alias', {}, docs)).toEqual([doc1, doc4]);
+  });
+
+  it('should return all docs if there are no members', () => {
+    const docs = [doc1, doc4];
+    expect(disambiguateByNonMember('alias', {}, docs)).toEqual([doc1, doc4]);
+  });
+
+  it('should return all docs if there are only members', () => {
+    const docs = [doc2, doc3, doc5];
+    expect(disambiguateByNonMember('alias', {}, docs)).toEqual([doc2, doc3, doc5]);
+  });
+});
\ No newline at end of file

From 38a0d1fac556aed84bb85004c46280583eabd4c3 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 12:19:29 +0100
Subject: [PATCH 280/582] docs: remove unnecessary `@linkDocs` tags (#24000)

It is cleaner and simpler to use just a straightforward link.

PR Close #24000
---
 packages/common/src/i18n/locale_data.ts       |  2 +-
 packages/common/src/i18n/locale_data_api.ts   |  4 +--
 packages/common/src/pipes/date_pipe.ts        |  4 +--
 packages/core/src/di/injectable.ts            |  2 +-
 packages/core/src/di/injector.ts              |  2 +-
 packages/core/src/di/metadata.ts              | 10 +++----
 packages/core/src/di/provider.ts              | 30 +++++++++----------
 packages/core/src/i18n/tokens.ts              |  8 ++---
 packages/core/src/metadata/lifecycle_hooks.ts | 16 +++++-----
 9 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/common/src/i18n/locale_data.ts b/packages/common/src/i18n/locale_data.ts
index 1d061dc6d8..d638d26bc3 100644
--- a/packages/common/src/i18n/locale_data.ts
+++ b/packages/common/src/i18n/locale_data.ts
@@ -13,7 +13,7 @@ export const LOCALE_DATA: {[localeId: string]: any} = {};
 
 /**
  * Register global data to be used internally by Angular. See the
- * {@linkDocs guide/i18n#i18n-pipes "I18n guide"} to know how to import additional locale data.
+ * ["I18n guide"](guide/i18n#i18n-pipes) to know how to import additional locale data.
  *
  * @experimental i18n support is experimental.
  */
diff --git a/packages/common/src/i18n/locale_data_api.ts b/packages/common/src/i18n/locale_data_api.ts
index eb90cedacc..cbfd90f117 100644
--- a/packages/common/src/i18n/locale_data_api.ts
+++ b/packages/common/src/i18n/locale_data_api.ts
@@ -427,7 +427,7 @@ function checkFullData(data: any) {
  * You should fallback to AM/PM when there are no rules available.
  *
  * Note: this is only available if you load the full locale data.
- * See the {@linkDocs guide/i18n#i18n-pipes "I18n guide"} to know how to import additional locale
+ * See the ["I18n guide"](guide/i18n#i18n-pipes) to know how to import additional locale
  * data.
  *
  * @experimental i18n support is experimental.
@@ -452,7 +452,7 @@ export function getLocaleExtraDayPeriodRules(locale: string): (Time | [Time, Tim
  * You should fallback to AM/PM when there are no day periods available.
  *
  * Note: this is only available if you load the full locale data.
- * See the {@linkDocs guide/i18n#i18n-pipes "I18n guide"} to know how to import additional locale
+ * See the ["I18n guide"](guide/i18n#i18n-pipes) to know how to import additional locale
  * data.
  *
  * @experimental i18n support is experimental.
diff --git a/packages/common/src/pipes/date_pipe.ts b/packages/common/src/pipes/date_pipe.ts
index d70a002968..1c89c4df61 100644
--- a/packages/common/src/pipes/date_pipe.ts
+++ b/packages/common/src/pipes/date_pipe.ts
@@ -82,10 +82,10 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  * WARNINGS:
  * - this pipe has only access to en-US locale data by default. If you want to localize the dates
  *   in another language, you will have to import data for other locales.
- *   See the {@linkDocs guide/i18n#i18n-pipes "I18n guide"} to know how to import additional locale
+ *   See the ["I18n guide"](guide/i18n#i18n-pipes) to know how to import additional locale
  *   data.
  * - Fields suffixed with * are only available in the extra dataset.
- *   See the {@linkDocs guide/i18n#i18n-pipes "I18n guide"} to know how to import extra locale
+ *   See the ["I18n guide"](guide/i18n#i18n-pipes) to know how to import extra locale
  *   data.
  * - 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
diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
index 740878d3bf..581f1d0b6e 100644
--- a/packages/core/src/di/injectable.ts
+++ b/packages/core/src/di/injectable.ts
@@ -44,7 +44,7 @@ export interface InjectableDecorator {
    * @description
    * A marker metadata that marks a class as available to {@link Injector} for creation.
    *
-   * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+   * For more details, see the ["Dependency Injection Guide"(guide/dependency-injection).
    *
    * ### Example
    *
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index 0dedf6e2a4..a3d02e1018 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -53,7 +53,7 @@ export class NullInjector implements Injector {
  *
  * Concrete injectors implement this interface.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
diff --git a/packages/core/src/di/metadata.ts b/packages/core/src/di/metadata.ts
index 7ddb9cf9a3..32ec55cbfd 100644
--- a/packages/core/src/di/metadata.ts
+++ b/packages/core/src/di/metadata.ts
@@ -31,7 +31,7 @@ export interface InjectDecorator {
    * @description
    * A parameter decorator that specifies a dependency.
    *
-   * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
    * ### Example
    *
@@ -85,7 +85,7 @@ export interface OptionalDecorator {
    * A parameter metadata that marks a dependency as optional.
    * {@link Injector} provides `null` if the dependency is not found.
    *
-   * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
    * ### Example
    *
@@ -130,7 +130,7 @@ export interface SelfDecorator {
    * @description
    * Specifies that an {@link Injector} should retrieve a dependency only from itself.
    *
-   * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
    * ### Example
    *
@@ -176,7 +176,7 @@ export interface SkipSelfDecorator {
    * @description
    * Specifies that the dependency resolution should start from the parent injector.
    *
-   * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
    * ### Example
    *
@@ -222,7 +222,7 @@ export interface HostDecorator {
    * Specifies that an injector should retrieve a dependency from any injector until
    * reaching the host element of the current component.
    *
-   * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
    * ### Example
    *
diff --git a/packages/core/src/di/provider.ts b/packages/core/src/di/provider.ts
index 447f7c2279..bb956dc81b 100644
--- a/packages/core/src/di/provider.ts
+++ b/packages/core/src/di/provider.ts
@@ -18,7 +18,7 @@ import {Type} from '../type';
  * @description
  * Configures the `Injector` to return a value for a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -42,7 +42,7 @@ export interface ValueSansProvider {
  * @description
  * Configures the `Injector` to return a value for a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -77,7 +77,7 @@ export interface ValueProvider extends ValueSansProvider {
  * @description
  * Configures the `Injector` to return an instance of `useClass` for a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -111,7 +111,7 @@ export interface StaticClassSansProvider {
  * @description
  * Configures the `Injector` to return an instance of `useClass` for a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -149,7 +149,7 @@ export interface StaticClassProvider extends StaticClassSansProvider {
  * @description
  * Configures the `Injector` to return an instance of a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * @experimental
  */
@@ -173,7 +173,7 @@ export interface ConstructorSansProvider {
  * @description
  * Configures the `Injector` to return an instance of a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -208,7 +208,7 @@ export interface ConstructorProvider extends ConstructorSansProvider {
  * @description
  * Configures the `Injector` to return a value of another `useExisting` token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -232,7 +232,7 @@ export interface ExistingSansProvider {
  * @description
  * Configures the `Injector` to return a value of another `useExisting` token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -269,7 +269,7 @@ export interface ExistingProvider extends ExistingSansProvider {
  * @description
  * Configures the `Injector` to return a value by invoking a `useFactory` function.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -302,7 +302,7 @@ export interface FactorySansProvider {
  * @description
  * Configures the `Injector` to return a value by invoking a `useFactory` function.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -337,7 +337,7 @@ export interface FactoryProvider extends FactorySansProvider {
  * @description
  * Describes how the `Injector` should be configured in a static way (Without reflection).
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  *
  */
@@ -360,7 +360,7 @@ export type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvi
  * Create an instance by invoking the `new` operator and supplying additional arguments.
  * This form is a short form of `TypeProvider`;
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -383,7 +383,7 @@ export interface TypeProvider extends Type<any> {}
  * @description
  * Configures the `Injector` to return a value by invoking a `useClass` function.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -410,7 +410,7 @@ export interface ClassSansProvider {
  * @description
  * Configures the `Injector` to return an instance of `useClass` for a token.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  * ### Example
  *
@@ -445,7 +445,7 @@ export interface ClassProvider extends ClassSansProvider {
  * @description
  * Describes how the `Injector` should be configured.
  *
- * For more details, see the {@linkDocs guide/dependency-injection "Dependency Injection Guide"}.
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
  *
  */
diff --git a/packages/core/src/i18n/tokens.ts b/packages/core/src/i18n/tokens.ts
index 7bbec4939d..55786e6db2 100644
--- a/packages/core/src/i18n/tokens.ts
+++ b/packages/core/src/i18n/tokens.ts
@@ -13,7 +13,7 @@ import {InjectionToken} from '../di/injection_token';
  * It is used for i18n extraction, by i18n pipes (DatePipe, I18nPluralPipe, CurrencyPipe,
  * DecimalPipe and PercentPipe) and by ICU expressions.
  *
- * See the {@linkDocs guide/i18n#setting-up-locale i18n guide} for more information.
+ * See the [i18n guide](guide/i18n#setting-up-locale) for more information.
  *
  * ### Example
  *
@@ -35,7 +35,7 @@ export const LOCALE_ID = new InjectionToken<string>('LocaleId');
  * Use this token at bootstrap to provide the content of your translation file (`xtb`,
  * `xlf` or `xlf2`) when you want to translate your application in another language.
  *
- * See the {@linkDocs guide/i18n#merge i18n guide} for more information.
+ * See the [i18n guide](guide/i18n#merge) for more information.
  *
  * ### Example
  *
@@ -60,7 +60,7 @@ export const TRANSLATIONS = new InjectionToken<string>('Translations');
  * Provide this token at bootstrap to set the format of your {@link TRANSLATIONS}: `xtb`,
  * `xlf` or `xlf2`.
  *
- * See the {@linkDocs guide/i18n#merge i18n guide} for more information.
+ * See the [i18n guide](guide/i18n#merge) for more information.
  *
  * ### Example
  *
@@ -85,7 +85,7 @@ export const TRANSLATIONS_FORMAT = new InjectionToken<string>('TranslationsForma
  * - Warning (default): show a warning in the console and/or shell.
  * - Ignore: do nothing.
  *
- * See the {@linkDocs guide/i18n#missing-translation i18n guide} for more information.
+ * See the [i18n guide](guide/i18n#missing-translation) for more information.
  *
  * ### Example
  * ```typescript
diff --git a/packages/core/src/metadata/lifecycle_hooks.ts b/packages/core/src/metadata/lifecycle_hooks.ts
index cfa21b9dee..426752f28f 100644
--- a/packages/core/src/metadata/lifecycle_hooks.ts
+++ b/packages/core/src/metadata/lifecycle_hooks.ts
@@ -27,7 +27,7 @@ export interface SimpleChanges { [propName: string]: SimpleChange; }
  * and content children are checked if at least one of them has changed.
  * The `changes` parameter contains the changed properties.
  *
- * See {@linkDocs guide/lifecycle-hooks#onchanges "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#onchanges).
  *
  *
  */
@@ -45,7 +45,7 @@ export interface OnChanges { ngOnChanges(changes: SimpleChanges): void; }
  * first time, and before any of its children have been checked. It is invoked only once when the
  * directive is instantiated.
  *
- * See {@linkDocs guide/lifecycle-hooks "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks).
  *
  *
  */
@@ -69,7 +69,7 @@ export interface OnInit { ngOnInit(): void; }
  * See {@link KeyValueDiffers} and {@link IterableDiffers} for implementing custom dirty checking
  * for collections.
  *
- * See {@linkDocs guide/lifecycle-hooks#docheck "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#docheck).
  *
  *
  */
@@ -85,7 +85,7 @@ export interface DoCheck { ngDoCheck(): void; }
  * `ngOnDestroy` callback is typically used for any custom cleanup that needs to occur when the
  * instance is destroyed.
  *
- * See {@linkDocs guide/lifecycle-hooks "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks).
  *
  *
  */
@@ -100,7 +100,7 @@ export interface OnDestroy { ngOnDestroy(): void; }
  * Lifecycle hook that is called after a directive's content has been fully
  * initialized.
  *
- * See {@linkDocs guide/lifecycle-hooks#aftercontent "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#aftercontent).
  *
  *
  */
@@ -113,7 +113,7 @@ export interface AfterContentInit { ngAfterContentInit(): void; }
  * @description
  * Lifecycle hook that is called after every check of a directive's content.
  *
- * See {@linkDocs guide/lifecycle-hooks#aftercontent "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#aftercontent).
  *
  *
  */
@@ -127,7 +127,7 @@ export interface AfterContentChecked { ngAfterContentChecked(): void; }
  * Lifecycle hook that is called after a component's view has been fully
  * initialized.
  *
- * See {@linkDocs guide/lifecycle-hooks#afterview "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#afterview).
  *
  *
  */
@@ -140,7 +140,7 @@ export interface AfterViewInit { ngAfterViewInit(): void; }
  * @description
  * Lifecycle hook that is called after every check of a component's view.
  *
- * See {@linkDocs guide/lifecycle-hooks#afterview "Lifecycle Hooks Guide"}.
+ * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#afterview).
  *
  *
  */

From ccb19fea689b414bea22688d290c7ff95b91cb53 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 12:19:52 +0100
Subject: [PATCH 281/582] build(aio): remove unused `@linkDocs` alias for
 `@link` jsdoc tag (#24000)

PR Close #24000
---
 aio/tools/transforms/links-package/inline-tag-defs/link.js      | 1 -
 aio/tools/transforms/links-package/inline-tag-defs/link.spec.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/aio/tools/transforms/links-package/inline-tag-defs/link.js b/aio/tools/transforms/links-package/inline-tag-defs/link.js
index 3a8524a586..16f44baaf7 100644
--- a/aio/tools/transforms/links-package/inline-tag-defs/link.js
+++ b/aio/tools/transforms/links-package/inline-tag-defs/link.js
@@ -14,7 +14,6 @@ var INLINE_LINK = /(\S+)(?:\s+([\s\S]+))?/;
 module.exports = function linkInlineTagDef(getLinkInfo, createDocMessage, log) {
   return {
     name: 'link',
-    aliases: ['linkDocs'],
     failOnBadLink: false,
     description:
         'Process inline link tags (of the form {@link some/uri Some Title}), replacing them with HTML anchors',
diff --git a/aio/tools/transforms/links-package/inline-tag-defs/link.spec.js b/aio/tools/transforms/links-package/inline-tag-defs/link.spec.js
index 9d1a3b13c9..c380b2ce3c 100644
--- a/aio/tools/transforms/links-package/inline-tag-defs/link.spec.js
+++ b/aio/tools/transforms/links-package/inline-tag-defs/link.spec.js
@@ -19,7 +19,6 @@ describe('link inline-tag-def', function() {
   it('should be available as a service', () => {
     expect(tag).toBeDefined();
     expect(tag.name).toEqual('link');
-    expect(tag.aliases).toEqual(['linkDocs']);
   });
 
   it('should call getLinkInfo', () => {

From e371b226fade18f03fb09ed5cee61f0adb611fd3 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 13:46:26 +0100
Subject: [PATCH 282/582] build(aio): rearrange decorator API doc template
 (#24000)

The overview of the decorator options is now a table.
The detailed description of each option is now a full section.

PR Close #24000
---
 aio/src/styles/2-modules/_api-pages.scss      |  2 +-
 .../templates/api/decorator.template.html     | 38 ++++++++++++++++++-
 .../api/includes/decorator-overview.html      | 35 ++++++++++++++---
 3 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/aio/src/styles/2-modules/_api-pages.scss b/aio/src/styles/2-modules/_api-pages.scss
index 7bfdb19556..00a3bb1c9b 100644
--- a/aio/src/styles/2-modules/_api-pages.scss
+++ b/aio/src/styles/2-modules/_api-pages.scss
@@ -30,7 +30,7 @@
     }
   }
 
-  .method-table {
+  .method-table, .option-table {
     h3 {
       margin: 6px 0;
       font-weight: bold;
diff --git a/aio/tools/transforms/templates/api/decorator.template.html b/aio/tools/transforms/templates/api/decorator.template.html
index 75e43cf6ec..050240a875 100644
--- a/aio/tools/transforms/templates/api/decorator.template.html
+++ b/aio/tools/transforms/templates/api/decorator.template.html
@@ -4,6 +4,40 @@
 
 {% block overview %}{% include "includes/decorator-overview.html" %}{% endblock %}
 {% block details %}
-  {% include "includes/description.html" %}
-  {$ memberHelper.renderProperties(doc.members, 'metadata-members', 'metadata-member', 'Options') $}
+{% include "includes/description.html" %}
+
+<section class="decorator-options">
+  <h2>Options</h2>
+  {% for option in doc.members %}
+  <a id="{$ option.anchor $}"></a>
+  <table class="is-full-width option-table">
+    <thead><tr><th><h3>{$ option.name $}</h3></th></tr></thead>
+    <tbody>
+      <tr>
+        <td>
+          {% if option.shortDescription %}{$ option.shortDescription | marked $}{% endif %}
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <code-example language="ts" hideCopy="true" class="no-box api-heading">
+          {$ option.name $}: {$ option.type | escape $}
+          </code-example>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          {%- if option.description %}
+          {$ option.description | marked({ h3: 'h4' }) $}
+          {% endif %}
+
+          {%- if option.usageNotes %}
+          {$ option.usageNotes | marked({ h3: 'h4' }) $}
+          {% endif %}
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  {% endfor %}
+</section>
 {% endblock %}
diff --git a/aio/tools/transforms/templates/api/includes/decorator-overview.html b/aio/tools/transforms/templates/api/includes/decorator-overview.html
index a8328500d1..44f06484c3 100644
--- a/aio/tools/transforms/templates/api/includes/decorator-overview.html
+++ b/aio/tools/transforms/templates/api/includes/decorator-overview.html
@@ -1,10 +1,33 @@
-{% import "lib/memberHelpers.html" as memberHelper -%}
+{% import "lib/descendants.html" as descendants -%}
+
+{% macro renderOptionsTable(doc) %}
+<table class="is-full-width list-table option-table">
+  <thead>
+    <tr><th>Option</th><th>Description</th></tr>
+  </thead>
+  <tbody>
+  {%- for option in doc.members %}
+    <tr class="option">
+      <td>
+        <a class="code-anchor" href="{$ doc.path $}#{$ option.anchor | urlencode $}">
+          <code>{$ option.name $}</code>
+        </a>
+      </td>
+      <td>{$ option.shortDescription | marked $}</td>
+    </tr>
+    {% endfor -%}
+  </tbody>
+</table>
+
+{% for ancestor in doc.extendsClauses %}{% if ancestor.doc %}
+<h3>Inherited from <a class="code-anchor" href="{$ ancestor.doc.path $}">{$ ancestor.doc.id $}</a></h3>
+{$ renderOptionsTable(ancestor.doc) $}
+{% endif %}{% endfor %}
+{% endmacro %}
 
 {% if doc.members.length %}
 <section class="decorator-overview">
-<code-example language="ts" hideCopy="true">
-@{$ doc.name $}{$ doc.typeParams | escape $}({ {$ memberHelper.renderMembers(doc) $}
-})
-</code-example>
+  {$ renderOptionsTable(doc) $}
+  {$ descendants.renderDescendants(doc, 'decorator', 'Subclasses') $}
 </section>
-{% endif %}
\ No newline at end of file
+{% endif %}

From 77309e2ea4040038c3eca9c0ae46842c5f7bd647 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 15:07:11 +0100
Subject: [PATCH 283/582] build(aio): map H3 headings into H4 headings for
 certain templates (#24000)

The sections such as methods and decorator options are already headed
by a H3 heading so we need to map the H3 headings in the API doc source
down to H4 headings.

This commit includes general heading mapping functionality accessible via
the `marked` Nunjucks filter.

PR Close #24000
---
 aio/tools/transforms/remark-package/index.js  |  2 +-
 .../services/markedNunjucksFilter.js          | 12 +++++++
 .../services/plugins/mapHeadings.js           | 31 ++++++++++++++++++
 .../remark-package/services/renderMarkdown.js | 26 ++++++++-------
 .../services/renderMarkdown.spec.js           | 32 +++++++++++++++++++
 .../templates/api/lib/memberHelpers.html      | 20 +++++++++---
 6 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 aio/tools/transforms/remark-package/services/markedNunjucksFilter.js
 create mode 100644 aio/tools/transforms/remark-package/services/plugins/mapHeadings.js

diff --git a/aio/tools/transforms/remark-package/index.js b/aio/tools/transforms/remark-package/index.js
index 67b7acc318..1ef0fe2746 100644
--- a/aio/tools/transforms/remark-package/index.js
+++ b/aio/tools/transforms/remark-package/index.js
@@ -5,5 +5,5 @@ var Package = require('dgeni').Package;
  * @description Overrides the renderMarkdown service with an implementation based on remark
  */
 module.exports = new Package('remark', ['nunjucks'])
-
+                     .factory(require('./services/markedNunjucksFilter'))
                      .factory(require('./services/renderMarkdown'));
diff --git a/aio/tools/transforms/remark-package/services/markedNunjucksFilter.js b/aio/tools/transforms/remark-package/services/markedNunjucksFilter.js
new file mode 100644
index 0000000000..11dae32016
--- /dev/null
+++ b/aio/tools/transforms/remark-package/services/markedNunjucksFilter.js
@@ -0,0 +1,12 @@
+/**
+ * Convert the value, as markdown, into HTML
+ * @param headingMappings A map of headings to convert (e.g. from h3 to h4).
+ */
+module.exports = function markedNunjucksFilter(renderMarkdown) {
+  return {
+    name: 'marked',
+    process: function(str, headingMappings) {
+      return str && renderMarkdown(str, headingMappings);
+    }
+  };
+};
\ No newline at end of file
diff --git a/aio/tools/transforms/remark-package/services/plugins/mapHeadings.js b/aio/tools/transforms/remark-package/services/plugins/mapHeadings.js
new file mode 100644
index 0000000000..e00ee7c775
--- /dev/null
+++ b/aio/tools/transforms/remark-package/services/plugins/mapHeadings.js
@@ -0,0 +1,31 @@
+const visit = require('unist-util-visit');
+
+function headingToLevel(heading) {
+  const match = /^h(\d+)/.exec(heading);
+  return match ? match[1] : '0';
+}
+
+function parseMappings(mappings) {
+  const mapping = {};
+  Object.keys(mappings).forEach(key => mapping[headingToLevel(key)] = headingToLevel(mappings[key]));
+  return mapping;
+}
+
+module.exports = function mapHeadings(mappings) {
+  const headings = parseMappings(mappings || {});
+  return () => ast => {
+    const nodesToFix = [];
+    Object.keys(headings).forEach(heading => {
+      visit(ast, 'heading', node => {
+        if (node.depth === Number(heading)) {
+          nodesToFix.push(node);
+        }
+      });
+    });
+
+    // Update the depth of the matched nodes
+    nodesToFix.forEach(node => node.depth = headings[node.depth]);
+
+    return ast;
+  };
+};
diff --git a/aio/tools/transforms/remark-package/services/renderMarkdown.js b/aio/tools/transforms/remark-package/services/renderMarkdown.js
index c68701e119..4bdaf90021 100644
--- a/aio/tools/transforms/remark-package/services/renderMarkdown.js
+++ b/aio/tools/transforms/remark-package/services/renderMarkdown.js
@@ -1,25 +1,29 @@
 const remark = require('remark');
 const html = require('remark-html');
 const code = require('./handlers/code');
+const mapHeadings = require('./plugins/mapHeadings');
 
 /**
  * @dgService renderMarkdown
  * @description
  * Render the markdown in the given string as HTML.
+ * @param headingMap A map of headings to convert.
+ *                   E.g. `{h3: 'h4'} will map heading 3 level into heading 4.
  */
 module.exports = function renderMarkdown() {
-  const handlers = { code };
-  const renderer = remark()
-                    .use(inlineTagDefs)
-                    .use(noIndentedCodeBlocks)
-                    .use(plainHTMLBlocks)
-                    // USEFUL DEBUGGING CODE
-                    // .use(() => tree => {
-                    //   console.log(require('util').inspect(tree, { colors: true, depth: 4 }));
-                    // })
-                    .use(html, { handlers });
+  return function renderMarkdownImpl(content, headingMap) {
+
+    const renderer = remark()
+      .use(inlineTagDefs)
+      .use(noIndentedCodeBlocks)
+      .use(plainHTMLBlocks)
+      // USEFUL DEBUGGING CODE
+      // .use(() => tree => {
+      //   console.log(require('util').inspect(tree, { colors: true, depth: 4 }));
+      // })
+      .use(mapHeadings(headingMap))
+      .use(html, { handlers: { code } });
 
-  return function renderMarkdownImpl(content) {
     return renderer.processSync(content).toString();
   };
 
diff --git a/aio/tools/transforms/remark-package/services/renderMarkdown.spec.js b/aio/tools/transforms/remark-package/services/renderMarkdown.spec.js
index d9afc6c762..973a9c8008 100644
--- a/aio/tools/transforms/remark-package/services/renderMarkdown.spec.js
+++ b/aio/tools/transforms/remark-package/services/renderMarkdown.spec.js
@@ -95,4 +95,36 @@ describe('remark: renderMarkdown service', () => {
     '</code-example>\n'
     );
   });
+
+  it('should map heading levels as specified', () => {
+    const content =
+    '# heading 1\n' +
+    '\n' +
+    'some paragraph\n' +
+    '\n' +
+    '## heading 2a\n' +
+    '\n' +
+    'some paragraph\n' +
+    '\n' +
+    '### heading 3\n' +
+    '\n' +
+    'some paragraph\n' +
+    '\n' +
+    '## heading 2b\n' +
+    '\n' +
+    'some paragraph\n' +
+    '\n';
+    const headingMappings = { h2: 'h3', h3: 'h5' };
+    const output = renderMarkdown(content, headingMappings);
+    expect(output).toEqual(
+      '<h1>heading 1</h1>\n' +
+      '<p>some paragraph</p>\n' +
+      '<h3>heading 2a</h3>\n' +
+      '<p>some paragraph</p>\n' +
+      '<h5>heading 3</h5>\n' +
+      '<p>some paragraph</p>\n' +
+      '<h3>heading 2b</h3>\n' +
+      '<p>some paragraph</p>\n'
+      );
+  });
 });
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index 2fdfb3b6e4..15146f8755 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -113,12 +113,24 @@
       </td>
     </tr>
   {% endif %}
-  {% if method.description %}<tr>
+
+  {% if method.description -%}
+    <tr>
       <td class="description">
-        {$ method.description | marked $}
+        {$ method.description | marked({ h3: 'h4' }) $}
       </td>
-    </tr>{% endif %}
-  </tbody>
+    </tr>
+  {%- endif %}
+
+  {% if method.usageNotes -%}
+    <tr>
+      <td class="usage-notes">
+        <h3>Usage Notes</h3>
+        {$ method.usageNotes | marked({ h3: 'h4' }) $}
+      </td>
+    </tr>
+  {%- endif %}
+    </tbody>
 </table>
 {% endmacro -%}
 

From e6516b0229398430fd11d0d433e8c3712b182b3b Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 16:13:00 +0100
Subject: [PATCH 284/582] docs: fix invalid headings (#24000)

PR Close #24000
---
 packages/animations/src/animation_metadata.ts |   4 +-
 packages/core/src/application_ref.ts          |  15 +-
 .../change_detection/change_detector_ref.ts   |   6 +-
 .../differs/iterable_differs.ts               |   5 +-
 .../differs/keyvalue_differs.ts               |   5 +-
 .../src/change_detection/pipe_transform.ts    |   5 +-
 packages/core/src/di/forward_ref.ts           |  10 +-
 packages/core/src/di/injectable.ts            |  20 +-
 packages/core/src/di/injection_token.ts       |  12 +-
 packages/core/src/di/injector.ts              |  16 +-
 packages/core/src/di/metadata.ts              |  89 +--------
 packages/core/src/di/provider.ts              | 180 ++++--------------
 packages/core/src/di/reflective_errors.ts     |   7 +
 packages/core/src/di/reflective_injector.ts   |  26 ++-
 packages/core/src/di/reflective_provider.ts   |  19 +-
 packages/core/src/error_handler.ts            |   5 +-
 packages/core/src/event_emitter.ts            |   3 +
 packages/core/src/i18n/tokens.ts              |   4 +
 packages/core/src/linker/query_list.ts        |   2 +-
 packages/core/src/linker/view_ref.ts          |  15 +-
 packages/core/src/metadata/di.ts              | 108 +++++------
 packages/core/src/metadata/directives.ts      | 155 ++++++---------
 packages/core/src/render3/view_ref.ts         |   4 +
 packages/core/src/zone/ng_zone.ts             |   1 +
 packages/core/testing/src/fake_async.ts       |   6 +-
 .../core/testing/src/fake_async_fallback.ts   |   6 +-
 26 files changed, 255 insertions(+), 473 deletions(-)

diff --git a/packages/animations/src/animation_metadata.ts b/packages/animations/src/animation_metadata.ts
index c2c4afad43..a46524c412 100755
--- a/packages/animations/src/animation_metadata.ts
+++ b/packages/animations/src/animation_metadata.ts
@@ -42,8 +42,8 @@ export declare type AnimateTimings = {
  * @description Options that control animation styling and timing.
  * The following animation functions accept `AnimationOptions` data:
  *
- * - `transition`
- * - `sequence`
+ * - `transition()`
+ * - `sequence()`
  * - `group()`
  * - `query()`
  * - `animation()`
diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts
index ce30069931..2f3beb8622 100644
--- a/packages/core/src/application_ref.ts
+++ b/packages/core/src/application_ref.ts
@@ -180,8 +180,6 @@ export interface BootstrapOptions {
  *
  * A page's platform is initialized implicitly when a platform is created via a platform factory
  * (e.g. {@link platformBrowser}), or explicitly by calling the {@link createPlatform} function.
- *
- *
  */
 @Injectable()
 export class PlatformRef {
@@ -196,7 +194,8 @@ export class PlatformRef {
    * Creates an instance of an `@NgModule` for the given platform
    * for offline compilation.
    *
-   * ## Simple Example
+   * @usageNotes
+   * ### Simple Example
    *
    * ```typescript
    * my_module.ts:
@@ -252,7 +251,8 @@ export class PlatformRef {
   /**
    * Creates an instance of an `@NgModule` for a given platform using the given runtime compiler.
    *
-   * ## Simple Example
+   * @usageNotes
+   * ### Simple Example
    *
    * ```typescript
    * @NgModule({
@@ -358,8 +358,6 @@ function optionsReducer<T extends Object>(dst: any, objs: T | T[]): T {
 
 /**
  * A reference to an Angular application running on a page.
- *
- *
  */
 @Injectable()
 export class ApplicationRef {
@@ -448,14 +446,15 @@ export class ApplicationRef {
   /**
    * Bootstrap a new component at the root level of the application.
    *
+   * @usageNotes
    * ### Bootstrap process
    *
    * When bootstrapping a new root component into an application, Angular mounts the
-   * specified application component onto DOM elements identified by the [componentType]'s
+   * specified application component onto DOM elements identified by the componentType's
    * selector and kicks off automatic change detection to finish initializing the component.
    *
    * Optionally, a component can be mounted onto a DOM element that does not match the
-   * [componentType]'s selector.
+   * componentType's selector.
    *
    * ### Example
    * {@example core/ts/platform/platform.ts region='longform'}
diff --git a/packages/core/src/change_detection/change_detector_ref.ts b/packages/core/src/change_detection/change_detector_ref.ts
index 743f5f66ae..2c50ff96aa 100644
--- a/packages/core/src/change_detection/change_detector_ref.ts
+++ b/packages/core/src/change_detection/change_detector_ref.ts
@@ -16,6 +16,7 @@ export abstract class ChangeDetectorRef {
    *
    * <!-- TODO: Add a link to a chapter on OnPush components -->
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -50,6 +51,7 @@ export abstract class ChangeDetectorRef {
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
    *
+   * @usageNotes
    * ### Example
    *
    * The following example defines a component with a large list of readonly data.
@@ -102,9 +104,8 @@ export abstract class ChangeDetectorRef {
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
    *
-   * ### Example
+   * @usageNotes
    *
-   * The following example defines a component with a large list of readonly data.
    * Imagine, the data changes constantly, many times per second. For performance reasons,
    * we want to check and update the list every five seconds.
    *
@@ -131,6 +132,7 @@ export abstract class ChangeDetectorRef {
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    *
+   * @usageNotes
    * ### Example
    *
    * The following example creates a component displaying `live` data. The component will detach
diff --git a/packages/core/src/change_detection/differs/iterable_differs.ts b/packages/core/src/change_detection/differs/iterable_differs.ts
index c631f42aa0..1c7ede1213 100644
--- a/packages/core/src/change_detection/differs/iterable_differs.ts
+++ b/packages/core/src/change_detection/differs/iterable_differs.ts
@@ -162,12 +162,13 @@ export class IterableDiffers {
    * inherited {@link IterableDiffers} instance with the provided factories and return a new
    * {@link IterableDiffers} instance.
    *
+   * @usageNotes
+   * ### Example
+   *
    * The following example shows how to extend an existing list of factories,
    * which will only be applied to the injector for this component and its children.
    * This step is all that's required to make a new {@link IterableDiffer} available.
    *
-   * ### Example
-   *
    * ```
    * @Component({
    *   viewProviders: [
diff --git a/packages/core/src/change_detection/differs/keyvalue_differs.ts b/packages/core/src/change_detection/differs/keyvalue_differs.ts
index 6a9807c587..47dcaf81b6 100644
--- a/packages/core/src/change_detection/differs/keyvalue_differs.ts
+++ b/packages/core/src/change_detection/differs/keyvalue_differs.ts
@@ -135,12 +135,13 @@ export class KeyValueDiffers {
    * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
    * {@link KeyValueDiffers} instance.
    *
+   * @usageNotes
+   * ### Example
+   *
    * The following example shows how to extend an existing list of factories,
    * which will only be applied to the injector for this component and its children.
    * This step is all that's required to make a new {@link KeyValueDiffer} available.
    *
-   * ### Example
-   *
    * ```
    * @Component({
    *   viewProviders: [
diff --git a/packages/core/src/change_detection/pipe_transform.ts b/packages/core/src/change_detection/pipe_transform.ts
index e835d7f610..740581d6ac 100644
--- a/packages/core/src/change_detection/pipe_transform.ts
+++ b/packages/core/src/change_detection/pipe_transform.ts
@@ -12,10 +12,7 @@
  * Angular invokes the `transform` method with the value of a binding
  * as the first argument, and any parameters as the second argument in list form.
  *
- * ## Syntax
- *
- * `value | pipeName[:arg0[:arg1...]]`
- *
+ * @usageNotes
  * ### Example
  *
  * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
diff --git a/packages/core/src/di/forward_ref.ts b/packages/core/src/di/forward_ref.ts
index 6837df128c..3d9b7f27aa 100644
--- a/packages/core/src/di/forward_ref.ts
+++ b/packages/core/src/di/forward_ref.ts
@@ -14,6 +14,7 @@ import {stringify} from '../util';
 /**
  * An interface that a function passed into {@link forwardRef} has to implement.
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/forward_ref/forward_ref_spec.ts region='forward_ref_fn'}
@@ -25,10 +26,10 @@ export interface ForwardRefFn { (): any; }
  * Allows to refer to references which are not yet defined.
  *
  * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
- * DI is declared,
- * but not yet defined. It is also used when the `token` which we use when creating a query is not
- * yet defined.
+ * DI is declared, but not yet defined. It is also used when the `token` which we use when creating
+ * a query is not yet defined.
  *
+ * @usageNotes
  * ### Example
  * {@example core/di/ts/forward_ref/forward_ref_spec.ts region='forward_ref'}
  * @experimental
@@ -44,11 +45,12 @@ export function forwardRef(forwardRefFn: ForwardRefFn): Type<any> {
  *
  * Acts as the identity function when given a non-forward-ref value.
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/forward_ref/forward_ref_spec.ts region='resolve_forward_ref'}
  *
- * See: {@link forwardRef}
+ * @see `forwardRef`
  * @experimental
  */
 export function resolveForwardRef(type: any): any {
diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
index 581f1d0b6e..d1dacf1033 100644
--- a/packages/core/src/di/injectable.ts
+++ b/packages/core/src/di/injectable.ts
@@ -30,32 +30,23 @@ export type InjectableProvider = ValueSansProvider | ExistingSansProvider |
 
 /**
  * Type of the Injectable decorator / constructor function.
- *
- *
  */
 export interface InjectableDecorator {
   /**
+   * A marker metadata that marks a class as available to `Injector` for creation.
+   *
+   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
+   *
    * @usageNotes
-   * ```
-   * @Injectable()
-   * class Car {}
-   * ```
-   *
-   * @description
-   * A marker metadata that marks a class as available to {@link Injector} for creation.
-   *
-   * For more details, see the ["Dependency Injection Guide"(guide/dependency-injection).
-   *
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='Injectable'}
    *
-   * {@link Injector} will throw an error when trying to instantiate a class that
+   * `Injector` will throw an error when trying to instantiate a class that
    * does not have `@Injectable` marker, as shown in the example below.
    *
    * {@example core/di/ts/metadata_spec.ts region='InjectableThrows'}
    *
-   *
    */
   (): any;
   (options?: {providedIn: Type<any>| 'root' | null}&InjectableProvider): any;
@@ -125,7 +116,6 @@ function preR3InjectableCompile(
 /**
 * Injectable decorator and metadata.
 *
-*
 * @Annotation
 */
 export const Injectable: InjectableDecorator = makeDecorator(
diff --git a/packages/core/src/di/injection_token.ts b/packages/core/src/di/injection_token.ts
index 364e0b9c7b..f33d3a5d48 100644
--- a/packages/core/src/di/injection_token.ts
+++ b/packages/core/src/di/injection_token.ts
@@ -36,16 +36,14 @@ import {InjectableDef, defineInjectable} from './defs';
  * overrides the above behavior and marks the token as belonging to a particular `@NgModule`. As
  * mentioned above, `'root'` is the default value for `providedIn`.
  *
- * ### Example
- *
- * #### Tree-shakeable InjectionToken
- *
- * {@example core/di/ts/injector_spec.ts region='ShakeableInjectionToken'}
- *
- * #### Plain InjectionToken
+ * @usageNotes
+ * ### Basic Example
  *
  * {@example core/di/ts/injector_spec.ts region='InjectionToken'}
  *
+ * ### Tree-shakeable Example
+ *
+ * {@example core/di/ts/injector_spec.ts region='ShakeableInjectionToken'}
  *
  */
 export class InjectionToken<T> {
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index a3d02e1018..712ded66fa 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -43,23 +43,17 @@ export class NullInjector implements Injector {
 }
 
 /**
- * @usageNotes
- * ```
- * const injector: Injector = ...;
- * injector.get(...);
- * ```
- *
- * @description
- *
  * Concrete injectors implement this interface.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/injector_spec.ts region='Injector'}
  *
  * `Injector` returns itself when given `Injector` as a token:
+ *
  * {@example core/di/ts/injector_spec.ts region='injectInjector'}
  *
  *
@@ -92,6 +86,7 @@ export abstract class Injector {
   /**
    * Create a new Injector which is configure using `StaticProvider`s.
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/di/ts/provider_spec.ts region='ConstructorProvider'}
@@ -450,7 +445,10 @@ export function setCurrentInjector(injector: Injector | null | undefined): Injec
  * Injects a token from the currently active injector.
  *
  * This function must be used in the context of a factory function such as one defined for an
- * `InjectionToken`, and will throw an error if not called from such a context. For example:
+ * `InjectionToken`, and will throw an error if not called from such a context.
+ *
+ * @usageNotes
+ * ### Example
  *
  * {@example core/di/ts/injector_spec.ts region='ShakeableInjectionToken'}
  *
diff --git a/packages/core/src/di/metadata.ts b/packages/core/src/di/metadata.ts
index 32ec55cbfd..ac10a47402 100644
--- a/packages/core/src/di/metadata.ts
+++ b/packages/core/src/di/metadata.ts
@@ -15,36 +15,24 @@ import {EMPTY_ARRAY} from '../view/util';
 
 /**
  * Type of the Inject decorator / constructor function.
- *
- *
  */
 export interface InjectDecorator {
   /**
-   * @usageNotes
-   * ```
-   * @Injectable()
-   * class Car {
-   *   constructor(@Inject("MyEngine") public engine:Engine) {}
-   * }
-   * ```
-   *
-   * @description
    * A parameter decorator that specifies a dependency.
    *
    * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='Inject'}
    *
-   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the
+   * When `@Inject()` is not present, `Injector` will use the type annotation of the
    * parameter.
    *
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='InjectWithoutDecorator'}
-   *
-   *
    */
   (token: any): any;
   new (token: any): Inject;
@@ -52,15 +40,12 @@ export interface InjectDecorator {
 
 /**
  * Type of the Inject metadata.
- *
- *
  */
 export interface Inject { token: any; }
 
 /**
  * Inject decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Inject: InjectDecorator = makeParamDecorator('Inject', (token: any) => ({token}));
@@ -68,30 +53,18 @@ export const Inject: InjectDecorator = makeParamDecorator('Inject', (token: any)
 
 /**
  * Type of the Optional decorator / constructor function.
- *
- *
  */
 export interface OptionalDecorator {
   /**
-   * @usageNotes
-   * ```
-   * @Injectable()
-   * class Car {
-   *   constructor(@Optional() public engine:Engine) {}
-   * }
-   * ```
-   *
-   * @description
    * A parameter metadata that marks a dependency as optional.
-   * {@link Injector} provides `null` if the dependency is not found.
+   * `Injector` provides `null` if the dependency is not found.
    *
    * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='Optional'}
-   *
-   *
    */
   (): any;
   new (): Optional;
@@ -99,44 +72,29 @@ export interface OptionalDecorator {
 
 /**
  * Type of the Optional metadata.
- *
- *
  */
 export interface Optional {}
 
 /**
  * Optional decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Optional: OptionalDecorator = makeParamDecorator('Optional');
 
 /**
  * Type of the Self decorator / constructor function.
- *
- *
  */
 export interface SelfDecorator {
   /**
-   * @usageNotes
-   * ```
-   * @Injectable()
-   * class Car {
-   *   constructor(@Self() public engine:Engine) {}
-   * }
-   * ```
-   *
-   * @description
-   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * Specifies that an `Injector` should retrieve a dependency only from itself.
    *
    * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='Self'}
-   *
-   *
    */
   (): any;
   new (): Self;
@@ -144,15 +102,12 @@ export interface SelfDecorator {
 
 /**
  * Type of the Self metadata.
- *
- *
  */
 export interface Self {}
 
 /**
  * Self decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Self: SelfDecorator = makeParamDecorator('Self');
@@ -160,29 +115,17 @@ export const Self: SelfDecorator = makeParamDecorator('Self');
 
 /**
  * Type of the SkipSelf decorator / constructor function.
- *
- *
  */
 export interface SkipSelfDecorator {
   /**
-   * @usageNotes
-   * ```
-   * @Injectable()
-   * class Car {
-   *   constructor(@SkipSelf() public engine:Engine) {}
-   * }
-   * ```
-   *
-   * @description
    * Specifies that the dependency resolution should start from the parent injector.
    *
    * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='SkipSelf'}
-   *
-   *
    */
   (): any;
   new (): SkipSelf;
@@ -198,37 +141,24 @@ export interface SkipSelf {}
 /**
  * SkipSelf decorator and metadata.
  *
- *
  * @Annotation
  */
 export const SkipSelf: SkipSelfDecorator = makeParamDecorator('SkipSelf');
 
 /**
  * Type of the Host decorator / constructor function.
- *
- *
  */
 export interface HostDecorator {
   /**
-   * @usageNotes
-   * ```
-   * @Injectable()
-   * class Car {
-   *   constructor(@Host() public engine:Engine) {}
-   * }
-   * ```
-   *
-   * @description
    * Specifies that an injector should retrieve a dependency from any injector until
    * reaching the host element of the current component.
    *
    * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/di/ts/metadata_spec.ts region='Host'}
-   *
-   *
    */
   (): any;
   new (): Host;
@@ -236,15 +166,12 @@ export interface HostDecorator {
 
 /**
  * Type of the Host metadata.
- *
- *
  */
 export interface Host {}
 
 /**
  * Host decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Host: HostDecorator = makeParamDecorator('Host');
diff --git a/packages/core/src/di/provider.ts b/packages/core/src/di/provider.ts
index bb956dc81b..635af80b6c 100644
--- a/packages/core/src/di/provider.ts
+++ b/packages/core/src/di/provider.ts
@@ -9,17 +9,11 @@
 import {Type} from '../type';
 
 /**
- * @usageNotes
- * ```
- * @Injectable(SomeModule, {useValue: 'someValue'})
- * class SomeClass {}
- * ```
- *
- * @description
  * Configures the `Injector` to return a value for a token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ValueSansProvider'}
@@ -34,21 +28,18 @@ export interface ValueSansProvider {
 }
 
 /**
- * @usageNotes
- * ```
- * const provider: ValueProvider = {provide: 'someToken', useValue: 'someValue'};
- * ```
- *
- * @description
  * Configures the `Injector` to return a value for a token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ValueProvider'}
  *
+ * ### Multi-value example
  *
+ * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
  */
 export interface ValueProvider extends ValueSansProvider {
   /**
@@ -59,26 +50,16 @@ export interface ValueProvider extends ValueSansProvider {
   /**
    * If true, then injector returns an array of instances. This is useful to allow multiple
    * providers spread across many files to provide configuration information to a common token.
-   *
-   * ### Example
-   *
-   * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
    */
   multi?: boolean;
 }
 
 /**
- * @usageNotes
- * ```
- * @Injectable(SomeModule, {useClass: MyService, deps: []})
- * class MyService {}
- * ```
- *
- * @description
  * Configures the `Injector` to return an instance of `useClass` for a token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='StaticClassSansProvider'}
@@ -100,27 +81,22 @@ export interface StaticClassSansProvider {
 }
 
 /**
- * @usageNotes
- * ```
- * @Injectable()
- * class MyService {}
- *
- * const provider: ClassProvider = {provide: 'someToken', useClass: MyService, deps: []};
- * ```
- *
- * @description
  * Configures the `Injector` to return an instance of `useClass` for a token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='StaticClassProvider'}
  *
  * Note that following two providers are not equal:
+ *
  * {@example core/di/ts/provider_spec.ts region='StaticClassProviderDifference'}
  *
+ * ### Multi-value example
  *
+ * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
  */
 export interface StaticClassProvider extends StaticClassSansProvider {
   /**
@@ -131,26 +107,23 @@ export interface StaticClassProvider extends StaticClassSansProvider {
   /**
    * If true, then injector returns an array of instances. This is useful to allow multiple
    * providers spread across many files to provide configuration information to a common token.
-   *
-   * ### Example
-   *
-   * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
    */
   multi?: boolean;
 }
 
 /**
+ * Configures the `Injector` to return an instance of a token.
+ *
+ * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
+ *
  * @usageNotes
+ * ### Example
+ *
  * ```
  * @Injectable(SomeModule, {deps: []})
  * class MyService {}
  * ```
  *
- * @description
- * Configures the `Injector` to return an instance of a token.
- *
- * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
- *
  * @experimental
  */
 export interface ConstructorSansProvider {
@@ -162,24 +135,18 @@ export interface ConstructorSansProvider {
 }
 
 /**
- * @usageNotes
- * ```
- * @Injectable()
- * class MyService {}
- *
- * const provider: ClassProvider = {provide: MyClass, deps: []};
- * ```
- *
- * @description
  * Configures the `Injector` to return an instance of a token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ConstructorProvider'}
  *
+ * ### Multi-value example
  *
+ * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
  */
 export interface ConstructorProvider extends ConstructorSansProvider {
   /**
@@ -190,31 +157,19 @@ export interface ConstructorProvider extends ConstructorSansProvider {
   /**
    * If true, then injector returns an array of instances. This is useful to allow multiple
    * providers spread across many files to provide configuration information to a common token.
-   *
-   * ### Example
-   *
-   * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
    */
   multi?: boolean;
 }
 
 /**
- * @usageNotes
- * ```
- * @Injectable(SomeModule, {useExisting: 'someOtherToken'})
- * class SomeClass {}
- * ```
- *
- * @description
  * Configures the `Injector` to return a value of another `useExisting` token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ExistingSansProvider'}
- *
- *
  */
 export interface ExistingSansProvider {
   /**
@@ -224,21 +179,18 @@ export interface ExistingSansProvider {
 }
 
 /**
- * @usageNotes
- * ```
- * const provider: ExistingProvider = {provide: 'someToken', useExisting: 'someOtherToken'};
- * ```
- *
- * @description
  * Configures the `Injector` to return a value of another `useExisting` token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ExistingProvider'}
  *
+ * ### Multi-value example
  *
+ * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
  */
 export interface ExistingProvider extends ExistingSansProvider {
   /**
@@ -249,34 +201,22 @@ export interface ExistingProvider extends ExistingSansProvider {
   /**
    * If true, then injector returns an array of instances. This is useful to allow multiple
    * providers spread across many files to provide configuration information to a common token.
-   *
-   * ### Example
-   *
-   * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
    */
   multi?: boolean;
 }
 
 /**
- * @usageNotes
- * ```
- * function serviceFactory() { ... }
- *
- * @Injectable(SomeModule, {useFactory: serviceFactory, deps: []})
- * class SomeClass {}
- * ```
- *
- * @description
  * Configures the `Injector` to return a value by invoking a `useFactory` function.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='FactorySansProvider'}
  *
  * @experimental
-   */
+ */
 export interface FactorySansProvider {
   /**
    * A function to invoke to create a value for this `token`. The function is invoked with
@@ -292,26 +232,22 @@ export interface FactorySansProvider {
 }
 
 /**
- * @usageNotes
- * ```
- * function serviceFactory() { ... }
- *
- * const provider: FactoryProvider = {provide: 'someToken', useFactory: serviceFactory, deps: []};
- * ```
- *
- * @description
  * Configures the `Injector` to return a value by invoking a `useFactory` function.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='FactoryProvider'}
  *
  * Dependencies can also be marked as optional:
+ *
  * {@example core/di/ts/provider_spec.ts region='FactoryProviderOptionalDeps'}
  *
+ * ### Multi-value example
  *
+ * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
  */
 export interface FactoryProvider extends FactorySansProvider {
   /**
@@ -322,39 +258,24 @@ export interface FactoryProvider extends FactorySansProvider {
   /**
    * If true, then injector returns an array of instances. This is useful to allow multiple
    * providers spread across many files to provide configuration information to a common token.
-   *
-   * ### Example
-   *
-   * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
    */
   multi?: boolean;
 }
 
 /**
- * @usageNotes
- * See {@link ValueProvider}, {@link ExistingProvider}, {@link FactoryProvider}.
- *
- * @description
  * Describes how the `Injector` should be configured in a static way (Without reflection).
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
- *
+ * @see `ValueProvider`
+ * @see `ExistingProvider`
+ * @see `FactoryProvider`
  */
 export type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvider |
     ConstructorProvider | FactoryProvider | any[];
 
 
 /**
- * @usageNotes
- * ```
- * @Injectable()
- * class MyService {}
- *
- * const provider: TypeProvider = MyService;
- * ```
- *
- * @description
  * Configures the `Injector` to return an instance of `Type` when `Type' is used as the token.
  *
  * Create an instance by invoking the `new` operator and supplying additional arguments.
@@ -362,29 +283,19 @@ export type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvi
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='TypeProvider'}
- *
- *
  */
 export interface TypeProvider extends Type<any> {}
 
 /**
- * @usageNotes
- * ```
- *
- * class SomeClassImpl {}
- *
- * @Injectable(SomeModule, {useClass: SomeClassImpl})
- * class SomeClass {}
- * ```
- *
- * @description
  * Configures the `Injector` to return a value by invoking a `useClass` function.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ClassSansProvider'}
@@ -399,27 +310,22 @@ export interface ClassSansProvider {
 }
 
 /**
- * @usageNotes
- * ```
- * @Injectable()
- * class MyService {}
- *
- * const provider: ClassProvider = {provide: 'someToken', useClass: MyService};
- * ```
- *
- * @description
  * Configures the `Injector` to return an instance of `useClass` for a token.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
+ * @usageNotes
  * ### Example
  *
  * {@example core/di/ts/provider_spec.ts region='ClassProvider'}
  *
  * Note that following two providers are not equal:
+ *
  * {@example core/di/ts/provider_spec.ts region='ClassProviderDifference'}
  *
+ * ### Multi-value example
  *
+ * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
  */
 export interface ClassProvider extends ClassSansProvider {
   /**
@@ -430,24 +336,18 @@ export interface ClassProvider extends ClassSansProvider {
   /**
    * If true, then injector returns an array of instances. This is useful to allow multiple
    * providers spread across many files to provide configuration information to a common token.
-   *
-   * ### Example
-   *
-   * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
    */
   multi?: boolean;
 }
 
 /**
- * @usageNotes
- * See {@link TypeProvider}, {@link ClassProvider}, {@link StaticProvider}.
- *
- * @description
  * Describes how the `Injector` should be configured.
  *
  * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
  *
- *
+ * @see `TypeProvider`
+ * @see `ClassProvider`
+ * @see `StaticProvider`
  */
 export type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider |
     ExistingProvider | FactoryProvider | any[];
diff --git a/packages/core/src/di/reflective_errors.ts b/packages/core/src/di/reflective_errors.ts
index 7351ebb99a..c88ffa441d 100644
--- a/packages/core/src/di/reflective_errors.ts
+++ b/packages/core/src/di/reflective_errors.ts
@@ -70,6 +70,7 @@ function addKey(this: InjectionError, injector: ReflectiveInjector, key: Reflect
  * Thrown when trying to retrieve a dependency by key from {@link Injector}, but the
  * {@link Injector} does not have a {@link Provider} for the given key.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -90,6 +91,7 @@ export function noProviderError(injector: ReflectiveInjector, key: ReflectiveKey
 /**
  * Thrown when dependencies form a cycle.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -116,6 +118,7 @@ export function cyclicDependencyError(
  * The `InstantiationError` class contains the original error plus the dependency graph which caused
  * this object to be instantiated.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -149,6 +152,7 @@ export function instantiationError(
  * Thrown when an object other then {@link Provider} (or `Type`) is passed to {@link Injector}
  * creation.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -166,6 +170,7 @@ export function invalidProviderError(provider: any) {
  * Lack of annotation information prevents the {@link Injector} from determining which dependencies
  * need to be injected into the constructor.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -209,6 +214,7 @@ export function noAnnotationError(typeOrFunc: Type<any>| Function, params: any[]
 /**
  * Thrown when getting an object by index.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -228,6 +234,7 @@ export function outOfBoundsError(index: number) {
 /**
  * Thrown when a multi provider and a regular provider are bound to the same token.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
diff --git a/packages/core/src/di/reflective_injector.ts b/packages/core/src/di/reflective_injector.ts
index d7784cb38e..f11781f060 100644
--- a/packages/core/src/di/reflective_injector.ts
+++ b/packages/core/src/di/reflective_injector.ts
@@ -26,6 +26,7 @@ const UNDEFINED = new Object();
  * In typical use, application code asks for the dependencies in the constructor and they are
  * resolved by the `Injector`.
  *
+ * @usageNotes
  * ### Example
  *
  * The following example creates an `Injector` configured to create `Engine` and `Car`.
@@ -56,8 +57,9 @@ export abstract class ReflectiveInjector implements Injector {
    * Turns an array of provider definitions into an array of resolved providers.
    *
    * A resolution is a process of flattening multiple nested arrays and converting individual
-   * providers into an array of {@link ResolvedReflectiveProvider}s.
+   * providers into an array of `ResolvedReflectiveProvider`s.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -83,7 +85,6 @@ export abstract class ReflectiveInjector implements Injector {
    * });
    * ```
    *
-   * See {@link ReflectiveInjector#fromResolvedProviders fromResolvedProviders} for more info.
    */
   static resolve(providers: Provider[]): ResolvedReflectiveProvider[] {
     return resolveReflectiveProviders(providers);
@@ -92,9 +93,10 @@ export abstract class ReflectiveInjector implements Injector {
   /**
    * Resolves an array of providers and creates an injector from those providers.
    *
-   * The passed-in providers can be an array of `Type`, {@link Provider},
+   * The passed-in providers can be an array of `Type`, `Provider`,
    * or a recursive array of more providers.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -110,11 +112,6 @@ export abstract class ReflectiveInjector implements Injector {
    * var injector = ReflectiveInjector.resolveAndCreate([Car, Engine]);
    * expect(injector.get(Car) instanceof Car).toBe(true);
    * ```
-   *
-   * This function is slower than the corresponding `fromResolvedProviders`
-   * because it needs to resolve the passed-in providers first.
-   * See {@link ReflectiveInjector#resolve resolve} and
-   * {@link ReflectiveInjector#fromResolvedProviders fromResolvedProviders}.
    */
   static resolveAndCreate(providers: Provider[], parent?: Injector): ReflectiveInjector {
     const ResolvedReflectiveProviders = ReflectiveInjector.resolve(providers);
@@ -126,6 +123,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * This API is the recommended way to construct injectors in performance-sensitive parts.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -156,6 +154,7 @@ export abstract class ReflectiveInjector implements Injector {
    * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
    * -->
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -172,9 +171,10 @@ export abstract class ReflectiveInjector implements Injector {
    * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
    * -->
    *
-   * The passed-in providers can be an array of `Type`, {@link Provider},
+   * The passed-in providers can be an array of `Type`, `Provider`,
    * or a recursive array of more providers.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -188,11 +188,6 @@ export abstract class ReflectiveInjector implements Injector {
    * expect(child.get(ChildProvider) instanceof ChildProvider).toBe(true);
    * expect(child.get(ParentProvider)).toBe(parent.get(ParentProvider));
    * ```
-   *
-   * This function is slower than the corresponding `createChildFromResolved`
-   * because it needs to resolve the passed-in providers first.
-   * See {@link ReflectiveInjector#resolve resolve} and
-   * {@link ReflectiveInjector#createChildFromResolved createChildFromResolved}.
    */
   abstract resolveAndCreateChild(providers: Provider[]): ReflectiveInjector;
 
@@ -204,6 +199,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * This API is the recommended way to construct injectors in performance-sensitive parts.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -228,6 +224,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * The created object does not get cached by the injector.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -254,6 +251,7 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * The created object does not get cached by the injector.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
diff --git a/packages/core/src/di/reflective_provider.ts b/packages/core/src/di/reflective_provider.ts
index f66bc9a02e..6d95966ddc 100644
--- a/packages/core/src/di/reflective_provider.ts
+++ b/packages/core/src/di/reflective_provider.ts
@@ -36,9 +36,10 @@ export class ReflectiveDependency {
 const _EMPTY_LIST: any[] = [];
 
 /**
- * An internal resolved representation of a {@link Provider} used by the {@link Injector}.
+ * An internal resolved representation of a `Provider` used by the `Injector`.
  *
- * It is usually created automatically by `Injector.resolveAndCreate`.
+ * @usageNotes
+ * This is usually created automatically by `Injector.resolveAndCreate`.
  *
  * It can be created manually, as follows:
  *
@@ -81,8 +82,7 @@ export class ResolvedReflectiveProvider_ implements ResolvedReflectiveProvider {
 }
 
 /**
- * An internal resolved representation of a factory function created by resolving {@link
- * Provider}.
+ * An internal resolved representation of a factory function created by resolving `Provider`.
  * @experimental
  */
 export class ResolvedReflectiveFactory {
@@ -123,10 +123,10 @@ function resolveReflectiveFactory(provider: NormalizedProvider): ResolvedReflect
 }
 
 /**
- * Converts the {@link Provider} into {@link ResolvedProvider}.
+ * Converts the `Provider` into `ResolvedProvider`.
  *
- * {@link Injector} internally only uses {@link ResolvedProvider}, {@link Provider} contains
- * convenience provider syntax.
+ * `Injector` internally only uses `ResolvedProvider`, `Provider` contains convenience provider
+ * syntax.
  */
 function resolveReflectiveProvider(provider: NormalizedProvider): ResolvedReflectiveProvider {
   return new ResolvedReflectiveProvider_(
@@ -145,9 +145,8 @@ export function resolveReflectiveProviders(providers: Provider[]): ResolvedRefle
 }
 
 /**
- * Merges a list of ResolvedProviders into a list where
- * each key is contained exactly once and multi providers
- * have been merged.
+ * Merges a list of ResolvedProviders into a list where each key is contained exactly once and
+ * multi providers have been merged.
  */
 export function mergeResolvedReflectiveProviders(
     providers: ResolvedReflectiveProvider[],
diff --git a/packages/core/src/error_handler.ts b/packages/core/src/error_handler.ts
index 62f17e84d3..da2b8af72c 100644
--- a/packages/core/src/error_handler.ts
+++ b/packages/core/src/error_handler.ts
@@ -11,14 +11,13 @@ import {ERROR_ORIGINAL_ERROR, getDebugContext, getErrorLogger, getOriginalError}
 
 
 /**
- *
- * @description
  * Provides a hook for centralized exception handling.
  *
  * The default implementation of `ErrorHandler` prints error messages to the `console`. To
  * intercept error handling, write a custom exception handler that replaces this default as
  * appropriate for your app.
  *
+ * @usageNotes
  * ### Example
  *
  * ```
@@ -33,8 +32,6 @@ import {ERROR_ORIGINAL_ERROR, getDebugContext, getErrorLogger, getOriginalError}
  * })
  * class MyModule {}
  * ```
- *
- *
  */
 export class ErrorHandler {
   /**
diff --git a/packages/core/src/event_emitter.ts b/packages/core/src/event_emitter.ts
index bd46970b5c..582bb61fb6 100644
--- a/packages/core/src/event_emitter.ts
+++ b/packages/core/src/event_emitter.ts
@@ -11,6 +11,7 @@ import {Subject, Subscription} from 'rxjs';
 /**
  * Use by directives and components to emit custom Events.
  *
+ * @usageNotes
  * ### Examples
  *
  * In the following example, `Zippy` alternatively emits `open` and `close` events when its
@@ -49,6 +50,8 @@ import {Subject, Subscription} from 'rxjs';
  * <zippy (open)="onOpen($event)" (close)="onClose($event)"></zippy>
  * ```
  *
+ * ### Notes
+ *
  * Uses Rx.Observable but provides an adapter to make it work as specified here:
  * https://github.com/jhusain/observable-spec
  *
diff --git a/packages/core/src/i18n/tokens.ts b/packages/core/src/i18n/tokens.ts
index 55786e6db2..8565414028 100644
--- a/packages/core/src/i18n/tokens.ts
+++ b/packages/core/src/i18n/tokens.ts
@@ -15,6 +15,7 @@ import {InjectionToken} from '../di/injection_token';
  *
  * See the [i18n guide](guide/i18n#setting-up-locale) for more information.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -37,6 +38,7 @@ export const LOCALE_ID = new InjectionToken<string>('LocaleId');
  *
  * See the [i18n guide](guide/i18n#merge) for more information.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -62,6 +64,7 @@ export const TRANSLATIONS = new InjectionToken<string>('Translations');
  *
  * See the [i18n guide](guide/i18n#merge) for more information.
  *
+ * @usageNotes
  * ### Example
  *
  * ```typescript
@@ -87,6 +90,7 @@ export const TRANSLATIONS_FORMAT = new InjectionToken<string>('TranslationsForma
  *
  * See the [i18n guide](guide/i18n#missing-translation) for more information.
  *
+ * @usageNotes
  * ### Example
  * ```typescript
  * import { MissingTranslationStrategy } from '@angular/core';
diff --git a/packages/core/src/linker/query_list.ts b/packages/core/src/linker/query_list.ts
index dc72fd1588..eeb0026a16 100644
--- a/packages/core/src/linker/query_list.ts
+++ b/packages/core/src/linker/query_list.ts
@@ -27,6 +27,7 @@ import {getSymbolIterator} from '../util';
  *
  * NOTE: In the future this class will implement an `Observable` interface.
  *
+ * @usageNotes
  * ### Example
  * ```typescript
  * @Component({...})
@@ -34,7 +35,6 @@ import {getSymbolIterator} from '../util';
  *   @ViewChildren(Item) items:QueryList<Item>;
  * }
  * ```
- *
  */
 export class QueryList<T>/* implements Iterable<T> */ {
   public readonly dirty = true;
diff --git a/packages/core/src/linker/view_ref.ts b/packages/core/src/linker/view_ref.ts
index 47b721a5d8..ffeb9be846 100644
--- a/packages/core/src/linker/view_ref.ts
+++ b/packages/core/src/linker/view_ref.ts
@@ -29,9 +29,10 @@ export abstract class ViewRef extends ChangeDetectorRef {
  *
  * Properties of elements in a View can change, but the structure (number and order) of elements in
  * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
- * removing nested Views via a {@link ViewContainerRef}. Each View can contain many View Containers.
+ * removing nested Views via a `ViewContainerRef`. Each View can contain many View Containers.
  * <!-- /TODO -->
  *
+ * @usageNotes
  * ### Example
  *
  * Given this template...
@@ -43,9 +44,10 @@ export abstract class ViewRef extends ChangeDetectorRef {
  * </ul>
  * ```
  *
- * We have two {@link TemplateRef}s:
+ * We have two `TemplateRef`s:
+ *
+ * Outer `TemplateRef`:
  *
- * Outer {@link TemplateRef}:
  * ```
  * Count: {{items.length}}
  * <ul>
@@ -53,14 +55,15 @@ export abstract class ViewRef extends ChangeDetectorRef {
  * </ul>
  * ```
  *
- * Inner {@link TemplateRef}:
+ * Inner `TemplateRef`:
+ *
  * ```
  *   <li>{{item}}</li>
  * ```
  *
- * Notice that the original template is broken down into two separate {@link TemplateRef}s.
+ * Notice that the original template is broken down into two separate `TemplateRef`s.
  *
- * The outer/inner {@link TemplateRef}s are then assembled into views like so:
+ * The outer/inner `TemplateRef`s are then assembled into views like so:
  *
  * ```
  * <!-- ViewRef: outer-0 -->
diff --git a/packages/core/src/metadata/di.ts b/packages/core/src/metadata/di.ts
index fff3ae60e1..d25a9a52fa 100644
--- a/packages/core/src/metadata/di.ts
+++ b/packages/core/src/metadata/di.ts
@@ -16,6 +16,7 @@ import {makeParamDecorator, makePropDecorator} from '../util/decorators';
  * All components that are referenced in the `useValue` value (either directly
  * or in a nested array or map) will be added to the `entryComponents` property.
  *
+ * @usageNotes
  * ### Example
  * The following example shows how the router can populate the `entryComponents`
  * field of an NgModule based on the router configuration which refers
@@ -57,6 +58,7 @@ export interface AttributeDecorator {
    *
    * The directive can inject constant string literals of host element attributes.
    *
+   * @usageNotes
    * ### Example
    *
    * Suppose we have an `<input>` element and want to know its `type`.
@@ -103,7 +105,6 @@ export interface Attribute { attributeName?: string; }
 /**
  * Attribute decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Attribute: AttributeDecorator =
@@ -111,8 +112,6 @@ export const Attribute: AttributeDecorator =
 
 /**
  * Type of the Query metadata.
- *
- *
  */
 export interface Query {
   descendants: boolean;
@@ -125,34 +124,25 @@ export interface Query {
 /**
  * Base class for query metadata.
  *
- * See {@link ContentChildren}, {@link ContentChild}, {@link ViewChildren}, {@link ViewChild} for
- * more information.
- *
- *
+ * @see `ContentChildren`.
+ * @see `ContentChild`.
+ * @see `ViewChildren`.
+ * @see `ViewChild`.
  */
 export abstract class Query {}
 
 /**
  * Type of the ContentChildren decorator / constructor function.
  *
- * See {@link ContentChildren}.
- *
- *
+ * @see `ContentChildren`.
  */
 export interface ContentChildrenDecorator {
   /**
-   *
-   * @usageNotes
-   *
-   * {@example core/di/ts/contentChildren/content_children_howto.ts region='HowTo'}
-   *
-   * @description
    * Configures a content query.
    *
-   * You can use ContentChildren to get the {@link QueryList} of elements or directives from the
+   * You can use ContentChildren to get the `QueryList` of elements or directives from the
    * content DOM. Any time a child element is added, removed, or moved, the query list will be
-   * updated,
-   * and the changes observable of the query list will emit a new value.
+   * updated, and the changes observable of the query list will emit a new value.
    *
    * Content queries are set before the `ngAfterContentInit` callback is called.
    *
@@ -162,13 +152,20 @@ export interface ContentChildrenDecorator {
    * * **descendants** - include only direct children or all descendants.
    * * **read** - read a different token from the queried elements.
    *
-   * Let's look at an example:
+   * @usageNotes
+   * ### Basic Example
+   *
+   * Here is a simple demonstration of how the `ContentChildren` decorator can be used.
+   *
+   * {@example core/di/ts/contentChildren/content_children_howto.ts region='HowTo'}
+   *
+   * ### Tab-pane Example
+   *
+   * Here is a slightly more realistic example that shows how `ContentChildren` decorators
+   * can be used to implement a tab pane component.
    *
    * {@example core/di/ts/contentChildren/content_children_example.ts region='Component'}
    *
-   * **npm package**: `@angular/core`
-   *
-   *
    * @Annotation
    */
   (selector: Type<any>|Function|string, opts?: {descendants?: boolean, read?: any}): any;
@@ -203,12 +200,6 @@ export const ContentChildren: ContentChildrenDecorator = makePropDecorator(
  */
 export interface ContentChildDecorator {
   /**
-   *
-   * @usageNotes
-   *
-   * {@example core/di/ts/contentChild/content_child_howto.ts region='HowTo'}
-   *
-   * @description
    * Configures a content query.
    *
    * You can use ContentChild to get the first element or the directive matching the selector from
@@ -222,13 +213,15 @@ export interface ContentChildDecorator {
    * * **selector** - the directive type or the name used for querying.
    * * **read** - read a different token from the queried element.
    *
-   * Let's look at an example:
+   * @usageNotes
+   * ### Example
+   *
+   * {@example core/di/ts/contentChild/content_child_howto.ts region='HowTo'}
+   *
+   * ### Example
    *
    * {@example core/di/ts/contentChild/content_child_example.ts region='Component'}
    *
-   * **npm package**: `@angular/core`
-   *
-   *
    * @Annotation
    */
   (selector: Type<any>|Function|string, opts?: {read?: any}): any;
@@ -238,7 +231,7 @@ export interface ContentChildDecorator {
 /**
  * Type of the ContentChild metadata.
  *
- * See {@link ContentChild}.
+ * @see `ContentChild`.
  *
  *
  */
@@ -258,21 +251,15 @@ export const ContentChild: ContentChildDecorator = makePropDecorator(
 /**
  * Type of the ViewChildren decorator / constructor function.
  *
- * See {@link ViewChildren}.
+ * @see `ViewChildren`.
  *
  *
  */
 export interface ViewChildrenDecorator {
   /**
-   *
-   * @usageNotes
-   *
-   * {@example core/di/ts/viewChildren/view_children_howto.ts region='HowTo'}
-   *
-   * @description
    * Configures a view query.
    *
-   * You can use ViewChildren to get the {@link QueryList} of elements or directives from the
+   * You can use ViewChildren to get the `QueryList` of elements or directives from the
    * view DOM. Any time a child element is added, removed, or moved, the query list will be updated,
    * and the changes observable of the query list will emit a new value.
    *
@@ -283,13 +270,16 @@ export interface ViewChildrenDecorator {
    * * **selector** - the directive type or the name used for querying.
    * * **read** - read a different token from the queried elements.
    *
-   * Let's look at an example:
+   * @usageNotes
+   *
+   * ### Example
+   *
+   * {@example core/di/ts/viewChildren/view_children_howto.ts region='HowTo'}
+   *
+   * ### Example
    *
    * {@example core/di/ts/viewChildren/view_children_example.ts region='Component'}
    *
-   * **npm package**: `@angular/core`
-   *
-   *
    * @Annotation
    */
   (selector: Type<any>|Function|string, opts?: {read?: any}): any;
@@ -298,15 +288,12 @@ export interface ViewChildrenDecorator {
 
 /**
  * Type of the ViewChildren metadata.
- *
- *
  */
 export type ViewChildren = Query;
 
 /**
  * ViewChildren decorator and metadata.
  *
- *
  * @Annotation
  */
 export const ViewChildren: ViewChildrenDecorator = makePropDecorator(
@@ -317,17 +304,10 @@ export const ViewChildren: ViewChildrenDecorator = makePropDecorator(
 /**
  * Type of the ViewChild decorator / constructor function.
  *
- * See {@link ViewChild}
- *
- *
+ * @see `ViewChild`.
  */
 export interface ViewChildDecorator {
   /**
-   *
-   * @usageNotes
-   *
-   * {@example core/di/ts/viewChild/view_child_howto.ts region='HowTo'}
-   *
    * @description
    * Configures a view query.
    *
@@ -342,11 +322,16 @@ export interface ViewChildDecorator {
    * * **selector** - the directive type or the name used for querying.
    * * **read** - read a different token from the queried elements.
    *
+   * @usageNotes
+   *
+   * ### Example
+   *
+   * {@example core/di/ts/viewChild/view_child_howto.ts region='HowTo'}
+   *
+   * ### Example
+   *
    * {@example core/di/ts/viewChild/view_child_example.ts region='Component'}
    *
-   * **npm package**: `@angular/core`
-   *
-   *
    * @Annotation
    */
   (selector: Type<any>|Function|string, opts?: {read?: any}): any;
@@ -355,15 +340,12 @@ export interface ViewChildDecorator {
 
 /**
  * Type of the ViewChild metadata.
- *
- *
  */
 export type ViewChild = Query;
 
 /**
  * ViewChild decorator and metadata.
  *
- *
  * @Annotation
  */
 export const ViewChild: ViewChildDecorator = makePropDecorator(
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index afe89547fa..711c1855a4 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -16,25 +16,9 @@ import {ViewEncapsulation} from './view';
 
 /**
  * Type of the Directive decorator / constructor function.
- *
- *
  */
 export interface DirectiveDecorator {
   /**
-   * @usageNotes
-   *
-   * ```
-   * import {Directive} from '@angular/core';
-   *
-   * @Directive({
-   *   selector: 'my-directive',
-   * })
-   * export class MyDirective {
-   * }
-   * ```
-   *
-   * @description
-   *
    * Marks a class as an Angular directive and collects directive configuration
    * metadata.
    *
@@ -65,13 +49,24 @@ export interface DirectiveDecorator {
    * * **queries** -  configure queries that can be injected into the component
    * * **selector** - css selector that identifies this component in a template
    *
+   * @usageNotes
+   *
+   * ```
+   * import {Directive} from '@angular/core';
+   *
+   * @Directive({
+   *   selector: 'my-directive',
+   * })
+   * export class MyDirective {
+   * }
+   * ```
    *
    * @Annotation
    */
   (obj: Directive): TypeDecorator;
 
   /**
-   * See the {@link Directive} decorator.
+   * See the `Directive` decorator.
    */
   new (obj: Directive): Directive;
 }
@@ -92,7 +87,7 @@ export interface Directive {
    * - `:not(sub_selector)`: select only if the element does not match the `sub_selector`.
    * - `selector1, selector2`: select if either `selector1` or `selector2` matches.
    *
-   *
+   * @usageNotes
    * ### Example
    *
    * Suppose we have a directive with an `input[type=text]` selector.
@@ -124,6 +119,7 @@ export interface Directive {
    *
    * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
    *
+   * @usageNotes
    * ### Example
    *
    * The following example creates a component with two data-bound properties.
@@ -153,7 +149,6 @@ export interface Directive {
    * })
    * class App {}
    * ```
-   *
    */
   inputs?: string[];
 
@@ -169,6 +164,7 @@ export interface Directive {
    * - `directiveProperty` specifies the component property that emits events.
    * - `bindingProperty` specifies the DOM property the event handler is attached to.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -198,14 +194,17 @@ export interface Directive {
    *   everyFiveSeconds() { console.log('five seconds'); }
    * }
    * ```
-   *
    */
   outputs?: string[];
 
   /**
    * Specify the events, actions, properties and attributes related to the host element.
    *
-   * ## Host Listeners
+   * @usageNotes
+   * The key corresponds to the name of the event, property or attribute on the host to
+   * bind. The value is formatted differently depending upon the type of the binding.
+   *
+   * ### Host Listeners
    *
    * Specifies which DOM events a directive listens to via a set of `(event)` to `method`
    * key-value pairs:
@@ -220,8 +219,6 @@ export interface Directive {
    *
    * When writing a directive event binding, you can also refer to the $event local variable.
    *
-   * ### Example
-   *
    * The following example declares a directive that attaches a click listener to the button and
    * counts clicks.
    *
@@ -247,15 +244,13 @@ export interface Directive {
    * class App {}
    * ```
    *
-   * ## Host Property Bindings
+   * ### Host Property Bindings
    *
    * Specifies which DOM properties a directive updates.
    *
    * Angular automatically checks host property bindings during change detection.
    * If a binding changes, it will update the host element of the directive.
    *
-   * ### Example
-   *
    * The following example creates a directive that sets the `valid` and `invalid` classes
    * on the DOM element that has ngModel directive on it.
    *
@@ -282,12 +277,10 @@ export interface Directive {
    * }
    * ```
    *
-   * ## Attributes
+   * ### Attributes
    *
    * Specifies static attributes that should be propagated to a host element.
    *
-   * ### Example
-   *
    * In this example using `my-button` directive (ex.: `<div my-button></div>`) on a host element
    * (here: `<div>` ) will ensure that this element will get the "button" role.
    *
@@ -308,7 +301,8 @@ export interface Directive {
    * Defines the set of injectable objects that are visible to a Directive and its light DOM
    * children.
    *
-   * ## Simple Example
+   * @usageNotes
+   * ### Simple Example
    *
    * Here is an example of a class that can be injected:
    *
@@ -339,7 +333,8 @@ export interface Directive {
   /**
    * Defines the name that can be used in the template to assign this directive to a variable.
    *
-   * ## Simple Example
+   * @usageNotes
+   * ### Simple Example
    *
    * ```
    * @Directive({
@@ -366,6 +361,7 @@ export interface Directive {
    * Content queries are set before the `ngAfterContentInit` callback is called.
    * View queries are set before the `ngAfterViewInit` callback is called.
    *
+   * @usageNotes
    * ### Example
    *
    * ```
@@ -397,7 +393,6 @@ export interface Directive {
 /**
  * Directive decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Directive: DirectiveDecorator = makeDecorator(
@@ -406,16 +401,9 @@ export const Directive: DirectiveDecorator = makeDecorator(
 
 /**
  * Type of the Component decorator / constructor function.
- *
- *
  */
 export interface ComponentDecorator {
   /**
-   * @usageNotes
-   *
-   * {@example core/ts/metadata/metadata.ts region='component'}
-   *
-   * @description
    * Marks a class as an Angular component and collects component configuration
    * metadata.
    *
@@ -459,24 +447,22 @@ export interface ComponentDecorator {
    * * **templateUrl** - url to an external file containing a template for the view
    * * **viewProviders** - list of providers available to this component and its view children
    *
+   * @usageNotes
    * ### Example
    *
    * {@example core/ts/metadata/metadata.ts region='component'}
    *
-   *
    * @Annotation
    */
   (obj: Component): TypeDecorator;
   /**
-   * See the {@link Component} decorator.
+   * See the `Component` decorator.
    */
   new (obj: Component): Component;
 }
 
 /**
  * Type of the Component metadata.
- *
- *
  */
 export interface Component extends Directive {
   /**
@@ -493,7 +479,8 @@ export interface Component extends Directive {
   /**
    * Defines the set of injectable objects that are visible to its view DOM children.
    *
-   * ## Simple Example
+   * @usageNotes
+   * ### Simple Example
    *
    * Here is an example of a class that can be injected:
    *
@@ -535,8 +522,8 @@ export interface Component extends Directive {
    * In CommonJS, this can always be set to `module.id`, similarly SystemJS exposes `__moduleName`
    * variable within each module.
    *
-   *
-   * ## Simple Example
+   * @usageNotes
+   * ### Simple Example
    *
    * ```
    * @Directive({
@@ -553,7 +540,7 @@ export interface Component extends Directive {
   /**
    * Specifies a template URL for an Angular component.
    *
-   *Only one of `templateUrl` or `template` can be defined per View.
+   * Only one of `templateUrl` or `template` can be defined per View.
    */
   templateUrl?: string;
 
@@ -586,9 +573,12 @@ export interface Component extends Directive {
    *
    * For animations to be available for use, animation state changes are placed within
    * {@link trigger animation triggers} which are housed inside of the `animations` annotation
-   * metadata. Within a trigger both {@link state state} and {@link transition transition} entries
+   * metadata. Within a trigger both `state` and `transition` entries
    * can be placed.
    *
+   * @usageNotes
+   * ### Example
+   *
    * ```typescript
    * @Component({
    *   selector: 'animation-cmp',
@@ -636,28 +626,26 @@ export interface Component extends Directive {
    * Please visit each of the animation DSL functions listed below to gain a better understanding
    * of how and why they are used for crafting animations in Angular:
    *
-   * - {@link trigger trigger()}
-   * - {@link state state()}
-   * - {@link transition transition()}
-   * - {@link group group()}
-   * - {@link sequence sequence()}
-   * - {@link style style()}
-   * - {@link animate animate()}
-   * - {@link keyframes keyframes()}
+   * - `trigger()`
+   * - `state()`
+   * - `transition()`
+   * - `group()`
+   * - `sequence()`
+   * - `style()`
+   * - `animate()`
+   * - `keyframes()`
    */
   animations?: any[];
 
   /**
    * Specifies how the template and the styles should be encapsulated:
-   * - {@link ViewEncapsulation#Native `ViewEncapsulation.Native`} to use shadow roots - only works
-   *   if natively available on the platform,
-   * - {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} to use shimmed CSS that
-   *   emulates the native behavior,
-   * - {@link ViewEncapsulation#None `ViewEncapsulation.None`} to use global CSS without any
-   *   encapsulation.
+   * - `ViewEncapsulation.Native` to use shadow roots - only works if natively available on the
+   *   platform,
+   * - `ViewEncapsulation.Emulated` to use shimmed CSS that emulates the native behavior,
+   * - `ViewEncapsulation.None` to use global CSS without any encapsulation.
    *
    * When no `encapsulation` is defined for the component, the default value from the
-   * {@link CompilerOptions} is used. The default is `ViewEncapsulation.Emulated`}. Provide a new
+   * `CompilerOptions` is used. The default is `ViewEncapsulation.Emulated`. Provide a new
    * `CompilerOptions` to override this value.
    *
    * If the encapsulation is set to `ViewEncapsulation.Emulated` and the component has no `styles`
@@ -673,13 +661,13 @@ export interface Component extends Directive {
   /**
    * Defines the components that should be compiled as well when
    * this component is defined. For each components listed here,
-   * Angular will create a {@link ComponentFactory} and store it in the
-   * {@link ComponentFactoryResolver}.
+   * Angular will create a `ComponentFactory` and store it in the
+   * `ComponentFactoryResolver`.
    */
   entryComponents?: Array<Type<any>|any[]>;
 
   /**
-   * If {@link Component#preserveWhitespaces Component.preserveWhitespaces} is set to `false`
+   * If `Component.preserveWhitespaces` is set to `false`
    * potentially superfluous whitespace characters (ones matching the `\s` character class in
    * JavaScript regular expressions) will be removed from a compiled template. This can greatly
    * reduce AOT-generated code size as well as speed up view creation.
@@ -750,7 +738,6 @@ export interface Component extends Directive {
 /**
  * Component decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Component: ComponentDecorator = makeDecorator(
@@ -760,8 +747,6 @@ export const Component: ComponentDecorator = makeDecorator(
 
 /**
  * Type of the Pipe decorator / constructor function.
- *
- *
  */
 export interface PipeDecorator {
   /**
@@ -774,15 +759,13 @@ export interface PipeDecorator {
   (obj: Pipe): TypeDecorator;
 
   /**
-   * See the {@link Pipe} decorator.
+   * See the `Pipe` decorator.
    */
   new (obj: Pipe): Pipe;
 }
 
 /**
  * Type of the Pipe metadata.
- *
- *
  */
 export interface Pipe {
   /**
@@ -810,11 +793,10 @@ export interface Pipe {
  * Pipe decorator and metadata.
  *
  * Use the `@Pipe` annotation to declare that a given class is a pipe. A pipe
- * class must also implement {@link PipeTransform} interface.
+ * class must also implement `PipeTransform` interface.
  *
  * To use the pipe include a reference to the pipe class in
- * {@link NgModule#declarations}.
- *
+ * `NgModule.declarations`.
  *
  * @Annotation
  */
@@ -865,7 +847,6 @@ export interface InputDecorator {
    *
    * class App {}
    * ```
-   *
    */
   (bindingPropertyName?: string): any;
   new (bindingPropertyName?: string): any;
@@ -873,8 +854,6 @@ export interface InputDecorator {
 
 /**
  * Type of the Input metadata.
- *
- *
  */
 export interface Input {
   /**
@@ -886,7 +865,6 @@ export interface Input {
 /**
  * Input decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Input: InputDecorator =
@@ -894,8 +872,6 @@ export const Input: InputDecorator =
 
 /**
  * Type of the Output decorator / constructor function.
- *
- *
  */
 export interface OutputDecorator {
   /**
@@ -908,6 +884,7 @@ export interface OutputDecorator {
    * used when instantiating a component in the template. When not provided,
    * the name of the decorated property is used.
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -944,15 +921,12 @@ export interface OutputDecorator {
 
 /**
  * Type of the Output metadata.
- *
- *
  */
 export interface Output { bindingPropertyName?: string; }
 
 /**
  * Output decorator and metadata.
  *
- *
  * @Annotation
  */
 export const Output: OutputDecorator =
@@ -961,8 +935,6 @@ export const Output: OutputDecorator =
 
 /**
  * Type of the HostBinding decorator / constructor function.
- *
- *
  */
 export interface HostBindingDecorator {
   /**
@@ -975,6 +947,7 @@ export interface HostBindingDecorator {
    * name of the host element that will be updated. When not provided,
    * the class property name is used.
    *
+   * @usageNotes
    * ### Example
    *
    * The following example creates a directive that sets the `valid` and `invalid` classes
@@ -996,7 +969,6 @@ export interface HostBindingDecorator {
    *   prop;
    * }
    * ```
-   *
    */
   (hostPropertyName?: string): any;
   new (hostPropertyName?: string): any;
@@ -1004,15 +976,12 @@ export interface HostBindingDecorator {
 
 /**
  * Type of the HostBinding metadata.
- *
- *
  */
 export interface HostBinding { hostPropertyName?: string; }
 
 /**
  * HostBinding decorator and metadata.
  *
- *
  * @Annotation
  */
 export const HostBinding: HostBindingDecorator =
@@ -1021,8 +990,6 @@ export const HostBinding: HostBindingDecorator =
 
 /**
  * Type of the HostListener decorator / constructor function.
- *
- *
  */
 export interface HostListenerDecorator {
   /**
@@ -1032,6 +999,7 @@ export interface HostListenerDecorator {
    *
    * If the decorated method returns `false`, then `preventDefault` is applied on the DOM event.
    *
+   * @usageNotes
    * ### Example
    *
    * The following example declares a directive that attaches a click listener to the button and
@@ -1063,8 +1031,6 @@ export interface HostListenerDecorator {
 
 /**
  * Type of the HostListener metadata.
- *
- *
  */
 export interface HostListener {
   eventName?: string;
@@ -1074,7 +1040,6 @@ export interface HostListener {
 /**
  * HostListener decorator and metadata.
  *
- *
  * @Annotation
  */
 export const HostListener: HostListenerDecorator =
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index bf6a6d2fb9..e88cdd489b 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -57,6 +57,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    *
    * <!-- TODO: Add a link to a chapter on OnPush components -->
    *
+   * @usageNotes
    * ### Example
    *
    * ```typescript
@@ -91,6 +92,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
    *
+   * @usageNotes
    * ### Example
    *
    * The following example defines a component with a large list of readonly data.
@@ -142,6 +144,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    *
+   * @usageNotes
    * ### Example
    *
    * The following example creates a component displaying `live` data. The component will detach
@@ -200,6 +203,7 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
    *
+   * @usageNotes
    * ### Example
    *
    * The following example defines a component with a large list of readonly data.
diff --git a/packages/core/src/zone/ng_zone.ts b/packages/core/src/zone/ng_zone.ts
index bd410c78a0..17b68225d8 100644
--- a/packages/core/src/zone/ng_zone.ts
+++ b/packages/core/src/zone/ng_zone.ts
@@ -24,6 +24,7 @@ import {EventEmitter} from '../event_emitter';
  *   - link to runOutsideAngular/run (throughout this file!)
  *   -->
  *
+ * @usageNotes
  * ### Example
  *
  * ```
diff --git a/packages/core/testing/src/fake_async.ts b/packages/core/testing/src/fake_async.ts
index 6758643a2b..e7b9e221f0 100644
--- a/packages/core/testing/src/fake_async.ts
+++ b/packages/core/testing/src/fake_async.ts
@@ -33,7 +33,8 @@ export function resetFakeAsyncZone(): void {
  *
  * Can be used to wrap inject() calls.
  *
- * ## Example
+ * @usageNotes
+ * ### Example
  *
  * {@example core/testing/ts/fake_async.ts region='basic'}
  *
@@ -56,7 +57,8 @@ export function fakeAsync(fn: Function): (...args: any[]) => any {
  * The microtasks queue is drained at the very start of this function and after any timer callback
  * has been executed.
  *
- * ## Example
+ * @usageNotes
+ * ### Example
  *
  * {@example core/testing/ts/fake_async.ts region='basic'}
  *
diff --git a/packages/core/testing/src/fake_async_fallback.ts b/packages/core/testing/src/fake_async_fallback.ts
index 4819f5c129..7971726465 100644
--- a/packages/core/testing/src/fake_async_fallback.ts
+++ b/packages/core/testing/src/fake_async_fallback.ts
@@ -43,7 +43,8 @@ let _inFakeAsyncCall = false;
  *
  * Can be used to wrap inject() calls.
  *
- * ## Example
+ * @usageNotes
+ * ### Example
  *
  * {@example core/testing/ts/fake_async.ts region='basic'}
  *
@@ -110,7 +111,8 @@ function _getFakeAsyncZoneSpec(): any {
  * The microtasks queue is drained at the very start of this function and after any timer callback
  * has been executed.
  *
- * ## Example
+ * @usageNotes
+ * ### Example
  *
  * {@example core/testing/ts/fake_async.ts region='basic'}
  *

From bc4f10ca201c575638bd5a2244233c97715eadfc Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 18 May 2018 19:29:34 +0100
Subject: [PATCH 285/582] build(aio): rearrange processors to ensure we catch
 all content errors (#24000)

PR Close #24000
---
 .../transforms/angular-api-package/index.js   | 42 +++++++++----------
 .../processors/filterContainedDocs.js         |  2 +-
 .../processors/filterPrivateDocs.js           |  2 +-
 .../processors/filterPrivateDocs.spec.js      |  2 +-
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index b867a1159e..5e0931a724 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -119,8 +119,8 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
         parseTagsProcessor.tagDefinitions.concat(getInjectables(requireFolder(__dirname, './tag-defs')));
   })
 
-  .config(function(computeStability, splitDescription, addNotYetDocumentedProperty, EXPORT_DOC_TYPES, API_DOC_TYPES) {
-    computeStability.docTypes = EXPORT_DOC_TYPES;
+  .config(function(computeStability, splitDescription, addNotYetDocumentedProperty, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES) {
+    computeStability.docTypes = API_DOC_TYPES_TO_RENDER;
     // Only split the description on the API docs
     splitDescription.docTypes = API_DOC_TYPES;
     addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
@@ -166,9 +166,9 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     filterContainedDocs.docTypes = API_CONTAINED_DOC_TYPES;
   })
 
-  .config(function(checkContentRules, EXPORT_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
+  .config(function(checkContentRules, API_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
     addMinLengthRules(checkContentRules);
-    addHeadingRules(checkContentRules, EXPORT_DOC_TYPES);
+    addHeadingRules(checkContentRules, API_DOC_TYPES);
     addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES);
   })
 
@@ -214,37 +214,33 @@ function addMinLengthRules(checkContentRules) {
   paramRules.push(createMinLengthRule());
 }
 
-function addHeadingRules(checkContentRules, EXPORT_DOC_TYPES) {
+function addHeadingRules(checkContentRules, API_DOC_TYPES) {
   const createNoMarkdownHeadingsRule = require('./content-rules/noMarkdownHeadings');
   const noMarkdownHeadings = createNoMarkdownHeadingsRule();
   const allowOnlyLevel3Headings = createNoMarkdownHeadingsRule(1, 2, '4,');
-  const DOC_TYPES_TO_CHECK = EXPORT_DOC_TYPES.concat(['member', 'overload-info']);
-  const PROPS_TO_CHECK = ['description', 'shortDescription'];
 
-  DOC_TYPES_TO_CHECK.forEach(docType => {
+  API_DOC_TYPES.forEach(docType => {
+    let rules;
     const ruleSet = checkContentRules.docTypeRules[docType] = checkContentRules.docTypeRules[docType] || {};
-    PROPS_TO_CHECK.forEach(prop => {
-      const rules = ruleSet[prop] = ruleSet[prop] || [];
-      rules.push(noMarkdownHeadings);
-    });
-    const rules = ruleSet['usageNotes'] = ruleSet['usageNotes'] || [];
+
+    rules = ruleSet['description'] = ruleSet['description'] || [];
+    rules.push(noMarkdownHeadings);
+
+    rules = ruleSet['shortDescription'] = ruleSet['shortDescription'] || [];
+    rules.push(noMarkdownHeadings);
+
+    rules = ruleSet['usageNotes'] = ruleSet['usageNotes'] || [];
     rules.push(allowOnlyLevel3Headings);
   });
 }
 
 function addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES) {
-  const PROPS_TO_DISALLOW = ['usageNotes'];
-
   API_CONTAINED_DOC_TYPES.forEach(docType => {
     const ruleSet = checkContentRules.docTypeRules[docType] = checkContentRules.docTypeRules[docType] || {};
-    PROPS_TO_DISALLOW.forEach(prop => {
-      const rules = ruleSet[prop] = ruleSet[prop] || [];
-      rules.push((doc, prop, value) => {
-        return value &&
-               !isMethod(doc) &&
-               `Invalid property: "${prop}" is not allowed on "${doc.docType}" docs.`;
-      });
-    });
+
+    const rules = ruleSet['usageNotes'] = ruleSet['usageNotes'] || [];
+    rules.push((doc, prop, value) => value && !isMethod(doc) &&
+      `Invalid property: "${prop}" is not allowed on "${doc.docType}" docs.`);
   });
 }
 
diff --git a/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js b/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js
index 79ddd6acb1..df62bfd888 100644
--- a/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js
+++ b/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js
@@ -5,7 +5,7 @@
 module.exports = function filterContainedDocs() {
   return {
     docTypes: ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'],
-    $runAfter: ['extra-docs-added'],
+    $runAfter: ['extra-docs-added', 'checkContentRules'],
     $runBefore: ['computing-paths'],
     $process: function(docs) {
       var docTypes = this.docTypes;
diff --git a/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.js b/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.js
index 673e38d114..cd9ee16f97 100644
--- a/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.js
+++ b/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.js
@@ -1,6 +1,6 @@
 module.exports = function filterPrivateDocs() {
   return {
-    $runAfter: ['extra-docs-added'],
+    $runAfter: ['extra-docs-added', 'checkContentRules'],
     $runBefore: ['computing-paths'],
     $process: function(docs) {
       return docs.filter(function(doc) { return doc.privateExport !== true; });
diff --git a/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.spec.js b/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.spec.js
index 3f9831e4b5..8715abd688 100644
--- a/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/filterPrivateDocs.spec.js
@@ -18,7 +18,7 @@ describe('filterPrivateDocs processor', () => {
 
   it('should run after the correct processor', () => {
     const processor = processorFactory();
-    expect(processor.$runAfter).toEqual(['extra-docs-added']);
+    expect(processor.$runAfter).toEqual(['extra-docs-added', 'checkContentRules']);
   });
 
   it('should remove docs that are marked as private exports', () => {

From 2b15108f7eae5b43c34e4407de4a9b44049001ba Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 23 May 2018 18:31:54 +0100
Subject: [PATCH 286/582] build(aio): remove invalid H3 usage notes heading
 (#24000)

This heading is too high for the section because the
method name is a H3 but it cannot be a H4 because
usage notes may contain H4 headings.

PR Close #24000
---
 aio/tools/transforms/templates/api/lib/memberHelpers.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index 15146f8755..e303f95d0a 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -125,7 +125,6 @@
   {% if method.usageNotes -%}
     <tr>
       <td class="usage-notes">
-        <h3>Usage Notes</h3>
         {$ method.usageNotes | marked({ h3: 'h4' }) $}
       </td>
     </tr>
@@ -153,7 +152,7 @@
 {% if nonInternalProperties.length -%}
 <section class="{$ containerClass $}">
   <h2>{$ headingText $}</h2>
-  <table class="is-full-width list-table properties-table">
+  <table class="is-full-width list-table property-table">
     <thead>
       <tr>
         <th>{$ headings[0] or 'Property' $}</th>

From 8a4c57791735c8538f7526b6b11036acdfeb5a49 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 23 May 2018 21:56:10 +0100
Subject: [PATCH 287/582] build(aio): fix broken doc-gen unit test (#24000)

PR Close #24000
---
 .../transforms/angular-base-package/rendering/hasValues.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js b/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js
index 7f22c93e9d..7b057bcafd 100644
--- a/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js
+++ b/aio/tools/transforms/angular-base-package/rendering/hasValues.spec.js
@@ -9,7 +9,7 @@ describe('hasValues filter', () => {
 
   it('should return true if the specified property is truthy on any item in the list', function() {
     expect(filter.process([], 'a')).toEqual(false);
-    expect(filter.process(0), 'a').toEqual(false);
+    expect(filter.process(0, 'a')).toEqual(false);
     expect(filter.process({}, 'a')).toEqual(false);
     expect(filter.process([{a: 1}], 'a')).toEqual(true);
     expect(filter.process([{b: 2}], 'a')).toEqual(false);

From 66f6a48210cd16b0d06dd2b6f78321847b30956b Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 23 May 2018 22:13:28 +0100
Subject: [PATCH 288/582] fix(aio): tidy up API doc styles (#24000)

* Code anchors should inherit the font size from their container
* Table headings should align with content

PR Close #24000
---
 aio/src/styles/1-layouts/_api-page.scss    | 79 ----------------------
 aio/src/styles/1-layouts/_api-pages.scss   | 41 +++++++++++
 aio/src/styles/1-layouts/_layouts-dir.scss |  2 +-
 aio/src/styles/2-modules/_api-list.scss    |  1 +
 aio/src/styles/2-modules/_api-pages.scss   |  8 +--
 5 files changed, 47 insertions(+), 84 deletions(-)
 delete mode 100644 aio/src/styles/1-layouts/_api-page.scss
 create mode 100644 aio/src/styles/1-layouts/_api-pages.scss

diff --git a/aio/src/styles/1-layouts/_api-page.scss b/aio/src/styles/1-layouts/_api-page.scss
deleted file mode 100644
index aa5e714c69..0000000000
--- a/aio/src/styles/1-layouts/_api-page.scss
+++ /dev/null
@@ -1,79 +0,0 @@
-.api-section {
-    position: relative;
-
-    pre {
-        white-space: pre-wrap;
-    }
-
-    table.api-table {
-        min-width: 680px;
-
-        thead th {
-            color: white;
-            font-size: 16px;
-            background-color: $blue;
-            border-radius: 4px 4px 0 0;
-            text-transform: none;
-            padding: 8px 24px;
-        }
-
-        tbody {
-            pre {
-                white-space: normal;
-                margin: 4px;
-                padding: 4px 16px;
-            }
-
-            td, th {
-                padding: 0;
-            }
-
-            th {
-                max-width: 150px;
-            }
-        }
-
-    }
-}
-
-.api-body {
-
-    max-width: 1200px;
-
-    table {
-
-        th {
-            text-transform: none;
-            font-size: 16px;
-            font-weight: bold;
-        }
-
-        tr {
-            border-bottom: 1px solid $lightgray;
-        }
-
-        td {
-            vertical-align: middle;
-        }
-
-        hr {
-            margin: 16px 0;
-        }
-
-        tr:last-child {
-            border-bottom: none;
-        }
-
-        &.item-table {
-            td {
-                padding: 32px;
-            }
-        }
-
-        &.list-table {
-            td {
-                padding: 16px 24px;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/aio/src/styles/1-layouts/_api-pages.scss b/aio/src/styles/1-layouts/_api-pages.scss
new file mode 100644
index 0000000000..9755851cb2
--- /dev/null
+++ b/aio/src/styles/1-layouts/_api-pages.scss
@@ -0,0 +1,41 @@
+.api-body {
+
+    max-width: 1200px;
+
+    table {
+
+        th {
+            text-transform: none;
+            font-size: 16px;
+            font-weight: bold;
+        }
+
+        tr {
+            border-bottom: 1px solid $lightgray;
+        }
+
+        td {
+            vertical-align: middle;
+        }
+
+        hr {
+            margin: 16px 0;
+        }
+
+        tr:last-child {
+            border-bottom: none;
+        }
+
+        &.item-table {
+            td {
+                padding: 32px;
+            }
+        }
+
+        &.list-table {
+            td {
+                padding: 16px 24px;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/aio/src/styles/1-layouts/_layouts-dir.scss b/aio/src/styles/1-layouts/_layouts-dir.scss
index 93311dc79d..e9d687bef6 100644
--- a/aio/src/styles/1-layouts/_layouts-dir.scss
+++ b/aio/src/styles/1-layouts/_layouts-dir.scss
@@ -2,7 +2,7 @@
    LAYOUT STYLES
    ============================== */
 
-@import 'api-page';
+@import 'api-pages';
 @import 'content-layout';
 @import 'doc-viewer';
 @import 'footer';
diff --git a/aio/src/styles/2-modules/_api-list.scss b/aio/src/styles/2-modules/_api-list.scss
index 383c2e906e..d3428e1545 100644
--- a/aio/src/styles/2-modules/_api-list.scss
+++ b/aio/src/styles/2-modules/_api-list.scss
@@ -280,6 +280,7 @@ p {
 .code-anchor {
   cursor: pointer;
   text-decoration: none;
+  font-size: inherit;
 
   &:hover {
     text-decoration: underline;
diff --git a/aio/src/styles/2-modules/_api-pages.scss b/aio/src/styles/2-modules/_api-pages.scss
index 00a3bb1c9b..f368289ada 100644
--- a/aio/src/styles/2-modules/_api-pages.scss
+++ b/aio/src/styles/2-modules/_api-pages.scss
@@ -31,6 +31,10 @@
   }
 
   .method-table, .option-table {
+    th {
+      padding: 8px 16px;
+    }
+
     h3 {
       margin: 6px 0;
       font-weight: bold;
@@ -87,10 +91,6 @@
     }
 }
 
-  .api-section aio-code {
-    background-color: rgba(241, 241, 241, 0.2);
-  }
-
   .from-constructor, .read-only-property {
     font-style: italic;
     color: $blue;

From 859a3d5784d0038661632331dd293048bcf3f17d Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 23 May 2018 22:15:15 +0100
Subject: [PATCH 289/582] build(aio): fix decorator doc "inherited from"
 heading (#24000)

We should not include the package path in the inherited
from heading for decorator API docs

PR Close #24000
---
 .../transforms/templates/api/includes/decorator-overview.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/tools/transforms/templates/api/includes/decorator-overview.html b/aio/tools/transforms/templates/api/includes/decorator-overview.html
index 44f06484c3..52c24e8a4f 100644
--- a/aio/tools/transforms/templates/api/includes/decorator-overview.html
+++ b/aio/tools/transforms/templates/api/includes/decorator-overview.html
@@ -20,7 +20,7 @@
 </table>
 
 {% for ancestor in doc.extendsClauses %}{% if ancestor.doc %}
-<h3>Inherited from <a class="code-anchor" href="{$ ancestor.doc.path $}">{$ ancestor.doc.id $}</a></h3>
+<h3 class="no-toc">Inherited from <a class="code-anchor" href="{$ ancestor.doc.path $}">{$ ancestor.doc.name $}</a> decorator</h3>
 {$ renderOptionsTable(ancestor.doc) $}
 {% endif %}{% endfor %}
 {% endmacro %}

From 8daadf360cdad6d95de4fefa60ce872d5225e6da Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 23 May 2018 22:20:14 +0100
Subject: [PATCH 290/582] build(aio): compute breadcrums for all API doc types
 (#24000)

PR Close #24000
---
 .../processors/computeApiBreadCrumbs.js             | 13 ++++++-------
 .../processors/computeApiBreadCrumbs.spec.js        | 11 ++++++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.js b/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.js
index c813b11c9c..62eb6c2225 100644
--- a/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.js
+++ b/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.js
@@ -1,16 +1,15 @@
-module.exports = function computeApiBreadCrumbs(EXPORT_DOC_TYPES) {
+module.exports = function computeApiBreadCrumbs(API_DOC_TYPES_TO_RENDER) {
   return {
     $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
     $process(docs) {
       // Compute the breadcrumb for each doc by processing its containers
       docs.forEach(doc => {
-        if (EXPORT_DOC_TYPES.indexOf(doc.docType) !== -1) {
-          doc.breadCrumbs = [
-            { text: 'API', path: '/api' },
-            { text: '@angular/' + doc.moduleDoc.id, path: doc.moduleDoc.path },
-            { text: doc.name, path: doc.path }
-          ];
+        if (API_DOC_TYPES_TO_RENDER.indexOf(doc.docType) !== -1) {
+          doc.breadCrumbs = [];
+          doc.breadCrumbs.push({ text: 'API', path: '/api' });
+          if (doc.moduleDoc) doc.breadCrumbs.push({ text: '@angular/' + doc.moduleDoc.id, path: doc.moduleDoc.path });
+          doc.breadCrumbs.push({ text: doc.name, path: doc.path });
         }
       });
     }
diff --git a/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js b/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js
index 7e3aba0c96..03bc24e426 100644
--- a/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js
@@ -13,14 +13,15 @@ describe('angular-api-package: computeApiBreadCrumbs processor', () => {
     expect(processor.$runBefore).toEqual(['rendering-docs']);
   });
 
-  it('should attach a breadCrumbs property to each of the EXPORT_DOC_TYPES docs', () => {
-    const EXPORT_DOC_TYPES = ['class', 'interface'];
-    const processor = processorFactory(EXPORT_DOC_TYPES);
+  it('should attach a breadCrumbs property to each of the API_DOC_TYPES_TO_RENDER docs', () => {
+    const API_DOC_TYPES_TO_RENDER = ['class', 'interface', 'module'];
+    const processor = processorFactory(API_DOC_TYPES_TO_RENDER);
 
     const docs = [
       { docType: 'class', name: 'ClassA', path: 'module-1/class-a', moduleDoc: { id: 'moduleOne', path: 'module-1' } },
       { docType: 'interface', name: 'InterfaceB', path: 'module-2/interface-b', moduleDoc: { id: 'moduleTwo', path: 'module-2' } },
       { docType: 'guide', name: 'Guide One', path: 'guide/guide-1' },
+      { docType: 'module', name: 'testing', id: 'http/testing', path: 'http/testing' },
     ];
     processor.$process(docs);
 
@@ -35,5 +36,9 @@ describe('angular-api-package: computeApiBreadCrumbs processor', () => {
       { text: 'InterfaceB', path: 'module-2/interface-b' },
     ]);
     expect(docs[2].breadCrumbs).toBeUndefined();
+    expect(docs[3].breadCrumbs).toEqual([
+      { text: 'API', path: '/api' },
+      { text: 'testing', path: 'http/testing' },
+    ]);
   });
 });

From 39af314e2946a25fe887f62b68a0150a2b566c48 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 23 May 2018 22:56:05 +0100
Subject: [PATCH 291/582] build(aio): add github links to API doc members
 (#24000)

This change adds Github edit and view links to methods
and decorator options.

It is possible to add these to properties also but the
UI is rather tight as these are displayed in a table.

PR Close #24000
---
 aio/src/styles/2-modules/_api-pages.scss      | 20 +++++++++++++++--
 .../templates/api/base.template.html          |  5 +----
 .../templates/api/class.template.html         |  6 ++---
 .../templates/api/decorator.template.html     |  6 ++++-
 .../api/includes/decorator-overview.html      |  2 +-
 .../templates/api/interface.template.html     |  2 +-
 .../templates/api/lib/githubLinks.html        | 11 ++++++++--
 .../templates/api/lib/memberHelpers.html      | 22 +++++++++++--------
 8 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/aio/src/styles/2-modules/_api-pages.scss b/aio/src/styles/2-modules/_api-pages.scss
index f368289ada..dcd25bab04 100644
--- a/aio/src/styles/2-modules/_api-pages.scss
+++ b/aio/src/styles/2-modules/_api-pages.scss
@@ -1,4 +1,4 @@
-.page-actions {
+.github-links {
   float: right;
   .material-icons {
     border-radius: 4px;
@@ -32,12 +32,28 @@
 
   .method-table, .option-table {
     th {
-      padding: 8px 16px;
+      display: flex;
+      align-items: center;
+
+      h3 {
+        flex: 1;
+      }
+
+      .github-links {
+        a {
+          color: $mediumgray;
+          .material-icons:hover {
+            background: none;
+            color: $blue;
+          }
+        }
+      }
     }
 
     h3 {
       margin: 6px 0;
       font-weight: bold;
+      clear: left;
     }
 
     h4 {
diff --git a/aio/tools/transforms/templates/api/base.template.html b/aio/tools/transforms/templates/api/base.template.html
index 7d93b9e861..72b6fe9a7a 100644
--- a/aio/tools/transforms/templates/api/base.template.html
+++ b/aio/tools/transforms/templates/api/base.template.html
@@ -2,10 +2,7 @@
 {% set comma = joiner(',') %}
 {% set slash = joiner('/') %}
 <article>
-  <div class="page-actions">
-    <a href="{$ github.githubEditHref(doc, versionInfo) $}" aria-label="Suggest Edits" title="Suggest Edits"><i class="material-icons" aria-hidden="true" role="img">mode_edit</i></a>
-    <a href="{$ github.githubViewHref(doc, versionInfo) $}" aria-label="View Source" title="View Source"><i class="material-icons" aria-hidden="true" role="img">code</i></a>
-  </div>
+  {$ github.githubLinks(doc, versionInfo) $}
   <div class="breadcrumb">
     <script type="application/ld+json">
       {
diff --git a/aio/tools/transforms/templates/api/class.template.html b/aio/tools/transforms/templates/api/class.template.html
index 175144103f..d0af53a1a5 100644
--- a/aio/tools/transforms/templates/api/class.template.html
+++ b/aio/tools/transforms/templates/api/class.template.html
@@ -10,14 +10,14 @@
   {% block additional %}{% endblock %}
   {% include "includes/description.html" %}
   {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static Properties') $}
-  {$ memberHelpers.renderMethodDetails(doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $}
+  {$ memberHelpers.renderMethodDetails(versionInfo, doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $}
   {% if doc.constructorDoc %}
   <h2>Constructor</h2>
-  {$ memberHelpers.renderMethodDetail(doc.constructorDoc, 'constructor') $}{% endif %}
+  {$ memberHelpers.renderMethodDetail(versionInfo, doc.constructorDoc, 'constructor') $}{% endif %}
 
   {$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $}
 
-  {$ memberHelpers.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
+  {$ memberHelpers.renderMethodDetails(versionInfo, doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
 
   {% block annotations %}{% include "includes/annotations.html" %}{% endblock %}
 {% endblock %}
diff --git a/aio/tools/transforms/templates/api/decorator.template.html b/aio/tools/transforms/templates/api/decorator.template.html
index 050240a875..6a32d634b7 100644
--- a/aio/tools/transforms/templates/api/decorator.template.html
+++ b/aio/tools/transforms/templates/api/decorator.template.html
@@ -1,3 +1,4 @@
+{% import "lib/githubLinks.html" as github -%}
 {% import "lib/memberHelpers.html" as memberHelper -%}
 {% import "lib/paramList.html" as params -%}
 {% extends 'export-base.template.html' %}
@@ -11,7 +12,10 @@
   {% for option in doc.members %}
   <a id="{$ option.anchor $}"></a>
   <table class="is-full-width option-table">
-    <thead><tr><th><h3>{$ option.name $}</h3></th></tr></thead>
+    <thead><tr><th>
+      <h3>{$ option.name $}</h3>
+      {$ github.githubLinks(option, versionInfo) $}
+    </th></tr></thead>
     <tbody>
       <tr>
         <td>
diff --git a/aio/tools/transforms/templates/api/includes/decorator-overview.html b/aio/tools/transforms/templates/api/includes/decorator-overview.html
index 52c24e8a4f..657a4933d1 100644
--- a/aio/tools/transforms/templates/api/includes/decorator-overview.html
+++ b/aio/tools/transforms/templates/api/includes/decorator-overview.html
@@ -1,7 +1,7 @@
 {% import "lib/descendants.html" as descendants -%}
 
 {% macro renderOptionsTable(doc) %}
-<table class="is-full-width list-table option-table">
+<table class="is-full-width list-table option-overview">
   <thead>
     <tr><th>Option</th><th>Description</th></tr>
   </thead>
diff --git a/aio/tools/transforms/templates/api/interface.template.html b/aio/tools/transforms/templates/api/interface.template.html
index dc81d49793..79fb8c5c12 100644
--- a/aio/tools/transforms/templates/api/interface.template.html
+++ b/aio/tools/transforms/templates/api/interface.template.html
@@ -7,5 +7,5 @@
 {% block details %}
   {% include "includes/description.html" %}
   {$ memberHelper.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $}
-  {$ memberHelper.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
+  {$ memberHelper.renderMethodDetails(versionInfo, doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
 {% endblock %}
diff --git a/aio/tools/transforms/templates/api/lib/githubLinks.html b/aio/tools/transforms/templates/api/lib/githubLinks.html
index 1c13c59385..349e135b45 100644
--- a/aio/tools/transforms/templates/api/lib/githubLinks.html
+++ b/aio/tools/transforms/templates/api/lib/githubLinks.html
@@ -1,6 +1,6 @@
 {% macro githubViewHref(doc, versionInfo) -%}
 https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/tree/{$ versionInfo.currentVersion.isSnapshot and versionInfo.currentVersion.SHA or versionInfo.currentVersion.raw $}/packages/{$ doc.fileInfo.realProjectRelativePath $}#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}
-{%- endmacro %}
+{%- endmacro -%}
 
 
 {% macro githubEditHref(doc, versionInfo) -%}
@@ -9,4 +9,11 @@ https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInf
   {%- elseif doc.docType === 'module' %}{$ doc.id.split('/')[0] $}
   {%- else %}...{%- endif -%}
 )%3A%20describe%20your%20change...#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro -%}
+
+{% macro githubLinks(doc, versionInfo) -%}
+<div class="github-links">
+  <a href="{$ githubEditHref(doc, versionInfo) $}" aria-label="Suggest Edits" title="Suggest Edits"><i class="material-icons" aria-hidden="true" role="img">mode_edit</i></a>
+  <a href="{$ githubViewHref(doc, versionInfo) $}" aria-label="View Source" title="View Source"><i class="material-icons" aria-hidden="true" role="img">code</i></a>
+</div>
+{%- endmacro -%}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index e303f95d0a..046d56dfcd 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -1,3 +1,4 @@
+{% import "lib/githubLinks.html" as github -%}
 {% import "lib/paramList.html" as params -%}
 
 {%- macro renderHeritage(exportDoc) -%}
@@ -69,15 +70,18 @@
 {%- endif %}
 {%- endmacro -%}
 
-{%- macro renderMethodDetail(method, cssClass) -%}
+{%- macro renderMethodDetail(versionInfo, method, cssClass) -%}
 <a id="{$ method.anchor $}"></a>
 <table class="is-full-width method-table {$ cssClass $}">
-  {% if method.name !== 'constructor' %}<thead><tr><th><h3>
-    {% if method.isCallMember %}<i>call signature</i>
-    {% elseif method.isNewMember %}<i>construct signature</i>
-    {% else %}{$ method.name $}()
-    {% endif %}
-  </h3></th></tr></thead>{% endif %}
+  {% if method.name !== 'constructor' %}<thead><tr><th>
+    <h3>
+      {% if method.isCallMember %}<i>call signature</i>
+      {% elseif method.isNewMember %}<i>construct signature</i>
+      {% else %}{$ method.name $}()
+      {% endif %}
+    </h3>
+    {$ github.githubLinks(method, versionInfo) $}
+  </th></tr></thead>{% endif %}
   <tbody>
     {% if method.shortDescription %}<tr>
       <td class="short-description">
@@ -133,13 +137,13 @@
 </table>
 {% endmacro -%}
 
-{%- macro renderMethodDetails(methods, containerClass, itemClass, headingText) -%}
+{%- macro renderMethodDetails(versionInfo, methods, containerClass, itemClass, headingText) -%}
 {% set nonInternalMethods = methods | filterByPropertyValue('internal', undefined) %}
 {% if nonInternalMethods.length %}
 <section class="{$ containerClass $}">
   <h2>{$ headingText $}</h2>
   {% for member in nonInternalMethods %}
-    {$ renderMethodDetail(member, itemClass) $}
+    {$ renderMethodDetail(versionInfo, member, itemClass) $}
   {% endfor %}
 </section>
 {% endif %}

From d8f7b293d79e7a3f5e6fc330d6029c790f32988a Mon Sep 17 00:00:00 2001
From: Mark Levy <levy@codeandmore.pl>
Date: Sun, 26 Nov 2017 19:04:46 +0100
Subject: [PATCH 292/582] fix(compiler): support `.` in import statements.
 (#20634)

fix #20363

PR Close #20634
---
 packages/compiler-cli/src/transformers/compiler_host.ts      | 2 +-
 .../compiler-cli/test/transformers/compiler_host_spec.ts     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/transformers/compiler_host.ts b/packages/compiler-cli/src/transformers/compiler_host.ts
index a91d056320..344b21eeb3 100644
--- a/packages/compiler-cli/src/transformers/compiler_host.ts
+++ b/packages/compiler-cli/src/transformers/compiler_host.ts
@@ -18,7 +18,7 @@ import {CompilerHost, CompilerOptions, LibrarySummary} from './api';
 import {MetadataReaderHost, createMetadataReaderCache, readMetadata} from './metadata_reader';
 import {DTS, GENERATED_FILES, isInRootDir, relativeToRootDirs} from './util';
 
-const NODE_MODULES_PACKAGE_NAME = /node_modules\/((\w|-)+|(@(\w|-)+\/(\w|-)+))/;
+const NODE_MODULES_PACKAGE_NAME = /node_modules\/((\w|-|\.)+|(@(\w|-|\.)+\/(\w|-|\.)+))/;
 const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;
 
 export function createCompilerHost(
diff --git a/packages/compiler-cli/test/transformers/compiler_host_spec.ts b/packages/compiler-cli/test/transformers/compiler_host_spec.ts
index 59118f3449..357bdc543f 100644
--- a/packages/compiler-cli/test/transformers/compiler_host_spec.ts
+++ b/packages/compiler-cli/test/transformers/compiler_host_spec.ts
@@ -65,6 +65,11 @@ describe('NgCompilerHost', () => {
           .toBe('@angular/core');
     });
 
+    it('should allow an import o a package whose name contains dot (e.g. @angular.io)', () => {
+      expect(host.fileNameToModuleName('/tmp/node_modules/@angular.io/core.d.ts', '/tmp/main.ts'))
+          .toBe('@angular.io/core');
+    });
+
     it('should use a package import when accessing a package from another package', () => {
       expect(host.fileNameToModuleName(
                  '/tmp/node_modules/mod1/index.d.ts', '/tmp/node_modules/mod2/index.d.ts'))

From 5aa12c73ae06947785ccabd6d92c96bae0837d25 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 14 Jun 2018 07:37:06 -0700
Subject: [PATCH 293/582] build: update to Bazel 0.14.0 (#24512)

Includes a fix for out-of-memory condition which caused this to be
reverted yesterday.

PR Close #24512
---
 .circleci/config.yml                         |  8 +++-
 WORKSPACE                                    |  2 +-
 integration/bazel/WORKSPACE                  |  2 +-
 packages/bazel/src/ng_package/ng_package.bzl | 41 ++++++++++----------
 packages/bazel/src/ng_rollup_bundle.bzl      |  8 ++--
 tools/ngcontainer/Dockerfile                 |  2 +-
 tools/ngcontainer/README.md                  |  2 +-
 7 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ce1cfd6a8..ef587e0d90 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.3.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.0
+var_1: &docker_image angular/ngcontainer:0.3.2
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.2
 
 # Define common ENV vars
 var_3: &define_env_vars
@@ -187,6 +187,10 @@ jobs:
   # See comments inside the integration/run_tests.sh script.
   integration_test:
     <<: *job_defaults
+    # Note: we run Bazel in one of the integration tests, and it can consume >2G
+    # of memory. Together with the system under test, this can exhaust the RAM
+    # on a 4G worker so we use a larger machine here too.
+    resource_class: xlarge
     steps:
       - *define_env_vars
       - checkout:
diff --git a/WORKSPACE b/WORKSPACE
index 7fc3008e67..290243dc3e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -77,7 +77,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.13.0")
+check_bazel_version("0.14.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 4dd7f9fa78..ac95a4132e 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -44,7 +44,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
 
-check_bazel_version("0.13.0")
+check_bazel_version("0.14.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 0e74959433..875b3728e7 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -80,14 +80,14 @@ def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, for
   map_output = ctx.actions.declare_file(js_output.basename + ".map", sibling = js_output)
 
   args = ctx.actions.args()
-  args.add(["--config", rollup_config.path])
+  args.add("--config", rollup_config)
 
-  args.add(["--input", entry_point])
-  args.add(["--output.file", js_output.path])
-  args.add(["--output.format", format])
+  args.add("--input", entry_point)
+  args.add("--output.file", js_output)
+  args.add("--output.format", format)
   if package_name:
-    args.add(["--output.name", _global_name(package_name)])
-    args.add(["--amd.id", package_name])
+    args.add("--output.name", _global_name(package_name))
+    args.add("--amd.id", package_name)
 
   # Note: if the input has external source maps then we need to also install and use
   #   `rollup-plugin-sourcemaps`, which will require us to use rollup.config.js file instead
@@ -95,14 +95,15 @@ def _rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output, for
   args.add("--sourcemap")
 
   globals = dict(WELL_KNOWN_GLOBALS, **ctx.attr.globals)
-  args.add("--external")
   external = globals.keys()
   if not include_tslib:
     external.append("tslib")
-  args.add(external, join_with=",")
+  args.add_joined("--external", external, join_with=",")
 
-  args.add("--globals")
-  args.add(["%s:%s" % g for g in globals.items()], join_with=",")
+  args.add_joined(
+      "--globals",
+      ["%s:%s" % g for g in globals.items()],
+      join_with=",")
 
   args.add("--silent")
 
@@ -251,8 +252,8 @@ def _ng_package_impl(ctx):
   # The order of arguments matters here, as they are read in order in packager.ts.
   packager_args.add(npm_package_directory.path)
   packager_args.add(ctx.label.package)
-  packager_args.add([ctx.bin_dir.path, ctx.label.package], join_with="/")
-  packager_args.add([ctx.genfiles_dir.path, ctx.label.package], join_with="/")
+  packager_args.add_joined([ctx.bin_dir.path, ctx.label.package], join_with="/")
+  packager_args.add_joined([ctx.genfiles_dir.path, ctx.label.package], join_with="/")
 
   # Marshal the metadata into a JSON string so we can parse the data structure
   # in the TypeScript program easily.
@@ -273,19 +274,19 @@ def _ng_package_impl(ctx):
     # placeholder
     packager_args.add("")
 
-  packager_args.add(_flatten_paths(fesm2015), join_with=",")
-  packager_args.add(_flatten_paths(fesm5), join_with=",")
-  packager_args.add(_flatten_paths(esm2015), join_with=",")
-  packager_args.add(_flatten_paths(esm5), join_with=",")
-  packager_args.add(_flatten_paths(bundles), join_with=",")
-  packager_args.add([s.path for s in ctx.files.srcs], join_with=",")
+  packager_args.add_joined(_flatten_paths(fesm2015), join_with=",")
+  packager_args.add_joined(_flatten_paths(fesm5), join_with=",")
+  packager_args.add_joined(_flatten_paths(esm2015), join_with=",")
+  packager_args.add_joined(_flatten_paths(esm5), join_with=",")
+  packager_args.add_joined(_flatten_paths(bundles), join_with=",")
+  packager_args.add_joined([s.path for s in ctx.files.srcs], join_with=",")
 
   # TODO: figure out a better way to gather runfiles providers from the transitive closure.
-  packager_args.add([d.path for d in ctx.files.data], join_with=",")
+  packager_args.add_joined([d.path for d in ctx.files.data], join_with=",")
 
   if ctx.file.license_banner:
     packager_inputs.append(ctx.file.license_banner)
-    packager_args.add(ctx.file.license_banner.path)
+    packager_args.add(ctx.file.license_banner)
   else:
     # placeholder
     packager_args.add("")
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index e4584d6133..66603099d2 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -48,7 +48,7 @@ def _use_plain_rollup(ctx):
 
   strategy = ctx.var['compile']
   return strategy != 'legacy'
-  
+
 
 def run_brotli(ctx, input, output):
   ctx.actions.run(
@@ -61,10 +61,10 @@ def run_brotli(ctx, input, output):
 # Borrowed from bazelbuild/rules_nodejs
 def _run_tsc(ctx, input, output):
   args = ctx.actions.args()
-  args.add(["--target", "es5"])
+  args.add("--target", "es5")
   args.add("--allowJS")
-  args.add(input.path)
-  args.add(["--outFile", output.path])
+  args.add(input)
+  args.add("--outFile", output)
 
   ctx.action(
       executable = ctx.executable._tsc,
diff --git a/tools/ngcontainer/Dockerfile b/tools/ngcontainer/Dockerfile
index 0c3f41421f..eec67f69be 100644
--- a/tools/ngcontainer/Dockerfile
+++ b/tools/ngcontainer/Dockerfile
@@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
 ###
 # Bazel install
 # See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
-RUN BAZEL_VERSION="0.13.0" \
+RUN BAZEL_VERSION="0.14.1" \
  && wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
  && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
  && apt-get update \
diff --git a/tools/ngcontainer/README.md b/tools/ngcontainer/README.md
index 0a9e0e9d9e..105900a86c 100644
--- a/tools/ngcontainer/README.md
+++ b/tools/ngcontainer/README.md
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
 - npm 5.5.1
 - yarn 1.3.2
 - Java 8 (for Closure Compiler and Bazel)
-- Bazel build tool v0.13.0 - http://bazel.build
+- Bazel build tool v0.14.1 - http://bazel.build
 - Google Chrome 63.0.3239.84
 - Mozilla Firefox 47.0.1
 - xvfb (virtual framebuffer) for headless testing

From 7c8159b3e21c1e761b1b84242ce4c43cae917e9b Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Thu, 14 Jun 2018 11:14:21 -0700
Subject: [PATCH 294/582] test(bazel): fix flakey bazel integration e2e test
 (#24522)

PR Close #24522
---
 integration/bazel/test/e2e/app.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/integration/bazel/test/e2e/app.spec.ts b/integration/bazel/test/e2e/app.spec.ts
index 79f46226d5..69e93ccd8d 100644
--- a/integration/bazel/test/e2e/app.spec.ts
+++ b/integration/bazel/test/e2e/app.spec.ts
@@ -1,5 +1,7 @@
 import {browser, by, element, ExpectedConditions} from 'protractor';
 
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;
+
 describe('angular example application', () => {
   it('should display: Hello World!', (done) => {
     browser.get('');

From 6d246d6c72b6630f63ce2c99b44325058c818b7b Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Thu, 14 Jun 2018 15:45:21 +0200
Subject: [PATCH 295/582] fix(ivy): allow view and content queries to match the
 same element (#24507)

When creating content queries from a directive on an element we need to take into account
existing view queries. The same element can be reported to both content and view queries
so freshly created content queries must be combined with pre-existing view queries.

PR Close #24507
---
 packages/core/src/render3/instructions.ts |  2 +-
 packages/core/test/render3/query_spec.ts  | 68 ++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index c9c775a8fd..10ea38172c 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -124,7 +124,7 @@ let currentQueries: LQueries|null;
 
 export function getCurrentQueries(QueryType: {new (): LQueries}): LQueries {
   // top level variables should not be exported for performance reasons (PERF_NOTES.md)
-  return currentQueries || (currentQueries = new QueryType());
+  return currentQueries || (currentQueries = (previousOrParentNode.queries || new QueryType()));
 }
 
 /**
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index b94e8d26fc..9efe0bdb3c 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -7,12 +7,12 @@
  */
 
 import {NgForOfContext} from '@angular/common';
-import {TemplateRef, ViewContainerRef} from '@angular/core';
+import {ElementRef, TemplateRef, ViewContainerRef} from '@angular/core';
 
 import {EventEmitter} from '../..';
 import {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
 import {AttributeMarker, QueryList, defineComponent, defineDirective, detectChanges, injectViewContainerRef} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, queryRefresh} from '../../src/render3/query';
 
@@ -1365,4 +1365,68 @@ describe('query', () => {
       expect((queryInstance !.changes as EventEmitter<any>).closed).toBeTruthy();
     });
   });
+
+  describe('content', () => {
+
+    // https://stackblitz.com/edit/angular-wlenwd?file=src%2Fapp%2Fapp.component.ts
+    it('should support view and content queries matching the same element', () => {
+      let withContentComponentInstance: WithContentComponent;
+
+      class WithContentComponent {
+        // @ContentChildren('foo') foos;
+        foos: QueryList<ElementRef>;
+
+        static ngComponentDef = defineComponent({
+          type: WithContentComponent,
+          selectors: [['with-content']],
+          factory: () => {
+            return [new WithContentComponent(), query(null, ['foo'], true, QUERY_READ_FROM_NODE)];
+          },
+          template: (rf: RenderFlags, ctx: WithContentComponent) => {
+            // intentionally left empty, don't need anything for this test
+          },
+          hostBindings: function ContentQueryComponent_HostBindings(
+              dirIndex: number, elIndex: number) {
+            let tmp: any;
+            withContentComponentInstance = loadDirective<any[]>(dirIndex)[0];
+            queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
+                (withContentComponentInstance.foos = tmp as QueryList<any>);
+          },
+        });
+      }
+
+      /**
+       * <with-content>
+       *   <div #foo></div>
+       * </with-content>
+       * <div id="after" #bar></div>
+       * class Cmpt {
+       *  @ViewChildren('foo, bar') foos;
+       * }
+       */
+      const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
+        let tmp: any;
+        if (rf & RenderFlags.Create) {
+          query(0, ['foo', 'bar'], true, QUERY_READ_FROM_NODE);
+          elementStart(1, 'with-content');
+          { element(2, 'div', null, ['foo', '']); }
+          elementEnd();
+          element(4, 'div', ['id', 'after'], ['bar', '']);
+        }
+        if (rf & RenderFlags.Update) {
+          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.foos = tmp as QueryList<any>);
+        }
+      }, [WithContentComponent]);
+
+      const fixture = new ComponentFixture(AppComponent);
+      const viewQList = fixture.component.foos;
+
+      expect(viewQList.length).toBe(2);
+      expect(withContentComponentInstance !.foos.length).toBe(1);
+      expect(viewQList.first.nativeElement)
+          .toBe(withContentComponentInstance !.foos.first.nativeElement);
+      expect(viewQList.last.nativeElement.id).toBe('after');
+    });
+
+  });
 });

From f00ae516eb687a6331ac8817b2ae6fd92e2a25bd Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 12 Jun 2018 16:58:09 -0700
Subject: [PATCH 296/582] feat(ivy): implement host bindings in JIT mode
 (#24479)

PR Close #24479
---
 packages/compiler/src/compiler.ts             |  2 +-
 .../compiler/src/render3/view/compiler.ts     | 42 +++++++++++++
 .../src/template_parser/binding_parser.ts     |  4 +-
 packages/core/src/render3/jit/directive.ts    | 63 ++++++++++++++-----
 packages/core/test/render3/ivy/jit_spec.ts    | 25 +++++++-
 5 files changed, 117 insertions(+), 19 deletions(-)

diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index b64abc6716..f3067a6c0e 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -85,5 +85,5 @@ export {jitExpression} from './render3/r3_jit';
 export {R3DependencyMetadata, R3FactoryMetadata, R3ResolvedDependencyType} from './render3/r3_factory';
 export {compileNgModule, R3NgModuleMetadata} from './render3/r3_module_compiler';
 export {makeBindingParser, parseTemplate} from './render3/view/template';
-export {compileComponentFromMetadata, compileDirectiveFromMetadata} from './render3/view/compiler';
+export {compileComponentFromMetadata, compileDirectiveFromMetadata, parseHostBindings} from './render3/view/compiler';
 // This file only reexports content of the `src` folder. Keep it that way.
\ No newline at end of file
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index d830630418..089b652a7c 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -445,3 +445,45 @@ function typeMapToExpressionMap(
       ([key, type]): [string, o.Expression] => [key, outputCtx.importExpr(type)]);
   return new Map(entries);
 }
+
+const HOST_REG_EXP = /^(?:(?:\[([^\]]+)\])|(?:\(([^\)]+)\)))|(\@[-\w]+)$/;
+
+// Represents the groups in the above regex.
+const enum HostBindingGroup {
+  // group 1: "prop" from "[prop]"
+  Property = 1,
+
+  // group 2: "event" from "(event)"
+  Event = 2,
+
+  // group 3: "@trigger" from "@trigger"
+  Animation = 3,
+}
+
+export function parseHostBindings(host: {[key: string]: string}): {
+  attributes: {[key: string]: string},
+  listeners: {[key: string]: string},
+  properties: {[key: string]: string},
+  animations: {[key: string]: string},
+} {
+  const attributes: {[key: string]: string} = {};
+  const listeners: {[key: string]: string} = {};
+  const properties: {[key: string]: string} = {};
+  const animations: {[key: string]: string} = {};
+
+  Object.keys(host).forEach(key => {
+    const value = host[key];
+    const matches = key.match(HOST_REG_EXP);
+    if (matches === null) {
+      attributes[key] = value;
+    } else if (matches[HostBindingGroup.Property] != null) {
+      properties[matches[HostBindingGroup.Property]] = value;
+    } else if (matches[HostBindingGroup.Event] != null) {
+      listeners[matches[HostBindingGroup.Event]] = value;
+    } else if (matches[HostBindingGroup.Animation] != null) {
+      animations[matches[HostBindingGroup.Animation]] = value;
+    }
+  });
+
+  return {attributes, listeners, properties, animations};
+}
\ No newline at end of file
diff --git a/packages/compiler/src/template_parser/binding_parser.ts b/packages/compiler/src/template_parser/binding_parser.ts
index 04aa7ba9f7..44d6c0951a 100644
--- a/packages/compiler/src/template_parser/binding_parser.ts
+++ b/packages/compiler/src/template_parser/binding_parser.ts
@@ -221,7 +221,7 @@ export class BindingParser {
 
   private _parseBinding(value: string, isHostBinding: boolean, sourceSpan: ParseSourceSpan):
       ASTWithSource {
-    const sourceInfo = sourceSpan.start.toString();
+    const sourceInfo = (sourceSpan && sourceSpan.start || '(unknown)').toString();
 
     try {
       const ast = isHostBinding ?
@@ -343,7 +343,7 @@ export class BindingParser {
   }
 
   private _parseAction(value: string, sourceSpan: ParseSourceSpan): ASTWithSource {
-    const sourceInfo = sourceSpan.start.toString();
+    const sourceInfo = (sourceSpan && sourceSpan.start || '(unknown').toString();
 
     try {
       const ast = this._exprParser.parseAction(value, sourceInfo, this._interpolationConfig);
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index 9e5d00539d..9c0b2d3fb1 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata as compileR3Component, compileDirectiveFromMetadata as compileR3Directive, jitExpression, makeBindingParser, parseTemplate} from '@angular/compiler';
+import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata as compileR3Component, compileDirectiveFromMetadata as compileR3Directive, jitExpression, makeBindingParser, parseHostBindings, parseTemplate} from '@angular/compiler';
 
-import {Component, Directive, HostBinding, Input, Output} from '../../metadata/directives';
+import {Component, Directive, HostBinding, HostListener, Input, Output} from '../../metadata/directives';
 import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
 import {Type} from '../../type';
 
@@ -19,6 +19,10 @@ import {getReflect, reflectDependencies} from './util';
 
 let _pendingPromises: Promise<void>[] = [];
 
+type StringMap = {
+  [key: string]: string
+};
+
 /**
  * Compile an Angular component according to its decorator metadata, and patch the resulting
  * ngComponentDef onto the component type.
@@ -137,12 +141,14 @@ export function awaitCurrentlyCompilingComponents(): Promise<void> {
  */
 function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMetadata {
   // Reflect inputs and outputs.
-  const props = getReflect().propMetadata(type);
-  const inputs: {[key: string]: string} = {};
-  const outputs: {[key: string]: string} = {};
+  const propMetadata = getReflect().propMetadata(type);
+  const inputs: StringMap = {};
+  const outputs: StringMap = {};
 
-  for (let field in props) {
-    props[field].forEach(ann => {
+  const host = extractHostBindings(metadata, propMetadata);
+
+  for (let field in propMetadata) {
+    propMetadata[field].forEach(ann => {
       if (isInput(ann)) {
         inputs[field] = ann.bindingPropertyName || field;
       } else if (isOutput(ann)) {
@@ -155,14 +161,7 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
     name: type.name,
     type: new WrappedNodeExpr(type),
     selector: metadata.selector !,
-    deps: reflectDependencies(type),
-    host: {
-      attributes: {},
-      listeners: {},
-      properties: {},
-    },
-    inputs,
-    outputs,
+    deps: reflectDependencies(type), host, inputs, outputs,
     queries: [],
     lifecycle: {
       usesOnChanges: type.prototype.ngOnChanges !== undefined,
@@ -171,6 +170,32 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
   };
 }
 
+function extractHostBindings(metadata: Directive, propMetadata: {[key: string]: any[]}): {
+  attributes: StringMap,
+  listeners: StringMap,
+  properties: StringMap,
+} {
+  // First parse the declarations from the metadata.
+  const {attributes, listeners, properties, animations} = parseHostBindings(metadata.host || {});
+
+  if (Object.keys(animations).length > 0) {
+    throw new Error(`Animation bindings are as-of-yet unsupported in Ivy`);
+  }
+
+  // Next, loop over the properties of the object, looking for @HostBinding and @HostListener.
+  for (let field in propMetadata) {
+    propMetadata[field].forEach(ann => {
+      if (isHostBinding(ann)) {
+        properties[ann.hostPropertyName || field] = field;
+      } else if (isHostListener(ann)) {
+        listeners[ann.eventName || field] = `${field}(${(ann.args || []).join(',')})`;
+      }
+    });
+  }
+
+  return {attributes, listeners, properties};
+}
+
 function isInput(value: any): value is Input {
   return value.ngMetadataName === 'Input';
 }
@@ -178,3 +203,11 @@ function isInput(value: any): value is Input {
 function isOutput(value: any): value is Output {
   return value.ngMetadataName === 'Output';
 }
+
+function isHostBinding(value: any): value is HostBinding {
+  return value.ngMetadataName === 'HostBinding';
+}
+
+function isHostListener(value: any): value is HostListener {
+  return value.ngMetadataName === 'HostListener';
+}
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index f09edbe042..1a82a60372 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -9,7 +9,7 @@
 import {Injectable} from '@angular/core/src/di/injectable';
 import {inject, setCurrentInjector} from '@angular/core/src/di/injector';
 import {ivyEnabled} from '@angular/core/src/ivy_switch';
-import {Component} from '@angular/core/src/metadata/directives';
+import {Component, HostBinding, HostListener} from '@angular/core/src/metadata/directives';
 import {NgModule, NgModuleDef} from '@angular/core/src/metadata/ng_module';
 import {ComponentDef} from '@angular/core/src/render3/interfaces/definition';
 
@@ -161,6 +161,29 @@ ivyEnabled && describe('render3 jit', () => {
     expect(cmpDef.directiveDefs instanceof Function).toBe(true);
     expect((cmpDef.directiveDefs as Function)()).toEqual([cmpDef]);
   });
+
+  it('should add hostbindings and hostlisteners', () => {
+    @Component({
+      template: 'foo',
+      selector: 'foo',
+      host: {
+        '[class.red]': 'isRed',
+        '(click)': 'onClick()',
+      },
+    })
+    class Cmp {
+      @HostBinding('class.green')
+      green: boolean = false;
+
+      @HostListener('change', ['$event'])
+      onChange(event: any): void {}
+    }
+
+    const cmpDef = (Cmp as any).ngComponentDef as ComponentDef<Cmp>;
+
+    expect(cmpDef.hostBindings).toBeDefined();
+    expect(cmpDef.hostBindings !.length).toBe(2);
+  });
 });
 
 it('ensure at least one spec exists', () => {});

From a45fad3dd9c3d8ef9b6030603e6ce40ecb2c6082 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 13 Jun 2018 08:39:32 -0700
Subject: [PATCH 297/582] fix(ivy): keep JIT symbol table and r3_identifiers in
 sync (#24479)

At runtime in JIT mode, when the compiler writes a reference to a symbol that symbol
is resolved through a symbol table named angularCoreEnv in render3/jit/environment.
Previously, this symbol table was not kept up-to-date with the Ivy instruction set
and the names of symbols the compiler could reference.

This change brings the symbol table in sync, and also adds a test that verifies every
symbol the compiler can reference is available at runtime in the symbol table.

PR Close #24479
---
 .../compiler/src/render3/r3_identifiers.ts    |  4 --
 packages/core/src/render3/jit/environment.ts  |  9 +++-
 packages/core/test/render3/BUILD.bazel        |  1 +
 .../core/test/render3/jit_environment_spec.ts | 43 +++++++++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 packages/core/test/render3/jit_environment_spec.ts

diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index f665b557dd..51dc0bcafe 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -84,10 +84,6 @@ export class Identifiers {
   static projection: o.ExternalReference = {name: 'ɵP', moduleName: CORE};
   static projectionDef: o.ExternalReference = {name: 'ɵpD', moduleName: CORE};
 
-  static refreshComponent: o.ExternalReference = {name: 'ɵr', moduleName: CORE};
-
-  static directiveLifeCycle: o.ExternalReference = {name: 'ɵl', moduleName: CORE};
-
   static inject: o.ExternalReference = {name: 'inject', moduleName: CORE};
 
   static injectAttribute: o.ExternalReference = {name: 'ɵinjectAttribute', moduleName: CORE};
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 3db548c1da..b4e0b8f0b5 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {defineInjectable} from '../../di/defs';
+import {defineInjectable, defineInjector,} from '../../di/defs';
 import {inject} from '../../di/injector';
 import {defineNgModule} from '../../metadata/ng_module';
 import * as r3 from '../index';
@@ -21,7 +21,9 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵdefineComponent': r3.defineComponent,
   'ɵdefineDirective': r3.defineDirective,
   'defineInjectable': defineInjectable,
+  'defineInjector': defineInjector,
   'ɵdefineNgModule': defineNgModule,
+  'ɵdefinePipe': r3.definePipe,
   'ɵdirectiveInject': r3.directiveInject,
   'inject': inject,
   'ɵinjectAttribute': r3.injectAttribute,
@@ -60,18 +62,23 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵi6': r3.i6,
   'ɵi7': r3.i7,
   'ɵi8': r3.i8,
+  'ɵiV': r3.iV,
   'ɵk': r3.k,
   'ɵkn': r3.kn,
   'ɵL': r3.L,
   'ɵld': r3.ld,
+  'ɵP': r3.P,
   'ɵp': r3.p,
   'ɵpb1': r3.pb1,
   'ɵpb2': r3.pb2,
   'ɵpb3': r3.pb3,
   'ɵpb4': r3.pb4,
   'ɵpbV': r3.pbV,
+  'ɵpD': r3.pD,
+  'ɵPp': r3.Pp,
   'ɵQ': r3.Q,
   'ɵqR': r3.qR,
+  'ɵrS': r3.rS,
   'ɵs': r3.s,
   'ɵsn': r3.sn,
   'ɵst': r3.st,
diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
index a3f89ee72f..52546212b3 100644
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@@ -21,6 +21,7 @@ ts_library(
         "//packages/animations/browser",
         "//packages/animations/browser/testing",
         "//packages/common",
+        "//packages/compiler",
         "//packages/core",
         "//packages/core/testing",
         "//packages/platform-browser",
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
new file mode 100644
index 0000000000..c451f856a0
--- /dev/null
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -0,0 +1,43 @@
+/**
+ * @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 {ExternalReference} from '@angular/compiler';
+import {Identifiers} from '@angular/compiler/src/render3/r3_identifiers';
+
+import {angularCoreEnv} from '../../src/render3/jit/environment';
+
+const INTERFACE_EXCEPTIONS = new Set<string>([
+  'ComponentDef',
+  'DirectiveDef',
+]);
+
+describe('r3 jit environment', () => {
+  // This test keeps render3/jit/environment and r3_identifiers in the compiler in sync, ensuring
+  // that if the compiler writes a reference to a render3 symbol, it will be resolvable at runtime
+  // in JIT mode.
+  it('should support all r3 symbols', () => {
+    Object
+        // Map over the static properties of Identifiers.
+        .keys(Identifiers)
+        .map(key => (Identifiers as any as{[key: string]: string | ExternalReference})[key])
+        // A few such properties are string constants. Ignore them, and focus on ExternalReferences.
+        .filter(isExternalReference)
+        // Some references are to interface types. Only take properties which have runtime values.
+        .filter(sym => !INTERFACE_EXCEPTIONS.has(sym.name))
+        .forEach(sym => {
+          // Assert that angularCoreEnv has a reference to the runtime symbol.
+          expect(angularCoreEnv.hasOwnProperty(sym.name))
+              .toBe(true, `Missing symbol ${sym.name} in render3/jit/environment`);
+        });
+  });
+});
+
+function isExternalReference(sym: ExternalReference | string): sym is ExternalReference&
+    {name: string} {
+  return typeof sym === 'object' && sym.name !== null && sym.moduleName !== null;
+}

From 0f7e4fae207c15056aae67282d64ec6f7c1e91fb Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 13 Jun 2018 09:44:36 -0700
Subject: [PATCH 298/582] style(ivy): defeat clang format issue (#24479)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

clang-format (on mac) has taken a disliking to this particular line, and
rewrites one of the ɵ characters to an invalid Unicode sequence.

PR Close #24479
---
 .../render3/compiler_canonical/component_directives_spec.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index d15391a594..9f2bb7c85c 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -530,7 +530,11 @@ describe('components & directives', () => {
               $r3$.ɵT(0);
             }
             if (rf & 2) {
+              // clang-format wants to break this line by changing the second 'ɵ' to an invalid
+              // unicode sequence.
+              // clang-format off
               $r3$.ɵt(0, $r3$.ɵb(ctx.num));
+              // clang-format on
             }
           },
           inputs: {num: 'num'}

From 27bc7dcb43ec20d185b92986cba06cbc0329b58f Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 31 May 2018 15:50:02 -0700
Subject: [PATCH 299/582] feat(ivy): ngtsc compiles @Component, @Directive,
 @NgModule (#24427)

This change supports compilation of components, directives, and modules
within ngtsc. Support is not complete, but is enough to compile and test
//packages/core/test/bundling/todo in full AOT mode. Code size benefits
are not yet achieved as //packages/core itself does not get compiled, and
some decorators (e.g. @Input) are not stripped, leading to unwanted code
being retained by the tree-shaker. This will be improved in future commits.

PR Close #24427
---
 .../src/largetable/render3/table.ts           |   4 +-
 modules/benchmarks/src/tree/render3/tree.ts   |   6 +-
 packages/compiler-cli/BUILD.bazel             |   1 +
 .../src/ngtsc/annotations/BUILD.bazel         |  17 +
 .../src/ngtsc/annotations/index.ts            |  13 +
 .../src/ngtsc/annotations/src/component.ts    | 117 ++++++
 .../src/ngtsc/annotations/src/directive.ts    | 212 +++++++++++
 .../src/injectable.ts                         |  41 +-
 .../src/ngtsc/annotations/src/ng_module.ts    | 116 ++++++
 .../ngtsc/annotations/src/selector_scope.ts   | 353 ++++++++++++++++++
 .../src/ngtsc/annotations/src/util.ts         |  84 +++++
 .../src/ngtsc/annotations/test/BUILD.bazel    |  28 ++
 .../annotations/test/selector_scope_spec.ts   |  79 ++++
 .../src/ngtsc/metadata/BUILD.bazel            |   1 +
 .../compiler-cli/src/ngtsc/metadata/index.ts  |   5 +-
 .../src/ngtsc/metadata/src/reflector.ts       | 100 +++++
 .../src/ngtsc/metadata/src/resolver.ts        | 338 +++++++++++------
 .../src/ngtsc/metadata/test/BUILD.bazel       |   1 +
 .../src/ngtsc/metadata/test/resolver_spec.ts  |  60 ++-
 packages/compiler-cli/src/ngtsc/program.ts    |  13 +-
 .../src/ngtsc/testing/in_memory_typescript.ts |   5 +-
 .../src/ngtsc/transform/BUILD.bazel           |   1 +
 .../compiler-cli/src/ngtsc/transform/index.ts |   2 +-
 .../src/ngtsc/transform/src/api.ts            |  13 +-
 .../src/ngtsc/transform/src/compilation.ts    |  13 +-
 .../src/ngtsc/transform/src/declaration.ts    |   8 +-
 .../src/ngtsc/transform/src/transform.ts      |  78 ++--
 .../src/ngtsc/transform/src/translator.ts     |  89 ++++-
 .../src/ngtsc/util/src/visitor.ts             |  26 +-
 .../test/ngtsc/fake_core/index.ts             |   2 +
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     |  60 ++-
 .../compiler/src/render3/r3_identifiers.ts    |   5 +
 .../src/render3/r3_module_compiler.ts         |   7 +-
 .../compiler/src/render3/view/compiler.ts     |  18 +-
 .../compiler/src/render3/view/template.ts     |   4 +-
 .../core/src/core_render3_private_export.ts   |   5 +-
 packages/core/src/metadata.ts                 |   2 +-
 packages/core/src/metadata/directives.ts      |   8 +
 packages/core/src/metadata/ng_module.ts       |  50 ++-
 packages/core/src/render3/component.ts        |   9 +-
 packages/core/src/render3/component_ref.ts    |   4 +-
 packages/core/src/render3/definition.ts       |  25 +-
 packages/core/src/render3/di.ts               |  10 +-
 packages/core/src/render3/hooks.ts            |  10 +-
 packages/core/src/render3/index.ts            |  10 +-
 packages/core/src/render3/instructions.ts     |  34 +-
 .../core/src/render3/interfaces/definition.ts |  28 +-
 packages/core/src/render3/interfaces/view.ts  |   4 +-
 packages/core/src/render3/jit/directive.ts    |   4 +-
 packages/core/src/render3/jit/environment.ts  |   3 +-
 packages/core/src/render3/jit/module.ts       |  18 +-
 packages/core/src/render3/query.ts            |   4 +-
 .../test/bundling/hello_world/BUILD.bazel     |   1 +
 packages/core/test/bundling/todo/BUILD.bazel  |   6 +-
 .../bundling/todo/bundle.golden_symbols.json  | 174 ---------
 packages/core/test/bundling/todo/index.ts     |  31 +-
 .../component_directives_spec.ts              |  51 +--
 .../compiler_canonical/elements_spec.ts       |   5 +-
 .../compiler_canonical/life_cycle_spec.ts     |   5 +-
 .../render3/compiler_canonical/pipes_spec.ts  |   8 +-
 .../render3/compiler_canonical/query_spec.ts  |   6 +-
 .../compiler_canonical/small_app_spec.ts      |   2 +-
 .../template_variables_spec.ts                |   4 +-
 packages/core/test/render3/component_spec.ts  |   4 +-
 packages/core/test/render3/define_spec.ts     |  22 +-
 packages/core/test/render3/ivy/jit_spec.ts    |  12 +-
 .../core/test/render3/jit_environment_spec.ts |   1 +
 packages/core/test/render3/render_util.ts     |   6 +-
 packages/core/testing/src/test_bed.ts         |   5 +-
 69 files changed, 1884 insertions(+), 607 deletions(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/index.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/component.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
 rename packages/compiler-cli/src/ngtsc/{transform => annotations}/src/injectable.ts (78%)
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/util.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts

diff --git a/modules/benchmarks/src/largetable/render3/table.ts b/modules/benchmarks/src/largetable/render3/table.ts
index 85b43102ce..881f487525 100644
--- a/modules/benchmarks/src/largetable/render3/table.ts
+++ b/modules/benchmarks/src/largetable/render3/table.ts
@@ -7,7 +7,7 @@
  */
 
 import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as detectChanges, ɵe as e, ɵsn as sn, ɵt as t, ɵv as v} from '@angular/core';
-import {ComponentDef} from '@angular/core/src/render3/interfaces/definition';
+import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 import {TableCell, buildTable, emptyTable} from '../util';
 
@@ -15,7 +15,7 @@ export class LargeTableComponent {
   data: TableCell[][] = emptyTable;
 
   /** @nocollapse */
-  static ngComponentDef: ComponentDef<LargeTableComponent> = defineComponent({
+  static ngComponentDef: ComponentDefInternal<LargeTableComponent> = defineComponent({
     type: LargeTableComponent,
     selectors: [['largetable']],
     template: function(rf: RenderFlags, ctx: LargeTableComponent) {
diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts
index 61bd0955e0..8b629df4b5 100644
--- a/modules/benchmarks/src/tree/render3/tree.ts
+++ b/modules/benchmarks/src/tree/render3/tree.ts
@@ -7,7 +7,7 @@
  */
 
 import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as _detectChanges, ɵe as e, ɵi1 as i1, ɵp as p, ɵsn as sn, ɵt as t, ɵv as v} from '@angular/core';
-import {ComponentDef} from '@angular/core/src/render3/interfaces/definition';
+import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 import {TreeNode, buildTree, emptyTree} from '../util';
 
@@ -35,7 +35,7 @@ export class TreeComponent {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef: ComponentDef<TreeComponent> = defineComponent({
+  static ngComponentDef: ComponentDefInternal<TreeComponent> = defineComponent({
     type: TreeComponent,
     selectors: [['tree']],
     template: function(rf: RenderFlags, ctx: TreeComponent) {
@@ -95,7 +95,7 @@ export class TreeFunction {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef: ComponentDef<TreeFunction> = defineComponent({
+  static ngComponentDef: ComponentDefInternal<TreeFunction> = defineComponent({
     type: TreeFunction,
     selectors: [['tree']],
     template: function(rf: RenderFlags, ctx: TreeFunction) {
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 867afd5333..fcdf1eb025 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -25,6 +25,7 @@ ts_library(
     tsconfig = ":tsconfig",
     deps = [
         "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/annotations",
         "//packages/compiler-cli/src/ngtsc/transform",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
new file mode 100644
index 0000000000..0e502d94c4
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
@@ -0,0 +1,17 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "annotations",
+    srcs = glob([
+        "index.ts",
+        "src/**/*.ts",
+    ]),
+    module_name = "@angular/compiler-cli/src/ngtsc/annotations",
+    deps = [
+        "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/metadata",
+        "//packages/compiler-cli/src/ngtsc/transform",
+    ],
+)
diff --git a/packages/compiler-cli/src/ngtsc/annotations/index.ts b/packages/compiler-cli/src/ngtsc/annotations/index.ts
new file mode 100644
index 0000000000..f56e3074cc
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/index.ts
@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export {ComponentDecoratorHandler} from './src/component';
+export {DirectiveDecoratorHandler} from './src/directive';
+export {InjectableDecoratorHandler} from './src/injectable';
+export {NgModuleDecoratorHandler} from './src/ng_module';
+export {CompilationScope, SelectorScopeRegistry} from './src/selector_scope';
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
new file mode 100644
index 0000000000..13894bdf82
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -0,0 +1,117 @@
+/**
+ * @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 {ConstantPool, Expression, R3ComponentMetadata, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata, makeBindingParser, parseTemplate} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Decorator, reflectNonStaticField, reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
+
+import {extractDirectiveMetadata} from './directive';
+import {SelectorScopeRegistry} from './selector_scope';
+
+const EMPTY_MAP = new Map<string, Expression>();
+
+/**
+ * `DecoratorHandler` which handles the `@Component` annotation.
+ */
+export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMetadata> {
+  constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
+
+  detect(decorators: Decorator[]): Decorator|undefined {
+    return decorators.find(
+        decorator => decorator.name === 'Component' && decorator.from === '@angular/core');
+  }
+
+  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3ComponentMetadata> {
+    const meta = decorator.args[0];
+    if (!ts.isObjectLiteralExpression(meta)) {
+      throw new Error(`Decorator argument must be literal.`);
+    }
+
+    // @Component inherits @Directive, so begin by extracting the @Directive metadata and building
+    // on it.
+    const directiveMetadata = extractDirectiveMetadata(node, decorator, this.checker);
+    if (directiveMetadata === undefined) {
+      // `extractDirectiveMetadata` returns undefined when the @Directive has `jit: true`. In this
+      // case, compilation of the decorator is skipped. Returning an empty object signifies
+      // that no analysis was produced.
+      return {};
+    }
+
+    // Next, read the `@Component`-specific fields.
+    const component = reflectObjectLiteral(meta);
+
+    // Resolve and parse the template.
+    if (!component.has('template')) {
+      throw new Error(`For now, components must directly have a template.`);
+    }
+    const templateExpr = component.get('template') !;
+    const templateStr = staticallyResolve(templateExpr, this.checker);
+    if (typeof templateStr !== 'string') {
+      throw new Error(`Template must statically resolve to a string: ${node.name!.text}`);
+    }
+
+    let preserveWhitespaces: boolean = false;
+    if (component.has('preserveWhitespaces')) {
+      const value = staticallyResolve(component.get('preserveWhitespaces') !, this.checker);
+      if (typeof value !== 'boolean') {
+        throw new Error(`preserveWhitespaces must resolve to a boolean if present`);
+      }
+      preserveWhitespaces = value;
+    }
+
+    const template = parseTemplate(
+        templateStr, `${node.getSourceFile().fileName}#${node.name!.text}/template.html`,
+        {preserveWhitespaces});
+    if (template.errors !== undefined) {
+      throw new Error(
+          `Errors parsing template: ${template.errors.map(e => e.toString()).join(', ')}`);
+    }
+
+    // If the component has a selector, it should be registered with the `SelectorScopeRegistry` so
+    // when this component appears in an `@NgModule` scope, its selector can be determined.
+    if (directiveMetadata.selector !== null) {
+      this.scopeRegistry.registerSelector(node, directiveMetadata.selector);
+    }
+
+    return {
+      analysis: {
+        ...directiveMetadata,
+        template,
+        viewQueries: [],
+
+        // These will be replaced during the compilation step, after all `NgModule`s have been
+        // analyzed and the full compilation scope for the component can be realized.
+        pipes: EMPTY_MAP,
+        directives: EMPTY_MAP,
+      }
+    };
+  }
+  compile(node: ts.ClassDeclaration, analysis: R3ComponentMetadata): CompileResult {
+    const pool = new ConstantPool();
+
+    // Check whether this component was registered with an NgModule. If so, it should be compiled
+    // under that module's compilation scope.
+    const scope = this.scopeRegistry.lookupCompilationScope(node);
+    if (scope !== null) {
+      // Replace the empty components and directives from the analyze() step with a fully expanded
+      // scope. This is possible now because during compile() the whole compilation unit has been
+      // fully analyzed.
+      analysis = {...analysis, ...scope};
+    }
+
+    const res = compileComponentFromMetadata(analysis, pool, makeBindingParser());
+    return {
+      field: 'ngComponentDef',
+      initializer: res.expression,
+      statements: pool.statements,
+      type: res.type,
+    };
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
new file mode 100644
index 0000000000..f9e49f69f2
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -0,0 +1,212 @@
+/**
+ * @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 {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileDirectiveFromMetadata, makeBindingParser} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Decorator, staticallyResolve} from '../../metadata';
+import {DecoratedNode, getDecoratedClassElements, reflectNonStaticField, reflectObjectLiteral} from '../../metadata/src/reflector';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
+
+import {SelectorScopeRegistry} from './selector_scope';
+import {getConstructorDependencies} from './util';
+
+const EMPTY_OBJECT: {[key: string]: string} = {};
+
+export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMetadata> {
+  constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
+
+  detect(decorators: Decorator[]): Decorator|undefined {
+    return decorators.find(
+        decorator => decorator.name === 'Directive' && decorator.from === '@angular/core');
+  }
+
+  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3DirectiveMetadata> {
+    const analysis = extractDirectiveMetadata(node, decorator, this.checker);
+
+    // If the directive has a selector, it should be registered with the `SelectorScopeRegistry` so
+    // when this directive appears in an `@NgModule` scope, its selector can be determined.
+    if (analysis && analysis.selector !== null) {
+      this.scopeRegistry.registerSelector(node, analysis.selector);
+    }
+
+    return {analysis};
+  }
+
+  compile(node: ts.ClassDeclaration, analysis: R3DirectiveMetadata): CompileResult {
+    const pool = new ConstantPool();
+    const res = compileDirectiveFromMetadata(analysis, pool, makeBindingParser());
+    return {
+      field: 'ngDirectiveDef',
+      initializer: res.expression,
+      statements: pool.statements,
+      type: res.type,
+    };
+  }
+}
+
+/**
+ * Helper function to extract metadata from a `Directive` or `Component`.
+ */
+export function extractDirectiveMetadata(
+    clazz: ts.ClassDeclaration, decorator: Decorator, checker: ts.TypeChecker): R3DirectiveMetadata|
+    undefined {
+  const meta = decorator.args[0];
+  if (!ts.isObjectLiteralExpression(meta)) {
+    throw new Error(`Decorator argument must be literal.`);
+  }
+  const directive = reflectObjectLiteral(meta);
+
+  if (directive.has('jit')) {
+    // The only allowed value is true, so there's no need to expand further.
+    return undefined;
+  }
+
+  // Precompute a list of ts.ClassElements that have decorators. This includes things like @Input,
+  // @Output, @HostBinding, etc.
+  const decoratedElements = getDecoratedClassElements(clazz, checker);
+
+  // Construct the map of inputs both from the @Directive/@Component decorator, and the decorated
+  // fields.
+  const inputsFromMeta = parseFieldToPropertyMapping(directive, 'inputs', checker);
+  const inputsFromFields = parseDecoratedFields(
+      findDecoratedFields(decoratedElements, '@angular/core', 'Input'), checker);
+
+  // And outputs.
+  const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', checker);
+  const outputsFromFields = parseDecoratedFields(
+      findDecoratedFields(decoratedElements, '@angular/core', 'Output'), checker);
+
+  // Parse the selector.
+  let selector = '';
+  if (directive.has('selector')) {
+    const resolved = staticallyResolve(directive.get('selector') !, checker);
+    if (typeof resolved !== 'string') {
+      throw new Error(`Selector must be a string`);
+    }
+    selector = resolved;
+  }
+
+  // Determine if `ngOnChanges` is a lifecycle hook defined on the component.
+  const usesOnChanges = reflectNonStaticField(clazz, 'ngOnChanges') !== null;
+
+  return {
+    name: clazz.name !.text,
+    deps: getConstructorDependencies(clazz, checker),
+    host: {
+      attributes: {},
+      listeners: {},
+      properties: {},
+    },
+    lifecycle: {
+        usesOnChanges,
+    },
+    inputs: {...inputsFromMeta, ...inputsFromFields},
+    outputs: {...outputsFromMeta, ...outputsFromFields},
+    queries: [], selector,
+    type: new WrappedNodeExpr(clazz.name !),
+    typeSourceSpan: null !,
+  };
+}
+
+function assertIsStringArray(value: any[]): value is string[] {
+  for (let i = 0; i < value.length; i++) {
+    if (typeof value[i] !== 'string') {
+      throw new Error(`Failed to resolve @Directive.inputs[${i}] to a string`);
+    }
+  }
+  return true;
+}
+
+type DecoratedProperty = DecoratedNode<ts.PropertyDeclaration|ts.AccessorDeclaration>;
+
+/**
+ * Find all fields in the array of `DecoratedNode`s that have a decorator of the given type.
+ */
+function findDecoratedFields(
+    elements: DecoratedNode<ts.ClassElement>[], decoratorModule: string,
+    decoratorName: string): DecoratedProperty[] {
+  return elements
+      .map(entry => {
+        const element = entry.element;
+        // Only consider properties and accessors. Filter out everything else.
+        if (!ts.isPropertyDeclaration(element) && !ts.isAccessor(element)) {
+          return null;
+        }
+
+        // Extract the array of matching decorators (there could be more than one).
+        const decorators = entry.decorators.filter(
+            decorator => decorator.name === decoratorName && decorator.from === decoratorModule);
+        if (decorators.length === 0) {
+          // No matching decorators, don't include this element.
+          return null;
+        }
+        return {element, decorators};
+      })
+      // Filter out nulls.
+      .filter(entry => entry !== null) as DecoratedProperty[];
+}
+
+/**
+ * Interpret property mapping fields on the decorator (e.g. inputs or outputs) and return the
+ * correctly shaped metadata object.
+ */
+function parseFieldToPropertyMapping(
+    directive: Map<string, ts.Expression>, field: string,
+    checker: ts.TypeChecker): {[field: string]: string} {
+  if (!directive.has(field)) {
+    return EMPTY_OBJECT;
+  }
+
+  // Resolve the field of interest from the directive metadata to a string[].
+  const metaValues = staticallyResolve(directive.get(field) !, checker);
+  if (!Array.isArray(metaValues) || !assertIsStringArray(metaValues)) {
+    throw new Error(`Failed to resolve @Directive.${field}`);
+  }
+
+  return metaValues.reduce(
+      (results, value) => {
+        // Either the value is 'field' or 'field: property'. In the first case, `property` will
+        // be undefined, in which case the field name should also be used as the property name.
+        const [field, property] = value.split(':', 2).map(str => str.trim());
+        results[field] = property || field;
+        return results;
+      },
+      {} as{[field: string]: string});
+}
+
+/**
+ * Parse property decorators (e.g. `Input` or `Output`) and return the correctly shaped metadata
+ * object.
+ */
+function parseDecoratedFields(
+    fields: DecoratedProperty[], checker: ts.TypeChecker): {[field: string]: string} {
+  return fields.reduce(
+      (results, field) => {
+        const fieldName = (field.element.name as ts.Identifier).text;
+        field.decorators.forEach(decorator => {
+          // The decorator either doesn't have an argument (@Input()) in which case the property
+          // name is used, or it has one argument (@Output('named')).
+          if (decorator.args.length === 0) {
+            results[fieldName] = fieldName;
+          } else if (decorator.args.length === 1) {
+            const property = staticallyResolve(decorator.args[0], checker);
+            if (typeof property !== 'string') {
+              throw new Error(`Decorator argument must resolve to a string`);
+            }
+            results[fieldName] = property;
+          } else {
+            // Too many arguments.
+            throw new Error(
+                `Decorator must have 0 or 1 arguments, got ${decorator.args.length} argument(s)`);
+          }
+        });
+        return results;
+      },
+      {} as{[field: string]: string});
+}
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
similarity index 78%
rename from packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
rename to packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
index d6444bc584..f0210e78c1 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
@@ -11,14 +11,15 @@ import * as ts from 'typescript';
 
 import {Decorator} from '../../metadata';
 import {reflectConstructorParameters, reflectImportedIdentifier, reflectObjectLiteral} from '../../metadata/src/reflector';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform/src/api';
 
-import {AddStaticFieldInstruction, AnalysisOutput, CompilerAdapter} from './api';
+import {getConstructorDependencies} from './util';
 
 
 /**
  * Adapts the `compileIvyInjectable` compiler for `@Injectable` decorators to the Ivy compiler.
  */
-export class InjectableCompilerAdapter implements CompilerAdapter<R3InjectableMetadata> {
+export class InjectableDecoratorHandler implements DecoratorHandler<R3InjectableMetadata> {
   constructor(private checker: ts.TypeChecker) {}
 
   detect(decorator: Decorator[]): Decorator|undefined {
@@ -31,11 +32,12 @@ export class InjectableCompilerAdapter implements CompilerAdapter<R3InjectableMe
     };
   }
 
-  compile(node: ts.ClassDeclaration, analysis: R3InjectableMetadata): AddStaticFieldInstruction {
+  compile(node: ts.ClassDeclaration, analysis: R3InjectableMetadata): CompileResult {
     const res = compileIvyInjectable(analysis);
     return {
       field: 'ngInjectableDef',
       initializer: res.expression,
+      statements: [],
       type: res.type,
     };
   }
@@ -105,38 +107,7 @@ function extractInjectableMetadata(
   }
 }
 
-function getConstructorDependencies(
-    clazz: ts.ClassDeclaration, checker: ts.TypeChecker): R3DependencyMetadata[] {
-  const useType: R3DependencyMetadata[] = [];
-  const ctorParams = (reflectConstructorParameters(clazz, checker) || []);
-  ctorParams.forEach(param => {
-    let tokenExpr = param.typeValueExpr;
-    let optional = false, self = false, skipSelf = false;
-    param.decorators.filter(dec => dec.from === '@angular/core').forEach(dec => {
-      if (dec.name === 'Inject') {
-        if (dec.args.length !== 1) {
-          throw new Error(`Unexpected number of arguments to @Inject().`);
-        }
-        tokenExpr = dec.args[0];
-      } else if (dec.name === 'Optional') {
-        optional = true;
-      } else if (dec.name === 'SkipSelf') {
-        skipSelf = true;
-      } else if (dec.name === 'Self') {
-        self = true;
-      } else {
-        throw new Error(`Unexpected decorator ${dec.name} on parameter.`);
-      }
-      if (tokenExpr === null) {
-        throw new Error(`No suitable token for parameter!`);
-      }
-    });
-    const token = new WrappedNodeExpr(tokenExpr);
-    useType.push(
-        {token, optional, self, skipSelf, host: false, resolved: R3ResolvedDependencyType.Token});
-  });
-  return useType;
-}
+
 
 function getDep(dep: ts.Expression, checker: ts.TypeChecker): R3DependencyMetadata {
   const meta: R3DependencyMetadata = {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
new file mode 100644
index 0000000000..b39e2c561d
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -0,0 +1,116 @@
+/**
+ * @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 {ConstantPool, Expression, R3DirectiveMetadata, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule, makeBindingParser, parseTemplate} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Decorator, Reference, ResolvedValue, reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
+
+import {SelectorScopeRegistry} from './selector_scope';
+import {referenceToExpression} from './util';
+
+/**
+ * Compiles @NgModule annotations to ngModuleDef fields.
+ *
+ * TODO(alxhub): handle injector side of things as well.
+ */
+export class NgModuleDecoratorHandler implements DecoratorHandler<R3NgModuleMetadata> {
+  constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
+
+  detect(decorators: Decorator[]): Decorator|undefined {
+    return decorators.find(
+        decorator => decorator.name === 'NgModule' && decorator.from === '@angular/core');
+  }
+
+  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3NgModuleMetadata> {
+    const meta = decorator.args[0];
+    if (!ts.isObjectLiteralExpression(meta)) {
+      throw new Error(`Decorator argument must be literal.`);
+    }
+    const ngModule = reflectObjectLiteral(meta);
+
+    if (ngModule.has('jit')) {
+      // The only allowed value is true, so there's no need to expand further.
+      return {};
+    }
+
+    // Extract the module declarations, imports, and exports.
+    let declarations: Reference[] = [];
+    if (ngModule.has('declarations')) {
+      const declarationMeta = staticallyResolve(ngModule.get('declarations') !, this.checker);
+      declarations = resolveTypeList(declarationMeta, 'declarations');
+    }
+    let imports: Reference[] = [];
+    if (ngModule.has('imports')) {
+      const importsMeta = staticallyResolve(ngModule.get('imports') !, this.checker);
+      imports = resolveTypeList(importsMeta, 'imports');
+    }
+    let exports: Reference[] = [];
+    if (ngModule.has('exports')) {
+      const exportsMeta = staticallyResolve(ngModule.get('exports') !, this.checker);
+      exports = resolveTypeList(exportsMeta, 'exports');
+    }
+
+    // Register this module's information with the SelectorScopeRegistry. This ensures that during
+    // the compile() phase, the module's metadata is available for selector scope computation.
+    this.scopeRegistry.registerModule(node, {declarations, imports, exports});
+
+    const context = node.getSourceFile();
+
+    return {
+      analysis: {
+        type: new WrappedNodeExpr(node.name !),
+        bootstrap: [],
+        declarations: declarations.map(decl => referenceToExpression(decl, context)),
+        exports: exports.map(exp => referenceToExpression(exp, context)),
+        imports: imports.map(imp => referenceToExpression(imp, context)),
+        emitInline: false,
+      },
+    };
+  }
+
+  compile(node: ts.ClassDeclaration, analysis: R3NgModuleMetadata): CompileResult {
+    const res = compileNgModule(analysis);
+    return {
+      field: 'ngModuleDef',
+      initializer: res.expression,
+      statements: [],
+      type: res.type,
+    };
+  }
+}
+
+/**
+ * Compute a list of `Reference`s from a resolved metadata value.
+ */
+function resolveTypeList(resolvedList: ResolvedValue, name: string): Reference[] {
+  const refList: Reference[] = [];
+  if (!Array.isArray(resolvedList)) {
+    throw new Error(`Expected array when reading property ${name}`);
+  }
+
+  resolvedList.forEach((entry, idx) => {
+    if (Array.isArray(entry)) {
+      // Recurse into nested arrays.
+      refList.push(...resolveTypeList(entry, name));
+    } else if (entry instanceof Reference) {
+      if (!entry.expressable) {
+        throw new Error(`Value at position ${idx} in ${name} array is not expressable`);
+      } else if (!ts.isClassDeclaration(entry.node)) {
+        throw new Error(`Value at position ${idx} in ${name} array is not a class declaration`);
+      }
+      refList.push(entry);
+    } else {
+      // TODO(alxhub): expand ModuleWithProviders.
+      throw new Error(`Value at position ${idx} in ${name} array is not a reference`);
+    }
+  });
+
+  return refList;
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
new file mode 100644
index 0000000000..4ddc245ad7
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
@@ -0,0 +1,353 @@
+/**
+ * @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 {Expression, ExternalExpr, ExternalReference} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {AbsoluteReference, Reference, reflectStaticField, reflectTypeEntityToDeclaration} from '../../metadata';
+
+import {referenceToExpression} from './util';
+
+
+/**
+ * Metadata extracted for a given NgModule that can be used to compute selector scopes.
+ */
+export interface ModuleData {
+  declarations: Reference[];
+  imports: Reference[];
+  exports: Reference[];
+}
+
+/**
+ * Transitively expanded maps of directives and pipes visible to a component being compiled in the
+ * context of some module.
+ */
+export interface CompilationScope<T> {
+  directives: Map<string, T>;
+  pipes: Map<string, T>;
+}
+
+/**
+ * Both transitively expanded scopes for a given NgModule.
+ */
+interface SelectorScopes {
+  /**
+   * Set of components, directives, and pipes visible to all components being compiled in the
+   * context of some module.
+   */
+  compilation: Reference[];
+
+  /**
+   * Set of components, directives, and pipes added to the compilation scope of any module importing
+   * some module.
+   */
+  exported: Reference[];
+}
+
+/**
+ * Registry which records and correlates static analysis information of Angular types.
+ *
+ * Once a compilation unit's information is fed into the SelectorScopeRegistry, it can be asked to
+ * produce transitive `CompilationScope`s for components.
+ */
+export class SelectorScopeRegistry {
+  /**
+   *  Map of modules declared in the current compilation unit to their (local) metadata.
+   */
+  private _moduleToData = new Map<ts.ClassDeclaration, ModuleData>();
+
+  /**
+   * Map of modules to their cached `CompilationScope`s.
+   */
+  private _compilationScopeCache = new Map<ts.ClassDeclaration, CompilationScope<Reference>>();
+
+  /**
+   * Map of components/directives to their selector.
+   */
+  private _directiveToSelector = new Map<ts.ClassDeclaration, string>();
+
+  /**
+   * Map of pipes to their name.
+   */
+  private _pipeToName = new Map<ts.ClassDeclaration, string>();
+
+  /**
+   * Map of components/directives/pipes to their module.
+   */
+  private _declararedTypeToModule = new Map<ts.ClassDeclaration, ts.ClassDeclaration>();
+
+  constructor(private checker: ts.TypeChecker) {}
+
+  /**
+   * Register a module's metadata with the registry.
+   */
+  registerModule(node: ts.ClassDeclaration, data: ModuleData): void {
+    node = ts.getOriginalNode(node) as ts.ClassDeclaration;
+
+    if (this._moduleToData.has(node)) {
+      throw new Error(`Module already registered: ${node.name!.text}`);
+    }
+    this._moduleToData.set(node, data);
+
+    // Register all of the module's declarations in the context map as belonging to this module.
+    data.declarations.forEach(decl => {
+      this._declararedTypeToModule.set(ts.getOriginalNode(decl.node) as ts.ClassDeclaration, node);
+    });
+  }
+
+  /**
+   * Register the selector of a component or directive with the registry.
+   */
+  registerSelector(node: ts.ClassDeclaration, selector: string): void {
+    node = ts.getOriginalNode(node) as ts.ClassDeclaration;
+
+    if (this._directiveToSelector.has(node)) {
+      throw new Error(`Selector already registered: ${node.name!.text} ${selector}`);
+    }
+    this._directiveToSelector.set(node, selector);
+  }
+
+  /**
+   * Register the name of a pipe with the registry.
+   */
+  registerPipe(node: ts.ClassDeclaration, name: string): void { this._pipeToName.set(node, name); }
+
+  /**
+   * Produce the compilation scope of a component, which is determined by the module that declares
+   * it.
+   */
+  lookupCompilationScope(node: ts.ClassDeclaration): CompilationScope<Expression>|null {
+    node = ts.getOriginalNode(node) as ts.ClassDeclaration;
+
+    // If the component has no associated module, then it has no compilation scope.
+    if (!this._declararedTypeToModule.has(node)) {
+      return null;
+    }
+
+    const module = this._declararedTypeToModule.get(node) !;
+
+    // Compilation scope computation is somewhat expensive, so it's cached. Check the cache for
+    // the module.
+    if (this._compilationScopeCache.has(module)) {
+      // The compilation scope was cached.
+      const scope = this._compilationScopeCache.get(module) !;
+
+      // The scope as cached is in terms of References, not Expressions. Converting between them
+      // requires knowledge of the context file (in this case, the component node's source file).
+      return convertScopeToExpressions(scope, node.getSourceFile());
+    }
+
+    // This is the first time the scope for this module is being computed.
+    const directives = new Map<string, Reference>();
+    const pipes = new Map<string, Reference>();
+
+    // Process the declaration scope of the module, and lookup the selector of every declared type.
+    // The initial value of ngModuleImportedFrom is 'null' which signifies that the NgModule
+    // was not imported from a .d.ts source.
+    this.lookupScopes(module !, /* ngModuleImportedFrom */ null).compilation.forEach(ref => {
+      const selector =
+          this.lookupDirectiveSelector(ts.getOriginalNode(ref.node) as ts.ClassDeclaration);
+      // Only directives/components with selectors get added to the scope.
+      if (selector != null) {
+        directives.set(selector, ref);
+      }
+    });
+
+    const scope: CompilationScope<Reference> = {directives, pipes};
+
+    // Many components may be compiled in the same scope, so cache it.
+    this._compilationScopeCache.set(node, scope);
+
+    // Convert References to Expressions in the context of the component's source file.
+    return convertScopeToExpressions(scope, node.getSourceFile());
+  }
+
+  /**
+   * Lookup `SelectorScopes` for a given module.
+   *
+   * This function assumes that if the given module was imported from an absolute path
+   * (`ngModuleImportedFrom`) then all of its declarations are exported at that same path, as well
+   * as imports and exports from other modules that are relatively imported.
+   */
+  private lookupScopes(node: ts.ClassDeclaration, ngModuleImportedFrom: string|null):
+      SelectorScopes {
+    let data: ModuleData|null = null;
+
+    // Either this module was analyzed directly, or has a precompiled ngModuleDef.
+    if (this._moduleToData.has(node)) {
+      // The module was analyzed before, and thus its data is available.
+      data = this._moduleToData.get(node) !;
+    } else {
+      // The module wasn't analyzed before, and probably has a precompiled ngModuleDef with a type
+      // annotation that specifies the needed metadata.
+      if (ngModuleImportedFrom === null) {
+        // TODO(alxhub): handle hand-compiled ngModuleDef in the current Program.
+        throw new Error(`Need to read .d.ts module but ngModuleImportedFrom is unspecified`);
+      }
+      data = this._readMetadataFromCompiledClass(node, ngModuleImportedFrom);
+      // Note that data here could still be null, if the class didn't have a precompiled
+      // ngModuleDef.
+    }
+
+    if (data === null) {
+      throw new Error(`Module not registered: ${node.name!.text}`);
+    }
+
+    return {
+      compilation: [
+        ...data.declarations,
+        // Expand imports to the exported scope of those imports.
+        ...flatten(data.imports.map(
+            ref => this.lookupScopes(ref.node as ts.ClassDeclaration, absoluteModuleName(ref))
+                       .exported)),
+        // And include the compilation scope of exported modules.
+        ...flatten(
+            data.exports.filter(ref => this._moduleToData.has(ref.node as ts.ClassDeclaration))
+                .map(
+                    ref =>
+                        this.lookupScopes(ref.node as ts.ClassDeclaration, absoluteModuleName(ref))
+                            .exported))
+      ],
+      exported: flatten(data.exports.map(ref => {
+        if (this._moduleToData.has(ref.node as ts.ClassDeclaration)) {
+          return this.lookupScopes(ref.node as ts.ClassDeclaration, absoluteModuleName(ref))
+              .exported;
+        } else {
+          return [ref];
+        }
+      })),
+    };
+  }
+
+  /**
+   * Lookup the selector of a component or directive class.
+   *
+   * Potentially this class is declared in a .d.ts file or otherwise has a manually created
+   * ngComponentDef/ngDirectiveDef. In this case, the type metadata of that definition is read
+   * to determine the selector.
+   */
+  private lookupDirectiveSelector(node: ts.ClassDeclaration): string|null {
+    if (this._directiveToSelector.has(node)) {
+      return this._directiveToSelector.get(node) !;
+    } else {
+      return this._readSelectorFromCompiledClass(node);
+    }
+  }
+
+  private lookupPipeName(node: ts.ClassDeclaration): string|undefined {
+    return this._pipeToName.get(node);
+  }
+
+  /**
+   * Read the metadata from a class that has already been compiled somehow (either it's in a .d.ts
+   * file, or in a .ts file with a handwritten definition).
+   *
+   * @param clazz the class of interest
+   * @param ngModuleImportedFrom module specifier of the import path to assume for all declarations
+   * stemming from this module.
+   */
+  private _readMetadataFromCompiledClass(clazz: ts.ClassDeclaration, ngModuleImportedFrom: string):
+      ModuleData|null {
+    // This operation is explicitly not memoized, as it depends on `ngModuleImportedFrom`.
+    // TODO(alxhub): investigate caching of .d.ts module metadata.
+    const ngModuleDef = reflectStaticField(clazz, 'ngModuleDef');
+    if (ngModuleDef === null) {
+      return null;
+    } else if (
+        // Validate that the shape of the ngModuleDef type is correct.
+        ngModuleDef.type === undefined || !ts.isTypeReferenceNode(ngModuleDef.type) ||
+        ngModuleDef.type.typeArguments === undefined ||
+        ngModuleDef.type.typeArguments.length !== 4) {
+      return null;
+    }
+
+    // Read the ModuleData out of the type arguments.
+    const [_, declarationMetadata, importMetadata, exportMetadata] = ngModuleDef.type.typeArguments;
+    return {
+      declarations: this._extractReferencesFromType(declarationMetadata, ngModuleImportedFrom),
+      exports: this._extractReferencesFromType(exportMetadata, ngModuleImportedFrom),
+      imports: this._extractReferencesFromType(importMetadata, ngModuleImportedFrom),
+    };
+  }
+
+  /**
+   * Get the selector from type metadata for a class with a precompiled ngComponentDef or
+   * ngDirectiveDef.
+   */
+  private _readSelectorFromCompiledClass(clazz: ts.ClassDeclaration): string|null {
+    const def =
+        reflectStaticField(clazz, 'ngComponentDef') || reflectStaticField(clazz, 'ngDirectiveDef');
+    if (def === null) {
+      // No definition could be found.
+      return null;
+    } else if (
+        def.type === undefined || !ts.isTypeReferenceNode(def.type) ||
+        def.type.typeArguments === undefined || def.type.typeArguments.length !== 2) {
+      // The type metadata was the wrong shape.
+      return null;
+    }
+    const type = def.type.typeArguments[1];
+    if (!ts.isLiteralTypeNode(type) || !ts.isStringLiteral(type.literal)) {
+      // The type metadata was the wrong type.
+      return null;
+    }
+    return type.literal.text;
+  }
+
+  /**
+   * Process a `TypeNode` which is a tuple of references to other types, and return `Reference`s to
+   * them.
+   *
+   * This operation assumes that these types should be imported from `ngModuleImportedFrom` unless
+   * they themselves were imported from another absolute path.
+   */
+  private _extractReferencesFromType(def: ts.TypeNode, ngModuleImportedFrom: string): Reference[] {
+    if (!ts.isTupleTypeNode(def)) {
+      return [];
+    }
+    return def.elementTypes.map(element => {
+      if (!ts.isTypeReferenceNode(element)) {
+        throw new Error(`Expected TypeReferenceNode`);
+      }
+      const type = element.typeName;
+      const {node, from} = reflectTypeEntityToDeclaration(type, this.checker);
+      const moduleName = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
+      const clazz = node as ts.ClassDeclaration;
+      return new AbsoluteReference(node, clazz.name !, moduleName, clazz.name !.text);
+    });
+  }
+}
+
+function flatten<T>(array: T[][]): T[] {
+  return array.reduce((accum, subArray) => {
+    accum.push(...subArray);
+    return accum;
+  }, [] as T[]);
+}
+
+function absoluteModuleName(ref: Reference): string|null {
+  const name = (ref.node as ts.ClassDeclaration).name !.text;
+  if (!(ref instanceof AbsoluteReference)) {
+    return null;
+  }
+  return ref.moduleName;
+}
+
+function convertReferenceMap(
+    map: Map<string, Reference>, context: ts.SourceFile): Map<string, Expression> {
+  return new Map<string, Expression>(Array.from(map.entries()).map(([selector, ref]): [
+    string, Expression
+  ] => [selector, referenceToExpression(ref, context)]));
+}
+
+function convertScopeToExpressions(
+    scope: CompilationScope<Reference>, context: ts.SourceFile): CompilationScope<Expression> {
+  const directives = convertReferenceMap(scope.directives, context);
+  const pipes = convertReferenceMap(scope.pipes, context);
+  return {directives, pipes};
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
new file mode 100644
index 0000000000..0f3ee2442d
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -0,0 +1,84 @@
+/**
+ * @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 {Expression, R3DependencyMetadata, R3ResolvedDependencyType, WrappedNodeExpr} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Reference, reflectConstructorParameters} from '../../metadata';
+import {reflectImportedIdentifier} from '../../metadata/src/reflector';
+
+export function getConstructorDependencies(
+    clazz: ts.ClassDeclaration, checker: ts.TypeChecker): R3DependencyMetadata[] {
+  const useType: R3DependencyMetadata[] = [];
+  const ctorParams = (reflectConstructorParameters(clazz, checker) || []);
+  ctorParams.forEach(param => {
+    let tokenExpr = param.typeValueExpr;
+    let optional = false, self = false, skipSelf = false, host = false;
+    let resolved = R3ResolvedDependencyType.Token;
+    param.decorators.filter(dec => dec.from === '@angular/core').forEach(dec => {
+      if (dec.name === 'Inject') {
+        if (dec.args.length !== 1) {
+          throw new Error(`Unexpected number of arguments to @Inject().`);
+        }
+        tokenExpr = dec.args[0];
+      } else if (dec.name === 'Optional') {
+        optional = true;
+      } else if (dec.name === 'SkipSelf') {
+        skipSelf = true;
+      } else if (dec.name === 'Self') {
+        self = true;
+      } else if (dec.name === 'Host') {
+        host = true;
+      } else if (dec.name === 'Attribute') {
+        if (dec.args.length !== 1) {
+          throw new Error(`Unexpected number of arguments to @Attribute().`);
+        }
+        tokenExpr = dec.args[0];
+        resolved = R3ResolvedDependencyType.Attribute;
+      } else {
+        throw new Error(`Unexpected decorator ${dec.name} on parameter.`);
+      }
+    });
+    if (tokenExpr === null) {
+      throw new Error(
+          `No suitable token for parameter ${(param.name as ts.Identifier).text} of class ${clazz.name!.text} with decorators ${param.decorators.map(dec => dec.from + '#' + dec.name).join(',')}`);
+    }
+    if (ts.isIdentifier(tokenExpr)) {
+      const importedSymbol = reflectImportedIdentifier(tokenExpr, checker);
+      if (importedSymbol !== null && importedSymbol.from === '@angular/core') {
+        switch (importedSymbol.name) {
+          case 'ElementRef':
+            resolved = R3ResolvedDependencyType.ElementRef;
+            break;
+          case 'Injector':
+            resolved = R3ResolvedDependencyType.Injector;
+            break;
+          case 'TemplateRef':
+            resolved = R3ResolvedDependencyType.TemplateRef;
+            break;
+          case 'ViewContainerRef':
+            resolved = R3ResolvedDependencyType.ViewContainerRef;
+            break;
+          default:
+            // Leave as a Token or Attribute.
+        }
+      }
+    }
+    const token = new WrappedNodeExpr(tokenExpr);
+    useType.push({token, optional, self, skipSelf, host, resolved});
+  });
+  return useType;
+}
+
+export function referenceToExpression(ref: Reference, context: ts.SourceFile): Expression {
+  const exp = ref.toExpression(context);
+  if (exp === null) {
+    throw new Error(`Could not refer to ${ts.SyntaxKind[ref.node.kind]}`);
+  }
+  return exp;
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
new file mode 100644
index 0000000000..a6898c53fb
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
@@ -0,0 +1,28 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "test_lib",
+    testonly = 1,
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/annotations",
+        "//packages/compiler-cli/src/ngtsc/metadata",
+        "//packages/compiler-cli/src/ngtsc/testing",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"],
+    deps = [
+        ":test_lib",
+        "//tools/testing:node_no_angular",
+    ],
+)
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
new file mode 100644
index 0000000000..a5c28160ed
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {AbsoluteReference, ResolvedReference} from '../../metadata/src/resolver';
+import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
+import {NgModuleDecoratorHandler} from '../src/ng_module';
+import {SelectorScopeRegistry} from '../src/selector_scope';
+
+describe('SelectorScopeRegistry', () => {
+  it('absolute imports work', () => {
+    const {program} = makeProgram([
+      {
+        name: 'node_modules/@angular/core/index.d.ts',
+        contents: `
+        export interface NgComponentDef<A, B> {}
+        export interface NgModuleDef<A, B, C, D> {}
+      `
+      },
+      {
+        name: 'node_modules/some_library/index.d.ts',
+        contents: `
+        import {NgComponentDef, NgModuleDef} from '@angular/core';
+        import * as i0 from './component';
+        
+        export declare class SomeModule {
+          static ngModuleDef: NgModuleDef<SomeModule, [i0.SomeCmp], any, [i0.SomeCmp]>;
+        }
+
+        export declare class SomeCmp {
+          static ngComponentDef: NgComponentDef<SomeCmp, 'some-cmp'>;
+        }
+      `
+      },
+      {
+        name: 'node_modules/some_library/component.d.ts',
+        contents: `
+        export declare class SomeCmp {}
+      `
+      },
+      {
+        name: 'entry.ts',
+        contents: `
+          export class ProgramCmp {}
+          export class ProgramModule {}
+      `
+      },
+    ]);
+    const checker = program.getTypeChecker();
+    const ProgramModule =
+        getDeclaration(program, 'entry.ts', 'ProgramModule', ts.isClassDeclaration);
+    const ProgramCmp = getDeclaration(program, 'entry.ts', 'ProgramCmp', ts.isClassDeclaration);
+    const SomeModule = getDeclaration(
+        program, 'node_modules/some_library/index.d.ts', 'SomeModule', ts.isClassDeclaration);
+    expect(ProgramModule).toBeDefined();
+    expect(SomeModule).toBeDefined();
+
+    const registry = new SelectorScopeRegistry(checker);
+
+    registry.registerModule(ProgramModule, {
+      declarations: [new ResolvedReference(ProgramCmp, ProgramCmp.name !)],
+      exports: [],
+      imports: [new AbsoluteReference(SomeModule, SomeModule.name !, 'some_library', 'SomeModule')],
+    });
+
+    registry.registerSelector(ProgramCmp, 'program-cmp');
+
+    const scope = registry.lookupCompilationScope(ProgramCmp) !;
+    expect(scope).toBeDefined();
+    expect(scope.directives).toBeDefined();
+    expect(scope.directives.size).toBe(1);
+  });
+});
\ No newline at end of file
diff --git a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
index 48bc2b903a..4a5c83e87c 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
@@ -10,6 +10,7 @@ ts_library(
     ]),
     module_name = "@angular/compiler-cli/src/ngtsc/metadata",
     deps = [
+        "//packages:types",
         "//packages/compiler",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/metadata/index.ts b/packages/compiler-cli/src/ngtsc/metadata/index.ts
index ecd28cd0f9..49b2efca8d 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/index.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/index.ts
@@ -6,5 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {Decorator, Parameter, reflectConstructorParameters, reflectDecorator} from './src/reflector';
-export {Reference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';
+export {Decorator, Parameter, reflectConstructorParameters, reflectDecorator, reflectNonStaticField, reflectObjectLiteral, reflectStaticField, reflectTypeEntityToDeclaration,} from './src/reflector';
+
+export {AbsoluteReference, Reference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts b/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
index 9aa26326cd..4b807bbb3a 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
@@ -236,3 +236,103 @@ export function reflectImportedIdentifier(
 
   return {from, name};
 }
+
+export interface DecoratedNode<T extends ts.Node> {
+  element: T;
+  decorators: Decorator[];
+}
+
+export function getDecoratedClassElements(
+    clazz: ts.ClassDeclaration, checker: ts.TypeChecker): DecoratedNode<ts.ClassElement>[] {
+  const decoratedElements: DecoratedNode<ts.ClassElement>[] = [];
+  clazz.members.forEach(element => {
+    if (element.decorators !== undefined) {
+      const decorators = element.decorators.map(decorator => reflectDecorator(decorator, checker))
+                             .filter(decorator => decorator != null) as Decorator[];
+      if (decorators.length > 0) {
+        decoratedElements.push({element, decorators});
+      }
+    }
+  });
+  return decoratedElements;
+}
+
+export function reflectStaticField(
+    clazz: ts.ClassDeclaration, field: string): ts.PropertyDeclaration|null {
+  return clazz.members.find((member: ts.ClassElement): member is ts.PropertyDeclaration => {
+    // Check if the name matches.
+    if (member.name === undefined || !ts.isIdentifier(member.name) || member.name.text !== field) {
+      return false;
+    }
+    // Check if the property is static.
+    if (member.modifiers === undefined ||
+        !member.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword)) {
+      return false;
+    }
+    // Found the field.
+    return true;
+  }) ||
+      null;
+}
+
+export function reflectNonStaticField(
+    clazz: ts.ClassDeclaration, field: string): ts.PropertyDeclaration|null {
+  return clazz.members.find((member: ts.ClassElement): member is ts.PropertyDeclaration => {
+    // Check if the name matches.
+    if (member.name === undefined || !ts.isIdentifier(member.name) || member.name.text !== field) {
+      return false;
+    }
+    // Check if the property is static.
+    if (member.modifiers !== undefined &&
+        member.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword)) {
+      return false;
+    }
+    // Found the field.
+    return true;
+  }) ||
+      null;
+}
+
+export function reflectTypeEntityToDeclaration(
+    type: ts.EntityName, checker: ts.TypeChecker): {node: ts.Declaration, from: string | null} {
+  let realSymbol = checker.getSymbolAtLocation(type);
+  if (realSymbol === undefined) {
+    throw new Error(`Cannot resolve type entity to symbol`);
+  }
+  while (realSymbol.flags & ts.SymbolFlags.Alias) {
+    realSymbol = checker.getAliasedSymbol(realSymbol);
+  }
+
+  let node: ts.Declaration|null = null;
+  if (realSymbol.valueDeclaration !== undefined) {
+    node = realSymbol.valueDeclaration;
+  } else if (realSymbol.declarations !== undefined && realSymbol.declarations.length === 1) {
+    node = realSymbol.declarations[0];
+  } else {
+    throw new Error(`Cannot resolve type entity symbol to declaration`);
+  }
+
+  if (ts.isQualifiedName(type)) {
+    if (!ts.isIdentifier(type.left)) {
+      throw new Error(`Cannot handle qualified name with non-identifier lhs`);
+    }
+    const symbol = checker.getSymbolAtLocation(type.left);
+    if (symbol === undefined || symbol.declarations === undefined ||
+        symbol.declarations.length !== 1) {
+      throw new Error(`Cannot resolve qualified type entity lhs to symbol`);
+    }
+    const decl = symbol.declarations[0];
+    if (ts.isNamespaceImport(decl)) {
+      const clause = decl.parent !;
+      const importDecl = clause.parent !;
+      if (!ts.isStringLiteral(importDecl.moduleSpecifier)) {
+        throw new Error(`Module specifier is not a string`);
+      }
+      return {node, from: importDecl.moduleSpecifier.text};
+    } else {
+      throw new Error(`Unknown import type?`);
+    }
+  } else {
+    return {node, from: null};
+  }
+}
\ No newline at end of file
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index 9f4e4ab200..f97e509cfb 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -11,8 +11,12 @@
  * values where possible and returning a `DynamicValue` signal when not.
  */
 
+import {Expression, ExternalExpr, ExternalReference, WrappedNodeExpr} from '@angular/compiler';
+import * as path from 'path';
 import * as ts from 'typescript';
 
+const TS_DTS_EXTENSION = /(\.d)?\.ts$/;
+
 /**
  * Represents a value which cannot be determined statically.
  *
@@ -72,24 +76,99 @@ export interface ResolvedValueArray extends Array<ResolvedValue> {}
  */
 type Scope = Map<ts.ParameterDeclaration, ResolvedValue>;
 
-/**
- * Whether or not to allow references during resolution.
- *
- * See `StaticInterpreter` for details.
- */
-const enum AllowReferences {
-  No = 0,
-  Yes = 1,
-}
-
 /**
  * A reference to a `ts.Node`.
  *
  * For example, if an expression evaluates to a function or class definition, it will be returned
  * as a `Reference` (assuming references are allowed in evaluation).
  */
-export class Reference {
+export abstract class Reference {
   constructor(readonly node: ts.Node) {}
+
+  /**
+   * Whether an `Expression` can be generated which references the node.
+   */
+  readonly expressable: boolean;
+
+  /**
+   * Generate an `Expression` representing this type, in the context of the given SourceFile.
+   *
+   * This could be a local variable reference, if the symbol is imported, or it could be a new
+   * import if needed.
+   */
+  abstract toExpression(context: ts.SourceFile): Expression|null;
+}
+
+/**
+ * A reference to a node only, without any ability to get an `Expression` representing that node.
+ *
+ * This is used for returning references to things like method declarations, which are not directly
+ * referenceable.
+ */
+export class NodeReference extends Reference {
+  toExpression(context: ts.SourceFile): null { return null; }
+}
+
+/**
+ * A reference to a node which has a `ts.Identifier` and can be resolved to an `Expression`.
+ *
+ * Imports generated by `ResolvedReference`s are always relative.
+ */
+export class ResolvedReference extends Reference {
+  constructor(node: ts.Node, protected identifier: ts.Identifier) { super(node); }
+
+  readonly expressable = true;
+
+  toExpression(context: ts.SourceFile): Expression {
+    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.node).getSourceFile()) {
+      return new WrappedNodeExpr(this.identifier);
+    } else {
+      // Relative import from context -> this.node.getSourceFile().
+      // TODO(alxhub): investigate the impact of multiple source roots here.
+      // TODO(alxhub): investigate the need to map such paths via the Host for proper g3 support.
+      let relative =
+          path.posix.relative(path.dirname(context.fileName), this.node.getSourceFile().fileName)
+              .replace(TS_DTS_EXTENSION, '');
+
+      // path.relative() does not include the leading './'.
+      if (!relative.startsWith('.')) {
+        relative = `./${relative}`;
+      }
+
+      // path.relative() returns the empty string (converted to './' above) if the two paths are the
+      // same.
+      if (relative === './') {
+        // Same file after all.
+        return new WrappedNodeExpr(this.identifier);
+      } else {
+        return new ExternalExpr(new ExternalReference(relative, this.identifier.text));
+      }
+    }
+  }
+}
+
+/**
+ * A reference to a node which has a `ts.Identifer` and an expected absolute module name.
+ *
+ * An `AbsoluteReference` can be resolved to an `Expression`, and if that expression is an import
+ * the module specifier will be an absolute module name, not a relative path.
+ */
+export class AbsoluteReference extends Reference {
+  constructor(
+      node: ts.Node, private identifier: ts.Identifier, readonly moduleName: string,
+      private symbolName: string) {
+    super(node);
+  }
+
+  readonly expressable = true;
+
+  toExpression(context: ts.SourceFile): Expression {
+    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.node.getSourceFile())) {
+      return new WrappedNodeExpr(this.identifier);
+    } else {
+      return new ExternalExpr(new ExternalReference(this.moduleName, this.symbolName));
+    }
+  }
 }
 
 /**
@@ -100,9 +179,8 @@ export class Reference {
  * @returns a `ResolvedValue` representing the resolved value
  */
 export function staticallyResolve(node: ts.Expression, checker: ts.TypeChecker): ResolvedValue {
-  return new StaticInterpreter(
-             checker, new Map<ts.ParameterDeclaration, ResolvedValue>(), AllowReferences.No)
-      .visit(node);
+  return new StaticInterpreter(checker).visit(
+      node, {absoluteModuleName: null, scope: new Map<ts.ParameterDeclaration, ResolvedValue>()});
 }
 
 interface BinaryOperatorDef {
@@ -144,59 +222,67 @@ const UNARY_OPERATORS = new Map<ts.SyntaxKind, (a: any) => any>([
   [ts.SyntaxKind.PlusToken, a => +a], [ts.SyntaxKind.ExclamationToken, a => !a]
 ]);
 
+interface Context {
+  absoluteModuleName: string|null;
+  scope: Scope;
+}
+
 class StaticInterpreter {
-  constructor(
-      private checker: ts.TypeChecker, private scope: Scope,
-      private allowReferences: AllowReferences) {}
+  constructor(private checker: ts.TypeChecker) {}
 
-  visit(node: ts.Expression): ResolvedValue { return this.visitExpression(node); }
+  visit(node: ts.Expression, context: Context): ResolvedValue {
+    return this.visitExpression(node, context);
+  }
 
-  private visitExpression(node: ts.Expression): ResolvedValue {
+  private visitExpression(node: ts.Expression, context: Context): ResolvedValue {
     if (node.kind === ts.SyntaxKind.TrueKeyword) {
       return true;
     } else if (node.kind === ts.SyntaxKind.FalseKeyword) {
       return false;
     } else if (ts.isStringLiteral(node)) {
       return node.text;
+    } else if (ts.isNoSubstitutionTemplateLiteral(node)) {
+      return node.text;
     } else if (ts.isNumericLiteral(node)) {
       return parseFloat(node.text);
     } else if (ts.isObjectLiteralExpression(node)) {
-      return this.visitObjectLiteralExpression(node);
+      return this.visitObjectLiteralExpression(node, context);
     } else if (ts.isIdentifier(node)) {
-      return this.visitIdentifier(node);
+      return this.visitIdentifier(node, context);
     } else if (ts.isPropertyAccessExpression(node)) {
-      return this.visitPropertyAccessExpression(node);
+      return this.visitPropertyAccessExpression(node, context);
     } else if (ts.isCallExpression(node)) {
-      return this.visitCallExpression(node);
+      return this.visitCallExpression(node, context);
     } else if (ts.isConditionalExpression(node)) {
-      return this.visitConditionalExpression(node);
+      return this.visitConditionalExpression(node, context);
     } else if (ts.isPrefixUnaryExpression(node)) {
-      return this.visitPrefixUnaryExpression(node);
+      return this.visitPrefixUnaryExpression(node, context);
     } else if (ts.isBinaryExpression(node)) {
-      return this.visitBinaryExpression(node);
+      return this.visitBinaryExpression(node, context);
     } else if (ts.isArrayLiteralExpression(node)) {
-      return this.visitArrayLiteralExpression(node);
+      return this.visitArrayLiteralExpression(node, context);
     } else if (ts.isParenthesizedExpression(node)) {
-      return this.visitParenthesizedExpression(node);
+      return this.visitParenthesizedExpression(node, context);
     } else if (ts.isElementAccessExpression(node)) {
-      return this.visitElementAccessExpression(node);
+      return this.visitElementAccessExpression(node, context);
     } else if (ts.isAsExpression(node)) {
-      return this.visitExpression(node.expression);
+      return this.visitExpression(node.expression, context);
     } else if (ts.isNonNullExpression(node)) {
-      return this.visitExpression(node.expression);
+      return this.visitExpression(node.expression, context);
     } else if (ts.isClassDeclaration(node)) {
-      return this.visitDeclaration(node);
+      return this.visitDeclaration(node, context);
     } else {
       return DYNAMIC_VALUE;
     }
   }
 
-  private visitArrayLiteralExpression(node: ts.ArrayLiteralExpression): ResolvedValue {
+  private visitArrayLiteralExpression(node: ts.ArrayLiteralExpression, context: Context):
+      ResolvedValue {
     const array: ResolvedValueArray = [];
     for (let i = 0; i < node.elements.length; i++) {
       const element = node.elements[i];
       if (ts.isSpreadElement(element)) {
-        const spread = this.visitExpression(element.expression);
+        const spread = this.visitExpression(element.expression, context);
         if (isDynamicValue(spread)) {
           return DYNAMIC_VALUE;
         }
@@ -206,7 +292,7 @@ class StaticInterpreter {
 
         array.push(...spread);
       } else {
-        const result = this.visitExpression(element);
+        const result = this.visitExpression(element, context);
         if (isDynamicValue(result)) {
           return DYNAMIC_VALUE;
         }
@@ -217,27 +303,28 @@ class StaticInterpreter {
     return array;
   }
 
-  private visitObjectLiteralExpression(node: ts.ObjectLiteralExpression): ResolvedValue {
+  private visitObjectLiteralExpression(node: ts.ObjectLiteralExpression, context: Context):
+      ResolvedValue {
     const map: ResolvedValueMap = new Map<string, ResolvedValue>();
     for (let i = 0; i < node.properties.length; i++) {
       const property = node.properties[i];
       if (ts.isPropertyAssignment(property)) {
-        const name = this.stringNameFromPropertyName(property.name);
+        const name = this.stringNameFromPropertyName(property.name, context);
 
         // Check whether the name can be determined statically.
         if (name === undefined) {
           return DYNAMIC_VALUE;
         }
 
-        map.set(name, this.visitExpression(property.initializer));
+        map.set(name, this.visitExpression(property.initializer, context));
       } else if (ts.isShorthandPropertyAssignment(property)) {
         const symbol = this.checker.getShorthandAssignmentValueSymbol(property);
         if (symbol === undefined || symbol.valueDeclaration === undefined) {
           return DYNAMIC_VALUE;
         }
-        map.set(property.name.text, this.visitDeclaration(symbol.valueDeclaration));
+        map.set(property.name.text, this.visitDeclaration(symbol.valueDeclaration, context));
       } else if (ts.isSpreadAssignment(property)) {
-        const spread = this.visitExpression(property.expression);
+        const spread = this.visitExpression(property.expression, context);
         if (isDynamicValue(spread)) {
           return DYNAMIC_VALUE;
         }
@@ -252,19 +339,34 @@ class StaticInterpreter {
     return map;
   }
 
-  private visitIdentifier(node: ts.Identifier): ResolvedValue {
+  private visitIdentifier(node: ts.Identifier, context: Context): ResolvedValue {
     let symbol: ts.Symbol|undefined = this.checker.getSymbolAtLocation(node);
     if (symbol === undefined) {
       return DYNAMIC_VALUE;
     }
-    const result = this.visitSymbol(symbol);
-    if (this.allowReferences === AllowReferences.Yes && isDynamicValue(result)) {
-      return new Reference(node);
-    }
-    return result;
+    return this.visitSymbol(symbol, context);
   }
 
-  private visitSymbol(symbol: ts.Symbol): ResolvedValue {
+  private visitSymbol(symbol: ts.Symbol, context: Context): ResolvedValue {
+    let absoluteModuleName = context.absoluteModuleName;
+    if (symbol.declarations !== undefined && symbol.declarations.length > 0) {
+      for (let i = 0; i < symbol.declarations.length; i++) {
+        const decl = symbol.declarations[i];
+        if (ts.isImportSpecifier(decl) && decl.parent !== undefined &&
+            decl.parent.parent !== undefined && decl.parent.parent.parent !== undefined) {
+          const importDecl = decl.parent.parent.parent;
+          if (ts.isStringLiteral(importDecl.moduleSpecifier)) {
+            const moduleSpecifier = importDecl.moduleSpecifier.text;
+            if (!moduleSpecifier.startsWith('.')) {
+              absoluteModuleName = moduleSpecifier;
+            }
+          }
+        }
+      }
+    }
+
+    const newContext = {...context, absoluteModuleName};
+
     while (symbol.flags & ts.SymbolFlags.Alias) {
       symbol = this.checker.getAliasedSymbol(symbol);
     }
@@ -274,42 +376,44 @@ class StaticInterpreter {
     }
 
     if (symbol.valueDeclaration !== undefined) {
-      return this.visitDeclaration(symbol.valueDeclaration);
+      return this.visitDeclaration(symbol.valueDeclaration, newContext);
     }
 
     return symbol.declarations.reduce<ResolvedValue>((prev, decl) => {
       if (!(isDynamicValue(prev) || prev instanceof Reference)) {
         return prev;
       }
-      return this.visitDeclaration(decl);
+      return this.visitDeclaration(decl, newContext);
     }, DYNAMIC_VALUE);
   }
 
-  private visitDeclaration(node: ts.Declaration): ResolvedValue {
+  private visitDeclaration(node: ts.Declaration, context: Context): ResolvedValue {
     if (ts.isVariableDeclaration(node)) {
       if (!node.initializer) {
         return undefined;
       }
-      return this.visitExpression(node.initializer);
-    } else if (ts.isParameter(node) && this.scope.has(node)) {
-      return this.scope.get(node) !;
+      return this.visitExpression(node.initializer, context);
+    } else if (ts.isParameter(node) && context.scope.has(node)) {
+      return context.scope.get(node) !;
     } else if (ts.isExportAssignment(node)) {
-      return this.visitExpression(node.expression);
+      return this.visitExpression(node.expression, context);
     } else if (ts.isSourceFile(node)) {
-      return this.visitSourceFile(node);
+      return this.visitSourceFile(node, context);
+    } else {
+      return this.getReference(node, context);
     }
-    return this.allowReferences === AllowReferences.Yes ? new Reference(node) : DYNAMIC_VALUE;
   }
 
-  private visitElementAccessExpression(node: ts.ElementAccessExpression): ResolvedValue {
-    const lhs = this.withReferences.visitExpression(node.expression);
+  private visitElementAccessExpression(node: ts.ElementAccessExpression, context: Context):
+      ResolvedValue {
+    const lhs = this.visitExpression(node.expression, context);
     if (node.argumentExpression === undefined) {
       throw new Error(`Expected argument in ElementAccessExpression`);
     }
     if (isDynamicValue(lhs)) {
       return DYNAMIC_VALUE;
     }
-    const rhs = this.withNoReferences.visitExpression(node.argumentExpression);
+    const rhs = this.visitExpression(node.argumentExpression, context);
     if (isDynamicValue(rhs)) {
       return DYNAMIC_VALUE;
     }
@@ -318,33 +422,34 @@ class StaticInterpreter {
           `ElementAccessExpression index should be string or number, got ${typeof rhs}: ${rhs}`);
     }
 
-    return this.accessHelper(lhs, rhs);
+    return this.accessHelper(lhs, rhs, context);
   }
 
-  private visitPropertyAccessExpression(node: ts.PropertyAccessExpression): ResolvedValue {
-    const lhs = this.withReferences.visitExpression(node.expression);
+  private visitPropertyAccessExpression(node: ts.PropertyAccessExpression, context: Context):
+      ResolvedValue {
+    const lhs = this.visitExpression(node.expression, context);
     const rhs = node.name.text;
     // TODO: handle reference to class declaration.
     if (isDynamicValue(lhs)) {
       return DYNAMIC_VALUE;
     }
 
-    return this.accessHelper(lhs, rhs);
+    return this.accessHelper(lhs, rhs, context);
   }
 
-  private visitSourceFile(node: ts.SourceFile): ResolvedValue {
+  private visitSourceFile(node: ts.SourceFile, context: Context): ResolvedValue {
     const map = new Map<string, ResolvedValue>();
     const symbol = this.checker.getSymbolAtLocation(node);
     if (symbol === undefined) {
       return DYNAMIC_VALUE;
     }
     const exports = this.checker.getExportsOfModule(symbol);
-    exports.forEach(symbol => map.set(symbol.name, this.visitSymbol(symbol)));
+    exports.forEach(symbol => map.set(symbol.name, this.visitSymbol(symbol, context)));
 
     return map;
   }
 
-  private accessHelper(lhs: ResolvedValue, rhs: string|number): ResolvedValue {
+  private accessHelper(lhs: ResolvedValue, rhs: string|number, context: Context): ResolvedValue {
     const strIndex = `${rhs}`;
     if (lhs instanceof Map) {
       if (lhs.has(strIndex)) {
@@ -367,16 +472,16 @@ class StaticInterpreter {
       const ref = lhs.node;
       if (ts.isClassDeclaration(ref)) {
         let value: ResolvedValue = undefined;
-        const member = ref.members.filter(member => isStatic(member))
-                           .find(
-                               member => member.name !== undefined &&
-                                   this.stringNameFromPropertyName(member.name) === strIndex);
+        const member =
+            ref.members.filter(member => isStatic(member))
+                .find(
+                    member => member.name !== undefined &&
+                        this.stringNameFromPropertyName(member.name, context) === strIndex);
         if (member !== undefined) {
           if (ts.isPropertyDeclaration(member) && member.initializer !== undefined) {
-            value = this.visitExpression(member.initializer);
+            value = this.visitExpression(member.initializer, context);
           } else if (ts.isMethodDeclaration(member)) {
-            value = this.allowReferences === AllowReferences.Yes ? new Reference(member) :
-                                                                   DYNAMIC_VALUE;
+            value = new NodeReference(member);
           }
         }
         return value;
@@ -385,8 +490,8 @@ class StaticInterpreter {
     throw new Error(`Invalid dot property access: ${lhs} dot ${rhs}`);
   }
 
-  private visitCallExpression(node: ts.CallExpression): ResolvedValue {
-    const lhs = this.withReferences.visitExpression(node.expression);
+  private visitCallExpression(node: ts.CallExpression, context: Context): ResolvedValue {
+    const lhs = this.visitExpression(node.expression, context);
     if (!(lhs instanceof Reference)) {
       throw new Error(`attempting to call something that is not a function: ${lhs}`);
     } else if (!isFunctionOrMethodDeclaration(lhs.node) || !lhs.node.body) {
@@ -406,43 +511,46 @@ class StaticInterpreter {
       let value: ResolvedValue = undefined;
       if (index < node.arguments.length) {
         const arg = node.arguments[index];
-        value = this.visitExpression(arg);
+        value = this.visitExpression(arg, context);
       }
       if (value === undefined && param.initializer !== undefined) {
-        value = this.visitExpression(param.initializer);
+        value = this.visitExpression(param.initializer, context);
       }
       newScope.set(param, value);
     });
 
-    return ret.expression !== undefined ? this.withScope(newScope).visitExpression(ret.expression) :
-                                          undefined;
+    return ret.expression !== undefined ?
+        this.visitExpression(ret.expression, {...context, scope: newScope}) :
+        undefined;
   }
 
-  private visitConditionalExpression(node: ts.ConditionalExpression): ResolvedValue {
-    const condition = this.withNoReferences.visitExpression(node.condition);
+  private visitConditionalExpression(node: ts.ConditionalExpression, context: Context):
+      ResolvedValue {
+    const condition = this.visitExpression(node.condition, context);
     if (isDynamicValue(condition)) {
       return condition;
     }
 
     if (condition) {
-      return this.visitExpression(node.whenTrue);
+      return this.visitExpression(node.whenTrue, context);
     } else {
-      return this.visitExpression(node.whenFalse);
+      return this.visitExpression(node.whenFalse, context);
     }
   }
 
-  private visitPrefixUnaryExpression(node: ts.PrefixUnaryExpression): ResolvedValue {
+  private visitPrefixUnaryExpression(node: ts.PrefixUnaryExpression, context: Context):
+      ResolvedValue {
     const operatorKind = node.operator;
     if (!UNARY_OPERATORS.has(operatorKind)) {
       throw new Error(`Unsupported prefix unary operator: ${ts.SyntaxKind[operatorKind]}`);
     }
 
     const op = UNARY_OPERATORS.get(operatorKind) !;
-    const value = this.visitExpression(node.operand);
+    const value = this.visitExpression(node.operand, context);
     return isDynamicValue(value) ? DYNAMIC_VALUE : op(value);
   }
 
-  private visitBinaryExpression(node: ts.BinaryExpression): ResolvedValue {
+  private visitBinaryExpression(node: ts.BinaryExpression, context: Context): ResolvedValue {
     const tokenKind = node.operatorToken.kind;
     if (!BINARY_OPERATORS.has(tokenKind)) {
       throw new Error(`Unsupported binary operator: ${ts.SyntaxKind[tokenKind]}`);
@@ -451,44 +559,42 @@ class StaticInterpreter {
     const opRecord = BINARY_OPERATORS.get(tokenKind) !;
     let lhs: ResolvedValue, rhs: ResolvedValue;
     if (opRecord.literal) {
-      const withNoReferences = this.withNoReferences;
-      lhs = literal(withNoReferences.visitExpression(node.left));
-      rhs = literal(withNoReferences.visitExpression(node.right));
+      lhs = literal(this.visitExpression(node.left, context));
+      rhs = literal(this.visitExpression(node.right, context));
     } else {
-      lhs = this.visitExpression(node.left);
-      rhs = this.visitExpression(node.right);
+      lhs = this.visitExpression(node.left, context);
+      rhs = this.visitExpression(node.right, context);
     }
 
     return isDynamicValue(lhs) || isDynamicValue(rhs) ? DYNAMIC_VALUE : opRecord.op(lhs, rhs);
   }
 
-  private visitParenthesizedExpression(node: ts.ParenthesizedExpression): ResolvedValue {
-    return this.visitExpression(node.expression);
+  private visitParenthesizedExpression(node: ts.ParenthesizedExpression, context: Context):
+      ResolvedValue {
+    return this.visitExpression(node.expression, context);
   }
 
-  private stringNameFromPropertyName(node: ts.PropertyName): string|undefined {
+  private stringNameFromPropertyName(node: ts.PropertyName, context: Context): string|undefined {
     if (ts.isIdentifier(node) || ts.isStringLiteral(node) || ts.isNumericLiteral(node)) {
       return node.text;
     } else {  // ts.ComputedPropertyName
-      const literal = this.withNoReferences.visitExpression(node.expression);
+      const literal = this.visitExpression(node.expression, context);
       return typeof literal === 'string' ? literal : undefined;
     }
   }
 
-  private get withReferences(): StaticInterpreter {
-    return this.allowReferences === AllowReferences.Yes ?
-        this :
-        new StaticInterpreter(this.checker, this.scope, AllowReferences.Yes);
-  }
-
-  private get withNoReferences(): StaticInterpreter {
-    return this.allowReferences === AllowReferences.No ?
-        this :
-        new StaticInterpreter(this.checker, this.scope, AllowReferences.No);
-  }
-
-  private withScope(scope: Scope): StaticInterpreter {
-    return new StaticInterpreter(this.checker, scope, this.allowReferences);
+  private getReference(node: ts.Declaration, context: Context): Reference {
+    const id = identifierOfDeclaration(node);
+    if (id === undefined) {
+      throw new Error(`Don't know how to refer to ${ts.SyntaxKind[node.kind]}`);
+    }
+    if (context.absoluteModuleName !== null) {
+      // TODO(alxhub): investigate whether this can get symbol names wrong in the event of
+      // re-exports under different names.
+      return new AbsoluteReference(node, id, context.absoluteModuleName, id.text);
+    } else {
+      return new ResolvedReference(node, id);
+    }
   }
 }
 
@@ -512,3 +618,17 @@ function literal(value: ResolvedValue): any {
   }
   throw new Error(`Value ${value} is not literal and cannot be used in this context.`);
 }
+
+function identifierOfDeclaration(decl: ts.Declaration): ts.Identifier|undefined {
+  if (ts.isClassDeclaration(decl)) {
+    return decl.name;
+  } else if (ts.isFunctionDeclaration(decl)) {
+    return decl.name;
+  } else if (ts.isVariableDeclaration(decl) && ts.isIdentifier(decl.name)) {
+    return decl.name;
+  } else if (ts.isShorthandPropertyAssignment(decl)) {
+    return decl.name;
+  } else {
+    return undefined;
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
index 746e88739e..9a675329a2 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
     ]),
     deps = [
         "//packages:types",
+        "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/testing",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
index 8f6feddf27..5498f4aa57 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ExternalExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
-import {ResolvedValue, staticallyResolve} from '../src/resolver';
+import {Reference, ResolvedValue, staticallyResolve} from '../src/resolver';
 
 function makeSimpleProgram(contents: string): ts.Program {
   return makeProgram([{name: 'entry.ts', contents}]).program;
@@ -116,6 +117,62 @@ describe('ngtsc metadata', () => {
     expect(evaluate(`const x = 3;`, '!!x')).toEqual(true);
   });
 
+  it('imports work', () => {
+    const {program} = makeProgram([
+      {name: 'second.ts', contents: 'export function foo(bar) { return bar; }'},
+      {
+        name: 'entry.ts',
+        contents: `
+          import {foo} from './second';
+          const target$ = foo;
+      `
+      },
+    ]);
+    const checker = program.getTypeChecker();
+    const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
+    const expr = result.initializer !;
+    const resolved = staticallyResolve(expr, checker);
+    if (!(resolved instanceof Reference)) {
+      return fail('Expected expression to resolve to a reference');
+    }
+    expect(ts.isFunctionDeclaration(resolved.node)).toBe(true);
+    expect(resolved.expressable).toBe(true);
+    const reference = resolved.toExpression(program.getSourceFile('entry.ts') !);
+    if (!(reference instanceof ExternalExpr)) {
+      return fail('Expected expression reference to be an external (import) expression');
+    }
+    expect(reference.value.moduleName).toBe('./second');
+    expect(reference.value.name).toBe('foo');
+  });
+
+  it('absolute imports work', () => {
+    const {program} = makeProgram([
+      {name: 'node_modules/some_library/index.d.ts', contents: 'export declare function foo(bar);'},
+      {
+        name: 'entry.ts',
+        contents: `
+          import {foo} from 'some_library';
+          const target$ = foo;
+      `
+      },
+    ]);
+    const checker = program.getTypeChecker();
+    const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
+    const expr = result.initializer !;
+    const resolved = staticallyResolve(expr, checker);
+    if (!(resolved instanceof Reference)) {
+      return fail('Expected expression to resolve to a reference');
+    }
+    expect(ts.isFunctionDeclaration(resolved.node)).toBe(true);
+    expect(resolved.expressable).toBe(true);
+    const reference = resolved.toExpression(program.getSourceFile('entry.ts') !);
+    if (!(reference instanceof ExternalExpr)) {
+      return fail('Expected expression reference to be an external (import) expression');
+    }
+    expect(reference.value.moduleName).toBe('some_library');
+    expect(reference.value.name).toBe('foo');
+  });
+
   it('reads values from default exports', () => {
     const {program} = makeProgram([
       {name: 'second.ts', contents: 'export default {property: "test"}'},
@@ -130,7 +187,6 @@ describe('ngtsc metadata', () => {
     const checker = program.getTypeChecker();
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
-    debugger;
     expect(staticallyResolve(expr, checker)).toEqual('test');
   });
 
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 579a415f02..0df33b4627 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -12,8 +12,9 @@ import * as ts from 'typescript';
 
 import * as api from '../transformers/api';
 
+import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, SelectorScopeRegistry} from './annotations';
 import {CompilerHost} from './compiler_host';
-import {InjectableCompilerAdapter, IvyCompilation, ivyTransformFactory} from './transform';
+import {IvyCompilation, ivyTransformFactory} from './transform';
 
 export class NgtscProgram implements api.Program {
   private tsProgram: ts.Program;
@@ -89,10 +90,16 @@ export class NgtscProgram implements api.Program {
     const mergeEmitResultsCallback = opts && opts.mergeEmitResultsCallback || mergeEmitResults;
 
     const checker = this.tsProgram.getTypeChecker();
+    const scopeRegistry = new SelectorScopeRegistry(checker);
 
     // Set up the IvyCompilation, which manages state for the Ivy transformer.
-    const adapters = [new InjectableCompilerAdapter(checker)];
-    const compilation = new IvyCompilation(adapters, checker);
+    const handlers = [
+      new ComponentDecoratorHandler(checker, scopeRegistry),
+      new DirectiveDecoratorHandler(checker, scopeRegistry),
+      new InjectableDecoratorHandler(checker),
+      new NgModuleDecoratorHandler(checker, scopeRegistry),
+    ];
+    const compilation = new IvyCompilation(handlers, checker);
 
     // Analyze every source file in the program.
     this.tsProgram.getSourceFiles()
diff --git a/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts b/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
index ad9356834a..aea082817c 100644
--- a/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
+++ b/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
@@ -15,7 +15,10 @@ export function makeProgram(files: {name: string, contents: string}[]):
   files.forEach(file => host.writeFile(file.name, file.contents));
 
   const rootNames = files.map(file => host.getCanonicalFileName(file.name));
-  const program = ts.createProgram(rootNames, {noLib: true, experimentalDecorators: true}, host);
+  const program = ts.createProgram(
+      rootNames,
+      {noLib: true, experimentalDecorators: true, moduleResolution: ts.ModuleResolutionKind.NodeJs},
+      host);
   const diags = [...program.getSyntacticDiagnostics(), ...program.getSemanticDiagnostics()];
   if (diags.length > 0) {
     throw new Error(
diff --git a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
index 61232d4328..ab5918688c 100644
--- a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
@@ -12,5 +12,6 @@ ts_library(
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/metadata",
+        "//packages/compiler-cli/src/ngtsc/util",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/transform/index.ts b/packages/compiler-cli/src/ngtsc/transform/index.ts
index bf776e1a2d..ccf8eff5bd 100644
--- a/packages/compiler-cli/src/ngtsc/transform/index.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/index.ts
@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+export * from './src/api';
 export {IvyCompilation} from './src/compilation';
-export {InjectableCompilerAdapter} from './src/injectable';
 export {ivyTransformFactory} from './src/transform';
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/api.ts b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
index e1b63c19e0..4ce4734a9d 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, Type} from '@angular/compiler';
+import {Expression, Statement, Type} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Decorator} from '../../metadata';
@@ -15,13 +15,13 @@ import {Decorator} from '../../metadata';
  * Provides the interface between a decorator compiler from @angular/compiler and the Typescript
  * compiler/transform.
  *
- * The decorator compilers in @angular/compiler do not depend on Typescript. The adapter is
+ * The decorator compilers in @angular/compiler do not depend on Typescript. The handler is
  * responsible for extracting the information required to perform compilation from the decorators
  * and Typescript source, invoking the decorator compiler, and returning the result.
  */
-export interface CompilerAdapter<A> {
+export interface DecoratorHandler<A> {
   /**
-   * Scan a set of reflected decorators and determine if this adapter is responsible for compilation
+   * Scan a set of reflected decorators and determine if this handler is responsible for compilation
    * of one of them.
    */
   detect(decorator: Decorator[]): Decorator|undefined;
@@ -37,7 +37,7 @@ export interface CompilerAdapter<A> {
    * Generate a description of the field which should be added to the class, including any
    * initialization code to be generated.
    */
-  compile(node: ts.ClassDeclaration, analysis: A): AddStaticFieldInstruction;
+  compile(node: ts.ClassDeclaration, analysis: A): CompileResult;
 }
 
 /**
@@ -54,8 +54,9 @@ export interface AnalysisOutput<A> {
  * A description of the static field to add to a class, including an initialization expression
  * and a type for the .d.ts file.
  */
-export interface AddStaticFieldInstruction {
+export interface CompileResult {
   field: string;
   initializer: Expression;
+  statements: Statement[];
   type: Type;
 }
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index 45e39f552b..948a01ba6f 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -11,17 +11,18 @@ import * as ts from 'typescript';
 
 import {Decorator, reflectDecorator} from '../../metadata';
 
-import {AddStaticFieldInstruction, AnalysisOutput, CompilerAdapter} from './api';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from './api';
 import {DtsFileTransformer} from './declaration';
 import {ImportManager, translateType} from './translator';
 
 
+
 /**
  * Record of an adapter which decided to emit a static field, and the analysis it performed to
  * prepare for that operation.
  */
 interface EmitFieldOperation<T> {
-  adapter: CompilerAdapter<T>;
+  adapter: DecoratorHandler<T>;
   analysis: AnalysisOutput<T>;
   decorator: ts.Decorator;
 }
@@ -44,7 +45,7 @@ export class IvyCompilation {
    */
   private dtsMap = new Map<string, DtsFileTransformer>();
 
-  constructor(private adapters: CompilerAdapter<any>[], private checker: ts.TypeChecker) {}
+  constructor(private handlers: DecoratorHandler<any>[], private checker: ts.TypeChecker) {}
 
   /**
    * Analyze a source file and produce diagnostics for it (if any).
@@ -60,8 +61,8 @@ export class IvyCompilation {
             node.decorators.map(decorator => reflectDecorator(decorator, this.checker))
                 .filter(decorator => decorator !== null) as Decorator[];
 
-        // Look through the CompilerAdapters to see if any are relevant.
-        this.adapters.forEach(adapter => {
+        // Look through the DecoratorHandlers to see if any are relevant.
+        this.handlers.forEach(adapter => {
           // An adapter is relevant if it matches one of the decorators on the class.
           const decorator = adapter.detect(decorators);
           if (decorator === undefined) {
@@ -101,7 +102,7 @@ export class IvyCompilation {
    * Perform a compilation operation on the given class declaration and return instructions to an
    * AST transformer if any are available.
    */
-  compileIvyFieldFor(node: ts.ClassDeclaration): AddStaticFieldInstruction|undefined {
+  compileIvyFieldFor(node: ts.ClassDeclaration): CompileResult|undefined {
     // Look to see whether the original node was analyzed. If not, there's nothing to do.
     const original = ts.getOriginalNode(node) as ts.ClassDeclaration;
     if (!this.analysis.has(original)) {
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
index 1e2c3d4abb..3038806287 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
@@ -8,7 +8,7 @@
 
 import * as ts from 'typescript';
 
-import {AddStaticFieldInstruction} from './api';
+import {CompileResult} from './api';
 import {ImportManager, translateType} from './translator';
 
 
@@ -17,15 +17,13 @@ import {ImportManager, translateType} from './translator';
  * Processes .d.ts file text and adds static field declarations, with types.
  */
 export class DtsFileTransformer {
-  private ivyFields = new Map<string, AddStaticFieldInstruction>();
+  private ivyFields = new Map<string, CompileResult>();
   private imports = new ImportManager();
 
   /**
    * Track that a static field was added to the code for a class.
    */
-  recordStaticField(name: string, decl: AddStaticFieldInstruction): void {
-    this.ivyFields.set(name, decl);
-  }
+  recordStaticField(name: string, decl: CompileResult): void { this.ivyFields.set(name, decl); }
 
   /**
    * Process the .d.ts text for a file and add any declarations which were recorded.
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index 85d6fcb9c1..e13a887e65 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -9,8 +9,10 @@
 import {WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
+import {VisitListEntryResult, Visitor, visit} from '../../util/src/visitor';
+
 import {IvyCompilation} from './compilation';
-import {ImportManager, translateExpression} from './translator';
+import {ImportManager, translateExpression, translateStatement} from './translator';
 
 export function ivyTransformFactory(compilation: IvyCompilation):
     ts.TransformerFactory<ts.SourceFile> {
@@ -21,6 +23,40 @@ export function ivyTransformFactory(compilation: IvyCompilation):
   };
 }
 
+class IvyVisitor extends Visitor {
+  constructor(private compilation: IvyCompilation, private importManager: ImportManager) {
+    super();
+  }
+
+  visitClassDeclaration(node: ts.ClassDeclaration):
+      VisitListEntryResult<ts.Statement, ts.ClassDeclaration> {
+    // Determine if this class has an Ivy field that needs to be added, and compile the field
+    // to an expression if so.
+    const res = this.compilation.compileIvyFieldFor(node);
+    if (res !== undefined) {
+      // There is a field to add. Translate the initializer for the field into TS nodes.
+      const exprNode = translateExpression(res.initializer, this.importManager);
+
+      // Create a static property declaration for the new field.
+      const property = ts.createProperty(
+          undefined, [ts.createToken(ts.SyntaxKind.StaticKeyword)], res.field, undefined, undefined,
+          exprNode);
+
+      // Replace the class declaration with an updated version.
+      node = ts.updateClassDeclaration(
+          node,
+          // Remove the decorator which triggered this compilation, leaving the others alone.
+          maybeFilterDecorator(node.decorators, this.compilation.ivyDecoratorFor(node) !),
+          node.modifiers, node.name, node.typeParameters, node.heritageClauses || [],
+          [...node.members, property]);
+      const statements = res.statements.map(stmt => translateStatement(stmt, this.importManager));
+      return {node, before: statements};
+    }
+
+    return {node};
+  }
+}
+
 /**
  * A transformer which operates on ts.SourceFiles and applies changes from an `IvyCompilation`.
  */
@@ -30,7 +66,7 @@ function transformIvySourceFile(
   const importManager = new ImportManager();
 
   // Recursively scan through the AST and perform any updates requested by the IvyCompilation.
-  const sf = visitNode(file);
+  const sf = visit(file, new IvyVisitor(compilation, importManager), context);
 
   // Generate the import statements to prepend.
   const imports = importManager.getAllImports().map(
@@ -44,44 +80,8 @@ function transformIvySourceFile(
     sf.statements = ts.createNodeArray([...imports, ...sf.statements]);
   }
   return sf;
-
-  // Helper function to process a class declaration.
-  function visitClassDeclaration(node: ts.ClassDeclaration): ts.ClassDeclaration {
-    // Determine if this class has an Ivy field that needs to be added, and compile the field
-    // to an expression if so.
-    const res = compilation.compileIvyFieldFor(node);
-    if (res !== undefined) {
-      // There is a field to add. Translate the initializer for the field into TS nodes.
-      const exprNode = translateExpression(res.initializer, importManager);
-
-      // Create a static property declaration for the new field.
-      const property = ts.createProperty(
-          undefined, [ts.createToken(ts.SyntaxKind.StaticKeyword)], res.field, undefined, undefined,
-          exprNode);
-
-      // Replace the class declaration with an updated version.
-      node = ts.updateClassDeclaration(
-          node,
-          // Remove the decorator which triggered this compilation, leaving the others alone.
-          maybeFilterDecorator(node.decorators, compilation.ivyDecoratorFor(node) !),
-          node.modifiers, node.name, node.typeParameters, node.heritageClauses || [],
-          [...node.members, property]);
-    }
-
-    // Recurse into the class declaration in case there are nested class declarations.
-    return ts.visitEachChild(node, child => visitNode(child), context);
-  }
-
-  // Helper function that recurses through the nodes and processes each one.
-  function visitNode<T extends ts.Node>(node: T): T;
-  function visitNode(node: ts.Node): ts.Node {
-    if (ts.isClassDeclaration(node)) {
-      return visitClassDeclaration(node);
-    } else {
-      return ts.visitEachChild(node, child => visitNode(child), context);
-    }
-  }
 }
+
 function maybeFilterDecorator(
     decorators: ts.NodeArray<ts.Decorator>| undefined,
     toRemove: ts.Decorator): ts.NodeArray<ts.Decorator>|undefined {
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index 77151a94ba..69ad563a71 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -6,9 +6,28 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ArrayType, AssertNotNull, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
+import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
+const BINARY_OPERATORS = new Map<BinaryOperator, ts.BinaryOperator>([
+  [BinaryOperator.And, ts.SyntaxKind.AmpersandAmpersandToken],
+  [BinaryOperator.Bigger, ts.SyntaxKind.GreaterThanToken],
+  [BinaryOperator.BiggerEquals, ts.SyntaxKind.GreaterThanEqualsToken],
+  [BinaryOperator.BitwiseAnd, ts.SyntaxKind.AmpersandToken],
+  [BinaryOperator.Divide, ts.SyntaxKind.SlashToken],
+  [BinaryOperator.Equals, ts.SyntaxKind.EqualsEqualsToken],
+  [BinaryOperator.Identical, ts.SyntaxKind.EqualsEqualsEqualsToken],
+  [BinaryOperator.Lower, ts.SyntaxKind.LessThanToken],
+  [BinaryOperator.LowerEquals, ts.SyntaxKind.LessThanEqualsToken],
+  [BinaryOperator.Minus, ts.SyntaxKind.MinusToken],
+  [BinaryOperator.Modulo, ts.SyntaxKind.PercentToken],
+  [BinaryOperator.Multiply, ts.SyntaxKind.AsteriskToken],
+  [BinaryOperator.NotEquals, ts.SyntaxKind.ExclamationEqualsToken],
+  [BinaryOperator.NotIdentical, ts.SyntaxKind.ExclamationEqualsEqualsToken],
+  [BinaryOperator.Or, ts.SyntaxKind.BarBarToken],
+  [BinaryOperator.Plus, ts.SyntaxKind.PlusToken],
+]);
+
 export class ImportManager {
   private moduleToIndex = new Map<string, string>();
   private nextIndex = 0;
@@ -32,6 +51,10 @@ export function translateExpression(expression: Expression, imports: ImportManag
   return expression.visitExpression(new ExpressionTranslatorVisitor(imports), null);
 }
 
+export function translateStatement(statement: Statement, imports: ImportManager): ts.Statement {
+  return statement.visitStatement(new ExpressionTranslatorVisitor(imports), null);
+}
+
 export function translateType(type: Type, imports: ImportManager): string {
   return type.visitType(new TypeTranslatorVisitor(imports), null);
 }
@@ -39,16 +62,23 @@ export function translateType(type: Type, imports: ImportManager): string {
 class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor {
   constructor(private imports: ImportManager) {}
 
-  visitDeclareVarStmt(stmt: DeclareVarStmt, context: any) {
-    throw new Error('Method not implemented.');
+  visitDeclareVarStmt(stmt: DeclareVarStmt, context: any): ts.VariableStatement {
+    return ts.createVariableStatement(
+        undefined,
+        ts.createVariableDeclarationList([ts.createVariableDeclaration(
+            stmt.name, undefined, stmt.value && stmt.value.visitExpression(this, context))]));
   }
 
-  visitDeclareFunctionStmt(stmt: DeclareFunctionStmt, context: any) {
-    throw new Error('Method not implemented.');
+  visitDeclareFunctionStmt(stmt: DeclareFunctionStmt, context: any): ts.FunctionDeclaration {
+    return ts.createFunctionDeclaration(
+        undefined, undefined, undefined, stmt.name, undefined,
+        stmt.params.map(param => ts.createParameter(undefined, undefined, undefined, param.name)),
+        undefined,
+        ts.createBlock(stmt.statements.map(child => child.visitStatement(this, context))));
   }
 
-  visitExpressionStmt(stmt: ExpressionStatement, context: any) {
-    throw new Error('Method not implemented.');
+  visitExpressionStmt(stmt: ExpressionStatement, context: any): ts.ExpressionStatement {
+    return ts.createStatement(stmt.expr.visitExpression(this, context));
   }
 
   visitReturnStmt(stmt: ReturnStatement, context: any): ts.ReturnStatement {
@@ -59,7 +89,14 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     throw new Error('Method not implemented.');
   }
 
-  visitIfStmt(stmt: IfStmt, context: any) { throw new Error('Method not implemented.'); }
+  visitIfStmt(stmt: IfStmt, context: any): ts.IfStatement {
+    return ts.createIf(
+        stmt.condition.visitExpression(this, context),
+        ts.createBlock(stmt.trueCase.map(child => child.visitStatement(this, context))),
+        stmt.falseCase.length > 0 ?
+            ts.createBlock(stmt.falseCase.map(child => child.visitStatement(this, context))) :
+            undefined);
+  }
 
   visitTryCatchStmt(stmt: TryCatchStmt, context: any) {
     throw new Error('Method not implemented.');
@@ -89,12 +126,17 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     throw new Error('Method not implemented.');
   }
 
-  visitWritePropExpr(expr: WritePropExpr, context: any): never {
-    throw new Error('Method not implemented.');
+  visitWritePropExpr(expr: WritePropExpr, context: any): ts.BinaryExpression {
+    return ts.createBinary(
+        ts.createPropertyAccess(expr.receiver.visitExpression(this, context), expr.name),
+        ts.SyntaxKind.EqualsToken, expr.value.visitExpression(this, context));
   }
 
-  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: any): never {
-    throw new Error('Method not implemented.');
+  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: any): ts.CallExpression {
+    const target = ast.receiver.visitExpression(this, context);
+    return ts.createCall(
+        ast.name !== null ? ts.createPropertyAccess(target, ast.name) : target, undefined,
+        ast.args.map(arg => arg.visitExpression(this, context)));
   }
 
   visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: any): ts.CallExpression {
@@ -156,20 +198,26 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
         undefined, ts.createBlock(ast.statements.map(stmt => stmt.visitStatement(this, context))));
   }
 
-  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): never {
-    throw new Error('Method not implemented.');
+  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): ts.Expression {
+    if (!BINARY_OPERATORS.has(ast.operator)) {
+      throw new Error(`Unknown binary operator: ${BinaryOperator[ast.operator]}`);
+    }
+    const binEx = ts.createBinary(
+        ast.lhs.visitExpression(this, context), BINARY_OPERATORS.get(ast.operator) !,
+        ast.rhs.visitExpression(this, context));
+    return ast.parens ? ts.createParen(binEx) : binEx;
   }
 
-  visitReadPropExpr(ast: ReadPropExpr, context: any): never {
-    throw new Error('Method not implemented.');
+  visitReadPropExpr(ast: ReadPropExpr, context: any): ts.PropertyAccessExpression {
+    return ts.createPropertyAccess(ast.receiver.visitExpression(this, context), ast.name);
   }
 
   visitReadKeyExpr(ast: ReadKeyExpr, context: any): never {
     throw new Error('Method not implemented.');
   }
 
-  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any): never {
-    throw new Error('Method not implemented.');
+  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any): ts.ArrayLiteralExpression {
+    return ts.createArrayLiteral(ast.entries.map(expr => expr.visitExpression(this, context)));
   }
 
   visitLiteralMapExpr(ast: LiteralMapExpr, context: any): ts.ObjectLiteralExpression {
@@ -297,8 +345,9 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
 
   visitReadKeyExpr(ast: ReadKeyExpr, context: any) { throw new Error('Method not implemented.'); }
 
-  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any) {
-    throw new Error('Method not implemented.');
+  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any): string {
+    const values = ast.entries.map(expr => expr.visitExpression(this, context));
+    return `[${values.join(',')}]`;
   }
 
   visitLiteralMapExpr(ast: LiteralMapExpr, context: any) {
diff --git a/packages/compiler-cli/src/ngtsc/util/src/visitor.ts b/packages/compiler-cli/src/ngtsc/util/src/visitor.ts
index f3e04a1056..455a1d3613 100644
--- a/packages/compiler-cli/src/ngtsc/util/src/visitor.ts
+++ b/packages/compiler-cli/src/ngtsc/util/src/visitor.ts
@@ -33,7 +33,7 @@ export abstract class Visitor {
   /**
    * Maps statements to an array of statements that should be inserted before them.
    */
-  private _before = new Map<ts.Statement, ts.Statement[]>();
+  private _before = new Map<ts.Node, ts.Statement[]>();
 
   /**
    * Visit a class declaration, returning at least the transformed declaration and optionally other
@@ -44,16 +44,15 @@ export abstract class Visitor {
     return {node};
   }
 
-  private _visitClassDeclaration(node: ts.ClassDeclaration, context: ts.TransformationContext):
-      ts.ClassDeclaration {
-    const result = this.visitClassDeclaration(node);
-    const visited = ts.visitEachChild(result.node, child => this._visit(child, context), context);
+  private _visitListEntryNode<T extends ts.Statement>(
+      node: T, visitor: (node: T) => VisitListEntryResult<ts.Statement, T>): T {
+    const result = visitor(node);
     if (result.before !== undefined) {
       // Record that some nodes should be inserted before the given declaration. The declaration's
       // parent's _visit call is responsible for performing this insertion.
-      this._before.set(visited, result.before);
+      this._before.set(result.node, result.before);
     }
-    return visited;
+    return result.node;
   }
 
   /**
@@ -61,11 +60,6 @@ export abstract class Visitor {
    */
   visitOtherNode<T extends ts.Node>(node: T): T { return node; }
 
-  private _visitOtherNode<T extends ts.Node>(node: T, context: ts.TransformationContext): T {
-    return ts.visitEachChild(
-        this.visitOtherNode(node), child => this._visit(child, context), context);
-  }
-
   /**
    * @internal
    */
@@ -73,10 +67,14 @@ export abstract class Visitor {
     // First, visit the node. visitedNode starts off as `null` but should be set after visiting
     // is completed.
     let visitedNode: T|null = null;
+
+    node = ts.visitEachChild(node, child => this._visit(child, context), context) as T;
+
     if (ts.isClassDeclaration(node)) {
-      visitedNode = this._visitClassDeclaration(node, context) as typeof node;
+      visitedNode = this._visitListEntryNode(
+          node, (node: ts.ClassDeclaration) => this.visitClassDeclaration(node)) as typeof node;
     } else {
-      visitedNode = this._visitOtherNode(node, context);
+      visitedNode = this.visitOtherNode(node);
     }
 
     // If the visited node has a `statements` array then process them, maybe replacing the visited
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index c7d1c3c5b3..a87052c3a1 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -16,6 +16,8 @@ function callableParamDecorator(): FnWithArg<(a: any, b: any, c: any) => void> {
   return null !;
 }
 
+export const Component = callableClassDecorator();
+export const Directive = callableClassDecorator();
 export const Injectable = callableClassDecorator();
 export const NgModule = callableClassDecorator();
 
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 4c56ce857d..b4869e1728 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -95,7 +95,7 @@ describe('ngtsc behavioral tests', () => {
     }`);
   });
 
-  it('should compile without errors', () => {
+  it('should compile Injectables without errors', () => {
     writeConfig();
     write('test.ts', `
         import {Injectable} from '@angular/core';
@@ -122,4 +122,62 @@ describe('ngtsc behavioral tests', () => {
     expect(dtsContents).toContain('static ngInjectableDef: i0.InjectableDef<Dep>;');
     expect(dtsContents).toContain('static ngInjectableDef: i0.InjectableDef<Service>;');
   });
+
+  it('should compile Components without errors', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Component} from '@angular/core';
+
+        @Component({
+          selector: 'test-cmp',
+          template: 'this is a test',
+        })
+        export class TestCmp {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ɵdefineComponent');
+    expect(jsContents).not.toContain('__decorate');
+
+    const dtsContents = getContents('test.d.ts');
+    expect(dtsContents).toContain('static ngComponentDef: i0.ComponentDef<TestCmp, \'test-cmp\'>');
+  });
+
+  it('should compile NgModules without errors', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Component, NgModule} from '@angular/core';
+
+        @Component({
+          selector: 'test-cmp',
+          template: 'this is a test',
+        })
+        export class TestCmp {}
+
+        @NgModule({
+          declarations: [TestCmp],
+        })
+        export class TestModule {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents)
+        .toContain(
+            'i0.ɵdefineNgModule({ type: TestModule, bootstrap: [], ' +
+            'declarations: [TestCmp], imports: [], exports: [] })');
+
+    const dtsContents = getContents('test.d.ts');
+    expect(dtsContents).toContain('static ngComponentDef: i0.ComponentDef<TestCmp, \'test-cmp\'>');
+    expect(dtsContents)
+        .toContain('static ngModuleDef: i0.NgModuleDef<TestModule, [TestCmp], [], []>');
+    expect(dtsContents).not.toContain('__decorate');
+  });
 });
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 51dc0bcafe..03f6f8e5fe 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -119,6 +119,11 @@ export class Identifiers {
     moduleName: CORE,
   };
 
+  static NgModuleDef: o.ExternalReference = {
+    name: 'NgModuleDef',
+    moduleName: CORE,
+  };
+
   static defineNgModule: o.ExternalReference = {name: 'ɵdefineNgModule', moduleName: CORE};
 
   static definePipe: o.ExternalReference = {name: 'ɵdefinePipe', moduleName: CORE};
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index 91a365a3dc..78f3e0db84 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -72,8 +72,11 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
     exports: o.literalArr(exports),
   })]);
 
-  // TODO(alxhub): write a proper type reference when AOT compilation of @NgModule is implemented.
-  const type = new o.ExpressionType(o.NULL_EXPR);
+  const type = new o.ExpressionType(o.importExpr(R3.NgModuleDef, [
+    new o.ExpressionType(moduleType), new o.ExpressionType(o.literalArr(declarations)),
+    new o.ExpressionType(o.literalArr(imports)), new o.ExpressionType(o.literalArr(exports))
+  ]));
+
   const additionalStatements: o.Statement[] = [];
   return {expression, type, additionalStatements};
 }
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 089b652a7c..c2cb6551ac 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -85,8 +85,9 @@ export function compileDirectiveFromMetadata(
     bindingParser: BindingParser): R3DirectiveDef {
   const definitionMap = baseDirectiveFields(meta, constantPool, bindingParser);
   const expression = o.importExpr(R3.defineDirective).callFn([definitionMap.toLiteralMap()]);
-  const type =
-      new o.ExpressionType(o.importExpr(R3.DirectiveDef, [new o.ExpressionType(meta.type)]));
+  const type = new o.ExpressionType(o.importExpr(
+      R3.DirectiveDef,
+      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(meta.selector || ''))]));
   return {expression, type};
 }
 
@@ -154,8 +155,9 @@ export function compileComponentFromMetadata(
   }
 
   const expression = o.importExpr(R3.defineComponent).callFn([definitionMap.toLiteralMap()]);
-  const type =
-      new o.ExpressionType(o.importExpr(R3.ComponentDef, [new o.ExpressionType(meta.type)]));
+  const type = new o.ExpressionType(o.importExpr(
+      R3.ComponentDef,
+      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(meta.selector || ''))]));
 
   return {expression, type};
 }
@@ -243,15 +245,15 @@ function directiveMetadataFromGlobalMetadata(
     selector: directive.selector,
     deps: dependenciesFromGlobalMetadata(directive.type, outputCtx, reflector),
     queries: queriesFromGlobalMetadata(directive.queries, outputCtx),
+    lifecycle: {
+      usesOnChanges:
+          directive.type.lifecycleHooks.some(lifecycle => lifecycle == LifecycleHooks.OnChanges),
+    },
     host: {
       attributes: directive.hostAttributes,
       listeners: summary.hostListeners,
       properties: summary.hostProperties,
     },
-    lifecycle: {
-      usesOnChanges:
-          directive.type.lifecycleHooks.some(lifecycle => lifecycle == LifecycleHooks.OnChanges),
-    },
     inputs: directive.inputs,
     outputs: directive.outputs,
   };
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 57ab502aa6..decfe1ea94 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -849,7 +849,7 @@ function interpolate(args: o.Expression[]): o.Expression {
  * @param templateUrl URL to use for source mapping of the parsed template
  */
 export function parseTemplate(
-    template: string, templateUrl: string, options: {preserveWhitespace?: boolean} = {}):
+    template: string, templateUrl: string, options: {preserveWhitespaces?: boolean} = {}):
     {errors?: ParseError[], nodes: t.Node[], hasNgContent: boolean, ngContentSelectors: string[]} {
   const bindingParser = makeBindingParser();
   const htmlParser = new HtmlParser();
@@ -860,7 +860,7 @@ export function parseTemplate(
   }
 
   let rootNodes: html.Node[] = parseResult.rootNodes;
-  if (!options.preserveWhitespace) {
+  if (!options.preserveWhitespaces) {
     rootNodes = html.visitAll(new WhitespaceVisitor(), rootNodes);
   }
 
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index c944bace23..11e7feb6a9 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -11,6 +11,7 @@ export {
   defineComponent as ɵdefineComponent,
   defineDirective as ɵdefineDirective,
   definePipe as ɵdefinePipe,
+  defineNgModule as ɵdefineNgModule,
   detectChanges as ɵdetectChanges,
   renderComponent as ɵrenderComponent,
   ComponentType as ɵComponentType,
@@ -82,8 +83,8 @@ export {
   st as ɵst,
   ld as ɵld,
   Pp as ɵPp,
-  ComponentDef as ɵComponentDef,
-  DirectiveDef as ɵDirectiveDef,
+  ComponentDefInternal as ɵComponentDef,
+  DirectiveDefInternal as ɵDirectiveDef,
   PipeDef as ɵPipeDef,
   whenRendered as ɵwhenRendered,
 } from './render3/index';
diff --git a/packages/core/src/metadata.ts b/packages/core/src/metadata.ts
index 2866829128..e606c12fa4 100644
--- a/packages/core/src/metadata.ts
+++ b/packages/core/src/metadata.ts
@@ -13,7 +13,7 @@
 
 import {Attribute, ContentChild, ContentChildren, Query, ViewChild, ViewChildren} from './metadata/di';
 import {Component, Directive, HostBinding, HostListener, Input, Output, Pipe} from './metadata/directives';
-import {ModuleWithProviders, NgModule, NgModuleDef, SchemaMetadata, defineNgModule} from './metadata/ng_module';
+import {ModuleWithProviders, NgModule, SchemaMetadata} from './metadata/ng_module';
 import {ViewEncapsulation} from './metadata/view';
 
 export {ANALYZE_FOR_ENTRY_COMPONENTS, Attribute, ContentChild, ContentChildDecorator, ContentChildren, ContentChildrenDecorator, Query, ViewChild, ViewChildDecorator, ViewChildren, ViewChildrenDecorator} from './metadata/di';
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 711c1855a4..61e3ef7cfa 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -388,6 +388,14 @@ export interface Directive {
    * ```
    */
   queries?: {[key: string]: any};
+
+  /**
+   * If true, this directive/component will be skipped by the AOT compiler and so will always be
+   * compiled using JIT.
+   *
+   * This exists to support future Ivy work and has no effect currently.
+   */
+  jit?: true;
 }
 
 /**
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 40def87bb2..2bc8151c07 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -27,11 +27,39 @@ export interface NgModuleTransitiveScopes {
   exported: {directives: Set<any>; pipes: Set<any>;};
 }
 
-export interface NgModuleDef<T> {
+/**
+ * A version of {@link NgModuleDef} that represents the runtime type shape only, and excludes
+ * metadata parameters.
+ */
+export type NgModuleDefInternal<T> = NgModuleDef<T, any, any, any>;
+
+/**
+ * Runtime link information for NgModules.
+ *
+ * This is the internal data structure used by the runtime to assemble components, directives,
+ * pipes, and injectors.
+ *
+ * NOTE: Always use `defineNgModule` function to create this object,
+ * never create the object directly since the shape of this object
+ * can change between versions.
+ */
+export interface NgModuleDef<T, Declarations, Imports, Exports> {
+  /** Token representing the module. Used by DI. */
   type: T;
+
+  /** List of components to bootstrap. */
   bootstrap: Type<any>[];
+
+  /** List of components, directives, and pipes declared by this module. */
   declarations: Type<any>[];
+
+  /** List of modules or `ModuleWithProviders` imported by this module. */
   imports: Type<any>[];
+
+  /**
+   * List of modules, `ModuleWithProviders`, components, directives, or pipes exported by this
+   * module.
+   */
   exports: Type<any>[];
 
   /**
@@ -42,18 +70,6 @@ export interface NgModuleDef<T> {
   transitiveCompileScopes: NgModuleTransitiveScopes|null;
 }
 
-export function defineNgModule<T>(def: {type: T} & Partial<NgModuleDef<T>>): never {
-  const res: NgModuleDef<T> = {
-    type: def.type,
-    bootstrap: def.bootstrap || [],
-    declarations: def.declarations || [],
-    imports: def.imports || [],
-    exports: def.exports || [],
-    transitiveCompileScopes: null,
-  };
-  return res as never;
-}
-
 /**
  * A wrapper around a module that also includes the providers.
  *
@@ -226,6 +242,14 @@ export interface NgModule {
    * `getModuleFactory`.
    */
   id?: string;
+
+  /**
+   * If true, this module will be skipped by the AOT compiler and so will always be compiled
+   * using JIT.
+   *
+   * This exists to support future Ivy work and has no effect currently.
+   */
+  jit?: true;
 }
 
 function preR3NgModuleCompile(moduleType: InjectorType<any>, metadata: NgModule): void {
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 5f275cd7cd..2009bf8f21 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -15,7 +15,7 @@ import {Sanitizer} from '../sanitization/security';
 import {assertComponentType, assertDefined} from './assert';
 import {queueInitHooks, queueLifecycleHooks} from './hooks';
 import {CLEAN_PROMISE, ROOT_DIRECTIVE_INDICES, _getComponentHostLElementNode, baseDirectiveCreate, createLViewData, createTView, detectChangesInternal, enterView, executeInitAndContentHooks, getRootView, hostElement, initChangeDetectorIfExisting, leaveView, locateHostElement, setHostBindings,} from './instructions';
-import {ComponentDef, ComponentType} from './interfaces/definition';
+import {ComponentDef, ComponentDefInternal, ComponentType} from './interfaces/definition';
 import {LElementNode} from './interfaces/node';
 import {RElement, RendererFactory3, domRendererFactory3} from './interfaces/renderer';
 import {LViewData, LViewFlags, RootContext, INJECTOR, CONTEXT, TVIEW} from './interfaces/view';
@@ -52,7 +52,7 @@ export interface CreateComponentOptions {
    * features list because there's no way of knowing when the component will be used as
    * a root component.
    */
-  hostFeatures?: (<T>(component: T, componentDef: ComponentDef<T>) => void)[];
+  hostFeatures?: (<T>(component: T, componentDef: ComponentDef<T, string>) => void)[];
 
   /**
    * A function which is used to schedule change detection work in the future.
@@ -96,7 +96,8 @@ export function renderComponent<T>(
   ngDevMode && assertComponentType(componentType);
   const rendererFactory = opts.rendererFactory || domRendererFactory3;
   const sanitizer = opts.sanitizer || null;
-  const componentDef = (componentType as ComponentType<T>).ngComponentDef as ComponentDef<T>;
+  const componentDef =
+      (componentType as ComponentType<T>).ngComponentDef as ComponentDefInternal<T>;
   if (componentDef.type != componentType) componentDef.type = componentType;
   let component: T;
   // The first index of the first selector is the tag name.
@@ -157,7 +158,7 @@ export function createRootContext(scheduler: (workFn: () => void) => void): Root
  * renderComponent(AppComponent, {features: [RootLifecycleHooks]});
  * ```
  */
-export function LifecycleHooksFeature(component: any, def: ComponentDef<any>): void {
+export function LifecycleHooksFeature(component: any, def: ComponentDefInternal<any>): void {
   const elementNode = _getComponentHostLElementNode(component);
 
   // Root component is always created at dir index 0
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index a903ca309c..a3aca371ee 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -19,7 +19,7 @@ import {Type} from '../type';
 import {assertComponentType, assertDefined} from './assert';
 import {createRootContext} from './component';
 import {baseDirectiveCreate, createLViewData, createTView, enterView, hostElement, initChangeDetectorIfExisting, locateHostElement} from './instructions';
-import {ComponentDef, ComponentType} from './interfaces/definition';
+import {ComponentDefInternal, ComponentType} from './interfaces/definition';
 import {LElementNode} from './interfaces/node';
 import {RElement} from './interfaces/renderer';
 import {INJECTOR, LViewData, LViewFlags, RootContext} from './interfaces/view';
@@ -72,7 +72,7 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     return toRefArray(this.componentDef.outputs);
   }
 
-  constructor(private componentDef: ComponentDef<any>) {
+  constructor(private componentDef: ComponentDefInternal<any>) {
     super();
     this.componentType = componentDef.type;
     this.selector = componentDef.selectors[0][0] as string;
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index e39abdb9b7..fd6a4b08d4 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -11,12 +11,13 @@ import {ChangeDetectionStrategy} from '../change_detection/constants';
 import {PipeTransform} from '../change_detection/pipe_transform';
 import {Provider} from '../core';
 import {OnChanges, SimpleChanges} from '../metadata/lifecycle_hooks';
+import {NgModuleDef, NgModuleDefInternal} from '../metadata/ng_module';
 import {RendererType2} from '../render/api';
 import {Type} from '../type';
 import {resolveRendererType2} from '../view/util';
 
 import {diPublic} from './di';
-import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFeature, DirectiveDefListOrFactory, DirectiveType, DirectiveTypesOrFactory, PipeDef, PipeType, PipeTypesOrFactory} from './interfaces/definition';
+import {ComponentDefFeature, ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefFeature, DirectiveDefInternal, DirectiveDefListOrFactory, DirectiveType, DirectiveTypesOrFactory, PipeDef, PipeType, PipeTypesOrFactory} from './interfaces/definition';
 import {CssSelectorList, SelectorFlags} from './interfaces/projection';
 
 
@@ -166,7 +167,7 @@ export function defineComponent<T>(componentDefinition: {
   const type = componentDefinition.type;
   const pipeTypes = componentDefinition.pipes !;
   const directiveTypes = componentDefinition.directives !;
-  const def = <ComponentDef<any>>{
+  const def: ComponentDefInternal<any> = {
     type: type,
     diPublic: null,
     factory: componentDefinition.factory,
@@ -176,7 +177,7 @@ export function defineComponent<T>(componentDefinition: {
     inputs: invertObject(componentDefinition.inputs),
     outputs: invertObject(componentDefinition.outputs),
     rendererType: resolveRendererType2(componentDefinition.rendererType) || null,
-    exportAs: componentDefinition.exportAs,
+    exportAs: componentDefinition.exportAs || null,
     onInit: type.prototype.ngOnInit || null,
     doCheck: type.prototype.ngDoCheck || null,
     afterContentInit: type.prototype.ngAfterContentInit || null,
@@ -200,7 +201,7 @@ export function defineComponent<T>(componentDefinition: {
 }
 
 export function extractDirectiveDef(type: DirectiveType<any>& ComponentType<any>):
-    DirectiveDef<any>|ComponentDef<any> {
+    DirectiveDefInternal<any>|ComponentDefInternal<any> {
   const def = type.ngComponentDef || type.ngDirectiveDef;
   if (ngDevMode && !def) {
     throw new Error(`'${type.name}' is neither 'ComponentType' or 'DirectiveType'.`);
@@ -216,7 +217,17 @@ export function extractPipeDef(type: PipeType<any>): PipeDef<any> {
   return def;
 }
 
-
+export function defineNgModule<T>(def: {type: T} & Partial<NgModuleDef<T, any, any, any>>): never {
+  const res: NgModuleDefInternal<T> = {
+    type: def.type,
+    bootstrap: def.bootstrap || [],
+    declarations: def.declarations || [],
+    imports: def.imports || [],
+    exports: def.exports || [],
+    transitiveCompileScopes: null,
+  };
+  return res as never;
+}
 
 const PRIVATE_PREFIX = '__ngOnChanges_';
 
@@ -250,7 +261,7 @@ type OnChangesExpando = OnChanges & {
  */
 export function NgOnChangesFeature(inputPropertyNames?: {[key: string]: string}):
     DirectiveDefFeature {
-  return function(definition: DirectiveDef<any>): void {
+  return function(definition: DirectiveDefInternal<any>): void {
     const inputs = definition.inputs;
     const proto = definition.type.prototype;
     for (let pubKey in inputs) {
@@ -313,7 +324,7 @@ export function NgOnChangesFeature(inputPropertyNames?: {[key: string]: string})
 }
 
 
-export function PublicFeature<T>(definition: DirectiveDef<T>) {
+export function PublicFeature<T>(definition: DirectiveDefInternal<T>) {
   definition.diPublic = diPublic;
 }
 
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index b5b9ad78d3..24860481ea 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -21,7 +21,7 @@ import {Type} from '../type';
 import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
 import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {VIEWS} from './interfaces/container';
-import {ComponentTemplate, DirectiveDef} from './interfaces/definition';
+import {ComponentTemplate, DirectiveDefInternal} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
@@ -141,7 +141,7 @@ export function getOrCreateNodeInjectorForNode(node: LElementNode | LContainerNo
  * @param di The node injector in which a directive will be added
  * @param def The definition of the directive to be made public
  */
-export function diPublicInInjector(di: LInjector, def: DirectiveDef<any>): void {
+export function diPublicInInjector(di: LInjector, def: DirectiveDefInternal<any>): void {
   bloomAdd(di, def.type);
 }
 
@@ -150,7 +150,7 @@ export function diPublicInInjector(di: LInjector, def: DirectiveDef<any>): void
  *
  * @param def The definition of the directive to be made public
  */
-export function diPublic(def: DirectiveDef<any>): void {
+export function diPublic(def: DirectiveDefInternal<any>): void {
   diPublicInInjector(getOrCreateNodeInjector(), def);
 }
 
@@ -376,7 +376,7 @@ export function getOrCreateInjectable<T>(
         for (let i = start; i < end; i++) {
           // Get the definition for the directive at this index and, if it is injectable (diPublic),
           // and matches the given token, return the directive instance.
-          const directiveDef = defs[i] as DirectiveDef<any>;
+          const directiveDef = defs[i] as DirectiveDefInternal<any>;
           if (directiveDef.type === token && directiveDef.diPublic) {
             return getDirectiveInstance(node.view[DIRECTIVES] ![i]);
           }
@@ -409,7 +409,7 @@ function searchMatchesQueuedForCreation<T>(node: LNode, token: any): T|null {
   const matches = node.view[TVIEW].currentMatches;
   if (matches) {
     for (let i = 0; i < matches.length; i += 2) {
-      const def = matches[i] as DirectiveDef<any>;
+      const def = matches[i] as DirectiveDefInternal<any>;
       if (def.type === token) {
         return resolveDirective(def, i + 1, matches, node.view[TVIEW]);
       }
diff --git a/packages/core/src/render3/hooks.ts b/packages/core/src/render3/hooks.ts
index 5b49b24b78..f05f673b58 100644
--- a/packages/core/src/render3/hooks.ts
+++ b/packages/core/src/render3/hooks.ts
@@ -7,7 +7,7 @@
  */
 
 import {assertEqual} from './assert';
-import {DirectiveDef} from './interfaces/definition';
+import {DirectiveDefInternal} from './interfaces/definition';
 import {TNodeFlags} from './interfaces/node';
 import {DIRECTIVES, FLAGS, HookData, LViewData, LViewFlags, TView} from './interfaces/view';
 
@@ -52,7 +52,7 @@ export function queueLifecycleHooks(flags: number, tView: TView): void {
     // directiveCreate) so we can preserve the current hook order. Content, view, and destroy
     // hooks for projected components and directives must be called *before* their hosts.
     for (let i = start; i < end; i++) {
-      const def: DirectiveDef<any> = tView.directives ![i];
+      const def: DirectiveDefInternal<any> = tView.directives ![i];
       queueContentHooks(def, tView, i);
       queueViewHooks(def, tView, i);
       queueDestroyHooks(def, tView, i);
@@ -61,7 +61,7 @@ export function queueLifecycleHooks(flags: number, tView: TView): void {
 }
 
 /** Queues afterContentInit and afterContentChecked hooks on TView */
-function queueContentHooks(def: DirectiveDef<any>, tView: TView, i: number): void {
+function queueContentHooks(def: DirectiveDefInternal<any>, tView: TView, i: number): void {
   if (def.afterContentInit) {
     (tView.contentHooks || (tView.contentHooks = [])).push(i, def.afterContentInit);
   }
@@ -73,7 +73,7 @@ function queueContentHooks(def: DirectiveDef<any>, tView: TView, i: number): voi
 }
 
 /** Queues afterViewInit and afterViewChecked hooks on TView */
-function queueViewHooks(def: DirectiveDef<any>, tView: TView, i: number): void {
+function queueViewHooks(def: DirectiveDefInternal<any>, tView: TView, i: number): void {
   if (def.afterViewInit) {
     (tView.viewHooks || (tView.viewHooks = [])).push(i, def.afterViewInit);
   }
@@ -85,7 +85,7 @@ function queueViewHooks(def: DirectiveDef<any>, tView: TView, i: number): void {
 }
 
 /** Queues onDestroy hooks on TView */
-function queueDestroyHooks(def: DirectiveDef<any>, tView: TView, i: number): void {
+function queueDestroyHooks(def: DirectiveDefInternal<any>, tView: TView, i: number): void {
   if (def.onDestroy != null) {
     (tView.destroyHooks || (tView.destroyHooks = [])).push(i, def.onDestroy);
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index df2efee76c..7ff3835145 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -7,8 +7,8 @@
  */
 
 import {LifecycleHooksFeature, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
-import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, definePipe} from './definition';
-import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef} from './interfaces/definition';
+import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, defineNgModule, definePipe} from './definition';
+import {ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
@@ -16,6 +16,7 @@ export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
 
+
 // Naming scheme:
 // - Capital letters are for creating things: T(Text), E(Element), D(Directive), V(View),
 // C(Container), L(Listener)
@@ -116,10 +117,10 @@ export {
 // clang-format on
 
 export {
-  ComponentDef,
+  ComponentDefInternal,
   ComponentTemplate,
   ComponentType,
-  DirectiveDef,
+  DirectiveDefInternal,
   DirectiveDefFlags,
   DirectiveType,
   NgOnChangesFeature,
@@ -128,6 +129,7 @@ export {
   LifecycleHooksFeature,
   defineComponent,
   defineDirective,
+  defineNgModule,
   definePipe,
   getHostElement,
   getRenderedText,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 10ea38172c..774ecc245d 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -23,7 +23,7 @@ import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNode
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
+import {ComponentDefInternal, ComponentTemplate, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
@@ -258,7 +258,7 @@ export function setHostBindings(bindings: number[] | null): void {
     const defs = tView.directives !;
     for (let i = 0; i < bindings.length; i += 2) {
       const dirIndex = bindings[i];
-      const def = defs[dirIndex] as DirectiveDef<any>;
+      const def = defs[dirIndex] as DirectiveDefInternal<any>;
       def.hostBindings && def.hostBindings(dirIndex, bindings[i + 1]);
     }
   }
@@ -659,7 +659,7 @@ function cacheMatchingDirectivesForNode(
   const matches = tView.currentMatches = findDirectiveMatches(tNode);
   if (matches) {
     for (let i = 0; i < matches.length; i += 2) {
-      const def = matches[i] as DirectiveDef<any>;
+      const def = matches[i] as DirectiveDefInternal<any>;
       const valueIndex = i + 1;
       resolveDirective(def, valueIndex, matches, tView);
       saveNameToExportMap(matches[valueIndex] as number, def, exportsMap);
@@ -676,7 +676,7 @@ function findDirectiveMatches(tNode: TNode): CurrentMatchesList|null {
     for (let i = 0; i < registry.length; i++) {
       const def = registry[i];
       if (isNodeMatchingSelectorList(tNode, def.selectors !)) {
-        if ((def as ComponentDef<any>).template) {
+        if ((def as ComponentDefInternal<any>).template) {
           if (tNode.flags & TNodeFlags.isComponent) throwMultipleComponentError(tNode);
           tNode.flags = TNodeFlags.isComponent;
         }
@@ -689,7 +689,8 @@ function findDirectiveMatches(tNode: TNode): CurrentMatchesList|null {
 }
 
 export function resolveDirective(
-    def: DirectiveDef<any>, valueIndex: number, matches: CurrentMatchesList, tView: TView): any {
+    def: DirectiveDefInternal<any>, valueIndex: number, matches: CurrentMatchesList,
+    tView: TView): any {
   if (matches[valueIndex] === null) {
     matches[valueIndex] = CIRCULAR;
     const instance = def.factory();
@@ -745,7 +746,7 @@ function instantiateDirectivesDirectly() {
     const tDirectives = tView.directives !;
 
     for (let i = start; i < end; i++) {
-      const def: DirectiveDef<any> = tDirectives[i];
+      const def: DirectiveDefInternal<any> = tDirectives[i];
       directiveCreate(i, def.factory(), def);
     }
   }
@@ -773,11 +774,11 @@ function cacheMatchingLocalNames(
  * to their directive instances.
  */
 function saveNameToExportMap(
-    index: number, def: DirectiveDef<any>| ComponentDef<any>,
+    index: number, def: DirectiveDefInternal<any>| ComponentDefInternal<any>,
     exportsMap: {[key: string]: number} | null) {
   if (exportsMap) {
     if (def.exportAs) exportsMap[def.exportAs] = index;
-    if ((def as ComponentDef<any>).template) exportsMap[''] = index;
+    if ((def as ComponentDefInternal<any>).template) exportsMap[''] = index;
   }
 }
 
@@ -929,7 +930,7 @@ export function locateHostElement(
  * @returns LElementNode created
  */
 export function hostElement(
-    tag: string, rNode: RElement | null, def: ComponentDef<any>,
+    tag: string, rNode: RElement | null, def: ComponentDefInternal<any>,
     sanitizer?: Sanitizer | null): LElementNode {
   resetApplicationState();
   const node = createLNode(
@@ -1187,7 +1188,7 @@ function generatePropertyAliases(
     const defs = tView.directives !;
 
     for (let i = start; i < end; i++) {
-      const directiveDef = defs[i] as DirectiveDef<any>;
+      const directiveDef = defs[i] as DirectiveDefInternal<any>;
       const propertyAliasMap: {[publicName: string]: string} =
           isInput ? directiveDef.inputs : directiveDef.outputs;
       for (let publicName in propertyAliasMap) {
@@ -1387,15 +1388,16 @@ export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
  * @param directiveDef DirectiveDef object which contains information about the template.
  */
 export function directiveCreate<T>(
-    index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
+    index: number, directive: T,
+    directiveDef: DirectiveDefInternal<T>| ComponentDefInternal<T>): T {
   const instance = baseDirectiveCreate(index, directive, directiveDef);
 
   ngDevMode && assertDefined(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
   const tNode = previousOrParentNode.tNode;
 
-  const isComponent = (directiveDef as ComponentDef<T>).template;
+  const isComponent = (directiveDef as ComponentDefInternal<T>).template;
   if (isComponent) {
-    addComponentLogic(index, directive, directiveDef as ComponentDef<T>);
+    addComponentLogic(index, directive, directiveDef as ComponentDefInternal<T>);
   }
 
   if (firstTemplatePass) {
@@ -1413,7 +1415,8 @@ export function directiveCreate<T>(
   return instance;
 }
 
-function addComponentLogic<T>(directiveIndex: number, instance: T, def: ComponentDef<T>): void {
+function addComponentLogic<T>(
+    directiveIndex: number, instance: T, def: ComponentDefInternal<T>): void {
   const tView = getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs);
 
   // Only component views should be added to the view tree directly. Embedded views are
@@ -1442,7 +1445,8 @@ function addComponentLogic<T>(directiveIndex: number, instance: T, def: Componen
  * current Angular. Example: local refs and inputs on root component.
  */
 export function baseDirectiveCreate<T>(
-    index: number, directive: T, directiveDef: DirectiveDef<T>| ComponentDef<T>): T {
+    index: number, directive: T,
+    directiveDef: DirectiveDefInternal<T>| ComponentDefInternal<T>): T {
   ngDevMode &&
       assertEqual(viewData[BINDING_INDEX], -1, 'directives should be created before any bindings');
   ngDevMode && assertPreviousIsParent();
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index dc41b96f33..b13d1924d0 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -54,6 +54,12 @@ export const enum DirectiveDefFlags {ContentQuery = 0b10}
  */
 export interface PipeType<T> extends Type<T> { ngPipeDef: never; }
 
+/**
+ * A version of {@link DirectiveDef} that represents the runtime type shape only, and excludes
+ * metadata parameters.
+ */
+export type DirectiveDefInternal<T> = DirectiveDef<T, string>;
+
 /**
  * Runtime link information for Directives.
  *
@@ -64,14 +70,16 @@ export interface PipeType<T> extends Type<T> { ngPipeDef: never; }
  * never create the object directly since the shape of this object
  * can change between versions.
  *
+ * @param Selector type metadata specifying the selector of the directive or component
+ *
  * See: {@link defineDirective}
  */
-export interface DirectiveDef<T> {
+export interface DirectiveDef<T, Selector extends string> {
   /** Token representing the directive. Used by DI. */
   type: Type<T>;
 
   /** Function that makes a directive public to the DI system. */
-  diPublic: ((def: DirectiveDef<any>) => void)|null;
+  diPublic: ((def: DirectiveDef<any, string>) => void)|null;
 
   /** The selectors that will be used to match nodes to this directive. */
   selectors: CssSelectorList;
@@ -124,6 +132,12 @@ export interface DirectiveDef<T> {
   onDestroy: (() => void)|null;
 }
 
+/**
+ * A version of {@link ComponentDef} that represents the runtime type shape only, and excludes
+ * metadata parameters.
+ */
+export type ComponentDefInternal<T> = ComponentDef<T, string>;
+
 /**
  * Runtime link information for Components.
  *
@@ -136,7 +150,7 @@ export interface DirectiveDef<T> {
  *
  * See: {@link defineComponent}
  */
-export interface ComponentDef<T> extends DirectiveDef<T> {
+export interface ComponentDef<T, Selector extends string> extends DirectiveDef<T, Selector> {
   /**
    * The View template of the component.
    *
@@ -220,8 +234,8 @@ export interface PipeDef<T> {
   onDestroy: (() => void)|null;
 }
 
-export type DirectiveDefFeature = <T>(directiveDef: DirectiveDef<T>) => void;
-export type ComponentDefFeature = <T>(componentDef: ComponentDef<T>) => void;
+export type DirectiveDefFeature = <T>(directiveDef: DirectiveDef<T, string>) => void;
+export type ComponentDefFeature = <T>(componentDef: ComponentDef<T, string>) => void;
 
 /**
  * Type used for directiveDefs on component definition.
@@ -230,12 +244,12 @@ export type ComponentDefFeature = <T>(componentDef: ComponentDef<T>) => void;
  */
 export type DirectiveDefListOrFactory = (() => DirectiveDefList) | DirectiveDefList;
 
-export type DirectiveDefList = (DirectiveDef<any>| ComponentDef<any>)[];
+export type DirectiveDefList = (DirectiveDef<any, string>| ComponentDef<any, string>)[];
 
 export type DirectiveTypesOrFactory = (() => DirectiveTypeList) | DirectiveTypeList;
 
 export type DirectiveTypeList =
-    (DirectiveDef<any>| ComponentDef<any>|
+    (DirectiveDef<any, string>| ComponentDef<any, string>|
      Type<any>/* Type as workaround for: Microsoft/TypeScript/issues/4881 */)[];
 
 /**
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index cbedb714e8..5f199104cc 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -10,7 +10,7 @@ import {Injector} from '../../di/injector';
 import {Sanitizer} from '../../sanitization/security';
 
 import {LContainer} from './container';
-import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDef, PipeDefList} from './definition';
+import {ComponentTemplate, DirectiveDefInternal, DirectiveDefList, PipeDef, PipeDefList} from './definition';
 import {LElementNode, LViewNode, TNode} from './node';
 import {LQueries} from './query';
 import {Renderer3} from './renderer';
@@ -443,7 +443,7 @@ export type HookData = (number | (() => void))[];
 export type TData = (TNode | PipeDef<any>| null)[];
 
 /** Type for TView.currentMatches */
-export type CurrentMatchesList = [DirectiveDef<any>, (string | number | null)];
+export type CurrentMatchesList = [DirectiveDefInternal<any>, (string | number | null)];
 
 // Note: This hack is necessary so we don't erroneously get a circular dependency
 // failure based on types.
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index 9c0b2d3fb1..b05831dae3 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -47,7 +47,9 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
         const constantPool = new ConstantPool();
 
         // Parse the template and check for errors.
-        const template = parseTemplate(templateStr, `ng://${type.name}/template.html`);
+        const template = parseTemplate(templateStr, `ng://${type.name}/template.html`, {
+          preserveWhitespaces: metadata.preserveWhitespaces || false,
+        });
         if (template.errors !== undefined) {
           const errors = template.errors.map(err => err.toString()).join(', ');
           throw new Error(`Errors during JIT compilation of template for ${type.name}: ${errors}`);
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index b4e0b8f0b5..b82abaa389 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -8,7 +8,6 @@
 
 import {defineInjectable, defineInjector,} from '../../di/defs';
 import {inject} from '../../di/injector';
-import {defineNgModule} from '../../metadata/ng_module';
 import * as r3 from '../index';
 
 
@@ -22,7 +21,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵdefineDirective': r3.defineDirective,
   'defineInjectable': defineInjectable,
   'defineInjector': defineInjector,
-  'ɵdefineNgModule': defineNgModule,
+  'ɵdefineNgModule': r3.defineNgModule,
   'ɵdefinePipe': r3.definePipe,
   'ɵdirectiveInject': r3.directiveInject,
   'inject': inject,
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index e457f3e7ca..004cf80e06 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -8,9 +8,9 @@
 
 import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
 
-import {ModuleWithProviders, NgModule, NgModuleDef, NgModuleTransitiveScopes} from '../../metadata/ng_module';
+import {ModuleWithProviders, NgModule, NgModuleDefInternal, NgModuleTransitiveScopes} from '../../metadata/ng_module';
 import {Type} from '../../type';
-import {ComponentDef} from '../interfaces/definition';
+import {ComponentDefInternal} from '../interfaces/definition';
 
 import {angularCoreEnv} from './environment';
 import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
@@ -48,7 +48,8 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
     if (declaration.hasOwnProperty(NG_COMPONENT_DEF)) {
       // An `ngComponentDef` field exists - go ahead and patch the component directly.
       patchComponentDefWithScope(
-          (declaration as Type<any>& {ngComponentDef: ComponentDef<any>}).ngComponentDef, type);
+          (declaration as Type<any>& {ngComponentDef: ComponentDefInternal<any>}).ngComponentDef,
+          type);
     } else if (
         !declaration.hasOwnProperty(NG_DIRECTIVE_DEF) && !declaration.hasOwnProperty(NG_PIPE_DEF)) {
       // Set `ngSelectorScope` for future reference when the component compilation finishes.
@@ -61,7 +62,8 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
  * Patch the definition of a component with directives and pipes from the compilation scope of
  * a given module.
  */
-export function patchComponentDefWithScope<C, M>(componentDef: ComponentDef<C>, module: Type<M>) {
+export function patchComponentDefWithScope<C, M>(
+    componentDef: ComponentDefInternal<C>, module: Type<M>) {
   componentDef.directiveDefs = () => Array.from(transitiveScopesFor(module).compilation.directives)
                                          .map(dir => dir.ngDirectiveDef || dir.ngComponentDef)
                                          .filter(def => !!def);
@@ -113,7 +115,7 @@ export function transitiveScopesFor<T>(moduleType: Type<T>): NgModuleTransitiveS
   def.imports.forEach(<I>(imported: Type<I>) => {
     let importedTyped = imported as Type<I>& {
       // If imported is an @NgModule:
-      ngModuleDef?: NgModuleDef<I>;
+      ngModuleDef?: NgModuleDefInternal<I>;
     };
 
     if (!isNgModule<I>(importedTyped)) {
@@ -132,7 +134,7 @@ export function transitiveScopesFor<T>(moduleType: Type<T>): NgModuleTransitiveS
       // Components, Directives, NgModules, and Pipes can all be exported.
       ngComponentDef?: any;
       ngDirectiveDef?: any;
-      ngModuleDef?: NgModuleDef<E>;
+      ngModuleDef?: NgModuleDefInternal<E>;
       ngPipeDef?: any;
     };
 
@@ -188,6 +190,6 @@ function isModuleWithProviders(value: any): value is ModuleWithProviders {
   return (value as{ngModule?: any}).ngModule !== undefined;
 }
 
-function isNgModule<T>(value: Type<T>): value is Type<T>&{ngModuleDef: NgModuleDef<T>} {
-  return (value as{ngModuleDef?: NgModuleDef<T>}).ngModuleDef !== undefined;
+function isNgModule<T>(value: Type<T>): value is Type<T>&{ngModuleDef: NgModuleDefInternal<T>} {
+  return (value as{ngModuleDef?: NgModuleDefInternal<T>}).ngModuleDef !== undefined;
 }
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 241df49d51..1ec3ed22ee 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -18,7 +18,7 @@ import {getSymbolIterator} from '../util';
 import {assertDefined, assertEqual} from './assert';
 import {ReadFromInjectorFn, getOrCreateNodeInjectorForNode} from './di';
 import {assertPreviousIsParent, getCurrentQueries, store, storeCleanupWithContext} from './instructions';
-import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
+import {DirectiveDefInternal, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
 import {LInjector, unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {LContainerNode, LElementNode, LNode, TNode, TNodeFlags, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
 import {LQueries, QueryReadType, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
@@ -232,7 +232,7 @@ function getIdxOfMatchingDirective(node: LNode, type: Type<any>): number|null {
   const start = flags >> TNodeFlags.DirectiveStartingIndexShift;
   const end = start + count;
   for (let i = start; i < end; i++) {
-    const def = defs[i] as DirectiveDef<any>;
+    const def = defs[i] as DirectiveDefInternal<any>;
     if (def.type === type && def.diPublic) {
       return i;
     }
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index ef122d93fa..eebdb88453 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -49,6 +49,7 @@ jasmine_node_test(
     ],
     tags = [
         "ivy-jit",
+        "ivy-local",
     ],
     deps = [":test_lib"],
 )
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index ca386bde01..450ccb2b45 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -51,7 +51,11 @@ jasmine_node_test(
         ":bundle.min.js",
         ":bundle.min_debug.js",
     ],
-    tags = ["ivy-jit"],
+    tags = [
+        "ivy-jit",
+        "ivy-local",
+        "ivy-only",
+    ],
     deps = [":test_lib"],
 )
 
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 7e32c98327..80369b3b06 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -26,24 +26,12 @@
   {
     "name": "DIRECTIVES"
   },
-  {
-    "name": "DefaultIterableDiffer"
-  },
-  {
-    "name": "DefaultIterableDifferFactory"
-  },
   {
     "name": "EMPTY$2"
   },
   {
     "name": "EMPTY_RENDERER_TYPE_ID"
   },
-  {
-    "name": "ElementRef$1"
-  },
-  {
-    "name": "EmbeddedViewRef$1"
-  },
   {
     "name": "FLAGS"
   },
@@ -59,12 +47,6 @@
   {
     "name": "INJECTOR$1"
   },
-  {
-    "name": "IterableChangeRecord_"
-  },
-  {
-    "name": "IterableDiffers"
-  },
   {
     "name": "NEXT"
   },
@@ -92,12 +74,6 @@
   {
     "name": "NgIfContext"
   },
-  {
-    "name": "Optional"
-  },
-  {
-    "name": "PARAMETERS"
-  },
   {
     "name": "PARENT"
   },
@@ -107,9 +83,6 @@
   {
     "name": "RENDERER"
   },
-  {
-    "name": "RENDER_PARENT"
-  },
   {
     "name": "ROOT_DIRECTIVE_INDICES"
   },
@@ -119,18 +92,12 @@
   {
     "name": "SANITIZER"
   },
-  {
-    "name": "SkipSelf"
-  },
   {
     "name": "TAIL"
   },
   {
     "name": "TVIEW"
   },
-  {
-    "name": "TemplateRef$1"
-  },
   {
     "name": "ToDoAppComponent"
   },
@@ -149,36 +116,12 @@
   {
     "name": "VIEWS"
   },
-  {
-    "name": "ViewContainerRef$1"
-  },
   {
     "name": "_CLEAN_PROMISE"
   },
-  {
-    "name": "_DuplicateItemRecordList"
-  },
-  {
-    "name": "_DuplicateMap"
-  },
   {
     "name": "_ROOT_DIRECTIVE_INDICES"
   },
-  {
-    "name": "__extends"
-  },
-  {
-    "name": "__read"
-  },
-  {
-    "name": "__self"
-  },
-  {
-    "name": "__spread"
-  },
-  {
-    "name": "__window"
-  },
   {
     "name": "_c0"
   },
@@ -242,21 +185,12 @@
   {
     "name": "_getComponentHostLElementNode"
   },
-  {
-    "name": "_global"
-  },
   {
     "name": "_renderCompCount"
   },
-  {
-    "name": "_symbolIterator"
-  },
   {
     "name": "addComponentLogic"
   },
-  {
-    "name": "addRemoveViewFromContainer"
-  },
   {
     "name": "addToViewTree"
   },
@@ -293,15 +227,9 @@
   {
     "name": "canInsertNativeNode"
   },
-  {
-    "name": "checkNoChanges"
-  },
   {
     "name": "checkNoChangesMode"
   },
-  {
-    "name": "cleanUpView"
-  },
   {
     "name": "componentRefresh"
   },
@@ -341,27 +269,12 @@
   {
     "name": "defineComponent"
   },
-  {
-    "name": "defineDirective"
-  },
   {
     "name": "defineInjectable"
   },
   {
     "name": "defineInjector"
   },
-  {
-    "name": "destroyLView"
-  },
-  {
-    "name": "destroyViewTree"
-  },
-  {
-    "name": "detachView"
-  },
-  {
-    "name": "detectChanges"
-  },
   {
     "name": "detectChangesInternal"
   },
@@ -398,18 +311,6 @@
   {
     "name": "executeInitHooks"
   },
-  {
-    "name": "executeNodeAction"
-  },
-  {
-    "name": "executeOnDestroys"
-  },
-  {
-    "name": "executePipeOnDestroys"
-  },
-  {
-    "name": "extendStatics"
-  },
   {
     "name": "extractDirectiveDef"
   },
@@ -431,9 +332,6 @@
   {
     "name": "generatePropertyAliases"
   },
-  {
-    "name": "getChildLNode"
-  },
   {
     "name": "getCleanup"
   },
@@ -446,18 +344,6 @@
   {
     "name": "getLViewChild"
   },
-  {
-    "name": "getNextLNode"
-  },
-  {
-    "name": "getNextLNodeWithProjection"
-  },
-  {
-    "name": "getOrCreateContainerRef"
-  },
-  {
-    "name": "getOrCreateElementRef"
-  },
   {
     "name": "getOrCreateInjectable"
   },
@@ -470,39 +356,21 @@
   {
     "name": "getOrCreateTView"
   },
-  {
-    "name": "getOrCreateTemplateRef"
-  },
   {
     "name": "getParentLNode"
   },
-  {
-    "name": "getParentState"
-  },
-  {
-    "name": "getPreviousIndex"
-  },
   {
     "name": "getPreviousOrParentNode"
   },
   {
     "name": "getRenderFlags"
   },
-  {
-    "name": "getRenderer"
-  },
   {
     "name": "getRootView"
   },
-  {
-    "name": "getSymbolIterator"
-  },
   {
     "name": "getTViewCleanup"
   },
-  {
-    "name": "getTypeNameForDebugging"
-  },
   {
     "name": "getTypeNameForDebugging$1"
   },
@@ -518,15 +386,6 @@
   {
     "name": "inject"
   },
-  {
-    "name": "injectTemplateRef"
-  },
-  {
-    "name": "injectViewContainerRef"
-  },
-  {
-    "name": "insertView"
-  },
   {
     "name": "instantiateDirectivesDirectly"
   },
@@ -545,12 +404,6 @@
   {
     "name": "isDifferent"
   },
-  {
-    "name": "isJsObject"
-  },
-  {
-    "name": "isListLikeIterable"
-  },
   {
     "name": "isNodeMatchingSelector"
   },
@@ -563,9 +416,6 @@
   {
     "name": "isProceduralRenderer"
   },
-  {
-    "name": "iterateListLike"
-  },
   {
     "name": "leaveView"
   },
@@ -581,15 +431,6 @@
   {
     "name": "locateHostElement"
   },
-  {
-    "name": "looseIdentical"
-  },
-  {
-    "name": "makeMetadataCtor"
-  },
-  {
-    "name": "makeParamDecorator"
-  },
   {
     "name": "markDirtyIfOnPush"
   },
@@ -599,9 +440,6 @@
   {
     "name": "namespaceHTML"
   },
-  {
-    "name": "notImplemented"
-  },
   {
     "name": "queueComponentIndexForCheck"
   },
@@ -632,12 +470,6 @@
   {
     "name": "refreshView"
   },
-  {
-    "name": "removeListeners"
-  },
-  {
-    "name": "removeView"
-  },
   {
     "name": "renderComponent"
   },
@@ -716,15 +548,9 @@
   {
     "name": "tickRootContext"
   },
-  {
-    "name": "trackByIdentity"
-  },
   {
     "name": "viewAttached"
   },
-  {
-    "name": "walkLNodeTree"
-  },
   {
     "name": "wrapListenerWithDirtyAndDefault"
   },
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index 579335ce45..a2acf790be 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -147,36 +147,7 @@ export class ToDoAppComponent {
   }
 }
 
-// In JIT mode the @Directive decorators in //packages/common will compile the Ivy fields. When
-// running under --define=compile=legacy, //packages/common is not compiled with Ivy fields, so they
-// must be monkey-patched on.
-if (!(NgIf as any).ngDirectiveDef) {
-  // TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
-  (CommonModule as any).ngInjectorDef = defineInjector({factory: () => new CommonModule});
-
-  // TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
-  (NgForOf as any).ngDirectiveDef = defineDirective({
-    type: NgForOf,
-    selectors: [['', 'ngFor', '', 'ngForOf', '']],
-    factory: () => new NgForOf(
-                 injectViewContainerRef(), injectTemplateRef(), directiveInject(IterableDiffers)),
-    inputs: {
-      ngForOf: 'ngForOf',
-      ngForTrackBy: 'ngForTrackBy',
-      ngForTemplate: 'ngForTemplate',
-    }
-  });
-
-  // TODO(misko): This hack is here because common is not compiled with Ivy flag turned on.
-  (NgIf as any).ngDirectiveDef = defineDirective({
-    type: NgIf,
-    selectors: [['', 'ngIf', '']],
-    factory: () => new NgIf(injectViewContainerRef(), injectTemplateRef()),
-    inputs: {ngIf: 'ngIf', ngIfThen: 'ngIfThen', ngIfElse: 'ngIfElse'}
-  });
-}
-
-@NgModule({declarations: [ToDoAppComponent, ToDoAppComponent], imports: [CommonModule]})
+@NgModule({declarations: [ToDoAppComponent], imports: [CommonModule]})
 export class ToDoAppModule {
 }
 
diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index 9f2bb7c85c..90cd8ce01c 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
-import {ComponentDef} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
 import {renderComponent, toHtml} from '../render_util';
 
 
@@ -78,8 +78,9 @@ describe('components & directives', () => {
     }
 
     // NON-NORMATIVE (done by defineNgModule)
-    (MyComponent.ngComponentDef as ComponentDef<any>).directiveDefs =
-        [(ChildComponent.ngComponentDef as ComponentDef<any>), SomeDirective.ngDirectiveDef];
+    (MyComponent.ngComponentDef as ComponentDefInternal<any>).directiveDefs = [
+      (ChildComponent.ngComponentDef as ComponentDefInternal<any>), SomeDirective.ngDirectiveDef
+    ];
     // /NON-NORMATIVE
 
     expect(renderComp(MyComponent)).toEqual('<child some-directive="">child-view</child>!');
@@ -127,7 +128,8 @@ describe('components & directives', () => {
     }
 
     // NON-NORMATIVE (done by defineNgModule)
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs = [HostBindingDir.ngDirectiveDef];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+        [HostBindingDir.ngDirectiveDef];
     // /NON-NORMATIVE
 
     expect(renderComp(MyApp)).toEqual(`<div hostbindingdir="" id="some id"></div>`);
@@ -178,7 +180,8 @@ describe('components & directives', () => {
     }
 
     // NON-NORMATIVE (done by defineNgModule)
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs = [HostListenerDir.ngDirectiveDef];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+        [HostListenerDir.ngDirectiveDef];
     // /NON-NORMATIVE
 
     expect(renderComp(MyApp)).toEqual(`<button hostlistenerdir="">Click</button>`);
@@ -222,7 +225,8 @@ describe('components & directives', () => {
     }
 
     // NON-NORMATIVE (done by defineNgModule)
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs = [HostAttributeDir.ngDirectiveDef];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+        [HostAttributeDir.ngDirectiveDef];
     // /NON-NORMATIVE
 
     expect(renderComp(MyApp)).toEqual(`<div hostattributedir="" role="listbox"></div>`);
@@ -269,7 +273,8 @@ describe('components & directives', () => {
     }
 
     // NON-NORMATIVE (done by defineNgModule)
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs = [HostBindingDir.ngDirectiveDef];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+        [HostBindingDir.ngDirectiveDef];
     // /NON-NORMATIVE
 
     expect(renderComp(MyApp)).toEqual(`<div aria-label="some label" hostbindingdir=""></div>`);
@@ -331,8 +336,8 @@ describe('components & directives', () => {
     }
 
     // NON-NORMATIVE (done by defineNgModule)
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-        [(MyComp.ngComponentDef as ComponentDef<any>)];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+        [(MyComp.ngComponentDef as ComponentDefInternal<any>)];
     // /NON-NORMATIVE
 
     expect(renderComp(MyApp)).toEqual(`<my-comp>some name</my-comp>`);
@@ -461,8 +466,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(MyArrayComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(MyArrayComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp)).toEqual(`<my-array-comp>Nancy Bess</my-array-comp>`);
@@ -506,8 +511,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(MyArrayComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(MyArrayComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp)).toEqual(`<my-array-comp>NANCY Bess</my-array-comp>`);
@@ -571,8 +576,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(MyComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(MyComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp)).toEqual(`<my-comp>3</my-comp>`);
@@ -614,8 +619,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(MyArrayComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(MyArrayComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp)).toEqual(`<my-array-comp>Nancy Bess</my-array-comp>`);
@@ -727,8 +732,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(MyComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(MyComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp)).toEqual(`<my-comp>start-abcde-middle-fghi-end</my-comp>`);
@@ -802,8 +807,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(ObjectComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(ObjectComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp)).toEqual(`<object-comp><p>500</p><p>slide</p></object-comp>`);
@@ -890,8 +895,8 @@ describe('components & directives', () => {
       }
 
       // NON-NORMATIVE (done by defineNgModule)
-      (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
-          [(NestedComp.ngComponentDef as ComponentDef<any>)];
+      (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+          [(NestedComp.ngComponentDef as ComponentDefInternal<any>)];
       // /NON-NORMATIVE
 
       expect(renderComp(MyApp))
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index e82fbf5f04..536b2a92a7 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -11,7 +11,7 @@ import {browserDetection} from '@angular/platform-browser/testing/src/browser_ut
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
 import {AttributeMarker} from '../../../src/render3';
-import {ComponentDef} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
 import {ComponentFixture, renderComponent, toHtml} from '../render_util';
 
 
@@ -107,7 +107,8 @@ describe('elements', () => {
     }
 
     // NON-NORMATIVE
-    (LocalRefComp.ngComponentDef as ComponentDef<any>).directiveDefs = () => [Dir.ngDirectiveDef];
+    (LocalRefComp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+        () => [Dir.ngDirectiveDef];
     // /NON-NORMATIVE
 
     const fixture = new ComponentFixture(LocalRefComp);
diff --git a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
index 6577777e51..6738ee94e0 100644
--- a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
-import {ComponentDef} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
 import {renderComponent, toHtml} from '../render_util';
 
 
@@ -83,7 +83,8 @@ describe('lifecycle hooks', () => {
   }
 
   // NON-NORMATIVE
-  (SimpleLayout.ngComponentDef as ComponentDef<any>).directiveDefs = [LifecycleComp.ngComponentDef];
+  (SimpleLayout.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
+      [LifecycleComp.ngComponentDef];
   // /NON-NORMATIVE
 
   it('should gen hooks with a few simple components', () => {
diff --git a/packages/core/test/render3/compiler_canonical/pipes_spec.ts b/packages/core/test/render3/compiler_canonical/pipes_spec.ts
index ea6316fdac..90bf0ff7e0 100644
--- a/packages/core/test/render3/compiler_canonical/pipes_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/pipes_spec.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
-import {ComponentDef} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
 import {containerEl, renderComponent, toHtml} from '../render_util';
 
 
@@ -101,7 +101,7 @@ describe('pipes', () => {
     }
 
     // NON-NORMATIVE
-    (MyApp.ngComponentDef as ComponentDef<any>).pipeDefs =
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).pipeDefs =
         () => [MyPurePipe.ngPipeDef, MyPipe.ngPipeDef];
     // /NON-NORMATIVE
 
@@ -197,8 +197,8 @@ describe('pipes', () => {
     }
 
     // NON-NORMATIVE
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs = [OneTimeIf.ngDirectiveDef];
-    (MyApp.ngComponentDef as ComponentDef<any>).pipeDefs = [MyPurePipe.ngPipeDef];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs = [OneTimeIf.ngDirectiveDef];
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).pipeDefs = [MyPurePipe.ngPipeDef];
     // /NON-NORMATIVE
 
     let myApp: MyApp = renderComponent(MyApp);
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index 10f6f1221e..98c3a6151d 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
-import {ComponentDef} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
 import {renderComponent, toHtml} from '../render_util';
 
 
@@ -71,7 +71,7 @@ describe('queries', () => {
     }
 
     // NON-NORMATIVE
-    (ViewQueryComponent.ngComponentDef as ComponentDef<any>).directiveDefs =
+    (ViewQueryComponent.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
         [SomeDirective.ngDirectiveDef];
     // /NON-NORMATIVE
 
@@ -155,7 +155,7 @@ describe('queries', () => {
     }
 
     // NON-NORMATIVE
-    (MyApp.ngComponentDef as ComponentDef<any>).directiveDefs =
+    (MyApp.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
         [ContentQueryComponent.ngComponentDef, SomeDirective.ngDirectiveDef];
     // /NON-NORMATIVE
 
diff --git a/packages/core/test/render3/compiler_canonical/small_app_spec.ts b/packages/core/test/render3/compiler_canonical/small_app_spec.ts
index 93e795d829..afc631d7c9 100644
--- a/packages/core/test/render3/compiler_canonical/small_app_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/small_app_spec.ts
@@ -96,7 +96,7 @@ class ToDoAppComponent {
 }
 
 // NON-NORMATIVE
-(ToDoAppComponent.ngComponentDef as r3.ComponentDef<any>).directiveDefs = () =>
+(ToDoAppComponent.ngComponentDef as r3.ComponentDefInternal<any>).directiveDefs = () =>
     [ToDoItemComponent.ngComponentDef, (NgForOf as r3.DirectiveType<NgForOf<any>>).ngDirectiveDef];
 // /NON-NORMATIVE
 
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index 26c198b24c..8f57e5d805 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
-import {ComponentDef} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
 import {renderComponent, toHtml} from '../render_util';
 
 
@@ -125,7 +125,7 @@ describe('template variables', () => {
     }
 
     // NON-NORMATIVE
-    (MyComponent.ngComponentDef as ComponentDef<any>).directiveDefs =
+    (MyComponent.ngComponentDef as ComponentDefInternal<any>).directiveDefs =
         [ForOfDirective.ngDirectiveDef];
     // /NON-NORMATIVE
 
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index 148f447ded..c73fc4c0f6 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -11,7 +11,7 @@ import {DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInje
 import {getRenderedText} from '../../src/render3/component';
 import {ComponentFactory, LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding, tick} from '../../src/render3/instructions';
-import {ComponentDef, DirectiveDef, RenderFlags} from '../../src/render3/interfaces/definition';
+import {ComponentDefInternal, DirectiveDefInternal, RenderFlags} from '../../src/render3/interfaces/definition';
 import {createRendererType2} from '../../src/view/index';
 
 import {getRendererFactory2} from './imported_renderer2';
@@ -346,7 +346,7 @@ describe('recursive components', () => {
     });
   }
 
-  (TreeComponent.ngComponentDef as ComponentDef<TreeComponent>).directiveDefs =
+  (TreeComponent.ngComponentDef as ComponentDefInternal<TreeComponent>).directiveDefs =
       () => [TreeComponent.ngComponentDef];
 
   function _buildTree(currDepth: number): TreeNode {
diff --git a/packages/core/test/render3/define_spec.ts b/packages/core/test/render3/define_spec.ts
index 6c9f6565e7..165895866d 100644
--- a/packages/core/test/render3/define_spec.ts
+++ b/packages/core/test/render3/define_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {DoCheck, OnChanges, SimpleChange, SimpleChanges} from '../../src/core';
-import {DirectiveDef, NgOnChangesFeature, defineDirective} from '../../src/render3/index';
+import {DirectiveDefInternal, NgOnChangesFeature, defineDirective} from '../../src/render3/index';
 
 describe('define', () => {
   describe('component', () => {
@@ -36,15 +36,15 @@ describe('define', () => {
           });
         }
 
-        const myDir =
-            (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).factory() as MyDirective;
+        const myDir = (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>)
+                          .factory() as MyDirective;
         myDir.valA = 'first';
         expect(myDir.valA).toEqual('first');
         myDir.valB = 'second';
         expect(myDir.log).toEqual(['second']);
         expect(myDir.valB).toEqual('works');
         myDir.log.length = 0;
-        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
         const changeA = new SimpleChange(undefined, 'first', true);
         const changeB = new SimpleChange(undefined, 'second', true);
         expect(myDir.log).toEqual(['ngOnChanges', 'valA', changeA, 'valB', changeB, 'ngDoCheck']);
@@ -70,18 +70,18 @@ describe('define', () => {
           });
         }
 
-        const myDir =
-            (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).factory() as MyDirective;
+        const myDir = (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>)
+                          .factory() as MyDirective;
         myDir.valA = 'first';
         myDir.valB = 'second';
-        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
         const changeA1 = new SimpleChange(undefined, 'first', true);
         const changeB1 = new SimpleChange(undefined, 'second', true);
         expect(myDir.log).toEqual(['valA', changeA1, 'valB', changeB1]);
 
         myDir.log.length = 0;
         myDir.valA = 'third';
-        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
         const changeA2 = new SimpleChange('first', 'third', false);
         expect(myDir.log).toEqual(['valA', changeA2, 'valB', undefined]);
       });
@@ -106,11 +106,11 @@ describe('define', () => {
           });
         }
 
-        const myDir =
-            (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).factory() as MyDirective;
+        const myDir = (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>)
+                          .factory() as MyDirective;
         myDir.onlySetter = 'someValue';
         expect(myDir.onlySetter).toBeUndefined();
-        (MyDirective.ngDirectiveDef as DirectiveDef<MyDirective>).doCheck !.call(myDir);
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
         const changeSetter = new SimpleChange(undefined, 'someValue', true);
         expect(myDir.log).toEqual(['someValue', 'ngOnChanges', 'onlySetter', changeSetter]);
       });
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index 1a82a60372..6d31afb2bf 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -10,8 +10,8 @@ import {Injectable} from '@angular/core/src/di/injectable';
 import {inject, setCurrentInjector} from '@angular/core/src/di/injector';
 import {ivyEnabled} from '@angular/core/src/ivy_switch';
 import {Component, HostBinding, HostListener} from '@angular/core/src/metadata/directives';
-import {NgModule, NgModuleDef} from '@angular/core/src/metadata/ng_module';
-import {ComponentDef} from '@angular/core/src/render3/interfaces/definition';
+import {NgModule, NgModuleDefInternal} from '@angular/core/src/metadata/ng_module';
+import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 ivyEnabled && describe('render3 jit', () => {
   let injector: any;
@@ -134,7 +134,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Module {
     }
 
-    const moduleDef: NgModuleDef<Module> = (Module as any).ngModuleDef;
+    const moduleDef: NgModuleDefInternal<Module> = (Module as any).ngModuleDef;
     expect(moduleDef).toBeDefined();
     expect(moduleDef.declarations.length).toBe(1);
     expect(moduleDef.declarations[0]).toBe(Cmp);
@@ -147,7 +147,7 @@ ivyEnabled && describe('render3 jit', () => {
     })
     class Cmp {
     }
-    const cmpDef: ComponentDef<Cmp> = (Cmp as any).ngComponentDef;
+    const cmpDef: ComponentDefInternal<Cmp> = (Cmp as any).ngComponentDef;
 
     expect(cmpDef.directiveDefs).toBeNull();
 
@@ -157,7 +157,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Module {
     }
 
-    const moduleDef: NgModuleDef<Module> = (Module as any).ngModuleDef;
+    const moduleDef: NgModuleDefInternal<Module> = (Module as any).ngModuleDef;
     expect(cmpDef.directiveDefs instanceof Function).toBe(true);
     expect((cmpDef.directiveDefs as Function)()).toEqual([cmpDef]);
   });
@@ -179,7 +179,7 @@ ivyEnabled && describe('render3 jit', () => {
       onChange(event: any): void {}
     }
 
-    const cmpDef = (Cmp as any).ngComponentDef as ComponentDef<Cmp>;
+    const cmpDef = (Cmp as any).ngComponentDef as ComponentDefInternal<Cmp>;
 
     expect(cmpDef.hostBindings).toBeDefined();
     expect(cmpDef.hostBindings !.length).toBe(2);
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
index c451f856a0..b88abe1a84 100644
--- a/packages/core/test/render3/jit_environment_spec.ts
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -14,6 +14,7 @@ import {angularCoreEnv} from '../../src/render3/jit/environment';
 const INTERFACE_EXCEPTIONS = new Set<string>([
   'ComponentDef',
   'DirectiveDef',
+  'NgModuleDef',
 ]);
 
 describe('r3 jit environment', () => {
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 5d08734f11..666f8dba99 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -11,7 +11,7 @@ import {stringifyElement} from '@angular/platform-browser/testing/src/browser_ut
 import {Injector} from '../../src/di/injector';
 import {CreateComponentOptions} from '../../src/render3/component';
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
-import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, PublicFeature, RenderFlags, defineComponent, defineDirective, renderComponent as _renderComponent, tick} from '../../src/render3/index';
+import {ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefInternal, DirectiveType, PublicFeature, RenderFlags, defineComponent, defineDirective, renderComponent as _renderComponent, tick} from '../../src/render3/index';
 import {NG_HOST_SYMBOL, renderTemplate} from '../../src/render3/instructions';
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {LElementNode} from '../../src/render3/interfaces/node';
@@ -180,13 +180,13 @@ export function renderToHtml(
 
 function toDefs(
     types: DirectiveTypesOrFactory | undefined | null,
-    mapFn: (type: Type<any>) => DirectiveDef<any>): DirectiveDefList|null;
+    mapFn: (type: Type<any>) => DirectiveDefInternal<any>): DirectiveDefList|null;
 function toDefs(
     types: PipeTypesOrFactory | undefined | null,
     mapFn: (type: Type<any>) => PipeDef<any>): PipeDefList|null;
 function toDefs(
     types: PipeTypesOrFactory | DirectiveTypesOrFactory | undefined | null,
-    mapFn: (type: Type<any>) => PipeDef<any>| DirectiveDef<any>): any {
+    mapFn: (type: Type<any>) => PipeDef<any>| DirectiveDefInternal<any>): any {
   if (!types) return null;
   if (typeof types == 'function') {
     types = types();
diff --git a/packages/core/testing/src/test_bed.ts b/packages/core/testing/src/test_bed.ts
index 7f0176ab52..79a0a5e0dc 100644
--- a/packages/core/testing/src/test_bed.ts
+++ b/packages/core/testing/src/test_bed.ts
@@ -389,6 +389,7 @@ export class TestBed implements Injector {
         providers: [
           ...rootProviderOverrides,
         ],
+        jit: true,
       })
       class RootScopeModule {
       }
@@ -399,7 +400,7 @@ export class TestBed implements Injector {
     const imports = [rootScopeImports, this.ngModule, this._imports];
     const schemas = this._schemas;
 
-    @NgModule({providers, declarations, imports, schemas})
+    @NgModule({providers, declarations, imports, schemas, jit: true})
     class DynamicTestModule {
     }
 
@@ -540,7 +541,7 @@ export class TestBed implements Injector {
   overrideTemplateUsingTestingModule(component: Type<any>, template: string) {
     this._assertNotInstantiated('overrideTemplateUsingTestingModule', 'override template');
 
-    @Component({selector: 'empty', template})
+    @Component({selector: 'empty', template, jit: true})
     class OverrideComponent {
     }
 

From ccbda9de658cd685d947dfc2ac85664a09efb11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Thu, 14 Jun 2018 10:36:20 -0700
Subject: [PATCH 300/582] fix(core): Injector correctly honors the @Self flag
 (#24520)

Injector was incorrectly returning instance from parent injector even
when `@Self` was specified.

PR Close #24520
---
 packages/core/src/view/ng_module.ts       |  2 ++
 packages/core/test/view/ng_module_spec.ts | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts
index 9e6bd20305..15496ce80f 100644
--- a/packages/core/src/view/ng_module.ts
+++ b/packages/core/src/view/ng_module.ts
@@ -118,6 +118,8 @@ export function resolveNgModuleDep(
       return (
           data._providers[index] =
               _createProviderInstance(data, data._def.providersByKey[depDef.tokenKey]));
+    } else if (depDef.flags & DepFlags.Self) {
+      return notFoundValue;
     }
     return data._parent.get(depDef.token, notFoundValue);
   } finally {
diff --git a/packages/core/test/view/ng_module_spec.ts b/packages/core/test/view/ng_module_spec.ts
index 6e3c1fa9a1..3d569c844b 100644
--- a/packages/core/test/view/ng_module_spec.ts
+++ b/packages/core/test/view/ng_module_spec.ts
@@ -80,11 +80,14 @@ class FromChildWithOptionalDep {
 }
 
 class FromChildWithSkipSelfDep {
-  constructor(public depFromParent: ChildDep|null, public depFromChild: Bar|null) {}
+  constructor(
+      public skipSelfChildDep: ChildDep|null, public selfChildDep: ChildDep|null,
+      public optionalSelfBar: Bar|null) {}
   static ngInjectableDef: InjectableDef<FromChildWithSkipSelfDep> = defineInjectable({
     factory: () => new FromChildWithSkipSelfDep(
                  inject(ChildDep, InjectFlags.SkipSelf|InjectFlags.Optional),
-                 inject(Bar, InjectFlags.Self|InjectFlags.Optional)),
+                 inject(ChildDep, InjectFlags.Self),
+                 inject(Bar, InjectFlags.Self|InjectFlags.Optional), ),
     providedIn: MyChildModule,
   });
 }
@@ -162,8 +165,9 @@ describe('NgModuleRef_ injector', () => {
   it('injects skip-self and self deps across injectors properly', () => {
     const instance = childRef.injector.get(FromChildWithSkipSelfDep);
     expect(instance instanceof FromChildWithSkipSelfDep).toBeTruthy();
-    expect(instance.depFromParent).toBeNull();
-    expect(instance.depFromChild instanceof Bar).toBeTruthy();
+    expect(instance.skipSelfChildDep).toBeNull();
+    expect(instance.selfChildDep instanceof ChildDep).toBeTruthy();
+    expect(instance.optionalSelfBar).toBeNull();
   });
 
   it('does not inject something not scoped to the module',

From f3625e424bf5b07b3ba455366c7630ea680b43a3 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Wed, 13 Jun 2018 23:19:06 +0200
Subject: [PATCH 301/582] test(common): rename keyvalue e2e test (#24489)

PR Close #24489
---
 packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts b/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
index 818679e63e..f665c6f8b1 100644
--- a/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
+++ b/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
@@ -57,7 +57,8 @@ describe('pipe', () => {
       expect(element.all(by.css('titlecase-pipe p')).get(5).getText()).toEqual('Foo-vs-bar');
     });
   });
-  describe('titlecase', () => {
+
+  describe('keyvalue', () => {
     it('should work properly', () => {
       browser.get(URL);
       waitForElement('keyvalue-pipe');

From 45862d08128f5dca8df08f536cface8a83da3d57 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 14 Jun 2018 23:02:45 +0100
Subject: [PATCH 302/582] build(docs-infra): ensure all headings are sentence
 cased (#24527)

PR Close #24527
---
 aio/tools/transforms/templates/api/class.template.html        | 4 ++--
 aio/tools/transforms/templates/api/includes/deprecation.html  | 2 +-
 aio/tools/transforms/templates/api/includes/metadata.html     | 2 +-
 .../transforms/templates/api/includes/pipe-overview.html      | 2 +-
 .../transforms/templates/api/includes/security-notes.html     | 2 +-
 aio/tools/transforms/templates/api/includes/see-also.html     | 2 +-
 aio/tools/transforms/templates/api/includes/usageNotes.html   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aio/tools/transforms/templates/api/class.template.html b/aio/tools/transforms/templates/api/class.template.html
index d0af53a1a5..45cd8ad08d 100644
--- a/aio/tools/transforms/templates/api/class.template.html
+++ b/aio/tools/transforms/templates/api/class.template.html
@@ -9,8 +9,8 @@
 {% block details %}
   {% block additional %}{% endblock %}
   {% include "includes/description.html" %}
-  {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static Properties') $}
-  {$ memberHelpers.renderMethodDetails(versionInfo, doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $}
+  {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static properties') $}
+  {$ memberHelpers.renderMethodDetails(versionInfo, doc.staticMethods, 'static-methods', 'static-method', 'Static methods') $}
   {% if doc.constructorDoc %}
   <h2>Constructor</h2>
   {$ memberHelpers.renderMethodDetail(versionInfo, doc.constructorDoc, 'constructor') $}{% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/deprecation.html b/aio/tools/transforms/templates/api/includes/deprecation.html
index 7aa4f0db54..8286ab4148 100644
--- a/aio/tools/transforms/templates/api/includes/deprecation.html
+++ b/aio/tools/transforms/templates/api/includes/deprecation.html
@@ -1,6 +1,6 @@
 {% if doc.deprecated %}
 <section class="deprecated">
-  <h2>Deprecation Notes</h2>
+  <h2>Deprecation notes</h2>
   {$ doc.deprecated | marked $}
 </section>
 {% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/metadata.html b/aio/tools/transforms/templates/api/includes/metadata.html
index 8e1a0f953a..9aa301e44d 100644
--- a/aio/tools/transforms/templates/api/includes/metadata.html
+++ b/aio/tools/transforms/templates/api/includes/metadata.html
@@ -1,6 +1,6 @@
 {% if doc.members.length %}
 <section class="meta-data">
-  <h2>Metadata Properties</h2>
+  <h2>Metadata properties</h2>
     {% for metadata in doc.members %}{% if not metadata.internal %}
     <div class="metadata-member">
       <a name="{$ metadata.name $}" class="anchor-offset"></a>
diff --git a/aio/tools/transforms/templates/api/includes/pipe-overview.html b/aio/tools/transforms/templates/api/includes/pipe-overview.html
index f6bf09eb6a..ec822379dd 100644
--- a/aio/tools/transforms/templates/api/includes/pipe-overview.html
+++ b/aio/tools/transforms/templates/api/includes/pipe-overview.html
@@ -11,7 +11,7 @@
     {%- endfor %} }}</code-example>
 
   {% if doc.valueParam.type %}
-  <h2>Input Value</h2>
+  <h2>Input value</h2>
   {$ params.renderParameters([doc.valueParam], 'pipe-parameters', 'pipe-parameter', true) $}
   {% endif %}
   {% if doc.pipeParams.length %}
diff --git a/aio/tools/transforms/templates/api/includes/security-notes.html b/aio/tools/transforms/templates/api/includes/security-notes.html
index 4f0f815b30..ff13159b9d 100644
--- a/aio/tools/transforms/templates/api/includes/security-notes.html
+++ b/aio/tools/transforms/templates/api/includes/security-notes.html
@@ -1,6 +1,6 @@
 {% if doc.security %}
 <section "security">
-  <h2>Security Risk</h2>
+  <h2>Security risk</h2>
   {$ doc.security | marked $}
 </section>
 {% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/see-also.html b/aio/tools/transforms/templates/api/includes/see-also.html
index 0b97cc87e8..5d37c3340f 100644
--- a/aio/tools/transforms/templates/api/includes/see-also.html
+++ b/aio/tools/transforms/templates/api/includes/see-also.html
@@ -1,6 +1,6 @@
 {%- if doc.see.length %}
 <section class="see-also">
-  <h2>See Also</h2>
+  <h2>See also</h2>
   <ul>
   {% for see in doc.see %}
     <li>{$ see | marked $}</li>{% endfor %}
diff --git a/aio/tools/transforms/templates/api/includes/usageNotes.html b/aio/tools/transforms/templates/api/includes/usageNotes.html
index 88b2d89853..7b5b0b20ea 100644
--- a/aio/tools/transforms/templates/api/includes/usageNotes.html
+++ b/aio/tools/transforms/templates/api/includes/usageNotes.html
@@ -1,6 +1,6 @@
 {% if doc.usageNotes %}
 <section class="usage-notes">
-  <h2>Usage Notes</h2>
+  <h2>Usage notes</h2>
   {$ doc.usageNotes | marked $}
 </section>
 {% endif %}

From 794584e3531aa30dd65441956471687762e674cf Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 13 Jun 2018 10:05:24 -0500
Subject: [PATCH 303/582] docs: Remove outdated Webpack guide and example
 (#24478)

A supporting Webpack guide will be introduced as part of the guidance
for ejecting from the Angular CLI.

Closes #23937

PR Close #24478
---
 .../examples/webpack/config/helpers.js        |  12 -
 .../webpack/config/karma-test-shim.js         |  17 -
 .../examples/webpack/config/karma.conf.js     |  39 -
 .../examples/webpack/config/webpack.common.js |  81 --
 .../examples/webpack/config/webpack.dev.js    |  26 -
 .../examples/webpack/config/webpack.prod.js   |  41 -
 .../examples/webpack/config/webpack.test.js   |  55 --
 aio/content/examples/webpack/e2e-spec.ts      |  21 -
 .../examples/webpack/example-config.json      |   5 -
 .../examples/webpack/karma.webpack.conf.js    |   2 -
 .../examples/webpack/package.webpack.json     |  49 --
 .../webpack/src/app/app.component.css         |   9 -
 .../webpack/src/app/app.component.html        |   7 -
 .../webpack/src/app/app.component.spec.ts     |  16 -
 .../examples/webpack/src/app/app.component.ts |  16 -
 .../examples/webpack/src/app/app.module.ts    |  16 -
 .../webpack/src/assets/css/styles.css         |   6 -
 .../webpack/src/assets/images/angular.png     | Bin 2385 -> 0 bytes
 aio/content/examples/webpack/src/index.html   |  14 -
 aio/content/examples/webpack/src/main.ts      |  14 -
 aio/content/examples/webpack/src/polyfills.ts |  12 -
 .../examples/webpack/src/tsconfig.1.json      |  13 -
 aio/content/examples/webpack/src/vendor.ts    |  18 -
 .../examples/webpack/webpack.config.js        |   3 -
 aio/content/examples/webpack/zipper.json      |  12 -
 aio/content/guide/typescript-configuration.md |   2 +-
 aio/content/guide/webpack.md                  | 801 ------------------
 aio/content/navigation.json                   |   6 -
 aio/tools/example-zipper/README.md            |   7 +-
 .../customizer/package-json/webpack.json      |  26 -
 aio/tools/example-zipper/exampleZipper.js     |   1 -
 aio/tools/examples/run-example-e2e.js         |   1 -
 .../shared/boilerplate/systemjs/package.json  |   6 -
 aio/tools/examples/shared/package.json        |   8 -
 aio/tools/examples/shared/yarn.lock           | 694 +--------------
 35 files changed, 25 insertions(+), 2031 deletions(-)
 delete mode 100644 aio/content/examples/webpack/config/helpers.js
 delete mode 100644 aio/content/examples/webpack/config/karma-test-shim.js
 delete mode 100644 aio/content/examples/webpack/config/karma.conf.js
 delete mode 100644 aio/content/examples/webpack/config/webpack.common.js
 delete mode 100644 aio/content/examples/webpack/config/webpack.dev.js
 delete mode 100644 aio/content/examples/webpack/config/webpack.prod.js
 delete mode 100644 aio/content/examples/webpack/config/webpack.test.js
 delete mode 100644 aio/content/examples/webpack/e2e-spec.ts
 delete mode 100644 aio/content/examples/webpack/example-config.json
 delete mode 100644 aio/content/examples/webpack/karma.webpack.conf.js
 delete mode 100644 aio/content/examples/webpack/package.webpack.json
 delete mode 100644 aio/content/examples/webpack/src/app/app.component.css
 delete mode 100644 aio/content/examples/webpack/src/app/app.component.html
 delete mode 100644 aio/content/examples/webpack/src/app/app.component.spec.ts
 delete mode 100644 aio/content/examples/webpack/src/app/app.component.ts
 delete mode 100644 aio/content/examples/webpack/src/app/app.module.ts
 delete mode 100644 aio/content/examples/webpack/src/assets/css/styles.css
 delete mode 100644 aio/content/examples/webpack/src/assets/images/angular.png
 delete mode 100644 aio/content/examples/webpack/src/index.html
 delete mode 100644 aio/content/examples/webpack/src/main.ts
 delete mode 100644 aio/content/examples/webpack/src/polyfills.ts
 delete mode 100644 aio/content/examples/webpack/src/tsconfig.1.json
 delete mode 100644 aio/content/examples/webpack/src/vendor.ts
 delete mode 100644 aio/content/examples/webpack/webpack.config.js
 delete mode 100644 aio/content/examples/webpack/zipper.json
 delete mode 100644 aio/content/guide/webpack.md
 delete mode 100644 aio/tools/example-zipper/customizer/package-json/webpack.json

diff --git a/aio/content/examples/webpack/config/helpers.js b/aio/content/examples/webpack/config/helpers.js
deleted file mode 100644
index b760520f1c..0000000000
--- a/aio/content/examples/webpack/config/helpers.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// #docregion
-var path = require('path');
-
-var _root = path.resolve(__dirname, '..');
-
-function root(args) {
-  args = Array.prototype.slice.call(arguments, 0);
-  return path.join.apply(path, [_root].concat(args));
-}
-
-exports.root = root;
-// #enddocregion
\ No newline at end of file
diff --git a/aio/content/examples/webpack/config/karma-test-shim.js b/aio/content/examples/webpack/config/karma-test-shim.js
deleted file mode 100644
index 27bcd089fc..0000000000
--- a/aio/content/examples/webpack/config/karma-test-shim.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// #docregion
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es6');
-require('core-js/es7/reflect');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/zone-testing');
-
-var appContext = require.context('../src', true, /\.spec\.ts/);
-
-appContext.keys().forEach(appContext);
-
-var testing = require('@angular/core/testing');
-var browser = require('@angular/platform-browser-dynamic/testing');
-
-testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
diff --git a/aio/content/examples/webpack/config/karma.conf.js b/aio/content/examples/webpack/config/karma.conf.js
deleted file mode 100644
index 96387be7ff..0000000000
--- a/aio/content/examples/webpack/config/karma.conf.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// #docregion
-var webpackConfig = require('./webpack.test');
-
-module.exports = function (config) {
-  var _config = {
-    basePath: '',
-
-    frameworks: ['jasmine'],
-
-    files: [
-      {pattern: './config/karma-test-shim.js', watched: false}
-    ],
-
-    preprocessors: {
-      './config/karma-test-shim.js': ['webpack', 'sourcemap']
-    },
-
-    webpack: webpackConfig,
-
-    webpackMiddleware: {
-      stats: 'errors-only'
-    },
-
-    webpackServer: {
-      noInfo: true
-    },
-
-    reporters: ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: false,
-    browsers: ['Chrome'],
-    singleRun: true
-  };
-
-  config.set(_config);
-};
-// #enddocregion
diff --git a/aio/content/examples/webpack/config/webpack.common.js b/aio/content/examples/webpack/config/webpack.common.js
deleted file mode 100644
index 28be240e04..0000000000
--- a/aio/content/examples/webpack/config/webpack.common.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// #docplaster
-// #docregion
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var helpers = require('./helpers');
-
-module.exports = {
-  // #docregion entries, one-entry, two-entries
-  entry: {
-    // #enddocregion one-entry, two-entries
-    'polyfills': './src/polyfills.ts',
-    // #docregion two-entries
-    'vendor': './src/vendor.ts',
-    // #docregion one-entry
-    'app': './src/main.ts'
-  },
-  // #enddocregion entries, one-entry, two-entries
-
-  // #docregion resolve
-  resolve: {
-    extensions: ['.ts', '.js']
-  },
-  // #enddocregion resolve
-
-  // #docregion loaders
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        loaders: [
-          {
-            loader: 'awesome-typescript-loader',
-            options: { configFileName: helpers.root('src', 'tsconfig.json') }
-          } , 'angular2-template-loader'
-        ]
-      },
-      {
-        test: /\.html$/,
-        loader: 'html-loader'
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-        loader: 'file-loader?name=assets/[name].[hash].[ext]'
-      },
-      {
-        test: /\.css$/,
-        exclude: helpers.root('src', 'app'),
-        loader: ExtractTextPlugin.extract({ fallbackLoader: 'style-loader', loader: 'css-loader?sourceMap' })
-      },
-      {
-        test: /\.css$/,
-        include: helpers.root('src', 'app'),
-        loader: 'raw-loader'
-      }
-    ]
-  },
-  // #enddocregion loaders
-
-  // #docregion plugins
-  plugins: [
-    // Workaround for angular/angular#11580
-    new webpack.ContextReplacementPlugin(
-      // The (\\|\/) piece accounts for path separators in *nix and Windows
-      /angular(\\|\/)core(\\|\/)@angular/,
-      helpers.root('./src'), // location of your src
-      {} // a map of your routes
-    ),
-
-    new webpack.optimize.CommonsChunkPlugin({
-      name: ['app', 'vendor', 'polyfills']
-    }),
-
-    new HtmlWebpackPlugin({
-      template: 'src/index.html'
-    })
-  ]
-  // #enddocregion plugins
-};
-// #enddocregion
-
diff --git a/aio/content/examples/webpack/config/webpack.dev.js b/aio/content/examples/webpack/config/webpack.dev.js
deleted file mode 100644
index 57d29560a0..0000000000
--- a/aio/content/examples/webpack/config/webpack.dev.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// #docregion
-var webpackMerge = require('webpack-merge');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var commonConfig = require('./webpack.common.js');
-var helpers = require('./helpers');
-
-module.exports = webpackMerge(commonConfig, {
-  devtool: 'cheap-module-eval-source-map',
-
-  output: {
-    path: helpers.root('dist'),
-    publicPath: '/',
-    filename: '[name].js',
-    chunkFilename: '[id].chunk.js'
-  },
-
-  plugins: [
-    new ExtractTextPlugin('[name].css')
-  ],
-
-  devServer: {
-    historyApiFallback: true,
-    stats: 'minimal'
-  }
-});
-// #enddocregion
diff --git a/aio/content/examples/webpack/config/webpack.prod.js b/aio/content/examples/webpack/config/webpack.prod.js
deleted file mode 100644
index d6c70119bc..0000000000
--- a/aio/content/examples/webpack/config/webpack.prod.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// #docregion
-var webpack = require('webpack');
-var webpackMerge = require('webpack-merge');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var commonConfig = require('./webpack.common.js');
-var helpers = require('./helpers');
-
-const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
-
-module.exports = webpackMerge(commonConfig, {
-  devtool: 'source-map',
-
-  output: {
-    path: helpers.root('dist'),
-    publicPath: '/',
-    filename: '[name].[hash].js',
-    chunkFilename: '[id].[hash].chunk.js'
-  },
-
-  plugins: [
-    new webpack.NoEmitOnErrorsPlugin(),
-    new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
-      mangle: {
-        keep_fnames: true
-      }
-    }),
-    new ExtractTextPlugin('[name].[hash].css'),
-    new webpack.DefinePlugin({
-      'process.env': {
-        'ENV': JSON.stringify(ENV)
-      }
-    }),
-    new webpack.LoaderOptionsPlugin({
-      htmlLoader: {
-        minimize: false // workaround for ng2
-      }
-    })
-  ]
-});
-
-// #enddocregion
diff --git a/aio/content/examples/webpack/config/webpack.test.js b/aio/content/examples/webpack/config/webpack.test.js
deleted file mode 100644
index 2c6a59c90f..0000000000
--- a/aio/content/examples/webpack/config/webpack.test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// #docregion
-var webpack = require('webpack');
-var helpers = require('./helpers');
-
-module.exports = {
-  devtool: 'inline-source-map',
-
-  resolve: {
-    extensions: ['.ts', '.js']
-  },
-
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        loaders: [
-          {
-            loader: 'awesome-typescript-loader',
-            options: { configFileName: helpers.root('src', 'tsconfig.json') }
-          } , 'angular2-template-loader'
-        ]
-      },
-      {
-        test: /\.html$/,
-        loader: 'html-loader'
-
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-        loader: 'null-loader'
-      },
-      {
-        test: /\.css$/,
-        exclude: helpers.root('src', 'app'),
-        loader: 'null-loader'
-      },
-      {
-        test: /\.css$/,
-        include: helpers.root('src', 'app'),
-        loader: 'raw-loader'
-      }
-    ]
-  },
-
-  plugins: [
-    new webpack.ContextReplacementPlugin(
-      // The (\\|\/) piece accounts for path separators in *nix and Windows
-      /angular(\\|\/)core(\\|\/)@angular/,
-      helpers.root('./src'), // location of your src
-      {} // a map of your routes
-    )
-  ]
-}
-
-// #enddocregion
diff --git a/aio/content/examples/webpack/e2e-spec.ts b/aio/content/examples/webpack/e2e-spec.ts
deleted file mode 100644
index b13f93552e..0000000000
--- a/aio/content/examples/webpack/e2e-spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict'; // necessary for es6 output in node
-
-import { browser, element, by } from 'protractor';
-
-describe('QuickStart E2E Tests', function () {
-
-  let expectedMsg = 'Hello from Angular App with Webpack';
-
-  beforeEach(function () {
-    browser.get('');
-  });
-
-  it(`should display: ${expectedMsg}`, function () {
-    expect(element(by.css('h1')).getText()).toEqual(expectedMsg);
-  });
-
-  it('should display an image', function () {
-    expect(element(by.css('img')).isPresent()).toBe(true);
-  });
-
-});
diff --git a/aio/content/examples/webpack/example-config.json b/aio/content/examples/webpack/example-config.json
deleted file mode 100644
index 96e6897378..0000000000
--- a/aio/content/examples/webpack/example-config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "build": "build:webpack",
-  "run": "serve:cli",
-  "projectType": "systemjs"
-}
diff --git a/aio/content/examples/webpack/karma.webpack.conf.js b/aio/content/examples/webpack/karma.webpack.conf.js
deleted file mode 100644
index e2a663e8de..0000000000
--- a/aio/content/examples/webpack/karma.webpack.conf.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// #docregion
-module.exports = require('./config/karma.conf.js');
diff --git a/aio/content/examples/webpack/package.webpack.json b/aio/content/examples/webpack/package.webpack.json
deleted file mode 100644
index 5aeb5ebf56..0000000000
--- a/aio/content/examples/webpack/package.webpack.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "name": "angular2-webpack",
-  "version": "1.0.0",
-  "description": "A webpack starter for Angular",
-  "scripts": {
-    "start": "webpack-dev-server --inline --progress --port 8080",
-    "test": "karma start",
-    "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@angular/common": "~4.2.0",
-    "@angular/compiler": "~4.2.0",
-    "@angular/core": "~4.2.0",
-    "@angular/forms": "~4.2.0",
-    "@angular/http": "~4.2.0",
-    "@angular/platform-browser": "~4.2.0",
-    "@angular/platform-browser-dynamic": "~4.2.0",
-    "@angular/router": "~4.2.0",
-    "core-js": "^2.4.1",
-    "rxjs": "5.0.1",
-    "zone.js": "^0.8.4"
-  },
-  "devDependencies": {
-    "@types/node": "^6.0.45",
-    "@types/jasmine": "2.5.36",
-    "angular2-template-loader": "^0.6.0",
-    "awesome-typescript-loader": "^3.0.4",
-    "css-loader": "^0.26.1",
-    "extract-text-webpack-plugin": "2.0.0-beta.5",
-    "file-loader": "^0.9.0",
-    "html-loader": "^0.4.3",
-    "html-webpack-plugin": "^2.16.1",
-    "jasmine-core": "^2.4.1",
-    "karma": "^1.2.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-jasmine": "^1.0.2",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^2.0.1",
-    "null-loader": "^0.1.1",
-    "raw-loader": "^0.5.1",
-    "rimraf": "^2.5.2",
-    "style-loader": "^0.13.1",
-    "typescript": "~2.3.1",
-    "webpack": "2.2.1",
-    "webpack-dev-server": "2.4.1",
-    "webpack-merge": "^3.0.0"
-  }
-}
diff --git a/aio/content/examples/webpack/src/app/app.component.css b/aio/content/examples/webpack/src/app/app.component.css
deleted file mode 100644
index bb624c5aae..0000000000
--- a/aio/content/examples/webpack/src/app/app.component.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/* #docregion */
-main {
-  padding: 1em;
-  font-family: Arial, Helvetica, sans-serif;
-  text-align: center;
-  margin-top: 50px;
-  display: block;
-}
-/* #enddocregion */
diff --git a/aio/content/examples/webpack/src/app/app.component.html b/aio/content/examples/webpack/src/app/app.component.html
deleted file mode 100644
index 9e60cd2ad5..0000000000
--- a/aio/content/examples/webpack/src/app/app.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- #docregion -->
-<main>
-  <h1>Hello from Angular App with Webpack</h1>
-
-  <img src="../assets/images/angular.png">
-</main>
-<!-- #enddocregion -->
diff --git a/aio/content/examples/webpack/src/app/app.component.spec.ts b/aio/content/examples/webpack/src/app/app.component.spec.ts
deleted file mode 100644
index a6512a11e7..0000000000
--- a/aio/content/examples/webpack/src/app/app.component.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// #docregion
-import { TestBed } from '@angular/core/testing';
-
-import { AppComponent } from './app.component';
-
-describe('App', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({ declarations: [AppComponent]});
-  });
-
-  it ('should work', () => {
-    let fixture = TestBed.createComponent(AppComponent);
-    expect(fixture.componentInstance instanceof AppComponent).toBe(true, 'should create AppComponent');
-  });
-});
-// #enddocregion
diff --git a/aio/content/examples/webpack/src/app/app.component.ts b/aio/content/examples/webpack/src/app/app.component.ts
deleted file mode 100644
index 2c5eac0147..0000000000
--- a/aio/content/examples/webpack/src/app/app.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// #docplaster
-// #docregion
-// #docregion component
-import { Component } from '@angular/core';
-
-// #enddocregion component
-import '../assets/css/styles.css';
-
-// #docregion component
-@Component({
-  selector: 'my-app',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-export class AppComponent { }
-// #enddocregion
diff --git a/aio/content/examples/webpack/src/app/app.module.ts b/aio/content/examples/webpack/src/app/app.module.ts
deleted file mode 100644
index 362f3401fa..0000000000
--- a/aio/content/examples/webpack/src/app/app.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// #docregion
-import { NgModule } from '@angular/core';
-import { BrowserModule }  from '@angular/platform-browser';
-
-import { AppComponent } from './app.component';
-
-@NgModule({
-  imports: [
-    BrowserModule
-  ],
-  declarations: [
-    AppComponent
-  ],
-  bootstrap: [ AppComponent ]
-})
-export class AppModule { }
diff --git a/aio/content/examples/webpack/src/assets/css/styles.css b/aio/content/examples/webpack/src/assets/css/styles.css
deleted file mode 100644
index 2d404ff5b9..0000000000
--- a/aio/content/examples/webpack/src/assets/css/styles.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* #docregion */
-body {
-    background: #0147A7;
-    color: #fff;
-}
-/* #enddocregion */
diff --git a/aio/content/examples/webpack/src/assets/images/angular.png b/aio/content/examples/webpack/src/assets/images/angular.png
deleted file mode 100644
index c5102939182281314e8f79f1d7f7cd2145cd81f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2385
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

diff --git a/aio/content/examples/webpack/src/index.html b/aio/content/examples/webpack/src/index.html
deleted file mode 100644
index 503ea4a950..0000000000
--- a/aio/content/examples/webpack/src/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- #docregion -->
-<!DOCTYPE html>
-<html>
-  <head>
-    <base href="/">
-    <title>Angular With Webpack</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-  </head>
-  <body>
-    <my-app>Loading...</my-app>
-  </body>
-</html>
-<!-- #enddocregion -->
diff --git a/aio/content/examples/webpack/src/main.ts b/aio/content/examples/webpack/src/main.ts
deleted file mode 100644
index e1d8cbc0fe..0000000000
--- a/aio/content/examples/webpack/src/main.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// #docregion
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { enableProdMode } from '@angular/core';
-
-import { AppModule } from './app/app.module';
-
-// #docregion enable-prod
-if (process.env.ENV === 'production') {
-  enableProdMode();
-}
-// #enddocregion enable-prod
-
-platformBrowserDynamic().bootstrapModule(AppModule);
-// #enddocregion
diff --git a/aio/content/examples/webpack/src/polyfills.ts b/aio/content/examples/webpack/src/polyfills.ts
deleted file mode 100644
index 118acd2b0c..0000000000
--- a/aio/content/examples/webpack/src/polyfills.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// #docregion
-import 'core-js/es6';
-import 'core-js/es7/reflect';
-require('zone.js/dist/zone');
-
-if (process.env.ENV === 'production') {
-  // Production
-} else {
-  // Development and test
-  Error['stackTraceLimit'] = Infinity;
-  require('zone.js/dist/long-stack-trace-zone');
-}
diff --git a/aio/content/examples/webpack/src/tsconfig.1.json b/aio/content/examples/webpack/src/tsconfig.1.json
deleted file mode 100644
index 544e895bce..0000000000
--- a/aio/content/examples/webpack/src/tsconfig.1.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": ["es2015", "dom"],
-    "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true
-  }
-}
\ No newline at end of file
diff --git a/aio/content/examples/webpack/src/vendor.ts b/aio/content/examples/webpack/src/vendor.ts
deleted file mode 100644
index 8193b33e4f..0000000000
--- a/aio/content/examples/webpack/src/vendor.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(i): this no longer works. we need to review this example and if absolutely necessary rewrite it to use the
-// rxjs-compat package
-
-// #docregion
-// Angular
-import '@angular/platform-browser';
-import '@angular/platform-browser-dynamic';
-import '@angular/core';
-import '@angular/common';
-import '@angular/http';
-import '@angular/router';
-
-// RxJS
-import 'rxjs';
-
-// Other vendors for example jQuery, Lodash or Bootstrap
-// You can import js, ts, css, sass, ...
-// #enddocregion
diff --git a/aio/content/examples/webpack/webpack.config.js b/aio/content/examples/webpack/webpack.config.js
deleted file mode 100644
index 66141706fe..0000000000
--- a/aio/content/examples/webpack/webpack.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// #docregion
-module.exports = require('./config/webpack.dev.js');
-// #enddocregion
\ No newline at end of file
diff --git a/aio/content/examples/webpack/zipper.json b/aio/content/examples/webpack/zipper.json
deleted file mode 100644
index 73ea46a406..0000000000
--- a/aio/content/examples/webpack/zipper.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "files":[
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[0-9].*",
-    "config/**/*",
-    "webpack.config.js",
-    "karma.webpack.conf.js"
-  ],
-  "removeSystemJsConfig": true,
-  "type": "webpack"
-}
diff --git a/aio/content/guide/typescript-configuration.md b/aio/content/guide/typescript-configuration.md
index 32a0d87449..b7cb188b47 100644
--- a/aio/content/guide/typescript-configuration.md
+++ b/aio/content/guide/typescript-configuration.md
@@ -132,7 +132,7 @@ QuickStart identifies two *typings*, or `d.ts`, files:
 * [jasmine](http://jasmine.github.io/) typings for the Jasmine test framework.
 
 * [node](https://www.npmjs.com/package/@types/node) for code that references objects in the *Node.js®* environment;
-you can view an example in the [webpack](guide/webpack) page.
+
 
 QuickStart doesn't require these typings but many of the samples do.
 
diff --git a/aio/content/guide/webpack.md b/aio/content/guide/webpack.md
deleted file mode 100644
index 7ce5437176..0000000000
--- a/aio/content/guide/webpack.md
+++ /dev/null
@@ -1,801 +0,0 @@
-# Webpack: An Introduction
-
-<style>
-  h4 {font-size: 17px !important; text-transform: none !important;}
-  .syntax { font-family: Consolas, 'Lucida Sans', Courier, sans-serif; color: black; font-size: 85%; }
-
-</style>
-
-
-
-[**Webpack**](https://webpack.github.io/) is a popular module bundler,
-a tool for bundling application source code in convenient _chunks_
-and for loading that code from a server into a browser.
-
-It's an excellent alternative to the *SystemJS* approach used elsewhere in the documentation.
-This guide offers a taste of Webpack and explains how to use it with Angular applications.
-
-
-{@a top}
-
-<!--
-
-
-# Contents
-
-* [What is Webpack?](guide/webpack#what-is-webpack)
-
-  * [Entries and outputs](guide/webpack#entries-outputs)
-  * [Multiple bundles](guide/webpack#multiple-bundles)
-  * [Loaders](guide/webpack#loaders)
-  * [Plugins](guide/webpack#plugins)
-
-* [Configuring Webpack](guide/webpack#configure-webpack)
-
-  * [Polyfills](guide/webpack#polyfills)
-  * [Common configuration](guide/webpack#common-configuration)
-  * [Inside `webpack.common.js`](guide/webpack#inside-webpack-commonjs)
-
-    * [entry](guide/webpack#common-entries)
-    * [resolve extension-less imports](guide/webpack#common-resolves)
-    * [`module.rules`](guide/webpack#common-rules)
-    * [Plugins](guide/webpack#plugins)
-    * [`CommonsChunkPlugin`](guide/webpack#commons-chunk-plugin)
-    * [`HtmlWebpackPlugin`](guide/webpack#html-webpack-plugin)
-
-  * [Environment specific configuration](guide/webpack#environment-configuration)
-  * [Development configuration](guide/webpack#development-configuration)
-  * [Production configuration](guide/webpack#production-configuration)
-  * [Test configuration](guide/webpack#test-configuration)
-
-* [Trying it out](guide/webpack#try)
-* [Highlights](guide/webpack#highlights)
-* [Conclusion](guide/webpack#conclusion)
-
--->
-
-You can also <a href="generated/zips/webpack/webpack.zip" target="_blank">download the final result.</a>
-
-{@a what-is-webpack}
-
-## What is Webpack?
-
-Webpack is a powerful module bundler.
-A _bundle_ is a JavaScript file that incorporates _assets_ that *belong* together and
-should be served to the client in a response to a single file request.
-A bundle can include JavaScript, CSS styles, HTML, and almost any other kind of file.
-
-Webpack roams over your application source code,
-looking for `import` statements, building a dependency graph, and emitting one or more _bundles_.
-With plugins and rules, Webpack can preprocess and minify different non-JavaScript files such as TypeScript, SASS, and LESS files.
-
-You determine what Webpack does and how it does it with a JavaScript configuration file, `webpack.config.js`.
-
-
-{@a entries-outputs}
-
-
-
-### Entries and outputs
-
-You supply Webpack with one or more *entry* files and let it find and incorporate the dependencies that radiate from those entries.
-The one entry point file in this example is the application's root file, `src/main.ts`:
-
-
-<code-example path="webpack/config/webpack.common.js" region="one-entry" title="webpack.config.js (single entry)" linenums="false">
-
-</code-example>
-
-
-
-Webpack inspects that file and traverses its `import` dependencies recursively.
-
-
-<code-example path="webpack/src/app/app.component.ts" region="component" title="src/main.ts" linenums="false">
-
-</code-example>
-
-
-
-It sees that you're importing `@angular/core` so it adds that to its dependency list for potential inclusion in the bundle.
-It opens the `@angular/core` file and follows _its_ network of `import` statements until it has built the complete dependency graph from `main.ts` down.
-
-Then it **outputs** these files to the `app.js` _bundle file_ designated in configuration:
-
-<code-example name="webpack.config.js (single output)" language="javascript">
-  output: {
-    filename: 'app.js'
-  }
-
-</code-example>
-
-This `app.js` output bundle is a single JavaScript file that contains the application source and its dependencies.
-You'll load it later with a `<script>` tag in the `index.html`.
-
-
-{@a multiple-bundles}
-
-
-#### Multiple bundles
-You probably don't want one giant bundle of everything.
-It's preferable to separate the volatile application app code from comparatively stable vendor code modules.
-
-Change the configuration so that it has two entry points, `main.ts` and `vendor.ts`:
-
-
-<code-example language="javascript">
-  entry: {
-    app: 'src/app.ts',
-    vendor: 'src/vendor.ts'
-  },
-
-  output: {
-    filename: '[name].js'
-  }
-
-</code-example>
-
-
-Webpack constructs two separate dependency graphs
-and emits *two* bundle files, one called `app.js` containing only the application code and
-another called `vendor.js` with all the vendor dependencies.
-
-
-<div class="l-sub-section">
-
-
-
-The `[name]` in the output name is a *placeholder* that a Webpack plugin replaces with the entry names,
-`app` and `vendor`. Plugins are [covered later](guide/webpack#commons-chunk-plugin) in the guide.
-
-
-</div>
-
-
-
-To tell Webpack what belongs in the vendor bundle,
-add a `vendor.ts` file that only imports the application's third-party modules:
-
-<code-example path="webpack/src/vendor.ts" title="src/vendor.ts" linenums="false">
-
-</code-example>
-
-
-
-{@a loaders}
-
-
-
-### Loaders
-
-Webpack can bundle any kind of file: JavaScript, TypeScript, CSS, SASS, LESS, images, HTML, fonts, whatever.
-Webpack _itself_ only understands JavaScript files.
-Teach it to transform non-JavaScript file into their JavaScript equivalents with *loaders*.
-Configure loaders for TypeScript and CSS as follows.
-
-
-<code-example language="javascript">
-  rules: [
-    {
-      test: /\.ts$/,
-      loader: 'awesome-typescript-loader'
-    },
-    {
-      test: /\.css$/,
-      loaders: 'style-loader!css-loader'
-    }
-  ]
-
-</code-example>
-
-
-
-When Webpack encounters `import` statements like the following,
-it applies the `test` RegEx patterns.
-
-
-<code-example language="typescript">
-  import { AppComponent } from './app.component.ts';
-
-  import 'uiframework/dist/uiframework.css';
-
-</code-example>
-
-
-
-When a pattern matches the filename, Webpack processes the file with the associated loader.
-
-The first `import` file matches the `.ts` pattern so Webpack processes it with the `awesome-typescript-loader`.
-The imported file doesn't match the second pattern so its loader is ignored.
-
-The second `import` matches the second `.css` pattern for which you have *two* loaders chained by the (!) character.
-Webpack applies chained loaders *right to left*. So it applies
-the `css` loader first to flatten CSS `@import` and `url(...)` statements.
-Then it applies the `style` loader to append the css inside `<style>` elements on the page.
-
-
-{@a plugins}
-
-
-
-### Plugins
-
-Webpack has a build pipeline with well-defined phases.
-Tap into that pipeline with plugins such as the `uglify` minification plugin:
-
-<code-example language="javascript">
-  plugins: [
-    new webpack.optimize.UglifyJsPlugin()
-  ]
-
-</code-example>
-
-
-
-{@a configure-webpack}
-
-
-
-## Configuring Webpack
-
-After that brief orientation, you are ready to build your own Webpack configuration for Angular apps.
-
-Begin by setting up the development environment.
-
-Create a new project folder.
-
-<code-example language="sh" class="code-shell">
-  mkdir angular-webpack
-  cd    angular-webpack
-
-</code-example>
-
-
-
-Add these files:
-
-
-<code-tabs>
-
-  <code-pane title="package.json" path="webpack/package.webpack.json">
-
-  </code-pane>
-
-  <code-pane title="src/tsconfig.json" path="webpack/src/tsconfig.1.json">
-
-  </code-pane>
-
-  <code-pane title="webpack.config.js" path="webpack/webpack.config.js">
-
-  </code-pane>
-
-  <code-pane title="karma.conf.js" path="webpack/karma.webpack.conf.js">
-
-  </code-pane>
-
-  <code-pane title="config/helpers.js" path="webpack/config/helpers.js">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
-<div class="l-sub-section">
-
-
-
-Many of these files should be familiar from other Angular documentation guides,
-especially the [Typescript configuration](guide/typescript-configuration) and
-[npm packages](guide/npm-packages) guides.
-
-Webpack, the plugins, and the loaders are also installed as packages.
-They are listed in the updated `packages.json`.
-
-
-</div>
-
-
-
-Open a terminal window and install the npm packages.
-
-<code-example language="sh" class="code-shell">
-  npm install
-
-</code-example>
-
-
-
-{@a polyfills}
-
-
-
-### Polyfills
-
-You'll need polyfills to run an Angular application in most browsers as explained
-in the [Browser Support](guide/browser-support) guide.
-
-Polyfills should be bundled separately from the application and vendor bundles.
-Add a `polyfills.ts` like this one to the `src/` folder.
-
-
-<code-example path="webpack/src/polyfills.ts" title="src/polyfills.ts" linenums="false">
-
-</code-example>
-
-
-
-<div class="callout is-critical">
-
-
-
-<header>
-  Loading polyfills
-</header>
-
-
-
-Load `zone.js` early within `polyfills.ts`, immediately after the other ES6 and metadata shims.
-
-
-</div>
-
-
-
-Because this bundle file will load first, `polyfills.ts` is also a good place to configure the browser environment
-for production or development.
-
-
-{@a common-configuration}
-
-
-
-### Common configuration
-
-Developers typically have separate configurations for development, production, and test environments.
-All three have a lot of configuration in common.
-
-Gather the common configuration in a file called `webpack.common.js`.
-
-
-<code-example path="webpack/config/webpack.common.js" title="config/webpack.common.js" linenums="false">
-
-</code-example>
-
-
-
-{@a inside-webpack-commonjs}
-
-
-### Inside _webpack.common.js_
-Webpack is a NodeJS-based tool that reads configuration from a JavaScript commonjs module file.
-
-The configuration imports dependencies with `require` statements
-and exports several objects as properties of a `module.exports` object.
-
-* [`entry`](guide/webpack#common-entries)&mdash;the entry-point files that define the bundles.
-* [`resolve`](guide/webpack#common-resolves)&mdash;how to resolve file names when they lack extensions.
-* [`module.rules`](guide/webpack#common-rules)&mdash; `module` is an object with `rules` for deciding how files are loaded.
-* [`plugins`](guide/webpack#common-plugins)&mdash;creates instances of the plugins.
-
-
-{@a common-entries}
-
-
-#### _entry_
-
-The first export is the `entry` object:
-
-
-<code-example path="webpack/config/webpack.common.js" region="entries" title="config/webpack.common.js" linenums="false">
-
-</code-example>
-
-
-
-This `entry` object defines the three bundles:
-
-* `polyfills`&mdash;the polyfills needed to run Angular applications in most modern browsers.
-* `vendor`&mdash;the third-party dependencies such as Angular, lodash, and bootstrap.css.
-* `app`&mdash;the application code.
-
-
-{@a common-resolves}
-
-
-#### _resolve_ extension-less imports
-
-The app will `import` dozens if not hundreds of JavaScript and TypeScript files.
-You could write `import` statements with explicit extensions like this example:
-
-<code-example language="typescript">
-  import { AppComponent } from './app.component.ts';
-
-</code-example>
-
-
-But most `import` statements don't mention the extension at all.
-Tell Webpack to resolve extension-less file requests by looking for matching files with
-`.ts` extension or `.js` extension (for regular JavaScript files and pre-compiled TypeScript files).
-
-
-<code-example path="webpack/config/webpack.common.js" region="resolve" title="config/webpack.common.js" linenums="false">
-
-</code-example>
-
-
-
-<div class="l-sub-section">
-
-
-
-If Webpack should resolve extension-less files for styles and HTML,
-add `.css` and `.html` to the list.
-
-
-</div>
-
-
-
-{@a common-rules}
-
-
-
-
-#### _module.rules_
-Rules tell Webpack which loaders to use for each file, or module:
-
-
-<code-example path="webpack/config/webpack.common.js" region="loaders" title="config/webpack.common.js" linenums="false">
-
-</code-example>
-
-
-
-* `awesome-typescript-loader`&mdash;a loader to transpile the Typescript code to ES5, guided by the `tsconfig.json` file.
-* `angular2-template-loader`&mdash;loads angular components' template and styles.
-* `html-loader`&mdash;for component templates.
-* images/fonts&mdash;Images and fonts are bundled as well.
-* CSS&mdash;the first pattern matches application-wide styles; the second handles
-component-scoped styles (the ones specified in a component's `styleUrls` metadata property).
-
-<div class="l-sub-section">
-
-
-
-The first pattern is for the application-wide styles. It excludes `.css` files within the `src/app` directory
-where the component-scoped styles sit. The `ExtractTextPlugin` (described below) applies the `style` and `css`
-loaders to these files.
-
-The second pattern filters for component-scoped styles and loads them as strings via the `raw-loader`,
-which is what Angular expects to do with styles specified in a `styleUrls` metadata property.
-
-
-</div>
-
-
-
-<div class="l-sub-section">
-
-
-
-Multiple loaders can be chained using the array notation.
-
-
-</div>
-
-
-
-{@a common-plugins}
-
-
-
-
-#### _plugins_
-Finally, create instances of three plugins:
-
-
-<code-example path="webpack/config/webpack.common.js" region="plugins" title="config/webpack.common.js" linenums="false">
-
-</code-example>
-
-
-
-{@a commons-chunk-plugin}
-
-
-#### *CommonsChunkPlugin*
-
-The `app.js` bundle should contain only application code. All vendor code belongs in the `vendor.js` bundle.
-
-Of course the application code imports vendor code.
-On its own, Webpack is not smart enough to keep the vendor code out of the `app.js` bundle.
-The `CommonsChunkPlugin` does that job.
-
-<div class="l-sub-section">
-
-
-
-The `CommonsChunkPlugin` identifies the hierarchy among three _chunks_: `app` -> `vendor` -> `polyfills`.
-Where Webpack finds that `app` has shared dependencies with `vendor`, it removes them from `app`.
-It would remove `polyfills` from `vendor` if they shared dependencies, which they don't.
-
-
-</div>
-
-
-
-{@a html-webpack-plugin}
-
-
-#### _HtmlWebpackPlugin_
-
-Webpack generates a number of js and CSS files.
-You _could_ insert them into the `index.html` _manually_. That would be tedious and error-prone.
-Webpack can inject those scripts and links for you with the `HtmlWebpackPlugin`.
-
-
-{@a environment-configuration}
-
-
-
-### Environment-specific configuration
-
-The `webpack.common.js` configuration file does most of the heavy lifting.
-Create separate, environment-specific configuration files that build on `webpack.common`
-by merging into it the peculiarities particular to the target environments.
-
-These files tend to be short and simple.
-
-
-{@a development-configuration}
-
-
-
-### Development configuration
-
-Here is the `webpack.dev.js` development configuration file.
-
-
-<code-example path="webpack/config/webpack.dev.js" title="config/webpack.dev.js" linenums="false">
-
-</code-example>
-
-
-
-The development build relies on the Webpack development server, configured near the bottom of the file.
-
-Although you tell Webpack to put output bundles in the `dist` folder,
-the dev server keeps all bundles in memory; it doesn't write them to disk.
-You won't find any files in the `dist` folder, at least not any generated from *this development build*.
-
-
-The `HtmlWebpackPlugin`, added in `webpack.common.js`, uses the `publicPath` and the `filename` settings to generate
-appropriate `<script>` and `<link>` tags into the `index.html`.
-
-The CSS styles are buried inside the Javascript bundles by default. The `ExtractTextPlugin` extracts them into
-external `.css` files that the `HtmlWebpackPlugin` inscribes as `<link>` tags into the `index.html`.
-
-Refer to the [Webpack documentation](https://webpack.github.io/docs/) for details on these and
-other configuration options in this file.
-
-Grab the app code at the end of this guide and try:
-
-
-<code-example language="sh" class="code-shell">
-  npm start
-
-</code-example>
-
-
-
-{@a production-configuration}
-
-
-
-### Production configuration
-
-Configuration of a *production* build resembles *development* configuration with a few key changes.
-
-
-<code-example path="webpack/config/webpack.prod.js" title="config/webpack.prod.js" linenums="false">
-
-</code-example>
-
-
-
-You'll deploy the application and its dependencies to a real production server.
-You won't deploy the artifacts needed only in development.
-
-Put the production output bundle files in the `dist` folder.
-
-Webpack generates file names with cache-busting hash.
-Thanks to the `HtmlWebpackPlugin`, you don't have to update the `index.html` file when the hash changes.
-
-There are additional plugins:
-
-* *`NoEmitOnErrorsPlugin`&mdash;stops the build if there is an error.
-* *`UglifyJsPlugin`&mdash;minifies the bundles.
-* *`ExtractTextPlugin`&mdash;extracts embedded css as external files, adding cache-busting hash to the filename.
-* *`DefinePlugin`&mdash;use to define environment variables that you can reference within the application.
-* *`LoaderOptionsPlugins`&mdash;to override options of certain loaders.
-
-Thanks to the `DefinePlugin` and the `ENV` variable defined at top, you can enable Angular production mode like this:
-
-
-<code-example path="webpack/src/main.ts" region="enable-prod" title="src/main.ts" linenums="false">
-
-</code-example>
-
-
-
-Grab the app code at the end of this guide and try:
-
-
-<code-example language="sh" class="code-shell">
-  npm run build
-
-</code-example>
-
-
-
-{@a test-configuration}
-
-
-
-### Test configuration
-
-You don't need much configuration to run unit tests.
-You don't need the loaders and plugins that you declared for your development and production builds.
-You probably don't need to load and process the application-wide styles files for unit tests and doing so would slow you down;
-you'll use the `null` loader for those CSS files.
-
-You could merge the test configuration into the `webpack.common` configuration and override the parts you don't want or need.
-But it might be simpler to start over with a completely fresh configuration.
-
-
-<code-example path="webpack/config/webpack.test.js" title="config/webpack.test.js" linenums="false">
-
-</code-example>
-
-
-
-Reconfigure [Karma](https://karma-runner.github.io/1.0/index.html) to use Webpack to run the tests:
-
-
-<code-example path="webpack/config/karma.conf.js" title="config/karma.conf.js" linenums="false">
-
-</code-example>
-
-
-
-You don't precompile the TypeScript; Webpack transpiles the Typescript files on the fly, in memory, and feeds the emitted JS directly to Karma.
-There are no temporary files on disk.
-
-The `karma-test-shim` tells Karma what files to pre-load and
-primes the Angular test framework with test versions of the providers that every app expects to be pre-loaded.
-
-
-<code-example path="webpack/config/karma-test-shim.js" title="config/karma-test-shim.js" linenums="false">
-
-</code-example>
-
-
-
-Notice that you do _not_ load the application code explicitly.
-You tell Webpack to find and load the test files (the files ending in `.spec.ts`).
-Each spec file imports all&mdash;and only&mdash;the application source code that it tests.
-Webpack loads just _those_ specific application files and ignores the other files that you aren't testing.
-
-
-Grab the app code at the end of this guide and try:
-
-
-<code-example language="sh" class="code-shell">
-  npm test
-
-</code-example>
-
-{@a try}
-
-## Trying it out
-
-Here is the source code for a small application that bundles with the
-Webpack techniques covered in this guide.
-
-
-<code-tabs>
-
-  <code-pane title="src/index.html" path="webpack/src/index.html">
-
-  </code-pane>
-
-  <code-pane title="src/main.ts" path="webpack/src/main.ts">
-
-  </code-pane>
-
-  <code-pane title="src/assets/css/styles.css" path="webpack/src/assets/css/styles.css">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
-<code-tabs>
-
-  <code-pane title="src/app/app.component.ts" path="webpack/src/app/app.component.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/app.component.html" path="webpack/src/app/app.component.html">
-
-  </code-pane>
-
-  <code-pane title="src/app/app.component.css" path="webpack/src/app/app.component.css">
-
-  </code-pane>
-
-  <code-pane title="src/app/app.component.spec.ts" path="webpack/src/app/app.component.spec.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/app.module.ts" path="webpack/src/app/app.module.ts">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
-The <code>app.component.html</code> displays this downloadable Angular logo
-<a href="assets/images/logos/angular/angular.png">
-<img src="assets/images/logos/angular/angular.png" height="40px" title="download Angular logo"></a>.
-Create a folder called `images` under the project's `assets` folder, then right-click (Cmd+click on Mac)
-on the image and download it to that folder.
-
-
-{@a bundle-ts}
-
-
-Here again are the TypeScript entry-point files that define the `polyfills` and `vendor` bundles.
-
-<code-tabs>
-
-  <code-pane title="src/polyfills.ts" path="webpack/src/polyfills.ts">
-
-  </code-pane>
-
-  <code-pane title="src/vendor.ts" path="webpack/src/vendor.ts">
-
-  </code-pane>
-
-</code-tabs>
-
-{@a highlights}
-
-<h3 class="no-toc">Highlights</h3>
-
-* There are no `<script>` or `<link>` tags in the `index.html`.
-The `HtmlWebpackPlugin` inserts them dynamically at runtime.
-
-* The `AppComponent` in `app.component.ts` imports the application-wide css with a simple `import` statement.
-
-* The `AppComponent` itself has its own html template and css file. WebPack loads them with calls to `require()`.
-Webpack stashes those component-scoped files in the `app.js` bundle too.
-You don't see those calls in the source code;
-they're added behind the scenes by the `angular2-template-loader` plug-in.
-
-* The `vendor.ts` consists of vendor dependency `import` statements that drive the `vendor.js` bundle.
-The application imports these modules too; they'd be duplicated in the `app.js` bundle
-if the `CommonsChunkPlugin` hadn't detected the overlap and removed them from `app.js`.
-{@a conclusion}
-
-## Conclusion
-
-You've learned just enough Webpack to configurate development, test and production builds
-for a small Angular application.
-
-_You could always do more_. Search the web for expert advice and expand your Webpack knowledge.
-
-[Back to top](guide/webpack#top)
diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index 407c5efe0f..c0006c1c0d 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -61,12 +61,6 @@
       "hidden": true
     },
 
-    {
-      "url": "guide/webpack",
-      "title": "Webpack: An Introduction",
-      "hidden": true
-    },
-
     {
       "url": "guide/quickstart",
       "title": "Getting Started",
diff --git a/aio/tools/example-zipper/README.md b/aio/tools/example-zipper/README.md
index 2351fe2cff..e4d728a661 100644
--- a/aio/tools/example-zipper/README.md
+++ b/aio/tools/example-zipper/README.md
@@ -25,7 +25,7 @@ The zipper will use this information for creating new zips.
 
 ## Three kinds of examples
 
-The majority of examples in AIO use `System.js` but there are also `CLI` and `Webpack` projects. This
+The majority of examples in AIO use `CLI`, with some additionally using `Webpack` and upgrade usiing `SystemJS`. This
 tool is able to differentiate between them.
 
 The boilerplate uses a `package.json` that contains packages and scripts to run any kind of example.
@@ -44,7 +44,6 @@ Here you find a:
 
 * **base.json** - All the common scripts and packages
 * **cli.json** - Extra scripts and packages for the CLI
-* **webpack.json** - Extra scripts and packages for Webpack
 * **universal.json** - Extra scripts and packages for universal
 * **i18n.json** - Extra scripts and packages for i18n
 * **systemjs.json** - All the System.js related packages but it also contains the remainder scripts
@@ -68,11 +67,11 @@ In both `stackblitz.json` and `zipper.json` you can use two extra properties for
 {
   ...
   "removeSystemJsConfig": true,
-  "type": "webpack"
+  "type": "testing"
 }
 ```
 
-This would generate a zip for a webpack application and it will also remove everything related with
+This would generate a zip for a testing application and it will also remove everything related with
 SystemJS.
 
 ## Executing the zip generation
diff --git a/aio/tools/example-zipper/customizer/package-json/webpack.json b/aio/tools/example-zipper/customizer/package-json/webpack.json
deleted file mode 100644
index 377d549e74..0000000000
--- a/aio/tools/example-zipper/customizer/package-json/webpack.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "scripts": [
-    { "name": "start:webpack", "rename": "start" },
-    { "name": "test:webpack", "rename": "test" },
-    { "name": "build:webpack", "rename": "build" }
-  ],
-  "dependencies": [],
-  "devDependencies": [
-    "angular2-template-loader",
-    "awesome-typescript-loader",
-    "css-loader",
-    "extract-text-webpack-plugin",
-    "file-loader",
-    "html-loader",
-    "html-webpack-plugin",
-    "karma-sourcemap-loader",
-    "karma-webpack",
-    "null-loader",
-    "raw-loader",
-    "rimraf",
-    "style-loader",
-    "webpack",
-    "webpack-dev-server",
-    "webpack-merge"
-  ]
-}
diff --git a/aio/tools/example-zipper/exampleZipper.js b/aio/tools/example-zipper/exampleZipper.js
index 996f38a008..3afce755d7 100644
--- a/aio/tools/example-zipper/exampleZipper.js
+++ b/aio/tools/example-zipper/exampleZipper.js
@@ -113,7 +113,6 @@ class ExampleZipper {
       '!**/package.json',
       '!**/example-config.json',
       '!**/wallaby.js',
-      '!**/package.webpack.json',
       // AoT related files
       '!**/aot/**/*.*',
       '!**/*-aot.*'
diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js
index 28b2ebf84e..e7d6291d0b 100644
--- a/aio/tools/examples/run-example-e2e.js
+++ b/aio/tools/examples/run-example-e2e.js
@@ -18,7 +18,6 @@ const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
 const IGNORED_EXAMPLES = [ // temporary ignores
   'quickstart',
   'setup',
-  'webpack',
   'upgrade-p'
 ];
 
diff --git a/aio/tools/examples/shared/boilerplate/systemjs/package.json b/aio/tools/examples/shared/boilerplate/systemjs/package.json
index cd0b70e0ea..d9747ad511 100644
--- a/aio/tools/examples/shared/boilerplate/systemjs/package.json
+++ b/aio/tools/examples/shared/boilerplate/systemjs/package.json
@@ -26,13 +26,7 @@
     "serve:cli": "http-server dist/",
     "build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup-config.js",
     "serve:aot": "lite-server -c bs-config.aot.json",
-    "start:webpack": "webpack-dev-server --inline --progress --port 8080",
-    "test:webpack": "karma start karma.webpack.conf.js",
-    "build:webpack": "rimraf dist && webpack --config config/webpack.prod.js --bail",
     "build:babel": "babel src -d src --extensions \".es6\" --source-maps",
-    "build:uni-client": "webpack --config webpack.config.client.js",
-    "build:uni": "webpack --config webpack.config.universal.js",
-    "serve:uni": "node dist/server.js",
 
     "clean": "rimraf src/dist && rimraf src/app/*.js* && rimraf src/universal/*.js* && rimraf src/main.js*",
     "copy-dist-files": "node ./copy-dist-files.js",
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index d3f27b9ee5..0e3ff282e5 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -58,12 +58,6 @@
     "@types/node": "^6.0.45",
     "canonical-path": "0.0.2",
     "concurrently": "^3.0.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.26.1",
-    "extract-text-webpack-plugin": "2.0.0-beta.5",
-    "file-loader": "^0.9.0",
-    "html-loader": "^0.4.3",
-    "html-webpack-plugin": "^2.16.1",
     "http-server": "^0.9.0",
     "jasmine-core": "~2.99.1",
     "jasmine-marbles": "^0.3.1",
@@ -74,7 +68,6 @@
     "karma-jasmine": "~1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-phantomjs-launcher": "^1.0.2",
-    "karma-sourcemap-loader": "^0.3.7",
     "lite-server": "^2.2.2",
     "lodash": "^4.16.2",
     "phantomjs-prebuilt": "^2.1.7",
@@ -85,7 +78,6 @@
     "rollup-plugin-node-resolve": "2.0.0",
     "rollup-plugin-uglify": "^1.0.1",
     "source-map-explorer": "^1.3.2",
-    "ts-loader": "^4.2.0",
     "ts-node": "^5.0.1",
     "tslint": "^5.9.1",
     "typescript": "2.7.2",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index b85cf758e4..ab9ed54dc6 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -438,10 +438,6 @@ align-text@^0.1.1, align-text@^0.1.3:
     longest "^1.0.1"
     repeat-string "^1.5.2"
 
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -652,10 +648,6 @@ ast-types@0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
 
-ast-types@0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
-
 async-each-series@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
@@ -676,12 +668,6 @@ async@1.5.2, async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-  dependencies:
-    lodash "^4.14.0"
-
 async@^2.1.4, async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
@@ -696,17 +682,6 @@ atob@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
-autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
-  dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
-
 autoprefixer@^8.1.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.2.0.tgz#1e49b611b31a5259b86b7a6b2b1b8faf091abe2a"
@@ -730,7 +705,7 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -1335,10 +1310,6 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -1419,7 +1390,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0, bluebird@^3.4.7, bluebird@^3.5.1:
+bluebird@^3.3.0, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1638,13 +1609,6 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
-
 browserslist@^3.2.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.4.tgz#fb9ad70fd09875137ae943a31ab815ed76896031"
@@ -1787,19 +1751,6 @@ camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-caniuse-api@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
-  dependencies:
-    browserslist "^1.3.6"
-    caniuse-db "^1.0.30000529"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000752"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000752.tgz#daa129d54ce700e94ad14388bdef514ec1e2dd54"
-
 caniuse-lite@^1.0.30000817, caniuse-lite@^1.0.30000821:
   version "1.0.30000828"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000828.tgz#048f98de213f7a3c047bf78a9523c611855d4fdd"
@@ -1956,12 +1907,6 @@ circular-dependency-plugin@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
 
-clap@^1.0.9:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
-  dependencies:
-    chalk "^1.1.3"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -2071,10 +2016,6 @@ clone@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
-clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-
 clone@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
@@ -2091,12 +2032,6 @@ co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
-coa@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
-  dependencies:
-    q "^1.1.2"
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -2108,43 +2043,21 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.3.0, color-convert@^1.9.0:
+color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
-color-name@^1.0.0, color-name@^1.1.1:
+color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  dependencies:
-    color-name "^1.0.0"
-
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
-
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
-  dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
-
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@1.1.2, colors@^1.1.0, colors@~1.1.2:
+colors@1.1.2, colors@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
@@ -2341,19 +2254,6 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-copy-webpack-plugin@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz#252bb94597f96399d23d7fad355f8d3a661ac096"
-  dependencies:
-    bluebird "^3.5.1"
-    fs-extra "^4.0.2"
-    glob "^7.1.2"
-    is-glob "^4.0.0"
-    loader-utils "^0.2.15"
-    lodash "^4.3.0"
-    minimatch "^3.0.4"
-    node-dir "^0.1.10"
-
 copy-webpack-plugin@^4.5.1:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.1.tgz#fc4f68f4add837cc5e13d111b20715793225d29c"
@@ -2478,27 +2378,6 @@ crypto-browserify@^3.11.0:
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
 
-css-color-names@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
-css-loader@^0.26.1:
-  version "0.26.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.4.tgz#b61e9e30db94303e6ffc892f10ecd09ad025a1fd"
-  dependencies:
-    babel-code-frame "^6.11.0"
-    css-selector-tokenizer "^0.7.0"
-    cssnano ">=2.6.1 <4"
-    loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    object-assign "^4.0.1"
-    postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.0.0"
-    postcss-modules-local-by-default "^1.0.1"
-    postcss-modules-scope "^1.0.0"
-    postcss-modules-values "^1.1.0"
-    source-list-map "^0.1.7"
-
 css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
@@ -2512,66 +2391,10 @@ css-select@^1.1.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
 
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-
-"cssnano@>=2.6.1 <4":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-  dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
-
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
-
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
@@ -2710,10 +2533,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -2943,10 +2762,6 @@ ejs@^2.5.9:
   version "2.5.9"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5"
 
-electron-to-chromium@^1.2.7:
-  version "1.3.27"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
-
 electron-to-chromium@^1.3.41:
   version "1.3.42"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9"
@@ -3138,13 +2953,6 @@ es6-promise@~4.0.3:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
 
-es6-templates@^0.2.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4"
-  dependencies:
-    recast "~0.11.12"
-    through "~2.3.6"
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3171,7 +2979,7 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
+esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
@@ -3179,10 +2987,6 @@ esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
-esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esrecurse@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
@@ -3388,14 +3192,6 @@ extglob@^2.0.2, extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-text-webpack-plugin@2.0.0-beta.5:
-  version "2.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-beta.5.tgz#595e32ae2466ad2129a928328485fcc064ce57f0"
-  dependencies:
-    async "^2.1.2"
-    loader-utils "^0.2.3"
-    webpack-sources "^0.1.0"
-
 extract-zip@~1.6.5:
   version "1.6.5"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.5.tgz#99a06735b6ea20ea9b705d779acffcc87cff0440"
@@ -3431,10 +3227,6 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
-fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -3466,12 +3258,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.9.0.tgz#1d2daddd424ce6d1b07cfe3f79731bed3617ab42"
-  dependencies:
-    loader-utils "~0.2.5"
-
 file-loader@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
@@ -3570,10 +3356,6 @@ first-chunk-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-
 flow-parser@^0.*:
   version "0.71.0"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.71.0.tgz#da2479b83f9207905b4b17ab0c4e6d17bd505250"
@@ -3676,14 +3458,6 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
@@ -4237,25 +4011,11 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
-html-loader@^0.4.3:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.4.5.tgz#5fbcd87cd63a5c49a7fce2fe56f425e05729c68c"
-  dependencies:
-    es6-templates "^0.2.2"
-    fastparse "^1.1.1"
-    html-minifier "^3.0.1"
-    loader-utils "^1.0.2"
-    object-assign "^4.1.0"
-
-html-minifier@^3.0.1, html-minifier@^3.2.3:
+html-minifier@^3.2.3:
   version "3.5.6"
   resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.6.tgz#7e4e661a09999599c7d8e8a2b8d7fb7430bb5c3e"
   dependencies:
@@ -4268,17 +4028,6 @@ html-minifier@^3.0.1, html-minifier@^3.2.3:
     relateurl "0.2.x"
     uglify-js "3.1.x"
 
-html-webpack-plugin@^2.16.1:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5"
-  dependencies:
-    bluebird "^3.4.7"
-    html-minifier "^3.2.3"
-    loader-utils "^0.2.16"
-    lodash "^4.17.3"
-    pretty-error "^2.0.2"
-    toposort "^1.0.0"
-
 html-webpack-plugin@^3.0.6:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
@@ -4403,10 +4152,6 @@ iconv-lite@^0.4.17:
   dependencies:
     safer-buffer "^2.1.0"
 
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -4460,10 +4205,6 @@ indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -4559,10 +4300,6 @@ ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
 
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -4816,12 +4553,6 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  dependencies:
-    html-comment-regex "^1.1.0"
-
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -5010,7 +4741,7 @@ jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
 
-js-base64@^2.1.8, js-base64@^2.1.9:
+js-base64@^2.1.8:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
 
@@ -5032,13 +4763,6 @@ js-yaml@^3.4.3, js-yaml@^3.7.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -5137,12 +4861,6 @@ jsonfile@^3.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -5211,12 +4929,6 @@ karma-source-map-support@^1.2.0:
   dependencies:
     source-map-support "^0.4.1"
 
-karma-sourcemap-loader@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
-  dependencies:
-    graceful-fs "^4.1.2"
-
 karma@~1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
@@ -5430,7 +5142,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@~0.2.5:
+loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -5467,10 +5179,6 @@ lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -5479,10 +5187,6 @@ lodash.isfinite@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
 
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
 lodash.mergewith@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
@@ -5491,10 +5195,6 @@ lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
 
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-
 lodash@^3.10.1, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
@@ -5585,10 +5285,6 @@ lru-cache@^4.0.1, lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-
 magic-string@^0.22.4:
   version "0.22.4"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
@@ -5625,10 +5321,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-math-expression-evaluator@^1.2.14:
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
-
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -5883,7 +5575,7 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -6017,12 +5709,6 @@ node-dir@0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
 
-node-dir@^0.1.10:
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
-  dependencies:
-    minimatch "^3.0.2"
-
 node-forge@0.6.33:
   version "0.6.33"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
@@ -6175,15 +5861,6 @@ normalize-url@2.0.1:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
 "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
@@ -6726,67 +6403,6 @@ posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
 
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
-
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
-
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-overridden@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  dependencies:
-    postcss "^5.0.16"
-
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
-
-postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
-  dependencies:
-    postcss "^5.0.4"
-    uniqid "^4.0.0"
-
 postcss-import@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
@@ -6828,162 +6444,6 @@ postcss-loader@^2.1.4:
     postcss-load-config "^1.2.0"
     schema-utils "^0.4.0"
 
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
-
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-merge-rules@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
-    vendors "^1.0.0"
-
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
-  dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
-  dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
-
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
-    uniqs "^2.0.0"
-
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
-
-postcss-modules-extract-imports@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
-  dependencies:
-    postcss "^6.0.1"
-
-postcss-modules-local-by-default@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-scope@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-values@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  dependencies:
-    icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
-
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
-  dependencies:
-    postcss "^5.0.5"
-
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
-  dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
-
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
-
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
-  dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
-
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
 postcss-url@^7.3.1:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.2.tgz#5fea273807fb84b38c461c3c9a9e8abd235f7120"
@@ -6994,27 +6454,10 @@ postcss-url@^7.3.1:
     postcss "^6.0.1"
     xxhashjs "^0.2.1"
 
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+postcss-value-parser@^3.2.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
-  version "5.2.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
-  dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
 postcss@^6.0.0:
   version "6.0.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
@@ -7043,7 +6486,7 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
@@ -7183,7 +6626,7 @@ q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-q@^1.1.2, q@^1.4.1:
+q@^1.4.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -7215,13 +6658,6 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -7400,15 +6836,6 @@ recast@^0.14.1:
     private "~0.1.5"
     source-map "~0.6.1"
 
-recast@~0.11.12:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -7422,20 +6849,6 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-reduce-css-calc@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  dependencies:
-    balanced-match "^0.4.2"
-
 reflect-metadata@^0.1.2:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
@@ -7475,14 +6888,6 @@ regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
@@ -7894,7 +7299,7 @@ sax@0.6.x:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
 
-sax@>=0.6.0, sax@~1.2.1:
+sax@>=0.6.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -7968,7 +7373,7 @@ semver-intersect@^1.1.2:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -8302,26 +7707,20 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.7, source-list-map@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
 source-map-explorer@^1.3.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-1.5.0.tgz#654e2ba0db158fecfc99b9cefdf891b755b767d1"
@@ -8367,7 +7766,7 @@ source-map@0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -8680,18 +8079,6 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
-
 symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
@@ -8768,7 +8155,7 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6, through@~2.3.6:
+through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -8878,16 +8265,6 @@ trim-right@^1.0.1:
   dependencies:
     glob "^6.0.4"
 
-ts-loader@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.2.0.tgz#c380c399fc81f82cad0e3044f9c1f775ecde6efa"
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^3.1.4"
-    semver "^5.0.1"
-
 ts-node@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
@@ -9068,20 +8445,6 @@ union@~0.4.3:
   dependencies:
     qs "~2.3.3"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  dependencies:
-    macaddress "^0.2.8"
-
-uniqs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
 unique-filename@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
@@ -9261,10 +8624,6 @@ vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
-vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -9462,13 +8821,6 @@ webpack-merge@^4.1.2:
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.5.3"
-
 webpack-sources@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
@@ -9540,10 +8892,6 @@ when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
 
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"

From 4e1493a1d6c3d47186458fd14cd0c8da9ab4beed Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Fri, 1 Jun 2018 07:35:06 -0500
Subject: [PATCH 304/582] docs(forms): update API reference for FormControl
 (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 577 ++++++++++++++++++++++++++----------
 1 file changed, 425 insertions(+), 152 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index bbda7f1c6b..a94e12839a 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -143,7 +143,9 @@ export abstract class AbstractControl {
   public readonly value: any;
 
   /**
+   * @description
    * Initialize the AbstractControl instance.
+   *
    * @param validator The function that will determine the synchronous validity of this control.
    * @param asyncValidator The function that will determine the asynchronous validity of this
    * control.
@@ -151,11 +153,13 @@ export abstract class AbstractControl {
   constructor(public validator: ValidatorFn|null, public asyncValidator: AsyncValidatorFn|null) {}
 
   /**
+   * @description
    * The parent control.
    */
   get parent(): FormGroup|FormArray { return this._parent; }
 
   /**
+   * @description
    * The validation status of the control. There are four possible
    * validation statuses:
    *
@@ -170,7 +174,8 @@ export abstract class AbstractControl {
   public readonly status: string;
 
   /**
-   * A control is `valid` when its `status === VALID`.
+   * @description
+   * A control is `valid` when its `status` is `VALID`.
    *
    * In order to have this status, the control must have passed all its
    * validation checks.
@@ -178,7 +183,8 @@ export abstract class AbstractControl {
   get valid(): boolean { return this.status === VALID; }
 
   /**
-   * A control is `invalid` when its `status === INVALID`.
+   * @description
+   * A control is `invalid` when its `status` is `INVALID`.
    *
    * In order to have this status, the control must have failed
    * at least one of its validation checks.
@@ -186,7 +192,8 @@ export abstract class AbstractControl {
   get invalid(): boolean { return this.status === INVALID; }
 
   /**
-   * A control is `pending` when its `status === PENDING`.
+   * @description
+   * A control is `pending` when its `status` is `PENDING`.
    *
    * In order to have this status, the control must be in the
    * middle of conducting a validation check.
@@ -194,7 +201,8 @@ export abstract class AbstractControl {
   get pending(): boolean { return this.status == PENDING; }
 
   /**
-   * A control is `disabled` when its `status === DISABLED`.
+   * @description
+   * A control is `disabled` when its `status` is `DISABLED`.
    *
    * Disabled controls are exempt from validation checks and
    * are not included in the aggregate value of their ancestor
@@ -203,7 +211,8 @@ export abstract class AbstractControl {
   get disabled(): boolean { return this.status === DISABLED; }
 
   /**
-   * A control is `enabled` as long as its `status !== DISABLED`.
+   * @description
+   * A control is `enabled` as long as its `status` is not `DISABLED`.
    *
    * In other words, it has a status of `VALID`, `INVALID`, or
    * `PENDING`.
@@ -211,63 +220,73 @@ export abstract class AbstractControl {
   get enabled(): boolean { return this.status !== DISABLED; }
 
   /**
+   * @description
    * Returns any errors generated by failing validation. If there
    * are no errors, it will return null.
    */
   public readonly errors: ValidationErrors|null;
 
   /**
+   * @description
    * A control is `pristine` if the user has not yet changed
    * the value in the UI.
    *
-   * Note that programmatic changes to a control's value will
-   * *not* mark it dirty.
+   * Programmatic changes to a control's value will
+   * **not** mark it dirty.
    */
   public readonly pristine: boolean = true;
 
   /**
+   * @description
    * A control is `dirty` if the user has changed the value
    * in the UI.
    *
-   * Note that programmatic changes to a control's value will
-   * *not* mark it dirty.
+   * Programmatic changes to a control's value will
+   * **not** mark it dirty.
    */
   get dirty(): boolean { return !this.pristine; }
 
   /**
-  * A control is marked `touched` once the user has triggered
-  * a `blur` event on it.
-  */
+   * @description
+   * A control is marked `touched` once the user has triggered
+   * a `blur` event on it.
+   */
   public readonly touched: boolean = false;
 
   /**
+   * @description
    * A control is `untouched` if the user has not yet triggered
    * a `blur` event on it.
    */
   get untouched(): boolean { return !this.touched; }
 
   /**
+   * @description
    * Emits an event every time the value of the control changes, in
    * the UI or programmatically.
    */
   public readonly valueChanges: Observable<any>;
 
   /**
+   * @description
    * Emits an event every time the validation status of the control
    * is re-calculated.
    */
   public readonly statusChanges: Observable<any>;
 
   /**
+   * @description
    * Returns the update strategy of the `AbstractControl` (i.e.
    * the event on which the control will update itself).
-   * Possible values: `'change'` (default) | `'blur'` | `'submit'`
+   * Possible values: `'change'` | `'blur'` | `'submit'`
+   * Default value: `'change'`
    */
   get updateOn(): FormHooks {
     return this._updateOn ? this._updateOn : (this.parent ? this.parent.updateOn : 'change');
   }
 
   /**
+   * @description
    * Sets the synchronous validators that are active on this control.  Calling
    * this will overwrite any existing sync validators.
    */
@@ -276,6 +295,7 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Sets the async validators that are active on this control. Calling this
    * will overwrite any existing async validators.
    */
@@ -284,20 +304,24 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Empties out the sync validator list.
    */
   clearValidators(): void { this.validator = null; }
 
   /**
+   * @description
    * Empties out the async validator list.
    */
   clearAsyncValidators(): void { this.asyncValidator = null; }
 
   /**
+   * @description
    * Marks the control as `touched`.
    *
-   * This will also mark all direct ancestors as `touched` to maintain
-   * the model.
+   *  @param opts Configure options that happen when marked as touched
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `touched`
+   * to maintain the model. Defaults to false
    */
   markAsTouched(opts: {onlySelf?: boolean} = {}): void {
     (this as{touched: boolean}).touched = true;
@@ -308,11 +332,16 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Marks the control as `untouched`.
    *
    * If the control has any children, it will also mark all children as `untouched`
    * to maintain the model, and re-calculate the `touched` status of all parent
    * controls.
+   *
+   *  @param opts Configure options that happen when marked as untouched
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `touched`
+   * to maintain the model. Defaults to false
    */
   markAsUntouched(opts: {onlySelf?: boolean} = {}): void {
     (this as{touched: boolean}).touched = false;
@@ -327,10 +356,12 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Marks the control as `dirty`.
    *
-   * This will also mark all direct ancestors as `dirty` to maintain
-   * the model.
+   *  @param opts Configure options that happen when marked as dirty
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `dirty` to maintain
+   * to maintain the model. Defaults to false
    */
   markAsDirty(opts: {onlySelf?: boolean} = {}): void {
     (this as{pristine: boolean}).pristine = false;
@@ -341,11 +372,16 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Marks the control as `pristine`.
    *
    * If the control has any children, it will also mark all children as `pristine`
    * to maintain the model, and re-calculate the `pristine` status of all parent
    * controls.
+   *
+   *  @param opts Configure options that happen when marked as pristine
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `pristine`
+   * to maintain the model. Defaults to false
    */
   markAsPristine(opts: {onlySelf?: boolean} = {}): void {
     (this as{pristine: boolean}).pristine = true;
@@ -359,11 +395,15 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Marks the control as `pending`.
    *
    * An event will be emitted by `statusChanges` by default.
    *
-   * Passing `false` for `emitEvent` will cause `statusChanges` to not emit an event.
+   *  @param opts Configure options that happen when marked as untouched
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `untouched`
+   * to maintain the model.
+   * * If `emitEvent` is false, `statusChanges` will not emit an event.
    */
   markAsPending(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = PENDING;
@@ -378,10 +418,16 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Disables the control. This means the control will be exempt from validation checks and
    * excluded from the aggregate value of any parent. Its status is `DISABLED`.
    *
    * If the control has children, all children will be disabled to maintain the model.
+   *
+   *  @param opts Configure options that happen when disabled
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `disabled`
+   * to maintain the model.
+   * * If `emitEvent` is false, `statusChanges` and `valueChanges` will not emit an event.
    */
   disable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = DISABLED;
@@ -400,11 +446,17 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Enables the control. This means the control will be included in validation checks and
    * the aggregate value of its parent. Its status is re-calculated based on its value and
    * its validators.
    *
    * If the control has children, all children will be enabled.
+   *
+   *  @param opts Configure options that happen when marked as untouched
+   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `disabled`
+   * to maintain the model.
+   * * If `emitEvent` is false, `statusChanges` and `valueChanges` will not emit an event.
    */
   enable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = VALID;
@@ -424,19 +476,26 @@ export abstract class AbstractControl {
     }
   }
 
+  /**
+   * @description
+   * @param parent Sets the parent of the control
+   */
   setParent(parent: FormGroup|FormArray): void { this._parent = parent; }
 
   /**
+   * @description
    * Sets the value of the control. Abstract method (implemented in sub-classes).
    */
   abstract setValue(value: any, options?: Object): void;
 
   /**
+   * @description
    * Patches the value of the control. Abstract method (implemented in sub-classes).
    */
   abstract patchValue(value: any, options?: Object): void;
 
   /**
+   * @description
    * Resets the control. Abstract method (implemented in sub-classes).
    */
   abstract reset(value?: any, options?: Object): void;
@@ -445,6 +504,11 @@ export abstract class AbstractControl {
    * Re-calculates the value and validation status of the control.
    *
    * By default, it will also update the value and validity of its ancestors.
+   *
+   * @param opts Configure options that happen when the value and validity change
+   * * If `onlySelf` is true, this will **not** update all direct ancestors
+   * to maintain the model.
+   * * If `emitEvent` is false, `statusChanges` and `valueChanges` will **not** emit an event.
    */
   updateValueAndValidity(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._setInitialStatus();
@@ -500,24 +564,25 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Sets errors on a form control.
    *
    * This is used when validations are run manually by the user, rather than automatically.
    *
    * Calling `setErrors` will also update the validity of the parent control.
    *
-   * ### Example
+   * ### Manually set the errors for a control
    *
    * ```
-   * const login = new FormControl("someLogin");
+   * const login = new FormControl('someLogin');
    * login.setErrors({
-   *   "notUnique": true
+   *   notUnique: true
    * });
    *
    * expect(login.valid).toEqual(false);
-   * expect(login.errors).toEqual({"notUnique": true});
+   * expect(login.errors).toEqual({ notUnique: true });
    *
-   * login.setValue("someOtherLogin");
+   * login.setValue('someOtherLogin');
    *
    * expect(login.valid).toEqual(true);
    * ```
@@ -528,11 +593,15 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Retrieves a child control given the control's name or path.
    *
-   * Paths can be passed in as an array or a string delimited by a dot.
+   * @param path dot-delimited string or array of string/number values that define the path to the
+   * control.
    *
-   * To get a control nested within a `person` sub-group:
+   * ### Retrieve a nested control
+   *
+   * For example, to get a `name` control nested within a `person` sub-group:
    *
    * * `this.form.get('person.name');`
    *
@@ -543,10 +612,13 @@ export abstract class AbstractControl {
   get(path: Array<string|number>|string): AbstractControl|null { return _find(this, path, '.'); }
 
   /**
+   * @description
    * Returns error data if the control with the given path has the error specified. Otherwise
    * returns null or undefined.
    *
-   * If no path is given, it checks for the error on the present control.
+   * @param errorCode The error code to be retrieved
+   * @param path The path to the control. If no path is given, it checks for the error on the
+   * present control.
    */
   getError(errorCode: string, path?: string[]): any {
     const control = path ? this.get(path) : this;
@@ -554,14 +626,18 @@ export abstract class AbstractControl {
   }
 
   /**
+   * @description
    * Returns true if the control with the given path has the error specified. Otherwise
    * returns false.
    *
-   * If no path is given, it checks for the error on the present control.
+   * @param errorCode The error code to be retrieved
+   * @param path The path to the control. If no path is given, it checks for the error on the
+   * present control.
    */
   hasError(errorCode: string, path?: string[]): boolean { return !!this.getError(errorCode, path); }
 
   /**
+   * @description
    * Retrieves the top-level ancestor of this control.
    */
   get root(): AbstractControl {
@@ -672,45 +748,47 @@ export abstract class AbstractControl {
 
 /**
  * @description
- *
  * Tracks the value and validation status of an individual form control.
  *
  * This is one of the three fundamental building blocks of Angular forms, along with
- * `FormGroup` and `FormArray`.
+ * `FormGroup` and `FormArray`. It extends the `AbstractControl` class that 
+ * implements most of the base functionality for accessing the value, validation status, 
+ * user interactions and events.
+ * 
+ * **npm package**: `@angular/forms`
+ * 
+ * @see `AbstractControl`
+ * @see [Reactive Forms Guide](guide/reactive-forms)
+ * @see [Usage Notes](#usage-notes)
+ * 
+ * @usageNotes
  *
- * When instantiating a `FormControl`, you can pass in an initial value as the
- * first argument. Example:
+ * Instantiate a `FormControl`, with an initial value.
  *
  * ```ts
  * const ctrl = new FormControl('some value');
  * console.log(ctrl.value);     // 'some value'
  *```
  *
- * You can also initialize the control with a form state object on instantiation,
- * which includes both the value and whether or not the control is disabled.
- * You can't use the value key without the disabled key; both are required
- * to use this way of initialization.
+ * Initializing the control with a form state object.
+ *
+ * The `value` and `disabled` keys are required when initializing with a form state object.
  *
  * ```ts
- * const ctrl = new FormControl({value: 'n/a', disabled: true});
+ * const ctrl = new FormControl({ value: 'n/a', disabled: true });
  * console.log(ctrl.value);     // 'n/a'
- * console.log(ctrl.status);   // 'DISABLED'
+ * console.log(ctrl.status);    // 'DISABLED'
  * ```
  *
- * The second `FormControl` argument can accept one of three things:
- * * a sync validator function
- * * an array of sync validator functions
- * * an options object containing validator and/or async validator functions
- *
- * Example of a single sync validator function:
+ * The following example initializes the control with a sync validator.
  *
  * ```ts
  * const ctrl = new FormControl('', Validators.required);
- * console.log(ctrl.value);     // ''
- * console.log(ctrl.status);   // 'INVALID'
+ * console.log(ctrl.value);      // ''
+ * console.log(ctrl.status);     // 'INVALID'
  * ```
  *
- * Example using options object:
+ * The example below initializes the control using an options object.
  *
  * ```ts
  * const ctrl = new FormControl('', {
@@ -719,24 +797,52 @@ export abstract class AbstractControl {
  * });
  * ```
  *
- * The options object can also be used to define when the control should update.
- * By default, the value and validity of a control updates whenever the value
- * changes. You can configure it to update on the blur event instead by setting
- * the `updateOn` option to `'blur'`.
+ * ### Configure the control to update on a blur event
+ *
+ * Set the `updateOn` option to `'blur'` to update on the blur `event`.
  *
  * ```ts
- * const c = new FormControl('', { updateOn: 'blur' });
+ * const ctrl = new FormControl('', { updateOn: 'blur' });
  * ```
  *
- * You can also set `updateOn` to `'submit'`, which will delay value and validity
- * updates until the parent form of the control fires a submit event.
+ * ### Configure the control to update on a submit event
  *
- * See its superclass, `AbstractControl`, for more properties and methods.
+ * Set the `updateOn` option to `'submit'` to update on a submit `event`.
  *
- * * **npm package**: `@angular/forms`
+ * ```ts
+ * const ctrl = new FormControl('', { updateOn: 'submit' });
+ * ```
+ * 
+ * ### Reset the control back to an initial value
+ * 
+ * You can also reset to a specific form state by passing through a standalone
+ * value or a form state object that contains both a value and a disabled state
+ * (these are the only two properties that cannot be calculated).
  *
+ * ```ts
+ * const ctrl = new FormControl('Nancy');
+ * 
+ * console.log(control.value); // 'Nancy'
+ * 
+ * control.reset('Drew');
  *
- */
+ * console.log(control.value); // 'Drew'
+ * ```
+ *
+ * ### Reset the control back to an initial value and disabled
+ *
+ * ```
+ * const ctrl = new FormControl('Nancy');
+ * 
+ * console.log(control.value); // 'Nancy'
+ * console.log(this.control.status); // 'DISABLED'
+ * 
+ * control.reset({ value: 'Drew', disabled: true });
+ *
+ * console.log(this.control.value); // 'Drew'
+ * console.log(this.control.status); // 'DISABLED'
+ *
+*/
 export class FormControl extends AbstractControl {
   /** @internal */
   _onChange: Function[] = [];
@@ -747,6 +853,24 @@ export class FormControl extends AbstractControl {
   /** @internal */
   _pendingChange: any;
 
+  /**
+  * @description
+  * Creates a new `FormControl` instance.
+  *
+  * @param formState Provides the control with an initial state in two ways:
+  * * with an initial value
+  * * with an object defining the initial value, disabled status and when updates and validation are
+  *handled.
+  *
+  * @param validatorOrOpts Provides the control with one of three things:
+  * * a sync validator function
+  * * an array of sync validator functions
+  * * an options object containing optional validator and/or async validator functions and a
+  *validation trigger
+  *
+  * @param asyncValidator A single async validator or array of async validator functions
+  *
+  */
   constructor(
       formState: any = null,
       validatorOrOpts?: ValidatorFn|ValidatorFn[]|AbstractControlOptions|null,
@@ -761,20 +885,23 @@ export class FormControl extends AbstractControl {
   }
 
   /**
-   * Set the value of the form control to `value`.
+   * @description
+   * Sets the latest value form the form control.
    *
-   * If `onlySelf` is `true`, this change will only affect the validation of this `FormControl`
+   * @param value The latest value for the control
+   * @param options Configure options for emitting events when the control value changes
+   *
+   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormControl`
    * and not its parent component. This defaults to false.
    *
-   * If `emitEvent` is `true`, this
-   * change will cause a `valueChanges` event on the `FormControl` to be emitted. This defaults
-   * to true (as it falls through to `updateValueAndValidity`).
+   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormControl`
+   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
    *
-   * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+   * * If `emitModelToViewChange` is `true`, the view will be notified about the new value
    * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
    * specified.
    *
-   * If `emitViewToModelChange` is `true`, an ngModelChange event will be fired to update the
+   * * If `emitViewToModelChange` is `true`, an ngModelChange event will be fired to update the
    * model.  This is the default behavior if `emitViewToModelChange` is not specified.
    */
   setValue(value: any, options: {
@@ -792,6 +919,7 @@ export class FormControl extends AbstractControl {
   }
 
   /**
+   * @description
    * Patches the value of a control.
    *
    * This function is functionally the same as {@link FormControl#setValue setValue} at this level.
@@ -808,32 +936,28 @@ export class FormControl extends AbstractControl {
   }
 
   /**
-   * Resets the form control. This means by default:
+   * @description
+   * Resets the form control
+   *
+   * By default, the following actions happen when the control is reset.
    *
    * * it is marked as `pristine`
    * * it is marked as `untouched`
    * * value is set to null
    *
-   * You can also reset to a specific form state by passing through a standalone
-   * value or a form state object that contains both a value and a disabled state
-   * (these are the only two properties that cannot be calculated).
+   * @param formState Provides the control with an initial state in two ways:
+   * * with an initial value
+   * * with an object defining the initial value, disabled status and when updates and validation
+   * are handled.
    *
-   * Ex:
+   * @param options Configure options for emitting events when the control value changes
    *
-   * ```ts
-   * this.control.reset('Nancy');
+   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormControl`
+   * and not its parent component. This defaults to false.
    *
-   * console.log(this.control.value);  // 'Nancy'
-   * ```
+   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormControl`
+   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
    *
-   * OR
-   *
-   * ```
-   * this.control.reset({value: 'Nancy', disabled: true});
-   *
-   * console.log(this.control.value);  // 'Nancy'
-   * console.log(this.control.status);  // 'DISABLED'
-   * ```
    */
   reset(formState: any = null, options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._applyFormState(formState);
@@ -859,7 +983,10 @@ export class FormControl extends AbstractControl {
   _allControlsDisabled(): boolean { return this.disabled; }
 
   /**
+   * @description
    * Register a listener for change events.
+   *
+   * @param fn The method that is called when the value changes
    */
   registerOnChange(fn: Function): void { this._onChange.push(fn); }
 
@@ -873,7 +1000,10 @@ export class FormControl extends AbstractControl {
   }
 
   /**
+   * @description
    * Register a listener for disabled events.
+   *
+   * @param fn The method that is called when the disabled status changes.
    */
   registerOnDisabledChange(fn: (isDisabled: boolean) => void): void {
     this._onDisabledChange.push(fn);
@@ -924,7 +1054,11 @@ export class FormControl extends AbstractControl {
  * When instantiating a `FormGroup`, pass in a collection of child controls as the first
  * argument. The key for each child will be the name under which it is registered.
  *
- * ### Example
+ * * **npm package**: `@angular/forms`
+ *
+ * @usageNotes
+ *
+ * ### Create a form group with 2 controls
  *
  * ```
  * const form = new FormGroup({
@@ -936,12 +1070,12 @@ export class FormControl extends AbstractControl {
  * console.log(form.status);  // 'VALID'
  * ```
  *
+ * ### Create a form group with a group-level validator
+ *
  * You can also include group-level validators as the second arg, or group-level async
  * validators as the third arg. These come in handy when you want to perform validation
  * that considers the value of more than one child control.
  *
- * ### Example
- *
  * ```
  * const form = new FormGroup({
  *   password: new FormControl('', Validators.minLength(2)),
@@ -962,9 +1096,11 @@ export class FormControl extends AbstractControl {
  * const form = new FormGroup({
  *   password: new FormControl('')
  *   passwordConfirm: new FormControl('')
- * }, {validators: passwordMatchValidator, asyncValidators: otherValidator});
+ * }, { validators: passwordMatchValidator, asyncValidators: otherValidator });
  * ```
  *
+ * ### Set the updateOn property for all controls in a form group
+ *
  * The options object can also be used to set a default value for each child
  * control's `updateOn` property. If you set `updateOn` to `'blur'` at the
  * group level, all child controls will default to 'blur', unless the child
@@ -972,15 +1108,27 @@ export class FormControl extends AbstractControl {
  *
  * ```ts
  * const c = new FormGroup({
- *    one: new FormControl()
- * }, {updateOn: 'blur'});
+ *   one: new FormControl()
+ * }, { updateOn: 'blur' });
  * ```
- *
- * * **npm package**: `@angular/forms`
- *
- *
  */
 export class FormGroup extends AbstractControl {
+  /**
+  * @description
+  * Creates a new `FormGroup` instance.
+  *
+  * @param controls A collection of child controls. The key for each child will be the name
+  * under which it is registered.
+  *
+  * @param validatorOrOpts Provides the control with one of three things:
+  * * a sync validator function
+  * * an array of sync validator functions
+  * * an options object containing optional validator and/or async validator functions and a
+  *validation trigger
+  *
+  * @param asyncValidator A single async validator or array of async validator functions
+  *
+  */
   constructor(
       public controls: {[key: string]: AbstractControl},
       validatorOrOpts?: ValidatorFn|ValidatorFn[]|AbstractControlOptions|null,
@@ -995,10 +1143,14 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * Registers a control with the group's list of controls.
    *
    * This method does not update the value or validity of the control, so for most cases you'll want
    * to use {@link FormGroup#addControl addControl} instead.
+   *
+   * @param name The control name to register in the collection
+   * @param control Provides the control for the given name
    */
   registerControl(name: string, control: AbstractControl): AbstractControl {
     if (this.controls[name]) return this.controls[name];
@@ -1009,7 +1161,11 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * Add a control to this group.
+   *
+   * @param name The control name to add to the collection
+   * @param control Provides the control for the given name
    */
   addControl(name: string, control: AbstractControl): void {
     this.registerControl(name, control);
@@ -1018,7 +1174,10 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * Remove a control from this group.
+   *
+   * @param name The control name to remove from the collection
    */
   removeControl(name: string): void {
     if (this.controls[name]) this.controls[name]._registerOnCollectionChange(() => {});
@@ -1028,7 +1187,11 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * Replace an existing control.
+   *
+   * @param name The control name to replace in the collection
+   * @param control Provides the control for the given name
    */
   setControl(name: string, control: AbstractControl): void {
     if (this.controls[name]) this.controls[name]._registerOnCollectionChange(() => {});
@@ -1039,35 +1202,47 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * Check whether there is an enabled control with the given name in the group.
    *
    * It will return false for disabled controls. If you'd like to check for existence in the group
    * only, use {@link AbstractControl#get get} instead.
+   *
+   * @param name The control name to check for existence in the collection
    */
   contains(controlName: string): boolean {
     return this.controls.hasOwnProperty(controlName) && this.controls[controlName].enabled;
   }
 
   /**
-   *  Sets the value of the `FormGroup`. It accepts an object that matches
-   *  the structure of the group, with control names as keys.
+   * @description
+   * Sets the value of the `FormGroup`. It accepts an object that matches
+   * the structure of the group, with control names as keys.
    *
-   *  ### Example
+   * ### Set the complete value for the form group
    *
-   *  ```
-   *  const form = new FormGroup({
-   *     first: new FormControl(),
-   *     last: new FormControl()
-   *  });
-   *  console.log(form.value);   // {first: null, last: null}
+   * ```
+   * const form = new FormGroup({
+   *   first: new FormControl(),
+   *   last: new FormControl()
+   * });
    *
-   *  form.setValue({first: 'Nancy', last: 'Drew'});
-   *  console.log(form.value);   // {first: 'Nancy', last: 'Drew'}
+   * console.log(form.value);   // {first: null, last: null}
    *
-   *  ```
+   * form.setValue({first: 'Nancy', last: 'Drew'});
+   * console.log(form.value);   // {first: 'Nancy', last: 'Drew'}
+   *
+   * ```
    * @throws This method performs strict checks, so it will throw an error if you try
    * to set the value of a control that doesn't exist or if you exclude the
    * value of a control.
+   *
+   * @param value The object that matches the structure of the group
+   * @param options Configure options that happen when the value is set
+   * * If `onlySelf` is true, this will **not** update the value and validity for all direct
+   * ancestors
+   * to maintain the model.
+   * * If `emitEvent` is false, `statusChanges` will not emit an event.
    */
   setValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
       void {
@@ -1080,13 +1255,14 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   *  Patches the value of the `FormGroup`. It accepts an object with control
-   *  names as keys, and will do its best to match the values to the correct controls
-   *  in the group.
+   * @description
+   * Patches the value of the `FormGroup`. It accepts an object with control
+   * names as keys, and will do its best to match the values to the correct controls
+   * in the group.
    *
-   *  It accepts both super-sets and sub-sets of the group without throwing an error.
+   * It accepts both super-sets and sub-sets of the group without throwing an error.
    *
-   *  ### Example
+   * ### Patch the value for a form group
    *
    *  ```
    *  const form = new FormGroup({
@@ -1099,6 +1275,13 @@ export class FormGroup extends AbstractControl {
    *  console.log(form.value);   // {first: 'Nancy', last: null}
    *
    *  ```
+   *
+   * @param value The object that matches the structure of the group
+   * @param options Configure options that happen when the value is patched
+   * * If `onlySelf` is true, this will **not** update the value and validity for all direct
+   * ancestors
+   * to maintain the model.
+   * * If `emitEvent` is false, `statusChanges` will not emit an event.
    */
   patchValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
       void {
@@ -1111,6 +1294,7 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * Resets the `FormGroup`. This means by default:
    *
    * * The group and all descendants are marked `pristine`
@@ -1122,18 +1306,30 @@ export class FormGroup extends AbstractControl {
    * can be a standalone value or a form state object with both a value and a disabled
    * status.
    *
-   * ### Example
+   * ### Reset the form group values
    *
    * ```ts
-   * this.form.reset({first: 'name', last: 'last name'});
+   * const form = new FormGroup({
+   *   first: new FormControl('first name'),
+   *   last: new FormControl('last name')
+   * });
    *
-   * console.log(this.form.value);  // {first: 'name', last: 'last name'}
+   * console.log(form.value);  // {first: 'first name', last: 'last name'}
+   *
+   * form.reset({ first: 'name', last: 'last name' });
+   *
+   * console.log(form.value);  // {first: 'name', last: 'last name'}
    * ```
    *
-   * - OR -
+   * ### Reset the form group values and disabled status
    *
    * ```
-   * this.form.reset({
+   * const form = new FormGroup({
+   *   first: new FormControl('first name'),
+   *   last: new FormControl('last name')
+   * });
+   *
+   * form.reset({
    *   first: {value: 'name', disabled: true},
    *   last: 'last'
    * });
@@ -1152,10 +1348,11 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
+   * @description
    * The aggregate value of the `FormGroup`, including any disabled controls.
    *
-   * If you'd like to include all values regardless of disabled status, use this method.
-   * Otherwise, the `value` property is the best way to get the value of the group.
+   * Retrieve all values regardless of disabled status.
+   * The `value` property is the best way to get the value of the group.
    */
   getRawValue(): any {
     return this._reduceChildren(
@@ -1264,10 +1461,11 @@ export class FormGroup extends AbstractControl {
  * `FormArray` is one of the three fundamental building blocks used to define forms in Angular,
  * along with `FormControl` and `FormGroup`.
  *
- * When instantiating a `FormArray`, pass in an array of child controls as the first
- * argument.
+ * * **npm package**: `@angular/forms`
  *
- * ### Example
+ * @usageNotes
+ *
+ * ### Create an array of form controls
  *
  * ```
  * const arr = new FormArray([
@@ -1279,6 +1477,8 @@ export class FormGroup extends AbstractControl {
  * console.log(arr.status);  // 'VALID'
  * ```
  *
+ * ### Create a form array with array-level validators
+ *
  * You can also include array-level validators and async validators. These come in handy
  * when you want to perform validation that considers the value of more than one child
  * control.
@@ -1292,6 +1492,8 @@ export class FormGroup extends AbstractControl {
  *   new FormControl('Drew')
  * ], {validators: myValidator, asyncValidators: myAsyncValidator});
  * ```
+ *
+  * ### Set the updateOn property for all controls in a form array
  *
  * The options object can also be used to set a default value for each child
  * control's `updateOn` property. If you set `updateOn` to `'blur'` at the
@@ -1299,12 +1501,12 @@ export class FormGroup extends AbstractControl {
  * has explicitly specified a different `updateOn` value.
  *
  * ```ts
- * const c = new FormArray([
+ * const arr = new FormArray([
  *    new FormControl()
  * ], {updateOn: 'blur'});
  * ```
  *
- * ### Adding or removing controls
+ * ### Adding or removing controls from a form array
  *
  * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
  * in `FormArray` itself. These methods ensure the controls are properly tracked in the
@@ -1312,11 +1514,25 @@ export class FormGroup extends AbstractControl {
  * the `FormArray` directly, as that will result in strange and unexpected behavior such
  * as broken change detection.
  *
- * * **npm package**: `@angular/forms`
- *
  *
  */
 export class FormArray extends AbstractControl {
+  /**
+  * @description
+  * Creates a new `FormArray` instance.
+  *
+  * @param controls An array of child controls. Each child control will be given an index
+  * wheh it is registered.
+  *
+  * @param validatorOrOpts Provides the control with one of three things:
+  * * a sync validator function
+  * * an array of sync validator functions
+  * * an options object containing optional validator and/or async validator functions and a
+  *validation trigger
+  *
+  * @param asyncValidator A single async validator or array of async validator functions
+  *
+  */
   constructor(
       public controls: AbstractControl[],
       validatorOrOpts?: ValidatorFn|ValidatorFn[]|AbstractControlOptions|null,
@@ -1331,12 +1547,18 @@ export class FormArray extends AbstractControl {
   }
 
   /**
+   * @description
    * Get the `AbstractControl` at the given `index` in the array.
+   *
+   * @param index Index in the array to retrieve the control
    */
   at(index: number): AbstractControl { return this.controls[index]; }
 
   /**
+   * @description
    * Insert a new `AbstractControl` at the end of the array.
+   *
+   * @param control Form control to be inserted
    */
   push(control: AbstractControl): void {
     this.controls.push(control);
@@ -1345,7 +1567,13 @@ export class FormArray extends AbstractControl {
     this._onCollectionChange();
   }
 
-  /** Insert a new `AbstractControl` at the given `index` in the array. */
+  /**
+   * @description
+   * Insert a new `AbstractControl` at the given `index` in the array.
+   *
+   * @param index Index in the array to insert the control
+   * @param control Form control to be inserted
+   */
   insert(index: number, control: AbstractControl): void {
     this.controls.splice(index, 0, control);
 
@@ -1353,7 +1581,12 @@ export class FormArray extends AbstractControl {
     this.updateValueAndValidity();
   }
 
-  /** Remove the control at the given `index` in the array. */
+  /**
+   * @description
+   * Remove the control at the given `index` in the array.
+   *
+   * @param index Index in the array to remove the control
+   */
   removeAt(index: number): void {
     if (this.controls[index]) this.controls[index]._registerOnCollectionChange(() => {});
     this.controls.splice(index, 1);
@@ -1361,7 +1594,11 @@ export class FormArray extends AbstractControl {
   }
 
   /**
+   * @description
    * Replace an existing control.
+   *
+   * @param index Index in the array to replace the control
+   * @param control The `AbstractControl` control to replace the existing control
    */
   setControl(index: number, control: AbstractControl): void {
     if (this.controls[index]) this.controls[index]._registerOnCollectionChange(() => {});
@@ -1377,30 +1614,41 @@ export class FormArray extends AbstractControl {
   }
 
   /**
+   * @description
    * Length of the control array.
    */
   get length(): number { return this.controls.length; }
 
   /**
-   *  Sets the value of the `FormArray`. It accepts an array that matches
-   *  the structure of the control.
+   * @description
+   * Sets the value of the `FormArray`. It accepts an array that matches
+   * the structure of the control.
    *
    * This method performs strict checks, so it will throw an error if you try
    * to set the value of a control that doesn't exist or if you exclude the
    * value of a control.
    *
-   *  ### Example
+   * ### Set the values for the controls in the form array
    *
-   *  ```
-   *  const arr = new FormArray([
-   *     new FormControl(),
-   *     new FormControl()
-   *  ]);
-   *  console.log(arr.value);   // [null, null]
+   * ```
+   * const arr = new FormArray([
+   *   new FormControl(),
+   *   new FormControl()
+   * ]);
+   * console.log(arr.value);   // [null, null]
    *
-   *  arr.setValue(['Nancy', 'Drew']);
-   *  console.log(arr.value);   // ['Nancy', 'Drew']
-   *  ```
+   * arr.setValue(['Nancy', 'Drew']);
+   * console.log(arr.value);   // ['Nancy', 'Drew']
+   * ```
+   *
+   * @param value Array of latest values for the controls
+   * @param options Configure options for emitting events when the control value changes
+   *
+   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormArray`
+   * and not its parent component. This defaults to false.
+   *
+   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormArray`
+   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
    */
   setValue(value: any[], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._checkAllValuesPresent(value);
@@ -1412,24 +1660,34 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   *  Patches the value of the `FormArray`. It accepts an array that matches the
-   *  structure of the control, and will do its best to match the values to the correct
-   *  controls in the group.
+   * @description
+   * Patches the value of the `FormArray`. It accepts an array that matches the
+   * structure of the control, and will do its best to match the values to the correct
+   * controls in the group.
    *
-   *  It accepts both super-sets and sub-sets of the array without throwing an error.
+   * It accepts both super-sets and sub-sets of the array without throwing an error.
    *
-   *  ### Example
+   * ### Patch the values for controls in a form array
    *
-   *  ```
-   *  const arr = new FormArray([
-   *     new FormControl(),
-   *     new FormControl()
-   *  ]);
-   *  console.log(arr.value);   // [null, null]
+   * ```
+   * const arr = new FormArray([
+   *    new FormControl(),
+   *    new FormControl()
+   * ]);
+   * console.log(arr.value);   // [null, null]
    *
-   *  arr.patchValue(['Nancy']);
-   *  console.log(arr.value);   // ['Nancy', null]
-   *  ```
+   * arr.patchValue(['Nancy']);
+   * console.log(arr.value);   // ['Nancy', null]
+   * ```
+   *
+   * @param value Array of latest values for the controls
+   * @param options Configure options for emitting events when the control value changes
+   *
+   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormArray`
+   * and not its parent component. This defaults to false.
+   *
+   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormArray`
+   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
    */
   patchValue(value: any[], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     value.forEach((newValue: any, index: number) => {
@@ -1441,6 +1699,7 @@ export class FormArray extends AbstractControl {
   }
 
   /**
+   * @description
    * Resets the `FormArray`. This means by default:
    *
    * * The array and all descendants are marked `pristine`
@@ -1451,15 +1710,19 @@ export class FormArray extends AbstractControl {
    * that matches the structure of the control. The state can be a standalone value
    * or a form state object with both a value and a disabled status.
    *
-   * ### Example
+   * ### Reset the values in a form array
    *
    * ```ts
-   * this.arr.reset(['name', 'last name']);
+   * const arr = new FormArray([
+   *    new FormControl(),
+   *    new FormControl()
+   * ]);
+   * arr.reset(['name', 'last name']);
    *
    * console.log(this.arr.value);  // ['name', 'last name']
    * ```
    *
-   * - OR -
+   * ### Reset the values in a form array and the disabled status for the first control
    *
    * ```
    * this.arr.reset([
@@ -1470,6 +1733,15 @@ export class FormArray extends AbstractControl {
    * console.log(this.arr.value);  // ['name', 'last name']
    * console.log(this.arr.get(0).status);  // 'DISABLED'
    * ```
+   *
+   * @param value Array of latest values for the controls
+   * @param options Configure options for emitting events when the control value changes
+   *
+   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormArray`
+   * and not its parent component. This defaults to false.
+   *
+   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormArray`
+   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
    */
   reset(value: any = [], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._forEachChild((control: AbstractControl, index: number) => {
@@ -1481,6 +1753,7 @@ export class FormArray extends AbstractControl {
   }
 
   /**
+   * @description
    * The aggregate value of the array, including any disabled controls.
    *
    * If you'd like to include all values regardless of disabled status, use this method.

From 43e61c25e1d0c634a6d6ba49fff02cbfddddeaa1 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 6 Jun 2018 12:17:30 -0500
Subject: [PATCH 305/582] docs(docs-infra): Update with review changes (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 256 ++++++++++++++++++------------------
 1 file changed, 125 insertions(+), 131 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index a94e12839a..775a2d97d1 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -161,14 +161,14 @@ export abstract class AbstractControl {
   /**
    * @description
    * The validation status of the control. There are four possible
-   * validation statuses:
+   * validation status values:
    *
-   * * **VALID**:  control has passed all validation checks
-   * * **INVALID**: control has failed at least one validation check
-   * * **PENDING**: control is in the midst of conducting a validation check
-   * * **DISABLED**: control is exempt from validation checks
+   * * **VALID**: This control has passed all validation checks.
+   * * **INVALID**: This control has failed at least one validation check.
+   * * **PENDING**: This control is in the midst of conducting a validation check.
+   * * **DISABLED**: This control is exempt from validation checks.
    *
-   * These statuses are mutually exclusive, so a control cannot be
+   * These status values are mutually exclusive, so a control cannot be
    * both valid AND invalid or invalid AND disabled.
    */
   public readonly status: string;
@@ -177,8 +177,8 @@ export abstract class AbstractControl {
    * @description
    * A control is `valid` when its `status` is `VALID`.
    *
-   * In order to have this status, the control must have passed all its
-   * validation checks.
+   * True if the control has passed all of its validation tests, 
+   * false otherwise.
    */
   get valid(): boolean { return this.status === VALID; }
 
@@ -186,8 +186,8 @@ export abstract class AbstractControl {
    * @description
    * A control is `invalid` when its `status` is `INVALID`.
    *
-   * In order to have this status, the control must have failed
-   * at least one of its validation checks.
+   * True if this control has failed one or more of its validation checks,
+   * false otherwise.
    */
   get invalid(): boolean { return this.status === INVALID; }
 
@@ -195,15 +195,17 @@ export abstract class AbstractControl {
    * @description
    * A control is `pending` when its `status` is `PENDING`.
    *
-   * In order to have this status, the control must be in the
-   * middle of conducting a validation check.
+   * True if this control is in the process of conducting a validation check, 
+   * false otherwise.
    */
   get pending(): boolean { return this.status == PENDING; }
 
   /**
    * @description
    * A control is `disabled` when its `status` is `DISABLED`.
-   *
+   * 
+   * True if the control is disabled, false otherwise.
+   * 
    * Disabled controls are exempt from validation checks and
    * are not included in the aggregate value of their ancestor
    * controls.
@@ -213,16 +215,17 @@ export abstract class AbstractControl {
   /**
    * @description
    * A control is `enabled` as long as its `status` is not `DISABLED`.
-   *
-   * In other words, it has a status of `VALID`, `INVALID`, or
-   * `PENDING`.
+   * 
+   * True if the control has any status other than 'DISABLED', 
+   * false if the status is 'DISABLED'.
+   * 
    */
   get enabled(): boolean { return this.status !== DISABLED; }
 
   /**
    * @description
-   * Returns any errors generated by failing validation. If there
-   * are no errors, it will return null.
+   * An object containing any errors generated by failing validation,
+   * or null if there are no errors.
    */
   public readonly errors: ValidationErrors|null;
 
@@ -231,8 +234,8 @@ export abstract class AbstractControl {
    * A control is `pristine` if the user has not yet changed
    * the value in the UI.
    *
-   * Programmatic changes to a control's value will
-   * **not** mark it dirty.
+   * True if the user has not yet changed the value in the UI; compare `dirty`.
+   * Programmatic changes to a control's value do not mark it dirty.
    */
   public readonly pristine: boolean = true;
 
@@ -241,8 +244,8 @@ export abstract class AbstractControl {
    * A control is `dirty` if the user has changed the value
    * in the UI.
    *
-   * Programmatic changes to a control's value will
-   * **not** mark it dirty.
+   * True if the user has changed the value of this control in the UI; compare `pristine`.
+   * Programmatic changes to a control's value do not mark it dirty.
    */
   get dirty(): boolean { return !this.pristine; }
 
@@ -262,21 +265,21 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Emits an event every time the value of the control changes, in
+   * An observable that emits an event every time the value of the control changes, in
    * the UI or programmatically.
    */
   public readonly valueChanges: Observable<any>;
 
   /**
    * @description
-   * Emits an event every time the validation status of the control
+   * An observable that emits an event every time the validation `status` of the control
    * is re-calculated.
    */
   public readonly statusChanges: Observable<any>;
 
   /**
    * @description
-   * Returns the update strategy of the `AbstractControl` (i.e.
+   * Reports the update strategy of the `AbstractControl` (i.e.
    * the event on which the control will update itself).
    * Possible values: `'change'` | `'blur'` | `'submit'`
    * Default value: `'change'`
@@ -319,9 +322,9 @@ export abstract class AbstractControl {
    * @description
    * Marks the control as `touched`.
    *
-   *  @param opts Configure options that happen when marked as touched
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `touched`
-   * to maintain the model. Defaults to false
+   *  @param opts Configuration options that how marking is applied.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
    */
   markAsTouched(opts: {onlySelf?: boolean} = {}): void {
     (this as{touched: boolean}).touched = true;
@@ -339,9 +342,9 @@ export abstract class AbstractControl {
    * to maintain the model, and re-calculate the `touched` status of all parent
    * controls.
    *
-   *  @param opts Configure options that happen when marked as untouched
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `touched`
-   * to maintain the model. Defaults to false
+   *  @param opts Configuration options that how marking is applied.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
    */
   markAsUntouched(opts: {onlySelf?: boolean} = {}): void {
     (this as{touched: boolean}).touched = false;
@@ -359,9 +362,9 @@ export abstract class AbstractControl {
    * @description
    * Marks the control as `dirty`.
    *
-   *  @param opts Configure options that happen when marked as dirty
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `dirty` to maintain
-   * to maintain the model. Defaults to false
+   *  @param opts Configuration options that how marking is applied.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
    */
   markAsDirty(opts: {onlySelf?: boolean} = {}): void {
     (this as{pristine: boolean}).pristine = false;
@@ -379,9 +382,9 @@ export abstract class AbstractControl {
    * to maintain the model, and re-calculate the `pristine` status of all parent
    * controls.
    *
-   *  @param opts Configure options that happen when marked as pristine
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `pristine`
-   * to maintain the model. Defaults to false
+   *  @param opts Configuration options that how marking is applied.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
    */
   markAsPristine(opts: {onlySelf?: boolean} = {}): void {
     (this as{pristine: boolean}).pristine = true;
@@ -400,10 +403,11 @@ export abstract class AbstractControl {
    *
    * An event will be emitted by `statusChanges` by default.
    *
-   *  @param opts Configure options that happen when marked as untouched
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `untouched`
-   * to maintain the model.
-   * * If `emitEvent` is false, `statusChanges` will not emit an event.
+   *  @param opts Configuration options that how marking is applied.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
+   * * `emitEvent`: When false, `statusChanges` will not emit an event.
+   * 
    */
   markAsPending(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = PENDING;
@@ -424,10 +428,11 @@ export abstract class AbstractControl {
    *
    * If the control has children, all children will be disabled to maintain the model.
    *
-   *  @param opts Configure options that happen when disabled
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `disabled`
-   * to maintain the model.
-   * * If `emitEvent` is false, `statusChanges` and `valueChanges` will not emit an event.
+   *  @param opts Configuration options that how marking is applied.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
+   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event. Otherwise,
+   * both Observables will emit a status and value event.
    */
   disable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = DISABLED;
@@ -451,12 +456,13 @@ export abstract class AbstractControl {
    * the aggregate value of its parent. Its status is re-calculated based on its value and
    * its validators.
    *
-   * If the control has children, all children will be enabled.
+   * By default, if the control has children, all children will be enabled.
    *
    *  @param opts Configure options that happen when marked as untouched
-   * * If `onlySelf` is true, this will **not** mark all direct ancestors as `disabled`
-   * to maintain the model.
-   * * If `emitEvent` is false, `statusChanges` and `valueChanges` will not emit an event.
+   * * `onlySelf`: When true, mark only this control. When false or not supplied,
+   * marks all direct ancestors, in order to maintain the model.
+   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event. Otherwise,
+   * both Observables will emit a status and value event.
    */
   enable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = VALID;
@@ -505,10 +511,12 @@ export abstract class AbstractControl {
    *
    * By default, it will also update the value and validity of its ancestors.
    *
-   * @param opts Configure options that happen when the value and validity change
-   * * If `onlySelf` is true, this will **not** update all direct ancestors
-   * to maintain the model.
-   * * If `emitEvent` is false, `statusChanges` and `valueChanges` will **not** emit an event.
+   * @param opts Configuration options that control events after updating and
+   * validity checks are applied.
+   * * `onlySelf`: When true, only update this control. When false or not supplied,
+   * update all direct ancestors, in order to maintain the model.
+   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event. Otherwise,
+   * both Observables will emit a status and value event.
    */
   updateValueAndValidity(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._setInitialStatus();
@@ -613,12 +621,11 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Returns error data if the control with the given path has the error specified. Otherwise
-   * returns null or undefined.
+   * Reports error data for a specific error occurring in this control or in another control.
    *
-   * @param errorCode The error code to be retrieved
-   * @param path The path to the control. If no path is given, it checks for the error on the
-   * present control.
+   * @param errorCode The error code for which to retrieve data
+   * @param path The path to a control to check. If not supplied, checks for the error in this control.
+   * @returns The error data if the control with the given path has the given error, otherwise null or undefined.
    */
   getError(errorCode: string, path?: string[]): any {
     const control = path ? this.get(path) : this;
@@ -627,12 +634,11 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Returns true if the control with the given path has the error specified. Otherwise
-   * returns false.
+   * Reports whether the control with the given path has the error specified.
    *
-   * @param errorCode The error code to be retrieved
-   * @param path The path to the control. If no path is given, it checks for the error on the
-   * present control.
+   * @param errorCode The error code for which to retrieve data
+   * @param path The path to a control to check. If not supplied, checks for the error in this control.
+   * @returns True when the control with the given path has the error, otherwise false.
    */
   hasError(errorCode: string, path?: string[]): boolean { return !!this.getError(errorCode, path); }
 
@@ -755,8 +761,6 @@ export abstract class AbstractControl {
  * implements most of the base functionality for accessing the value, validation status, 
  * user interactions and events.
  * 
- * **npm package**: `@angular/forms`
- * 
  * @see `AbstractControl`
  * @see [Reactive Forms Guide](guide/reactive-forms)
  * @see [Usage Notes](#usage-notes)
@@ -857,16 +861,13 @@ export class FormControl extends AbstractControl {
   * @description
   * Creates a new `FormControl` instance.
   *
-  * @param formState Provides the control with an initial state in two ways:
-  * * with an initial value
-  * * with an object defining the initial value, disabled status and when updates and validation are
-  *handled.
+  * @param formState Initializes the control with an initial state value, 
+  * or with an object that defines the initial value, status, and options 
+  * for handling updates and validation.
   *
-  * @param validatorOrOpts Provides the control with one of three things:
-  * * a sync validator function
-  * * an array of sync validator functions
-  * * an options object containing optional validator and/or async validator functions and a
-  *validation trigger
+  * @param validatorOrOpts A synchronous validator function, or an array of 
+  * such functions, or an `AbstractControlOptions` object that contains validation functions 
+  * and a validation trigger.
   *
   * @param asyncValidator A single async validator or array of async validator functions
   *
@@ -886,23 +887,17 @@ export class FormControl extends AbstractControl {
 
   /**
    * @description
-   * Sets the latest value form the form control.
+   * Sets a new value for the form control.
    *
-   * @param value The latest value for the control
-   * @param options Configure options for emitting events when the control value changes
+   * @param value The new value for the control.
+   * @param options Configuration options for how the control emits events when the value changes.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    *
-   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormControl`
-   * and not its parent component. This defaults to false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `emitModelToViewChange`: When true (the default), each change triggers an `onChange` event to update the view.
+   * * `emitViewToModelChange`: When true (the default), each change triggers an `ngModelChange` event to update the model.
    *
-   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormControl`
-   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
-   *
-   * * If `emitModelToViewChange` is `true`, the view will be notified about the new value
-   * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
-   * specified.
-   *
-   * * If `emitViewToModelChange` is `true`, an ngModelChange event will be fired to update the
-   * model.  This is the default behavior if `emitViewToModelChange` is not specified.
    */
   setValue(value: any, options: {
     onlySelf?: boolean,
@@ -925,6 +920,8 @@ export class FormControl extends AbstractControl {
    * This function is functionally the same as {@link FormControl#setValue setValue} at this level.
    * It exists for symmetry with {@link FormGroup#patchValue patchValue} on `FormGroups` and
    * `FormArrays`, where it does behave differently.
+   * 
+   * @see See `setValue` for options
    */
   patchValue(value: any, options: {
     onlySelf?: boolean,
@@ -945,18 +942,14 @@ export class FormControl extends AbstractControl {
    * * it is marked as `untouched`
    * * value is set to null
    *
-   * @param formState Provides the control with an initial state in two ways:
-   * * with an initial value
-   * * with an object defining the initial value, disabled status and when updates and validation
-   * are handled.
+   * @param formState Initializes the control with an initial state value, 
+   * or with an object that defines the initial value, status, and options 
+   * for handling updates and validation.
    *
-   * @param options Configure options for emitting events when the control value changes
+   * @param options Configuration options for emitting events when the control value changes.
    *
-   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormControl`
-   * and not its parent component. This defaults to false.
-   *
-   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormControl`
-   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
    *
    */
   reset(formState: any = null, options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -1044,7 +1037,7 @@ export class FormControl extends AbstractControl {
  * Tracks the value and validity state of a group of `FormControl` instances.
  *
  * A `FormGroup` aggregates the values of each child `FormControl` into one object,
- * with each control name as the key.  It calculates its status by reducing the statuses
+ * with each control name as the key.  It calculates its status by reducing the status values
  * of its children. For example, if one of the controls in a group is invalid, the entire
  * group becomes invalid.
  *
@@ -1054,8 +1047,6 @@ export class FormControl extends AbstractControl {
  * When instantiating a `FormGroup`, pass in a collection of child controls as the first
  * argument. The key for each child will be the name under which it is registered.
  *
- * * **npm package**: `@angular/forms`
- *
  * @usageNotes
  *
  * ### Create a form group with 2 controls
@@ -1117,14 +1108,12 @@ export class FormGroup extends AbstractControl {
   * @description
   * Creates a new `FormGroup` instance.
   *
-  * @param controls A collection of child controls. The key for each child will be the name
+  * @param controls A collection of child controls. The key for each child is the name
   * under which it is registered.
   *
-  * @param validatorOrOpts Provides the control with one of three things:
-  * * a sync validator function
-  * * an array of sync validator functions
-  * * an options object containing optional validator and/or async validator functions and a
-  *validation trigger
+  * @param validatorOrOpts A synchronous validator function, or an array of 
+  * such functions, or an `AbstractControlOptions` object that contains validation functions 
+  * and a validation trigger.
   *
   * @param asyncValidator A single async validator or array of async validator functions
   *
@@ -1146,8 +1135,8 @@ export class FormGroup extends AbstractControl {
    * @description
    * Registers a control with the group's list of controls.
    *
-   * This method does not update the value or validity of the control, so for most cases you'll want
-   * to use {@link FormGroup#addControl addControl} instead.
+   * This method does not update the value or validity of the control.
+   * Use {@link FormGroup#addControl addControl} instead.
    *
    * @param name The control name to register in the collection
    * @param control Provides the control for the given name
@@ -1163,6 +1152,8 @@ export class FormGroup extends AbstractControl {
   /**
    * @description
    * Add a control to this group.
+   * 
+   * This method also updates the value and validity of the control.
    *
    * @param name The control name to add to the collection
    * @param control Provides the control for the given name
@@ -1233,16 +1224,15 @@ export class FormGroup extends AbstractControl {
    * console.log(form.value);   // {first: 'Nancy', last: 'Drew'}
    *
    * ```
-   * @throws This method performs strict checks, so it will throw an error if you try
-   * to set the value of a control that doesn't exist or if you exclude the
-   * value of a control.
+   * @throws When strict checks fail, such as setting the value of a control 
+   * that doesn't exist or if you excluding the value of a control.
    *
-   * @param value The object that matches the structure of the group
-   * @param options Configure options that happen when the value is set
-   * * If `onlySelf` is true, this will **not** update the value and validity for all direct
-   * ancestors
-   * to maintain the model.
-   * * If `emitEvent` is false, `statusChanges` will not emit an event.
+   * @param value The new value for the control that matches the structure of the group.
+   * @param options Configuration options for how the control emits events when the value changes.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   *
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
    */
   setValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
       void {
@@ -1278,10 +1268,9 @@ export class FormGroup extends AbstractControl {
    *
    * @param value The object that matches the structure of the group
    * @param options Configure options that happen when the value is patched
-   * * If `onlySelf` is true, this will **not** update the value and validity for all direct
-   * ancestors
-   * to maintain the model.
-   * * If `emitEvent` is false, `statusChanges` will not emit an event.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    */
   patchValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
       void {
@@ -1305,6 +1294,15 @@ export class FormGroup extends AbstractControl {
    * that matches the structure of your form, with control names as keys. The state
    * can be a standalone value or a form state object with both a value and a disabled
    * status.
+   * 
+   * @param value Initializes the control with an initial state value, 
+   * or with an object that defines the initial value, status, 
+   * and options for handling updates and validation.
+   * 
+   * @param options Configuration options that happen when the group is reset.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    *
    * ### Reset the form group values
    *
@@ -1351,7 +1349,7 @@ export class FormGroup extends AbstractControl {
    * @description
    * The aggregate value of the `FormGroup`, including any disabled controls.
    *
-   * Retrieve all values regardless of disabled status.
+   * Retrieves all values regardless of disabled status.
    * The `value` property is the best way to get the value of the group.
    */
   getRawValue(): any {
@@ -1455,14 +1453,12 @@ export class FormGroup extends AbstractControl {
  * `FormGroup` or `FormArray` instances.
  *
  * A `FormArray` aggregates the values of each child `FormControl` into an array.
- * It calculates its status by reducing the statuses of its children. For example, if one of
+ * It calculates its status by reducing the status values of its children. For example, if one of
  * the controls in a `FormArray` is invalid, the entire array becomes invalid.
  *
  * `FormArray` is one of the three fundamental building blocks used to define forms in Angular,
  * along with `FormControl` and `FormGroup`.
  *
- * * **npm package**: `@angular/forms`
- *
  * @usageNotes
  *
  * ### Create an array of form controls
@@ -1524,11 +1520,9 @@ export class FormArray extends AbstractControl {
   * @param controls An array of child controls. Each child control will be given an index
   * wheh it is registered.
   *
-  * @param validatorOrOpts Provides the control with one of three things:
-  * * a sync validator function
-  * * an array of sync validator functions
-  * * an options object containing optional validator and/or async validator functions and a
-  *validation trigger
+  * @param validatorOrOpts A synchronous validator function, or an array of 
+  * such functions, or an `AbstractControlOptions` object that contains validation functions 
+  * and a validation trigger.
   *
   * @param asyncValidator A single async validator or array of async validator functions
   *

From 9d114c052a366014c14a0e327b7d1defef61d1a4 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 7 Jun 2018 13:31:25 -0500
Subject: [PATCH 306/582] docs: More form control API references fixes (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 67 +++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index 775a2d97d1..b614807540 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -13,24 +13,33 @@ import {AsyncValidatorFn, ValidationErrors, ValidatorFn} from './directives/vali
 import {toObservable} from './validators';
 
 /**
- * Indicates that a FormControl is valid, i.e. that no errors exist in the input value.
+ * @description
+ * Reports that a FormControl is valid, in that no errors exist in the input value.
+ *
  */
 export const VALID = 'VALID';
 
 /**
- * Indicates that a FormControl is invalid, i.e. that an error exists in the input value.
+ * @description
+ * Reports that a FormControl is invalid, in that an error exists in the input value.
  */
 export const INVALID = 'INVALID';
 
 /**
- * Indicates that a FormControl is pending, i.e. that async validation is occurring and
+ * @description
+ * Reports that a FormControl is pending, in that that async validation is occurring and
  * errors are not yet available for the input value.
+ * 
+ * @see `markAsPending`
  */
 export const PENDING = 'PENDING';
 
 /**
- * Indicates that a FormControl is disabled, i.e. that the control is exempt from ancestor
+ * @description
+ * Reports that a FormControl is disabled, i.e. that the control is exempt from ancestor
  * calculations of validity or value.
+ * 
+ * @see `markAsDisabled`
  */
 export const DISABLED = 'DISABLED';
 
@@ -140,6 +149,13 @@ export abstract class AbstractControl {
 
   private _parent: FormGroup|FormArray;
   private _asyncValidationSubscription: any;
+
+  /**
+   * @description
+   * Reports the current value of the control. Only includes
+   * the values of enabled controls.
+   * 
+   */
   public readonly value: any;
 
   /**
@@ -320,7 +336,8 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Marks the control as `touched`.
+   * Marks the control as `touched`. A control is touched by focus and
+   * blur events that do not change the value; compare markAsDirty
    *
    *  @param opts Configuration options that how marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
@@ -360,7 +377,8 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Marks the control as `dirty`.
+   * Marks the control as `dirty`. A control is dirty by changing 
+   * the control; compare `markAsTouched`
    *
    *  @param opts Configuration options that how marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
@@ -1304,6 +1322,8 @@ export class FormGroup extends AbstractControl {
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    *
+   * @usageNotes
+   * 
    * ### Reset the form group values
    *
    * ```ts
@@ -1350,7 +1370,8 @@ export class FormGroup extends AbstractControl {
    * The aggregate value of the `FormGroup`, including any disabled controls.
    *
    * Retrieves all values regardless of disabled status.
-   * The `value` property is the best way to get the value of the group.
+   * The `value` property is the best way to get the value of the group, because
+   * it excludes disabled controls in the `FormGroup`.
    */
   getRawValue(): any {
     return this._reduceChildren(
@@ -1635,14 +1656,12 @@ export class FormArray extends AbstractControl {
    * console.log(arr.value);   // ['Nancy', 'Drew']
    * ```
    *
-   * @param value Array of latest values for the controls
+   * @param value Array of values for the controls
    * @param options Configure options for emitting events when the control value changes
    *
-   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormArray`
-   * and not its parent component. This defaults to false.
-   *
-   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormArray`
-   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    */
   setValue(value: any[], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._checkAllValuesPresent(value);
@@ -1677,11 +1696,9 @@ export class FormArray extends AbstractControl {
    * @param value Array of latest values for the controls
    * @param options Configure options for emitting events when the control value changes
    *
-   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormArray`
-   * and not its parent component. This defaults to false.
-   *
-   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormArray`
-   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    */
   patchValue(value: any[], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     value.forEach((newValue: any, index: number) => {
@@ -1728,14 +1745,12 @@ export class FormArray extends AbstractControl {
    * console.log(this.arr.get(0).status);  // 'DISABLED'
    * ```
    *
-   * @param value Array of latest values for the controls
+   * @param value Array of values for the controls
    * @param options Configure options for emitting events when the control value changes
    *
-   * * If `onlySelf` is `true`, this change will only affect the validation of this `FormArray`
-   * and not its parent component. This defaults to false.
-   *
-   * * If `emitEvent` is `true`, this change will cause a `valueChanges` event on the `FormArray`
-   * to be emitted. This defaults to true (as it falls through to `updateValueAndValidity`).
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
    */
   reset(value: any = [], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._forEachChild((control: AbstractControl, index: number) => {
@@ -1750,8 +1765,8 @@ export class FormArray extends AbstractControl {
    * @description
    * The aggregate value of the array, including any disabled controls.
    *
-   * If you'd like to include all values regardless of disabled status, use this method.
-   * Otherwise, the `value` property is the best way to get the value of the array.
+   * Reports all values regardless of disabled status.
+   * For enabled controls only, the `value` property is the best way to get the value of the array.
    */
   getRawValue(): any[] {
     return this.controls.map((control: AbstractControl) => {

From 3e26cabe024ff77a8a9b3c559621e326b3d0dd7d Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 7 Jun 2018 13:37:01 -0500
Subject: [PATCH 307/582] docs: formatting (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 123 +++++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 50 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index b614807540..bfff7a7c3a 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -154,7 +154,7 @@ export abstract class AbstractControl {
    * @description
    * Reports the current value of the control. Only includes
    * the values of enabled controls.
-   * 
+   *
    */
   public readonly value: any;
 
@@ -193,7 +193,7 @@ export abstract class AbstractControl {
    * @description
    * A control is `valid` when its `status` is `VALID`.
    *
-   * True if the control has passed all of its validation tests, 
+   * True if the control has passed all of its validation tests,
    * false otherwise.
    */
   get valid(): boolean { return this.status === VALID; }
@@ -211,7 +211,7 @@ export abstract class AbstractControl {
    * @description
    * A control is `pending` when its `status` is `PENDING`.
    *
-   * True if this control is in the process of conducting a validation check, 
+   * True if this control is in the process of conducting a validation check,
    * false otherwise.
    */
   get pending(): boolean { return this.status == PENDING; }
@@ -219,9 +219,9 @@ export abstract class AbstractControl {
   /**
    * @description
    * A control is `disabled` when its `status` is `DISABLED`.
-   * 
+   *
    * True if the control is disabled, false otherwise.
-   * 
+   *
    * Disabled controls are exempt from validation checks and
    * are not included in the aggregate value of their ancestor
    * controls.
@@ -231,10 +231,10 @@ export abstract class AbstractControl {
   /**
    * @description
    * A control is `enabled` as long as its `status` is not `DISABLED`.
-   * 
-   * True if the control has any status other than 'DISABLED', 
+   *
+   * True if the control has any status other than 'DISABLED',
    * false if the status is 'DISABLED'.
-   * 
+   *
    */
   get enabled(): boolean { return this.status !== DISABLED; }
 
@@ -377,7 +377,7 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Marks the control as `dirty`. A control is dirty by changing 
+   * Marks the control as `dirty`. A control is dirty by changing
    * the control; compare `markAsTouched`
    *
    *  @param opts Configuration options that how marking is applied.
@@ -425,7 +425,7 @@ export abstract class AbstractControl {
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
    * * `emitEvent`: When false, `statusChanges` will not emit an event.
-   * 
+   *
    */
   markAsPending(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = PENDING;
@@ -449,7 +449,8 @@ export abstract class AbstractControl {
    *  @param opts Configuration options that how marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event. Otherwise,
+   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event.
+   * Otherwise,
    * both Observables will emit a status and value event.
    */
   disable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -479,7 +480,8 @@ export abstract class AbstractControl {
    *  @param opts Configure options that happen when marked as untouched
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event. Otherwise,
+   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event.
+   * Otherwise,
    * both Observables will emit a status and value event.
    */
   enable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -533,7 +535,8 @@ export abstract class AbstractControl {
    * validity checks are applied.
    * * `onlySelf`: When true, only update this control. When false or not supplied,
    * update all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event. Otherwise,
+   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event.
+   * Otherwise,
    * both Observables will emit a status and value event.
    */
   updateValueAndValidity(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -642,8 +645,10 @@ export abstract class AbstractControl {
    * Reports error data for a specific error occurring in this control or in another control.
    *
    * @param errorCode The error code for which to retrieve data
-   * @param path The path to a control to check. If not supplied, checks for the error in this control.
-   * @returns The error data if the control with the given path has the given error, otherwise null or undefined.
+   * @param path The path to a control to check. If not supplied, checks for the error in this
+   * control.
+   * @returns The error data if the control with the given path has the given error, otherwise null
+   * or undefined.
    */
   getError(errorCode: string, path?: string[]): any {
     const control = path ? this.get(path) : this;
@@ -655,7 +660,8 @@ export abstract class AbstractControl {
    * Reports whether the control with the given path has the error specified.
    *
    * @param errorCode The error code for which to retrieve data
-   * @param path The path to a control to check. If not supplied, checks for the error in this control.
+   * @param path The path to a control to check. If not supplied, checks for the error in this
+   * control.
    * @returns True when the control with the given path has the error, otherwise false.
    */
   hasError(errorCode: string, path?: string[]): boolean { return !!this.getError(errorCode, path); }
@@ -879,12 +885,12 @@ export class FormControl extends AbstractControl {
   * @description
   * Creates a new `FormControl` instance.
   *
-  * @param formState Initializes the control with an initial state value, 
-  * or with an object that defines the initial value, status, and options 
+  * @param formState Initializes the control with an initial state value,
+  * or with an object that defines the initial value, status, and options
   * for handling updates and validation.
   *
-  * @param validatorOrOpts A synchronous validator function, or an array of 
-  * such functions, or an `AbstractControlOptions` object that contains validation functions 
+  * @param validatorOrOpts A synchronous validator function, or an array of
+  * such functions, or an `AbstractControlOptions` object that contains validation functions
   * and a validation trigger.
   *
   * @param asyncValidator A single async validator or array of async validator functions
@@ -909,12 +915,16 @@ export class FormControl extends AbstractControl {
    *
    * @param value The new value for the control.
    * @param options Configuration options for how the control emits events when the value changes.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * * `emitModelToViewChange`: When true (the default), each change triggers an `onChange` event to update the view.
-   * * `emitViewToModelChange`: When true (the default), each change triggers an `ngModelChange` event to update the model.
+   * * `emitModelToViewChange`: When true (the default), each change triggers an `onChange` event to
+   * update the view.
+   * * `emitViewToModelChange`: When true (the default), each change triggers an `ngModelChange`
+   * event to update the model.
    *
    */
   setValue(value: any, options: {
@@ -960,13 +970,14 @@ export class FormControl extends AbstractControl {
    * * it is marked as `untouched`
    * * value is set to null
    *
-   * @param formState Initializes the control with an initial state value, 
-   * or with an object that defines the initial value, status, and options 
+   * @param formState Initializes the control with an initial state value,
+   * or with an object that defines the initial value, status, and options
    * for handling updates and validation.
    *
    * @param options Configuration options for emitting events when the control value changes.
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
    *
    */
@@ -1129,8 +1140,8 @@ export class FormGroup extends AbstractControl {
   * @param controls A collection of child controls. The key for each child is the name
   * under which it is registered.
   *
-  * @param validatorOrOpts A synchronous validator function, or an array of 
-  * such functions, or an `AbstractControlOptions` object that contains validation functions 
+  * @param validatorOrOpts A synchronous validator function, or an array of
+  * such functions, or an `AbstractControlOptions` object that contains validation functions
   * and a validation trigger.
   *
   * @param asyncValidator A single async validator or array of async validator functions
@@ -1170,7 +1181,7 @@ export class FormGroup extends AbstractControl {
   /**
    * @description
    * Add a control to this group.
-   * 
+   *
    * This method also updates the value and validity of the control.
    *
    * @param name The control name to add to the collection
@@ -1242,14 +1253,16 @@ export class FormGroup extends AbstractControl {
    * console.log(form.value);   // {first: 'Nancy', last: 'Drew'}
    *
    * ```
-   * @throws When strict checks fail, such as setting the value of a control 
+   * @throws When strict checks fail, such as setting the value of a control
    * that doesn't exist or if you excluding the value of a control.
    *
    * @param value The new value for the control that matches the structure of the group.
    * @param options Configuration options for how the control emits events when the value changes.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
    */
   setValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
@@ -1286,9 +1299,11 @@ export class FormGroup extends AbstractControl {
    *
    * @param value The object that matches the structure of the group
    * @param options Configure options that happen when the value is patched
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    */
   patchValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
       void {
@@ -1312,18 +1327,20 @@ export class FormGroup extends AbstractControl {
    * that matches the structure of your form, with control names as keys. The state
    * can be a standalone value or a form state object with both a value and a disabled
    * status.
-   * 
-   * @param value Initializes the control with an initial state value, 
-   * or with an object that defines the initial value, status, 
+   *
+   * @param value Initializes the control with an initial state value,
+   * or with an object that defines the initial value, status,
    * and options for handling updates and validation.
-   * 
+   *
    * @param options Configuration options that happen when the group is reset.
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    *
    * @usageNotes
-   * 
+   *
    * ### Reset the form group values
    *
    * ```ts
@@ -1541,8 +1558,8 @@ export class FormArray extends AbstractControl {
   * @param controls An array of child controls. Each child control will be given an index
   * wheh it is registered.
   *
-  * @param validatorOrOpts A synchronous validator function, or an array of 
-  * such functions, or an `AbstractControlOptions` object that contains validation functions 
+  * @param validatorOrOpts A synchronous validator function, or an array of
+  * such functions, or an `AbstractControlOptions` object that contains validation functions
   * and a validation trigger.
   *
   * @param asyncValidator A single async validator or array of async validator functions
@@ -1659,9 +1676,11 @@ export class FormArray extends AbstractControl {
    * @param value Array of values for the controls
    * @param options Configure options for emitting events when the control value changes
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    */
   setValue(value: any[], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._checkAllValuesPresent(value);
@@ -1696,9 +1715,11 @@ export class FormArray extends AbstractControl {
    * @param value Array of latest values for the controls
    * @param options Configure options for emitting events when the control value changes
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    */
   patchValue(value: any[], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     value.forEach((newValue: any, index: number) => {
@@ -1748,9 +1769,11 @@ export class FormArray extends AbstractControl {
    * @param value Array of values for the controls
    * @param options Configure options for emitting events when the control value changes
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is false.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
+   * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity updateValueAndValidity} method.
+   * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
+   * updateValueAndValidity} method.
    */
   reset(value: any = [], options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._forEachChild((control: AbstractControl, index: number) => {

From efc7639352cd9dea8aeb6de620999ea1dd37975a Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 7 Jun 2018 13:41:26 -0500
Subject: [PATCH 308/582] docs: Added multicast to observable descriptions
 (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index bfff7a7c3a..1a960409ba 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -281,14 +281,14 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * An observable that emits an event every time the value of the control changes, in
+   * A multicasted observable that emits an event every time the value of the control changes, in
    * the UI or programmatically.
    */
   public readonly valueChanges: Observable<any>;
 
   /**
    * @description
-   * An observable that emits an event every time the validation `status` of the control
+   * A multicasted observable that emits an event every time the validation `status` of the control
    * is re-calculated.
    */
   public readonly statusChanges: Observable<any>;

From a57825acf35ff0fbc908e9110f23113e41bce188 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Mon, 11 Jun 2018 14:24:00 -0500
Subject: [PATCH 309/582] docs: More form control API edits (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 257 ++++++++++++++++++++----------------
 1 file changed, 141 insertions(+), 116 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index 1a960409ba..4be897b5e3 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -14,32 +14,37 @@ import {toObservable} from './validators';
 
 /**
  * @description
- * Reports that a FormControl is valid, in that no errors exist in the input value.
+ * Reports that a FormControl is valid, meaning that no errors exist in the input value.
  *
+ * @see `status`
  */
 export const VALID = 'VALID';
 
 /**
  * @description
- * Reports that a FormControl is invalid, in that an error exists in the input value.
+ * Reports that a FormControl is invalid, meaning that an error exists in the input value.
+ * 
+ * @see `status`
  */
 export const INVALID = 'INVALID';
 
 /**
  * @description
- * Reports that a FormControl is pending, in that that async validation is occurring and
+ * Reports that a FormControl is pending, meaning that that async validation is occurring and
  * errors are not yet available for the input value.
  * 
  * @see `markAsPending`
+ * @see `status`
  */
 export const PENDING = 'PENDING';
 
 /**
  * @description
- * Reports that a FormControl is disabled, i.e. that the control is exempt from ancestor
+ * Reports that a FormControl is disabled, meaning that the control is exempt from ancestor
  * calculations of validity or value.
  * 
  * @see `markAsDisabled`
+ * @see `status`
  */
 export const DISABLED = 'DISABLED';
 
@@ -152,8 +157,12 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Reports the current value of the control. Only includes
-   * the values of enabled controls.
+   * The current value of the control.
+   *
+   * * For a `FormControl`, the current value.
+   * * For a `FormGroup`, the values of enabled controls as an object
+   * with a key-value pair for each member of the group.
+   * * For a `FormArray`, the values of enabled controls as an array.
    *
    */
   public readonly value: any;
@@ -162,8 +171,8 @@ export abstract class AbstractControl {
    * @description
    * Initialize the AbstractControl instance.
    *
-   * @param validator The function that will determine the synchronous validity of this control.
-   * @param asyncValidator The function that will determine the asynchronous validity of this
+   * @param validator The function that determines the synchronous validity of this control.
+   * @param asyncValidator The function that determines the asynchronous validity of this
    * control.
    */
   constructor(public validator: ValidatorFn|null, public asyncValidator: AsyncValidatorFn|null) {}
@@ -192,8 +201,10 @@ export abstract class AbstractControl {
   /**
    * @description
    * A control is `valid` when its `status` is `VALID`.
+   * 
+   * @see `status`
    *
-   * True if the control has passed all of its validation tests,
+   * @returns True if the control has passed all of its validation tests,
    * false otherwise.
    */
   get valid(): boolean { return this.status === VALID; }
@@ -201,8 +212,10 @@ export abstract class AbstractControl {
   /**
    * @description
    * A control is `invalid` when its `status` is `INVALID`.
-   *
-   * True if this control has failed one or more of its validation checks,
+   * 
+   * @see `status`
+   * 
+   * @returns True if this control has failed one or more of its validation checks,
    * false otherwise.
    */
   get invalid(): boolean { return this.status === INVALID; }
@@ -210,8 +223,10 @@ export abstract class AbstractControl {
   /**
    * @description
    * A control is `pending` when its `status` is `PENDING`.
-   *
-   * True if this control is in the process of conducting a validation check,
+   * 
+   * @see `status`
+   * 
+   * @returns True if this control is in the process of conducting a validation check,
    * false otherwise.
    */
   get pending(): boolean { return this.status == PENDING; }
@@ -220,19 +235,23 @@ export abstract class AbstractControl {
    * @description
    * A control is `disabled` when its `status` is `DISABLED`.
    *
-   * True if the control is disabled, false otherwise.
-   *
+   * @see `status`
+   * 
    * Disabled controls are exempt from validation checks and
    * are not included in the aggregate value of their ancestor
    * controls.
+   *
+   * @returns True if the control is disabled, false otherwise.
    */
   get disabled(): boolean { return this.status === DISABLED; }
 
   /**
    * @description
    * A control is `enabled` as long as its `status` is not `DISABLED`.
-   *
-   * True if the control has any status other than 'DISABLED',
+   * 
+   * @see `status`
+   * 
+   * @returns True if the control has any status other than 'DISABLED',
    * false if the status is 'DISABLED'.
    *
    */
@@ -250,7 +269,7 @@ export abstract class AbstractControl {
    * A control is `pristine` if the user has not yet changed
    * the value in the UI.
    *
-   * True if the user has not yet changed the value in the UI; compare `dirty`.
+   * @returns True if the user has not yet changed the value in the UI; compare `dirty`.
    * Programmatic changes to a control's value do not mark it dirty.
    */
   public readonly pristine: boolean = true;
@@ -260,13 +279,15 @@ export abstract class AbstractControl {
    * A control is `dirty` if the user has changed the value
    * in the UI.
    *
-   * True if the user has changed the value of this control in the UI; compare `pristine`.
+   * @returns True if the user has changed the value of this control in the UI; compare `pristine`.
    * Programmatic changes to a control's value do not mark it dirty.
    */
   get dirty(): boolean { return !this.pristine; }
 
   /**
    * @description
+   * True if the control is marked as `touched`.
+   *
    * A control is marked `touched` once the user has triggered
    * a `blur` event on it.
    */
@@ -274,6 +295,8 @@ export abstract class AbstractControl {
 
   /**
    * @description
+   * True if the control has not been marked as touched
+   *
    * A control is `untouched` if the user has not yet triggered
    * a `blur` event on it.
    */
@@ -281,22 +304,22 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * A multicasted observable that emits an event every time the value of the control changes, in
+   * A multicasting observable that emits an event every time the value of the control changes, in
    * the UI or programmatically.
    */
   public readonly valueChanges: Observable<any>;
 
   /**
    * @description
-   * A multicasted observable that emits an event every time the validation `status` of the control
-   * is re-calculated.
+   * A multicasting observable that emits an event every time the validation `status` of the control
+   * recalculates.
    */
   public readonly statusChanges: Observable<any>;
 
   /**
    * @description
-   * Reports the update strategy of the `AbstractControl` (i.e.
-   * the event on which the control will update itself).
+   * Reports the update strategy of the `AbstractControl` (meaning
+   * the event on which the control updates itself).
    * Possible values: `'change'` | `'blur'` | `'submit'`
    * Default value: `'change'`
    */
@@ -307,7 +330,7 @@ export abstract class AbstractControl {
   /**
    * @description
    * Sets the synchronous validators that are active on this control.  Calling
-   * this will overwrite any existing sync validators.
+   * this overwrites any existing sync validators.
    */
   setValidators(newValidator: ValidatorFn|ValidatorFn[]|null): void {
     this.validator = coerceToValidator(newValidator);
@@ -316,7 +339,7 @@ export abstract class AbstractControl {
   /**
    * @description
    * Sets the async validators that are active on this control. Calling this
-   * will overwrite any existing async validators.
+   * overwrites any existing async validators.
    */
   setAsyncValidators(newValidator: AsyncValidatorFn|AsyncValidatorFn[]|null): void {
     this.asyncValidator = coerceToAsyncValidator(newValidator);
@@ -337,9 +360,10 @@ export abstract class AbstractControl {
   /**
    * @description
    * Marks the control as `touched`. A control is touched by focus and
-   * blur events that do not change the value; compare markAsDirty
+   * blur events that do not change the value; compare `markAsDirty`;
    *
-   *  @param opts Configuration options that how marking is applied.
+   *  @param opts Configuration options that determine how the control events events after
+   * marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
    */
@@ -355,11 +379,11 @@ export abstract class AbstractControl {
    * @description
    * Marks the control as `untouched`.
    *
-   * If the control has any children, it will also mark all children as `untouched`
-   * to maintain the model, and re-calculate the `touched` status of all parent
-   * controls.
+   * If the control has any children, also marks all children as `untouched`
+   * and recalculates the `touched` status of all parent controls.
    *
-   *  @param opts Configuration options that how marking is applied.
+   *  @param opts Configuration options that determine how the control emits events after
+   * the marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
    */
@@ -377,10 +401,11 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Marks the control as `dirty`. A control is dirty by changing
-   * the control; compare `markAsTouched`
+   * Marks the control as `dirty`. A control becomes dirty when
+   * the control's is changed through the UI; compare `markAsTouched`.
    *
-   *  @param opts Configuration options that how marking is applied.
+   *  @param opts Configuration options that determine how the control emits events after
+   * marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
    */
@@ -396,11 +421,12 @@ export abstract class AbstractControl {
    * @description
    * Marks the control as `pristine`.
    *
-   * If the control has any children, it will also mark all children as `pristine`
-   * to maintain the model, and re-calculate the `pristine` status of all parent
+   * If the control has any children, marks all children as `pristine`,
+   * and recalculates the `pristine` status of all parent
    * controls.
    *
-   *  @param opts Configuration options that how marking is applied.
+   *  @param opts Configuration options that determine how the control emits events after
+   * marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
    */
@@ -419,12 +445,13 @@ export abstract class AbstractControl {
    * @description
    * Marks the control as `pending`.
    *
-   * An event will be emitted by `statusChanges` by default.
+   * A control is pending while the control performs async validation.
    *
-   *  @param opts Configuration options that how marking is applied.
+   *  @param opts Configuration options that determine how the control propagates and
+   * emits events after marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` will not emit an event.
+   * * `emitEvent`: When false, A `statusChanges` event is not emitted.
    *
    */
   markAsPending(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -441,17 +468,17 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Disables the control. This means the control will be exempt from validation checks and
+   * Disables the control. This means the control is exempt from validation checks and
    * excluded from the aggregate value of any parent. Its status is `DISABLED`.
    *
-   * If the control has children, all children will be disabled to maintain the model.
+   * If the control has children, all children are also disabled.
    *
-   *  @param opts Configuration options that how marking is applied.
+   *  @param opts Configuration options that determine how the control propagates
+   * changes and emits events after the control is disabled.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event.
-   * Otherwise,
-   * both Observables will emit a status and value event.
+   * * `emitEvent`: Set to false to prevent observables from emitting both statusChanges
+   * and valuesChanges events.
    */
   disable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = DISABLED;
@@ -471,18 +498,18 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Enables the control. This means the control will be included in validation checks and
-   * the aggregate value of its parent. Its status is re-calculated based on its value and
+   * Enables the control. This means the control is included in validation checks and
+   * the aggregate value of its parent. Its status recalculates based on its value and
    * its validators.
    *
-   * By default, if the control has children, all children will be enabled.
+   * By default, if the control has children, all children are enabled.
    *
-   *  @param opts Configure options that happen when marked as untouched
+   *  @param opts Configure options that control how the control propagates changes and
+   * emits events when marked as untouched
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
    * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event.
-   * Otherwise,
-   * both Observables will emit a status and value event.
+   * * `emitEvent`: Set to false to prevent observables from emitting both statusChanges
+   * and valuesChanges events.
    */
   enable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = VALID;
@@ -527,17 +554,16 @@ export abstract class AbstractControl {
   abstract reset(value?: any, options?: Object): void;
 
   /**
-   * Re-calculates the value and validation status of the control.
+   * Recalculates the value and validation status of the control.
    *
-   * By default, it will also update the value and validity of its ancestors.
+   * By default, it also updates the value and validity of its ancestors.
    *
-   * @param opts Configuration options that control events after updating and
-   * validity checks are applied.
+   * @param opts Configuration options determine how the control is updated and emits events
+   * after validity checks are applied.
    * * `onlySelf`: When true, only update this control. When false or not supplied,
    * update all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, `statusChanges` and `valueChanges` will not emit an event.
-   * Otherwise,
-   * both Observables will emit a status and value event.
+   * * `emitEvent`: Set to false to prevent observables from emitting both statusChanges
+   * and valuesChanges events.
    */
   updateValueAndValidity(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._setInitialStatus();
@@ -594,11 +620,9 @@ export abstract class AbstractControl {
 
   /**
    * @description
-   * Sets errors on a form control.
+   * Sets errors on a form control when running validations manually, rather than automatically.
    *
-   * This is used when validations are run manually by the user, rather than automatically.
-   *
-   * Calling `setErrors` will also update the validity of the parent control.
+   * Calling `setErrors` also updates the validity of the parent control.
    *
    * ### Manually set the errors for a control
    *
@@ -625,7 +649,7 @@ export abstract class AbstractControl {
    * @description
    * Retrieves a child control given the control's name or path.
    *
-   * @param path dot-delimited string or array of string/number values that define the path to the
+   * @param path A dot-delimited string or array of string/number values that define the path to the
    * control.
    *
    * ### Retrieve a nested control
@@ -647,6 +671,7 @@ export abstract class AbstractControl {
    * @param errorCode The error code for which to retrieve data
    * @param path The path to a control to check. If not supplied, checks for the error in this
    * control.
+   *
    * @returns The error data if the control with the given path has the given error, otherwise null
    * or undefined.
    */
@@ -790,6 +815,8 @@ export abstract class AbstractControl {
  * @see [Usage Notes](#usage-notes)
  * 
  * @usageNotes
+ * 
+ * ### Initializing Form Controls
  *
  * Instantiate a `FormControl`, with an initial value.
  *
@@ -798,9 +825,8 @@ export abstract class AbstractControl {
  * console.log(ctrl.value);     // 'some value'
  *```
  *
- * Initializing the control with a form state object.
- *
- * The `value` and `disabled` keys are required when initializing with a form state object.
+ * The following example initializes the control with a form state object. The `value` 
+ * and `disabled` keys are required in this case.
  *
  * ```ts
  * const ctrl = new FormControl({ value: 'n/a', disabled: true });
@@ -816,7 +842,7 @@ export abstract class AbstractControl {
  * console.log(ctrl.status);     // 'INVALID'
  * ```
  *
- * The example below initializes the control using an options object.
+ * The following example initializes the control using an options object.
  *
  * ```ts
  * const ctrl = new FormControl('', {
@@ -843,7 +869,7 @@ export abstract class AbstractControl {
  * 
  * ### Reset the control back to an initial value
  * 
- * You can also reset to a specific form state by passing through a standalone
+ * You reset to a specific form state by passing through a standalone
  * value or a form state object that contains both a value and a disabled state
  * (these are the only two properties that cannot be calculated).
  *
@@ -914,7 +940,8 @@ export class FormControl extends AbstractControl {
    * Sets a new value for the form control.
    *
    * @param value The new value for the control.
-   * @param options Configuration options for how the control emits events when the value changes.
+   * @param options Configuration options that determine how the control emits events when the
+   * value changes.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    *
@@ -949,7 +976,7 @@ export class FormControl extends AbstractControl {
    * It exists for symmetry with {@link FormGroup#patchValue patchValue} on `FormGroups` and
    * `FormArrays`, where it does behave differently.
    * 
-   * @see See `setValue` for options
+   * @see `setValue` for options
    */
   patchValue(value: any, options: {
     onlySelf?: boolean,
@@ -962,19 +989,15 @@ export class FormControl extends AbstractControl {
 
   /**
    * @description
-   * Resets the form control
-   *
-   * By default, the following actions happen when the control is reset.
-   *
-   * * it is marked as `pristine`
-   * * it is marked as `untouched`
-   * * value is set to null
+   * Resets the form control, marking it `pristine` and `untouched`, and setting
+   * the value to null.
    *
    * @param formState Initializes the control with an initial state value,
    * or with an object that defines the initial value, status, and options
    * for handling updates and validation.
    *
-   * @param options Configuration options for emitting events when the control value changes.
+   * @param options Configuration options that determine how the control is updated and
+   * emits events after the value changes.
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
@@ -1074,7 +1097,7 @@ export class FormControl extends AbstractControl {
  * along with `FormControl` and `FormArray`.
  *
  * When instantiating a `FormGroup`, pass in a collection of child controls as the first
- * argument. The key for each child will be the name under which it is registered.
+ * argument. The key for each child registers the name for the control.
  *
  * @usageNotes
  *
@@ -1092,7 +1115,7 @@ export class FormControl extends AbstractControl {
  *
  * ### Create a form group with a group-level validator
  *
- * You can also include group-level validators as the second arg, or group-level async
+ * You include group-level validators as the second arg, or group-level async
  * validators as the third arg. These come in handy when you want to perform validation
  * that considers the value of more than one child control.
  *
@@ -1109,7 +1132,7 @@ export class FormControl extends AbstractControl {
  * }
  * ```
  *
- * Like `FormControl` instances, you can alternatively choose to pass in
+ * Like `FormControl` instances, you choose to pass in
  * validators and async validators as part of an options object.
  *
  * ```
@@ -1121,9 +1144,9 @@ export class FormControl extends AbstractControl {
  *
  * ### Set the updateOn property for all controls in a form group
  *
- * The options object can also be used to set a default value for each child
+ * The options object is used to set a default value for each child
  * control's `updateOn` property. If you set `updateOn` to `'blur'` at the
- * group level, all child controls will default to 'blur', unless the child
+ * group level, all child controls default to 'blur', unless the child
  * has explicitly specified a different `updateOn` value.
  *
  * ```ts
@@ -1225,10 +1248,12 @@ export class FormGroup extends AbstractControl {
    * @description
    * Check whether there is an enabled control with the given name in the group.
    *
-   * It will return false for disabled controls. If you'd like to check for existence in the group
+   * Reports false for disabled controls. If you'd like to check for existence in the group
    * only, use {@link AbstractControl#get get} instead.
    *
    * @param name The control name to check for existence in the collection
+   *
+   * @returns false for disabled controls, true otherwise.
    */
   contains(controlName: string): boolean {
     return this.controls.hasOwnProperty(controlName) && this.controls[controlName].enabled;
@@ -1257,7 +1282,8 @@ export class FormGroup extends AbstractControl {
    * that doesn't exist or if you excluding the value of a control.
    *
    * @param value The new value for the control that matches the structure of the group.
-   * @param options Configuration options for how the control emits events when the value changes.
+   * @param options Configuration options that determine how the control is updated and
+   * emits events after the value changes.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    *
@@ -1278,7 +1304,7 @@ export class FormGroup extends AbstractControl {
   /**
    * @description
    * Patches the value of the `FormGroup`. It accepts an object with control
-   * names as keys, and will do its best to match the values to the correct controls
+   * names as keys, and does its best to match the values to the correct controls
    * in the group.
    *
    * It accepts both super-sets and sub-sets of the group without throwing an error.
@@ -1298,7 +1324,8 @@ export class FormGroup extends AbstractControl {
    *  ```
    *
    * @param value The object that matches the structure of the group
-   * @param options Configure options that happen when the value is patched
+   * @param options Configure options that determines how the control emits events after
+   * the value is patched
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
@@ -1317,22 +1344,20 @@ export class FormGroup extends AbstractControl {
 
   /**
    * @description
-   * Resets the `FormGroup`. This means by default:
+   * Resets the `FormGroup`, marks all descendants are marked `pristine` and `untouched`, and
+   * the value of all descendants to null.
    *
-   * * The group and all descendants are marked `pristine`
-   * * The group and all descendants are marked `untouched`
-   * * The value of all descendants will be null or null maps
-   *
-   * You can also reset to a specific form state by passing in a map of states
+   * You reset to a specific form state by passing in a map of states
    * that matches the structure of your form, with control names as keys. The state
-   * can be a standalone value or a form state object with both a value and a disabled
+   * is a standalone value or a form state object with both a value and a disabled
    * status.
    *
    * @param value Initializes the control with an initial state value,
    * or with an object that defines the initial value, status,
    * and options for handling updates and validation.
    *
-   * @param options Configuration options that happen when the group is reset.
+   * @param options Configuration options that determine how the control propagates changes
+   * and emits events when the group is reset.
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
    * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
@@ -1513,11 +1538,11 @@ export class FormGroup extends AbstractControl {
  *
  * ### Create a form array with array-level validators
  *
- * You can also include array-level validators and async validators. These come in handy
+ * You include array-level validators and async validators. These come in handy
  * when you want to perform validation that considers the value of more than one child
  * control.
  *
- * The two types of validators can be passed in separately as the second and third arg
+ * The two types of validators are passed in separately as the second and third arg
  * respectively, or together as part of an options object.
  *
  * ```
@@ -1529,9 +1554,9 @@ export class FormGroup extends AbstractControl {
  *
   * ### Set the updateOn property for all controls in a form array
  *
- * The options object can also be used to set a default value for each child
+ * The options object is used to set a default value for each child
  * control's `updateOn` property. If you set `updateOn` to `'blur'` at the
- * array level, all child controls will default to 'blur', unless the child
+ * array level, all child controls default to 'blur', unless the child
  * has explicitly specified a different `updateOn` value.
  *
  * ```ts
@@ -1545,7 +1570,7 @@ export class FormGroup extends AbstractControl {
  * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
  * in `FormArray` itself. These methods ensure the controls are properly tracked in the
  * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
- * the `FormArray` directly, as that will result in strange and unexpected behavior such
+ * the `FormArray` directly, as that result in strange and unexpected behavior such
  * as broken change detection.
  *
  *
@@ -1555,7 +1580,7 @@ export class FormArray extends AbstractControl {
   * @description
   * Creates a new `FormArray` instance.
   *
-  * @param controls An array of child controls. Each child control will be given an index
+  * @param controls An array of child controls. Each child control is given an index
   * wheh it is registered.
   *
   * @param validatorOrOpts A synchronous validator function, or an array of
@@ -1656,7 +1681,7 @@ export class FormArray extends AbstractControl {
    * Sets the value of the `FormArray`. It accepts an array that matches
    * the structure of the control.
    *
-   * This method performs strict checks, so it will throw an error if you try
+   * This method performs strict checks, and throws an error if you try
    * to set the value of a control that doesn't exist or if you exclude the
    * value of a control.
    *
@@ -1674,7 +1699,8 @@ export class FormArray extends AbstractControl {
    * ```
    *
    * @param value Array of values for the controls
-   * @param options Configure options for emitting events when the control value changes
+   * @param options Configure options that determine how the control emits events after the
+   * value changes
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
@@ -1694,7 +1720,7 @@ export class FormArray extends AbstractControl {
   /**
    * @description
    * Patches the value of the `FormArray`. It accepts an array that matches the
-   * structure of the control, and will do its best to match the values to the correct
+   * structure of the control, and does its best to match the values to the correct
    * controls in the group.
    *
    * It accepts both super-sets and sub-sets of the array without throwing an error.
@@ -1713,7 +1739,8 @@ export class FormArray extends AbstractControl {
    * ```
    *
    * @param value Array of latest values for the controls
-   * @param options Configure options for emitting events when the control value changes
+   * @param options Configure options that determine how the control emits events after the
+   * value changes
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
@@ -1732,14 +1759,11 @@ export class FormArray extends AbstractControl {
 
   /**
    * @description
-   * Resets the `FormArray`. This means by default:
+   * Resets the `FormArray` and all descendants are marked `pristine` and `untouched`, and the
+   * value of all descendants to null or null maps.
    *
-   * * The array and all descendants are marked `pristine`
-   * * The array and all descendants are marked `untouched`
-   * * The value of all descendants will be null or null maps
-   *
-   * You can also reset to a specific form state by passing in an array of states
-   * that matches the structure of the control. The state can be a standalone value
+   * You reset to a specific form state by passing in an array of states
+   * that matches the structure of the control. The state is a standalone value
    * or a form state object with both a value and a disabled status.
    *
    * ### Reset the values in a form array
@@ -1767,7 +1791,8 @@ export class FormArray extends AbstractControl {
    * ```
    *
    * @param value Array of values for the controls
-   * @param options Configure options for emitting events when the control value changes
+   * @param options Configure options that determine how the control emits events after the
+   * value changes
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.

From 5b76f04b7f6ec6125143daf4204f309b7878e323 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Mon, 11 Jun 2018 15:48:35 -0500
Subject: [PATCH 310/582] docs: More edits (#24255)

PR Close #24255
---
 packages/forms/src/model.ts | 269 +++++++++++++++---------------------
 1 file changed, 113 insertions(+), 156 deletions(-)

diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index 4be897b5e3..c0edddc4c9 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -13,7 +13,6 @@ import {AsyncValidatorFn, ValidationErrors, ValidatorFn} from './directives/vali
 import {toObservable} from './validators';
 
 /**
- * @description
  * Reports that a FormControl is valid, meaning that no errors exist in the input value.
  *
  * @see `status`
@@ -21,28 +20,25 @@ import {toObservable} from './validators';
 export const VALID = 'VALID';
 
 /**
- * @description
  * Reports that a FormControl is invalid, meaning that an error exists in the input value.
- * 
+ *
  * @see `status`
  */
 export const INVALID = 'INVALID';
 
 /**
- * @description
  * Reports that a FormControl is pending, meaning that that async validation is occurring and
  * errors are not yet available for the input value.
- * 
+ *
  * @see `markAsPending`
  * @see `status`
  */
 export const PENDING = 'PENDING';
 
 /**
- * @description
  * Reports that a FormControl is disabled, meaning that the control is exempt from ancestor
  * calculations of validity or value.
- * 
+ *
  * @see `markAsDisabled`
  * @see `status`
  */
@@ -95,8 +91,6 @@ function coerceToAsyncValidator(
 export type FormHooks = 'change' | 'blur' | 'submit';
 
 /**
- * @description
- *
  * Interface for options provided to an `AbstractControl`.
  *
  * @experimental
@@ -125,8 +119,6 @@ function isOptionsObj(
 
 
 /**
- * @description
- *
  * This is the base class for `FormControl`, `FormGroup`, and `FormArray`.
  *
  * It provides some of the shared behavior that all controls and groups of controls have, like
@@ -156,7 +148,6 @@ export abstract class AbstractControl {
   private _asyncValidationSubscription: any;
 
   /**
-   * @description
    * The current value of the control.
    *
    * * For a `FormControl`, the current value.
@@ -168,7 +159,6 @@ export abstract class AbstractControl {
   public readonly value: any;
 
   /**
-   * @description
    * Initialize the AbstractControl instance.
    *
    * @param validator The function that determines the synchronous validity of this control.
@@ -178,13 +168,11 @@ export abstract class AbstractControl {
   constructor(public validator: ValidatorFn|null, public asyncValidator: AsyncValidatorFn|null) {}
 
   /**
-   * @description
    * The parent control.
    */
   get parent(): FormGroup|FormArray { return this._parent; }
 
   /**
-   * @description
    * The validation status of the control. There are four possible
    * validation status values:
    *
@@ -199,9 +187,8 @@ export abstract class AbstractControl {
   public readonly status: string;
 
   /**
-   * @description
    * A control is `valid` when its `status` is `VALID`.
-   * 
+   *
    * @see `status`
    *
    * @returns True if the control has passed all of its validation tests,
@@ -210,33 +197,30 @@ export abstract class AbstractControl {
   get valid(): boolean { return this.status === VALID; }
 
   /**
-   * @description
    * A control is `invalid` when its `status` is `INVALID`.
-   * 
+   *
    * @see `status`
-   * 
+   *
    * @returns True if this control has failed one or more of its validation checks,
    * false otherwise.
    */
   get invalid(): boolean { return this.status === INVALID; }
 
   /**
-   * @description
    * A control is `pending` when its `status` is `PENDING`.
-   * 
+   *
    * @see `status`
-   * 
+   *
    * @returns True if this control is in the process of conducting a validation check,
    * false otherwise.
    */
   get pending(): boolean { return this.status == PENDING; }
 
   /**
-   * @description
    * A control is `disabled` when its `status` is `DISABLED`.
    *
    * @see `status`
-   * 
+   *
    * Disabled controls are exempt from validation checks and
    * are not included in the aggregate value of their ancestor
    * controls.
@@ -246,11 +230,10 @@ export abstract class AbstractControl {
   get disabled(): boolean { return this.status === DISABLED; }
 
   /**
-   * @description
    * A control is `enabled` as long as its `status` is not `DISABLED`.
-   * 
+   *
    * @see `status`
-   * 
+   *
    * @returns True if the control has any status other than 'DISABLED',
    * false if the status is 'DISABLED'.
    *
@@ -258,14 +241,12 @@ export abstract class AbstractControl {
   get enabled(): boolean { return this.status !== DISABLED; }
 
   /**
-   * @description
    * An object containing any errors generated by failing validation,
    * or null if there are no errors.
    */
   public readonly errors: ValidationErrors|null;
 
   /**
-   * @description
    * A control is `pristine` if the user has not yet changed
    * the value in the UI.
    *
@@ -275,7 +256,6 @@ export abstract class AbstractControl {
   public readonly pristine: boolean = true;
 
   /**
-   * @description
    * A control is `dirty` if the user has changed the value
    * in the UI.
    *
@@ -285,7 +265,6 @@ export abstract class AbstractControl {
   get dirty(): boolean { return !this.pristine; }
 
   /**
-   * @description
    * True if the control is marked as `touched`.
    *
    * A control is marked `touched` once the user has triggered
@@ -294,7 +273,6 @@ export abstract class AbstractControl {
   public readonly touched: boolean = false;
 
   /**
-   * @description
    * True if the control has not been marked as touched
    *
    * A control is `untouched` if the user has not yet triggered
@@ -303,21 +281,18 @@ export abstract class AbstractControl {
   get untouched(): boolean { return !this.touched; }
 
   /**
-   * @description
    * A multicasting observable that emits an event every time the value of the control changes, in
    * the UI or programmatically.
    */
   public readonly valueChanges: Observable<any>;
 
   /**
-   * @description
    * A multicasting observable that emits an event every time the validation `status` of the control
    * recalculates.
    */
   public readonly statusChanges: Observable<any>;
 
   /**
-   * @description
    * Reports the update strategy of the `AbstractControl` (meaning
    * the event on which the control updates itself).
    * Possible values: `'change'` | `'blur'` | `'submit'`
@@ -328,7 +303,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Sets the synchronous validators that are active on this control.  Calling
    * this overwrites any existing sync validators.
    */
@@ -337,7 +311,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Sets the async validators that are active on this control. Calling this
    * overwrites any existing async validators.
    */
@@ -346,26 +319,23 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Empties out the sync validator list.
    */
   clearValidators(): void { this.validator = null; }
 
   /**
-   * @description
    * Empties out the async validator list.
    */
   clearAsyncValidators(): void { this.asyncValidator = null; }
 
   /**
-   * @description
    * Marks the control as `touched`. A control is touched by focus and
    * blur events that do not change the value; compare `markAsDirty`;
    *
-   *  @param opts Configuration options that determine how the control events events after
-   * marking is applied.
+   *  @param opts Configuration options that determine how the control propagates changes
+   * and emits events events after marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
+   * marks all direct ancestors. Default is false.
    */
   markAsTouched(opts: {onlySelf?: boolean} = {}): void {
     (this as{touched: boolean}).touched = true;
@@ -376,16 +346,15 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Marks the control as `untouched`.
    *
    * If the control has any children, also marks all children as `untouched`
    * and recalculates the `touched` status of all parent controls.
    *
-   *  @param opts Configuration options that determine how the control emits events after
-   * the marking is applied.
+   *  @param opts Configuration options that determine how the control propagates changes
+   * and emits events after the marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
+   * marks all direct ancestors. Default is false.
    */
   markAsUntouched(opts: {onlySelf?: boolean} = {}): void {
     (this as{touched: boolean}).touched = false;
@@ -400,14 +369,13 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Marks the control as `dirty`. A control becomes dirty when
    * the control's is changed through the UI; compare `markAsTouched`.
    *
-   *  @param opts Configuration options that determine how the control emits events after
-   * marking is applied.
+   *  @param opts Configuration options that determine how the control propagates changes
+   * and emits events after marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
+   * marks all direct ancestors. Default is false.
    */
   markAsDirty(opts: {onlySelf?: boolean} = {}): void {
     (this as{pristine: boolean}).pristine = false;
@@ -418,7 +386,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Marks the control as `pristine`.
    *
    * If the control has any children, marks all children as `pristine`,
@@ -428,7 +395,7 @@ export abstract class AbstractControl {
    *  @param opts Configuration options that determine how the control emits events after
    * marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
+   * marks all direct ancestors. Default is false..
    */
   markAsPristine(opts: {onlySelf?: boolean} = {}): void {
     (this as{pristine: boolean}).pristine = true;
@@ -442,16 +409,17 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Marks the control as `pending`.
    *
    * A control is pending while the control performs async validation.
    *
-   *  @param opts Configuration options that determine how the control propagates and
+   *  @param opts Configuration options that determine how the control propagates changes and
    * emits events after marking is applied.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: When false, A `statusChanges` event is not emitted.
+   * marks all direct ancestors. Default is false..
+   * * `emitEvent`: When true or not supplied (the default), the `statusChanges`
+   * observable emits an event with the latest status the control is marked pending.
+   * When false, no events are emitted.
    *
    */
   markAsPending(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -467,7 +435,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Disables the control. This means the control is exempt from validation checks and
    * excluded from the aggregate value of any parent. Its status is `DISABLED`.
    *
@@ -476,9 +443,11 @@ export abstract class AbstractControl {
    *  @param opts Configuration options that determine how the control propagates
    * changes and emits events after the control is disabled.
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: Set to false to prevent observables from emitting both statusChanges
-   * and valuesChanges events.
+   * marks all direct ancestors. Default is false..
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control is disabled.
+   * When false, no events are emitted.
    */
   disable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = DISABLED;
@@ -497,7 +466,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Enables the control. This means the control is included in validation checks and
    * the aggregate value of its parent. Its status recalculates based on its value and
    * its validators.
@@ -507,9 +475,11 @@ export abstract class AbstractControl {
    *  @param opts Configure options that control how the control propagates changes and
    * emits events when marked as untouched
    * * `onlySelf`: When true, mark only this control. When false or not supplied,
-   * marks all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: Set to false to prevent observables from emitting both statusChanges
-   * and valuesChanges events.
+   * marks all direct ancestors. Default is false..
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control is enabled.
+   * When false, no events are emitted.
    */
   enable(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     (this as{status: string}).status = VALID;
@@ -530,25 +500,21 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * @param parent Sets the parent of the control
    */
   setParent(parent: FormGroup|FormArray): void { this._parent = parent; }
 
   /**
-   * @description
    * Sets the value of the control. Abstract method (implemented in sub-classes).
    */
   abstract setValue(value: any, options?: Object): void;
 
   /**
-   * @description
    * Patches the value of the control. Abstract method (implemented in sub-classes).
    */
   abstract patchValue(value: any, options?: Object): void;
 
   /**
-   * @description
    * Resets the control. Abstract method (implemented in sub-classes).
    */
   abstract reset(value?: any, options?: Object): void;
@@ -558,12 +524,14 @@ export abstract class AbstractControl {
    *
    * By default, it also updates the value and validity of its ancestors.
    *
-   * @param opts Configuration options determine how the control is updated and emits events
-   * after validity checks are applied.
+   * @param opts Configuration options determine how the control propagates changes and emits events
+   * after updates and validity checks are applied.
    * * `onlySelf`: When true, only update this control. When false or not supplied,
-   * update all direct ancestors, in order to maintain the model.
-   * * `emitEvent`: Set to false to prevent observables from emitting both statusChanges
-   * and valuesChanges events.
+   * update all direct ancestors. Default is false..
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control is updated.
+   * When false, no events are emitted.
    */
   updateValueAndValidity(opts: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
     this._setInitialStatus();
@@ -619,7 +587,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Sets errors on a form control when running validations manually, rather than automatically.
    *
    * Calling `setErrors` also updates the validity of the parent control.
@@ -646,7 +613,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Retrieves a child control given the control's name or path.
    *
    * @param path A dot-delimited string or array of string/number values that define the path to the
@@ -665,7 +631,6 @@ export abstract class AbstractControl {
   get(path: Array<string|number>|string): AbstractControl|null { return _find(this, path, '.'); }
 
   /**
-   * @description
    * Reports error data for a specific error occurring in this control or in another control.
    *
    * @param errorCode The error code for which to retrieve data
@@ -681,7 +646,6 @@ export abstract class AbstractControl {
   }
 
   /**
-   * @description
    * Reports whether the control with the given path has the error specified.
    *
    * @param errorCode The error code for which to retrieve data
@@ -692,7 +656,6 @@ export abstract class AbstractControl {
   hasError(errorCode: string, path?: string[]): boolean { return !!this.getError(errorCode, path); }
 
   /**
-   * @description
    * Retrieves the top-level ancestor of this control.
    */
   get root(): AbstractControl {
@@ -802,20 +765,19 @@ export abstract class AbstractControl {
 }
 
 /**
- * @description
  * Tracks the value and validation status of an individual form control.
  *
  * This is one of the three fundamental building blocks of Angular forms, along with
- * `FormGroup` and `FormArray`. It extends the `AbstractControl` class that 
- * implements most of the base functionality for accessing the value, validation status, 
+ * `FormGroup` and `FormArray`. It extends the `AbstractControl` class that
+ * implements most of the base functionality for accessing the value, validation status,
  * user interactions and events.
- * 
+ *
  * @see `AbstractControl`
  * @see [Reactive Forms Guide](guide/reactive-forms)
  * @see [Usage Notes](#usage-notes)
- * 
+ *
  * @usageNotes
- * 
+ *
  * ### Initializing Form Controls
  *
  * Instantiate a `FormControl`, with an initial value.
@@ -825,7 +787,7 @@ export abstract class AbstractControl {
  * console.log(ctrl.value);     // 'some value'
  *```
  *
- * The following example initializes the control with a form state object. The `value` 
+ * The following example initializes the control with a form state object. The `value`
  * and `disabled` keys are required in this case.
  *
  * ```ts
@@ -866,18 +828,18 @@ export abstract class AbstractControl {
  * ```ts
  * const ctrl = new FormControl('', { updateOn: 'submit' });
  * ```
- * 
+ *
  * ### Reset the control back to an initial value
- * 
+ *
  * You reset to a specific form state by passing through a standalone
  * value or a form state object that contains both a value and a disabled state
  * (these are the only two properties that cannot be calculated).
  *
  * ```ts
  * const ctrl = new FormControl('Nancy');
- * 
+ *
  * console.log(control.value); // 'Nancy'
- * 
+ *
  * control.reset('Drew');
  *
  * console.log(control.value); // 'Drew'
@@ -887,10 +849,10 @@ export abstract class AbstractControl {
  *
  * ```
  * const ctrl = new FormControl('Nancy');
- * 
+ *
  * console.log(control.value); // 'Nancy'
  * console.log(this.control.status); // 'DISABLED'
- * 
+ *
  * control.reset({ value: 'Drew', disabled: true });
  *
  * console.log(this.control.value); // 'Drew'
@@ -908,7 +870,6 @@ export class FormControl extends AbstractControl {
   _pendingChange: any;
 
   /**
-  * @description
   * Creates a new `FormControl` instance.
   *
   * @param formState Initializes the control with an initial state value,
@@ -936,21 +897,25 @@ export class FormControl extends AbstractControl {
   }
 
   /**
-   * @description
    * Sets a new value for the form control.
    *
    * @param value The new value for the control.
-   * @param options Configuration options that determine how the control emits events when the
-   * value changes.
+   * @param options Configuration options that determine how the control proopagates changes
+   * and emits events when the value changes.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
-   * * `emitModelToViewChange`: When true (the default), each change triggers an `onChange` event to
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control value is updated.
+   * When false, no events are emitted.
+   * * `emitModelToViewChange`: When true or not supplied  (the default), each change triggers an
+   * `onChange` event to
    * update the view.
-   * * `emitViewToModelChange`: When true (the default), each change triggers an `ngModelChange`
+   * * `emitViewToModelChange`: When true or not supplied (the default), each change triggers an
+   * `ngModelChange`
    * event to update the model.
    *
    */
@@ -969,13 +934,12 @@ export class FormControl extends AbstractControl {
   }
 
   /**
-   * @description
    * Patches the value of a control.
    *
    * This function is functionally the same as {@link FormControl#setValue setValue} at this level.
    * It exists for symmetry with {@link FormGroup#patchValue patchValue} on `FormGroups` and
    * `FormArrays`, where it does behave differently.
-   * 
+   *
    * @see `setValue` for options
    */
   patchValue(value: any, options: {
@@ -988,7 +952,6 @@ export class FormControl extends AbstractControl {
   }
 
   /**
-   * @description
    * Resets the form control, marking it `pristine` and `untouched`, and setting
    * the value to null.
    *
@@ -996,12 +959,15 @@ export class FormControl extends AbstractControl {
    * or with an object that defines the initial value, status, and options
    * for handling updates and validation.
    *
-   * @param options Configuration options that determine how the control is updated and
-   * emits events after the value changes.
+   * @param options Configuration options that determine how the control propagates changes
+   * and emits events after the value changes.
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control is reset.
+   * When false, no events are emitted.
    *
    */
   reset(formState: any = null, options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
@@ -1028,7 +994,6 @@ export class FormControl extends AbstractControl {
   _allControlsDisabled(): boolean { return this.disabled; }
 
   /**
-   * @description
    * Register a listener for change events.
    *
    * @param fn The method that is called when the value changes
@@ -1045,7 +1010,6 @@ export class FormControl extends AbstractControl {
   }
 
   /**
-   * @description
    * Register a listener for disabled events.
    *
    * @param fn The method that is called when the disabled status changes.
@@ -1084,8 +1048,6 @@ export class FormControl extends AbstractControl {
 }
 
 /**
- * @description
- *
  * Tracks the value and validity state of a group of `FormControl` instances.
  *
  * A `FormGroup` aggregates the values of each child `FormControl` into one object,
@@ -1157,7 +1119,6 @@ export class FormControl extends AbstractControl {
  */
 export class FormGroup extends AbstractControl {
   /**
-  * @description
   * Creates a new `FormGroup` instance.
   *
   * @param controls A collection of child controls. The key for each child is the name
@@ -1184,7 +1145,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Registers a control with the group's list of controls.
    *
    * This method does not update the value or validity of the control.
@@ -1202,7 +1162,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Add a control to this group.
    *
    * This method also updates the value and validity of the control.
@@ -1217,7 +1176,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Remove a control from this group.
    *
    * @param name The control name to remove from the collection
@@ -1230,7 +1188,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Replace an existing control.
    *
    * @param name The control name to replace in the collection
@@ -1245,7 +1202,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Check whether there is an enabled control with the given name in the group.
    *
    * Reports false for disabled controls. If you'd like to check for existence in the group
@@ -1260,7 +1216,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Sets the value of the `FormGroup`. It accepts an object that matches
    * the structure of the group, with control names as keys.
    *
@@ -1282,14 +1237,17 @@ export class FormGroup extends AbstractControl {
    * that doesn't exist or if you excluding the value of a control.
    *
    * @param value The new value for the control that matches the structure of the group.
-   * @param options Configuration options that determine how the control is updated and
-   * emits events after the value changes.
+   * @param options Configuration options that determine how the control propagates changes
+   * and emits events after the value changes.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    *
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control value is updated.
+   * When false, no events are emitted.
    */
   setValue(value: {[key: string]: any}, options: {onlySelf?: boolean, emitEvent?: boolean} = {}):
       void {
@@ -1302,7 +1260,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Patches the value of the `FormGroup`. It accepts an object with control
    * names as keys, and does its best to match the values to the correct controls
    * in the group.
@@ -1324,11 +1281,14 @@ export class FormGroup extends AbstractControl {
    *  ```
    *
    * @param value The object that matches the structure of the group
-   * @param options Configure options that determines how the control emits events after
-   * the value is patched
+   * @param options Configure options that determines how the control propagates changes and
+   * emits events after the value is patched
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
-   * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * true.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control value is updated.
+   * When false, no events are emitted.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    */
@@ -1343,7 +1303,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * Resets the `FormGroup`, marks all descendants are marked `pristine` and `untouched`, and
    * the value of all descendants to null.
    *
@@ -1360,7 +1319,10 @@ export class FormGroup extends AbstractControl {
    * and emits events when the group is reset.
    * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
    * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control is reset.
+   * When false, no events are emitted.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    *
@@ -1408,7 +1370,6 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * @description
    * The aggregate value of the `FormGroup`, including any disabled controls.
    *
    * Retrieves all values regardless of disabled status.
@@ -1510,8 +1471,6 @@ export class FormGroup extends AbstractControl {
 }
 
 /**
- * @description
- *
  * Tracks the value and validity state of an array of `FormControl`,
  * `FormGroup` or `FormArray` instances.
  *
@@ -1577,7 +1536,6 @@ export class FormGroup extends AbstractControl {
  */
 export class FormArray extends AbstractControl {
   /**
-  * @description
   * Creates a new `FormArray` instance.
   *
   * @param controls An array of child controls. Each child control is given an index
@@ -1604,7 +1562,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Get the `AbstractControl` at the given `index` in the array.
    *
    * @param index Index in the array to retrieve the control
@@ -1612,7 +1569,6 @@ export class FormArray extends AbstractControl {
   at(index: number): AbstractControl { return this.controls[index]; }
 
   /**
-   * @description
    * Insert a new `AbstractControl` at the end of the array.
    *
    * @param control Form control to be inserted
@@ -1625,7 +1581,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Insert a new `AbstractControl` at the given `index` in the array.
    *
    * @param index Index in the array to insert the control
@@ -1639,7 +1594,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Remove the control at the given `index` in the array.
    *
    * @param index Index in the array to remove the control
@@ -1651,7 +1605,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Replace an existing control.
    *
    * @param index Index in the array to replace the control
@@ -1671,13 +1624,11 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Length of the control array.
    */
   get length(): number { return this.controls.length; }
 
   /**
-   * @description
    * Sets the value of the `FormArray`. It accepts an array that matches
    * the structure of the control.
    *
@@ -1699,12 +1650,15 @@ export class FormArray extends AbstractControl {
    * ```
    *
    * @param value Array of values for the controls
-   * @param options Configure options that determine how the control emits events after the
-   * value changes
+   * @param options Configure options that determine how the control propagates changes and
+   * emits events after the value changes
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
-   * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default
+   * is false.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control value is updated.
+   * When false, no events are emitted.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    */
@@ -1718,7 +1672,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Patches the value of the `FormArray`. It accepts an array that matches the
    * structure of the control, and does its best to match the values to the correct
    * controls in the group.
@@ -1739,12 +1692,15 @@ export class FormArray extends AbstractControl {
    * ```
    *
    * @param value Array of latest values for the controls
-   * @param options Configure options that determine how the control emits events after the
-   * value changes
+   * @param options Configure options that determine how the control propagates changes and
+   * emits events after the value changes
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
-   * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default
+   * is false.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control value is updated.
+   * When false, no events are emitted.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    */
@@ -1758,7 +1714,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * Resets the `FormArray` and all descendants are marked `pristine` and `untouched`, and the
    * value of all descendants to null or null maps.
    *
@@ -1791,12 +1746,15 @@ export class FormArray extends AbstractControl {
    * ```
    *
    * @param value Array of values for the controls
-   * @param options Configure options that determine how the control emits events after the
-   * value changes
+   * @param options Configure options that determine how the control propagates changes and
+   * emits events after the value changes
    *
-   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default is
-   * false.
-   * * `emitEvent`: When true (the default), each change triggers a valueChanges event.
+   * * `onlySelf`: When true, each change only affects this control, and not its parent. Default
+   * is false.
+   * * `emitEvent`: When true or not supplied (the default), both the `statusChanges` and
+   * `valueChanges`
+   * observables emit events with the latest status and value when the control is reset.
+   * When false, no events are emitted.
    * The configuration options are passed to the {@link AbstractControl#updateValueAndValidity
    * updateValueAndValidity} method.
    */
@@ -1810,7 +1768,6 @@ export class FormArray extends AbstractControl {
   }
 
   /**
-   * @description
    * The aggregate value of the array, including any disabled controls.
    *
    * Reports all values regardless of disabled status.

From e8354edcd259aa8fcf772d18a703629ea05f041b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Tue, 10 Apr 2018 15:10:29 -0700
Subject: [PATCH 311/582] test(animations): properly reference body node for
 SSR environments (#23300)

PR Close #23300
---
 .../browser/src/render/animation_engine_next.ts    |  8 +++++---
 .../src/render/timeline_animation_engine.ts        |  4 +++-
 .../src/render/transition_animation_engine.ts      |  8 +++++---
 .../test/render/timeline_animation_engine_spec.ts  | 14 ++++++++------
 .../render/transition_animation_engine_spec.ts     |  5 +++--
 packages/core/test/render3/imported_renderer2.ts   |  3 ++-
 packages/platform-browser/animations/BUILD.bazel   |  1 +
 .../platform-browser/animations/src/providers.ts   |  8 +++++---
 8 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/animations/browser/src/render/animation_engine_next.ts b/packages/animations/browser/src/render/animation_engine_next.ts
index abfdd91764..753d8b52ae 100644
--- a/packages/animations/browser/src/render/animation_engine_next.ts
+++ b/packages/animations/browser/src/render/animation_engine_next.ts
@@ -25,9 +25,11 @@ export class AnimationEngine {
   // this method is designed to be overridden by the code that uses this engine
   public onRemovalComplete = (element: any, context: any) => {};
 
-  constructor(private _driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
-    this._transitionEngine = new TransitionAnimationEngine(_driver, normalizer);
-    this._timelineEngine = new TimelineAnimationEngine(_driver, normalizer);
+  constructor(
+      private bodyNode: any, private _driver: AnimationDriver,
+      normalizer: AnimationStyleNormalizer) {
+    this._transitionEngine = new TransitionAnimationEngine(bodyNode, _driver, normalizer);
+    this._timelineEngine = new TimelineAnimationEngine(bodyNode, _driver, normalizer);
 
     this._transitionEngine.onRemovalComplete = (element: any, context: any) =>
         this.onRemovalComplete(element, context);
diff --git a/packages/animations/browser/src/render/timeline_animation_engine.ts b/packages/animations/browser/src/render/timeline_animation_engine.ts
index dad8285e01..d83ad50223 100644
--- a/packages/animations/browser/src/render/timeline_animation_engine.ts
+++ b/packages/animations/browser/src/render/timeline_animation_engine.ts
@@ -25,7 +25,9 @@ export class TimelineAnimationEngine {
   private _playersById: {[id: string]: AnimationPlayer} = {};
   public players: AnimationPlayer[] = [];
 
-  constructor(private _driver: AnimationDriver, private _normalizer: AnimationStyleNormalizer) {}
+  constructor(
+      public bodyNode: any, private _driver: AnimationDriver,
+      private _normalizer: AnimationStyleNormalizer) {}
 
   register(id: string, metadata: AnimationMetadata|AnimationMetadata[]) {
     const errors: any[] = [];
diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index d388ac1676..5c17d54c34 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -16,7 +16,7 @@ import {AnimationStyleNormalizer} from '../dsl/style_normalization/animation_sty
 import {ENTER_CLASSNAME, LEAVE_CLASSNAME, NG_ANIMATING_CLASSNAME, NG_ANIMATING_SELECTOR, NG_TRIGGER_CLASSNAME, NG_TRIGGER_SELECTOR, copyObj, eraseStyles, iteratorToArray, setStyles} from '../util';
 
 import {AnimationDriver} from './animation_driver';
-import {getBodyNode, getOrSetAsInMap, listenOnPlayer, makeAnimationEvent, normalizeKeyframes, optimizeGroupPlayer} from './shared';
+import {getOrSetAsInMap, listenOnPlayer, makeAnimationEvent, normalizeKeyframes, optimizeGroupPlayer} from './shared';
 
 const QUEUED_CLASSNAME = 'ng-animate-queued';
 const QUEUED_SELECTOR = '.ng-animate-queued';
@@ -530,7 +530,9 @@ export class TransitionAnimationEngine {
   /** @internal */
   _onRemovalComplete(element: any, context: any) { this.onRemovalComplete(element, context); }
 
-  constructor(public driver: AnimationDriver, private _normalizer: AnimationStyleNormalizer) {}
+  constructor(
+      public bodyNode: any, public driver: AnimationDriver,
+      private _normalizer: AnimationStyleNormalizer) {}
 
   get queuedPlayers(): TransitionAnimationPlayer[] {
     const players: TransitionAnimationPlayer[] = [];
@@ -890,7 +892,7 @@ export class TransitionAnimationEngine {
       }
     });
 
-    const bodyNode = getBodyNode();
+    const bodyNode = this.bodyNode;
     const allTriggerElements = Array.from(this.statesByElement.keys());
     const enterNodeMap = buildRootMap(allTriggerElements, this.collectedEnterElements);
 
diff --git a/packages/animations/browser/test/render/timeline_animation_engine_spec.ts b/packages/animations/browser/test/render/timeline_animation_engine_spec.ts
index a7c188133c..b947141633 100644
--- a/packages/animations/browser/test/render/timeline_animation_engine_spec.ts
+++ b/packages/animations/browser/test/render/timeline_animation_engine_spec.ts
@@ -9,15 +9,16 @@ import {AnimationMetadata, animate, style} from '@angular/animations';
 
 import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer';
 import {AnimationDriver} from '../../src/render/animation_driver';
+import {getBodyNode} from '../../src/render/shared';
 import {TimelineAnimationEngine} from '../../src/render/timeline_animation_engine';
 import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver';
 
 (function() {
   const defaultDriver = new MockAnimationDriver();
 
-  function makeEngine(driver?: AnimationDriver, normalizer?: AnimationStyleNormalizer) {
+  function makeEngine(body: any, driver?: AnimationDriver, normalizer?: AnimationStyleNormalizer) {
     return new TimelineAnimationEngine(
-        driver || defaultDriver, normalizer || new NoopAnimationStyleNormalizer());
+        body, driver || defaultDriver, normalizer || new NoopAnimationStyleNormalizer());
   }
 
   // these tests are only mean't to be run within the DOM
@@ -35,7 +36,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
     afterEach(() => document.body.removeChild(element));
 
     it('should animate a timeline', () => {
-      const engine = makeEngine();
+      const engine = makeEngine(getBodyNode());
       const steps = [style({height: 100}), animate(1000, style({height: 0}))];
       expect(MockAnimationDriver.log.length).toEqual(0);
       invokeAnimation(engine, element, steps);
@@ -43,7 +44,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
     });
 
     it('should not destroy timeline-based animations after they have finished', () => {
-      const engine = makeEngine();
+      const engine = makeEngine(getBodyNode());
 
       const log: string[] = [];
       function capture(value: string) {
@@ -66,7 +67,8 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
 
     it('should normalize the style values that are animateTransitioned within an a timeline animation',
        () => {
-         const engine = makeEngine(defaultDriver, new SuffixNormalizer('-normalized'));
+         const engine =
+             makeEngine(getBodyNode(), defaultDriver, new SuffixNormalizer('-normalized'));
 
          const steps = [
            style({width: '333px'}),
@@ -82,7 +84,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
 
     it('should normalize `*` values', () => {
       const driver = new SuperMockDriver();
-      const engine = makeEngine(driver);
+      const engine = makeEngine(getBodyNode(), driver);
 
       const steps = [
         style({width: '*'}),
diff --git a/packages/animations/browser/test/render/transition_animation_engine_spec.ts b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
index ad6fc89fcd..8090f81e00 100644
--- a/packages/animations/browser/test/render/transition_animation_engine_spec.ts
+++ b/packages/animations/browser/test/render/transition_animation_engine_spec.ts
@@ -11,6 +11,7 @@ import {TriggerAst} from '../../src/dsl/animation_ast';
 import {buildAnimationAst} from '../../src/dsl/animation_ast_builder';
 import {buildTrigger} from '../../src/dsl/animation_trigger';
 import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer';
+import {getBodyNode} from '../../src/render/shared';
 import {TransitionAnimationEngine} from '../../src/render/transition_animation_engine';
 import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver';
 
@@ -34,8 +35,8 @@ const DEFAULT_NAMESPACE_ID = 'id';
     afterEach(() => { document.body.removeChild(element); });
 
     function makeEngine(normalizer?: AnimationStyleNormalizer) {
-      const engine =
-          new TransitionAnimationEngine(driver, normalizer || new NoopAnimationStyleNormalizer());
+      const engine = new TransitionAnimationEngine(
+          getBodyNode(), driver, normalizer || new NoopAnimationStyleNormalizer());
       engine.createNamespace(DEFAULT_NAMESPACE_ID, element);
       return engine;
     }
diff --git a/packages/core/test/render3/imported_renderer2.ts b/packages/core/test/render3/imported_renderer2.ts
index 49ec367b85..971fdd5be2 100644
--- a/packages/core/test/render3/imported_renderer2.ts
+++ b/packages/core/test/render3/imported_renderer2.ts
@@ -50,7 +50,8 @@ export function getAnimationRendererFactory2(document: any): RendererFactory2 {
   const fakeNgZone: NgZone = new NoopNgZone();
   return new ɵAnimationRendererFactory(
       getRendererFactory2(document),
-      new ɵAnimationEngine(new MockAnimationDriver(), new ɵNoopAnimationStyleNormalizer()),
+      new ɵAnimationEngine(
+          document.body, new MockAnimationDriver(), new ɵNoopAnimationStyleNormalizer()),
       fakeNgZone);
 }
 
diff --git a/packages/platform-browser/animations/BUILD.bazel b/packages/platform-browser/animations/BUILD.bazel
index 9f9ac0ed72..efb6d45469 100644
--- a/packages/platform-browser/animations/BUILD.bazel
+++ b/packages/platform-browser/animations/BUILD.bazel
@@ -16,6 +16,7 @@ ng_module(
     deps = [
         "//packages/animations",
         "//packages/animations/browser",
+        "//packages/common",
         "//packages/core",
         "//packages/platform-browser",
     ],
diff --git a/packages/platform-browser/animations/src/providers.ts b/packages/platform-browser/animations/src/providers.ts
index fb3f995e33..4832287101 100644
--- a/packages/platform-browser/animations/src/providers.ts
+++ b/packages/platform-browser/animations/src/providers.ts
@@ -8,7 +8,8 @@
 
 import {AnimationBuilder} from '@angular/animations';
 import {AnimationDriver, ɵAnimationEngine as AnimationEngine, ɵAnimationStyleNormalizer as AnimationStyleNormalizer, ɵCssKeyframesDriver as CssKeyframesDriver, ɵNoopAnimationDriver as NoopAnimationDriver, ɵWebAnimationsDriver as WebAnimationsDriver, ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer, ɵsupportsWebAnimations as supportsWebAnimations} from '@angular/animations/browser';
-import {Injectable, InjectionToken, NgZone, Provider, RendererFactory2} from '@angular/core';
+import {DOCUMENT} from '@angular/common';
+import {Inject, Injectable, InjectionToken, NgZone, Provider, RendererFactory2} from '@angular/core';
 import {ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser';
 
 import {BrowserAnimationBuilder} from './animation_builder';
@@ -16,8 +17,9 @@ import {AnimationRendererFactory} from './animation_renderer';
 
 @Injectable()
 export class InjectableAnimationEngine extends AnimationEngine {
-  constructor(driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
-    super(driver, normalizer);
+  constructor(
+      @Inject(DOCUMENT) doc: any, driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
+    super(doc.body, driver, normalizer);
   }
 }
 

From 9782736e008d206473c00ce51d1ffd3a8c9bb96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 20 Jun 2018 15:57:10 -0700
Subject: [PATCH 312/582] release: cut the v6.0.6 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab09260578..37fa64666d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="6.0.6"></a>
+## [6.0.6](https://github.com/angular/angular/compare/6.0.5...6.0.6) (2018-06-20)
+
+
+### Bug Fixes
+
+* **compiler:** support `.` in import statements. ([#20634](https://github.com/angular/angular/issues/20634)) ([e543c73](https://github.com/angular/angular/commit/e543c73)), closes [#20363](https://github.com/angular/angular/issues/20363)
+* **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([f5b3661](https://github.com/angular/angular/commit/f5b3661))
+
+
+
+<a name="6.0.5"></a>
+## [6.0.5](https://github.com/angular/angular/compare/6.0.4...6.0.5) (2018-06-13)
+
+
 <a name="6.1.0-beta.1"></a>
 # [6.1.0-beta.1](https://github.com/angular/angular/compare/6.1.0-beta.0...6.1.0-beta.1) (2018-06-13)
 

From def354de167c44f5bbac470f9a0f2ae7271e1c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 20 Jun 2018 16:37:10 -0700
Subject: [PATCH 313/582] release: cut the v6.1.0-beta.2 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37fa64666d..29e09a595c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="6.1.0-beta.2"></a>
+# [6.1.0-beta.2](https://github.com/angular/angular/compare/6.1.0-beta.1...6.1.0-beta.2) (2018-06-20)
+
+
+### Bug Fixes
+
+* **compiler:** support `.` in import statements. ([#20634](https://github.com/angular/angular/issues/20634)) ([d8f7b29](https://github.com/angular/angular/commit/d8f7b29)), closes [#20363](https://github.com/angular/angular/issues/20363)
+* **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([ccbda9d](https://github.com/angular/angular/commit/ccbda9d))
+
+
+
 <a name="6.0.6"></a>
 ## [6.0.6](https://github.com/angular/angular/compare/6.0.5...6.0.6) (2018-06-20)
 
diff --git a/package.json b/package.json
index 68d50f1a8d..205b61772b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.1.0-beta.1",
+  "version": "6.1.0-beta.2",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From a26965812b2ba17ecc4686681d7c4e0a009b49cc Mon Sep 17 00:00:00 2001
From: Stefanie Fluin <sjtrimble@gmail.com>
Date: Fri, 15 Jun 2018 14:07:52 -0700
Subject: [PATCH 314/582] feat(docs-infra): Add GitHub and Twitter external
 icon links to topnav toolbar (#24542)

PR Close #24542
---
 aio/src/app/app.component.html               |  6 +++
 aio/src/assets/images/logos/github-icon.svg  | 14 +++++++
 aio/src/assets/images/logos/twitter-icon.svg | 13 ++++++
 aio/src/styles/1-layouts/_top-menu.scss      | 42 +++++++++++++-------
 4 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 aio/src/assets/images/logos/github-icon.svg
 create mode 100644 aio/src/assets/images/logos/twitter-icon.svg

diff --git a/aio/src/app/app.component.html b/aio/src/app/app.component.html
index 7a35fd6884..11ffff1887 100644
--- a/aio/src/app/app.component.html
+++ b/aio/src/app/app.component.html
@@ -27,6 +27,12 @@
     </a>
     <aio-top-menu *ngIf="isSideBySide" [nodes]="topMenuNodes"></aio-top-menu>
     <aio-search-box class="search-container" #searchBox (onSearch)="doSearch($event)" (onFocus)="doSearch($event)"></aio-search-box>
+    <div class="toolbar-external-icons-container">
+      <a  href="https://twitter.com/angular" title="Twitter">
+        <img src="assets/images/logos/twitter-icon.svg"></a>
+      <a  href="https://github.com/angular/angular" title="GitHub">
+        <img src="assets/images/logos/github-icon.svg"></a>
+    </div>
   </mat-toolbar-row>
 </mat-toolbar>
 
diff --git a/aio/src/assets/images/logos/github-icon.svg b/aio/src/assets/images/logos/github-icon.svg
new file mode 100644
index 0000000000..6fe590f967
--- /dev/null
+++ b/aio/src/assets/images/logos/github-icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 51.8 50.4" style="enable-background:new 0 0 51.8 50.4;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M25.9,0.2C11.8,0.2,0.3,11.7,0.3,25.8c0,11.3,7.3,20.9,17.5,24.3c1.3,0.2,1.7-0.6,1.7-1.2c0-0.6,0-2.6,0-4.8
+	c-7.1,1.5-8.6-3-8.6-3c-1.2-3-2.8-3.7-2.8-3.7c-2.3-1.6,0.2-1.6,0.2-1.6c2.6,0.2,3.9,2.6,3.9,2.6c2.3,3.9,6,2.8,7.5,2.1
+	c0.2-1.7,0.9-2.8,1.6-3.4c-5.7-0.6-11.7-2.8-11.7-12.7c0-2.8,1-5.1,2.6-6.9c-0.3-0.7-1.1-3.3,0.3-6.8c0,0,2.1-0.7,7,2.6
+	c2-0.6,4.2-0.9,6.4-0.9c2.2,0,4.4,0.3,6.4,0.9c4.9-3.3,7-2.6,7-2.6c1.4,3.5,0.5,6.1,0.3,6.8c1.6,1.8,2.6,4.1,2.6,6.9
+	c0,9.8-6,12-11.7,12.6c0.9,0.8,1.7,2.4,1.7,4.7c0,3.4,0,6.2,0,7c0,0.7,0.5,1.5,1.8,1.2c10.2-3.4,17.5-13,17.5-24.3
+	C51.5,11.7,40.1,0.2,25.9,0.2z"/>
+</svg>
diff --git a/aio/src/assets/images/logos/twitter-icon.svg b/aio/src/assets/images/logos/twitter-icon.svg
new file mode 100644
index 0000000000..4928d64d03
--- /dev/null
+++ b/aio/src/assets/images/logos/twitter-icon.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 49.7" style="enable-background:new 0 0 50 49.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M50,9.3c-1.8,0.8-3.8,1.4-5.9,1.6c2.1-1.3,3.7-3.3,4.5-5.7c-2,1.2-4.2,2-6.5,2.5c-1.9-2-4.5-3.2-7.5-3.2
+	c-5.7,0-10.3,4.6-10.3,10.3c0,0.8,0.1,1.6,0.3,2.3C16.1,16.7,8.5,12.6,3.5,6.4c-0.9,1.5-1.4,3.3-1.4,5.2c0,3.6,1.8,6.7,4.6,8.5
+	C5,20,3.4,19.6,2,18.8c0,0,0,0.1,0,0.1c0,5,3.5,9.1,8.2,10.1c-0.9,0.2-1.8,0.4-2.7,0.4c-0.7,0-1.3-0.1-1.9-0.2
+	c1.3,4.1,5.1,7,9.6,7.1c-3.5,2.8-7.9,4.4-12.7,4.4c-0.8,0-1.6,0-2.4-0.1c4.5,2.9,9.9,4.6,15.7,4.6c18.9,0,29.2-15.6,29.2-29.2
+	c0-0.4,0-0.9,0-1.3C46.9,13.2,48.6,11.4,50,9.3z"/>
+</svg>
diff --git a/aio/src/styles/1-layouts/_top-menu.scss b/aio/src/styles/1-layouts/_top-menu.scss
index 928541791b..d90ffa25e6 100644
--- a/aio/src/styles/1-layouts/_top-menu.scss
+++ b/aio/src/styles/1-layouts/_top-menu.scss
@@ -2,7 +2,6 @@
 $hamburgerShownMargin: 0 8px 0 0;
 $hamburgerHiddenMargin: 0 16px 0 -88px;
 
-
 // DOCS PAGE / STANDARD: TOPNAV TOOLBAR FIXED
 mat-toolbar.mat-toolbar {
   position: fixed;
@@ -10,7 +9,7 @@ mat-toolbar.mat-toolbar {
   right: 0;
   left: 0;
   z-index: 10;
-  box-shadow: 0 2px 5px 0 rgba(0,0,0,0.30);
+  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
 
   mat-toolbar-row {
     padding: 0 16px 0 0;
@@ -21,7 +20,6 @@ mat-toolbar.mat-toolbar {
   }
 }
 
-
 // HOME PAGE OVERRIDE: TOPNAV TOOLBAR
 aio-shell.page-home mat-toolbar.mat-toolbar {
   background-color: $blue;
@@ -29,12 +27,11 @@ aio-shell.page-home mat-toolbar.mat-toolbar {
   @media (min-width: 481px) {
     &:not(.transitioning) {
       background-color: transparent;
-      transition: background-color .2s linear;
+      transition: background-color 0.2s linear;
     }
   }
 }
 
-
 // MARKETING PAGES OVERRIDE: TOPNAV TOOLBAR AND HAMBURGER
 aio-shell.page-home mat-toolbar.mat-toolbar,
 aio-shell.page-features mat-toolbar.mat-toolbar,
@@ -48,7 +45,6 @@ aio-shell.page-resources mat-toolbar.mat-toolbar {
   }
 }
 
-
 // DOCS PAGES OVERRIDE: HAMBURGER
 aio-shell.folder-api mat-toolbar.mat-toolbar,
 aio-shell.folder-docs mat-toolbar.mat-toolbar,
@@ -62,7 +58,6 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
   }
 }
 
-
 // HAMBURGER BUTTON
 .hamburger.mat-button {
   height: 100%;
@@ -70,9 +65,9 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
   padding: 0;
 
   &:not(.starting) {
-    transition-duration: .4s;
+    transition-duration: 0.4s;
     transition-property: color, margin;
-    transition-timing-function: cubic-bezier(.25, .8, .25, 1);
+    transition-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1);
   }
 
   @media (min-width: 992px) {
@@ -91,7 +86,6 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
   }
 }
 
-
 // HOME NAV-LINK
 .nav-link.home {
   cursor: pointer;
@@ -104,7 +98,7 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
     top: 12px;
     height: 40px;
 
-    @media(max-width: 992px) {
+    @media (max-width: 992px) {
       &:hover {
         transform: scale(1.1);
       }
@@ -112,7 +106,6 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
   }
 }
 
-
 // TOP MENU
 aio-top-menu {
   display: flex;
@@ -158,7 +151,6 @@ aio-top-menu {
   }
 }
 
-
 // SEARCH BOX
 aio-search-box.search-container {
   display: flex;
@@ -181,7 +173,7 @@ aio-search-box.search-container {
     -webkit-appearance: none;
 
     &:focus {
-        outline: none;
+      outline: none;
     }
 
     @include bp(big) {
@@ -196,3 +188,25 @@ aio-search-box.search-container {
     }
   }
 }
+
+// EXTERNAL LINK ICONS
+.app-toolbar {
+  .toolbar-external-icons-container {
+    display: flex;
+    flex-direction: row;
+
+    a {
+      display: flex;
+      align-items: center;
+      margin-left: 16px;
+
+      &:hover {
+        opacity: 0.8;
+      }
+
+      img {
+        height: 24px;
+      }
+    }
+  }
+}

From 8b8168262de854a875ccedffd504df2f12a6dca0 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Mon, 18 Jun 2018 18:07:05 +0200
Subject: [PATCH 315/582] fix(ivy): nested ngFor should be supported (#24564)

PR Close #24564
---
 packages/core/src/render3/di.ts               |  5 +-
 packages/core/src/render3/instructions.ts     |  3 +-
 packages/core/src/render3/interfaces/node.ts  |  7 ++
 .../core/src/render3/node_manipulation.ts     |  5 +-
 .../test/render3/common_integration_spec.ts   | 77 +++++++++++++++++++
 5 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 24860481ea..d5a9b3a84f 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -590,6 +590,7 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
 
     lContainerNode.tNode = hostTNode.dynamicContainerNode;
     vcRefHost.dynamicLContainerNode = lContainerNode;
+    lContainerNode.dynamicParent = vcRefHost;
 
     addToViewTree(vcRefHost.view, hostTNode.index as number, lContainer);
 
@@ -649,6 +650,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
     (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
 
     insertView(this._lContainerNode, lViewNode, adjustedIdx);
+    lViewNode.dynamicParent = this._lContainerNode;
 
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
 
@@ -672,7 +674,8 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
   detach(index?: number): viewEngine_ViewRef|null {
     const adjustedIdx = this._adjustIndex(index, -1);
-    detachView(this._lContainerNode, adjustedIdx);
+    const lViewNode = detachView(this._lContainerNode, adjustedIdx);
+    lViewNode.dynamicParent = null;
     return this._viewRefs.splice(adjustedIdx, 1)[0] || null;
   }
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 774ecc245d..d687622f35 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -318,7 +318,8 @@ export function createLNodeObject(
     queries: queries,
     tNode: null !,
     pNextOrParent: null,
-    dynamicLContainerNode: null
+    dynamicLContainerNode: null,
+    dynamicParent: null
   };
 }
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index f4c1af3080..9097c82195 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -111,6 +111,12 @@ export interface LNode {
    */
   // TODO(kara): Remove when removing LNodes
   dynamicLContainerNode: LContainerNode|null;
+
+  /**
+   * A pointer to a parent LNode created dynamically and virtually by directives requesting
+   * ViewContainerRef. Applicable only to LContainerNode and LViewNode.
+   */
+  dynamicParent: LElementNode|LContainerNode|LViewNode|null;
 }
 
 
@@ -129,6 +135,7 @@ export interface LTextNode extends LNode {
   native: RText;
   readonly data: null;
   dynamicLContainerNode: null;
+  dynamicParent: null;
 }
 
 /** Abstract node which contains root nodes of a view. */
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 743a453f5c..962f0724e2 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -42,7 +42,10 @@ export function getParentLNode(node: LContainerNode | LElementNode | LTextNode |
 export function getParentLNode(node: LViewNode): LContainerNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null {
-  if (node.tNode.index === -1) return null;
+  if (node.tNode.index === -1) {
+    // This is a dynamic container or an embedded view inside a dynamic container.
+    return node.dynamicParent;
+  }
   const parent = node.tNode.parent;
   return parent ? node.view[parent.index] : node.view[HOST_NODE];
 }
diff --git a/packages/core/test/render3/common_integration_spec.ts b/packages/core/test/render3/common_integration_spec.ts
index c78872fa1d..7111562ce9 100644
--- a/packages/core/test/render3/common_integration_spec.ts
+++ b/packages/core/test/render3/common_integration_spec.ts
@@ -199,6 +199,83 @@ describe('@angular/common integration', () => {
       expect(fixture.html)
           .toEqual('<button>Toggle List</button><ul><li>1</li><li>2</li><li>3</li></ul>');
     });
+
+    it('should support multiple levels of embedded templates', () => {
+      /**
+       * <ul *ngFor="let outterItem of items.">
+       *   <li *ngFor="let item of items">
+       *      <span>{{item}}</span>
+       *   </li>
+       * </ul>
+       */
+      class MyApp {
+        items: string[] = ['1', '2'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'ul');
+              { container(1, liTemplate, null, ['ngForOf', '']); }
+              elementEnd();
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(1, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                elementStart(0, 'li');
+                { container(1, spanTemplate, null, ['ngForOf', '']); }
+                elementEnd();
+              }
+              if (rf1 & RenderFlags.Update) {
+                elementProperty(1, 'ngForOf', bind(myApp.items));
+              }
+            }
+
+            function spanTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                elementStart(0, 'span');
+                { text(1); }
+                elementEnd();
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li><span>1</span><span>2</span></li><li><span>1</span><span>2</span></li></ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li><span>1</span></li></ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li><span>one</span></li></ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li><span>one</span><span>two</span></li><li><span>one</span><span>two</span></li></ul>');
+    });
   });
 
   describe('ngIf', () => {

From b91254fc43303b03a37cb627a0bbe97abf8ae994 Mon Sep 17 00:00:00 2001
From: Elana Olson <elanaolson@gmail.com>
Date: Tue, 19 Jun 2018 15:43:22 -0700
Subject: [PATCH 316/582] docs(aio): add elana olson to contributor.json file
 (#24579)

Add new contributor, elana olson, to the contributors list.

PR Close #24579
---
 aio/content/images/bios/elanaolson.jpg  | Bin 0 -> 25635 bytes
 aio/content/marketing/contributors.json |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 aio/content/images/bios/elanaolson.jpg

diff --git a/aio/content/images/bios/elanaolson.jpg b/aio/content/images/bios/elanaolson.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3c8d4ec6298be5690e00846fe8d42ec3f6cd72b1
GIT binary patch
literal 25635
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
J-LU)l{{c1cc_jb<

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index d1a4d2bbb1..47797f3d5d 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -645,5 +645,13 @@
     "website": "https://kmaida.io/",
     "bio": "Kim is an an Angular consultant, developer, speaker, writer, and Google Developer Expert. She is passionate about learning from and sharing knowledge with other developers through blogging, speaking, workshops, and open source.",
     "group": "GDE"
+  },
+
+  "elanaolson": {
+    "name": "Elana Olson",
+    "picture": "elanaolson.jpg",
+    "twitter": "elanathellama",
+    "bio": "Elana is a Developer Relations intern on the Angular team at Google. She is working on migration paths from AngularJS to Angular and would love to chat about your experience with upgrading.",
+    "group": "Angular"
   }
 }

From 1e6a226703ac0cf3eb856ba079d5fd2c9d63831c Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 19 Jun 2018 10:41:32 +0200
Subject: [PATCH 317/582] test(ivy): ngTemplateOutlet runtime integration test
 (#24587)

PR Close #24587
---
 .../test/render3/common_integration_spec.ts   | 53 +++++++++++++++++--
 packages/core/test/render3/common_with_def.ts | 16 ++++--
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/packages/core/test/render3/common_integration_spec.ts b/packages/core/test/render3/common_integration_spec.ts
index 7111562ce9..96d33c039e 100644
--- a/packages/core/test/render3/common_integration_spec.ts
+++ b/packages/core/test/render3/common_integration_spec.ts
@@ -8,11 +8,12 @@
 
 import {NgForOfContext} from '@angular/common';
 
-import {defineComponent} from '../../src/render3/index';
-import {bind, container, elementEnd, elementProperty, elementStart, interpolation1, interpolation3, listener, text, textBinding, tick} from '../../src/render3/instructions';
+import {getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
+import {AttributeMarker, defineComponent} from '../../src/render3/index';
+import {bind, container, elementEnd, elementProperty, elementStart, interpolation1, interpolation3, listener, load, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
-import {NgForOf, NgIf} from './common_with_def';
+import {NgForOf, NgIf, NgTemplateOutlet} from './common_with_def';
 import {ComponentFixture} from './render_util';
 
 describe('@angular/common integration', () => {
@@ -338,4 +339,50 @@ describe('@angular/common integration', () => {
     });
 
   });
+
+  describe('NgTemplateOutlet', () => {
+
+    it('should create and remove embedded views', () => {
+
+      class MyApp {
+        showing = false;
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          /**
+           * <ng-template #tpl>from tpl</ng-template>
+           * <ng-template [ngTemplateOutlet]="showing ? tpl : null"></ng-template>
+           */
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              container(0, (rf1: RenderFlags) => {
+                if (rf1 & RenderFlags.Create) {
+                  text(0, 'from tpl');
+                }
+              }, undefined, undefined, ['tpl', '']);
+              container(2, undefined, null, [AttributeMarker.SelectOnly, 'ngTemplateOutlet']);
+            }
+            if (rf & RenderFlags.Update) {
+              const tplRef = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(0)));
+              elementProperty(2, 'ngTemplateOutlet', bind(myApp.showing ? tplRef : null));
+            }
+          },
+          directives: () => [NgTemplateOutlet]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('');
+
+      fixture.component.showing = true;
+      fixture.update();
+      expect(fixture.html).toEqual('from tpl');
+
+      fixture.component.showing = false;
+      fixture.update();
+      expect(fixture.html).toEqual('');
+    });
+
+  });
 });
diff --git a/packages/core/test/render3/common_with_def.ts b/packages/core/test/render3/common_with_def.ts
index 9f3742fd3b..39d1077f0b 100644
--- a/packages/core/test/render3/common_with_def.ts
+++ b/packages/core/test/render3/common_with_def.ts
@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgForOf as NgForOfDef, NgIf as NgIfDef} from '@angular/common';
-import {InjectFlags, IterableDiffers} from '@angular/core';
+import {NgForOf as NgForOfDef, NgIf as NgIfDef, NgTemplateOutlet as NgTemplateOutletDef} from '@angular/common';
+import {IterableDiffers} from '@angular/core';
 
-import {defaultIterableDiffers} from '../../src/change_detection/change_detection';
 import {DirectiveType, NgOnChangesFeature, defineDirective, directiveInject, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
 
 export const NgForOf: DirectiveType<NgForOfDef<any>> = NgForOfDef as any;
 export const NgIf: DirectiveType<NgIfDef> = NgIfDef as any;
+export const NgTemplateOutlet: DirectiveType<NgTemplateOutletDef> = NgTemplateOutletDef as any;
 
 NgForOf.ngDirectiveDef = defineDirective({
   type: NgForOfDef,
@@ -33,3 +33,13 @@ NgForOf.ngDirectiveDef = defineDirective({
   factory: () => new NgIfDef(injectViewContainerRef(), injectTemplateRef()),
   inputs: {ngIf: 'ngIf', ngIfThen: 'ngIfThen', ngIfElse: 'ngIfElse'}
 });
+
+(NgTemplateOutlet as any).ngDirectiveDef = defineDirective({
+  type: NgTemplateOutletDef,
+  selectors: [['', 'ngTemplateOutlet', '']],
+  factory: () => new NgTemplateOutletDef(injectViewContainerRef()),
+  features: [NgOnChangesFeature(
+      {ngTemplateOutlet: 'ngTemplateOutlet', ngTemplateOutletContext: 'ngTemplateOutletContext'})],
+  inputs:
+      {ngTemplateOutlet: 'ngTemplateOutlet', ngTemplateOutletContext: 'ngTemplateOutletContext'}
+});

From 3e1a3b2e327232853ca88f13aaf5b1d6d6697ffa Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 19 Jun 2018 17:58:42 +0200
Subject: [PATCH 318/582] fix(ivy): support queries for views inserted in
 lifecycle hooks (#24587)

Closes #23707

PR Close #24587
---
 packages/core/src/render3/STATUS.md           |    2 +-
 packages/core/src/render3/component.ts        |    2 +-
 packages/core/src/render3/component_ref.ts    |    2 +-
 packages/core/src/render3/definition.ts       |   16 +-
 packages/core/src/render3/instructions.ts     |   44 +-
 .../core/src/render3/interfaces/definition.ts |   14 +-
 packages/core/src/render3/interfaces/view.ts  |    7 +-
 .../hello_world/bundle.golden_symbols.json    |    6 +
 .../bundling/todo/bundle.golden_symbols.json  |    6 +
 .../render3/compiler_canonical/query_spec.ts  |    8 +-
 packages/core/test/render3/di_spec.ts         |    4 +-
 packages/core/test/render3/query_spec.ts      | 1990 ++++++++++-------
 packages/core/test/render3/render_util.ts     |    4 +-
 13 files changed, 1243 insertions(+), 862 deletions(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index bf1f5d0c10..233fdbb7ff 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -192,7 +192,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `@ContentChildren`              |  ✅     |  ✅      |  ❌       |
 | `@ContentChild`                 |  ✅     |  ✅      |  ✅       |
 | `@ViewChildren`                 |  ✅     |  ✅      |  ❌       |
-| `@ViewChild`                    |  ✅     |  ✅      |  ✅       |
+| `@ViewChild`                    |  ✅     |  ✅      |  ❌       |
 
 
 
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 2009bf8f21..2888fa3138 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -107,7 +107,7 @@ export function renderComponent<T>(
 
   const rootView: LViewData = createLViewData(
       rendererFactory.createRenderer(hostNode, componentDef.rendererType),
-      createTView(-1, null, null, null), rootContext,
+      createTView(-1, null, null, null, null), rootContext,
       componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
   rootView[INJECTOR] = opts.injector || null;
 
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index a3aca371ee..ea8453b4ed 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -96,7 +96,7 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     // Create the root view. Uses empty TView and ContentTemplate.
     const rootView: LViewData = createLViewData(
         rendererFactory.createRenderer(hostNode, this.componentDef.rendererType),
-        createTView(-1, null, null, null), null,
+        createTView(-1, null, null, null, null), null,
         this.componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
     rootView[INJECTOR] = ngModule && ngModule.injector || null;
 
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index fd6a4b08d4..f8ce00f91c 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -8,7 +8,6 @@
 
 import {SimpleChange} from '../change_detection/change_detection_util';
 import {ChangeDetectionStrategy} from '../change_detection/constants';
-import {PipeTransform} from '../change_detection/pipe_transform';
 import {Provider} from '../core';
 import {OnChanges, SimpleChanges} from '../metadata/lifecycle_hooks';
 import {NgModuleDef, NgModuleDefInternal} from '../metadata/ng_module';
@@ -17,7 +16,7 @@ import {Type} from '../type';
 import {resolveRendererType2} from '../view/util';
 
 import {diPublic} from './di';
-import {ComponentDefFeature, ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefFeature, DirectiveDefInternal, DirectiveDefListOrFactory, DirectiveType, DirectiveTypesOrFactory, PipeDef, PipeType, PipeTypesOrFactory} from './interfaces/definition';
+import {ComponentDefFeature, ComponentDefInternal, ComponentQuery, ComponentTemplate, ComponentType, DirectiveDefFeature, DirectiveDefInternal, DirectiveDefListOrFactory, DirectiveType, DirectiveTypesOrFactory, PipeDef, PipeType, PipeTypesOrFactory} from './interfaces/definition';
 import {CssSelectorList, SelectorFlags} from './interfaces/projection';
 
 
@@ -126,6 +125,16 @@ export function defineComponent<T>(componentDefinition: {
    */
   template: ComponentTemplate<T>;
 
+  /**
+   * Additional set of instructions specific to view query processing. This could be seen as a
+   * set of instruction to be inserted into the template function.
+   *
+   * Query-related instructions need to be pulled out to a specific function as a timing of
+   * execution is different as compared to all other instructions (after change detection hooks but
+   * before view hooks).
+   */
+  viewQuery?: ComponentQuery<T>| null;
+
   /**
    * A list of optional features to apply.
    *
@@ -193,7 +202,8 @@ export function defineComponent<T>(componentDefinition: {
     pipeDefs: pipeTypes ?
         () => (typeof pipeTypes === 'function' ? pipeTypes() : pipeTypes).map(extractPipeDef) :
         null,
-    selectors: componentDefinition.selectors
+    selectors: componentDefinition.selectors,
+    viewQuery: componentDefinition.viewQuery || null,
   };
   const feature = componentDefinition.features;
   feature && feature.forEach((fn) => fn(def));
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index d687622f35..88bff707a6 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -23,7 +23,7 @@ import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNode
 import {assertNodeType} from './node_assert';
 import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {ComponentDefInternal, ComponentTemplate, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
+import {ComponentDefInternal, ComponentTemplate, ComponentQuery, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
@@ -446,7 +446,7 @@ export function renderTemplate<T>(
   if (host == null) {
     resetApplicationState();
     rendererFactory = providedRendererFactory;
-    const tView = getOrCreateTView(template, directives || null, pipes || null);
+    const tView = getOrCreateTView(template, directives || null, pipes || null, null);
     host = createLNode(
         -1, TNodeType.Element, hostNode, null, null,
         createLViewData(
@@ -809,7 +809,7 @@ function saveResolvedLocalsInData(): void {
  */
 function getOrCreateTView(
     template: ComponentTemplate<any>, directives: DirectiveDefListOrFactory | null,
-    pipes: PipeDefListOrFactory | null): TView {
+    pipes: PipeDefListOrFactory | null, viewQuery: ComponentQuery<any>| null): TView {
   // TODO(misko): reading `ngPrivateData` here is problematic for two reasons
   // 1. It is a megamorphic call on each invocation.
   // 2. For nested embedded views (ngFor inside ngFor) the template instance is per
@@ -818,7 +818,7 @@ function getOrCreateTView(
   // and not on embedded templates.
 
   return template.ngPrivateData ||
-      (template.ngPrivateData = createTView(-1, template, directives, pipes) as never);
+      (template.ngPrivateData = createTView(-1, template, directives, pipes, viewQuery) as never);
 }
 
 /**
@@ -830,11 +830,13 @@ function getOrCreateTView(
  */
 export function createTView(
     viewIndex: number, template: ComponentTemplate<any>| null,
-    directives: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null): TView {
+    directives: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null,
+    viewQuery: ComponentQuery<any>| null): TView {
   ngDevMode && ngDevMode.tView++;
   return {
     id: viewIndex,
     template: template,
+    viewQuery: viewQuery,
     node: null !,
     data: HEADER_FILLER.slice(),  // Fill in to match HEADER_OFFSET in LViewData
     childIndex: -1,               // Children set in addToViewTree(), if any
@@ -937,8 +939,8 @@ export function hostElement(
   const node = createLNode(
       0, TNodeType.Element, rNode, null, null,
       createLViewData(
-          renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs), null,
-          def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
+          renderer, getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs, def.viewQuery),
+          null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, sanitizer));
 
   if (firstTemplatePass) {
     node.tNode.flags = TNodeFlags.isComponent;
@@ -1418,7 +1420,7 @@ export function directiveCreate<T>(
 
 function addComponentLogic<T>(
     directiveIndex: number, instance: T, def: ComponentDefInternal<T>): void {
-  const tView = getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs);
+  const tView = getOrCreateTView(def.template, def.directiveDefs, def.pipeDefs, def.viewQuery);
 
   // Only component views should be added to the view tree directly. Embedded views are
   // accessed through their containers because they may be removed / re-added later.
@@ -1608,8 +1610,9 @@ export function container(
   appendChild(getParentLNode(node), comment, viewData);
 
   if (firstTemplatePass) {
-    node.tNode.tViews =
-        template ? createTView(-1, template, tView.directiveRegistry, tView.pipeRegistry) : [];
+    node.tNode.tViews = template ?
+        createTView(-1, template, tView.directiveRegistry, tView.pipeRegistry, null) :
+        [];
   }
 
   // Containers are added to the current view tree instead of their embedded views
@@ -1775,7 +1778,7 @@ function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TV
   ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
   if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
     containerTViews[viewIndex] =
-        createTView(viewIndex, null, tView.directiveRegistry, tView.pipeRegistry);
+        createTView(viewIndex, null, tView.directiveRegistry, tView.pipeRegistry, null);
   }
   return containerTViews[viewIndex];
 }
@@ -2198,17 +2201,34 @@ export function checkNoChanges<T>(component: T): void {
 export function detectChangesInternal<T>(
     hostView: LViewData, hostNode: LElementNode, component: T) {
   const oldView = enterView(hostView, hostNode);
-  const template = hostView[TVIEW].template !;
+  const hostTView = hostView[TVIEW];
+  const template = hostTView.template !;
+  const viewQuery = hostTView.viewQuery;
 
   try {
     namespaceHTML();
+    createViewQuery(viewQuery, hostView[FLAGS], component);
     template(getRenderFlags(hostView), component);
     refreshView();
+    updateViewQuery(viewQuery, component);
   } finally {
     leaveView(oldView);
   }
 }
 
+function createViewQuery<T>(
+    viewQuery: ComponentQuery<{}>| null, flags: LViewFlags, component: T): void {
+  if (viewQuery && (flags & LViewFlags.CreationMode)) {
+    viewQuery(RenderFlags.Create, component);
+  }
+}
+
+function updateViewQuery<T>(viewQuery: ComponentQuery<{}>| null, component: T): void {
+  if (viewQuery) {
+    viewQuery(RenderFlags.Update, component);
+  }
+}
+
 
 /**
  * Mark the component as dirty (needing change detection).
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index b13d1924d0..69d685919b 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -18,6 +18,11 @@ export type ComponentTemplate<T> = {
   (rf: RenderFlags, ctx: T): void; ngPrivateData?: never;
 };
 
+/**
+ * Definition of what a query function should look like.
+ */
+export type ComponentQuery<T> = ComponentTemplate<T>;
+
 /**
  * Flags passed into template functions to determine which blocks (i.e. creation, update)
  * should be executed.
@@ -153,15 +158,16 @@ export type ComponentDefInternal<T> = ComponentDef<T, string>;
 export interface ComponentDef<T, Selector extends string> extends DirectiveDef<T, Selector> {
   /**
    * The View template of the component.
-   *
-   * NOTE: only used with component directives.
    */
   readonly template: ComponentTemplate<T>;
 
+  /**
+   * Query-related instructions for a component.
+   */
+  readonly viewQuery: ComponentQuery<T>|null;
+
   /**
    * Renderer type data of the component.
-   *
-   * NOTE: only used with component directives.
    */
   readonly rendererType: RendererType2|null;
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 5f199104cc..a98e10dd6b 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -10,7 +10,7 @@ import {Injector} from '../../di/injector';
 import {Sanitizer} from '../../sanitization/security';
 
 import {LContainer} from './container';
-import {ComponentTemplate, DirectiveDefInternal, DirectiveDefList, PipeDef, PipeDefList} from './definition';
+import {ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefList, PipeDef, PipeDefList} from './definition';
 import {LElementNode, LViewNode, TNode} from './node';
 import {LQueries} from './query';
 import {Renderer3} from './renderer';
@@ -200,6 +200,11 @@ export interface TView {
    */
   template: ComponentTemplate<{}>|null;
 
+  /**
+   * A function containing query-related instructions.
+   */
+  viewQuery: ComponentQuery<{}>|null;
+
   /**
    * Pointer to the `TNode` that represents the root of the view.
    *
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 6fc22af83c..3b45ff5977 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -119,6 +119,9 @@
   {
     "name": "createTextNode"
   },
+  {
+    "name": "createViewQuery"
+  },
   {
     "name": "defineComponent"
   },
@@ -221,6 +224,9 @@
   {
     "name": "text"
   },
+  {
+    "name": "updateViewQuery"
+  },
   {
     "name": "viewAttached"
   }
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 80369b3b06..03d1fc5334 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -266,6 +266,9 @@
   {
     "name": "createTextNode"
   },
+  {
+    "name": "createViewQuery"
+  },
   {
     "name": "defineComponent"
   },
@@ -548,6 +551,9 @@
   {
     "name": "tickRootContext"
   },
+  {
+    "name": "updateViewQuery"
+  },
   {
     "name": "viewAttached"
   },
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index 98c3a6151d..4861072624 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -54,13 +54,17 @@ describe('queries', () => {
         factory: function ViewQueryComponent_Factory() { return new ViewQueryComponent(); },
         template: function ViewQueryComponent_Template(
             rf: $RenderFlags$, ctx: $ViewQueryComponent$) {
-          let $tmp$: any;
+          if (rf & 1) {
+            $r3$.ɵEe(2, 'div', $e1_attrs$);
+          }
+        },
+        viewQuery: function ViewQueryComponent_Query(rf: $RenderFlags$, ctx: $ViewQueryComponent$) {
           if (rf & 1) {
             $r3$.ɵQ(0, SomeDirective, false);
             $r3$.ɵQ(1, SomeDirective, false);
-            $r3$.ɵEe(2, 'div', $e1_attrs$);
           }
           if (rf & 2) {
+            let $tmp$: any;
             $r3$.ɵqR($tmp$ = $r3$.ɵld<QueryList<any>>(0)) && (ctx.someDir = $tmp$.first);
             $r3$.ɵqR($tmp$ = $r3$.ɵld<QueryList<any>>(1)) &&
                 (ctx.someDirList = $tmp$ as QueryList<any>);
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 31db90bae7..e910548115 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1403,8 +1403,8 @@ describe('di', () => {
 
   describe('getOrCreateNodeInjector', () => {
     it('should handle initial undefined state', () => {
-      const contentView =
-          createLViewData(null !, createTView(-1, null, null, null), null, LViewFlags.CheckAlways);
+      const contentView = createLViewData(
+          null !, createTView(-1, null, null, null, null), null, LViewFlags.CheckAlways);
       const oldView = enterView(contentView, null !);
       try {
         const parent = createLNode(0, TNodeType.Element, null, null, null, null);
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 9efe0bdb3c..9c613e81d8 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -16,7 +16,7 @@ import {bind, container, containerRefreshEnd, containerRefreshStart, element, el
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, queryRefresh} from '../../src/render3/query';
 
-import {NgForOf, NgIf} from './common_with_def';
+import {NgForOf, NgIf, NgTemplateOutlet} from './common_with_def';
 import {ComponentFixture, TemplateFixture, createComponent, createDirective, renderComponent} from './render_util';
 
 
@@ -54,640 +54,794 @@ describe('query', () => {
 
     let child1 = null;
     let child2 = null;
-    const Cmp = createComponent('cmp', function(rf: RenderFlags, ctx: any) {
-      /**
-       * <child>
-       *   <child>
-       *   </child>
-       * </child>
-       * class Cmp {
-       *   @ViewChildren(Child) query0;
-       *   @ViewChildren(Child, {descend: true}) query1;
-       * }
-       */
-      let tmp: any;
-      if (rf & RenderFlags.Create) {
-        query(0, Child, false);
-        query(1, Child, true);
-        elementStart(2, 'child');
-        {
-          child1 = loadDirective(0);
-          elementStart(3, 'child');
-          { child2 = loadDirective(1); }
-          elementEnd();
-        }
-        elementEnd();
-      }
-      if (rf & RenderFlags.Update) {
-        queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query0 = tmp as QueryList<any>);
-        queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.query1 = tmp as QueryList<any>);
-      }
-    }, [Child]);
+    const Cmp = createComponent(
+        'cmp',
+        function(rf: RenderFlags, ctx: any) {
+          /**
+           * <child>
+           *   <child>
+           *   </child>
+           * </child>
+           * class Cmp {
+           *   @ViewChildren(Child) query0;
+           *   @ViewChildren(Child, {descend: true}) query1;
+           * }
+           */
+          if (rf & RenderFlags.Create) {
+            elementStart(2, 'child');
+            { element(3, 'child'); }
+            elementEnd();
+          }
+          if (rf & RenderFlags.Update) {
+            child1 = loadDirective(0);
+            child2 = loadDirective(1);
+          }
+        },
+        [Child], [],
+        function(rf: RenderFlags, ctx: any) {
+          if (rf & RenderFlags.Create) {
+            query(0, Child, false);
+            query(1, Child, true);
+          }
+          if (rf & RenderFlags.Update) {
+            let tmp: any;
+            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query0 = tmp as QueryList<any>);
+            queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.query1 = tmp as QueryList<any>);
+          }
+        });
 
     const parent = renderComponent(Cmp);
     expect((parent.query0 as QueryList<any>).toArray()).toEqual([child1]);
     expect((parent.query1 as QueryList<any>).toArray()).toEqual([child1, child2]);
   });
 
-  describe('types predicate', () => {
+  describe('predicate', () => {
+    describe('types', () => {
 
-    it('should query using type predicate and read a specified token', () => {
-      const Child = createDirective('child');
-      let elToQuery;
-      /**
-       * <div child></div>
-       * class Cmpt {
-       *  @ViewChildren(Child, {read: ElementRef}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, Child, false, QUERY_READ_ELEMENT_REF);
-          elToQuery = elementStart(1, 'div', ['child', '']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child]);
+      it('should query using type predicate and read a specified token', () => {
+        const Child = createDirective('child');
+        let elToQuery;
+        /**
+         * <div child></div>
+         * class Cmpt {
+         *  @ViewChildren(Child, {read: ElementRef}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                elToQuery = elementStart(1, 'div', ['child', '']);
+                elementEnd();
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, Child, false, QUERY_READ_ELEMENT_REF);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(isElementRef(qList.first)).toBeTruthy();
-      expect(qList.first.nativeElement).toEqual(elToQuery);
-    });
-
-
-    it('should query using type predicate and read another directive type', () => {
-      const Child = createDirective('child');
-      const OtherChild = createDirective('otherChild');
-      let otherChildInstance;
-      /**
-       * <div child otherChild></div>
-       * class Cmpt {
-       *  @ViewChildren(Child, {read: OtherChild}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, Child, false, OtherChild);
-          elementStart(1, 'div', ['child', '', 'otherChild', '']);
-          { otherChildInstance = loadDirective(1); }
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child, OtherChild]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(qList.first).toBe(otherChildInstance);
-    });
-
-    it('should not add results to query if a requested token cant be read', () => {
-      const Child = createDirective('child');
-      const OtherChild = createDirective('otherChild');
-      /**
-       * <div child></div>
-       * class Cmpt {
-       *  @ViewChildren(Child, {read: OtherChild}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, Child, false, OtherChild);
-          elementStart(1, 'div', ['child', '']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child, OtherChild]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(0);
-    });
-  });
-
-  describe('local names predicate', () => {
-
-    it('should query for a single element and read ElementRef by default', () => {
-
-      let elToQuery;
-      /**
-       * <div #foo></div>
-       * <div></div>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, QUERY_READ_FROM_NODE);
-          elToQuery = elementStart(1, 'div', null, ['foo', '']);
-          elementEnd();
-          elementStart(3, 'div');
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(isElementRef(qList.first)).toBeTruthy();
+        expect(qList.first.nativeElement).toBe(elToQuery);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(qList.first.nativeElement).toEqual(elToQuery);
-    });
+      it('should query using type predicate and read another directive type', () => {
+        const Child = createDirective('child');
+        const OtherChild = createDirective('otherChild');
+        let otherChildInstance;
+        /**
+         * <div child otherChild></div>
+         * class Cmpt {
+         *  @ViewChildren(Child, {read: OtherChild}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                elementStart(1, 'div', ['child', '', 'otherChild', '']);
+                { otherChildInstance = loadDirective(1); }
+                elementEnd();
+              }
+            },
+            [Child, OtherChild], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, Child, false, OtherChild);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
-    it('should query multiple locals on the same element', () => {
-      let elToQuery;
-
-      /**
-       * <div #foo #bar></div>
-       * <div></div>
-       * class Cmpt {
-       *  @ViewChildren('foo') fooQuery;
-       *  @ViewChildren('bar') barQuery;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, QUERY_READ_FROM_NODE);
-          query(1, ['bar'], false, QUERY_READ_FROM_NODE);
-          elToQuery = elementStart(2, 'div', null, ['foo', '', 'bar', '']);
-          elementEnd();
-          elementStart(5, 'div');
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.fooQuery = tmp as QueryList<any>);
-          queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.barQuery = tmp as QueryList<any>);
-        }
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(qList.first).toBe(otherChildInstance);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
+      it('should not add results to query if a requested token cant be read', () => {
+        const Child = createDirective('child');
+        const OtherChild = createDirective('otherChild');
+        /**
+         * <div child></div>
+         * class Cmpt {
+         *  @ViewChildren(Child, {read: OtherChild}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                elementStart(1, 'div', ['child', '']);
+                elementEnd();
+              }
+            },
+            [Child, OtherChild], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, Child, false, OtherChild);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
-      const fooList = (cmptInstance.fooQuery as QueryList<any>);
-      expect(fooList.length).toBe(1);
-      expect(fooList.first.nativeElement).toEqual(elToQuery);
-
-      const barList = (cmptInstance.barQuery as QueryList<any>);
-      expect(barList.length).toBe(1);
-      expect(barList.first.nativeElement).toEqual(elToQuery);
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(0);
+      });
     });
 
-    it('should query for multiple elements and read ElementRef by default', () => {
+    describe('local names', () => {
 
-      let el1ToQuery;
-      let el2ToQuery;
-      /**
-       * <div #foo></div>
-       * <div></div>
-       * <div #bar></div>
-       * class Cmpt {
-       *  @ViewChildren('foo,bar') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo', 'bar'], undefined, QUERY_READ_FROM_NODE);
-          el1ToQuery = elementStart(1, 'div', null, ['foo', '']);
-          elementEnd();
-          elementStart(3, 'div');
-          elementEnd();
-          el2ToQuery = elementStart(4, 'div', null, ['bar', '']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+      it('should query for a single element and read ElementRef by default', () => {
+
+        let elToQuery;
+        /**
+         * <div #foo></div>
+         * <div></div>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                elToQuery = elementStart(1, 'div', null, ['foo', '']);
+                elementEnd();
+                elementStart(3, 'div');
+                elementEnd();
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(qList.first.nativeElement).toEqual(elToQuery);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(2);
-      expect(qList.first.nativeElement).toEqual(el1ToQuery);
-      expect(qList.last.nativeElement).toEqual(el2ToQuery);
-    });
+      it('should query multiple locals on the same element', () => {
+        let elToQuery;
 
-    it('should read ElementRef from an element when explicitly asked for', () => {
+        /**
+         * <div #foo #bar></div>
+         * <div></div>
+         * class Cmpt {
+         *  @ViewChildren('foo') fooQuery;
+         *  @ViewChildren('bar') barQuery;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                elToQuery = elementStart(2, 'div', null, ['foo', '', 'bar', '']);
+                elementEnd();
+                elementStart(5, 'div');
+                elementEnd();
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, QUERY_READ_FROM_NODE);
+                query(1, ['bar'], false, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                    (ctx.fooQuery = tmp as QueryList<any>);
+                queryRefresh(tmp = load<QueryList<any>>(1)) &&
+                    (ctx.barQuery = tmp as QueryList<any>);
+              }
+            });
 
-      let elToQuery;
-      /**
-       * <div #foo></div>
-       * <div></div>
-       * class Cmpt {
-       *  @ViewChildren('foo', {read: ElementRef}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, QUERY_READ_ELEMENT_REF);
-          elToQuery = elementStart(1, 'div', null, ['foo', '']);
-          elementEnd();
-          elementStart(3, 'div');
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        const cmptInstance = renderComponent(Cmpt);
+
+        const fooList = (cmptInstance.fooQuery as QueryList<any>);
+        expect(fooList.length).toBe(1);
+        expect(fooList.first.nativeElement).toEqual(elToQuery);
+
+        const barList = (cmptInstance.barQuery as QueryList<any>);
+        expect(barList.length).toBe(1);
+        expect(barList.first.nativeElement).toEqual(elToQuery);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(isElementRef(qList.first)).toBeTruthy();
-      expect(qList.first.nativeElement).toEqual(elToQuery);
-    });
+      it('should query for multiple elements and read ElementRef by default', () => {
 
-    it('should read ViewContainerRef from element nodes when explicitly asked for', () => {
-      /**
-       * <div #foo></div>
-       * class Cmpt {
-       *  @ViewChildren('foo', {read: ViewContainerRef}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, QUERY_READ_CONTAINER_REF);
-          elementStart(1, 'div', null, ['foo', '']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        let el1ToQuery;
+        let el2ToQuery;
+        /**
+         * <div #foo></div>
+         * <div></div>
+         * <div #bar></div>
+         * class Cmpt {
+         *  @ViewChildren('foo,bar') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                el1ToQuery = elementStart(1, 'div', null, ['foo', '']);
+                elementEnd();
+                elementStart(3, 'div');
+                elementEnd();
+                el2ToQuery = elementStart(4, 'div', null, ['bar', '']);
+                elementEnd();
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo', 'bar'], undefined, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(2);
+        expect(qList.first.nativeElement).toEqual(el1ToQuery);
+        expect(qList.last.nativeElement).toEqual(el2ToQuery);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(isViewContainerRef(qList.first)).toBeTruthy();
-    });
+      it('should read ElementRef from an element when explicitly asked for', () => {
 
-    it('should read ViewContainerRef from container nodes when explicitly asked for', () => {
-      /**
-       * <ng-template #foo></ng-template>
-       * class Cmpt {
-       *  @ViewChildren('foo', {read: ViewContainerRef}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, QUERY_READ_CONTAINER_REF);
-          container(1, undefined, undefined, undefined, ['foo', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        let elToQuery;
+        /**
+         * <div #foo></div>
+         * <div></div>
+         * class Cmpt {
+         *  @ViewChildren('foo', {read: ElementRef}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                elToQuery = elementStart(1, 'div', null, ['foo', '']);
+                elementEnd();
+                element(3, 'div');
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, QUERY_READ_ELEMENT_REF);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(isElementRef(qList.first)).toBeTruthy();
+        expect(qList.first.nativeElement).toEqual(elToQuery);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(isViewContainerRef(qList.first)).toBeTruthy();
-    });
+      it('should read ViewContainerRef from element nodes when explicitly asked for', () => {
+        /**
+         * <div #foo></div>
+         * class Cmpt {
+         *  @ViewChildren('foo', {read: ViewContainerRef}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                element(1, 'div', null, ['foo', '']);
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, QUERY_READ_CONTAINER_REF);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
-    it('should read ElementRef with a native element pointing to comment DOM node from containers',
-       () => {
-         /**
-          * <ng-template #foo></ng-template>
-          * class Cmpt {
-          *  @ViewChildren('foo', {read: ElementRef}) query;
-          * }
-          */
-         const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-           let tmp: any;
-           if (rf & RenderFlags.Create) {
-             query(0, ['foo'], false, QUERY_READ_ELEMENT_REF);
-             container(1, undefined, undefined, undefined, ['foo', '']);
-           }
-           if (rf & RenderFlags.Update) {
-             queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-           }
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(isViewContainerRef(qList.first)).toBeTruthy();
+      });
+
+      it('should read ViewContainerRef from container nodes when explicitly asked for', () => {
+        /**
+         * <ng-template #foo></ng-template>
+         * class Cmpt {
+         *  @ViewChildren('foo', {read: ViewContainerRef}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1, undefined, undefined, undefined, ['foo', '']);
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, QUERY_READ_CONTAINER_REF);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(isViewContainerRef(qList.first)).toBeTruthy();
+      });
+
+      it('should read ElementRef with a native element pointing to comment DOM node from containers',
+         () => {
+           /**
+            * <ng-template #foo></ng-template>
+            * class Cmpt {
+            *  @ViewChildren('foo', {read: ElementRef}) query;
+            * }
+            */
+           const Cmpt = createComponent(
+               'cmpt',
+               function(rf: RenderFlags, ctx: any) {
+                 if (rf & RenderFlags.Create) {
+                   container(1, undefined, undefined, undefined, ['foo', '']);
+                 }
+               },
+               [], [],
+               function(rf: RenderFlags, ctx: any) {
+
+                 if (rf & RenderFlags.Create) {
+                   query(0, ['foo'], false, QUERY_READ_ELEMENT_REF);
+                 }
+                 if (rf & RenderFlags.Update) {
+                   let tmp: any;
+                   queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                       (ctx.query = tmp as QueryList<any>);
+                 }
+               });
+
+           const cmptInstance = renderComponent(Cmpt);
+           const qList = (cmptInstance.query as QueryList<any>);
+           expect(qList.length).toBe(1);
+           expect(isElementRef(qList.first)).toBeTruthy();
+           expect(qList.first.nativeElement.nodeType).toBe(8);  // Node.COMMENT_NODE = 8
          });
 
-         const cmptInstance = renderComponent(Cmpt);
-         const qList = (cmptInstance.query as QueryList<any>);
-         expect(qList.length).toBe(1);
-         expect(isElementRef(qList.first)).toBeTruthy();
-         expect(qList.first.nativeElement.nodeType).toBe(8);  // Node.COMMENT_NODE = 8
-       });
+      it('should read TemplateRef from container nodes by default', () => {
+        // http://plnkr.co/edit/BVpORly8wped9I3xUYsX?p=preview
+        /**
+         * <ng-template #foo></ng-template>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1, undefined, undefined, undefined, ['foo', '']);
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], undefined, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
-    it('should read TemplateRef from container nodes by default', () => {
-      // http://plnkr.co/edit/BVpORly8wped9I3xUYsX?p=preview
-      /**
-       * <ng-template #foo></ng-template>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], undefined, QUERY_READ_FROM_NODE);
-          container(1, undefined, undefined, undefined, ['foo', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(isTemplateRef(qList.first)).toBeTruthy();
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(isTemplateRef(qList.first)).toBeTruthy();
-    });
 
+      it('should read TemplateRef from container nodes when explicitly asked for', () => {
+        /**
+         * <ng-template #foo></ng-template>
+         * class Cmpt {
+         *  @ViewChildren('foo', {read: TemplateRef}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1, undefined, undefined, undefined, ['foo', '']);
+              }
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, QUERY_READ_TEMPLATE_REF);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
-    it('should read TemplateRef from container nodes when explicitly asked for', () => {
-      /**
-       * <ng-template #foo></ng-template>
-       * class Cmpt {
-       *  @ViewChildren('foo', {read: TemplateRef}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, QUERY_READ_TEMPLATE_REF);
-          container(1, undefined, undefined, undefined, ['foo', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(isTemplateRef(qList.first)).toBeTruthy();
+      });
+
+      it('should read component instance if element queried for is a component host', () => {
+        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {});
+
+        let childInstance;
+        /**
+         * <child #foo></child>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                element(1, 'child', null, ['foo', '']);
+              }
+              if (rf & RenderFlags.Update) {
+                childInstance = loadDirective(0);
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(qList.first).toBe(childInstance);
+      });
+
+      it('should read component instance with explicit exportAs', () => {
+        let childInstance: Child;
+
+        class Child {
+          static ngComponentDef = defineComponent({
+            type: Child,
+            selectors: [['child']],
+            factory: () => childInstance = new Child(),
+            template: (rf: RenderFlags, ctx: Child) => {},
+            exportAs: 'child'
+          });
+        }
+
+        /**
+         * <child #foo="child"></child>
+         * class Cmpt {
+         *  @ViewChildren('foo') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                element(1, 'child', null, ['foo', 'child']);
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(qList.first).toBe(childInstance !);
+      });
+
+      it('should read directive instance if element queried for has an exported directive with a matching name',
+         () => {
+           const Child = createDirective('child', {exportAs: 'child'});
+
+           let childInstance;
+           /**
+            * <div #foo="child" child></div>
+            * class Cmpt {
+            *  @ViewChildren('foo') query;
+            * }
+            */
+           const Cmpt = createComponent(
+               'cmpt',
+               function(rf: RenderFlags, ctx: any) {
+                 if (rf & RenderFlags.Create) {
+                   element(1, 'div', ['child', ''], ['foo', 'child']);
+                 }
+                 if (rf & RenderFlags.Update) {
+                   childInstance = loadDirective(0);
+                 }
+               },
+               [Child], [],
+               function(rf: RenderFlags, ctx: any) {
+                 if (rf & RenderFlags.Create) {
+                   query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+                 }
+                 if (rf & RenderFlags.Update) {
+                   let tmp: any;
+                   queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                       (ctx.query = tmp as QueryList<any>);
+                 }
+               });
+
+           const cmptInstance = renderComponent(Cmpt);
+           const qList = (cmptInstance.query as QueryList<any>);
+           expect(qList.length).toBe(1);
+           expect(qList.first).toBe(childInstance);
+         });
+
+      it('should read all matching directive instances from a given element', () => {
+        const Child1 = createDirective('child1', {exportAs: 'child1'});
+        const Child2 = createDirective('child2', {exportAs: 'child2'});
+
+        let child1Instance, child2Instance;
+        /**
+         * <div #foo="child1" child1 #bar="child2" child2></div>
+         * class Cmpt {
+         *  @ViewChildren('foo, bar') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                element(1, 'div', ['child1', '', 'child2', ''], ['foo', 'child1', 'bar', 'child2']);
+              }
+              if (rf & RenderFlags.Update) {
+                child1Instance = loadDirective(0);
+                child2Instance = loadDirective(1);
+              }
+            },
+            [Child1, Child2], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo', 'bar'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(2);
+        expect(qList.first).toBe(child1Instance);
+        expect(qList.last).toBe(child2Instance);
+      });
+
+      it('should read multiple locals exporting the same directive from a given element', () => {
+        const Child = createDirective('child', {exportAs: 'child'});
+        let childInstance;
+
+        /**
+         * <div child #foo="child" #bar="child"></div>
+         * class Cmpt {
+         *  @ViewChildren('foo') fooQuery;
+         *  @ViewChildren('bar') barQuery;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                element(2, 'div', ['child', ''], ['foo', 'child', 'bar', 'child']);
+              }
+              if (rf & RenderFlags.Update) {
+                childInstance = loadDirective(0);
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+                query(1, ['bar'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                    (ctx.fooQuery = tmp as QueryList<any>);
+                queryRefresh(tmp = load<QueryList<any>>(1)) &&
+                    (ctx.barQuery = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+
+        const fooList = cmptInstance.fooQuery as QueryList<any>;
+        expect(fooList.length).toBe(1);
+        expect(fooList.first).toBe(childInstance);
+
+        const barList = cmptInstance.barQuery as QueryList<any>;
+        expect(barList.length).toBe(1);
+        expect(barList.first).toBe(childInstance);
+      });
+
+      it('should match on exported directive name and read a requested token', () => {
+        const Child = createDirective('child', {exportAs: 'child'});
+
+        let div;
+        /**
+         * <div #foo="child" child></div>
+         * class Cmpt {
+         *  @ViewChildren('foo', {read: ElementRef}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                div = elementStart(1, 'div', ['child', ''], ['foo', 'child']);
+                elementEnd();
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], undefined, QUERY_READ_ELEMENT_REF);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(1);
+        expect(qList.first.nativeElement).toBe(div);
+      });
+
+      it('should support reading a mix of ElementRef and directive instances', () => {
+        const Child = createDirective('child', {exportAs: 'child'});
+
+        let childInstance, div;
+        /**
+         * <div #foo #bar="child" child></div>
+         * class Cmpt {
+         *  @ViewChildren('foo, bar') query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                div = elementStart(1, 'div', ['child', ''], ['foo', '', 'bar', 'child']);
+                elementEnd();
+              }
+              if (rf & RenderFlags.Update) {
+                childInstance = loadDirective(0);
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo', 'bar'], undefined, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(2);
+        expect(qList.first.nativeElement).toBe(div);
+        expect(qList.last).toBe(childInstance);
+      });
+
+      it('should not add results to query if a requested token cant be read', () => {
+        const Child = createDirective('child');
+
+        /**
+         * <div #foo></div>
+         * class Cmpt {
+         *  @ViewChildren('foo', {read: Child}) query;
+         * }
+         */
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                element(1, 'div', ['foo', '']);
+              }
+            },
+            [Child], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], false, Child);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
+
+        const cmptInstance = renderComponent(Cmpt);
+        const qList = (cmptInstance.query as QueryList<any>);
+        expect(qList.length).toBe(0);
       });
 
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(isTemplateRef(qList.first)).toBeTruthy();
     });
-
-    it('should read component instance if element queried for is a component host', () => {
-      const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {});
-
-      let childInstance;
-      /**
-       * <child #foo></child>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          elementStart(1, 'child', null, ['foo', '']);
-          { childInstance = loadDirective(0); }
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(qList.first).toBe(childInstance);
-    });
-
-    it('should read component instance with explicit exportAs', () => {
-      let childInstance: Child;
-
-      class Child {
-        static ngComponentDef = defineComponent({
-          type: Child,
-          selectors: [['child']],
-          factory: () => childInstance = new Child(),
-          template: (rf: RenderFlags, ctx: Child) => {},
-          exportAs: 'child'
-        });
-      }
-
-      /**
-       * <child #foo="child"></child>
-       * class Cmpt {
-       *  @ViewChildren('foo') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          elementStart(1, 'child', null, ['foo', 'child']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(qList.first).toBe(childInstance !);
-    });
-
-    it('should read directive instance if element queried for has an exported directive with a matching name',
-       () => {
-         const Child = createDirective('child', {exportAs: 'child'});
-
-         let childInstance;
-         /**
-          * <div #foo="child" child></div>
-          * class Cmpt {
-          *  @ViewChildren('foo') query;
-          * }
-          */
-         const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-           let tmp: any;
-           if (rf & RenderFlags.Create) {
-             query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-             elementStart(1, 'div', ['child', ''], ['foo', 'child']);
-             childInstance = loadDirective(0);
-             elementEnd();
-           }
-           if (rf & RenderFlags.Update) {
-             queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-           }
-         }, [Child]);
-
-         const cmptInstance = renderComponent(Cmpt);
-         const qList = (cmptInstance.query as QueryList<any>);
-         expect(qList.length).toBe(1);
-         expect(qList.first).toBe(childInstance);
-       });
-
-    it('should read all matching directive instances from a given element', () => {
-      const Child1 = createDirective('child1', {exportAs: 'child1'});
-      const Child2 = createDirective('child2', {exportAs: 'child2'});
-
-      let child1Instance, child2Instance;
-      /**
-       * <div #foo="child1" child1 #bar="child2" child2></div>
-       * class Cmpt {
-       *  @ViewChildren('foo, bar') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo', 'bar'], true, QUERY_READ_FROM_NODE);
-          elementStart(1, 'div', ['child1', '', 'child2', ''], ['foo', 'child1', 'bar', 'child2']);
-          {
-            child1Instance = loadDirective(0);
-            child2Instance = loadDirective(1);
-          }
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child1, Child2]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(2);
-      expect(qList.first).toBe(child1Instance);
-      expect(qList.last).toBe(child2Instance);
-    });
-
-    it('should read multiple locals exporting the same directive from a given element', () => {
-      const Child = createDirective('child', {exportAs: 'child'});
-      let childInstance;
-
-      /**
-       * <div child #foo="child" #bar="child"></div>
-       * class Cmpt {
-       *  @ViewChildren('foo') fooQuery;
-       *  @ViewChildren('bar') barQuery;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-          query(1, ['bar'], true, QUERY_READ_FROM_NODE);
-          elementStart(2, 'div', ['child', ''], ['foo', 'child', 'bar', 'child']);
-          { childInstance = loadDirective(0); }
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.fooQuery = tmp as QueryList<any>);
-          queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.barQuery = tmp as QueryList<any>);
-        }
-      }, [Child]);
-
-      const cmptInstance = renderComponent(Cmpt);
-
-      const fooList = cmptInstance.fooQuery as QueryList<any>;
-      expect(fooList.length).toBe(1);
-      expect(fooList.first).toBe(childInstance);
-
-      const barList = cmptInstance.barQuery as QueryList<any>;
-      expect(barList.length).toBe(1);
-      expect(barList.first).toBe(childInstance);
-    });
-
-    it('should match on exported directive name and read a requested token', () => {
-      const Child = createDirective('child', {exportAs: 'child'});
-
-      let div;
-      /**
-       * <div #foo="child" child></div>
-       * class Cmpt {
-       *  @ViewChildren('foo', {read: ElementRef}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], undefined, QUERY_READ_ELEMENT_REF);
-          div = elementStart(1, 'div', ['child', ''], ['foo', 'child']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(1);
-      expect(qList.first.nativeElement).toBe(div);
-    });
-
-    it('should support reading a mix of ElementRef and directive instances', () => {
-      const Child = createDirective('child', {exportAs: 'child'});
-
-      let childInstance, div;
-      /**
-       * <div #foo #bar="child" child></div>
-       * class Cmpt {
-       *  @ViewChildren('foo, bar') query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo', 'bar'], undefined, QUERY_READ_FROM_NODE);
-          div = elementStart(1, 'div', ['child', ''], ['foo', '', 'bar', 'child']);
-          { childInstance = loadDirective(0); }
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(2);
-      expect(qList.first.nativeElement).toBe(div);
-      expect(qList.last).toBe(childInstance);
-    });
-
-    it('should not add results to query if a requested token cant be read', () => {
-      const Child = createDirective('child');
-
-      /**
-       * <div #foo></div>
-       * class Cmpt {
-       *  @ViewChildren('foo', {read: Child}) query;
-       * }
-       */
-      const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo'], false, Child);
-          elementStart(1, 'div', ['foo', '']);
-          elementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-        }
-      }, [Child]);
-
-      const cmptInstance = renderComponent(Cmpt);
-      const qList = (cmptInstance.query as QueryList<any>);
-      expect(qList.length).toBe(0);
-    });
-
   });
 
   describe('view boundaries', () => {
@@ -729,22 +883,31 @@ describe('query', () => {
          *  @ViewChildren('foo') query;
          * }
          */
-        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-          let tmp: any;
-          if (rf & RenderFlags.Create) {
-            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-            container(1, (rf1: RenderFlags, ctx1: any) => {
-              if (rf1 & RenderFlags.Create) {
-                elementStart(0, 'div', null, ['foo', '']);
-                elementEnd();
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1, (rf1: RenderFlags, ctx1: any) => {
+                  if (rf1 & RenderFlags.Create) {
+                    elementStart(0, 'div', null, ['foo', '']);
+                    elementEnd();
+                  }
+                }, null, ['ngIf', '']);
               }
-            }, null, ['ngIf', '']);
-          }
-          if (rf & RenderFlags.Update) {
-            elementProperty(1, 'ngIf', bind(ctx.value));
-            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-          }
-        }, [NgIf]);
+              if (rf & RenderFlags.Update) {
+                elementProperty(1, 'ngIf', bind(ctx.value));
+              }
+            },
+            [NgIf], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
         const fixture = new ComponentFixture(Cmpt);
         const qList = fixture.component.query;
@@ -769,25 +932,41 @@ describe('query', () => {
          *  @ViewChildren('foo') query;
          * }
          */
-        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-          let tmp: any;
-          if (rf & RenderFlags.Create) {
-            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-            container(1, (rf1: RenderFlags, row: NgForOfContext<string>) => {
-              if (rf1 & RenderFlags.Create) {
-                elementStart(0, 'div', null, ['foo', '']);
-                elementEnd();
+        class Cmpt {
+          value: string[];
+          query: any;
+          static ngComponentDef = defineComponent({
+            type: Cmpt,
+            factory: () => new Cmpt(),
+            selectors: [['my-app']],
+            template: function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1, (rf1: RenderFlags, row: NgForOfContext<string>) => {
+                  if (rf1 & RenderFlags.Create) {
+                    elementStart(0, 'div', null, ['foo', '']);
+                    elementEnd();
+                  }
+                  if (rf1 & RenderFlags.Update) {
+                    elementProperty(0, 'id', bind(row.$implicit));
+                  }
+                }, null, ['ngForOf', '']);
               }
-              if (rf1 & RenderFlags.Update) {
-                elementProperty(0, 'id', bind(row.$implicit));
+              if (rf & RenderFlags.Update) {
+                elementProperty(1, 'ngForOf', bind(ctx.value));
               }
-            }, null, ['ngForOf', '']);
-          }
-          if (rf & RenderFlags.Update) {
-            elementProperty(1, 'ngForOf', bind(ctx.value));
-            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-          }
-        }, [NgForOf]);
+            },
+            viewQuery: function(rf: RenderFlags, ctx: Cmpt) {
+              let tmp: any;
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            },
+            directives: () => [NgForOf]
+          });
+        }
 
         const fixture = new ComponentFixture(Cmpt);
         const qList = fixture.component.query;
@@ -795,14 +974,10 @@ describe('query', () => {
 
         fixture.component.value = ['a', 'b', 'c'];
         fixture.update();
-        fixture
-            .update();  // invoking CD twice due to https://github.com/angular/angular/issues/23707
         expect(qList.length).toBe(3);
 
         fixture.component.value.splice(1, 1);  // remove "b"
         fixture.update();
-        fixture
-            .update();  // invoking CD twice due to https://github.com/angular/angular/issues/23707
         expect(qList.length).toBe(2);
 
         // make sure that a proper element was removed from query results
@@ -831,44 +1006,53 @@ describe('query', () => {
             *
             * <ng-template viewInserter #vi="vi"></ng-template>
             */
-           const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-             let tmp: any;
-             if (rf & RenderFlags.Create) {
-               query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-
-               container(1, (rf: RenderFlags, ctx: {idx: number}) => {
+           const Cmpt = createComponent(
+               'cmpt',
+               function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   elementStart(0, 'div', null, ['foo', '']);
+                   container(1, (rf: RenderFlags, ctx: {idx: number}) => {
+                     if (rf & RenderFlags.Create) {
+                       elementStart(0, 'div', null, ['foo', '']);
+                       elementEnd();
+                     }
+                     if (rf & RenderFlags.Update) {
+                       elementProperty(0, 'id', bind('foo1_' + ctx.idx));
+                     }
+                   }, null, []);
+
+                   elementStart(2, 'div', ['id', 'middle'], ['foo', '']);
                    elementEnd();
+
+                   container(4, (rf: RenderFlags, ctx: {idx: number}) => {
+                     if (rf & RenderFlags.Create) {
+                       elementStart(0, 'div', null, ['foo', '']);
+                       elementEnd();
+                     }
+                     if (rf & RenderFlags.Update) {
+                       elementProperty(0, 'id', bind('foo2_' + ctx.idx));
+                     }
+                   }, null, []);
+
+                   container(5, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
+                 }
+
+                 if (rf & RenderFlags.Update) {
+                   tpl1 = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
+                   tpl2 = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(4)));
+                 }
+
+               },
+               [ViewContainerManipulatorDirective], [],
+               function(rf: RenderFlags, ctx: any) {
+                 if (rf & RenderFlags.Create) {
+                   query(0, ['foo'], true, QUERY_READ_FROM_NODE);
                  }
                  if (rf & RenderFlags.Update) {
-                   elementProperty(0, 'id', bind('foo1_' + ctx.idx));
+                   let tmp: any;
+                   queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                       (ctx.query = tmp as QueryList<any>);
                  }
-               }, null, []);
-
-               elementStart(2, 'div', ['id', 'middle'], ['foo', '']);
-               elementEnd();
-
-               container(4, (rf: RenderFlags, ctx: {idx: number}) => {
-                 if (rf & RenderFlags.Create) {
-                   elementStart(0, 'div', null, ['foo', '']);
-                   elementEnd();
-                 }
-                 if (rf & RenderFlags.Update) {
-                   elementProperty(0, 'id', bind('foo2_' + ctx.idx));
-                 }
-               }, null, []);
-
-               container(5, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
-             }
-
-             if (rf & RenderFlags.Update) {
-               tpl1 = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
-               tpl2 = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(4)));
-               queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-             }
-
-           }, [ViewContainerManipulatorDirective]);
+               });
 
            const fixture = new ComponentFixture(Cmpt);
            const qList = fixture.component.query;
@@ -923,32 +1107,47 @@ describe('query', () => {
             * <ng-template viewInserter #vi1="vi"></ng-template>
             * <ng-template viewInserter #vi2="vi"></ng-template>
             */
-           const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-             let tmp: any;
-             if (rf & RenderFlags.Create) {
-               query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-
-               container(1, (rf: RenderFlags, ctx: {idx: number, container_idx: number}) => {
+           class Cmpt {
+             query: any;
+             static ngComponentDef = defineComponent({
+               type: Cmpt,
+               factory: () => new Cmpt(),
+               selectors: [['my-app']],
+               template: function(rf: RenderFlags, ctx: any) {
+                 let tmp: any;
                  if (rf & RenderFlags.Create) {
-                   elementStart(0, 'div', null, ['foo', '']);
-                   elementEnd();
+                   container(1, (rf: RenderFlags, ctx: {idx: number, container_idx: number}) => {
+                     if (rf & RenderFlags.Create) {
+                       elementStart(0, 'div', null, ['foo', '']);
+                       elementEnd();
+                     }
+                     if (rf & RenderFlags.Update) {
+                       elementProperty(0, 'id', bind('foo_' + ctx.container_idx + '_' + ctx.idx));
+                     }
+                   }, null, []);
+
+                   container(2, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
+                   container(3, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
+                 }
+
+                 if (rf & RenderFlags.Update) {
+                   tpl = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
+                 }
+
+               },
+               viewQuery: (rf: RenderFlags, cmpt: Cmpt) => {
+                 let tmp: any;
+                 if (rf & RenderFlags.Create) {
+                   query(0, ['foo'], true, QUERY_READ_FROM_NODE);
                  }
                  if (rf & RenderFlags.Update) {
-                   elementProperty(0, 'id', bind('foo_' + ctx.container_idx + '_' + ctx.idx));
+                   queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                       (cmpt.query = tmp as QueryList<any>);
                  }
-               }, null, []);
-
-               container(2, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
-               container(3, undefined, null, [AttributeMarker.SelectOnly, 'vc']);
-             }
-
-             if (rf & RenderFlags.Update) {
-               tpl = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
-               queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-             }
-
-           }, [ViewContainerManipulatorDirective]);
-
+               },
+               directives: () => [ViewContainerManipulatorDirective],
+             });
+           }
            const fixture = new ComponentFixture(Cmpt);
            const qList = fixture.component.query;
 
@@ -972,6 +1171,64 @@ describe('query', () => {
            fixture.update();
            expect(qList.length).toBe(0);
          });
+
+      // https://stackblitz.com/edit/angular-wpd6gv?file=src%2Fapp%2Fapp.component.ts
+      it('should report results from views inserted in a lifecycle hook', () => {
+
+        class MyApp {
+          show = false;
+          query: any;
+          static ngComponentDef = defineComponent({
+            type: MyApp,
+            factory: () => new MyApp(),
+            selectors: [['my-app']],
+            /**
+             * <ng-template #tpl><span #foo id="from_tpl">from tpl</span></ng-template>
+             * <ng-template [ngTemplateOutlet]="show ? tpl : null"></ng-template>
+             */
+            template: (rf: RenderFlags, myApp: MyApp) => {
+              if (rf & RenderFlags.Create) {
+                container(1, (rf1: RenderFlags) => {
+                  if (rf1 & RenderFlags.Create) {
+                    element(0, 'span', ['id', 'from_tpl'], ['foo', '']);
+                  }
+                }, undefined, undefined, ['tpl', '']);
+                container(3, undefined, null, [AttributeMarker.SelectOnly, 'ngTemplateOutlet']);
+              }
+              if (rf & RenderFlags.Update) {
+                const tplRef = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(1)));
+                elementProperty(3, 'ngTemplateOutlet', bind(myApp.show ? tplRef : null));
+              }
+            },
+            directives: () => [NgTemplateOutlet],
+            viewQuery: (rf: RenderFlags, myApp: MyApp) => {
+              let tmp: any;
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                    (myApp.query = tmp as QueryList<any>);
+              }
+            }
+          });
+        }
+
+        const fixture = new ComponentFixture(MyApp);
+        const qList = fixture.component.query;
+
+        expect(qList.length).toBe(0);
+
+        fixture.component.show = true;
+        fixture.update();
+        expect(qList.length).toBe(1);
+        expect(qList.first.nativeElement.id).toBe('from_tpl');
+
+        fixture.component.show = false;
+        fixture.update();
+        expect(qList.length).toBe(0);
+      });
+
     });
 
     describe('JS blocks', () => {
@@ -986,30 +1243,39 @@ describe('query', () => {
          *  @ViewChildren('foo') query;
          * }
          */
-        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-          let tmp: any;
-          if (rf & RenderFlags.Create) {
-            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-            container(1);
-          }
-          if (rf & RenderFlags.Update) {
-            containerRefreshStart(1);
-            {
-              if (ctx.exp) {
-                let rf1 = embeddedViewStart(1);
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1);
+              }
+              if (rf & RenderFlags.Update) {
+                containerRefreshStart(1);
                 {
-                  if (rf1 & RenderFlags.Create) {
-                    firstEl = elementStart(0, 'div', null, ['foo', '']);
-                    elementEnd();
+                  if (ctx.exp) {
+                    let rf1 = embeddedViewStart(1);
+                    {
+                      if (rf1 & RenderFlags.Create) {
+                        firstEl = elementStart(0, 'div', null, ['foo', '']);
+                        elementEnd();
+                      }
+                    }
+                    embeddedViewEnd();
                   }
                 }
-                embeddedViewEnd();
+                containerRefreshEnd();
               }
-            }
-            containerRefreshEnd();
-            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-          }
-        });
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
         const cmptInstance = renderComponent(Cmpt);
         const qList = (cmptInstance.query as any);
@@ -1038,34 +1304,44 @@ describe('query', () => {
             *  @ViewChildren('foo') query;
             * }
             */
-           const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-             let tmp: any;
-             if (rf & RenderFlags.Create) {
-               query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-               firstEl = elementStart(1, 'span', null, ['foo', '']);
-               elementEnd();
-               container(3);
-               lastEl = elementStart(4, 'span', null, ['foo', '']);
-               elementEnd();
-             }
-             if (rf & RenderFlags.Update) {
-               containerRefreshStart(3);
-               {
-                 if (ctx.exp) {
-                   let rf1 = embeddedViewStart(1);
+           const Cmpt = createComponent(
+               'cmpt',
+               function(rf: RenderFlags, ctx: any) {
+                 if (rf & RenderFlags.Create) {
+                   firstEl = elementStart(1, 'span', null, ['foo', '']);
+                   elementEnd();
+                   container(3);
+                   lastEl = elementStart(4, 'span', null, ['foo', '']);
+                   elementEnd();
+                 }
+                 if (rf & RenderFlags.Update) {
+                   containerRefreshStart(3);
                    {
-                     if (rf1 & RenderFlags.Create) {
-                       viewEl = elementStart(0, 'div', null, ['foo', '']);
-                       elementEnd();
+                     if (ctx.exp) {
+                       let rf1 = embeddedViewStart(1);
+                       {
+                         if (rf1 & RenderFlags.Create) {
+                           viewEl = elementStart(0, 'div', null, ['foo', '']);
+                           elementEnd();
+                         }
+                       }
+                       embeddedViewEnd();
                      }
                    }
-                   embeddedViewEnd();
+                   containerRefreshEnd();
                  }
-               }
-               containerRefreshEnd();
-               queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-             }
-           });
+               },
+               [], [],
+               function(rf: RenderFlags, ctx: any) {
+                 if (rf & RenderFlags.Create) {
+                   query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+                 }
+                 if (rf & RenderFlags.Update) {
+                   let tmp: any;
+                   queryRefresh(tmp = load<QueryList<any>>(0)) &&
+                       (ctx.query = tmp as QueryList<any>);
+                 }
+               });
 
            const cmptInstance = renderComponent(Cmpt);
            const qList = (cmptInstance.query as any);
@@ -1099,40 +1375,49 @@ describe('query', () => {
          *  @ViewChildren('foo') query;
          * }
          */
-        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-          let tmp: any;
-          if (rf & RenderFlags.Create) {
-            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-            container(1);
-          }
-          if (rf & RenderFlags.Update) {
-            containerRefreshStart(1);
-            {
-              if (ctx.exp1) {
-                let rf0 = embeddedViewStart(0);
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1);
+              }
+              if (rf & RenderFlags.Update) {
+                containerRefreshStart(1);
                 {
-                  if (rf0 & RenderFlags.Create) {
-                    firstEl = elementStart(0, 'div', null, ['foo', '']);
-                    elementEnd();
+                  if (ctx.exp1) {
+                    let rf0 = embeddedViewStart(0);
+                    {
+                      if (rf0 & RenderFlags.Create) {
+                        firstEl = elementStart(0, 'div', null, ['foo', '']);
+                        elementEnd();
+                      }
+                    }
+                    embeddedViewEnd();
+                  }
+                  if (ctx.exp2) {
+                    let rf1 = embeddedViewStart(1);
+                    {
+                      if (rf1 & RenderFlags.Create) {
+                        lastEl = elementStart(0, 'span', null, ['foo', '']);
+                        elementEnd();
+                      }
+                    }
+                    embeddedViewEnd();
                   }
                 }
-                embeddedViewEnd();
+                containerRefreshEnd();
               }
-              if (ctx.exp2) {
-                let rf1 = embeddedViewStart(1);
-                {
-                  if (rf1 & RenderFlags.Create) {
-                    lastEl = elementStart(0, 'span', null, ['foo', '']);
-                    elementEnd();
-                  }
-                }
-                embeddedViewEnd();
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
               }
-            }
-            containerRefreshEnd();
-            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-          }
-        });
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
         const cmptInstance = renderComponent(Cmpt);
         const qList = (cmptInstance.query as any);
@@ -1163,47 +1448,56 @@ describe('query', () => {
          *  @ViewChildren('foo') query;
          * }
          */
-        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-          let tmp: any;
-          if (rf & RenderFlags.Create) {
-            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-            container(1);
-          }
-          if (rf & RenderFlags.Update) {
-            containerRefreshStart(1);
-            {
-              if (ctx.exp1) {
-                let rf0 = embeddedViewStart(0);
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(1);
+              }
+              if (rf & RenderFlags.Update) {
+                containerRefreshStart(1);
                 {
-                  if (rf0 & RenderFlags.Create) {
-                    firstEl = elementStart(0, 'div', null, ['foo', '']);
-                    elementEnd();
-                    container(2);
-                  }
-                  if (rf0 & RenderFlags.Update) {
-                    containerRefreshStart(2);
+                  if (ctx.exp1) {
+                    let rf0 = embeddedViewStart(0);
                     {
-                      if (ctx.exp2) {
-                        let rf2 = embeddedViewStart(0);
+                      if (rf0 & RenderFlags.Create) {
+                        firstEl = elementStart(0, 'div', null, ['foo', '']);
+                        elementEnd();
+                        container(2);
+                      }
+                      if (rf0 & RenderFlags.Update) {
+                        containerRefreshStart(2);
                         {
-                          if (rf2) {
-                            lastEl = elementStart(0, 'span', null, ['foo', '']);
-                            elementEnd();
+                          if (ctx.exp2) {
+                            let rf2 = embeddedViewStart(0);
+                            {
+                              if (rf2) {
+                                lastEl = elementStart(0, 'span', null, ['foo', '']);
+                                elementEnd();
+                              }
+                            }
+                            embeddedViewEnd();
                           }
                         }
-                        embeddedViewEnd();
+                        containerRefreshEnd();
                       }
                     }
-                    containerRefreshEnd();
+                    embeddedViewEnd();
                   }
                 }
-                embeddedViewEnd();
+                containerRefreshEnd();
               }
-            }
-            containerRefreshEnd();
-            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
-          }
-        });
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.query = tmp as QueryList<any>);
+              }
+            });
 
         const cmptInstance = renderComponent(Cmpt);
         const qList = (cmptInstance.query as any);
@@ -1221,44 +1515,59 @@ describe('query', () => {
         expect(qList.last.nativeElement).toBe(lastEl);
       });
 
+      /**
+       * What is tested here can't be achieved in the Renderer2 as all view queries are deep by
+       * default and can't be marked as shallow by a user.
+       */
       it('should support combination of deep and shallow queries', () => {
         /**
-         * <ng-template [ngIf]="exp">
+         * % if (exp) { ">
          *    <div #foo></div>
-         * </ng-template>
+         * % }
          * <span #foo></span>
          * class Cmpt {
-         *  @ViewChildren('foo') query;
+         *  @ViewChildren('foo') deep;
+         *  @ViewChildren('foo') shallow;
          * }
          */
-        const Cmpt = createComponent('cmpt', function(rf: RenderFlags, ctx: any) {
-          let tmp: any;
-          if (rf & RenderFlags.Create) {
-            query(0, ['foo'], true, QUERY_READ_FROM_NODE);
-            query(1, ['foo'], false, QUERY_READ_FROM_NODE);
-            container(2);
-            elementStart(3, 'span', null, ['foo', '']);
-            elementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            containerRefreshStart(2);
-            {
-              if (ctx.exp) {
-                let rf0 = embeddedViewStart(0);
+        const Cmpt = createComponent(
+            'cmpt',
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                container(2);
+                elementStart(3, 'span', null, ['foo', '']);
+                elementEnd();
+              }
+              if (rf & RenderFlags.Update) {
+                containerRefreshStart(2);
                 {
-                  if (rf0 & RenderFlags.Create) {
-                    elementStart(0, 'div', null, ['foo', '']);
-                    elementEnd();
+                  if (ctx.exp) {
+                    let rf0 = embeddedViewStart(0);
+                    {
+                      if (rf0 & RenderFlags.Create) {
+                        elementStart(0, 'div', null, ['foo', '']);
+                        elementEnd();
+                      }
+                    }
+                    embeddedViewEnd();
                   }
                 }
-                embeddedViewEnd();
+                containerRefreshEnd();
               }
-            }
-            containerRefreshEnd();
-            queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.deep = tmp as QueryList<any>);
-            queryRefresh(tmp = load<QueryList<any>>(1)) && (ctx.shallow = tmp as QueryList<any>);
-          }
-        });
+            },
+            [], [],
+            function(rf: RenderFlags, ctx: any) {
+              if (rf & RenderFlags.Create) {
+                query(0, ['foo'], true, QUERY_READ_FROM_NODE);
+                query(1, ['foo'], false, QUERY_READ_FROM_NODE);
+              }
+              if (rf & RenderFlags.Update) {
+                let tmp: any;
+                queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.deep = tmp as QueryList<any>);
+                queryRefresh(tmp = load<QueryList<any>>(1)) &&
+                    (ctx.shallow = tmp as QueryList<any>);
+              }
+            });
 
         const cmptInstance = renderComponent(Cmpt);
         const deep = (cmptInstance.deep as any);
@@ -1316,15 +1625,21 @@ describe('query', () => {
     it('should be destroyed when the containing view is destroyed', () => {
       let queryInstance: QueryList<any>;
 
-      const SimpleComponentWithQuery =
-          createComponent('some-component-with-query', function(rf: RenderFlags, ctx: any) {
-            let tmp: any;
+      const SimpleComponentWithQuery = createComponent(
+          'some-component-with-query',
+          function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              query(0, ['foo'], false, QUERY_READ_FROM_NODE);
               elementStart(1, 'div', null, ['foo', '']);
               elementEnd();
             }
+          },
+          [], [],
+          function(rf: RenderFlags, ctx: any) {
+            if (rf & RenderFlags.Create) {
+              query(0, ['foo'], false, QUERY_READ_FROM_NODE);
+            }
             if (rf & RenderFlags.Update) {
+              let tmp: any;
               queryRefresh(tmp = load<QueryList<any>>(0)) &&
                   (ctx.query = queryInstance = tmp as QueryList<any>);
             }
@@ -1404,19 +1719,26 @@ describe('query', () => {
        *  @ViewChildren('foo, bar') foos;
        * }
        */
-      const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
-        let tmp: any;
-        if (rf & RenderFlags.Create) {
-          query(0, ['foo', 'bar'], true, QUERY_READ_FROM_NODE);
-          elementStart(1, 'with-content');
-          { element(2, 'div', null, ['foo', '']); }
-          elementEnd();
-          element(4, 'div', ['id', 'after'], ['bar', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.foos = tmp as QueryList<any>);
-        }
-      }, [WithContentComponent]);
+      const AppComponent = createComponent(
+          'app-component',
+          function(rf: RenderFlags, ctx: any) {
+            if (rf & RenderFlags.Create) {
+              elementStart(1, 'with-content');
+              { element(2, 'div', null, ['foo', '']); }
+              elementEnd();
+              element(4, 'div', ['id', 'after'], ['bar', '']);
+            }
+          },
+          [WithContentComponent], [],
+          function(rf: RenderFlags, ctx: any) {
+            if (rf & RenderFlags.Create) {
+              query(0, ['foo', 'bar'], true, QUERY_READ_FROM_NODE);
+            }
+            if (rf & RenderFlags.Update) {
+              let tmp: any;
+              queryRefresh(tmp = load<QueryList<any>>(0)) && (ctx.foos = tmp as QueryList<any>);
+            }
+          });
 
       const fixture = new ComponentFixture(AppComponent);
       const viewQList = fixture.component.foos;
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 666f8dba99..6f34b01f80 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -228,7 +228,8 @@ export function toHtml<T>(componentOrElement: T | RElement): string {
 
 export function createComponent(
     name: string, template: ComponentTemplate<any>, directives: DirectiveTypesOrFactory = [],
-    pipes: PipeTypesOrFactory = []): ComponentType<any> {
+    pipes: PipeTypesOrFactory = [],
+    viewQuery: ComponentTemplate<any>| null = null): ComponentType<any> {
   return class Component {
     value: any;
     static ngComponentDef = defineComponent({
@@ -236,6 +237,7 @@ export function createComponent(
       selectors: [[name]],
       factory: () => new Component,
       template: template,
+      viewQuery: viewQuery,
       features: [PublicFeature],
       directives: directives,
       pipes: pipes

From cb31381734058f597392e11b992634a589e41b01 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 20 Jun 2018 20:02:54 +0300
Subject: [PATCH 319/582] build(docs-infra): redirect removed webpack guide to
 `v5.angular.io` (#24595)

The outdated webpack guide has been removed in #24478, but people might
still try to access it (via direct links or search-engine results).

Instead of returning 404, we will now redirect `/guide/webpack` to the
archived version of the guide at `v5.angular.io/guide/webpack`.

PR Close #24595
---
 aio/firebase.json                                | 3 ++-
 aio/ngsw-manifest.json                           | 2 +-
 aio/tests/deployment/shared/URLS_TO_REDIRECT.txt | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aio/firebase.json b/aio/firebase.json
index b306c655ab..57fee90f7a 100644
--- a/aio/firebase.json
+++ b/aio/firebase.json
@@ -15,7 +15,7 @@
       // A random bad indexed page that used `api/api`
       {"type": 301, "source": "/api/api/:rest*", "destination": "/api/:rest*"},
 
-      // Guide renames
+      // Guide renames/removals
       {"type": 301, "source": "/docs/*/latest/cli-quickstart.html", "destination": "/guide/quickstart"},
       {"type": 301, "source": "/docs/*/latest/glossary.html", "destination": "/guide/glossary"},
       {"type": 301, "source": "/docs/*/latest/quickstart.html", "destination": "/guide/quickstart"},
@@ -25,6 +25,7 @@
       {"type": 301, "source": "/guide/service-worker-getstart", "destination": "/guide/service-worker-getting-started"},
       {"type": 301, "source": "/guide/service-worker-comm", "destination": "/guide/service-worker-communications"},
       {"type": 301, "source": "/guide/service-worker-configref", "destination": "/guide/service-worker-config"},
+      {"type": 301, "source": "/guide/webpack", "destination": "https://v5.angular.io/guide/webpack"},
 
       // some top level guide pages on old site were moved below the guide folder
       {"type": 301, "source": "/styleguide", "destination": "/guide/styleguide"},
diff --git a/aio/ngsw-manifest.json b/aio/ngsw-manifest.json
index 343fe4f675..8eed08fd18 100644
--- a/aio/ngsw-manifest.json
+++ b/aio/ngsw-manifest.json
@@ -18,7 +18,7 @@
   "routing": {
     "index": "/index.html",
     "routes": {
-      "^(?!/styleguide|/docs/.|(?:/guide/(?:cli-quickstart|metadata|ngmodule|service-worker-(?:getstart|comm|configref)|learning-angular)|/news)(?:\\.html|/)?$|/testing|/api/(?:.+/[^/]+-|platform-browser/AnimationDriver|testing/|api/|animate/|(?:common/(?:NgModel|Control|MaxLengthValidator))|(?:[^/]+/)?(?:NgFor(?:$|-)|AnimationStateDeclarationMetadata|CORE_DIRECTIVES|PLATFORM_PIPES|DirectiveMetadata|HTTP_PROVIDERS))|.*/stackblitz(?:\\.html)?(?:\\?.*)?$|.*\\.[^\/.]+$)": {
+      "^(?!/styleguide|/docs/.|(?:/guide/(?:cli-quickstart|metadata|ngmodule|service-worker-(?:getstart|comm|configref)|learning-angular|webpack)|/news)(?:\\.html|/)?$|/testing|/api/(?:.+/[^/]+-|platform-browser/AnimationDriver|testing/|api/|animate/|(?:common/(?:NgModel|Control|MaxLengthValidator))|(?:[^/]+/)?(?:NgFor(?:$|-)|AnimationStateDeclarationMetadata|CORE_DIRECTIVES|PLATFORM_PIPES|DirectiveMetadata|HTTP_PROVIDERS))|.*/stackblitz(?:\\.html)?(?:\\?.*)?$|.*\\.[^\/.]+$)": {
         "match": "regex"
       }
     }
diff --git a/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
index c4d9ee2d4f..e81bc5e706 100644
--- a/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
+++ b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
@@ -178,6 +178,7 @@
 /guide/service-worker-getstart	/guide/service-worker-getting-started
 /guide/service-worker-comm	/guide/service-worker-communications
 /guide/service-worker-configref	/guide/service-worker-config
+/guide/webpack	https://v5.angular.io/guide/webpack
 /news	https://blog.angular.io/
 /news.html	https://blog.angular.io/
 /testing	/guide/testing

From 84272e2227b4c8bd028ff2211cbe56270ee0c37a Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 18 Jun 2018 16:55:43 +0200
Subject: [PATCH 320/582] feat(ivy): runtime i18n (#24037)

PR Close #24037
---
 .../core/src/core_render3_private_export.ts   |    7 +
 packages/core/src/render3/i18n.ts             |  460 ++++++
 packages/core/src/render3/index.ts            |   13 +-
 packages/core/src/render3/instructions.ts     |   47 +-
 packages/core/src/render3/interfaces/node.ts  |   13 +
 packages/core/src/render3/ng_dev_mode.ts      |    4 +
 .../core/src/render3/node_manipulation.ts     |   32 +-
 .../render3/compiler_canonical/i18n_spec.ts   |  139 ++
 packages/core/test/render3/i18n_spec.ts       | 1316 +++++++++++++++++
 .../render3/node_selector_matcher_spec.ts     |    3 +-
 10 files changed, 2011 insertions(+), 23 deletions(-)
 create mode 100644 packages/core/src/render3/i18n.ts
 create mode 100644 packages/core/test/render3/compiler_canonical/i18n_spec.ts
 create mode 100644 packages/core/test/render3/i18n_spec.ts

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 11e7feb6a9..c312ee55cd 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -87,6 +87,13 @@ export {
   DirectiveDefInternal as ɵDirectiveDef,
   PipeDef as ɵPipeDef,
   whenRendered as ɵwhenRendered,
+  iA as ɵiA,
+  iEM as ɵiEM,
+  iI as ɵiI,
+  iIV as ɵIV,
+  iM as ɵiM,
+  I18nInstruction as ɵI18nInstruction,
+  I18nExpInstruction as ɵI18nExpInstruction,
 } from './render3/index';
 export {
   bypassSanitizationTrustHtml as ɵbypassSanitizationTrustHtml,
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
new file mode 100644
index 0000000000..9871b2e56f
--- /dev/null
+++ b/packages/core/src/render3/i18n.ts
@@ -0,0 +1,460 @@
+/**
+ * @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 {assertEqual, assertLessThan} from './assert';
+import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load} from './instructions';
+import {LContainerNode, LElementNode, LNode, TNodeType} from './interfaces/node';
+import {BINDING_INDEX} from './interfaces/view';
+import {appendChild, createTextNode, getParentLNode, removeChild} from './node_manipulation';
+import {stringify} from './util';
+
+/**
+ * A list of flags to encode the i18n instructions used to translate the template.
+ * We shift the flags by 29 so that 30 & 31 & 32 bits contains the instructions.
+ */
+export const enum I18nInstructions {
+  Text = 1 << 29,
+  Element = 2 << 29,
+  Expression = 3 << 29,
+  CloseNode = 4 << 29,
+  RemoveNode = 5 << 29,
+  /** Used to decode the number encoded with the instruction. */
+  IndexMask = (1 << 29) - 1,
+  /** Used to test the type of instruction. */
+  InstructionMask = ~((1 << 29) - 1),
+}
+
+/**
+ * Represents the instructions used to translate the template.
+ * Instructions can be a placeholder index, a static text or a simple bit field (`I18nFlag`).
+ * When the instruction is the flag `Text`, it is always followed by its text value.
+ */
+export type I18nInstruction = number | string;
+/**
+ * Represents the instructions used to translate attributes containing expressions.
+ * Even indexes contain static strings, while odd indexes contain the index of the expression whose
+ * value will be concatenated into the final translation.
+ */
+export type I18nExpInstruction = number | string;
+/** Mapping of placeholder names to their absolute indexes in their templates. */
+export type PlaceholderMap = {
+  [name: string]: number
+};
+const i18nTagRegex = /\{\$([^}]+)\}/g;
+
+/**
+ * Takes a translation string, the initial list of placeholders (elements and expressions) and the
+ * indexes of their corresponding expression nodes to return a list of instructions for each
+ * template function.
+ *
+ * Because embedded templates have different indexes for each placeholder, each parameter (except
+ * the translation) is an array, where each value corresponds to a different template, by order of
+ * appearance.
+ *
+ * @param translation A translation string where placeholders are represented by `{$name}`
+ * @param elements An array containing, for each template, the maps of element placeholders and
+ * their indexes.
+ * @param expressions An array containing, for each template, the maps of expression placeholders
+ * and their indexes.
+ * @param tmplContainers An array of template container placeholders whose content should be ignored
+ * when generating the instructions for their parent template.
+ * @param lastChildIndex The index of the last child of the i18n node. Used when the i18n block is
+ * an ng-container.
+ *
+ * @returns A list of instructions used to translate each template.
+ */
+export function i18nMapping(
+    translation: string, elements: (PlaceholderMap | null)[] | null,
+    expressions?: (PlaceholderMap | null)[] | null, tmplContainers?: string[] | null,
+    lastChildIndex?: number | null): I18nInstruction[][] {
+  const translationParts = translation.split(i18nTagRegex);
+  const instructions: I18nInstruction[][] = [];
+
+  generateMappingInstructions(
+      0, translationParts, instructions, elements, expressions, tmplContainers, lastChildIndex);
+
+  return instructions;
+}
+
+/**
+ * Internal function that reads the translation parts and generates a set of instructions for each
+ * template.
+ *
+ * See `i18nMapping()` for more details.
+ *
+ * @param index The current index in `translationParts`.
+ * @param translationParts The translation string split into an array of placeholders and text
+ * elements.
+ * @param instructions The current list of instructions to update.
+ * @param elements An array containing, for each template, the maps of element placeholders and
+ * their indexes.
+ * @param expressions An array containing, for each template, the maps of expression placeholders
+ * and their indexes.
+ * @param tmplContainers An array of template container placeholders whose content should be ignored
+ * when generating the instructions for their parent template.
+ * @param lastChildIndex The index of the last child of the i18n node. Used when the i18n block is
+ * an ng-container.
+ * @returns the current index in `translationParts`
+ */
+function generateMappingInstructions(
+    index: number, translationParts: string[], instructions: I18nInstruction[][],
+    elements: (PlaceholderMap | null)[] | null, expressions?: (PlaceholderMap | null)[] | null,
+    tmplContainers?: string[] | null, lastChildIndex?: number | null): number {
+  const tmplIndex = instructions.length;
+  const tmplInstructions: I18nInstruction[] = [];
+  const phVisited = [];
+  let openedTagCount = 0;
+  let maxIndex = 0;
+
+  instructions.push(tmplInstructions);
+
+  for (; index < translationParts.length; index++) {
+    const value = translationParts[index];
+
+    // Odd indexes are placeholders
+    if (index & 1) {
+      let phIndex;
+
+      if (elements && elements[tmplIndex] &&
+          typeof(phIndex = elements[tmplIndex] ![value]) !== 'undefined') {
+        // The placeholder represents a DOM element
+        // Add an instruction to move the element
+        tmplInstructions.push(phIndex | I18nInstructions.Element);
+        phVisited.push(value);
+        openedTagCount++;
+      } else if (
+          expressions && expressions[tmplIndex] &&
+          typeof(phIndex = expressions[tmplIndex] ![value]) !== 'undefined') {
+        // The placeholder represents an expression
+        // Add an instruction to move the expression
+        tmplInstructions.push(phIndex | I18nInstructions.Expression);
+        phVisited.push(value);
+      } else {  // It is a closing tag
+        tmplInstructions.push(I18nInstructions.CloseNode);
+
+        if (tmplIndex > 0) {
+          openedTagCount--;
+
+          // If we have reached the closing tag for this template, exit the loop
+          if (openedTagCount === 0) {
+            break;
+          }
+        }
+      }
+
+      if (typeof phIndex !== 'undefined' && phIndex > maxIndex) {
+        maxIndex = phIndex;
+      }
+
+      if (tmplContainers && tmplContainers.indexOf(value) !== -1 &&
+          tmplContainers.indexOf(value) >= tmplIndex) {
+        index = generateMappingInstructions(
+            index, translationParts, instructions, elements, expressions, tmplContainers,
+            lastChildIndex);
+      }
+
+    } else if (value) {
+      // It's a non-empty string, create a text node
+      tmplInstructions.push(I18nInstructions.Text, value);
+    }
+  }
+
+  // Check if some elements from the template are missing from the translation
+  if (elements) {
+    const tmplElements = elements[tmplIndex];
+
+    if (tmplElements) {
+      const phKeys = Object.keys(tmplElements);
+
+      for (let i = 0; i < phKeys.length; i++) {
+        const ph = phKeys[i];
+
+        if (phVisited.indexOf(ph) === -1) {
+          let index = tmplElements[ph];
+          // Add an instruction to remove the element
+          tmplInstructions.push(index | I18nInstructions.RemoveNode);
+
+          if (index > maxIndex) {
+            maxIndex = index;
+          }
+        }
+      }
+    }
+  }
+
+  // Check if some expressions from the template are missing from the translation
+  if (expressions) {
+    const tmplExpressions = expressions[tmplIndex];
+
+    if (tmplExpressions) {
+      const phKeys = Object.keys(tmplExpressions);
+
+      for (let i = 0; i < phKeys.length; i++) {
+        const ph = phKeys[i];
+
+        if (phVisited.indexOf(ph) === -1) {
+          let index = tmplExpressions[ph];
+          if (ngDevMode) {
+            assertLessThan(
+                index.toString(2).length, 28, `Index ${index} is too big and will overflow`);
+          }
+          // Add an instruction to remove the expression
+          tmplInstructions.push(index | I18nInstructions.RemoveNode);
+
+          if (index > maxIndex) {
+            maxIndex = index;
+          }
+        }
+      }
+    }
+  }
+
+  if (tmplIndex === 0 && typeof lastChildIndex === 'number') {
+    // The current parent is an ng-container and it has more children after the translation that we
+    // need to append to keep the order of the DOM nodes correct
+    for (let i = maxIndex + 1; i <= lastChildIndex; i++) {
+      if (ngDevMode) {
+        assertLessThan(i.toString(2).length, 28, `Index ${i} is too big and will overflow`);
+      }
+      // We consider those additional placeholders as expressions because we don't care about
+      // their children, all we need to do is to append them
+      tmplInstructions.push(i | I18nInstructions.Expression);
+    }
+  }
+
+  return index;
+}
+
+function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
+  if (ngDevMode) {
+    ngDevMode.rendererMoveNode++;
+  }
+
+  const viewData = getViewData();
+
+  appendChild(parentNode, node.native || null, viewData);
+
+  if (previousNode === parentNode && parentNode.pChild === null) {
+    parentNode.pChild = node;
+  } else {
+    previousNode.pNextOrParent = node;
+  }
+
+  // Template containers also have a comment node for the `ViewContainerRef` that should be moved
+  if (node.tNode.type === TNodeType.Container && node.dynamicLContainerNode) {
+    // (node.native as RComment).textContent = 'test';
+    // console.log(node.native);
+    appendChild(parentNode, node.dynamicLContainerNode.native || null, viewData);
+    node.pNextOrParent = node.dynamicLContainerNode;
+    return node.dynamicLContainerNode;
+  }
+
+  return node;
+}
+
+/**
+ * Takes a list of instructions generated by `i18nMapping()` to transform the template accordingly.
+ *
+ * @param startIndex Index of the first element to translate (for instance the first child of the
+ * element with the i18n attribute).
+ * @param instructions The list of instructions to apply on the current view.
+ */
+export function i18nApply(startIndex: number, instructions: I18nInstruction[]): void {
+  const viewData = getViewData();
+  if (ngDevMode) {
+    assertEqual(viewData[BINDING_INDEX], -1, 'i18nApply should be called before any binding');
+  }
+
+  if (!instructions) {
+    return;
+  }
+
+  const renderer = getRenderer();
+  let localParentNode: LNode = getParentLNode(load(startIndex)) || getPreviousOrParentNode();
+  let localPreviousNode: LNode = localParentNode;
+
+  for (let i = 0; i < instructions.length; i++) {
+    const instruction = instructions[i] as number;
+    switch (instruction & I18nInstructions.InstructionMask) {
+      case I18nInstructions.Element:
+        const element: LNode = load(instruction & I18nInstructions.IndexMask);
+        localPreviousNode = appendI18nNode(element, localParentNode, localPreviousNode);
+        localParentNode = element;
+        break;
+      case I18nInstructions.Expression:
+        const expr: LNode = load(instruction & I18nInstructions.IndexMask);
+        localPreviousNode = appendI18nNode(expr, localParentNode, localPreviousNode);
+        break;
+      case I18nInstructions.Text:
+        if (ngDevMode) {
+          ngDevMode.rendererCreateTextNode++;
+        }
+        const value = instructions[++i];
+        const textRNode = createTextNode(value, renderer);
+        // If we were to only create a `RNode` then projections won't move the text.
+        // But since this text doesn't have an index in `LViewData`, we need to create an
+        // `LElementNode` with the index -1 so that it isn't saved in `LViewData`
+        const textLNode = createLNode(-1, TNodeType.Element, textRNode, null, null);
+        textLNode.dynamicParent = localParentNode as LElementNode | LContainerNode;
+        localPreviousNode = appendI18nNode(textLNode, localParentNode, localPreviousNode);
+        break;
+      case I18nInstructions.CloseNode:
+        localPreviousNode = localParentNode;
+        localParentNode = getParentLNode(localParentNode) !;
+        break;
+      case I18nInstructions.RemoveNode:
+        if (ngDevMode) {
+          ngDevMode.rendererRemoveNode++;
+        }
+        const index = instruction & I18nInstructions.IndexMask;
+        const removedNode: LNode|LContainerNode = load(index);
+        const parentNode = getParentLNode(removedNode) !;
+        removeChild(parentNode, removedNode.native || null, viewData);
+
+        // For template containers we also need to remove their `ViewContainerRef` from the DOM
+        if (removedNode.tNode.type === TNodeType.Container && removedNode.dynamicLContainerNode) {
+          removeChild(parentNode, removedNode.dynamicLContainerNode.native || null, viewData);
+          removedNode.dynamicLContainerNode.tNode.detached = true;
+        }
+        break;
+    }
+  }
+}
+
+/**
+ * Takes a translation string and the initial list of expressions and returns a list of instructions
+ * that will be used to translate an attribute.
+ * Even indexes contain static strings, while odd indexes contain the index of the expression whose
+ * value will be concatenated into the final translation.
+ */
+export function i18nExpMapping(
+    translation: string, placeholders: PlaceholderMap): I18nExpInstruction[] {
+  const staticText: I18nExpInstruction[] = translation.split(i18nTagRegex);
+  // odd indexes are placeholders
+  for (let i = 1; i < staticText.length; i += 2) {
+    staticText[i] = placeholders[staticText[i]];
+  }
+  return staticText;
+}
+
+/**
+ * Checks if the value of up to 8 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation(
+    instructions: I18nExpInstruction[], numberOfExp: number, v0: any, v1?: any, v2?: any, v3?: any,
+    v4?: any, v5?: any, v6?: any, v7?: any): string|NO_CHANGE {
+  let different = bindingUpdated(v0);
+
+  if (numberOfExp > 1) {
+    different = bindingUpdated(v1) || different;
+
+    if (numberOfExp > 2) {
+      different = bindingUpdated(v2) || different;
+
+      if (numberOfExp > 3) {
+        different = bindingUpdated(v3) || different;
+
+        if (numberOfExp > 4) {
+          different = bindingUpdated(v4) || different;
+
+          if (numberOfExp > 5) {
+            different = bindingUpdated(v5) || different;
+
+            if (numberOfExp > 6) {
+              different = bindingUpdated(v6) || different;
+
+              if (numberOfExp > 7) {
+                different = bindingUpdated(v7) || different;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    let value: any;
+    // Odd indexes are placeholders
+    if (i & 1) {
+      switch (instructions[i]) {
+        case 0:
+          value = v0;
+          break;
+        case 1:
+          value = v1;
+          break;
+        case 2:
+          value = v2;
+          break;
+        case 3:
+          value = v3;
+          break;
+        case 4:
+          value = v4;
+          break;
+        case 5:
+          value = v5;
+          break;
+        case 6:
+          value = v6;
+          break;
+        case 7:
+          value = v7;
+          break;
+      }
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Create a translated interpolation binding with a variable number of expressions.
+ *
+ * If there are 1 to 8 expressions then `i18nInterpolation()` should be used instead. It is faster
+ * because there is no need to create an array of expressions and iterate over it.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolationV(instructions: I18nExpInstruction[], values: any[]): string|
+    NO_CHANGE {
+  let different = false;
+  for (let i = 0; i < values.length; i++) {
+    // Check if bindings have changed
+    bindingUpdated(values[i]) && (different = true);
+  }
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are placeholders
+    if (i & 1) {
+      res += stringify(values[instructions[i] as number]);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 7ff3835145..b9a7ee98fc 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -8,8 +8,8 @@
 
 import {LifecycleHooksFeature, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
 import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, defineNgModule, definePipe} from './definition';
+import {I18nExpInstruction, I18nInstruction, i18nExpMapping, i18nInterpolation, i18nInterpolationV} from './i18n';
 import {ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
-
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
 export {RenderFlags} from './interfaces/definition';
@@ -79,6 +79,16 @@ export {
   tick,
 } from './instructions';
 
+export {
+  i18nApply as iA,
+  i18nMapping as iM,
+  i18nInterpolation as iI,
+  i18nInterpolationV as iIV,
+  i18nExpMapping as iEM,
+  I18nInstruction,
+  I18nExpInstruction
+} from './i18n';
+
 export {NgModuleDef, NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
 
 export {
@@ -96,7 +106,6 @@ export {
 
 export {
   QueryList,
-
   query as Q,
   queryRefresh as qR,
 } from './query';
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 88bff707a6..390203239d 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -6,22 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import './ng_dev_mode';
-
 import {Sanitizer} from '../sanitization/security';
-
-import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual, assertSame} from './assert';
+import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual} from './assert';
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
 import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {ACTIVE_INDEX, LContainer, RENDER_PARENT, VIEWS} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
+import {AttributeMarker, InitialInputData, InitialInputs, LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, PropertyAliases, PropertyAliasValue, TAttributes, TContainerNode, TElementNode, TNode, TNodeFlags, TNodeType,} from './interfaces/node';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
-import {BINDING_INDEX, CLEANUP, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView,} from './interfaces/view';
-
-import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
+import {BINDING_INDEX, CLEANUP, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TVIEW, TView,} from './interfaces/view';
+import './ng_dev_mode';
 import {assertNodeType} from './node_assert';
-import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
+import {appendChild, appendProjectedNode, canInsertNativeNode, createTextNode, getChildLNode, getLViewChild, getNextLNode, getParentLNode, insertView, removeChild, removeView} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDefInternal, ComponentTemplate, ComponentQuery, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
@@ -103,6 +100,11 @@ export function getCurrentSanitizer(): Sanitizer|null {
   return viewData && viewData[SANITIZER];
 }
 
+export function getViewData(): LViewData {
+  // top level variables should not be exported for performance reasons (PERF_NOTES.md)
+  return viewData;
+}
+
 /** Used to set the parent property when nodes are created. */
 let previousOrParentNode: LNode;
 
@@ -319,7 +321,8 @@ export function createLNodeObject(
     tNode: null !,
     pNextOrParent: null,
     dynamicLContainerNode: null,
-    dynamicParent: null
+    dynamicParent: null,
+    pChild: null,
   };
 }
 
@@ -367,8 +370,8 @@ export function createLNode(
   if (index === -1 || type === TNodeType.View) {
     // View nodes are not stored in data because they can be added / removed at runtime (which
     // would cause indices to change). Their TNodes are instead stored in TView.node.
-    node.tNode =
-        (state as LViewData)[TVIEW].node || createTNode(type, index, null, null, tParent, null);
+    node.tNode = (state ? (state as LViewData)[TVIEW].node : null) ||
+        createTNode(type, index, null, null, tParent, null);
   } else {
     const adjustedIndex = index + HEADER_OFFSET;
 
@@ -1157,7 +1160,8 @@ export function createTNode(
     next: null,
     child: null,
     parent: parent,
-    dynamicContainerNode: null
+    dynamicContainerNode: null,
+    detached: null
   };
 }
 
@@ -1334,8 +1338,6 @@ export function elementStyle<T>(
   }
 }
 
-
-
 //////////////////////////
 //// Text
 //////////////////////////
@@ -1893,7 +1895,16 @@ export function projectionDef(
   }
 
   const componentNode: LElementNode = findComponentHost(viewData);
-  let componentChild: LNode|null = getChildLNode(componentNode);
+  let isProjectingI18nNodes = false;
+  let componentChild: LNode|null;
+  // for i18n translations we use pChild to point to the next child
+  // TODO(kara): Remove when removing LNodes
+  if (componentNode.pChild) {
+    isProjectingI18nNodes = true;
+    componentChild = componentNode.pChild;
+  } else {
+    componentChild = getChildLNode(componentNode);
+  }
 
   while (componentChild !== null) {
     // execute selector matching logic if and only if:
@@ -1906,7 +1917,11 @@ export function projectionDef(
       distributedNodes[0].push(componentChild);
     }
 
-    componentChild = getNextLNode(componentChild);
+    if (isProjectingI18nNodes) {
+      componentChild = componentChild.pNextOrParent;
+    } else {
+      componentChild = getNextLNode(componentChild);
+    }
   }
 
   ngDevMode && assertDataNext(index + HEADER_OFFSET);
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 9097c82195..7559a67f83 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -100,6 +100,13 @@ export interface LNode {
    */
   pNextOrParent: LNode|null;
 
+  /**
+   * If this node is part of an i18n block, pointer to the first child after translation
+   * If this node is not part of an i18n block, this field is null.
+   */
+  // TODO(kara): Remove this when removing pNextOrParent
+  pChild: LNode|null;
+
   /**
    * Pointer to the corresponding TNode object, which stores static
    * data about this node.
@@ -342,6 +349,12 @@ export interface TNode {
    * A pointer to a TContainerNode created by directives requesting ViewContainerRef
    */
   dynamicContainerNode: TNode|null;
+
+  /**
+   * If this node is part of an i18n block, it indicates whether this container is part of the DOM
+   * If this node is not part of an i18n block, this field is null.
+   */
+  detached: boolean|null;
 }
 
 /** Static data for an LElementNode  */
diff --git a/packages/core/src/render3/ng_dev_mode.ts b/packages/core/src/render3/ng_dev_mode.ts
index e3a2d7188b..c75ec09ccb 100644
--- a/packages/core/src/render3/ng_dev_mode.ts
+++ b/packages/core/src/render3/ng_dev_mode.ts
@@ -27,6 +27,8 @@ declare global {
     rendererRemoveStyle: number;
     rendererDestroy: number;
     rendererDestroyNode: number;
+    rendererMoveNode: number;
+    rendererRemoveNode: number;
   }
 }
 
@@ -54,6 +56,8 @@ export const ngDevModeResetPerfCounters: () => void =
            rendererRemoveStyle: 0,
            rendererDestroy: 0,
            rendererDestroyNode: 0,
+           rendererMoveNode: 0,
+           rendererRemoveNode: 0,
          };
        }
        ngDevModeResetPerfCounters();
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 962f0724e2..25c725e5a7 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -29,6 +29,9 @@ export function getNextLNode(node: LNode): LNode|null {
 
 /** Retrieves the first child of a given node */
 export function getChildLNode(node: LNode): LNode|null {
+  if (node.pChild) {
+    return node.pChild;
+  }
   if (node.tNode.child) {
     const viewData = node.tNode.type === TNodeType.View ? node.data as LViewData : node.view;
     return viewData[node.tNode.child.index];
@@ -313,7 +316,7 @@ export function insertView(
   // If the container's renderParent is null, we know that it is a root node of its own parent view
   // and we should wait until that parent processes its nodes (otherwise, we will insert this view's
   // nodes twice - once now and once when its parent inserts its views).
-  if (container.data[RENDER_PARENT] !== null) {
+  if (container.data[RENDER_PARENT] !== null && !container.tNode.detached) {
     // Find the node to insert in front of
     const beforeNode =
         index + 1 < views.length ? (getChildLNode(views[index + 1]) !).native : container.native;
@@ -343,7 +346,9 @@ export function detachView(container: LContainerNode, removeIndex: number): LVie
     views[removeIndex - 1].data[NEXT] = viewNode.data[NEXT] as LViewData;
   }
   views.splice(removeIndex, 1);
-  addRemoveViewFromContainer(container, viewNode, false);
+  if (!container.tNode.detached) {
+    addRemoveViewFromContainer(container, viewNode, false);
+  }
   // Notify query that view has been removed
   const removedLview = viewNode.data;
   if (removedLview[QUERIES]) {
@@ -506,7 +511,7 @@ export function canInsertNativeNode(parent: LNode, currentView: LViewData): bool
 /**
  * Appends the `child` element to the `parent`.
  *
- * The element insertion might be delayed {@link canInsertNativeNode}
+ * The element insertion might be delayed {@link canInsertNativeNode}.
  *
  * @param parent The parent to which to append the child
  * @param child The child that should be appended
@@ -515,7 +520,7 @@ export function canInsertNativeNode(parent: LNode, currentView: LViewData): bool
  */
 export function appendChild(parent: LNode, child: RNode | null, currentView: LViewData): boolean {
   if (child !== null && canInsertNativeNode(parent, currentView)) {
-    // We only add element if not in View or not projected.
+    // We only add the element if not in View or not projected.
     const renderer = currentView[RENDERER];
     isProceduralRenderer(renderer) ? renderer.appendChild(parent.native !as RElement, child) :
                                      parent.native !.appendChild(child);
@@ -524,6 +529,25 @@ export function appendChild(parent: LNode, child: RNode | null, currentView: LVi
   return false;
 }
 
+/**
+ * Removes the `child` element of the `parent` from the DOM.
+ *
+ * @param parent The parent from which to remove the child
+ * @param child The child that should be removed
+ * @param currentView The current LView
+ * @returns Whether or not the child was removed
+ */
+export function removeChild(parent: LNode, child: RNode | null, currentView: LViewData): boolean {
+  if (child !== null && canInsertNativeNode(parent, currentView)) {
+    // We only remove the element if not in View or not projected.
+    const renderer = currentView[RENDERER];
+    isProceduralRenderer(renderer) ? renderer.removeChild(parent.native as RElement, child) :
+                                     parent.native !.removeChild(child);
+    return true;
+  }
+  return false;
+}
+
 /**
  * Appends a projected node to the DOM, or in the case of a projected container,
  * appends the nodes from all of the container's active views to the DOM.
diff --git a/packages/core/test/render3/compiler_canonical/i18n_spec.ts b/packages/core/test/render3/compiler_canonical/i18n_spec.ts
new file mode 100644
index 0000000000..3811eb5c18
--- /dev/null
+++ b/packages/core/test/render3/compiler_canonical/i18n_spec.ts
@@ -0,0 +1,139 @@
+/**
+ * @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 {NgForOfContext} from '@angular/common';
+import {Component} from '../../../src/core';
+import * as $r3$ from '../../../src/core_render3_private_export';
+import {NgForOf} from '../common_with_def';
+
+/// See: `normative.md`
+describe('i18n', () => {
+  type $RenderFlags$ = $r3$.ɵRenderFlags;
+
+  it('should support html', () => {
+    type $MyApp$ = MyApp;
+    const $msg_1$ = `{$START_P}contenu{$END_P}`;
+    const $i18n_1$ = $r3$.ɵiM($msg_1$, [{START_P: 1}]);
+
+    @Component({selector: 'my-app', template: `<div i18n><p>content</p></div>`})
+    class MyApp {
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyApp,
+        selectors: [['my-app']],
+        factory: () => new MyApp(),
+        template: function(rf: $RenderFlags$, ctx: $MyApp$) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵE(1, 'p');
+            $r3$.ɵe();
+            $r3$.ɵe();
+            $r3$.ɵiA(1, $i18n_1$[0]);
+          }
+        }
+      });
+    }
+  });
+
+  it('should support expressions', () => {
+    type $MyApp$ = MyApp;
+    const $msg_1$ = `contenu: {$EXP_1}`;
+    const $i18n_1$ = $r3$.ɵiM($msg_1$, null, [{EXP_1: 1}]);
+
+    @Component({selector: 'my-app', template: `<div i18n>content: {{exp1}}</div>`})
+    class MyApp {
+      exp1 = '1';
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyApp,
+        selectors: [['my-app']],
+        factory: () => new MyApp(),
+        template: function(rf: $RenderFlags$, ctx: $MyApp$) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵT(1);
+            $r3$.ɵe();
+            $r3$.ɵiA(1, $i18n_1$[0]);
+          }
+          if (rf & 2) {
+            $r3$.ɵt(3, $r3$.ɵb(ctx.exp1));
+          }
+        }
+      });
+    }
+  });
+
+  it('should support expressions in attributes', () => {
+    type $MyApp$ = MyApp;
+    const $msg_1$ = `titre: {$EXP_1}`;
+    const $i18n_1$ = $r3$.ɵiEM($msg_1$, {EXP_1: 1});
+
+    @Component({selector: 'my-app', template: `<div i18n><p title="title: {{exp1}}"></p></div>`})
+    class MyApp {
+      exp1 = '1';
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyApp,
+        selectors: [['my-app']],
+        factory: () => new MyApp(),
+        template: function(rf: $RenderFlags$, ctx: $MyApp$) {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵE(1, 'p');
+            $r3$.ɵe();
+            $r3$.ɵe();
+          }
+          if (rf & 2) {
+            $r3$.ɵp(0, 'title', $r3$.ɵiI($i18n_1$, 2, ctx.exp1));
+          }
+        }
+      });
+    }
+  });
+
+  it('should support embedded templates', () => {
+    type $MyApp$ = MyApp;
+    const $msg_1$ = `{$START_LI}valeur: {$EXP_1}!{$END_LI}`;
+    const $i18n_1$ =
+        $r3$.ɵiM($msg_1$, [{START_LI: 1}, {START_LI: 0}], [null, {EXP_1: 1}], ['START_LI']);
+
+    @Component({
+      selector: 'my-app',
+      template: `<ul i18n><li *ngFor="let item of items">value: {{item}}</li></ul>`
+    })
+    class MyApp {
+      items: string[] = ['1', '2'];
+      static ngComponentDef = $r3$.ɵdefineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        template: (rf: $RenderFlags$, myApp: $MyApp$) => {
+          if (rf & 1) {
+            $r3$.ɵE(0, 'ul');
+            $r3$.ɵC(1, liTemplate, null, ['ngForOf', '']);
+            $r3$.ɵe();
+            $r3$.ɵiA(1, $i18n_1$[0]);
+          }
+          if (rf & 2) {
+            $r3$.ɵp(1, 'ngForOf', $r3$.ɵb(myApp.items));
+          }
+
+          function liTemplate(rf1: $RenderFlags$, row: NgForOfContext<string>) {
+            if (rf1 & 1) {
+              $r3$.ɵE(0, 'li');
+              $r3$.ɵT(1);
+              $r3$.ɵe();
+              $r3$.ɵiA(0, $i18n_1$[1]);
+            }
+            if (rf1 & 2) {
+              $r3$.ɵt(1, $r3$.ɵb(row.$implicit));
+            }
+          }
+        },
+        directives: () => [NgForOf]
+      });
+    }
+  });
+});
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
new file mode 100644
index 0000000000..b83f5080f3
--- /dev/null
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -0,0 +1,1316 @@
+/**
+ * @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 {NgForOfContext} from '@angular/common';
+import {Component} from '../../src/core';
+import {defineComponent} from '../../src/render3/definition';
+import {i18nApply, i18nExpMapping, i18nInterpolation, i18nInterpolationV, i18nMapping} from '../../src/render3/i18n';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {RenderFlags} from '../../src/render3/interfaces/definition';
+import {NgForOf} from './common_with_def';
+import {ComponentFixture, TemplateFixture} from './render_util';
+
+describe('Runtime i18n', () => {
+  it('should support html elements', () => {
+    // Html tags are replaced by placeholders.
+    // Open tag placeholders are never re-used (closing tag placeholders can be).
+    const MSG_DIV_SECTION_1 =
+        `{$START_C}trad 1{$END_C}{$START_A}trad 2{$START_B}trad 3{$END_B}{$END_A}`;
+    const i18n_1 =
+        i18nMapping(MSG_DIV_SECTION_1, [{START_A: 1, START_B: 2, START_REMOVE_ME: 3, START_C: 4}]);
+    // Initial template:
+    // <div i18n>
+    //  <a>
+    //    <b></b>
+    //    <remove-me></remove-me>
+    //  </a>
+    //  <c></c>
+    // </div>
+
+    // Translated to:
+    // <div i18n>
+    //  <c>trad 1</c>
+    //  <a>
+    //    trad 2
+    //    <b>trad 3</b>
+    //  </a>
+    // </div>
+    function createTemplate() {
+      elementStart(0, 'div');
+      {  // Start of translated section 1
+        // - i18n sections do not contain any text() instruction
+        elementStart(1, 'a');  // START_A
+        {
+          elementStart(2, 'b');  // START_B
+          elementEnd();
+          elementStart(3, 'remove-me');  // START_REMOVE_ME
+          elementEnd();
+        }
+        elementEnd();
+        elementStart(4, 'c');  // START_C
+        elementEnd();
+      }  // End of translated section 1
+      elementEnd();
+      i18nApply(1, i18n_1[0]);
+    }
+
+    const fixture = new TemplateFixture(createTemplate);
+    expect(fixture.html).toEqual('<div><c>trad 1</c><a>trad 2<b>trad 3</b></a></div>');
+  });
+
+  it('should support expressions', () => {
+    const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
+    const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 1, EXP_2: 2}]);
+
+    class MyApp {
+      exp1 = '1';
+      exp2 = '2';
+
+      static ngComponentDef = defineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        // Initial template:
+        // <div i18n>
+        //  {{exp1}} {{exp2}}
+        // </div>
+
+        // Translated to:
+        // <div i18n>
+        //  start {{exp2}} middle {{exp1}} end
+        // </div>
+        template: (rf: RenderFlags, ctx: MyApp) => {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'div');
+            {
+              // Start of translated section 1
+              // One text node is added per expression in the interpolation
+              text(1);  // EXP_1
+              text(2);  // EXP_2
+              // End of translated section 1
+            }
+            elementEnd();
+            i18nApply(1, i18n_1[0]);
+          }
+          if (rf & RenderFlags.Update) {
+            textBinding(1, bind(ctx.exp1));
+            textBinding(2, bind(ctx.exp2));
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(MyApp);
+    expect(fixture.html).toEqual('<div>start 2 middle 1 end</div>');
+
+    // Change detection cycle, no model changes
+    fixture.update();
+    expect(fixture.html).toEqual('<div>start 2 middle 1 end</div>');
+
+    // Change the expressions
+    fixture.component.exp1 = 'expr 1';
+    fixture.component.exp2 = 'expr 2';
+    fixture.update();
+    expect(fixture.html).toEqual('<div>start expr 2 middle expr 1 end</div>');
+  });
+
+  it('should support expressions on removed nodes', () => {
+    const MSG_DIV_SECTION_1 = `message`;
+    const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 1}]);
+
+    class MyApp {
+      exp1 = '1';
+
+      static ngComponentDef = defineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        // Initial template:
+        // <div i18n>
+        //  {{exp1}}
+        // </div>
+
+        // Translated to:
+        // <div i18n>
+        //   message
+        // </div>
+        template: (rf: RenderFlags, ctx: MyApp) => {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'div');
+            {
+              // Start of translated section 1
+              text(1);  // EXP_1 will be removed
+              // End of translated section 1
+            }
+            elementEnd();
+            i18nApply(1, i18n_1[0]);
+          }
+          if (rf & RenderFlags.Update) {
+            textBinding(1, bind(ctx.exp1));
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(MyApp);
+    expect(fixture.html).toEqual('<div>message</div>');
+
+    // Change detection cycle, no model changes
+    fixture.update();
+    expect(fixture.html).toEqual('<div>message</div>');
+
+    // Change the expressions
+    fixture.component.exp1 = 'expr 1';
+    fixture.update();
+    expect(fixture.html).toEqual('<div>message</div>');
+  });
+
+  it('should support expressions in attributes', () => {
+    const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
+    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {EXP_1: 0, EXP_2: 1});
+
+    class MyApp {
+      exp1: any = '1';
+      exp2: any = '2';
+
+      static ngComponentDef = defineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        // Initial template:
+        // <div i18n i18n-title title="{{exp1}}{{exp2}}"></div>
+
+        // Translated to:
+        // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end"></div>
+        template: (rf: RenderFlags, ctx: MyApp) => {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'div');
+            // Start of translated section 1
+            // End of translated section 1
+            elementEnd();
+          }
+          if (rf & RenderFlags.Update) {
+            elementProperty(0, 'title', i18nInterpolation(i18n_1, 2, ctx.exp1, ctx.exp2));
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(MyApp);
+    expect(fixture.html).toEqual('<div title="start 2 middle 1 end"></div>');
+
+    // Change detection cycle, no model changes
+    fixture.update();
+    expect(fixture.html).toEqual('<div title="start 2 middle 1 end"></div>');
+
+    // Change the expressions
+    fixture.component.exp1 = function test() {};
+    fixture.component.exp2 = null;
+    fixture.update();
+    expect(fixture.html).toEqual('<div title="start  middle test end"></div>');
+  });
+
+  it('should support both html elements, expressions and expressions in attributes', () => {
+    const MSG_DIV_SECTION_1 = `{$EXP_1} {$START_P}trad {$EXP_2}{$END_P}`;
+    const MSG_ATTR_1 = `start {$EXP_2} middle {$EXP_1} end`;
+    const i18n_1 = i18nMapping(
+        MSG_DIV_SECTION_1,
+        [{START_REMOVE_ME_1: 2, START_REMOVE_ME_2: 3, START_REMOVE_ME_3: 4, START_P: 5}],
+        [{EXP_1: 1, EXP_2: 6, EXP_3: 7}]);
+    const i18n_2 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0, EXP_2: 1});
+
+    class MyApp {
+      exp1 = '1';
+      exp2 = '2';
+      exp3 = '3';
+
+      static ngComponentDef = defineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        // Initial template:
+        // <div i18n i18n-title title="{{exp1}}{{exp2}}">
+        //  {{exp1}}
+        //  <remove-me-1>
+        //    <remove-me-2></remove-me-2>
+        //    <remove-me-3></remove-me-3>
+        //  </remove-me-1>
+        //  <p>
+        //    {{exp2}}
+        //  </p>
+        //  {{exp3}}
+        // </div>
+
+        // Translated to:
+        // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end">
+        //  {{exp1}}
+        //  <p>
+        //    trad {{exp2}}
+        //  </p>
+        // </div>
+        template: (rf: RenderFlags, ctx: MyApp) => {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'div');
+            {
+              // Start of translated section 1
+              text(1);                         // EXP_1
+              elementStart(2, 'remove-me-1');  // START_REMOVE_ME_1
+              {
+                elementStart(3, 'remove-me-2');  // START_REMOVE_ME_2
+                elementEnd();
+                elementStart(4, 'remove-me-3');  // START_REMOVE_ME_3
+                elementEnd();
+              }
+              elementEnd();
+              elementStart(5, 'p');  // START_P
+              { text(6); }           // EXP_2
+              elementEnd();
+              text(7);  // EXP_3
+              // End of translated section 1
+            }
+            elementEnd();
+            i18nApply(1, i18n_1[0]);
+          }
+          if (rf & RenderFlags.Update) {
+            textBinding(1, bind(ctx.exp1));
+            textBinding(6, bind(ctx.exp2));
+            textBinding(7, bind(ctx.exp3));
+            elementProperty(0, 'title', i18nInterpolation(i18n_2, 2, ctx.exp1, ctx.exp2));
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(MyApp);
+    expect(fixture.html).toEqual('<div title="start 2 middle 1 end">1 <p>trad 2</p></div>');
+
+    // Change detection cycle, no model changes
+    fixture.update();
+    expect(fixture.html).toEqual('<div title="start 2 middle 1 end">1 <p>trad 2</p></div>');
+
+    // Change the expressions
+    fixture.component.exp1 = 'expr 1';
+    fixture.component.exp2 = 'expr 2';
+    fixture.update();
+    expect(fixture.html)
+        .toEqual('<div title="start expr 2 middle expr 1 end">expr 1 <p>trad expr 2</p></div>');
+  });
+
+  it('should support multiple i18n elements', () => {
+    const MSG_DIV_SECTION_1 = `trad {$EXP_1}`;
+    const MSG_DIV_SECTION_2 = `{$START_C}trad{$END_C}`;
+    const MSG_ATTR_1 = `start {$EXP_2} middle {$EXP_1} end`;
+    const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 2}]);
+    const i18n_2 = i18nMapping(MSG_DIV_SECTION_2, [{START_C: 5}]);
+    const i18n_3 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0, EXP_2: 1});
+
+    class MyApp {
+      exp1 = '1';
+      exp2 = '2';
+
+      static ngComponentDef = defineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        // Initial template:
+        // <div>
+        //  <a i18n>
+        //    {{exp1}}
+        //  </a>
+        //  hello
+        //  <b i18n i18n-title title="{{exp1}}{{exp2}}">
+        //    <c></c>
+        //  </b>
+        // </div>
+
+        // Translated to:
+        // <div>
+        //  <a i18n>
+        //    trad {{exp1}}
+        //  </a>
+        //  hello
+        //  <b i18n i18n-title title="start {{exp2}} middle {{exp1}} end">
+        //    <c>trad</c>
+        //  </b>
+        // </div>
+        template: (rf: RenderFlags, ctx: MyApp) => {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'div');
+            {
+              elementStart(1, 'a');
+              {
+                // Start of translated section 1
+                text(2);  // EXP_1
+                // End of translated section 1
+              }
+              elementEnd();
+              text(3, 'hello');
+              elementStart(4, 'b');
+              {
+                // Start of translated section 2
+                elementStart(5, 'c');  // START_C
+                elementEnd();
+                // End of translated section 2
+              }
+              elementEnd();
+            }
+            elementEnd();
+            i18nApply(2, i18n_1[0]);
+            i18nApply(5, i18n_2[0]);
+          }
+          if (rf & RenderFlags.Update) {
+            textBinding(2, bind(ctx.exp1));
+            elementProperty(4, 'title', i18nInterpolation(i18n_3, 2, ctx.exp1, ctx.exp2));
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(MyApp);
+    expect(fixture.html)
+        .toEqual('<div><a>trad 1</a>hello<b title="start 2 middle 1 end"><c>trad</c></b></div>');
+
+    // Change detection cycle, no model changes
+    fixture.update();
+    expect(fixture.html)
+        .toEqual('<div><a>trad 1</a>hello<b title="start 2 middle 1 end"><c>trad</c></b></div>');
+
+    // Change the expressions
+    fixture.component.exp1 = 'expr 1';
+    fixture.component.exp2 = 'expr 2';
+    fixture.update();
+    expect(fixture.html)
+        .toEqual(
+            '<div><a>trad expr 1</a>hello<b title="start expr 2 middle expr 1 end"><c>trad</c></b></div>');
+  });
+
+  describe('view containers / embedded templates', () => {
+    it('should support containers', () => {
+      const MSG_DIV_SECTION_1 = `valeur: {$EXP_1}`;
+      // The indexes are based on the main template function
+      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 0}]);
+
+      class MyApp {
+        exp1 = '1';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // before (
+          // % if (condition) { // with i18n
+          //   value: {{exp1}}
+          // % }
+          // ) after
+
+          // Translated :
+          // before (
+          // % if (condition) { // with i18n
+          //   valeur: {{exp1}}
+          // % }
+          // ) after
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              text(0, 'before (');
+              container(1);
+              text(2, ') after');
+            }
+            if (rf & RenderFlags.Update) {
+              containerRefreshStart(1);
+              {
+                let rf0 = embeddedViewStart(0);
+                if (rf0 & RenderFlags.Create) {
+                  // Start of translated section 1
+                  text(0);  // EXP_1
+                  // End of translated section 1
+                  i18nApply(0, i18n_1[0]);
+                }
+                if (rf0 & RenderFlags.Update) {
+                  textBinding(0, bind(myApp.exp1));
+                }
+                embeddedViewEnd();
+              }
+              containerRefreshEnd();
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('before (valeur: 1) after');
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html).toEqual('before (valeur: 1) after');
+    });
+
+    it('should support ng-container', () => {
+      const MSG_DIV_SECTION_1 = `{$START_B}{$END_B}`;
+      // With ng-container the i18n node doesn't create any element at runtime which means that
+      // its children are not the only children of their parent, some nodes which are not
+      // translated might also be the children of the same parent.
+      // This is why we need to pass the `lastChildIndex` to `i18nMapping`
+      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{START_B: 2, START_C: 3}], null, null, 4);
+      // Initial template:
+      // <div i18n>
+      //  <a></a>
+      //  <ng-container i18n>
+      //    <b></b>
+      //    <c></c>
+      //  </ng-container>
+      //  <d></d>
+      // </div>
+
+      // Translated to:
+      // <div i18n>
+      //  <a></a>
+      //  <ng-container i18n>
+      //    <b></b>
+      //  </ng-container>
+      //  <d></d>
+      // </div>
+      function createTemplate() {
+        elementStart(0, 'div');
+        {
+          elementStart(1, 'a');
+          elementEnd();
+          {
+            // Start of translated section 1
+            elementStart(2, 'b');  // START_B
+            elementEnd();
+            elementStart(3, 'c');  // START_C
+            elementEnd();
+            // End of translated section 1
+          }
+          elementStart(4, 'd');
+          elementEnd();
+        }
+        elementEnd();
+        i18nApply(2, i18n_1[0]);
+      }
+
+      const fixture = new TemplateFixture(createTemplate);
+      expect(fixture.html).toEqual('<div><a></a><b></b><d></d></div>');
+    });
+
+    it('should support embedded templates', () => {
+      const MSG_DIV_SECTION_1 = `{$START_LI}valeur: {$EXP_1}!{$END_LI}`;
+      // The indexes are based on each template function
+      const i18n_1 = i18nMapping(
+          MSG_DIV_SECTION_1, [{START_LI: 1}, {START_LI: 0}], [null, {EXP_1: 1}], ['START_LI']);
+      class MyApp {
+        items: string[] = ['1', '2'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">value: {{item}}</li>
+          // </ul>
+
+          // Translated to:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">valeur: {{item}}</li>
+          // </ul>
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'ul');
+              {
+                // Start of translated section 1
+                container(1, liTemplate, null, ['ngForOf', '']);  // START_LI
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(1, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 2
+                elementStart(0, 'li');  // START_LI
+                { text(1); }            // EXP_1
+                elementEnd();
+                // End of translated section 2
+                i18nApply(0, i18n_1[1]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<ul><li>valeur: 1!</li><li>valeur: 2!</li></ul>');
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur: 1!</li><li>valeur: 2!</li></ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur: 1!</li></ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur: one!</li></ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur: one!</li><li>valeur: two!</li></ul>');
+    });
+
+    it('should support sibling embedded templates', () => {
+      const MSG_DIV_SECTION_1 =
+          `{$START_LI_0}valeur: {$EXP_1}!{$END_LI_0}{$START_LI_1}valeur bis: {$EXP_2}!{$END_LI_1}`;
+      // The indexes are based on each template function
+      const i18n_1 = i18nMapping(
+          MSG_DIV_SECTION_1, [null, {START_LI_0: 0}, {START_LI_1: 0}],
+          [{START_LI_0: 1, START_LI_1: 2}, {EXP_1: 1}, {EXP_2: 1}], ['START_LI_0', 'START_LI_1']);
+      class MyApp {
+        items: string[] = ['1', '2'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">value: {{item}}</li>
+          //   <li *ngFor="let item of items">value bis: {{item}}</li>
+          // </ul>
+
+          // Translated to:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">valeur: {{item}}!</li>
+          //   <li *ngFor="let item of items">valeur bis: {{item}}!</li>
+          // </ul>
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'ul');
+              {
+                // Start of translated section 1
+                container(1, liTemplate, null, ['ngForOf', '']);     // START_LI_0
+                container(2, liTemplateBis, null, ['ngForOf', '']);  // START_LI_1
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(1, 'ngForOf', bind(myApp.items));
+              elementProperty(2, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 2
+                elementStart(0, 'li');  // START_LI_0
+                { text(1); }            // EXP_1
+                elementEnd();
+                // End of translated section 2
+                i18nApply(0, i18n_1[1]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+
+            function liTemplateBis(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 3
+                elementStart(0, 'li');  // START_LI_1
+                { text(1); }            // EXP_2
+                elementEnd();
+                // End of translated section 3
+                i18nApply(0, i18n_1[2]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li>valeur: 1!</li><li>valeur: 2!</li><li>valeur bis: 1!</li><li>valeur bis: 2!</li></ul>');
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li>valeur: 1!</li><li>valeur: 2!</li><li>valeur bis: 1!</li><li>valeur bis: 2!</li></ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur: 1!</li><li>valeur bis: 1!</li></ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur: one!</li><li>valeur bis: one!</li></ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li>valeur: one!</li><li>valeur: two!</li><li>valeur bis: one!</li><li>valeur bis: two!</li></ul>');
+    });
+
+    it('should support nested embedded templates', () => {
+      const MSG_DIV_SECTION_1 = `{$START_LI}{$START_SPAN}valeur: {$EXP_1}!{$END_SPAN}{$END_LI}`;
+      // The indexes are based on each template function
+      const i18n_1 = i18nMapping(
+          MSG_DIV_SECTION_1, [null, {START_LI: 0}, {START_SPAN: 0}],
+          [{START_LI: 1}, {START_SPAN: 1}, {EXP_1: 1}], ['START_LI', 'START_SPAN']);
+      class MyApp {
+        items: string[] = ['1', '2'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">
+          //     <span *ngFor="let item of items">value: {{item}}</span>
+          //   </li>
+          // </ul>
+
+          // Translated to:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">
+          //     <span *ngFor="let item of items">valeur: {{item}}!</span>
+          //   </li>
+          // </ul>
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'ul');
+              {
+                // Start of translated section 1
+                container(1, liTemplate, null, ['ngForOf', '']);  // START_LI
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(1, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 2
+                elementStart(0, 'li');  // START_LI
+                {
+                  container(1, spanTemplate, null, ['ngForOf', '']);  // START_SPAN
+                }
+                elementEnd();
+                // End of translated section 2
+                i18nApply(0, i18n_1[1]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                elementProperty(1, 'ngForOf', bind(myApp.items));
+              }
+            }
+
+            function spanTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 3
+                elementStart(0, 'span');  // START_SPAN
+                { text(1); }              // EXP_1
+                elementEnd();
+                // End of translated section 3
+                i18nApply(0, i18n_1[2]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li><span>valeur: 1!</span><span>valeur: 2!</span></li><li><span>valeur: 1!</span><span>valeur: 2!</span></li></ul>');
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li><span>valeur: 1!</span><span>valeur: 2!</span></li><li><span>valeur: 1!</span><span>valeur: 2!</span></li></ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li><span>valeur: 1!</span></li></ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li><span>valeur: one!</span></li></ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li><span>valeur: one!</span><span>valeur: two!</span></li><li><span>valeur: one!</span><span>valeur: two!</span></li></ul>');
+    });
+
+    it('should be able to move template directives around', () => {
+      const MSG_DIV_SECTION_1 =
+          `{$START_LI_0}début{$END_LI_0}{$START_LI_1}valeur: {$EXP_1}{$END_LI_1}fin`;
+      // The indexes are based on each template function
+      const i18n_1 = i18nMapping(
+          MSG_DIV_SECTION_1, [{START_LI_0: 1, START_LI_2: 3}, {START_LI_1: 0}],
+          [{START_LI_1: 2}, {EXP_1: 1}], ['START_LI_1']);
+
+      class MyApp {
+        items: string[] = ['first', 'second'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <ul i18n>
+          //   <li>start</li>
+          //   <li *ngFor="let item of items">value: {{item}}</li>
+          //   <li>delete me</li>
+          // </ul>
+
+          // Translated to:
+          // <ul i18n>
+          //   <li>début</li>
+          //   <li *ngFor="let item of items">valeur: {{item}}</li>
+          //   fin
+          // </ul>
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'ul');
+              {
+                // Start of translated section 1
+                elementStart(1, 'li');  // START_LI_0
+                elementEnd();
+                container(2, liTemplate, null, ['ngForOf', '']);  // START_LI_1
+                elementStart(3, 'li');                            // START_LI_2
+                { text(4, 'delete me'); }
+                elementEnd();
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(2, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 2
+                elementStart(0, 'li');  // START_LI_1
+                { text(1); }            // EXP_1
+                elementEnd();
+                // End of translated section 2
+                i18nApply(0, i18n_1[1]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html)
+          .toEqual('<ul><li>début</li><li>valeur: first</li><li>valeur: second</li>fin</ul>');
+
+      // // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html)
+          .toEqual('<ul><li>début</li><li>valeur: first</li><li>valeur: second</li>fin</ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>début</li><li>valeur: first</li>fin</ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>début</li><li>valeur: one</li>fin</ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html)
+          .toEqual('<ul><li>début</li><li>valeur: one</li><li>valeur: two</li>fin</ul>');
+    });
+
+    it('should be able to remove containers', () => {
+      const MSG_DIV_SECTION_1 = `loop`;
+      // The indexes are based on each template function
+      const i18n_1 = i18nMapping(
+          MSG_DIV_SECTION_1, [{START_LI: 1}, {START_LI: 0}], [null, {EXP_1: 1}], ['START_LI']);
+
+      class MyApp {
+        items: string[] = ['first', 'second'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">value: {{item}}</li>
+          // </ul>
+
+          // Translated to:
+          // <ul i18n>
+          //   loop
+          // </ul>
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'ul');
+              {
+                // Start of translated section 1
+                container(1, liTemplate, undefined, ['ngForOf', '']);  // START_LI
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(1, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 2
+                elementStart(0, 'li');  // START_LI
+                { text(1); }            // EXP_1
+                elementEnd();
+                // End of translated section 2
+                i18nApply(0, i18n_1[1]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<ul>loop</ul>');
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html).toEqual('<ul>loop</ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul>loop</ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul>loop</ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html).toEqual('<ul>loop</ul>');
+    });
+  });
+
+  describe('projection', () => {
+    it('should project the translations', () => {
+      @Component({selector: 'child', template: '<p><ng-content></ng-content></p>'})
+      class Child {
+        static ngComponentDef = defineComponent({
+          type: Child,
+          selectors: [['child']],
+          factory: () => new Child(),
+          template: (rf: RenderFlags, cmp: Child) => {
+            if (rf & RenderFlags.Create) {
+              projectionDef(0);
+              elementStart(1, 'p');
+              { projection(2, 0); }
+              elementEnd();
+            }
+          }
+        });
+      }
+
+      const MSG_DIV_SECTION_1 =
+          `{$START_CHILD}Je suis projeté depuis {$START_B}{$EXP_1}{$END_B}{$END_CHILD}`;
+      const i18n_1 = i18nMapping(
+          MSG_DIV_SECTION_1, [{
+            START_CHILD: 1,
+            START_B: 2,
+            START_REMOVE_ME_1: 4,
+            START_REMOVE_ME_2: 5,
+            START_REMOVE_ME_3: 6
+          }],
+          [{EXP_1: 3}]);
+      const MSG_ATTR_1 = `Enfant de {$EXP_1}`;
+      const i18n_2 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0});
+
+      @Component({
+        selector: 'parent',
+        template: `
+        <div i18n>
+          <child>I am projected from <b i18n-title title="Child of {{name}}">{{name}}<remove-me-1></remove-me-1></b><remove-me-2></remove-me-2></child>
+          <remove-me-3></remove-me-3>
+        </div>`
+        // Translated to:
+        // <div i18n>
+        //   <child>
+        //     Je suis projeté depuis <b i18n-title title="Enfant de {{name}}">{{name}}</b>
+        //   </child>
+        // </div>
+      })
+      class Parent {
+        name: string = 'Parent';
+        static ngComponentDef = defineComponent({
+          type: Parent,
+          selectors: [['parent']],
+          directives: [Child],
+          factory: () => new Parent(),
+          template: (rf: RenderFlags, cmp: Parent) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'div');
+              {
+                // Start of translated section 1
+                elementStart(1, 'child');  // START_CHILD
+                {
+                  elementStart(2, 'b');  // START_B
+                  {
+                    text(3);                         // EXP_1
+                    elementStart(4, 'remove-me-1');  // START_REMOVE_ME_1
+                    elementEnd();
+                  }
+                  elementEnd();
+                  elementStart(5, 'remove-me-2');  // START_REMOVE_ME_2
+                  elementEnd();
+                }
+                elementEnd();
+                elementStart(6, 'remove-me-3');  // START_REMOVE_ME_3
+                elementEnd();
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(2, 'title', i18nInterpolation(i18n_2, 1, cmp.name));
+              textBinding(3, bind(cmp.name));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(Parent);
+      expect(fixture.html)
+          .toEqual(
+              '<div><child><p>Je suis projeté depuis <b title="Enfant de Parent">Parent</b></p></child></div>');
+    });
+
+    it('should project a translated i18n block', () => {
+      @Component({selector: 'child', template: '<p><ng-content></ng-content></p>'})
+      class Child {
+        static ngComponentDef = defineComponent({
+          type: Child,
+          selectors: [['child']],
+          factory: () => new Child(),
+          template: (rf: RenderFlags, cmp: Child) => {
+            if (rf & RenderFlags.Create) {
+              projectionDef(0);
+              elementStart(1, 'p');
+              { projection(2, 0); }
+              elementEnd();
+            }
+          }
+        });
+      }
+
+      const MSG_DIV_SECTION_1 = `Je suis projeté depuis {$EXP_1}`;
+      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 4}]);
+      const MSG_ATTR_1 = `Enfant de {$EXP_1}`;
+      const i18n_2 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0});
+
+      @Component({
+        selector: 'parent',
+        template: `
+        <div>
+          <child><any></any><b i18n i18n-title title="Child of {{name}}">I am projected from {{name}}</b><any></any></child>
+        </div>`
+        // Translated to:
+        // <div>
+        //   <child>
+        //     <any></any>
+        //     <b i18n i18n-title title="Enfant de {{name}}">Je suis projeté depuis {{name}}</b>
+        //     <any></any>
+        //   </child>
+        // </div>
+      })
+      class Parent {
+        name: string = 'Parent';
+        static ngComponentDef = defineComponent({
+          type: Parent,
+          selectors: [['parent']],
+          directives: [Child],
+          factory: () => new Parent(),
+          template: (rf: RenderFlags, cmp: Parent) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'div');
+              {
+                elementStart(1, 'child');
+                {
+                  elementStart(2, 'any');
+                  elementEnd();
+                  elementStart(3, 'b');
+                  {
+                    // Start of translated section 1
+                    text(4);  // EXP_1
+                    // End of translated section 1
+                  }
+                  elementEnd();
+                  elementStart(5, 'any');
+                  elementEnd();
+                }
+                elementEnd();
+              }
+              elementEnd();
+              i18nApply(4, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(3, 'title', i18nInterpolation(i18n_2, 1, cmp.name));
+              textBinding(4, bind(cmp.name));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(Parent);
+      expect(fixture.html)
+          .toEqual(
+              '<div><child><p><any></any><b title="Enfant de Parent">Je suis projeté depuis Parent</b><any></any></p></child></div>');
+    });
+
+    it('should re-project translations when multiple projections', () => {
+      @Component({selector: 'grand-child', template: '<div><ng-content></ng-content></div>'})
+      class GrandChild {
+        static ngComponentDef = defineComponent({
+          type: GrandChild,
+          selectors: [['grand-child']],
+          factory: () => new GrandChild(),
+          template: (rf: RenderFlags, cmp: Child) => {
+            if (rf & RenderFlags.Create) {
+              projectionDef(0);
+              elementStart(1, 'div');
+              { projection(2, 0); }
+              elementEnd();
+            }
+          }
+        });
+      }
+
+      @Component(
+          {selector: 'child', template: '<grand-child><ng-content></ng-content></grand-child>'})
+      class Child {
+        static ngComponentDef = defineComponent({
+          type: Child,
+          selectors: [['child']],
+          directives: [GrandChild],
+          factory: () => new Child(),
+          template: (rf: RenderFlags, cmp: Child) => {
+            if (rf & RenderFlags.Create) {
+              projectionDef(0);
+              elementStart(1, 'grand-child');
+              { projection(2, 0); }
+              elementEnd();
+            }
+          }
+        });
+      }
+
+      const MSG_DIV_SECTION_1 = `{$START_B}Bonjour{$END_B} Monde!`;
+      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{START_B: 1}]);
+
+      @Component({
+        selector: 'parent',
+        template: `<child i18n><b>Hello</b> World!</child>`
+        // Translated to:
+        // <child i18n><grand-child><div><b>Bonjour</b> Monde!</div></grand-child></child>
+      })
+      class Parent {
+        name: string = 'Parent';
+        static ngComponentDef = defineComponent({
+          type: Parent,
+          selectors: [['parent']],
+          directives: [Child],
+          factory: () => new Parent(),
+          template: (rf: RenderFlags, cmp: Parent) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'child');
+              {
+                // Start of translated section 1
+                elementStart(1, 'b');  // START_B
+                elementEnd();
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(Parent);
+      expect(fixture.html)
+          .toEqual('<child><grand-child><div><b>Bonjour</b> Monde!</div></grand-child></child>');
+    });
+
+    it('should project translations with selectors', () => {
+      @Component({
+        selector: 'child',
+        template: `
+          <ng-content select="span"></ng-content>
+        `
+      })
+      class Child {
+        static ngComponentDef = defineComponent({
+          type: Child,
+          selectors: [['child']],
+          factory: () => new Child(),
+          template: (rf: RenderFlags, cmp: Child) => {
+            if (rf & RenderFlags.Create) {
+              projectionDef(0, [[['span']]], ['span']);
+              projection(1, 0, 1);
+            }
+          }
+        });
+      }
+
+      const MSG_DIV_SECTION_1 = `{$START_SPAN_0}Contenu{$END_SPAN_0}`;
+      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{START_SPAN_0: 1, START_SPAN_1: 2}]);
+
+      @Component({
+        selector: 'parent',
+        template: `
+          <child i18n>
+            <span title="keepMe"></span>
+            <span title="deleteMe"></span>
+          </child>
+        `
+        // Translated to:
+        // <child i18n><span title="keepMe">Contenu</span></child>
+      })
+      class Parent {
+        static ngComponentDef = defineComponent({
+          type: Parent,
+          selectors: [['parent']],
+          directives: [Child],
+          factory: () => new Parent(),
+          template: (rf: RenderFlags, cmp: Parent) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'child');
+              {
+                // Start of translated section 1
+                elementStart(1, 'span', ['title', 'keepMe']);  // START_SPAN_0
+                elementEnd();
+                elementStart(2, 'span', ['title', 'deleteMe']);  // START_SPAN_1
+                elementEnd();
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(Parent);
+      expect(fixture.html).toEqual('<child><span title="keepMe">Contenu</span></child>');
+    });
+  });
+
+  it('i18nInterpolation should return the same value as i18nInterpolationV', () => {
+    const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
+    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {EXP_1: 0, EXP_2: 1});
+    let interpolation;
+    let interpolationV;
+
+    class MyApp {
+      exp1: any = '1';
+      exp2: any = '2';
+
+      static ngComponentDef = defineComponent({
+        type: MyApp,
+        factory: () => new MyApp(),
+        selectors: [['my-app']],
+        // Initial template:
+        // <div i18n i18n-title title="{{exp1}}{{exp2}}"></div>
+
+        // Translated to:
+        // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end"></div>
+        template: (rf: RenderFlags, ctx: MyApp) => {
+          if (rf & RenderFlags.Create) {
+            elementStart(0, 'div');
+            // Start of translated section 1
+            // End of translated section 1
+            elementEnd();
+          }
+          if (rf & RenderFlags.Update) {
+            interpolation = i18nInterpolation(i18n_1, 2, ctx.exp1, ctx.exp2);
+            interpolationV = i18nInterpolationV(i18n_1, [ctx.exp1, ctx.exp2]);
+            elementProperty(0, 'title', interpolation);
+          }
+        }
+      });
+    }
+
+    const fixture = new ComponentFixture(MyApp);
+    expect(interpolation).toBeDefined();
+    expect(interpolation).toEqual(interpolationV);
+  });
+});
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index cf5c2aca36..8cfd3a10df 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -24,7 +24,8 @@ function testLStaticData(tagName: string, attrs: TAttributes | null): TNode {
     next: null,
     child: null,
     parent: null,
-    dynamicContainerNode: null
+    dynamicContainerNode: null,
+    detached: null
   };
 }
 

From 10da6a45c6ca7ab14004c63b037f62eb8e3320b3 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 13 Jun 2018 10:33:04 -0700
Subject: [PATCH 321/582] refactor(ivy): first pass at extracting
 ReflectionHost for abstract reflection (#24541)

ngtsc needs to reflect over code to property compile it. It performs operations
such as enumerating decorators on a type, reading metadata from constructor
parameters, etc.

Depending on the format (ES5, ES6, etc) of the underlying code, the AST
structures over which this reflection takes place can be very different. For
example, in TS/ES6 code `class` declarations are `ts.ClassDeclaration` nodes,
but in ES5 code they've been downleveled to `ts.VariableDeclaration` nodes that
are initialized to IIFEs that build up the classes being defined.

The ReflectionHost abstraction allows ngtsc to perform these operations without
directly querying the AST. Different implementations of ReflectionHost allow
support for different code formats.

PR Close #24541
---
 packages/compiler-cli/BUILD.bazel             |   1 +
 .../src/ngtsc/annotations/BUILD.bazel         |   1 +
 .../src/ngtsc/annotations/src/component.ts    |  18 +-
 .../src/ngtsc/annotations/src/directive.ts    |  77 +--
 .../src/ngtsc/annotations/src/injectable.ts   |  36 +-
 .../src/ngtsc/annotations/src/ng_module.ts    |  11 +-
 .../ngtsc/annotations/src/selector_scope.ts   |  91 ++--
 .../src/ngtsc/annotations/src/util.ts         |  26 +-
 .../annotations/test/selector_scope_spec.ts   |   4 +-
 .../compiler-cli/src/ngtsc/host/BUILD.bazel   |  12 +
 packages/compiler-cli/src/ngtsc/host/index.ts |   9 +
 .../src/ngtsc/host/src/reflection.ts          | 223 ++++++++
 .../src/ngtsc/metadata/BUILD.bazel            |   1 +
 .../compiler-cli/src/ngtsc/metadata/index.ts  |   3 +-
 .../src/ngtsc/metadata/src/reflector.ts       | 511 +++++++++---------
 .../src/ngtsc/metadata/test/BUILD.bazel       |   1 +
 .../src/ngtsc/metadata/test/reflector_spec.ts |  45 +-
 packages/compiler-cli/src/ngtsc/program.ts    |  12 +-
 .../src/ngtsc/transform/BUILD.bazel           |   1 +
 .../src/ngtsc/transform/src/api.ts            |   6 +-
 .../src/ngtsc/transform/src/compilation.ts    |  95 ++--
 .../src/ngtsc/transform/src/transform.ts      |   3 +-
 .../compiler/src/render3/view/compiler.ts     |   2 +-
 23 files changed, 724 insertions(+), 465 deletions(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/host/BUILD.bazel
 create mode 100644 packages/compiler-cli/src/ngtsc/host/index.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/host/src/reflection.ts

diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index fcdf1eb025..cd99c5f7df 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -26,6 +26,7 @@ ts_library(
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/annotations",
+        "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/transform",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
index 0e502d94c4..4a0cd4bb59 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
     module_name = "@angular/compiler-cli/src/ngtsc/annotations",
     deps = [
         "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/transform",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index 13894bdf82..e539ef1dc1 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -9,11 +9,13 @@
 import {ConstantPool, Expression, R3ComponentMetadata, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata, makeBindingParser, parseTemplate} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator, reflectNonStaticField, reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {Decorator, ReflectionHost} from '../../host';
+import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {extractDirectiveMetadata} from './directive';
 import {SelectorScopeRegistry} from './selector_scope';
+import {isAngularCore} from './util';
 
 const EMPTY_MAP = new Map<string, Expression>();
 
@@ -21,14 +23,18 @@ const EMPTY_MAP = new Map<string, Expression>();
  * `DecoratorHandler` which handles the `@Component` annotation.
  */
 export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMetadata> {
-  constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
+  constructor(
+      private checker: ts.TypeChecker, private reflector: ReflectionHost,
+      private scopeRegistry: SelectorScopeRegistry) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
-    return decorators.find(
-        decorator => decorator.name === 'Component' && decorator.from === '@angular/core');
+    return decorators.find(decorator => decorator.name === 'Component' && isAngularCore(decorator));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3ComponentMetadata> {
+    if (decorator.args === null || decorator.args.length !== 1) {
+      throw new Error(`Incorrect number of arguments to @Component decorator`);
+    }
     const meta = decorator.args[0];
     if (!ts.isObjectLiteralExpression(meta)) {
       throw new Error(`Decorator argument must be literal.`);
@@ -36,7 +42,8 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
 
     // @Component inherits @Directive, so begin by extracting the @Directive metadata and building
     // on it.
-    const directiveMetadata = extractDirectiveMetadata(node, decorator, this.checker);
+    const directiveMetadata =
+        extractDirectiveMetadata(node, decorator, this.checker, this.reflector);
     if (directiveMetadata === undefined) {
       // `extractDirectiveMetadata` returns undefined when the @Directive has `jit: true`. In this
       // case, compilation of the decorator is skipped. Returning an empty object signifies
@@ -93,6 +100,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
       }
     };
   }
+
   compile(node: ts.ClassDeclaration, analysis: R3ComponentMetadata): CompileResult {
     const pool = new ConstantPool();
 
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index f9e49f69f2..ada4ec4633 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -9,25 +9,27 @@
 import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileDirectiveFromMetadata, makeBindingParser} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator, staticallyResolve} from '../../metadata';
-import {DecoratedNode, getDecoratedClassElements, reflectNonStaticField, reflectObjectLiteral} from '../../metadata/src/reflector';
+import {ClassMember, ClassMemberKind, Decorator, Import, ReflectionHost} from '../../host';
+import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {filterToMembersWithDecorator} from '../../metadata/src/reflector';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {getConstructorDependencies} from './util';
+import {getConstructorDependencies, isAngularCore} from './util';
 
 const EMPTY_OBJECT: {[key: string]: string} = {};
 
 export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMetadata> {
-  constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
+  constructor(
+      private checker: ts.TypeChecker, private reflector: ReflectionHost,
+      private scopeRegistry: SelectorScopeRegistry) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
-    return decorators.find(
-        decorator => decorator.name === 'Directive' && decorator.from === '@angular/core');
+    return decorators.find(decorator => decorator.name === 'Directive' && isAngularCore(decorator));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3DirectiveMetadata> {
-    const analysis = extractDirectiveMetadata(node, decorator, this.checker);
+    const analysis = extractDirectiveMetadata(node, decorator, this.checker, this.reflector);
 
     // If the directive has a selector, it should be registered with the `SelectorScopeRegistry` so
     // when this directive appears in an `@NgModule` scope, its selector can be determined.
@@ -54,8 +56,11 @@ export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMe
  * Helper function to extract metadata from a `Directive` or `Component`.
  */
 export function extractDirectiveMetadata(
-    clazz: ts.ClassDeclaration, decorator: Decorator, checker: ts.TypeChecker): R3DirectiveMetadata|
-    undefined {
+    clazz: ts.ClassDeclaration, decorator: Decorator, checker: ts.TypeChecker,
+    reflector: ReflectionHost): R3DirectiveMetadata|undefined {
+  if (decorator.args === null || decorator.args.length !== 1) {
+    throw new Error(`Incorrect number of arguments to @${decorator.name} decorator`);
+  }
   const meta = decorator.args[0];
   if (!ts.isObjectLiteralExpression(meta)) {
     throw new Error(`Decorator argument must be literal.`);
@@ -67,20 +72,24 @@ export function extractDirectiveMetadata(
     return undefined;
   }
 
+  const members = reflector.getMembersOfClass(clazz);
+
   // Precompute a list of ts.ClassElements that have decorators. This includes things like @Input,
   // @Output, @HostBinding, etc.
-  const decoratedElements = getDecoratedClassElements(clazz, checker);
+  const decoratedElements =
+      members.filter(member => !member.isStatic && member.decorators !== null);
 
-  // Construct the map of inputs both from the @Directive/@Component decorator, and the decorated
+  // Construct the map of inputs both from the @Directive/@Component
+  // decorator, and the decorated
   // fields.
   const inputsFromMeta = parseFieldToPropertyMapping(directive, 'inputs', checker);
   const inputsFromFields = parseDecoratedFields(
-      findDecoratedFields(decoratedElements, '@angular/core', 'Input'), checker);
+      filterToMembersWithDecorator(decoratedElements, 'Input', '@angular/core'), checker);
 
   // And outputs.
   const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', checker);
   const outputsFromFields = parseDecoratedFields(
-      findDecoratedFields(decoratedElements, '@angular/core', 'Output'), checker);
+      filterToMembersWithDecorator(decoratedElements, '@angular/core', 'Output'), checker);
 
   // Parse the selector.
   let selector = '';
@@ -93,11 +102,13 @@ export function extractDirectiveMetadata(
   }
 
   // Determine if `ngOnChanges` is a lifecycle hook defined on the component.
-  const usesOnChanges = reflectNonStaticField(clazz, 'ngOnChanges') !== null;
+  const usesOnChanges = members.find(
+                            member => member.isStatic && member.kind === ClassMemberKind.Method &&
+                                member.name === 'ngOnChanges') !== undefined;
 
   return {
     name: clazz.name !.text,
-    deps: getConstructorDependencies(clazz, checker),
+    deps: getConstructorDependencies(clazz, reflector),
     host: {
       attributes: {},
       listeners: {},
@@ -123,35 +134,6 @@ function assertIsStringArray(value: any[]): value is string[] {
   return true;
 }
 
-type DecoratedProperty = DecoratedNode<ts.PropertyDeclaration|ts.AccessorDeclaration>;
-
-/**
- * Find all fields in the array of `DecoratedNode`s that have a decorator of the given type.
- */
-function findDecoratedFields(
-    elements: DecoratedNode<ts.ClassElement>[], decoratorModule: string,
-    decoratorName: string): DecoratedProperty[] {
-  return elements
-      .map(entry => {
-        const element = entry.element;
-        // Only consider properties and accessors. Filter out everything else.
-        if (!ts.isPropertyDeclaration(element) && !ts.isAccessor(element)) {
-          return null;
-        }
-
-        // Extract the array of matching decorators (there could be more than one).
-        const decorators = entry.decorators.filter(
-            decorator => decorator.name === decoratorName && decorator.from === decoratorModule);
-        if (decorators.length === 0) {
-          // No matching decorators, don't include this element.
-          return null;
-        }
-        return {element, decorators};
-      })
-      // Filter out nulls.
-      .filter(entry => entry !== null) as DecoratedProperty[];
-}
-
 /**
  * Interpret property mapping fields on the decorator (e.g. inputs or outputs) and return the
  * correctly shaped metadata object.
@@ -185,14 +167,15 @@ function parseFieldToPropertyMapping(
  * object.
  */
 function parseDecoratedFields(
-    fields: DecoratedProperty[], checker: ts.TypeChecker): {[field: string]: string} {
+    fields: {member: ClassMember, decorators: Decorator[]}[],
+    checker: ts.TypeChecker): {[field: string]: string} {
   return fields.reduce(
       (results, field) => {
-        const fieldName = (field.element.name as ts.Identifier).text;
+        const fieldName = field.member.name;
         field.decorators.forEach(decorator => {
           // The decorator either doesn't have an argument (@Input()) in which case the property
           // name is used, or it has one argument (@Output('named')).
-          if (decorator.args.length === 0) {
+          if (decorator.args == null || decorator.args.length === 0) {
             results[fieldName] = fieldName;
           } else if (decorator.args.length === 1) {
             const property = staticallyResolve(decorator.args[0], checker);
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
index f0210e78c1..e93baf233d 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
@@ -9,26 +9,26 @@
 import {Expression, LiteralExpr, R3DependencyMetadata, R3InjectableMetadata, R3ResolvedDependencyType, WrappedNodeExpr, compileInjectable as compileIvyInjectable} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator} from '../../metadata';
-import {reflectConstructorParameters, reflectImportedIdentifier, reflectObjectLiteral} from '../../metadata/src/reflector';
-import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform/src/api';
+import {Decorator, ReflectionHost} from '../../host';
+import {reflectObjectLiteral} from '../../metadata';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
-import {getConstructorDependencies} from './util';
+import {getConstructorDependencies, isAngularCore} from './util';
 
 
 /**
  * Adapts the `compileIvyInjectable` compiler for `@Injectable` decorators to the Ivy compiler.
  */
 export class InjectableDecoratorHandler implements DecoratorHandler<R3InjectableMetadata> {
-  constructor(private checker: ts.TypeChecker) {}
+  constructor(private reflector: ReflectionHost) {}
 
   detect(decorator: Decorator[]): Decorator|undefined {
-    return decorator.find(dec => dec.name === 'Injectable' && dec.from === '@angular/core');
+    return decorator.find(decorator => decorator.name === 'Injectable' && isAngularCore(decorator));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3InjectableMetadata> {
     return {
-      analysis: extractInjectableMetadata(node, decorator, this.checker),
+      analysis: extractInjectableMetadata(node, decorator, this.reflector),
     };
   }
 
@@ -49,18 +49,21 @@ export class InjectableDecoratorHandler implements DecoratorHandler<R3Injectable
  */
 function extractInjectableMetadata(
     clazz: ts.ClassDeclaration, decorator: Decorator,
-    checker: ts.TypeChecker): R3InjectableMetadata {
+    reflector: ReflectionHost): R3InjectableMetadata {
   if (clazz.name === undefined) {
     throw new Error(`@Injectables must have names`);
   }
   const name = clazz.name.text;
   const type = new WrappedNodeExpr(clazz.name);
+  if (decorator.args === null) {
+    throw new Error(`@Injectable must be called`);
+  }
   if (decorator.args.length === 0) {
     return {
       name,
       type,
       providedIn: new LiteralExpr(null),
-      deps: getConstructorDependencies(clazz, checker),
+      deps: getConstructorDependencies(clazz, reflector),
     };
   } else if (decorator.args.length === 1) {
     const metaNode = decorator.args[0];
@@ -95,11 +98,11 @@ function extractInjectableMetadata(
         if (depsExpr.elements.length > 0) {
           throw new Error(`deps not yet supported`);
         }
-        deps.push(...depsExpr.elements.map(dep => getDep(dep, checker)));
+        deps.push(...depsExpr.elements.map(dep => getDep(dep, reflector)));
       }
       return {name, type, providedIn, useFactory: factory, deps};
     } else {
-      const deps = getConstructorDependencies(clazz, checker);
+      const deps = getConstructorDependencies(clazz, reflector);
       return {name, type, providedIn, deps};
     }
   } else {
@@ -109,7 +112,7 @@ function extractInjectableMetadata(
 
 
 
-function getDep(dep: ts.Expression, checker: ts.TypeChecker): R3DependencyMetadata {
+function getDep(dep: ts.Expression, reflector: ReflectionHost): R3DependencyMetadata {
   const meta: R3DependencyMetadata = {
     token: new WrappedNodeExpr(dep),
     host: false,
@@ -119,8 +122,9 @@ function getDep(dep: ts.Expression, checker: ts.TypeChecker): R3DependencyMetada
     skipSelf: false,
   };
 
-  function maybeUpdateDecorator(dec: ts.Identifier, token?: ts.Expression): void {
-    const source = reflectImportedIdentifier(dec, checker);
+  function maybeUpdateDecorator(
+      dec: ts.Identifier, reflector: ReflectionHost, token?: ts.Expression): void {
+    const source = reflector.getImportOfIdentifier(dec);
     if (source === null || source.from !== '@angular/core') {
       return;
     }
@@ -145,10 +149,10 @@ function getDep(dep: ts.Expression, checker: ts.TypeChecker): R3DependencyMetada
   if (ts.isArrayLiteralExpression(dep)) {
     dep.elements.forEach(el => {
       if (ts.isIdentifier(el)) {
-        maybeUpdateDecorator(el);
+        maybeUpdateDecorator(el, reflector);
       } else if (ts.isNewExpression(el) && ts.isIdentifier(el.expression)) {
         const token = el.arguments && el.arguments.length > 0 && el.arguments[0] || undefined;
-        maybeUpdateDecorator(el.expression, token);
+        maybeUpdateDecorator(el.expression, reflector, token);
       }
     });
   }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index b39e2c561d..7ca9acb324 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -9,11 +9,12 @@
 import {ConstantPool, Expression, R3DirectiveMetadata, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule, makeBindingParser, parseTemplate} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator, Reference, ResolvedValue, reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {Decorator} from '../../host';
+import {Reference, ResolvedValue, reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {referenceToExpression} from './util';
+import {isAngularCore, referenceToExpression} from './util';
 
 /**
  * Compiles @NgModule annotations to ngModuleDef fields.
@@ -24,11 +25,13 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<R3NgModuleMeta
   constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
-    return decorators.find(
-        decorator => decorator.name === 'NgModule' && decorator.from === '@angular/core');
+    return decorators.find(decorator => decorator.name === 'NgModule' && isAngularCore(decorator));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3NgModuleMetadata> {
+    if (decorator.args === null || decorator.args.length !== 1) {
+      throw new Error(`Incorrect number of arguments to @NgModule decorator`);
+    }
     const meta = decorator.args[0];
     if (!ts.isObjectLiteralExpression(meta)) {
       throw new Error(`Decorator argument must be literal.`);
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
index 4ddc245ad7..0c067fb5f3 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
@@ -9,11 +9,14 @@
 import {Expression, ExternalExpr, ExternalReference} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {AbsoluteReference, Reference, reflectStaticField, reflectTypeEntityToDeclaration} from '../../metadata';
+import {ReflectionHost} from '../../host';
+import {AbsoluteReference, Reference, reflectTypeEntityToDeclaration} from '../../metadata';
+import {reflectIdentifierOfDeclaration, reflectNameOfDeclaration} from '../../metadata/src/reflector';
 
 import {referenceToExpression} from './util';
 
 
+
 /**
  * Metadata extracted for a given NgModule that can be used to compute selector scopes.
  */
@@ -59,55 +62,55 @@ export class SelectorScopeRegistry {
   /**
    *  Map of modules declared in the current compilation unit to their (local) metadata.
    */
-  private _moduleToData = new Map<ts.ClassDeclaration, ModuleData>();
+  private _moduleToData = new Map<ts.Declaration, ModuleData>();
 
   /**
    * Map of modules to their cached `CompilationScope`s.
    */
-  private _compilationScopeCache = new Map<ts.ClassDeclaration, CompilationScope<Reference>>();
+  private _compilationScopeCache = new Map<ts.Declaration, CompilationScope<Reference>>();
 
   /**
    * Map of components/directives to their selector.
    */
-  private _directiveToSelector = new Map<ts.ClassDeclaration, string>();
+  private _directiveToSelector = new Map<ts.Declaration, string>();
 
   /**
    * Map of pipes to their name.
    */
-  private _pipeToName = new Map<ts.ClassDeclaration, string>();
+  private _pipeToName = new Map<ts.Declaration, string>();
 
   /**
    * Map of components/directives/pipes to their module.
    */
-  private _declararedTypeToModule = new Map<ts.ClassDeclaration, ts.ClassDeclaration>();
+  private _declararedTypeToModule = new Map<ts.Declaration, ts.Declaration>();
 
-  constructor(private checker: ts.TypeChecker) {}
+  constructor(private checker: ts.TypeChecker, private reflector: ReflectionHost) {}
 
   /**
    * Register a module's metadata with the registry.
    */
-  registerModule(node: ts.ClassDeclaration, data: ModuleData): void {
-    node = ts.getOriginalNode(node) as ts.ClassDeclaration;
+  registerModule(node: ts.Declaration, data: ModuleData): void {
+    node = ts.getOriginalNode(node) as ts.Declaration;
 
     if (this._moduleToData.has(node)) {
-      throw new Error(`Module already registered: ${node.name!.text}`);
+      throw new Error(`Module already registered: ${reflectNameOfDeclaration(node)}`);
     }
     this._moduleToData.set(node, data);
 
     // Register all of the module's declarations in the context map as belonging to this module.
     data.declarations.forEach(decl => {
-      this._declararedTypeToModule.set(ts.getOriginalNode(decl.node) as ts.ClassDeclaration, node);
+      this._declararedTypeToModule.set(ts.getOriginalNode(decl.node) as ts.Declaration, node);
     });
   }
 
   /**
    * Register the selector of a component or directive with the registry.
    */
-  registerSelector(node: ts.ClassDeclaration, selector: string): void {
-    node = ts.getOriginalNode(node) as ts.ClassDeclaration;
+  registerSelector(node: ts.Declaration, selector: string): void {
+    node = ts.getOriginalNode(node) as ts.Declaration;
 
     if (this._directiveToSelector.has(node)) {
-      throw new Error(`Selector already registered: ${node.name!.text} ${selector}`);
+      throw new Error(`Selector already registered: ${reflectNameOfDeclaration(node)} ${selector}`);
     }
     this._directiveToSelector.set(node, selector);
   }
@@ -115,14 +118,14 @@ export class SelectorScopeRegistry {
   /**
    * Register the name of a pipe with the registry.
    */
-  registerPipe(node: ts.ClassDeclaration, name: string): void { this._pipeToName.set(node, name); }
+  registerPipe(node: ts.Declaration, name: string): void { this._pipeToName.set(node, name); }
 
   /**
    * Produce the compilation scope of a component, which is determined by the module that declares
    * it.
    */
-  lookupCompilationScope(node: ts.ClassDeclaration): CompilationScope<Expression>|null {
-    node = ts.getOriginalNode(node) as ts.ClassDeclaration;
+  lookupCompilationScope(node: ts.Declaration): CompilationScope<Expression>|null {
+    node = ts.getOriginalNode(node) as ts.Declaration;
 
     // If the component has no associated module, then it has no compilation scope.
     if (!this._declararedTypeToModule.has(node)) {
@@ -150,8 +153,7 @@ export class SelectorScopeRegistry {
     // The initial value of ngModuleImportedFrom is 'null' which signifies that the NgModule
     // was not imported from a .d.ts source.
     this.lookupScopes(module !, /* ngModuleImportedFrom */ null).compilation.forEach(ref => {
-      const selector =
-          this.lookupDirectiveSelector(ts.getOriginalNode(ref.node) as ts.ClassDeclaration);
+      const selector = this.lookupDirectiveSelector(ts.getOriginalNode(ref.node) as ts.Declaration);
       // Only directives/components with selectors get added to the scope.
       if (selector != null) {
         directives.set(selector, ref);
@@ -174,8 +176,7 @@ export class SelectorScopeRegistry {
    * (`ngModuleImportedFrom`) then all of its declarations are exported at that same path, as well
    * as imports and exports from other modules that are relatively imported.
    */
-  private lookupScopes(node: ts.ClassDeclaration, ngModuleImportedFrom: string|null):
-      SelectorScopes {
+  private lookupScopes(node: ts.Declaration, ngModuleImportedFrom: string|null): SelectorScopes {
     let data: ModuleData|null = null;
 
     // Either this module was analyzed directly, or has a precompiled ngModuleDef.
@@ -195,7 +196,7 @@ export class SelectorScopeRegistry {
     }
 
     if (data === null) {
-      throw new Error(`Module not registered: ${node.name!.text}`);
+      throw new Error(`Module not registered: ${reflectNameOfDeclaration(node)}`);
     }
 
     return {
@@ -203,20 +204,18 @@ export class SelectorScopeRegistry {
         ...data.declarations,
         // Expand imports to the exported scope of those imports.
         ...flatten(data.imports.map(
-            ref => this.lookupScopes(ref.node as ts.ClassDeclaration, absoluteModuleName(ref))
-                       .exported)),
+            ref =>
+                this.lookupScopes(ref.node as ts.Declaration, absoluteModuleName(ref)).exported)),
         // And include the compilation scope of exported modules.
         ...flatten(
-            data.exports.filter(ref => this._moduleToData.has(ref.node as ts.ClassDeclaration))
+            data.exports.filter(ref => this._moduleToData.has(ref.node as ts.Declaration))
                 .map(
-                    ref =>
-                        this.lookupScopes(ref.node as ts.ClassDeclaration, absoluteModuleName(ref))
-                            .exported))
+                    ref => this.lookupScopes(ref.node as ts.Declaration, absoluteModuleName(ref))
+                               .exported))
       ],
       exported: flatten(data.exports.map(ref => {
-        if (this._moduleToData.has(ref.node as ts.ClassDeclaration)) {
-          return this.lookupScopes(ref.node as ts.ClassDeclaration, absoluteModuleName(ref))
-              .exported;
+        if (this._moduleToData.has(ref.node as ts.Declaration)) {
+          return this.lookupScopes(ref.node as ts.Declaration, absoluteModuleName(ref)).exported;
         } else {
           return [ref];
         }
@@ -231,7 +230,7 @@ export class SelectorScopeRegistry {
    * ngComponentDef/ngDirectiveDef. In this case, the type metadata of that definition is read
    * to determine the selector.
    */
-  private lookupDirectiveSelector(node: ts.ClassDeclaration): string|null {
+  private lookupDirectiveSelector(node: ts.Declaration): string|null {
     if (this._directiveToSelector.has(node)) {
       return this._directiveToSelector.get(node) !;
     } else {
@@ -239,7 +238,7 @@ export class SelectorScopeRegistry {
     }
   }
 
-  private lookupPipeName(node: ts.ClassDeclaration): string|undefined {
+  private lookupPipeName(node: ts.Declaration): string|undefined {
     return this._pipeToName.get(node);
   }
 
@@ -251,16 +250,17 @@ export class SelectorScopeRegistry {
    * @param ngModuleImportedFrom module specifier of the import path to assume for all declarations
    * stemming from this module.
    */
-  private _readMetadataFromCompiledClass(clazz: ts.ClassDeclaration, ngModuleImportedFrom: string):
+  private _readMetadataFromCompiledClass(clazz: ts.Declaration, ngModuleImportedFrom: string):
       ModuleData|null {
     // This operation is explicitly not memoized, as it depends on `ngModuleImportedFrom`.
     // TODO(alxhub): investigate caching of .d.ts module metadata.
-    const ngModuleDef = reflectStaticField(clazz, 'ngModuleDef');
-    if (ngModuleDef === null) {
+    const ngModuleDef = this.reflector.getMembersOfClass(clazz).find(
+        member => member.name === 'ngModuleDef' && member.isStatic);
+    if (ngModuleDef === undefined) {
       return null;
     } else if (
         // Validate that the shape of the ngModuleDef type is correct.
-        ngModuleDef.type === undefined || !ts.isTypeReferenceNode(ngModuleDef.type) ||
+        ngModuleDef.type === null || !ts.isTypeReferenceNode(ngModuleDef.type) ||
         ngModuleDef.type.typeArguments === undefined ||
         ngModuleDef.type.typeArguments.length !== 4) {
       return null;
@@ -279,14 +279,15 @@ export class SelectorScopeRegistry {
    * Get the selector from type metadata for a class with a precompiled ngComponentDef or
    * ngDirectiveDef.
    */
-  private _readSelectorFromCompiledClass(clazz: ts.ClassDeclaration): string|null {
-    const def =
-        reflectStaticField(clazz, 'ngComponentDef') || reflectStaticField(clazz, 'ngDirectiveDef');
-    if (def === null) {
+  private _readSelectorFromCompiledClass(clazz: ts.Declaration): string|null {
+    const def = this.reflector.getMembersOfClass(clazz).find(
+        field =>
+            field.isStatic && (field.name === 'ngComponentDef' || field.name === 'ngDirectiveDef'));
+    if (def === undefined) {
       // No definition could be found.
       return null;
     } else if (
-        def.type === undefined || !ts.isTypeReferenceNode(def.type) ||
+        def.type === null || !ts.isTypeReferenceNode(def.type) ||
         def.type.typeArguments === undefined || def.type.typeArguments.length !== 2) {
       // The type metadata was the wrong shape.
       return null;
@@ -317,8 +318,9 @@ export class SelectorScopeRegistry {
       const type = element.typeName;
       const {node, from} = reflectTypeEntityToDeclaration(type, this.checker);
       const moduleName = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
-      const clazz = node as ts.ClassDeclaration;
-      return new AbsoluteReference(node, clazz.name !, moduleName, clazz.name !.text);
+      const clazz = node as ts.Declaration;
+      const id = reflectIdentifierOfDeclaration(clazz);
+      return new AbsoluteReference(node, id !, moduleName, id !.text);
     });
   }
 }
@@ -331,7 +333,6 @@ function flatten<T>(array: T[][]): T[] {
 }
 
 function absoluteModuleName(ref: Reference): string|null {
-  const name = (ref.node as ts.ClassDeclaration).name !.text;
   if (!(ref instanceof AbsoluteReference)) {
     return null;
   }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index 0f3ee2442d..4a17e086ea 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -9,20 +9,20 @@
 import {Expression, R3DependencyMetadata, R3ResolvedDependencyType, WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Reference, reflectConstructorParameters} from '../../metadata';
-import {reflectImportedIdentifier} from '../../metadata/src/reflector';
+import {Decorator, ReflectionHost} from '../../host';
+import {Reference} from '../../metadata';
 
 export function getConstructorDependencies(
-    clazz: ts.ClassDeclaration, checker: ts.TypeChecker): R3DependencyMetadata[] {
+    clazz: ts.ClassDeclaration, reflector: ReflectionHost): R3DependencyMetadata[] {
   const useType: R3DependencyMetadata[] = [];
-  const ctorParams = (reflectConstructorParameters(clazz, checker) || []);
-  ctorParams.forEach(param => {
-    let tokenExpr = param.typeValueExpr;
+  const ctorParams = reflector.getConstructorParameters(clazz) || [];
+  ctorParams.forEach((param, idx) => {
+    let tokenExpr = param.type;
     let optional = false, self = false, skipSelf = false, host = false;
     let resolved = R3ResolvedDependencyType.Token;
-    param.decorators.filter(dec => dec.from === '@angular/core').forEach(dec => {
+    (param.decorators || []).filter(isAngularCore).forEach(dec => {
       if (dec.name === 'Inject') {
-        if (dec.args.length !== 1) {
+        if (dec.args === null || dec.args.length !== 1) {
           throw new Error(`Unexpected number of arguments to @Inject().`);
         }
         tokenExpr = dec.args[0];
@@ -35,7 +35,7 @@ export function getConstructorDependencies(
       } else if (dec.name === 'Host') {
         host = true;
       } else if (dec.name === 'Attribute') {
-        if (dec.args.length !== 1) {
+        if (dec.args === null || dec.args.length !== 1) {
           throw new Error(`Unexpected number of arguments to @Attribute().`);
         }
         tokenExpr = dec.args[0];
@@ -46,10 +46,10 @@ export function getConstructorDependencies(
     });
     if (tokenExpr === null) {
       throw new Error(
-          `No suitable token for parameter ${(param.name as ts.Identifier).text} of class ${clazz.name!.text} with decorators ${param.decorators.map(dec => dec.from + '#' + dec.name).join(',')}`);
+          `No suitable token for parameter ${param.name || idx} of class ${clazz.name!.text}`);
     }
     if (ts.isIdentifier(tokenExpr)) {
-      const importedSymbol = reflectImportedIdentifier(tokenExpr, checker);
+      const importedSymbol = reflector.getImportOfIdentifier(tokenExpr);
       if (importedSymbol !== null && importedSymbol.from === '@angular/core') {
         switch (importedSymbol.name) {
           case 'ElementRef':
@@ -82,3 +82,7 @@ export function referenceToExpression(ref: Reference, context: ts.SourceFile): E
   }
   return exp;
 }
+
+export function isAngularCore(decorator: Decorator): boolean {
+  return decorator.import !== null && decorator.import.from === '@angular/core';
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
index a5c28160ed..87ff276bd0 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
@@ -8,6 +8,7 @@
 
 import * as ts from 'typescript';
 
+import {TypeScriptReflectionHost} from '../../metadata';
 import {AbsoluteReference, ResolvedReference} from '../../metadata/src/resolver';
 import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
 import {NgModuleDecoratorHandler} from '../src/ng_module';
@@ -53,6 +54,7 @@ describe('SelectorScopeRegistry', () => {
       },
     ]);
     const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
     const ProgramModule =
         getDeclaration(program, 'entry.ts', 'ProgramModule', ts.isClassDeclaration);
     const ProgramCmp = getDeclaration(program, 'entry.ts', 'ProgramCmp', ts.isClassDeclaration);
@@ -61,7 +63,7 @@ describe('SelectorScopeRegistry', () => {
     expect(ProgramModule).toBeDefined();
     expect(SomeModule).toBeDefined();
 
-    const registry = new SelectorScopeRegistry(checker);
+    const registry = new SelectorScopeRegistry(checker, host);
 
     registry.registerModule(ProgramModule, {
       declarations: [new ResolvedReference(ProgramCmp, ProgramCmp.name !)],
diff --git a/packages/compiler-cli/src/ngtsc/host/BUILD.bazel b/packages/compiler-cli/src/ngtsc/host/BUILD.bazel
new file mode 100644
index 0000000000..ee3883cb08
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/host/BUILD.bazel
@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "host",
+    srcs = glob([
+        "index.ts",
+        "src/**/*.ts",
+    ]),
+    module_name = "@angular/compiler-cli/src/ngtsc/host",
+)
diff --git a/packages/compiler-cli/src/ngtsc/host/index.ts b/packages/compiler-cli/src/ngtsc/host/index.ts
new file mode 100644
index 0000000000..93a06d7a93
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/host/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './src/reflection';
diff --git a/packages/compiler-cli/src/ngtsc/host/src/reflection.ts b/packages/compiler-cli/src/ngtsc/host/src/reflection.ts
new file mode 100644
index 0000000000..c6c809737b
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/host/src/reflection.ts
@@ -0,0 +1,223 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+/**
+ * Metadata extracted from an instance of a decorator on another declaration.
+ */
+export interface Decorator {
+  /**
+   * Name by which the decorator was invoked in the user's code.
+   *
+   * This is distinct from the name by which the decorator was imported (though in practice they
+   * will usually be the same).
+   */
+  name: string;
+
+  /**
+   * `Import` by which the decorator was brought into the module in which it was invoked, or `null`
+   * if the decorator was declared in the same module and not imported.
+   */
+  import : Import | null;
+
+  /**
+   * TypeScript reference to the decorator itself.
+   */
+  node: ts.Node;
+
+  /**
+   * Arguments of the invocation of the decorator, if the decorator is invoked, or `null` otherwise.
+   */
+  args: ts.Expression[]|null;
+}
+
+/**
+ * An enumeration of possible kinds of class members.
+ */
+export enum ClassMemberKind {
+  Constructor,
+  Getter,
+  Setter,
+  Property,
+  Method,
+}
+
+/**
+ * A member of a class, such as a property, method, or constructor.
+ */
+export interface ClassMember {
+  /**
+   * TypeScript reference to the class member itself.
+   */
+  node: ts.Node;
+
+  /**
+   * Indication of which type of member this is (property, method, etc).
+   */
+  kind: ClassMemberKind;
+
+  /**
+   * TypeScript `ts.TypeNode` representing the type of the member, or `null` if not present or
+   * applicable.
+   */
+  type: ts.TypeNode|null;
+
+  /**
+   * Name of the class member.
+   */
+  name: string;
+
+  /**
+   * TypeScript `ts.Identifier` representing the name of the member, or `null` if no such node
+   * is present.
+   *
+   * The `nameNode` is useful in writing references to this member that will be correctly source-
+   * mapped back to the original file.
+   */
+  nameNode: ts.Identifier|null;
+
+  /**
+   * TypeScript `ts.Expression` which initializes this member, if the member is a property, or
+   * `null` otherwise.
+   */
+  initializer: ts.Expression|null;
+
+  /**
+   * Whether the member is static or not.
+   */
+  isStatic: boolean;
+
+  /**
+   * Any `Decorator`s which are present on the member, or `null` if none are present.
+   */
+  decorators: Decorator[]|null;
+}
+
+/**
+ * A parameter to a function or constructor.
+ */
+export interface Parameter {
+  /**
+   * Name of the parameter, if available.
+   *
+   * Some parameters don't have a simple string name (for example, parameters which are destructured
+   * into multiple variables). In these cases, `name` can be `null`.
+   */
+  name: string|null;
+
+  /**
+   * TypeScript `ts.BindingName` representing the name of the parameter.
+   *
+   * The `nameNode` is useful in writing references to this member that will be correctly source-
+   * mapped back to the original file.
+   */
+  nameNode: ts.BindingName;
+
+  /**
+   * TypeScript `ts.Expression` representing the type of the parameter, if the type is a simple
+   * expression type.
+   *
+   * If the type is not present or cannot be represented as an expression, `type` is `null`.
+   */
+  type: ts.Expression|null;
+
+  /**
+   * Any `Decorator`s which are present on the parameter, or `null` if none are present.
+   */
+  decorators: Decorator[]|null;
+}
+
+/**
+ * The source of an imported symbol, including the original symbol name and the module from which it
+ * was imported.
+ */
+export interface Import {
+  /**
+   * The name of the imported symbol under which it was exported (not imported).
+   */
+  name: string;
+
+  /**
+   * The module from which the symbol was imported.
+   *
+   * This could either be an absolute module name (@angular/core for example) or a relative path.
+   */
+  from: string;
+}
+
+/**
+ * Abstracts reflection operations on a TypeScript AST.
+ *
+ * Depending on the format of the code being interpreted, different concepts are represented with
+ * different syntactical structures. The `ReflectionHost` abstracts over those differences and
+ * presents a single API by which the compiler can query specific information about the AST.
+ *
+ * All operations on the `ReflectionHost` require the use of TypeScript `ts.Node`s with binding
+ * information already available (that is, nodes that come from a `ts.Program` that has been
+ * type-checked, and are not synthetically created).
+ */
+export interface ReflectionHost {
+  /**
+   * Examine a declaration (for example, of a class or function) and return metadata about any
+   * decorators present on the declaration.
+   *
+   * @param declaration a TypeScript `ts.Declaration` node representing the class or function over
+   * which to reflect. For example, if the intent is to reflect the decorators of a class and the
+   * source is in ES6 format, this will be a `ts.ClassDeclaration` node. If the source is in ES5
+   * format, this might be a `ts.VariableDeclaration` as classes in ES5 are represented as the
+   * result of an IIFE execution.
+   *
+   * @returns an array of `Decorator` metadata if decorators are present on the declaration, or
+   * `null` if either no decorators were present or if the declaration is not of a decorable type.
+   */
+  getDecoratorsOfDeclaration(declaration: ts.Declaration): Decorator[]|null;
+
+  /**
+   * Examine a declaration which should be of a class, and return metadata about the members of the
+   * class.
+   *
+   * @param declaration a TypeScript `ts.Declaration` node representing the class over which to
+   * reflect. If the source is in ES6 format, this will be a `ts.ClassDeclaration` node. If the
+   * source is in ES5 format, this might be a `ts.VariableDeclaration` as classes in ES5 are
+   * represented as the result of an IIFE execution.
+   *
+   * @returns an array of `ClassMember` metadata representing the members of the class.
+   *
+   * @throws if `declaration` does not resolve to a class declaration.
+   */
+  getMembersOfClass(clazz: ts.Declaration): ClassMember[];
+
+  /**
+   * Reflect over the constructor of a class and return metadata about its parameters.
+   *
+   * This method only looks at the constructor of a class directly and not at any inherited
+   * constructors.
+   *
+   * @param declaration a TypeScript `ts.Declaration` node representing the class over which to
+   * reflect. If the source is in ES6 format, this will be a `ts.ClassDeclaration` node. If the
+   * source is in ES5 format, this might be a `ts.VariableDeclaration` as classes in ES5 are
+   * represented as the result of an IIFE execution.
+   *
+   * @returns an array of `Parameter` metadata representing the parameters of the constructor, if
+   * a constructor exists. If the constructor exists and has 0 parameters, this array will be empty.
+   * If the class has no constructor, this method returns `null`.
+   */
+  getConstructorParameters(declaration: ts.Declaration): Parameter[]|null;
+
+  /**
+   * Determine if an identifier was imported from another module and return `Import` metadata
+   * describing its origin.
+   *
+   * @param id a TypeScript `ts.Identifer` to reflect.
+   *
+   * @returns metadata about the `Import` if the identifier was imported from another module, or
+   * `null` if the identifier doesn't resolve to an import but instead is locally defined.
+   */
+  getImportOfIdentifier(id: ts.Identifier): Import|null;
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
index 4a5c83e87c..6780665ad1 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
@@ -12,5 +12,6 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/host",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/metadata/index.ts b/packages/compiler-cli/src/ngtsc/metadata/index.ts
index 49b2efca8d..dd4a581356 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/index.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/index.ts
@@ -6,6 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {Decorator, Parameter, reflectConstructorParameters, reflectDecorator, reflectNonStaticField, reflectObjectLiteral, reflectStaticField, reflectTypeEntityToDeclaration,} from './src/reflector';
-
+export {TypeScriptReflectionHost, filterToMembersWithDecorator, findMember, reflectObjectLiteral, reflectTypeEntityToDeclaration} from './src/reflector';
 export {AbsoluteReference, Reference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts b/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
index 4b807bbb3a..61cab4e721 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
@@ -8,289 +8,187 @@
 
 import * as ts from 'typescript';
 
+import {ClassMember, ClassMemberKind, Decorator, Import, Parameter, ReflectionHost} from '../../host';
+
 /**
  * reflector.ts implements static reflection of declarations using the TypeScript `ts.TypeChecker`.
  */
 
-/**
- * A reflected parameter of a function, method, or constructor, indicating the name, any
- * decorators, and an expression representing a reference to the value side of the parameter's
- * declared type, if applicable.
- */
-export interface Parameter {
-  /**
-   * Name of the parameter as a `ts.BindingName`, which allows the parameter name to be identified
-   * via sourcemaps.
-   */
-  name: ts.BindingName;
+export class TypeScriptReflectionHost implements ReflectionHost {
+  constructor(protected checker: ts.TypeChecker) {}
 
-  /**
-   * A `ts.Expression` which represents a reference to the value side of the parameter's type.
-   */
-  typeValueExpr: ts.Expression|null;
-
-  /**
-   * Array of decorators present on the parameter.
-   */
-  decorators: Decorator[];
-}
-
-/**
- * A reflected decorator, indicating the name, where it was imported from, and any arguments if the
- * decorator is a call expression.
- */
-export interface Decorator {
-  /**
-   * Name of the decorator, extracted from the decoration expression.
-   */
-  name: string;
-
-  /**
-   * Import path (relative to the decorator's file) of the decorator itself.
-   */
-  from: string;
-
-  /**
-   * The decorator node itself (useful for printing sourcemap based references to the decorator).
-   */
-  node: ts.Decorator;
-
-  /**
-   * Any arguments of a call expression, if one is present. If the decorator was not a call
-   * expression, then this will be an empty array.
-   */
-  args: ts.Expression[];
-}
-
-/**
- * Reflect a `ts.ClassDeclaration` and determine the list of parameters.
- *
- * Note that this only reflects the referenced class and not any potential parent class - that must
- * be handled by the caller.
- *
- * @param node the `ts.ClassDeclaration` to reflect
- * @param checker a `ts.TypeChecker` used for reflection
- * @returns a `Parameter` instance for each argument of the constructor, or `null` if no constructor
- */
-export function reflectConstructorParameters(
-    node: ts.ClassDeclaration, checker: ts.TypeChecker): Parameter[]|null {
-  // Firstly, look for a constructor.
-  // clang-format off
-  const maybeCtor: ts.ConstructorDeclaration[] = node
-    .members
-    .filter(element => ts.isConstructorDeclaration(element)) as ts.ConstructorDeclaration[];
-  // clang-format on
-
-  if (maybeCtor.length !== 1) {
-    // No constructor.
-    return null;
-  }
-
-  // Reflect each parameter.
-  return maybeCtor[0].parameters.map(param => reflectParameter(param, checker));
-}
-
-/**
- * Reflect a `ts.ParameterDeclaration` and determine its name, a token which refers to the value
- * declaration of its type (if possible to statically determine), and its decorators, if any.
- */
-function reflectParameter(node: ts.ParameterDeclaration, checker: ts.TypeChecker): Parameter {
-  // The name of the parameter is easy.
-  const name = node.name;
-
-  const decorators = node.decorators &&
-          node.decorators.map(decorator => reflectDecorator(decorator, checker))
-              .filter(decorator => decorator !== null) as Decorator[] ||
-      [];
-
-  // It may or may not be possible to write an expression that refers to the value side of the
-  // type named for the parameter.
-  let typeValueExpr: ts.Expression|null = null;
-
-  // It's not possible to get a value expression if the parameter doesn't even have a type.
-  if (node.type !== undefined) {
-    // It's only valid to convert a type reference to a value reference if the type actually has a
-    // value declaration associated with it.
-    const type = checker.getTypeFromTypeNode(node.type);
-    if (type.symbol !== undefined && type.symbol.valueDeclaration !== undefined) {
-      // The type points to a valid value declaration. Rewrite the TypeReference into an Expression
-      // which references the value pointed to by the TypeReference, if possible.
-      typeValueExpr = typeNodeToValueExpr(node.type);
+  getDecoratorsOfDeclaration(declaration: ts.Declaration): Decorator[]|null {
+    if (declaration.decorators === undefined || declaration.decorators.length === 0) {
+      return null;
     }
+    return declaration.decorators.map(decorator => this._reflectDecorator(decorator))
+        .filter((dec): dec is Decorator => dec !== null);
   }
 
-  return {
-      name, typeValueExpr, decorators,
-  };
-}
-
-/**
- * Reflect a decorator and return a structure describing where it comes from and any arguments.
- *
- * Only imported decorators are considered, not locally defined decorators.
- */
-export function reflectDecorator(decorator: ts.Decorator, checker: ts.TypeChecker): Decorator|null {
-  // Attempt to resolve the decorator expression into a reference to a concrete Identifier. The
-  // expression may contain a call to a function which returns the decorator function, in which
-  // case we want to return the arguments.
-  let decoratorOfInterest: ts.Expression = decorator.expression;
-  let args: ts.Expression[] = [];
-
-  // Check for call expressions.
-  if (ts.isCallExpression(decoratorOfInterest)) {
-    args = Array.from(decoratorOfInterest.arguments);
-    decoratorOfInterest = decoratorOfInterest.expression;
+  getMembersOfClass(declaration: ts.Declaration): ClassMember[] {
+    const clazz = castDeclarationToClassOrDie(declaration);
+    return clazz.members.map(member => this._reflectMember(member))
+        .filter((member): member is ClassMember => member !== null);
   }
 
-  // The final resolved decorator should be a `ts.Identifier` - if it's not, then something is
-  // wrong and the decorator can't be resolved statically.
-  if (!ts.isIdentifier(decoratorOfInterest)) {
-    return null;
-  }
+  getConstructorParameters(declaration: ts.Declaration): Parameter[]|null {
+    const clazz = castDeclarationToClassOrDie(declaration);
 
-  const importDecl = reflectImportedIdentifier(decoratorOfInterest, checker);
-  if (importDecl === null) {
-    return null;
-  }
+    // First, find the constructor.
+    const ctor = clazz.members.find(ts.isConstructorDeclaration);
+    if (ctor === undefined) {
+      return null;
+    }
 
-  return {
-    ...importDecl,
-    node: decorator, args,
-  };
-}
+    return ctor.parameters.map(node => {
+      // The name of the parameter is easy.
+      const name = parameterName(node.name);
 
-function typeNodeToValueExpr(node: ts.TypeNode): ts.Expression|null {
-  if (ts.isTypeReferenceNode(node)) {
-    return entityNameToValue(node.typeName);
-  } else {
-    return null;
-  }
-}
+      const decorators = this.getDecoratorsOfDeclaration(node);
 
-function entityNameToValue(node: ts.EntityName): ts.Expression|null {
-  if (ts.isQualifiedName(node)) {
-    const left = entityNameToValue(node.left);
-    return left !== null ? ts.createPropertyAccess(left, node.right) : null;
-  } else if (ts.isIdentifier(node)) {
-    return ts.getMutableClone(node);
-  } else {
-    return null;
-  }
-}
+      // It may or may not be possible to write an expression that refers to the value side of the
+      // type named for the parameter.
+      let typeValueExpr: ts.Expression|null = null;
 
-function propertyNameToValue(node: ts.PropertyName): string|null {
-  if (ts.isIdentifier(node) || ts.isStringLiteral(node) || ts.isNumericLiteral(node)) {
-    return node.text;
-  } else {
-    return null;
-  }
-}
-
-export function reflectObjectLiteral(node: ts.ObjectLiteralExpression): Map<string, ts.Expression> {
-  const map = new Map<string, ts.Expression>();
-  node.properties.forEach(prop => {
-    if (ts.isPropertyAssignment(prop)) {
-      const name = propertyNameToValue(prop.name);
-      if (name === null) {
-        return;
+      // It's not possible to get a value expression if the parameter doesn't even have a type.
+      if (node.type !== undefined) {
+        // It's only valid to convert a type reference to a value reference if the type actually has
+        // a
+        // value declaration associated with it.
+        const type = this.checker.getTypeFromTypeNode(node.type);
+        if (type.symbol !== undefined && type.symbol.valueDeclaration !== undefined) {
+          // The type points to a valid value declaration. Rewrite the TypeReference into an
+          // Expression
+          // which references the value pointed to by the TypeReference, if possible.
+          typeValueExpr = typeNodeToValueExpr(node.type);
+        }
       }
-      map.set(name, prop.initializer);
-    } else if (ts.isShorthandPropertyAssignment(prop)) {
-      map.set(prop.name.text, prop.name);
+
+      return {
+        name,
+        nameNode: node.name,
+        type: typeValueExpr, decorators,
+      };
+    });
+  }
+
+  getImportOfIdentifier(id: ts.Identifier): Import|null {
+    const symbol = this.checker.getSymbolAtLocation(id);
+
+    if (symbol === undefined || symbol.declarations === undefined ||
+        symbol.declarations.length !== 1) {
+      return null;
+    }
+
+    // Ignore decorators that are defined locally (not imported).
+    const decl: ts.Declaration = symbol.declarations[0];
+    if (!ts.isImportSpecifier(decl)) {
+      return null;
+    }
+
+    // Walk back from the specifier to find the declaration, which carries the module specifier.
+    const importDecl = decl.parent !.parent !.parent !;
+
+    // The module specifier is guaranteed to be a string literal, so this should always pass.
+    if (!ts.isStringLiteral(importDecl.moduleSpecifier)) {
+      // Not allowed to happen in TypeScript ASTs.
+      return null;
+    }
+
+    // Read the module specifier.
+    const from = importDecl.moduleSpecifier.text;
+
+    // Compute the name by which the decorator was exported, not imported.
+    const name = (decl.propertyName !== undefined ? decl.propertyName : decl.name).text;
+
+    return {from, name};
+  }
+
+  isClass(node: ts.Node): node is ts.Declaration { return ts.isClassDeclaration(node); }
+
+  private _reflectDecorator(node: ts.Decorator): Decorator|null {
+    // Attempt to resolve the decorator expression into a reference to a concrete Identifier. The
+    // expression may contain a call to a function which returns the decorator function, in which
+    // case we want to return the arguments.
+    let decoratorExpr: ts.Expression = node.expression;
+    let args: ts.Expression[]|null = null;
+
+    // Check for call expressions.
+    if (ts.isCallExpression(decoratorExpr)) {
+      args = Array.from(decoratorExpr.arguments);
+      decoratorExpr = decoratorExpr.expression;
+    }
+
+    // The final resolved decorator should be a `ts.Identifier` - if it's not, then something is
+    // wrong and the decorator can't be resolved statically.
+    if (!ts.isIdentifier(decoratorExpr)) {
+      return null;
+    }
+
+    const importDecl = this.getImportOfIdentifier(decoratorExpr);
+
+    return {
+      name: decoratorExpr.text,
+      import: importDecl, node, args,
+    };
+  }
+
+  private _reflectMember(node: ts.ClassElement): ClassMember|null {
+    let kind: ClassMemberKind|null = null;
+    let initializer: ts.Expression|null = null;
+    let name: string|null = null;
+    let nameNode: ts.Identifier|null = null;
+
+    if (ts.isPropertyDeclaration(node)) {
+      kind = ClassMemberKind.Property;
+      initializer = node.initializer || null;
+    } else if (ts.isGetAccessorDeclaration(node)) {
+      kind = ClassMemberKind.Getter;
+    } else if (ts.isSetAccessorDeclaration(node)) {
+      kind = ClassMemberKind.Setter;
+    } else if (ts.isMethodDeclaration(node)) {
+      kind = ClassMemberKind.Method;
+    } else if (ts.isConstructorDeclaration(node)) {
+      kind = ClassMemberKind.Constructor;
     } else {
-      return;
+      return null;
     }
-  });
-  return map;
-}
 
-export function reflectImportedIdentifier(
-    id: ts.Identifier, checker: ts.TypeChecker): {name: string, from: string}|null {
-  const symbol = checker.getSymbolAtLocation(id);
+    if (ts.isConstructorDeclaration(node)) {
+      name = 'constructor';
+    } else if (ts.isIdentifier(node.name)) {
+      name = node.name.text;
+      nameNode = node.name;
+    } else {
+      return null;
+    }
 
-  if (symbol === undefined || symbol.declarations === undefined ||
-      symbol.declarations.length !== 1) {
-    return null;
+    const decorators = this.getDecoratorsOfDeclaration(node);
+    const isStatic = node.modifiers !== undefined &&
+        node.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword);
+
+    return {
+      node,
+      kind,
+      type: node.type || null, name, nameNode, decorators, initializer, isStatic,
+    };
   }
+}
 
-  // Ignore decorators that are defined locally (not imported).
-  const decl: ts.Declaration = symbol.declarations[0];
-  if (!ts.isImportSpecifier(decl)) {
-    return null;
+export function reflectNameOfDeclaration(decl: ts.Declaration): string|null {
+  const id = reflectIdentifierOfDeclaration(decl);
+  return id && id.text || null;
+}
+
+export function reflectIdentifierOfDeclaration(decl: ts.Declaration): ts.Identifier|null {
+  if (ts.isClassDeclaration(decl) || ts.isFunctionDeclaration(decl)) {
+    return decl.name || null;
+  } else if (ts.isVariableDeclaration(decl)) {
+    if (ts.isIdentifier(decl.name)) {
+      return decl.name;
+    }
   }
-
-  // Walk back from the specifier to find the declaration, which carries the module specifier.
-  const importDecl = decl.parent !.parent !.parent !;
-
-  // The module specifier is guaranteed to be a string literal, so this should always pass.
-  if (!ts.isStringLiteral(importDecl.moduleSpecifier)) {
-    // Not allowed to happen in TypeScript ASTs.
-    return null;
-  }
-
-  // Read the module specifier.
-  const from = importDecl.moduleSpecifier.text;
-
-  // Compute the name by which the decorator was exported, not imported.
-  const name = (decl.propertyName !== undefined ? decl.propertyName : decl.name).text;
-
-  return {from, name};
-}
-
-export interface DecoratedNode<T extends ts.Node> {
-  element: T;
-  decorators: Decorator[];
-}
-
-export function getDecoratedClassElements(
-    clazz: ts.ClassDeclaration, checker: ts.TypeChecker): DecoratedNode<ts.ClassElement>[] {
-  const decoratedElements: DecoratedNode<ts.ClassElement>[] = [];
-  clazz.members.forEach(element => {
-    if (element.decorators !== undefined) {
-      const decorators = element.decorators.map(decorator => reflectDecorator(decorator, checker))
-                             .filter(decorator => decorator != null) as Decorator[];
-      if (decorators.length > 0) {
-        decoratedElements.push({element, decorators});
-      }
-    }
-  });
-  return decoratedElements;
-}
-
-export function reflectStaticField(
-    clazz: ts.ClassDeclaration, field: string): ts.PropertyDeclaration|null {
-  return clazz.members.find((member: ts.ClassElement): member is ts.PropertyDeclaration => {
-    // Check if the name matches.
-    if (member.name === undefined || !ts.isIdentifier(member.name) || member.name.text !== field) {
-      return false;
-    }
-    // Check if the property is static.
-    if (member.modifiers === undefined ||
-        !member.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword)) {
-      return false;
-    }
-    // Found the field.
-    return true;
-  }) ||
-      null;
-}
-
-export function reflectNonStaticField(
-    clazz: ts.ClassDeclaration, field: string): ts.PropertyDeclaration|null {
-  return clazz.members.find((member: ts.ClassElement): member is ts.PropertyDeclaration => {
-    // Check if the name matches.
-    if (member.name === undefined || !ts.isIdentifier(member.name) || member.name.text !== field) {
-      return false;
-    }
-    // Check if the property is static.
-    if (member.modifiers !== undefined &&
-        member.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword)) {
-      return false;
-    }
-    // Found the field.
-    return true;
-  }) ||
-      null;
+  return null;
 }
 
 export function reflectTypeEntityToDeclaration(
@@ -335,4 +233,95 @@ export function reflectTypeEntityToDeclaration(
   } else {
     return {node, from: null};
   }
-}
\ No newline at end of file
+}
+
+export function filterToMembersWithDecorator(members: ClassMember[], name: string, module?: string):
+    {member: ClassMember, decorators: Decorator[]}[] {
+  return members.filter(member => !member.isStatic)
+      .map(member => {
+        if (member.decorators === null) {
+          return null;
+        }
+
+        const decorators = member.decorators.filter(dec => {
+          if (dec.import !== null) {
+            return dec.import.name === name && (module === undefined || dec.import.from === module);
+          } else {
+            return dec.name === name && module === undefined;
+          }
+        });
+
+        if (decorators.length === 0) {
+          return null;
+        }
+
+        return {member, decorators};
+      })
+      .filter((value): value is {member: ClassMember, decorators: Decorator[]} => value !== null);
+}
+
+export function findMember(
+    members: ClassMember[], name: string, isStatic: boolean = false): ClassMember|null {
+  return members.find(member => member.isStatic === isStatic && member.name === name) || null;
+}
+
+export function reflectObjectLiteral(node: ts.ObjectLiteralExpression): Map<string, ts.Expression> {
+  const map = new Map<string, ts.Expression>();
+  node.properties.forEach(prop => {
+    if (ts.isPropertyAssignment(prop)) {
+      const name = propertyNameToString(prop.name);
+      if (name === null) {
+        return;
+      }
+      map.set(name, prop.initializer);
+    } else if (ts.isShorthandPropertyAssignment(prop)) {
+      map.set(prop.name.text, prop.name);
+    } else {
+      return;
+    }
+  });
+  return map;
+}
+
+function castDeclarationToClassOrDie(declaration: ts.Declaration): ts.ClassDeclaration {
+  if (!ts.isClassDeclaration(declaration)) {
+    throw new Error(
+        `Reflecting on a ${ts.SyntaxKind[declaration.kind]} instead of a ClassDeclaration.`);
+  }
+  return declaration;
+}
+
+function parameterName(name: ts.BindingName): string|null {
+  if (ts.isIdentifier(name)) {
+    return name.text;
+  } else {
+    return null;
+  }
+}
+
+function typeNodeToValueExpr(node: ts.TypeNode): ts.Expression|null {
+  if (ts.isTypeReferenceNode(node)) {
+    return entityNameToValue(node.typeName);
+  } else {
+    return null;
+  }
+}
+
+function entityNameToValue(node: ts.EntityName): ts.Expression|null {
+  if (ts.isQualifiedName(node)) {
+    const left = entityNameToValue(node.left);
+    return left !== null ? ts.createPropertyAccess(left, node.right) : null;
+  } else if (ts.isIdentifier(node)) {
+    return ts.getMutableClone(node);
+  } else {
+    return null;
+  }
+}
+
+function propertyNameToString(node: ts.PropertyName): string|null {
+  if (ts.isIdentifier(node) || ts.isStringLiteral(node) || ts.isNumericLiteral(node)) {
+    return node.text;
+  } else {
+    return null;
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
index 9a675329a2..65474c8342 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
@@ -12,6 +12,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/testing",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
index f7cf26bd17..245dc8937b 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
@@ -8,8 +8,9 @@
 
 import * as ts from 'typescript';
 
+import {Parameter} from '../../host';
 import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
-import {Parameter, reflectConstructorParameters} from '../src/reflector';
+import {TypeScriptReflectionHost} from '../src/reflector';
 
 describe('reflector', () => {
   describe('ctor params', () => {
@@ -26,9 +27,10 @@ describe('reflector', () => {
       }]);
       const clazz = getDeclaration(program, 'entry.ts', 'Foo', ts.isClassDeclaration);
       const checker = program.getTypeChecker();
-      const args = reflectConstructorParameters(clazz, checker) !;
+      const host = new TypeScriptReflectionHost(checker);
+      const args = host.getConstructorParameters(clazz) !;
       expect(args.length).toBe(1);
-      expectArgument(args[0], 'bar', 'Bar');
+      expectParameter(args[0], 'bar', 'Bar');
     });
 
     it('should reflect a decorated argument', () => {
@@ -54,9 +56,10 @@ describe('reflector', () => {
       ]);
       const clazz = getDeclaration(program, 'entry.ts', 'Foo', ts.isClassDeclaration);
       const checker = program.getTypeChecker();
-      const args = reflectConstructorParameters(clazz, checker) !;
+      const host = new TypeScriptReflectionHost(checker);
+      const args = host.getConstructorParameters(clazz) !;
       expect(args.length).toBe(1);
-      expectArgument(args[0], 'bar', 'Bar', 'dec', './dec');
+      expectParameter(args[0], 'bar', 'Bar', 'dec', './dec');
     });
 
     it('should reflect a decorated argument with a call', () => {
@@ -82,9 +85,10 @@ describe('reflector', () => {
       ]);
       const clazz = getDeclaration(program, 'entry.ts', 'Foo', ts.isClassDeclaration);
       const checker = program.getTypeChecker();
-      const args = reflectConstructorParameters(clazz, checker) !;
+      const host = new TypeScriptReflectionHost(checker);
+      const args = host.getConstructorParameters(clazz) !;
       expect(args.length).toBe(1);
-      expectArgument(args[0], 'bar', 'Bar', 'dec', './dec');
+      expectParameter(args[0], 'bar', 'Bar', 'dec', './dec');
     });
 
     it('should reflect a decorated argument with an indirection', () => {
@@ -109,26 +113,31 @@ describe('reflector', () => {
       ]);
       const clazz = getDeclaration(program, 'entry.ts', 'Foo', ts.isClassDeclaration);
       const checker = program.getTypeChecker();
-      const args = reflectConstructorParameters(clazz, checker) !;
+      const host = new TypeScriptReflectionHost(checker);
+      const args = host.getConstructorParameters(clazz) !;
       expect(args.length).toBe(2);
-      expectArgument(args[0], 'bar', 'Bar');
-      expectArgument(args[1], 'otherBar', 'star.Bar');
+      expectParameter(args[0], 'bar', 'Bar');
+      expectParameter(args[1], 'otherBar', 'star.Bar');
     });
   });
 });
 
-function expectArgument(
-    arg: Parameter, name: string, type?: string, decorator?: string, decoratorFrom?: string): void {
-  expect(argExpressionToString(arg.name)).toEqual(name);
+function expectParameter(
+    param: Parameter, name: string, type?: string, decorator?: string,
+    decoratorFrom?: string): void {
+  expect(param.name !).toEqual(name);
   if (type === undefined) {
-    expect(arg.typeValueExpr).toBeNull();
+    expect(param.type).toBeNull();
   } else {
-    expect(arg.typeValueExpr).not.toBeNull();
-    expect(argExpressionToString(arg.typeValueExpr !)).toEqual(type);
+    expect(param.type).not.toBeNull();
+    expect(argExpressionToString(param.type !)).toEqual(type);
   }
   if (decorator !== undefined) {
-    expect(arg.decorators.length).toBeGreaterThan(0);
-    expect(arg.decorators.some(dec => dec.name === decorator && dec.from === decoratorFrom))
+    expect(param.decorators).not.toBeNull();
+    expect(param.decorators !.length).toBeGreaterThan(0);
+    expect(param.decorators !.some(
+               dec => dec.name === decorator && dec.import !== null &&
+                   dec.import.from === decoratorFrom))
         .toBe(true);
   }
 }
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 0df33b4627..95ef841abe 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -14,6 +14,7 @@ import * as api from '../transformers/api';
 
 import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, SelectorScopeRegistry} from './annotations';
 import {CompilerHost} from './compiler_host';
+import {TypeScriptReflectionHost} from './metadata';
 import {IvyCompilation, ivyTransformFactory} from './transform';
 
 export class NgtscProgram implements api.Program {
@@ -90,16 +91,17 @@ export class NgtscProgram implements api.Program {
     const mergeEmitResultsCallback = opts && opts.mergeEmitResultsCallback || mergeEmitResults;
 
     const checker = this.tsProgram.getTypeChecker();
-    const scopeRegistry = new SelectorScopeRegistry(checker);
+    const reflector = new TypeScriptReflectionHost(checker);
+    const scopeRegistry = new SelectorScopeRegistry(checker, reflector);
 
     // Set up the IvyCompilation, which manages state for the Ivy transformer.
     const handlers = [
-      new ComponentDecoratorHandler(checker, scopeRegistry),
-      new DirectiveDecoratorHandler(checker, scopeRegistry),
-      new InjectableDecoratorHandler(checker),
+      new ComponentDecoratorHandler(checker, reflector, scopeRegistry),
+      new DirectiveDecoratorHandler(checker, reflector, scopeRegistry),
+      new InjectableDecoratorHandler(reflector),
       new NgModuleDecoratorHandler(checker, scopeRegistry),
     ];
-    const compilation = new IvyCompilation(handlers, checker);
+    const compilation = new IvyCompilation(handlers, checker, reflector);
 
     // Analyze every source file in the program.
     this.tsProgram.getSourceFiles()
diff --git a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
index ab5918688c..a23b780019 100644
--- a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
     module_name = "@angular/compiler-cli/src/ngtsc/transform",
     deps = [
         "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/util",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/api.ts b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
index 4ce4734a9d..6dac390d0b 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
@@ -9,7 +9,7 @@
 import {Expression, Statement, Type} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator} from '../../metadata';
+import {Decorator} from '../../host';
 
 /**
  * Provides the interface between a decorator compiler from @angular/compiler and the Typescript
@@ -31,13 +31,13 @@ export interface DecoratorHandler<A> {
    * if successful, or an array of diagnostic messages if the analysis fails or the decorator
    * isn't valid.
    */
-  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<A>;
+  analyze(node: ts.Declaration, decorator: Decorator): AnalysisOutput<A>;
 
   /**
    * Generate a description of the field which should be added to the class, including any
    * initialization code to be generated.
    */
-  compile(node: ts.ClassDeclaration, analysis: A): CompileResult;
+  compile(node: ts.Declaration, analysis: A): CompileResult;
 }
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index 948a01ba6f..3500683998 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -9,7 +9,8 @@
 import {Expression, Type} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator, reflectDecorator} from '../../metadata';
+import {Decorator, ReflectionHost} from '../../host';
+import {reflectNameOfDeclaration} from '../../metadata/src/reflector';
 
 import {AnalysisOutput, CompileResult, DecoratorHandler} from './api';
 import {DtsFileTransformer} from './declaration';
@@ -24,7 +25,7 @@ import {ImportManager, translateType} from './translator';
 interface EmitFieldOperation<T> {
   adapter: DecoratorHandler<T>;
   analysis: AnalysisOutput<T>;
-  decorator: ts.Decorator;
+  decorator: Decorator;
 }
 
 /**
@@ -38,59 +39,63 @@ export class IvyCompilation {
    * Tracks classes which have been analyzed and found to have an Ivy decorator, and the
    * information recorded about them for later compilation.
    */
-  private analysis = new Map<ts.ClassDeclaration, EmitFieldOperation<any>>();
+  private analysis = new Map<ts.Declaration, EmitFieldOperation<any>>();
 
   /**
    * Tracks the `DtsFileTransformer`s for each TS file that needs .d.ts transformations.
    */
   private dtsMap = new Map<string, DtsFileTransformer>();
 
-  constructor(private handlers: DecoratorHandler<any>[], private checker: ts.TypeChecker) {}
+  constructor(
+      private handlers: DecoratorHandler<any>[], private checker: ts.TypeChecker,
+      private reflector: ReflectionHost) {}
 
   /**
    * Analyze a source file and produce diagnostics for it (if any).
    */
   analyze(sf: ts.SourceFile): ts.Diagnostic[] {
     const diagnostics: ts.Diagnostic[] = [];
-    const visit = (node: ts.Node) => {
-      // Process nodes recursively, and look for class declarations with decorators.
-      if (ts.isClassDeclaration(node) && node.decorators !== undefined) {
-        // The first step is to reflect the decorators, which will identify decorators
-        // that are imported from another module.
-        const decorators =
-            node.decorators.map(decorator => reflectDecorator(decorator, this.checker))
-                .filter(decorator => decorator !== null) as Decorator[];
 
-        // Look through the DecoratorHandlers to see if any are relevant.
-        this.handlers.forEach(adapter => {
-          // An adapter is relevant if it matches one of the decorators on the class.
-          const decorator = adapter.detect(decorators);
-          if (decorator === undefined) {
-            return;
-          }
-
-          // Check for multiple decorators on the same node. Technically speaking this
-          // could be supported, but right now it's an error.
-          if (this.analysis.has(node)) {
-            throw new Error('TODO.Diagnostic: Class has multiple Angular decorators.');
-          }
-
-          // Run analysis on the decorator. This will produce either diagnostics, an
-          // analysis result, or both.
-          const analysis = adapter.analyze(node, decorator);
-          if (analysis.diagnostics !== undefined) {
-            diagnostics.push(...analysis.diagnostics);
-          }
-          if (analysis.analysis !== undefined) {
-            this.analysis.set(node, {
-              adapter,
-              analysis: analysis.analysis,
-              decorator: decorator.node,
-            });
-          }
-        });
+    const analyzeClass = (node: ts.Declaration): void => {
+      // The first step is to reflect the decorators.
+      const decorators = this.reflector.getDecoratorsOfDeclaration(node);
+      if (decorators === null) {
+        return;
       }
+      // Look through the DecoratorHandlers to see if any are relevant.
+      this.handlers.forEach(adapter => {
+        // An adapter is relevant if it matches one of the decorators on the class.
+        const decorator = adapter.detect(decorators);
+        if (decorator === undefined) {
+          return;
+        }
 
+        // Check for multiple decorators on the same node. Technically speaking this
+        // could be supported, but right now it's an error.
+        if (this.analysis.has(node)) {
+          throw new Error('TODO.Diagnostic: Class has multiple Angular decorators.');
+        }
+
+        // Run analysis on the decorator. This will produce either diagnostics, an
+        // analysis result, or both.
+        const analysis = adapter.analyze(node, decorator);
+        if (analysis.diagnostics !== undefined) {
+          diagnostics.push(...analysis.diagnostics);
+        }
+        if (analysis.analysis !== undefined) {
+          this.analysis.set(node, {
+            adapter,
+            analysis: analysis.analysis, decorator,
+          });
+        }
+      });
+    };
+
+    const visit = (node: ts.Node): void => {
+      // Process nodes recursively, and look for class declarations with decorators.
+      if (ts.isClassDeclaration(node)) {
+        analyzeClass(node);
+      }
       ts.forEachChild(node, visit);
     };
 
@@ -102,9 +107,9 @@ export class IvyCompilation {
    * Perform a compilation operation on the given class declaration and return instructions to an
    * AST transformer if any are available.
    */
-  compileIvyFieldFor(node: ts.ClassDeclaration): CompileResult|undefined {
+  compileIvyFieldFor(node: ts.Declaration): CompileResult|undefined {
     // Look to see whether the original node was analyzed. If not, there's nothing to do.
-    const original = ts.getOriginalNode(node) as ts.ClassDeclaration;
+    const original = ts.getOriginalNode(node) as ts.Declaration;
     if (!this.analysis.has(original)) {
       return undefined;
     }
@@ -117,7 +122,7 @@ export class IvyCompilation {
     // which will allow the .d.ts to be transformed later.
     const fileName = node.getSourceFile().fileName;
     const dtsTransformer = this.getDtsTransformer(fileName);
-    dtsTransformer.recordStaticField(node.name !.text, res);
+    dtsTransformer.recordStaticField(reflectNameOfDeclaration(node) !, res);
 
     // Return the instruction to the transformer so the field will be added.
     return res;
@@ -126,8 +131,8 @@ export class IvyCompilation {
   /**
    * Lookup the `ts.Decorator` which triggered transformation of a particular class declaration.
    */
-  ivyDecoratorFor(node: ts.ClassDeclaration): ts.Decorator|undefined {
-    const original = ts.getOriginalNode(node) as ts.ClassDeclaration;
+  ivyDecoratorFor(node: ts.Declaration): Decorator|undefined {
+    const original = ts.getOriginalNode(node) as ts.Declaration;
     if (!this.analysis.has(original)) {
       return undefined;
     }
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index e13a887e65..6878b2278c 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -46,7 +46,8 @@ class IvyVisitor extends Visitor {
       node = ts.updateClassDeclaration(
           node,
           // Remove the decorator which triggered this compilation, leaving the others alone.
-          maybeFilterDecorator(node.decorators, this.compilation.ivyDecoratorFor(node) !),
+          maybeFilterDecorator(
+              node.decorators, this.compilation.ivyDecoratorFor(node) !.node as ts.Decorator),
           node.modifiers, node.name, node.typeParameters, node.heritageClauses || [],
           [...node.members, property]);
       const statements = res.statements.map(stmt => translateStatement(stmt, this.importManager));
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index c2cb6551ac..b6b8f76ae9 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -488,4 +488,4 @@ export function parseHostBindings(host: {[key: string]: string}): {
   });
 
   return {attributes, listeners, properties, animations};
-}
\ No newline at end of file
+}

From 7d3fd4d655b30202fb5ce65447cde2f8c16c0512 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 15 Jun 2018 15:27:12 -0700
Subject: [PATCH 322/582] fix(ivy): inject() no longer uses default value
 parameters (#24565)

inject() was changed in da31db7 to not take a default value parameter,
so injectable_compiler_2 should not request the use of one when
using inject().

PR Close #24565
---
 .../compiler/src/injectable_compiler_2.ts     |  2 --
 packages/compiler/src/render3/r3_factory.ts   | 32 ++-----------------
 .../compiler/src/render3/r3_pipe_compiler.ts  |  1 -
 .../compiler/src/render3/view/compiler.ts     |  1 -
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/packages/compiler/src/injectable_compiler_2.ts b/packages/compiler/src/injectable_compiler_2.ts
index 083d2217f4..abe1d9c76c 100644
--- a/packages/compiler/src/injectable_compiler_2.ts
+++ b/packages/compiler/src/injectable_compiler_2.ts
@@ -52,7 +52,6 @@ export function compileInjectable(meta: R3InjectableMetadata): InjectableDef {
         fnOrClass,
         useNew,
         injectFn: Identifiers.inject,
-        useOptionalParam: true,
         deps: meta.deps,
       });
     } else if (meta.useClass !== undefined) {
@@ -94,7 +93,6 @@ export function compileInjectable(meta: R3InjectableMetadata): InjectableDef {
       fnOrClass: meta.type,
       useNew: true,
       injectFn: Identifiers.inject,
-      useOptionalParam: true,
       deps: meta.deps,
     });
   }
diff --git a/packages/compiler/src/render3/r3_factory.ts b/packages/compiler/src/render3/r3_factory.ts
index 78d7e3c75c..178434026d 100644
--- a/packages/compiler/src/render3/r3_factory.ts
+++ b/packages/compiler/src/render3/r3_factory.ts
@@ -55,19 +55,6 @@ export interface R3FactoryMetadata {
    */
   injectFn: o.ExternalReference;
 
-  /**
-   * Whether the `injectFn` given above accepts a 2nd parameter indicating the default value to
-   * be used to resolve missing @Optional dependencies.
-   *
-   * If the optional parameter is used, injectFn for an optional dependency will be invoked as:
-   * `injectFn(token, null, flags)`.
-   *
-   * If it's not used, injectFn for an optional dependency will be invoked as:
-   * `injectFn(token, flags)`. The Optional flag will indicate that injectFn should select a default
-   * value if it cannot satisfy the injection request for the token.
-   */
-  useOptionalParam: boolean;
-
   /**
    * If present, the return of the factory function will be an array with the injected value in the
    * 0th position and the extra results included in subsequent positions.
@@ -162,8 +149,7 @@ export interface R3DependencyMetadata {
  */
 export function compileFactoryFunction(meta: R3FactoryMetadata): o.Expression {
   // Each dependency becomes an invocation of an inject*() function.
-  const args =
-      meta.deps.map(dep => compileInjectDependency(dep, meta.injectFn, meta.useOptionalParam));
+  const args = meta.deps.map(dep => compileInjectDependency(dep, meta.injectFn));
 
   // The overall result depends on whether this is construction or function invocation.
   const expr = meta.useNew ? new o.InstantiateExpr(meta.fnOrClass, args) :
@@ -178,8 +164,7 @@ export function compileFactoryFunction(meta: R3FactoryMetadata): o.Expression {
 }
 
 function compileInjectDependency(
-    dep: R3DependencyMetadata, injectFn: o.ExternalReference,
-    useOptionalParam: boolean): o.Expression {
+    dep: R3DependencyMetadata, injectFn: o.ExternalReference): o.Expression {
   // Interpret the dependency according to its resolved type.
   switch (dep.resolved) {
     case R3ResolvedDependencyType.Token:
@@ -202,18 +187,7 @@ function compileInjectDependency(
       // parameters describing how to inject the dependency must be passed to the inject function
       // that's being used.
       if (flags !== InjectFlags.Default || dep.optional) {
-        // Either the dependency is optional, or non-default flags are in use. Either of these cases
-        // necessitates adding an argument for the default value if such an argument is required
-        // by the inject function (useOptionalParam === true).
-        if (useOptionalParam) {
-          // The inject function requires a default value parameter.
-          injectArgs.push(dep.optional ? o.NULL_EXPR : o.literal(undefined));
-        }
-        // The last parameter is always the InjectFlags, which only need to be specified if they're
-        // non-default.
-        if (flags !== InjectFlags.Default) {
-          injectArgs.push(o.literal(flags));
-        }
+        injectArgs.push(o.literal(flags));
       }
       return o.importExpr(injectFn).callFn(injectArgs);
     }
diff --git a/packages/compiler/src/render3/r3_pipe_compiler.ts b/packages/compiler/src/render3/r3_pipe_compiler.ts
index 98c75db184..a7456b4e7a 100644
--- a/packages/compiler/src/render3/r3_pipe_compiler.ts
+++ b/packages/compiler/src/render3/r3_pipe_compiler.ts
@@ -37,7 +37,6 @@ export function compilePipe(
     fnOrClass: outputCtx.importExpr(pipe.type.reference), deps,
     useNew: true,
     injectFn: R3.directiveInject,
-    useOptionalParam: false,
   });
   definitionMapValues.push({key: 'factory', value: templateFactory, quoted: false});
 
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index b6b8f76ae9..63a2462408 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -49,7 +49,6 @@ function baseDirectiveFields(
                       deps: meta.deps,
                       useNew: true,
                       injectFn: R3.directiveInject,
-                      useOptionalParam: false,
                       extraResults: queryDefinitions,
                     }));
 

From 7b2b1afe719a253e8765fece2239590c84adb8c9 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 15 Jun 2018 15:43:22 -0700
Subject: [PATCH 323/582] fix(ivy): support inputs/outputs in decorator
 metadata in JIT (#24565)

PR Close #24565
---
 packages/core/src/render3/jit/directive.ts | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index b05831dae3..b545f72306 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -144,17 +144,20 @@ export function awaitCurrentlyCompilingComponents(): Promise<void> {
 function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMetadata {
   // Reflect inputs and outputs.
   const propMetadata = getReflect().propMetadata(type);
-  const inputs: StringMap = {};
-  const outputs: StringMap = {};
 
   const host = extractHostBindings(metadata, propMetadata);
 
+  const inputsFromMetadata = parseInputOutputs(metadata.inputs || []);
+  const outputsFromMetadata = parseInputOutputs(metadata.outputs || []);
+
+  const inputsFromType: StringMap = {};
+  const outputsFromType: StringMap = {};
   for (let field in propMetadata) {
     propMetadata[field].forEach(ann => {
       if (isInput(ann)) {
-        inputs[field] = ann.bindingPropertyName || field;
+        inputsFromType[field] = ann.bindingPropertyName || field;
       } else if (isOutput(ann)) {
-        outputs[field] = ann.bindingPropertyName || field;
+        outputsFromType[field] = ann.bindingPropertyName || field;
       }
     });
   }
@@ -163,7 +166,9 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
     name: type.name,
     type: new WrappedNodeExpr(type),
     selector: metadata.selector !,
-    deps: reflectDependencies(type), host, inputs, outputs,
+    deps: reflectDependencies(type), host,
+    inputs: {...inputsFromMetadata, ...inputsFromType},
+    outputs: {...outputsFromMetadata, ...outputsFromType},
     queries: [],
     lifecycle: {
       usesOnChanges: type.prototype.ngOnChanges !== undefined,
@@ -213,3 +218,13 @@ function isHostBinding(value: any): value is HostBinding {
 function isHostListener(value: any): value is HostListener {
   return value.ngMetadataName === 'HostListener';
 }
+
+function parseInputOutputs(values: string[]): StringMap {
+  return values.reduce(
+      (map, value) => {
+        const [field, property] = value.split(',').map(piece => piece.trim());
+        map[field] = property || field;
+        return map;
+      },
+      {} as StringMap);
+}

From 637805a0c90b201f3e258eaeff967d5992d71faf Mon Sep 17 00:00:00 2001
From: George Tzinos <geotzinos@gmail.com>
Date: Wed, 20 Jun 2018 15:54:32 +0300
Subject: [PATCH 324/582] docs: update `lowercase` pipe example in "AngularJS
 to Angular" guide (#24588)

PR Close #24588
---
 aio/content/guide/ajs-quick-reference.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/ajs-quick-reference.md b/aio/content/guide/ajs-quick-reference.md
index 38f9d22291..b900fd0a78 100644
--- a/aio/content/guide/ajs-quick-reference.md
+++ b/aio/content/guide/ajs-quick-reference.md
@@ -895,7 +895,7 @@ For more information on pipes, see [Pipes](guide/pipes).
       ### lowercase
 
       <code-example hideCopy>
-        &lt;div>{{movie.title | lowercase}}&lt;/div>
+        &lt;td>{{movie.title | lowercase}}&lt;/td>
       </code-example>
 
 

From fe8fe9ba9ec1f7958ea784936264ed5129b8d13c Mon Sep 17 00:00:00 2001
From: Ricardo Varanda <rickyv08@gmail.com>
Date: Tue, 19 Jun 2018 11:59:02 +0100
Subject: [PATCH 325/582] docs: update Angular CLI option for sourcemaps
 (#24437)

PR Close #24437
---
 aio/content/guide/deployment.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/deployment.md b/aio/content/guide/deployment.md
index 6e0292f572..58b3a26c27 100644
--- a/aio/content/guide/deployment.md
+++ b/aio/content/guide/deployment.md
@@ -152,7 +152,7 @@ Install `source-map-explorer`:
 Build your app for production _including the source maps_
 
 <code-example language="none" class="code-shell">
-  ng build --prod --sourcemaps
+  ng build --prod --source-map
 </code-example>
 
 List the generated bundles in the `dist/` folder.

From 50fb58fd016c4ad705fcb095acdd67810e7f4229 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 12 Jun 2018 14:37:13 +0300
Subject: [PATCH 326/582] test: remove unnecessary `yarn.lock` file (#24443)

PR Close #24443
---
 integration/typings_test_ts27/yarn.lock | 1038 -----------------------
 1 file changed, 1038 deletions(-)
 delete mode 100644 integration/typings_test_ts27/yarn.lock

diff --git a/integration/typings_test_ts27/yarn.lock b/integration/typings_test_ts27/yarn.lock
deleted file mode 100644
index 70936f8536..0000000000
--- a/integration/typings_test_ts27/yarn.lock
+++ /dev/null
@@ -1,1038 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@angular/animations@file:../../dist/packages-dist/animations":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/common@file:../../dist/packages-dist/common":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    chokidar "^1.4.2"
-    minimist "^1.2.0"
-    reflect-metadata "^0.1.2"
-    tsickle "^0.27.2"
-
-"@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/core@file:../../dist/packages-dist/core":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/forms@file:../../dist/packages-dist/forms":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/http@file:../../dist/packages-dist/http":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-server@file:../../dist/packages-dist/platform-server":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    domino "^2.0.1"
-    tslib "^1.9.0"
-    xhr2 "^0.1.4"
-
-"@angular/platform-webworker-dynamic@file:../../dist/packages-dist/platform-webworker-dynamic":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-webworker@file:../../dist/packages-dist/platform-webworker":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/router@file:../../dist/packages-dist/router":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/service-worker@file:../../dist/packages-dist/service-worker":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/upgrade@file:../../dist/packages-dist/upgrade":
-  version "6.0.0-rc.0-b32e6343a3"
-  dependencies:
-    tslib "^1.9.0"
-
-"@types/jasmine@2.5.41":
-  version "2.5.41"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713"
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
-are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-
-domino@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-extend@~3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
-glob@^7.0.5:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
-hawk@3.1.3, hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  dependencies:
-    isarray "1.0.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  dependencies:
-    is-buffer "^1.1.5"
-
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-"mkdirp@>=0.5 0", mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-
-nan@^2.3.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
-
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
-  dependencies:
-    detect-libc "^1.0.2"
-    hawk "3.1.3"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-path@^2.0.0, normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0, once@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-rc@^1.1.7:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-reflect-metadata@^0.1.2:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-"rxjs@file:../../node_modules/rxjs":
-  version "6.0.0-beta.4"
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
-source-map-support@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
-  dependencies:
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-stringstream@~0.0.4:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-tough-cookie@~2.3.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  dependencies:
-    punycode "^1.4.1"
-
-tsickle@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.6.0"
-    source-map-support "^0.5.0"
-
-tslib@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-typescript@2.7.x:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
-
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-uuid@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
-  dependencies:
-    string-width "^1.0.2"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xhr2@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
-
-"zone.js@file:../../node_modules/zone.js":
-  version "0.8.20"

From b8760a0ca5f49891b21296344886370f37a1aea5 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 12 Jun 2018 14:37:46 +0300
Subject: [PATCH 327/582] test(elements): test typings against TS 2.7 and 2.8
 (#24443)

PR Close #24443
---
 integration/typings_test_ts27/include-all.ts | 2 ++
 integration/typings_test_ts27/package.json   | 1 +
 integration/typings_test_ts28/include-all.ts | 2 ++
 integration/typings_test_ts28/package.json   | 1 +
 4 files changed, 6 insertions(+)

diff --git a/integration/typings_test_ts27/include-all.ts b/integration/typings_test_ts27/include-all.ts
index 78cefe0030..ca81c56472 100644
--- a/integration/typings_test_ts27/include-all.ts
+++ b/integration/typings_test_ts27/include-all.ts
@@ -10,6 +10,7 @@ import * as compiler from '@angular/compiler';
 import * as compilerTesting from '@angular/compiler/testing';
 import * as core from '@angular/core';
 import * as coreTesting from '@angular/core/testing';
+import * as elements from '@angular/elements';
 import * as forms from '@angular/forms';
 import * as http from '@angular/http';
 import * as httpTesting from '@angular/http/testing';
@@ -30,6 +31,7 @@ export default {
   compilerTesting,
   core,
   coreTesting,
+  elements,
   forms,
   http,
   httpTesting,
diff --git a/integration/typings_test_ts27/package.json b/integration/typings_test_ts27/package.json
index cfacf41182..f601b04922 100644
--- a/integration/typings_test_ts27/package.json
+++ b/integration/typings_test_ts27/package.json
@@ -9,6 +9,7 @@
     "@angular/compiler": "file:../../dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/elements": "file:../../dist/packages-dist/elements",
     "@angular/forms": "file:../../dist/packages-dist/forms",
     "@angular/http": "file:../../dist/packages-dist/http",
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
diff --git a/integration/typings_test_ts28/include-all.ts b/integration/typings_test_ts28/include-all.ts
index 78cefe0030..ca81c56472 100644
--- a/integration/typings_test_ts28/include-all.ts
+++ b/integration/typings_test_ts28/include-all.ts
@@ -10,6 +10,7 @@ import * as compiler from '@angular/compiler';
 import * as compilerTesting from '@angular/compiler/testing';
 import * as core from '@angular/core';
 import * as coreTesting from '@angular/core/testing';
+import * as elements from '@angular/elements';
 import * as forms from '@angular/forms';
 import * as http from '@angular/http';
 import * as httpTesting from '@angular/http/testing';
@@ -30,6 +31,7 @@ export default {
   compilerTesting,
   core,
   coreTesting,
+  elements,
   forms,
   http,
   httpTesting,
diff --git a/integration/typings_test_ts28/package.json b/integration/typings_test_ts28/package.json
index 8c3ddac65e..10a38622bd 100644
--- a/integration/typings_test_ts28/package.json
+++ b/integration/typings_test_ts28/package.json
@@ -9,6 +9,7 @@
     "@angular/compiler": "file:../../dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/elements": "file:../../dist/packages-dist/elements",
     "@angular/forms": "file:../../dist/packages-dist/forms",
     "@angular/http": "file:../../dist/packages-dist/http",
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",

From 71b0c3d46919f25b4c28b22f2160430ba2ffebb7 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 12 Jun 2018 14:38:19 +0300
Subject: [PATCH 328/582] docs(elements): mention `comp: elements` as a valid
 label (#24443)

PR Close #24443
---
 docs/TRIAGE_AND_LABELS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md
index 979da15af5..248ba91084 100644
--- a/docs/TRIAGE_AND_LABELS.md
+++ b/docs/TRIAGE_AND_LABELS.md
@@ -21,6 +21,7 @@ The components have a clear piece of source code associated with it within the `
 * `comp: core & compiler` - because core, compiler, compiler-cli and
   browser-platforms are very intertwined, we will be treating them as one
 * `comp: ivy` - a subset of core representing the new Ivy renderer.
+* `comp: elements`
 * `comp: forms`
 * `comp: http`
 * `comp: i18n`

From 8c51ce6f3b07da963ebafaa1a0c6eacf878d71f7 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 14 Jun 2018 22:06:59 +0100
Subject: [PATCH 329/582] build(docs-infra): move overload short description
 above syntax (#24526)

PR Close #24526
---
 aio/src/styles/1-layouts/_api-pages.scss                      | 4 ++++
 .../transforms/templates/api/includes/class-overview.html     | 2 +-
 aio/tools/transforms/templates/api/lib/memberHelpers.html     | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/aio/src/styles/1-layouts/_api-pages.scss b/aio/src/styles/1-layouts/_api-pages.scss
index 9755851cb2..81e2f548a0 100644
--- a/aio/src/styles/1-layouts/_api-pages.scss
+++ b/aio/src/styles/1-layouts/_api-pages.scss
@@ -37,5 +37,9 @@
                 padding: 16px 24px;
             }
         }
+
+        .short-description {
+            margin-left: 0;
+        }
     }
 }
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/class-overview.html b/aio/tools/transforms/templates/api/includes/class-overview.html
index 906f51e0a5..d9064a17bf 100644
--- a/aio/tools/transforms/templates/api/includes/class-overview.html
+++ b/aio/tools/transforms/templates/api/includes/class-overview.html
@@ -1,7 +1,7 @@
 {% import "lib/memberHelpers.html" as memberHelper -%}
 
 <section class="{$ doc.docType $}-overview">
-<code-example language="ts" hideCopy="true">
+<code-example language="ts" hideCopy="true" linenums="false">
 {% if doc.isAbstract %}abstract {% endif%}{$ doc.docType $} {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} {{$ memberHelper.renderMembers(doc) $}
 }
 </code-example>
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index 046d56dfcd..de81f1f5a2 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -40,13 +40,13 @@
 
 {%- macro renderOverloadInfo(overload, cssClass, method) -%}
 
-<code-example language="ts" hideCopy="true" class="no-box api-heading">{$ renderMemberSyntax(overload) $}</code-example>
-
 {% if overload.shortDescription and (overload.shortDescription != method.shortDescription) %}
 <div class="short-description">
   {$ overload.shortDescription | marked $}
 </div>{% endif %}
 
+<code-example language="ts" hideCopy="true" linenums="false" class="no-box api-heading">{$ renderMemberSyntax(overload) $}</code-example>
+
 <h4 class="no-anchor">Parameters</h4>
 {$ params.renderParameters(overload.parameterDocs, cssClass + '-parameters', cssClass + '-parameter') $}
 

From 39c7769c9ec03d6f426d5dd0f09a62ac8453460a Mon Sep 17 00:00:00 2001
From: Georgi Parlakov <gparlakov@gmail.com>
Date: Sat, 16 Jun 2018 20:03:27 +0300
Subject: [PATCH 330/582] docs(core): typo in static injector tests (#24548)

PR Close #24548
---
 packages/core/test/di/static_injector_spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/test/di/static_injector_spec.ts b/packages/core/test/di/static_injector_spec.ts
index 37e63876a5..81d15a354b 100644
--- a/packages/core/test/di/static_injector_spec.ts
+++ b/packages/core/test/di/static_injector_spec.ts
@@ -397,7 +397,7 @@ function factoryFn(a: any){}
     });
   });
 
-  describe('depedency resolution', () => {
+  describe('dependency resolution', () => {
     describe('@Self()', () => {
       it('should return a dependency from self', () => {
         const inj = Injector.create([

From c95437f15df93e2ca735ebf015acb20be597bb6a Mon Sep 17 00:00:00 2001
From: Rado Kirov <rkirov@gmail.com>
Date: Mon, 18 Jun 2018 16:38:33 -0700
Subject: [PATCH 331/582] build(bazel): Turning on strictPropertyInitialization
 for Angular. (#24572)

All errors for existing fields have been detected and suppressed with a
`!` assertion.

Issue/24571 is tracking proper clean up of those instances.

One-line change required in ivy/compilation.ts, because it appears that
the new syntax causes tsickle emitted node to no longer track their
original sourceFiles.

PR Close #24572
---
 .../src/dsl/animation_timeline_builder.ts     |   3 +-
 .../css_keyframes/css_keyframes_player.ts     |   6 +-
 .../src/render/transition_animation_engine.ts |   3 +-
 .../web_animations/web_animations_player.ts   |   6 +-
 .../src/firefox_extension/lib/main.ts         |   6 +-
 packages/common/http/src/headers.ts           |   6 +-
 packages/common/http/src/request.ts           |   6 +-
 packages/common/http/src/response.ts          |   3 +-
 packages/common/http/test/jsonp_mock.ts       |   3 +-
 packages/common/http/test/xhr_mock.ts         |   9 +-
 packages/common/src/directives/ng_class.ts    |   9 +-
 .../src/directives/ng_component_outlet.ts     |  12 +-
 packages/common/src/directives/ng_for_of.ts   |   6 +-
 packages/common/src/directives/ng_plural.ts   |   6 +-
 packages/common/src/directives/ng_style.ts    |   6 +-
 packages/common/src/directives/ng_switch.ts   |   3 +-
 .../src/directives/ng_template_outlet.ts      |   9 +-
 packages/common/src/pipes/keyvalue_pipe.ts    |   6 +-
 .../common/test/directives/ng_class_spec.ts   |   3 +-
 .../directives/ng_component_outlet_spec.ts    |  18 ++-
 .../directives/ng_template_outlet_spec.ts     |   6 +-
 .../integrationtest/tsconfig-build.json       |   1 +
 .../integrationtest/tsconfig-ngc-build.json   |   1 +
 .../src/diagnostics/expression_diagnostics.ts |   3 +-
 .../src/diagnostics/expression_type.ts        |   9 +-
 .../src/diagnostics/typescript_symbols.ts     |  12 +-
 packages/compiler-cli/src/metadata/bundler.ts |   3 +-
 packages/compiler-cli/src/metadata/symbols.ts |   3 +-
 .../src/ngtsc/metadata/src/resolver.ts        |   3 +-
 .../src/ngtsc/transform/src/compilation.ts    |   2 +-
 .../src/transformers/compiler_host.ts         |  12 +-
 .../src/transformers/lower_expressions.ts     |   3 +-
 .../compiler-cli/src/transformers/program.ts  |  15 +-
 .../compiler-cli/test/diagnostics/mocks.ts    |   6 +-
 .../test/metadata/typescript.mocks.ts         |   6 +-
 packages/compiler/src/aot/static_reflector.ts |  12 +-
 .../compiler/src/aot/summary_serializer.ts    |   3 +-
 packages/compiler/src/compile_metadata.ts     |   3 +-
 packages/compiler/src/constant_pool.ts        |   3 +-
 packages/compiler/src/css_parser/css_lexer.ts |   3 +-
 .../compiler/src/css_parser/css_parser.ts     |   9 +-
 .../compiler/src/i18n/extractor_merger.ts     |  41 ++++--
 packages/compiler/src/i18n/i18n_ast.ts        |   3 +-
 packages/compiler/src/i18n/i18n_parser.ts     |  15 +-
 .../compiler/src/i18n/serializers/xliff.ts    |  12 +-
 .../compiler/src/i18n/serializers/xliff2.ts   |  15 +-
 packages/compiler/src/i18n/serializers/xtb.ts |  12 +-
 .../compiler/src/i18n/translation_bundle.ts   |   6 +-
 packages/compiler/src/ml_parser/html_tags.ts  |   6 +-
 packages/compiler/src/ml_parser/lexer.ts      |   6 +-
 packages/compiler/src/ml_parser/parser.ts     |   3 +-
 packages/compiler/src/ml_parser/xml_tags.ts   |   9 +-
 .../test/expression_parser/utils/unparser.ts  |   6 +-
 .../compiler/test/i18n/integration_common.ts  |   9 +-
 packages/compiler/test/integration_spec.ts    |   3 +-
 .../testing/src/resource_loader_mock.ts       |   6 +-
 packages/compiler/tsconfig-build.json         |   1 +
 packages/core/src/application_init.ts         |   6 +-
 packages/core/src/application_ref.ts          |   3 +-
 .../differs/default_iterable_differ.ts        |   3 +-
 packages/core/src/debug/debug_node.ts         |   6 +-
 packages/core/src/linker/query_list.ts        |   6 +-
 .../system_js_ng_module_factory_loader.ts     |   6 +-
 packages/core/src/render/api.ts               |   3 +-
 packages/core/src/render3/di.ts               |   9 +-
 packages/core/src/render3/view_ref.ts         |   6 +-
 packages/core/src/view/refs.ts                |   9 +-
 .../animation/animation_integration_spec.ts   |  45 ++++--
 .../animation_query_integration_spec.ts       |  27 ++--
 ...ns_with_web_animations_integration_spec.ts |   9 +-
 packages/core/test/application_ref_spec.ts    |   6 +-
 packages/core/test/bundling/todo/index.ts     |   3 +-
 packages/core/test/debug/debug_node_spec.ts   |   9 +-
 .../core/test/forward_ref_integration_spec.ts |   3 +-
 .../change_detection_integration_spec.ts      |  51 ++++---
 packages/core/test/linker/integration_spec.ts |  24 ++-
 .../linker/ng_container_integration_spec.ts   |  12 +-
 .../test/linker/ng_module_integration_spec.ts |   6 +-
 .../test/linker/query_integration_spec.ts     | 138 ++++++++++++------
 .../linker/regression_integration_spec.ts     |  15 +-
 .../test/linker/security_integration_spec.ts  |   6 +-
 packages/core/test/metadata/di_spec.ts        |  15 +-
 .../core/test/reflection/reflector_spec.ts    |  12 +-
 .../test/render3/change_detection_spec.ts     |   3 +-
 .../component_directives_spec.ts              |  18 ++-
 .../compiler_canonical/life_cycle_spec.ts     |   3 +-
 .../render3/compiler_canonical/query_spec.ts  |  12 +-
 .../template_variables_spec.ts                |   6 +-
 packages/core/test/render3/component_spec.ts  |   6 +-
 packages/core/test/render3/define_spec.ts     |   3 +-
 packages/core/test/render3/di_spec.ts         |   3 +-
 packages/core/test/render3/directive_spec.ts  |  15 +-
 packages/core/test/render3/exports_spec.ts    |   6 +-
 .../core/test/render3/instructions_spec.ts    |   3 +-
 .../core/test/render3/integration_spec.ts     |   9 +-
 packages/core/test/render3/listeners_spec.ts  |   3 +-
 packages/core/test/render3/outputs_spec.ts    |   3 +-
 packages/core/test/render3/pipe_spec.ts       |   9 +-
 packages/core/test/render3/properties_spec.ts |  24 ++-
 .../core/test/render3/pure_function_spec.ts   |  12 +-
 packages/core/test/render3/query_spec.ts      |   6 +-
 .../test/render3/renderer_factory_spec.ts     |   3 +-
 .../test/render3/view_container_ref_spec.ts   |  15 +-
 packages/core/test/view/query_spec.ts         |  18 ++-
 .../core/testing/src/async_test_completer.ts  |   6 +-
 .../src/component-factory-strategy.ts         |   6 +-
 .../elements/src/create-custom-element.ts     |   3 +-
 .../test/create-custom-element_spec.ts        |   3 +-
 .../common/pipes/ts/lowerupper_pipe.ts        |   3 +-
 .../animation/ts/dsl/animation_example.ts     |   3 +-
 .../ts/contentChild/content_child_example.ts  |   6 +-
 .../di/ts/contentChild/content_child_howto.ts |   3 +-
 .../content_children_example.ts               |   9 +-
 .../contentChildren/content_children_howto.ts |   3 +-
 packages/examples/core/di/ts/provider_spec.ts |   8 +-
 .../di/ts/viewChild/view_child_example.ts     |   3 +-
 .../core/di/ts/viewChild/view_child_howto.ts  |   3 +-
 .../ts/viewChildren/view_children_example.ts  |   6 +-
 .../di/ts/viewChildren/view_children_howto.ts |   3 +-
 .../core/ts/metadata/lifecycle_hooks_spec.ts  |   3 +-
 packages/examples/upgrade/static/ts/module.ts |   9 +-
 .../abstract_form_group_directive.ts          |   9 +-
 .../forms/src/directives/control_container.ts |   3 +-
 packages/forms/src/directives/ng_form.ts      |   3 +-
 packages/forms/src/directives/ng_model.ts     |  10 +-
 .../forms/src/directives/ng_model_group.ts    |   3 +-
 .../radio_control_value_accessor.ts           |  15 +-
 .../form_control_directive.ts                 |   3 +-
 .../reactive_directives/form_control_name.ts  |   6 +-
 .../form_group_directive.ts                   |   3 +-
 .../reactive_directives/form_group_name.ts    |   6 +-
 .../select_control_value_accessor.ts          |   3 +-
 .../select_multiple_control_value_accessor.ts |   6 +-
 packages/forms/src/directives/validators.ts   |  39 +++--
 packages/forms/src/model.ts                   |  24 ++-
 .../forms/test/reactive_integration_spec.ts   |  72 ++++++---
 .../forms/test/template_integration_spec.ts   |  60 +++++---
 .../test/value_accessor_integration_spec.ts   |  54 ++++---
 packages/http/src/backends/jsonp_backend.ts   |   9 +-
 packages/http/src/backends/xhr_backend.ts     |   3 +-
 packages/http/src/interfaces.ts               |   6 +-
 packages/http/src/static_response.ts          |   6 +-
 .../http/test/backends/jsonp_backend_spec.ts  |   3 +-
 .../http/test/backends/xhr_backend_spec.ts    |  18 ++-
 .../language-service/src/reflector_host.ts    |   3 +-
 .../language-service/src/typescript_host.ts   |  33 +++--
 packages/language-service/test/test_utils.ts  |   3 +-
 .../location/browser_platform_location.ts     |   6 +-
 .../platform-browser/src/dom/dom_adapter.ts   |   3 +-
 .../src/dom/events/event_manager.ts           |   3 +-
 .../test/browser/bootstrap_spec.ts            |   3 +-
 .../test/testing_public_spec.ts               |   6 +-
 packages/platform-server/src/http.ts          |   3 +-
 .../platform-server/test/integration_spec.ts  |   3 +-
 .../web_workers/shared/post_message_bus.ts    |   6 +-
 .../src/web_workers/ui/renderer.ts            |   3 +-
 .../web_workers/worker/platform_location.ts   |   3 +-
 .../src/web_workers/worker/renderer.ts        |   3 +-
 .../platform-webworker/src/worker_render.ts   |   6 +-
 .../web_workers/shared/message_bus_util.ts    |   3 +-
 packages/router/src/directives/router_link.ts |  48 ++++--
 .../src/directives/router_link_active.ts      |   7 +-
 packages/router/src/router.ts                 |   3 +-
 packages/router/src/router_preloader.ts       |   3 +-
 packages/router/src/router_scroller.ts        |   6 +-
 packages/router/src/router_state.ts           |  24 ++-
 packages/router/src/url_tree.ts               |  12 +-
 .../test/regression_integration.spec.ts       |   6 +-
 packages/service-worker/cli/tsconfig.json     |   1 +
 packages/service-worker/src/push.ts           |   3 +-
 .../service-worker/worker/testing/mock.ts     |   3 +-
 .../service-worker/worker/testing/scope.ts    |   3 +-
 packages/service-worker/worker/tsconfig.json  |   1 +
 packages/tsconfig-build.json                  |   1 +
 packages/tsconfig.json                        |   1 +
 packages/upgrade/src/common/component_info.ts |  18 ++-
 .../upgrade/src/common/downgrade_component.ts |   3 +-
 .../src/common/downgrade_component_adapter.ts |   9 +-
 packages/upgrade/src/common/util.ts           |   6 +-
 .../upgrade/src/dynamic/upgrade_adapter.ts    |  12 +-
 .../src/dynamic/upgrade_ng1_adapter.ts        |   9 +-
 .../upgrade/src/static/upgrade_component.ts   |  17 ++-
 .../downgrade_component_adapter_spec.ts       |  15 +-
 packages/upgrade/test/dynamic/upgrade_spec.ts |  15 +-
 .../integration/change_detection_spec.ts      |   6 +-
 .../integration/content_projection_spec.ts    |   3 +-
 .../integration/downgrade_component_spec.ts   |   6 +-
 .../test/static/integration/examples_spec.ts  |   6 +-
 .../integration/upgrade_component_spec.ts     | 106 +++++++++-----
 189 files changed, 1273 insertions(+), 632 deletions(-)

diff --git a/packages/animations/browser/src/dsl/animation_timeline_builder.ts b/packages/animations/browser/src/dsl/animation_timeline_builder.ts
index 534cf5c788..b9bc5b0920 100644
--- a/packages/animations/browser/src/dsl/animation_timeline_builder.ts
+++ b/packages/animations/browser/src/dsl/animation_timeline_builder.ts
@@ -586,7 +586,8 @@ export class AnimationTimelineContext {
 
 export class TimelineBuilder {
   public duration: number = 0;
-  public easing: string|null;
+  // TODO(issue/24571): remove '!'.
+  public easing !: string | null;
   private _previousKeyframe: ɵStyleData = {};
   private _currentKeyframe: ɵStyleData = {};
   private _keyframes = new Map<number, ɵStyleData>();
diff --git a/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts b/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts
index c6ff2f6fbc..8369201a36 100644
--- a/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts
+++ b/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts
@@ -23,9 +23,11 @@ export class CssKeyframesPlayer implements AnimationPlayer {
   private _onDestroyFns: Function[] = [];
 
   private _started = false;
-  private _styler: ElementAnimationStyleHandler;
+  // TODO(issue/24571): remove '!'.
+  private _styler !: ElementAnimationStyleHandler;
 
-  public parentPlayer: AnimationPlayer;
+  // TODO(issue/24571): remove '!'.
+  public parentPlayer !: AnimationPlayer;
   public readonly totalTime: number;
   public readonly easing: string;
   public currentSnapshot: {[key: string]: string} = {};
diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index 5c17d54c34..700c34b15e 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -1424,7 +1424,8 @@ export class TransitionAnimationPlayer implements AnimationPlayer {
 
   private _queuedCallbacks: {[name: string]: (() => any)[]} = {};
   public readonly destroyed = false;
-  public parentPlayer: AnimationPlayer;
+  // TODO(issue/24571): remove '!'.
+  public parentPlayer !: AnimationPlayer;
 
   public markedForDestroy: boolean = false;
   public disabled = false;
diff --git a/packages/animations/browser/src/render/web_animations/web_animations_player.ts b/packages/animations/browser/src/render/web_animations/web_animations_player.ts
index 99fb96ee03..8db8088fe3 100644
--- a/packages/animations/browser/src/render/web_animations/web_animations_player.ts
+++ b/packages/animations/browser/src/render/web_animations/web_animations_player.ts
@@ -21,9 +21,11 @@ export class WebAnimationsPlayer implements AnimationPlayer {
   private _finished = false;
   private _started = false;
   private _destroyed = false;
-  private _finalKeyframe: {[key: string]: string | number};
+  // TODO(issue/24571): remove '!'.
+  private _finalKeyframe !: {[key: string]: string | number};
 
-  public readonly domPlayer: DOMAnimation;
+  // TODO(issue/24571): remove '!'.
+  public readonly domPlayer !: DOMAnimation;
   public time = 0;
 
   public parentPlayer: AnimationPlayer|null = null;
diff --git a/packages/benchpress/src/firefox_extension/lib/main.ts b/packages/benchpress/src/firefox_extension/lib/main.ts
index e66d549264..348014637c 100644
--- a/packages/benchpress/src/firefox_extension/lib/main.ts
+++ b/packages/benchpress/src/firefox_extension/lib/main.ts
@@ -12,8 +12,10 @@ const ParserUtil = require('./parser_util');
 
 class Profiler {
   private _profiler: any;
-  private _markerEvents: any[];
-  private _profilerStartTime: number;
+  // TODO(issue/24571): remove '!'.
+  private _markerEvents !: any[];
+  // TODO(issue/24571): remove '!'.
+  private _profilerStartTime !: number;
 
   constructor() { this._profiler = Cc['@mozilla.org/tools/profiler;1'].getService(Ci.nsIProfiler); }
 
diff --git a/packages/common/http/src/headers.ts b/packages/common/http/src/headers.ts
index d6c5203510..a4c39e4f21 100755
--- a/packages/common/http/src/headers.ts
+++ b/packages/common/http/src/headers.ts
@@ -20,7 +20,8 @@ export class HttpHeaders {
   /**
    * Internal map of lowercase header names to values.
    */
-  private headers: Map<string, string[]>;
+  // TODO(issue/24571): remove '!'.
+  private headers !: Map<string, string[]>;
 
 
   /**
@@ -32,7 +33,8 @@ export class HttpHeaders {
   /**
    * Complete the lazy initialization of this object (needed before reading).
    */
-  private lazyInit: HttpHeaders|Function|null;
+  // TODO(issue/24571): remove '!'.
+  private lazyInit !: HttpHeaders | Function | null;
 
   /**
    * Queued updates to be materialized the next initialization.
diff --git a/packages/common/http/src/request.ts b/packages/common/http/src/request.ts
index 6b920ed7d9..30413cb8da 100644
--- a/packages/common/http/src/request.ts
+++ b/packages/common/http/src/request.ts
@@ -88,7 +88,8 @@ export class HttpRequest<T> {
   /**
    * Outgoing headers for this request.
    */
-  readonly headers: HttpHeaders;
+  // TODO(issue/24571): remove '!'.
+  readonly headers !: HttpHeaders;
 
   /**
    * Whether this request should be made in a way that exposes progress events.
@@ -119,7 +120,8 @@ export class HttpRequest<T> {
   /**
    * Outgoing URL parameters.
    */
-  readonly params: HttpParams;
+  // TODO(issue/24571): remove '!'.
+  readonly params !: HttpParams;
 
   /**
    * The outgoing URL with all URL parameters set.
diff --git a/packages/common/http/src/response.ts b/packages/common/http/src/response.ts
index bb6d292f3b..9a72499030 100644
--- a/packages/common/http/src/response.ts
+++ b/packages/common/http/src/response.ts
@@ -171,7 +171,8 @@ export abstract class HttpResponseBase {
   /**
    * Type of the response, narrowed to either the full response or the header.
    */
-  readonly type: HttpEventType.Response|HttpEventType.ResponseHeader;
+  // TODO(issue/24571): remove '!'.
+  readonly type !: HttpEventType.Response | HttpEventType.ResponseHeader;
 
   /**
    * Super-constructor for all responses.
diff --git a/packages/common/http/test/jsonp_mock.ts b/packages/common/http/test/jsonp_mock.ts
index 2e7d58c0c0..7b2345d7c3 100644
--- a/packages/common/http/test/jsonp_mock.ts
+++ b/packages/common/http/test/jsonp_mock.ts
@@ -22,7 +22,8 @@ export class MockScriptElement {
 }
 
 export class MockDocument {
-  mock: MockScriptElement|null;
+  // TODO(issue/24571): remove '!'.
+  mock !: MockScriptElement | null;
   readonly body: any = this;
 
   createElement(tag: 'script'): HTMLScriptElement {
diff --git a/packages/common/http/test/xhr_mock.ts b/packages/common/http/test/xhr_mock.ts
index eceb729ebf..419d4af7e7 100644
--- a/packages/common/http/test/xhr_mock.ts
+++ b/packages/common/http/test/xhr_mock.ts
@@ -10,7 +10,8 @@ import {HttpHeaders} from '../src/headers';
 import {XhrFactory} from '../src/xhr';
 
 export class MockXhrFactory implements XhrFactory {
-  mock: MockXMLHttpRequest;
+  // TODO(issue/24571): remove '!'.
+  mock !: MockXMLHttpRequest;
 
   build(): XMLHttpRequest { return (this.mock = new MockXMLHttpRequest()) as any; }
 }
@@ -30,8 +31,10 @@ export class MockXMLHttpRequestUpload {
 export class MockXMLHttpRequest {
   // Set by method calls.
   body: any;
-  method: string;
-  url: string;
+  // TODO(issue/24571): remove '!'.
+  method !: string;
+  // TODO(issue/24571): remove '!'.
+  url !: string;
   mockHeaders: {[key: string]: string} = {};
   mockAborted: boolean = false;
 
diff --git a/packages/common/src/directives/ng_class.ts b/packages/common/src/directives/ng_class.ts
index ef832535ab..a8260a7f5d 100644
--- a/packages/common/src/directives/ng_class.ts
+++ b/packages/common/src/directives/ng_class.ts
@@ -38,10 +38,13 @@ import {Directive, DoCheck, ElementRef, Input, IterableChanges, IterableDiffer,
  */
 @Directive({selector: '[ngClass]'})
 export class NgClass implements DoCheck {
-  private _iterableDiffer: IterableDiffer<string>|null;
-  private _keyValueDiffer: KeyValueDiffer<string, any>|null;
+  // TODO(issue/24571): remove '!'.
+  private _iterableDiffer !: IterableDiffer<string>| null;
+  // TODO(issue/24571): remove '!'.
+  private _keyValueDiffer !: KeyValueDiffer<string, any>| null;
   private _initialClasses: string[] = [];
-  private _rawClass: string[]|Set<string>|{[klass: string]: any};
+  // TODO(issue/24571): remove '!'.
+  private _rawClass !: string[] | Set<string>| {[klass: string]: any};
 
   constructor(
       private _iterableDiffers: IterableDiffers, private _keyValueDiffers: KeyValueDiffers,
diff --git a/packages/common/src/directives/ng_component_outlet.ts b/packages/common/src/directives/ng_component_outlet.ts
index 3c018a7803..8048cafc95 100644
--- a/packages/common/src/directives/ng_component_outlet.ts
+++ b/packages/common/src/directives/ng_component_outlet.ts
@@ -66,10 +66,14 @@ import {ComponentFactoryResolver, ComponentRef, Directive, Injector, Input, NgMo
  */
 @Directive({selector: '[ngComponentOutlet]'})
 export class NgComponentOutlet implements OnChanges, OnDestroy {
-  @Input() ngComponentOutlet: Type<any>;
-  @Input() ngComponentOutletInjector: Injector;
-  @Input() ngComponentOutletContent: any[][];
-  @Input() ngComponentOutletNgModuleFactory: NgModuleFactory<any>;
+  // TODO(issue/24571): remove '!'.
+  @Input() ngComponentOutlet !: Type<any>;
+  // TODO(issue/24571): remove '!'.
+  @Input() ngComponentOutletInjector !: Injector;
+  // TODO(issue/24571): remove '!'.
+  @Input() ngComponentOutletContent !: any[][];
+  // TODO(issue/24571): remove '!'.
+  @Input() ngComponentOutletNgModuleFactory !: NgModuleFactory<any>;
 
   private _componentRef: ComponentRef<any>|null = null;
   private _moduleRef: NgModuleRef<any>|null = null;
diff --git a/packages/common/src/directives/ng_for_of.ts b/packages/common/src/directives/ng_for_of.ts
index 93288dc9f4..a3ca619cbd 100644
--- a/packages/common/src/directives/ng_for_of.ts
+++ b/packages/common/src/directives/ng_for_of.ts
@@ -114,10 +114,12 @@ export class NgForOf<T> implements DoCheck {
 
   get ngForTrackBy(): TrackByFunction<T> { return this._trackByFn; }
 
-  private _ngForOf: NgIterable<T>;
+  // TODO(issue/24571): remove '!'.
+  private _ngForOf !: NgIterable<T>;
   private _ngForOfDirty: boolean = true;
   private _differ: IterableDiffer<T>|null = null;
-  private _trackByFn: TrackByFunction<T>;
+  // TODO(issue/24571): remove '!'.
+  private _trackByFn !: TrackByFunction<T>;
 
   constructor(
       private _viewContainer: ViewContainerRef, private _template: TemplateRef<NgForOfContext<T>>,
diff --git a/packages/common/src/directives/ng_plural.ts b/packages/common/src/directives/ng_plural.ts
index cdf13c8374..eb489a8228 100644
--- a/packages/common/src/directives/ng_plural.ts
+++ b/packages/common/src/directives/ng_plural.ts
@@ -46,8 +46,10 @@ import {SwitchView} from './ng_switch';
  */
 @Directive({selector: '[ngPlural]'})
 export class NgPlural {
-  private _switchValue: number;
-  private _activeView: SwitchView;
+  // TODO(issue/24571): remove '!'.
+  private _switchValue !: number;
+  // TODO(issue/24571): remove '!'.
+  private _activeView !: SwitchView;
   private _caseViews: {[k: string]: SwitchView} = {};
 
   constructor(private _localization: NgLocalization) {}
diff --git a/packages/common/src/directives/ng_style.ts b/packages/common/src/directives/ng_style.ts
index 79e84548e9..9062f05b0f 100644
--- a/packages/common/src/directives/ng_style.ts
+++ b/packages/common/src/directives/ng_style.ts
@@ -32,8 +32,10 @@ import {Directive, DoCheck, ElementRef, Input, KeyValueChanges, KeyValueDiffer,
  */
 @Directive({selector: '[ngStyle]'})
 export class NgStyle implements DoCheck {
-  private _ngStyle: {[key: string]: string};
-  private _differ: KeyValueDiffer<string, string|number>;
+  // TODO(issue/24571): remove '!'.
+  private _ngStyle !: {[key: string]: string};
+  // TODO(issue/24571): remove '!'.
+  private _differ !: KeyValueDiffer<string, string|number>;
 
   constructor(
       private _differs: KeyValueDiffers, private _ngEl: ElementRef, private _renderer: Renderer2) {}
diff --git a/packages/common/src/directives/ng_switch.ts b/packages/common/src/directives/ng_switch.ts
index cece18504d..3f3ca39180 100644
--- a/packages/common/src/directives/ng_switch.ts
+++ b/packages/common/src/directives/ng_switch.ts
@@ -75,7 +75,8 @@ export class SwitchView {
  */
 @Directive({selector: '[ngSwitch]'})
 export class NgSwitch {
-  private _defaultViews: SwitchView[];
+  // TODO(issue/24571): remove '!'.
+  private _defaultViews !: SwitchView[];
   private _defaultUsed = false;
   private _caseCount = 0;
   private _lastCaseCheckIndex = 0;
diff --git a/packages/common/src/directives/ng_template_outlet.ts b/packages/common/src/directives/ng_template_outlet.ts
index 8cc2cd6dfb..d2feb77534 100644
--- a/packages/common/src/directives/ng_template_outlet.ts
+++ b/packages/common/src/directives/ng_template_outlet.ts
@@ -34,11 +34,14 @@ import {Directive, EmbeddedViewRef, Input, OnChanges, SimpleChange, SimpleChange
  */
 @Directive({selector: '[ngTemplateOutlet]'})
 export class NgTemplateOutlet implements OnChanges {
-  private _viewRef: EmbeddedViewRef<any>;
+  // TODO(issue/24571): remove '!'.
+  private _viewRef !: EmbeddedViewRef<any>;
 
-  @Input() public ngTemplateOutletContext: Object;
+  // TODO(issue/24571): remove '!'.
+  @Input() public ngTemplateOutletContext !: Object;
 
-  @Input() public ngTemplateOutlet: TemplateRef<any>;
+  // TODO(issue/24571): remove '!'.
+  @Input() public ngTemplateOutlet !: TemplateRef<any>;
 
   constructor(private _viewContainerRef: ViewContainerRef) {}
 
diff --git a/packages/common/src/pipes/keyvalue_pipe.ts b/packages/common/src/pipes/keyvalue_pipe.ts
index 0c58273af7..ec78bfc941 100644
--- a/packages/common/src/pipes/keyvalue_pipe.ts
+++ b/packages/common/src/pipes/keyvalue_pipe.ts
@@ -42,8 +42,10 @@ export interface KeyValue<K, V> {
 export class KeyValuePipe implements PipeTransform {
   constructor(private readonly differs: KeyValueDiffers) {}
 
-  private differ: KeyValueDiffer<any, any>;
-  private keyValues: Array<KeyValue<any, any>>;
+  // TODO(issue/24571): remove '!'.
+  private differ !: KeyValueDiffer<any, any>;
+  // TODO(issue/24571): remove '!'.
+  private keyValues !: Array<KeyValue<any, any>>;
 
   transform<K, V>(input: null, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): null;
   transform<V>(
diff --git a/packages/common/test/directives/ng_class_spec.ts b/packages/common/test/directives/ng_class_spec.ts
index e0efe7900b..36706aa884 100644
--- a/packages/common/test/directives/ng_class_spec.ts
+++ b/packages/common/test/directives/ng_class_spec.ts
@@ -358,7 +358,8 @@ import {ComponentFixture, TestBed, async} from '@angular/core/testing';
 @Component({selector: 'test-cmp', template: ''})
 class TestComponent {
   condition: boolean = true;
-  items: any[];
+  // TODO(issue/24571): remove '!'.
+  items !: any[];
   arrExpr: string[] = ['foo'];
   setExpr: Set<string> = new Set<string>();
   objExpr: {[klass: string]: any}|null = {'foo': true, 'bar': false};
diff --git a/packages/common/test/directives/ng_component_outlet_spec.ts b/packages/common/test/directives/ng_component_outlet_spec.ts
index b920952a99..9a8acd16ce 100644
--- a/packages/common/test/directives/ng_component_outlet_spec.ts
+++ b/packages/common/test/directives/ng_component_outlet_spec.ts
@@ -224,16 +224,22 @@ const TEST_CMP_TEMPLATE =
     `<ng-template *ngComponentOutlet="currentComponent; injector: injector; content: projectables; ngModuleFactory: module;"></ng-template>`;
 @Component({selector: 'test-cmp', template: TEST_CMP_TEMPLATE})
 class TestComponent {
-  currentComponent: Type<any>|null;
-  injector: Injector;
-  projectables: any[][];
-  module: NgModuleFactory<any>;
+  // TODO(issue/24571): remove '!'.
+  currentComponent !: Type<any>| null;
+  // TODO(issue/24571): remove '!'.
+  injector !: Injector;
+  // TODO(issue/24571): remove '!'.
+  projectables !: any[][];
+  // TODO(issue/24571): remove '!'.
+  module !: NgModuleFactory<any>;
 
   get cmpRef(): ComponentRef<any>|null { return this.ngComponentOutlet['_componentRef']; }
   set cmpRef(value: ComponentRef<any>|null) { this.ngComponentOutlet['_componentRef'] = value; }
 
-  @ViewChildren(TemplateRef) tplRefs: QueryList<TemplateRef<any>>;
-  @ViewChild(NgComponentOutlet) ngComponentOutlet: NgComponentOutlet;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TemplateRef) tplRefs !: QueryList<TemplateRef<any>>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild(NgComponentOutlet) ngComponentOutlet !: NgComponentOutlet;
 
   constructor(public vcRef: ViewContainerRef) {}
 }
diff --git a/packages/common/test/directives/ng_template_outlet_spec.ts b/packages/common/test/directives/ng_template_outlet_spec.ts
index a9bcca57e2..99dae02116 100644
--- a/packages/common/test/directives/ng_template_outlet_spec.ts
+++ b/packages/common/test/directives/ng_template_outlet_spec.ts
@@ -224,12 +224,14 @@ class DestroyableCmpt implements OnDestroy {
 
 @Directive({selector: 'tpl-refs', exportAs: 'tplRefs'})
 class CaptureTplRefs {
-  @ContentChildren(TemplateRef) tplRefs: QueryList<TemplateRef<any>>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TemplateRef) tplRefs !: QueryList<TemplateRef<any>>;
 }
 
 @Component({selector: 'test-cmp', template: ''})
 class TestComponent {
-  currentTplRef: TemplateRef<any>;
+  // TODO(issue/24571): remove '!'.
+  currentTplRef !: TemplateRef<any>;
   context: any = {foo: 'bar'};
   value = 'bar';
 }
diff --git a/packages/compiler-cli/integrationtest/tsconfig-build.json b/packages/compiler-cli/integrationtest/tsconfig-build.json
index 8badeac4d1..511a721e2f 100644
--- a/packages/compiler-cli/integrationtest/tsconfig-build.json
+++ b/packages/compiler-cli/integrationtest/tsconfig-build.json
@@ -14,6 +14,7 @@
     "experimentalDecorators": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "skipLibCheck": true,
     "moduleResolution": "node",
     "rootDir": "",
diff --git a/packages/compiler-cli/integrationtest/tsconfig-ngc-build.json b/packages/compiler-cli/integrationtest/tsconfig-ngc-build.json
index b3f0e8d88a..5c880dc22d 100644
--- a/packages/compiler-cli/integrationtest/tsconfig-ngc-build.json
+++ b/packages/compiler-cli/integrationtest/tsconfig-ngc-build.json
@@ -13,6 +13,7 @@
     "experimentalDecorators": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "skipLibCheck": true,
     "moduleResolution": "node",
     "rootDir": "",
diff --git a/packages/compiler-cli/src/diagnostics/expression_diagnostics.ts b/packages/compiler-cli/src/diagnostics/expression_diagnostics.ts
index 6639332936..3b858c2468 100644
--- a/packages/compiler-cli/src/diagnostics/expression_diagnostics.ts
+++ b/packages/compiler-cli/src/diagnostics/expression_diagnostics.ts
@@ -185,7 +185,8 @@ export function getExpressionScope(
 
 class ExpressionDiagnosticsVisitor extends RecursiveTemplateAstVisitor {
   private path: TemplateAstPath;
-  private directiveSummary: CompileDirectiveSummary;
+  // TODO(issue/24571): remove '!'.
+  private directiveSummary !: CompileDirectiveSummary;
 
   diagnostics: ExpressionDiagnostic[] = [];
 
diff --git a/packages/compiler-cli/src/diagnostics/expression_type.ts b/packages/compiler-cli/src/diagnostics/expression_type.ts
index 9ee89e1bba..85a7ce93ed 100644
--- a/packages/compiler-cli/src/diagnostics/expression_type.ts
+++ b/packages/compiler-cli/src/diagnostics/expression_type.ts
@@ -23,7 +23,8 @@ export class TypeDiagnostic {
 
 // AstType calculatetype of the ast given AST element.
 export class AstType implements AstVisitor {
-  public diagnostics: TypeDiagnostic[];
+  // TODO(issue/24571): remove '!'.
+  public diagnostics !: TypeDiagnostic[];
 
   constructor(
       private scope: SymbolTable, private query: SymbolQuery,
@@ -334,7 +335,8 @@ export class AstType implements AstVisitor {
     return this.resolvePropertyRead(this.query.getNonNullableType(this.getType(ast.receiver)), ast);
   }
 
-  private _anyType: Symbol;
+  // TODO(issue/24571): remove '!'.
+  private _anyType !: Symbol;
   private get anyType(): Symbol {
     let result = this._anyType;
     if (!result) {
@@ -343,7 +345,8 @@ export class AstType implements AstVisitor {
     return result;
   }
 
-  private _undefinedType: Symbol;
+  // TODO(issue/24571): remove '!'.
+  private _undefinedType !: Symbol;
   private get undefinedType(): Symbol {
     let result = this._undefinedType;
     if (!result) {
diff --git a/packages/compiler-cli/src/diagnostics/typescript_symbols.ts b/packages/compiler-cli/src/diagnostics/typescript_symbols.ts
index da44565c41..b55e96faf2 100644
--- a/packages/compiler-cli/src/diagnostics/typescript_symbols.ts
+++ b/packages/compiler-cli/src/diagnostics/typescript_symbols.ts
@@ -84,7 +84,8 @@ export function getPipesTable(
 
 class TypeScriptSymbolQuery implements SymbolQuery {
   private typeCache = new Map<BuiltinType, Symbol>();
-  private pipesCache: SymbolTable;
+  // TODO(issue/24571): remove '!'.
+  private pipesCache !: SymbolTable;
 
   constructor(
       private program: ts.Program, private checker: ts.TypeChecker, private source: ts.SourceFile,
@@ -283,8 +284,10 @@ class TypeWrapper implements Symbol {
 
 class SymbolWrapper implements Symbol {
   private symbol: ts.Symbol;
-  private _tsType: ts.Type;
-  private _members: SymbolTable;
+  // TODO(issue/24571): remove '!'.
+  private _tsType !: ts.Type;
+  // TODO(issue/24571): remove '!'.
+  private _members !: SymbolTable;
 
   public readonly nullable: boolean = false;
   public readonly language: string = 'typescript';
@@ -529,7 +532,8 @@ class PipesTable implements SymbolTable {
 const INDEX_PATTERN = /[\\/]([^\\/]+)[\\/]\1\.d\.ts$/;
 
 class PipeSymbol implements Symbol {
-  private _tsType: ts.Type;
+  // TODO(issue/24571): remove '!'.
+  private _tsType !: ts.Type;
   public readonly kind: DeclarationKind = 'pipe';
   public readonly language: string = 'typescript';
   public readonly container: Symbol|undefined = undefined;
diff --git a/packages/compiler-cli/src/metadata/bundler.ts b/packages/compiler-cli/src/metadata/bundler.ts
index 664f88d0d1..e039167120 100644
--- a/packages/compiler-cli/src/metadata/bundler.ts
+++ b/packages/compiler-cli/src/metadata/bundler.ts
@@ -85,7 +85,8 @@ export class MetadataBundler {
   private exports = new Map<string, Symbol[]>();
   private rootModule: string;
   private privateSymbolPrefix: string;
-  private exported: Set<Symbol>;
+  // TODO(issue/24571): remove '!'.
+  private exported !: Set<Symbol>;
 
   constructor(
       private root: string, private importAs: string|undefined, private host: MetadataBundlerHost,
diff --git a/packages/compiler-cli/src/metadata/symbols.ts b/packages/compiler-cli/src/metadata/symbols.ts
index 1401709390..afd7aff827 100644
--- a/packages/compiler-cli/src/metadata/symbols.ts
+++ b/packages/compiler-cli/src/metadata/symbols.ts
@@ -11,7 +11,8 @@ import * as ts from 'typescript';
 import {MetadataSymbolicReferenceExpression, MetadataValue} from './schema';
 
 export class Symbols {
-  private _symbols: Map<string, MetadataValue>;
+  // TODO(issue/24571): remove '!'.
+  private _symbols !: Map<string, MetadataValue>;
   private references = new Map<string, MetadataSymbolicReferenceExpression>();
 
   constructor(private sourceFile: ts.SourceFile) {}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index f97e509cfb..e84c84b52e 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -88,7 +88,8 @@ export abstract class Reference {
   /**
    * Whether an `Expression` can be generated which references the node.
    */
-  readonly expressable: boolean;
+  // TODO(issue/24571): remove '!'.
+  readonly expressable !: boolean;
 
   /**
    * Generate an `Expression` representing this type, in the context of the given SourceFile.
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index 3500683998..bebda19a99 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -120,7 +120,7 @@ export class IvyCompilation {
 
     // Look up the .d.ts transformer for the input file and record that a field was generated,
     // which will allow the .d.ts to be transformed later.
-    const fileName = node.getSourceFile().fileName;
+    const fileName = original.getSourceFile().fileName;
     const dtsTransformer = this.getDtsTransformer(fileName);
     dtsTransformer.recordStaticField(reflectNameOfDeclaration(node) !, res);
 
diff --git a/packages/compiler-cli/src/transformers/compiler_host.ts b/packages/compiler-cli/src/transformers/compiler_host.ts
index 344b21eeb3..683d4a05c3 100644
--- a/packages/compiler-cli/src/transformers/compiler_host.ts
+++ b/packages/compiler-cli/src/transformers/compiler_host.ts
@@ -74,10 +74,14 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
   private emitter = new TypeScriptEmitter();
   private metadataReaderHost: MetadataReaderHost;
 
-  getCancellationToken: () => ts.CancellationToken;
-  getDefaultLibLocation: () => string;
-  trace: (s: string) => void;
-  getDirectories: (path: string) => string[];
+  // TODO(issue/24571): remove '!'.
+  getCancellationToken !: () => ts.CancellationToken;
+  // TODO(issue/24571): remove '!'.
+  getDefaultLibLocation !: () => string;
+  // TODO(issue/24571): remove '!'.
+  trace !: (s: string) => void;
+  // TODO(issue/24571): remove '!'.
+  getDirectories !: (path: string) => string[];
   directoryExists?: (directoryName: string) => boolean;
 
   constructor(
diff --git a/packages/compiler-cli/src/transformers/lower_expressions.ts b/packages/compiler-cli/src/transformers/lower_expressions.ts
index dbdf027d51..6f346b7547 100644
--- a/packages/compiler-cli/src/transformers/lower_expressions.ts
+++ b/packages/compiler-cli/src/transformers/lower_expressions.ts
@@ -252,7 +252,8 @@ function isLiteralFieldNamed(node: ts.Node, names: Set<string>): boolean {
 }
 
 export class LowerMetadataTransform implements RequestsMap, MetadataTransformer {
-  private cache: MetadataCache;
+  // TODO(issue/24571): remove '!'.
+  private cache !: MetadataCache;
   private requests = new Map<string, RequestLocationMap>();
   private lowerableFieldNames: Set<string>;
 
diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts
index 5b9f4c67fc..a21fb7bf3d 100644
--- a/packages/compiler-cli/src/transformers/program.ts
+++ b/packages/compiler-cli/src/transformers/program.ts
@@ -115,7 +115,8 @@ class AngularCompilerProgram implements Program {
   private rootNames: string[];
   private metadataCache: MetadataCache;
   // Metadata cache used exclusively for the flat module index
-  private flatModuleMetadataCache: MetadataCache;
+  // TODO(issue/24571): remove '!'.
+  private flatModuleMetadataCache !: MetadataCache;
   private loweringMetadataTransform: LowerMetadataTransform;
   private oldProgramLibrarySummaries: Map<string, LibrarySummary>|undefined;
   private oldProgramEmittedGeneratedFiles: Map<string, GeneratedFile>|undefined;
@@ -127,15 +128,19 @@ class AngularCompilerProgram implements Program {
   private emittedSourceFiles: ts.SourceFile[]|undefined;
 
   // Lazily initialized fields
-  private _compiler: AotCompiler;
-  private _hostAdapter: TsCompilerAotCompilerTypeCheckHostAdapter;
-  private _tsProgram: ts.Program;
+  // TODO(issue/24571): remove '!'.
+  private _compiler !: AotCompiler;
+  // TODO(issue/24571): remove '!'.
+  private _hostAdapter !: TsCompilerAotCompilerTypeCheckHostAdapter;
+  // TODO(issue/24571): remove '!'.
+  private _tsProgram !: ts.Program;
   private _analyzedModules: NgAnalyzedModules|undefined;
   private _analyzedInjectables: NgAnalyzedFileWithInjectables[]|undefined;
   private _structuralDiagnostics: Diagnostic[]|undefined;
   private _programWithStubs: ts.Program|undefined;
   private _optionsDiagnostics: Diagnostic[] = [];
-  private _reifiedDecorators: Set<StaticSymbol>;
+  // TODO(issue/24571): remove '!'.
+  private _reifiedDecorators !: Set<StaticSymbol>;
 
   constructor(
       rootNames: ReadonlyArray<string>, private options: CompilerOptions,
diff --git a/packages/compiler-cli/test/diagnostics/mocks.ts b/packages/compiler-cli/test/diagnostics/mocks.ts
index 98fd240dad..aa3fefbcc4 100644
--- a/packages/compiler-cli/test/diagnostics/mocks.ts
+++ b/packages/compiler-cli/test/diagnostics/mocks.ts
@@ -117,12 +117,14 @@ const summaryResolver = new AotSummaryResolver(
 
 export class DiagnosticContext {
   // tslint:disable
-  _analyzedModules: NgAnalyzedModules;
+  // TODO(issue/24571): remove '!'.
+  _analyzedModules !: NgAnalyzedModules;
   _staticSymbolResolver: StaticSymbolResolver|undefined;
   _reflector: StaticReflector|undefined;
   _errors: {e: any, path?: string}[] = [];
   _resolver: CompileMetadataResolver|undefined;
-  _refletor: StaticReflector;
+  // TODO(issue/24571): remove '!'.
+  _refletor !: StaticReflector;
   // tslint:enable
 
   constructor(
diff --git a/packages/compiler-cli/test/metadata/typescript.mocks.ts b/packages/compiler-cli/test/metadata/typescript.mocks.ts
index 93f7438cc9..43521908d2 100644
--- a/packages/compiler-cli/test/metadata/typescript.mocks.ts
+++ b/packages/compiler-cli/test/metadata/typescript.mocks.ts
@@ -102,7 +102,8 @@ export class MockNode implements ts.Node {
 
 export class MockIdentifier extends MockNode implements ts.Identifier {
   public text: string;
-  public escapedText: ts.__String;
+  // TODO(issue/24571): remove '!'.
+  public escapedText !: ts.__String;
   // tslint:disable
   public _declarationBrand: any;
   public _primaryExpressionBrand: any;
@@ -139,7 +140,8 @@ export class MockVariableDeclaration extends MockNode implements ts.VariableDecl
 }
 
 export class MockSymbol implements ts.Symbol {
-  public escapedName: ts.__String;
+  // TODO(issue/24571): remove '!'.
+  public escapedName !: ts.__String;
   constructor(
       public name: string, private node: ts.Declaration = MockVariableDeclaration.of(name),
       public flags: ts.SymbolFlags = 0) {}
diff --git a/packages/compiler/src/aot/static_reflector.ts b/packages/compiler/src/aot/static_reflector.ts
index dafdeef709..3e67872937 100644
--- a/packages/compiler/src/aot/static_reflector.ts
+++ b/packages/compiler/src/aot/static_reflector.ts
@@ -49,10 +49,14 @@ export class StaticReflector implements CompileReflector {
   private staticCache = new Map<StaticSymbol, string[]>();
   private conversionMap = new Map<StaticSymbol, (context: StaticSymbol, args: any[]) => any>();
   private resolvedExternalReferences = new Map<string, StaticSymbol>();
-  private injectionToken: StaticSymbol;
-  private opaqueToken: StaticSymbol;
-  ROUTES: StaticSymbol;
-  private ANALYZE_FOR_ENTRY_COMPONENTS: StaticSymbol;
+  // TODO(issue/24571): remove '!'.
+  private injectionToken !: StaticSymbol;
+  // TODO(issue/24571): remove '!'.
+  private opaqueToken !: StaticSymbol;
+  // TODO(issue/24571): remove '!'.
+  ROUTES !: StaticSymbol;
+  // TODO(issue/24571): remove '!'.
+  private ANALYZE_FOR_ENTRY_COMPONENTS !: StaticSymbol;
   private annotationForParentClassWithSummaryKind =
       new Map<CompileSummaryKind, MetadataFactory<any>[]>();
 
diff --git a/packages/compiler/src/aot/summary_serializer.ts b/packages/compiler/src/aot/summary_serializer.ts
index 47d63cb6c5..1b6d44885d 100644
--- a/packages/compiler/src/aot/summary_serializer.ts
+++ b/packages/compiler/src/aot/summary_serializer.ts
@@ -421,7 +421,8 @@ class ForJitSerializer {
 }
 
 class FromJsonDeserializer extends ValueTransformer {
-  private symbols: StaticSymbol[];
+  // TODO(issue/24571): remove '!'.
+  private symbols !: StaticSymbol[];
 
   constructor(
       private symbolCache: StaticSymbolCache,
diff --git a/packages/compiler/src/compile_metadata.ts b/packages/compiler/src/compile_metadata.ts
index 6571596514..faf8737b4d 100644
--- a/packages/compiler/src/compile_metadata.ts
+++ b/packages/compiler/src/compile_metadata.ts
@@ -528,7 +528,8 @@ export interface CompileNgModuleSummary extends CompileTypeSummary {
 }
 
 export class CompileShallowModuleMetadata {
-  type: CompileTypeMetadata;
+  // TODO(issue/24571): remove '!'.
+  type !: CompileTypeMetadata;
 
   rawExports: any;
   rawImports: any;
diff --git a/packages/compiler/src/constant_pool.ts b/packages/compiler/src/constant_pool.ts
index 58a40a7eba..81feef39f0 100644
--- a/packages/compiler/src/constant_pool.ts
+++ b/packages/compiler/src/constant_pool.ts
@@ -40,7 +40,8 @@ const KEY_CONTEXT = {};
 class FixupExpression extends o.Expression {
   private original: o.Expression;
 
-  shared: boolean;
+  // TODO(issue/24571): remove '!'.
+  shared !: boolean;
 
   constructor(public resolved: o.Expression) {
     super(resolved.type);
diff --git a/packages/compiler/src/css_parser/css_lexer.ts b/packages/compiler/src/css_parser/css_lexer.ts
index 49d84da577..ea574dbf95 100644
--- a/packages/compiler/src/css_parser/css_lexer.ts
+++ b/packages/compiler/src/css_parser/css_lexer.ts
@@ -116,7 +116,8 @@ function _trackWhitespace(mode: CssLexerMode) {
 }
 
 export class CssScanner {
-  peek: number;
+  // TODO(issue/24571): remove '!'.
+  peek !: number;
   peekPeek: number;
   length: number = 0;
   index: number = -1;
diff --git a/packages/compiler/src/css_parser/css_parser.ts b/packages/compiler/src/css_parser/css_parser.ts
index cf283a6cea..2650e3deec 100644
--- a/packages/compiler/src/css_parser/css_parser.ts
+++ b/packages/compiler/src/css_parser/css_parser.ts
@@ -83,9 +83,12 @@ export class ParsedCssResult {
 
 export class CssParser {
   private _errors: CssParseError[] = [];
-  private _file: ParseSourceFile;
-  private _scanner: CssScanner;
-  private _lastToken: CssToken;
+  // TODO(issue/24571): remove '!'.
+  private _file !: ParseSourceFile;
+  // TODO(issue/24571): remove '!'.
+  private _scanner !: CssScanner;
+  // TODO(issue/24571): remove '!'.
+  private _lastToken !: CssToken;
 
   /**
    * @param css the CSS code that will be parsed
diff --git a/packages/compiler/src/i18n/extractor_merger.ts b/packages/compiler/src/i18n/extractor_merger.ts
index 2f29634a9b..4d37f489da 100644
--- a/packages/compiler/src/i18n/extractor_merger.ts
+++ b/packages/compiler/src/i18n/extractor_merger.ts
@@ -55,33 +55,46 @@ enum _VisitorMode {
  * @internal
  */
 class _Visitor implements html.Visitor {
-  private _depth: number;
+  // TODO(issue/24571): remove '!'.
+  private _depth !: number;
 
   // <el i18n>...</el>
-  private _inI18nNode: boolean;
-  private _inImplicitNode: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _inI18nNode !: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _inImplicitNode !: boolean;
 
   // <!--i18n-->...<!--/i18n-->
-  private _inI18nBlock: boolean;
-  private _blockMeaningAndDesc: string;
-  private _blockChildren: html.Node[];
-  private _blockStartDepth: number;
+  // TODO(issue/24571): remove '!'.
+  private _inI18nBlock !: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _blockMeaningAndDesc !: string;
+  // TODO(issue/24571): remove '!'.
+  private _blockChildren !: html.Node[];
+  // TODO(issue/24571): remove '!'.
+  private _blockStartDepth !: number;
 
   // {<icu message>}
-  private _inIcu: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _inIcu !: boolean;
 
   // set to void 0 when not in a section
   private _msgCountAtSectionStart: number|undefined;
-  private _errors: I18nError[];
-  private _mode: _VisitorMode;
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _mode !: _VisitorMode;
 
   // _VisitorMode.Extract only
-  private _messages: i18n.Message[];
+  // TODO(issue/24571): remove '!'.
+  private _messages !: i18n.Message[];
 
   // _VisitorMode.Merge only
-  private _translations: TranslationBundle;
-  private _createI18nMessage:
-      (msg: html.Node[], meaning: string, description: string, id: string) => i18n.Message;
+  // TODO(issue/24571): remove '!'.
+  private _translations !: TranslationBundle;
+  // TODO(issue/24571): remove '!'.
+  private _createI18nMessage !: (
+      msg: html.Node[], meaning: string, description: string, id: string) => i18n.Message;
 
 
   constructor(private _implicitTags: string[], private _implicitAttrs: {[k: string]: string[]}) {}
diff --git a/packages/compiler/src/i18n/i18n_ast.ts b/packages/compiler/src/i18n/i18n_ast.ts
index 931a5e4675..fd2fd93034 100644
--- a/packages/compiler/src/i18n/i18n_ast.ts
+++ b/packages/compiler/src/i18n/i18n_ast.ts
@@ -65,7 +65,8 @@ export class Container implements Node {
 }
 
 export class Icu implements Node {
-  public expressionPlaceholder: string;
+  // TODO(issue/24571): remove '!'.
+  public expressionPlaceholder !: string;
   constructor(
       public expression: string, public type: string, public cases: {[k: string]: Node},
       public sourceSpan: ParseSourceSpan) {}
diff --git a/packages/compiler/src/i18n/i18n_parser.ts b/packages/compiler/src/i18n/i18n_parser.ts
index 708a8e8c00..815d58c2ff 100644
--- a/packages/compiler/src/i18n/i18n_parser.ts
+++ b/packages/compiler/src/i18n/i18n_parser.ts
@@ -30,11 +30,16 @@ export function createI18nMessageFactory(interpolationConfig: InterpolationConfi
 }
 
 class _I18nVisitor implements html.Visitor {
-  private _isIcu: boolean;
-  private _icuDepth: number;
-  private _placeholderRegistry: PlaceholderRegistry;
-  private _placeholderToContent: {[phName: string]: string};
-  private _placeholderToMessage: {[phName: string]: i18n.Message};
+  // TODO(issue/24571): remove '!'.
+  private _isIcu !: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _icuDepth !: number;
+  // TODO(issue/24571): remove '!'.
+  private _placeholderRegistry !: PlaceholderRegistry;
+  // TODO(issue/24571): remove '!'.
+  private _placeholderToContent !: {[phName: string]: string};
+  // TODO(issue/24571): remove '!'.
+  private _placeholderToMessage !: {[phName: string]: i18n.Message};
 
   constructor(
       private _expressionParser: ExpressionParser,
diff --git a/packages/compiler/src/i18n/serializers/xliff.ts b/packages/compiler/src/i18n/serializers/xliff.ts
index fb64794daa..e1efddd9d5 100644
--- a/packages/compiler/src/i18n/serializers/xliff.ts
+++ b/packages/compiler/src/i18n/serializers/xliff.ts
@@ -173,9 +173,12 @@ class _WriteVisitor implements i18n.Visitor {
 // TODO(vicb): add error management (structure)
 // Extract messages as xml nodes from the xliff file
 class XliffParser implements ml.Visitor {
-  private _unitMlString: string|null;
-  private _errors: I18nError[];
-  private _msgIdToHtml: {[msgId: string]: string};
+  // TODO(issue/24571): remove '!'.
+  private _unitMlString !: string | null;
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _msgIdToHtml !: {[msgId: string]: string};
   private _locale: string|null = null;
 
   parse(xliff: string, url: string) {
@@ -261,7 +264,8 @@ class XliffParser implements ml.Visitor {
 
 // Convert ml nodes (xliff syntax) to i18n nodes
 class XmlToI18n implements ml.Visitor {
-  private _errors: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
 
   convert(message: string, url: string) {
     const xmlIcu = new XmlParser().parse(message, url, true);
diff --git a/packages/compiler/src/i18n/serializers/xliff2.ts b/packages/compiler/src/i18n/serializers/xliff2.ts
index eac6612f5d..f43382349f 100644
--- a/packages/compiler/src/i18n/serializers/xliff2.ts
+++ b/packages/compiler/src/i18n/serializers/xliff2.ts
@@ -112,7 +112,8 @@ export class Xliff2 extends Serializer {
 }
 
 class _WriteVisitor implements i18n.Visitor {
-  private _nextPlaceholderId: number;
+  // TODO(issue/24571): remove '!'.
+  private _nextPlaceholderId !: number;
 
   visitText(text: i18n.Text, context?: any): xml.Node[] { return [new xml.Text(text.value)]; }
 
@@ -190,9 +191,12 @@ class _WriteVisitor implements i18n.Visitor {
 
 // Extract messages as xml nodes from the xliff file
 class Xliff2Parser implements ml.Visitor {
-  private _unitMlString: string|null;
-  private _errors: I18nError[];
-  private _msgIdToHtml: {[msgId: string]: string};
+  // TODO(issue/24571): remove '!'.
+  private _unitMlString !: string | null;
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _msgIdToHtml !: {[msgId: string]: string};
   private _locale: string|null = null;
 
   parse(xliff: string, url: string) {
@@ -285,7 +289,8 @@ class Xliff2Parser implements ml.Visitor {
 
 // Convert ml nodes (xliff syntax) to i18n nodes
 class XmlToI18n implements ml.Visitor {
-  private _errors: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
 
   convert(message: string, url: string) {
     const xmlIcu = new XmlParser().parse(message, url, true);
diff --git a/packages/compiler/src/i18n/serializers/xtb.ts b/packages/compiler/src/i18n/serializers/xtb.ts
index c0259d6b94..c544bc9d70 100644
--- a/packages/compiler/src/i18n/serializers/xtb.ts
+++ b/packages/compiler/src/i18n/serializers/xtb.ts
@@ -74,9 +74,12 @@ function createLazyProperty(messages: any, id: string, valueFn: () => any) {
 
 // Extract messages as xml nodes from the xtb file
 class XtbParser implements ml.Visitor {
-  private _bundleDepth: number;
-  private _errors: I18nError[];
-  private _msgIdToHtml: {[msgId: string]: string};
+  // TODO(issue/24571): remove '!'.
+  private _bundleDepth !: number;
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _msgIdToHtml !: {[msgId: string]: string};
   private _locale: string|null = null;
 
   parse(xtb: string, url: string) {
@@ -152,7 +155,8 @@ class XtbParser implements ml.Visitor {
 
 // Convert ml nodes (xtb syntax) to i18n nodes
 class XmlToI18n implements ml.Visitor {
-  private _errors: I18nError[];
+  // TODO(issue/24571): remove '!'.
+  private _errors !: I18nError[];
 
   convert(message: string, url: string) {
     const xmlIcu = new XmlParser().parse(message, url, true);
diff --git a/packages/compiler/src/i18n/translation_bundle.ts b/packages/compiler/src/i18n/translation_bundle.ts
index 242ff966d8..cb6fb4f01c 100644
--- a/packages/compiler/src/i18n/translation_bundle.ts
+++ b/packages/compiler/src/i18n/translation_bundle.ts
@@ -60,10 +60,12 @@ export class TranslationBundle {
 }
 
 class I18nToHtmlVisitor implements i18n.Visitor {
-  private _srcMsg: i18n.Message;
+  // TODO(issue/24571): remove '!'.
+  private _srcMsg !: i18n.Message;
   private _contextStack: {msg: i18n.Message, mapper: (name: string) => string}[] = [];
   private _errors: I18nError[] = [];
-  private _mapper: (name: string) => string;
+  // TODO(issue/24571): remove '!'.
+  private _mapper !: (name: string) => string;
 
   constructor(
       private _i18nNodesByMsgId: {[msgId: string]: i18n.Node[]} = {}, private _locale: string|null,
diff --git a/packages/compiler/src/ml_parser/html_tags.ts b/packages/compiler/src/ml_parser/html_tags.ts
index 351265b642..9d3da64f4e 100644
--- a/packages/compiler/src/ml_parser/html_tags.ts
+++ b/packages/compiler/src/ml_parser/html_tags.ts
@@ -12,8 +12,10 @@ export class HtmlTagDefinition implements TagDefinition {
   private closedByChildren: {[key: string]: boolean} = {};
 
   closedByParent: boolean = false;
-  requiredParents: {[key: string]: boolean};
-  parentToAdd: string;
+  // TODO(issue/24571): remove '!'.
+  requiredParents !: {[key: string]: boolean};
+  // TODO(issue/24571): remove '!'.
+  parentToAdd !: string;
   implicitNamespacePrefix: string|null;
   contentType: TagContentType;
   isVoid: boolean;
diff --git a/packages/compiler/src/ml_parser/lexer.ts b/packages/compiler/src/ml_parser/lexer.ts
index 28adb6e27f..22fd6fc994 100644
--- a/packages/compiler/src/ml_parser/lexer.ts
+++ b/packages/compiler/src/ml_parser/lexer.ts
@@ -84,8 +84,10 @@ class _Tokenizer {
   private _index: number = -1;
   private _line: number = 0;
   private _column: number = -1;
-  private _currentTokenStart: ParseLocation;
-  private _currentTokenType: TokenType;
+  // TODO(issue/24571): remove '!'.
+  private _currentTokenStart !: ParseLocation;
+  // TODO(issue/24571): remove '!'.
+  private _currentTokenType !: TokenType;
   private _expansionCaseStack: TokenType[] = [];
   private _inInterpolation: boolean = false;
 
diff --git a/packages/compiler/src/ml_parser/parser.ts b/packages/compiler/src/ml_parser/parser.ts
index ab6a7c29f7..3a06bc182d 100644
--- a/packages/compiler/src/ml_parser/parser.ts
+++ b/packages/compiler/src/ml_parser/parser.ts
@@ -46,7 +46,8 @@ export class Parser {
 
 class _TreeBuilder {
   private _index: number = -1;
-  private _peek: lex.Token;
+  // TODO(issue/24571): remove '!'.
+  private _peek !: lex.Token;
 
   private _rootNodes: html.Node[] = [];
   private _errors: TreeError[] = [];
diff --git a/packages/compiler/src/ml_parser/xml_tags.ts b/packages/compiler/src/ml_parser/xml_tags.ts
index 6acc2f5363..ab52c15dd1 100644
--- a/packages/compiler/src/ml_parser/xml_tags.ts
+++ b/packages/compiler/src/ml_parser/xml_tags.ts
@@ -10,9 +10,12 @@ import {TagContentType, TagDefinition} from './tags';
 
 export class XmlTagDefinition implements TagDefinition {
   closedByParent: boolean = false;
-  requiredParents: {[key: string]: boolean};
-  parentToAdd: string;
-  implicitNamespacePrefix: string;
+  // TODO(issue/24571): remove '!'.
+  requiredParents !: {[key: string]: boolean};
+  // TODO(issue/24571): remove '!'.
+  parentToAdd !: string;
+  // TODO(issue/24571): remove '!'.
+  implicitNamespacePrefix !: string;
   contentType: TagContentType = TagContentType.PARSABLE_DATA;
   isVoid: boolean = false;
   ignoreFirstLf: boolean = false;
diff --git a/packages/compiler/test/expression_parser/utils/unparser.ts b/packages/compiler/test/expression_parser/utils/unparser.ts
index da27bfcbfb..e5ea2f9f89 100644
--- a/packages/compiler/test/expression_parser/utils/unparser.ts
+++ b/packages/compiler/test/expression_parser/utils/unparser.ts
@@ -11,8 +11,10 @@ import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../../src/ml
 
 class Unparser implements AstVisitor {
   private static _quoteRegExp = /"/g;
-  private _expression: string;
-  private _interpolationConfig: InterpolationConfig;
+  // TODO(issue/24571): remove '!'.
+  private _expression !: string;
+  // TODO(issue/24571): remove '!'.
+  private _interpolationConfig !: InterpolationConfig;
 
   unparse(ast: AST, interpolationConfig: InterpolationConfig) {
     this._expression = '';
diff --git a/packages/compiler/test/i18n/integration_common.ts b/packages/compiler/test/i18n/integration_common.ts
index 11027cbf75..2b59094aae 100644
--- a/packages/compiler/test/i18n/integration_common.ts
+++ b/packages/compiler/test/i18n/integration_common.ts
@@ -19,9 +19,12 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
   template: '',
 })
 export class I18nComponent {
-  count: number;
-  sex: string;
-  sexB: string;
+  // TODO(issue/24571): remove '!'.
+  count !: number;
+  // TODO(issue/24571): remove '!'.
+  sex !: string;
+  // TODO(issue/24571): remove '!'.
+  sexB !: string;
   response: any = {getItemsList: (): any[] => []};
 }
 
diff --git a/packages/compiler/test/integration_spec.ts b/packages/compiler/test/integration_spec.ts
index 34587b2ac1..da7f870600 100644
--- a/packages/compiler/test/integration_spec.ts
+++ b/packages/compiler/test/integration_spec.ts
@@ -20,7 +20,8 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
       it('should support dotted selectors', async(() => {
            @Directive({selector: '[dot.name]'})
            class MyDir {
-             @Input('dot.name') value: string;
+             // TODO(issue/24571): remove '!'.
+             @Input('dot.name') value !: string;
            }
 
            TestBed.configureTestingModule({
diff --git a/packages/compiler/testing/src/resource_loader_mock.ts b/packages/compiler/testing/src/resource_loader_mock.ts
index 230fa1caf1..e64c744960 100644
--- a/packages/compiler/testing/src/resource_loader_mock.ts
+++ b/packages/compiler/testing/src/resource_loader_mock.ts
@@ -99,8 +99,10 @@ export class MockResourceLoader extends ResourceLoader {
 }
 
 class _PendingRequest {
-  resolve: (result: string) => void;
-  reject: (error: any) => void;
+  // TODO(issue/24571): remove '!'.
+  resolve !: (result: string) => void;
+  // TODO(issue/24571): remove '!'.
+  reject !: (error: any) => void;
   promise: Promise<string>;
 
   constructor(public url: string) {
diff --git a/packages/compiler/tsconfig-build.json b/packages/compiler/tsconfig-build.json
index 46fbc6492f..d59d031f3b 100644
--- a/packages/compiler/tsconfig-build.json
+++ b/packages/compiler/tsconfig-build.json
@@ -7,6 +7,7 @@
     "experimentalDecorators": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "noFallthroughCasesInSwitch": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/packages/core/src/application_init.ts b/packages/core/src/application_init.ts
index 554c120d9d..945a776fd9 100644
--- a/packages/core/src/application_init.ts
+++ b/packages/core/src/application_init.ts
@@ -24,8 +24,10 @@ export const APP_INITIALIZER = new InjectionToken<Array<() => void>>('Applicatio
  */
 @Injectable()
 export class ApplicationInitStatus {
-  private resolve: Function;
-  private reject: Function;
+  // TODO(issue/24571): remove '!'.
+  private resolve !: Function;
+  // TODO(issue/24571): remove '!'.
+  private reject !: Function;
   private initialized = false;
   public readonly donePromise: Promise<any>;
   public readonly done = false;
diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts
index 2f3beb8622..9ec754f3ab 100644
--- a/packages/core/src/application_ref.ts
+++ b/packages/core/src/application_ref.ts
@@ -383,7 +383,8 @@ export class ApplicationRef {
   /**
    * Returns an Observable that indicates when the application is stable or unstable.
    */
-  public readonly isStable: Observable<boolean>;
+  // TODO(issue/24571): remove '!'.
+  public readonly isStable !: Observable<boolean>;
 
   /** @internal */
   constructor(
diff --git a/packages/core/src/change_detection/differs/default_iterable_differ.ts b/packages/core/src/change_detection/differs/default_iterable_differ.ts
index ac917e63f0..bf67045dc2 100644
--- a/packages/core/src/change_detection/differs/default_iterable_differ.ts
+++ b/packages/core/src/change_detection/differs/default_iterable_differ.ts
@@ -27,7 +27,8 @@ const trackByIdentity = (index: number, item: any) => item;
  */
 export class DefaultIterableDiffer<V> implements IterableDiffer<V>, IterableChanges<V> {
   public readonly length: number = 0;
-  public readonly collection: V[]|Iterable<V>|null;
+  // TODO(issue/24571): remove '!'.
+  public readonly collection !: V[] | Iterable<V>| null;
   // Keeps track of the used records at any point in time (during & across `_check()` calls)
   private _linkedRecords: _DuplicateMap<V>|null = null;
   // Keeps track of the removed records at any point in time during `_check()` calls.
diff --git a/packages/core/src/debug/debug_node.ts b/packages/core/src/debug/debug_node.ts
index ece2a45084..78fbdd0d77 100644
--- a/packages/core/src/debug/debug_node.ts
+++ b/packages/core/src/debug/debug_node.ts
@@ -19,7 +19,8 @@ export class EventListener {
 export class DebugNode {
   nativeNode: any;
   listeners: EventListener[];
-  parent: DebugElement|null;
+  // TODO(issue/24571): remove '!'.
+  parent !: DebugElement | null;
 
   constructor(nativeNode: any, parent: DebugNode|null, private _debugContext: DebugContext) {
     this.nativeNode = nativeNode;
@@ -46,7 +47,8 @@ export class DebugNode {
  * @experimental All debugging apis are currently experimental.
  */
 export class DebugElement extends DebugNode {
-  name: string;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
   properties: {[key: string]: any};
   attributes: {[key: string]: string | null};
   classes: {[key: string]: boolean};
diff --git a/packages/core/src/linker/query_list.ts b/packages/core/src/linker/query_list.ts
index eeb0026a16..fd06b021f4 100644
--- a/packages/core/src/linker/query_list.ts
+++ b/packages/core/src/linker/query_list.ts
@@ -42,8 +42,10 @@ export class QueryList<T>/* implements Iterable<T> */ {
   public readonly changes: Observable<any> = new EventEmitter();
 
   readonly length: number = 0;
-  readonly first: T;
-  readonly last: T;
+  // TODO(issue/24571): remove '!'.
+  readonly first !: T;
+  // TODO(issue/24571): remove '!'.
+  readonly last !: T;
 
   /**
    * See
diff --git a/packages/core/src/linker/system_js_ng_module_factory_loader.ts b/packages/core/src/linker/system_js_ng_module_factory_loader.ts
index d5540aca8b..b377c2e718 100644
--- a/packages/core/src/linker/system_js_ng_module_factory_loader.ts
+++ b/packages/core/src/linker/system_js_ng_module_factory_loader.ts
@@ -28,12 +28,14 @@ export abstract class SystemJsNgModuleLoaderConfig {
   /**
    * Prefix to add when computing the name of the factory module for a given module name.
    */
-  factoryPathPrefix: string;
+  // TODO(issue/24571): remove '!'.
+  factoryPathPrefix !: string;
 
   /**
    * Suffix to add when computing the name of the factory module for a given module name.
    */
-  factoryPathSuffix: string;
+  // TODO(issue/24571): remove '!'.
+  factoryPathSuffix !: string;
 }
 
 const DEFAULT_CONFIG: SystemJsNgModuleLoaderConfig = {
diff --git a/packages/core/src/render/api.ts b/packages/core/src/render/api.ts
index 61c7e5657b..ac80fd769c 100644
--- a/packages/core/src/render/api.ts
+++ b/packages/core/src/render/api.ts
@@ -159,7 +159,8 @@ export abstract class Renderer2 {
    * in which case the view engine won't call it.
    * This is used as a performance optimization for production mode.
    */
-  destroyNode: ((node: any) => void)|null;
+  // TODO(issue/24571): remove '!'.
+  destroyNode !: ((node: any) => void) | null;
   abstract appendChild(parent: any, newChild: any): void;
   abstract insertBefore(parent: any, newChild: any, refChild: any): void;
   abstract removeChild(parent: any, oldChild: any): void;
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index d5a9b3a84f..ecd0bf65f4 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -606,9 +606,12 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
  */
 class ViewContainerRef implements viewEngine_ViewContainerRef {
   private _viewRefs: viewEngine_ViewRef[] = [];
-  element: viewEngine_ElementRef;
-  injector: Injector;
-  parentInjector: Injector;
+  // TODO(issue/24571): remove '!'.
+  element !: viewEngine_ElementRef;
+  // TODO(issue/24571): remove '!'.
+  injector !: Injector;
+  // TODO(issue/24571): remove '!'.
+  parentInjector !: Injector;
 
   constructor(private _lContainerNode: LContainerNode) {}
 
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index e88cdd489b..6bf5d4e6b6 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -24,10 +24,12 @@ export interface viewEngine_ChangeDetectorRef_interface extends viewEngine_Chang
 
 export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_InternalViewRef,
     viewEngine_ChangeDetectorRef_interface {
-  private _appRef: ApplicationRef|null;
+  // TODO(issue/24571): remove '!'.
+  private _appRef !: ApplicationRef | null;
 
   context: T;
-  rootNodes: any[];
+  // TODO(issue/24571): remove '!'.
+  rootNodes !: any[];
 
   constructor(protected _view: LViewData, context: T|null) { this.context = context !; }
 
diff --git a/packages/core/src/view/refs.ts b/packages/core/src/view/refs.ts
index 0daada3109..72a44d6b5d 100644
--- a/packages/core/src/view/refs.ts
+++ b/packages/core/src/view/refs.ts
@@ -311,7 +311,8 @@ class TemplateRef_ extends TemplateRef<any> implements TemplateData {
   /**
    * @internal
    */
-  _projectedViews: ViewData[];
+  // TODO(issue/24571): remove '!'.
+  _projectedViews !: ViewData[];
 
   constructor(private _parentView: ViewData, private _def: NodeDef) { super(); }
 
@@ -479,9 +480,11 @@ class NgModuleRef_ implements NgModuleData, InternalNgModuleRef<any> {
   private _destroyListeners: (() => void)[] = [];
   private _destroyed: boolean = false;
   /** @internal */
-  _providers: any[];
+  // TODO(issue/24571): remove '!'.
+  _providers !: any[];
   /** @internal */
-  _modules: any[];
+  // TODO(issue/24571): remove '!'.
+  _modules !: any[];
 
   readonly injector: Injector = this;
 
diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts
index f94bca7d0c..4aafeca023 100644
--- a/packages/core/test/animation/animation_integration_spec.ts
+++ b/packages/core/test/animation/animation_integration_spec.ts
@@ -1636,7 +1636,8 @@ const DEFAULT_COMPONENT_ID = '1';
           ]
         })
         class Cmp {
-          public exp: string|null;
+          // TODO(issue/24571): remove '!'.
+          public exp !: string | null;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2023,7 +2024,8 @@ const DEFAULT_COMPONENT_ID = '1';
            })
            class Cmp {
              public exp: any;
-             public color: string|null;
+             // TODO(issue/24571): remove '!'.
+             public color !: string | null;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2456,7 +2458,8 @@ const DEFAULT_COMPONENT_ID = '1';
            })
            class Cmp {
              exp: any = false;
-             event: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event !: AnimationEvent;
 
              callback = (event: any) => { this.event = event; };
            }
@@ -2491,7 +2494,8 @@ const DEFAULT_COMPONENT_ID = '1';
            })
            class Cmp {
              exp: any = false;
-             event: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event !: AnimationEvent;
 
              callback = (event: any) => { this.event = event; };
            }
@@ -2546,8 +2550,10 @@ const DEFAULT_COMPONENT_ID = '1';
            class Cmp {
              exp1: any = false;
              exp2: any = false;
-             event1: AnimationEvent;
-             event2: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event1 !: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event2 !: AnimationEvent;
              // tslint:disable:semicolon
              callback1 = (event: any) => { this.event1 = event; };
              // tslint:disable:semicolon
@@ -2608,8 +2614,10 @@ const DEFAULT_COMPONENT_ID = '1';
            class Cmp {
              exp1: any = false;
              exp2: any = false;
-             event1: AnimationEvent;
-             event2: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event1 !: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event2 !: AnimationEvent;
              callback1 = (event: any) => { this.event1 = event; };
              callback2 = (event: any) => { this.event2 = event; };
            }
@@ -2713,7 +2721,8 @@ const DEFAULT_COMPONENT_ID = '1';
                      [style({'opacity': '0'}), animate(1000, style({'opacity': '1'}))])])],
            })
            class Cmp {
-             event: AnimationEvent;
+             // TODO(issue/24571): remove '!'.
+             event !: AnimationEvent;
 
              @HostBinding('@myAnimation2')
              exp: any = false;
@@ -2747,7 +2756,8 @@ const DEFAULT_COMPONENT_ID = '1';
              animations: [trigger('myAnimation', [])]
            })
            class Cmp {
-             exp: string;
+             // TODO(issue/24571): remove '!'.
+             exp !: string;
              log: any[] = [];
              callback = (event: any) => this.log.push(`${event.phaseName} => ${event.toState}`);
            }
@@ -2858,8 +2868,10 @@ const DEFAULT_COMPONENT_ID = '1';
            })
            class Cmp {
              log: string[] = [];
-             exp1: string;
-             exp2: string;
+             // TODO(issue/24571): remove '!'.
+             exp1 !: string;
+             // TODO(issue/24571): remove '!'.
+             exp2 !: string;
 
              cb(name: string, event: AnimationEvent) { this.log.push(name); }
            }
@@ -2936,7 +2948,8 @@ const DEFAULT_COMPONENT_ID = '1';
         class Cmp {
                  log: string[] = [];
                  events: {[name: string]: any} = {};
-                 exp: string;
+                 // TODO(issue/24571): remove '!'.
+                 exp !: string;
                  items: any = [0, 1, 2, 3];
 
                  cb(name: string, phase: string, event: AnimationEvent) {
@@ -3263,8 +3276,10 @@ const DEFAULT_COMPONENT_ID = '1';
              class Cmp {
                disableExp = false;
                exp = '';
-               startEvent: AnimationEvent;
-               doneEvent: AnimationEvent;
+               // TODO(issue/24571): remove '!'.
+               startEvent !: AnimationEvent;
+               // TODO(issue/24571): remove '!'.
+               doneEvent !: AnimationEvent;
              }
 
              TestBed.configureTestingModule({declarations: [Cmp]});
diff --git a/packages/core/test/animation/animation_query_integration_spec.ts b/packages/core/test/animation/animation_query_integration_spec.ts
index 14278b3f81..a0d63325c4 100644
--- a/packages/core/test/animation/animation_query_integration_spec.ts
+++ b/packages/core/test/animation/animation_query_integration_spec.ts
@@ -1049,7 +1049,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
             ])]
         })
         class Cmp {
-          public items: any[];
+          // TODO(issue/24571): remove '!'.
+          public items !: any[];
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1129,7 +1130,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
         })
         class Cmp {
              public exp: any;
-             public items: any[];
+             // TODO(issue/24571): remove '!'.
+             public items !: any[];
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1349,7 +1351,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
         })
         class Cmp {
           public exp: any;
-          public items: any[];
+          // TODO(issue/24571): remove '!'.
+          public items !: any[];
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1401,7 +1404,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
         })
         class Cmp {
           public exp: any;
-          public items: any[];
+          // TODO(issue/24571): remove '!'.
+          public items !: any[];
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1463,7 +1467,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
         class Cmp {
           public exp1: any;
           public exp2: any;
-          public items: any[];
+          // TODO(issue/24571): remove '!'.
+          public items !: any[];
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1532,7 +1537,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
            })
            class Cmp {
              public exp: any;
-             public items: any[];
+             // TODO(issue/24571): remove '!'.
+             public items !: any[];
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1586,7 +1592,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
           })
           class Cmp {
              public exp: any;
-             public items: any[];
+             // TODO(issue/24571): remove '!'.
+             public items !: any[];
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2469,7 +2476,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
           `
            })
            class Cmp {
-             public exp: boolean;
+             // TODO(issue/24571): remove '!'.
+             public exp !: boolean;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2648,7 +2656,8 @@ import {fakeAsync, flushMicrotasks} from '../../testing/src/fake_async';
           `
            })
            class Cmp {
-             public exp: boolean;
+             // TODO(issue/24571): remove '!'.
+             public exp !: boolean;
              public log: string[] = [];
              callback(event: any) {
                this.log.push(event.element.getAttribute('data-name') + '-' + event.phaseName);
diff --git a/packages/core/test/animation/animations_with_web_animations_integration_spec.ts b/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
index 6067815255..53bdd3cd59 100644
--- a/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
+++ b/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
@@ -138,7 +138,8 @@ import {TestBed} from '../../testing';
             [transition('* => *', [style({height: '!'}), animate(1000, style({height: '*'}))])])]
       })
       class Cmp {
-        public exp: number;
+        // TODO(issue/24571): remove '!'.
+        public exp !: number;
         public items = [0, 1, 2, 3, 4];
       }
 
@@ -358,7 +359,8 @@ import {TestBed} from '../../testing';
         ]
       })
       class Cmp {
-        public exp: string;
+        // TODO(issue/24571): remove '!'.
+        public exp !: string;
       }
 
       TestBed.configureTestingModule({declarations: [Cmp]});
@@ -411,7 +413,8 @@ import {TestBed} from '../../testing';
            ]
          })
          class Cmp {
-           public exp: string;
+           // TODO(issue/24571): remove '!'.
+           public exp !: string;
            public items: any[] = [];
          }
 
diff --git a/packages/core/test/application_ref_spec.ts b/packages/core/test/application_ref_spec.ts
index 8a225f1d9d..bdac3d0c1f 100644
--- a/packages/core/test/application_ref_spec.ts
+++ b/packages/core/test/application_ref_spec.ts
@@ -356,14 +356,16 @@ class SomeComponent {
 
       @Component({template: '<ng-container #vc></ng-container>'})
       class ContainerComp {
+        // TODO(issue/24571): remove '!'.
         @ViewChild('vc', {read: ViewContainerRef})
-        vc: ViewContainerRef;
+        vc !: ViewContainerRef;
       }
 
       @Component({template: '<ng-template #t>Dynamic content</ng-template>'})
       class EmbeddedViewComp {
+        // TODO(issue/24571): remove '!'.
         @ViewChild(TemplateRef)
-        tplRef: TemplateRef<Object>;
+        tplRef !: TemplateRef<Object>;
       }
 
       beforeEach(() => {
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index a2acf790be..2120f92677 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -14,7 +14,8 @@ import {Component, Injectable, IterableDiffers, NgModule, defineInjector, ɵNgOn
 export class Todo {
   editing: boolean;
 
-  private _title: string;
+  // TODO(issue/24571): remove '!'.
+  private _title !: string;
   get title() { return this._title; }
   set title(value: string) { this._title = value.trim(); }
 
diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts
index bb73be6b3a..d608220a10 100644
--- a/packages/core/test/debug/debug_node_spec.ts
+++ b/packages/core/test/debug/debug_node_spec.ts
@@ -141,10 +141,13 @@ class LocalsComp {
  `
 })
 class BankAccount {
-  @Input() bank: string;
-  @Input('account') id: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() bank !: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('account') id !: string;
 
-  normalizedBankName: string;
+  // TODO(issue/24571): remove '!'.
+  normalizedBankName !: string;
 }
 
 @Component({
diff --git a/packages/core/test/forward_ref_integration_spec.ts b/packages/core/test/forward_ref_integration_spec.ts
index 5c892aef0c..798870031c 100644
--- a/packages/core/test/forward_ref_integration_spec.ts
+++ b/packages/core/test/forward_ref_integration_spec.ts
@@ -46,7 +46,8 @@ class App {
   template: `{{frame.name}}(<span *ngFor="let  lock of locks">{{lock.name}}</span>)`,
 })
 class Door {
-  @ContentChildren(forwardRef(() => Lock)) locks: QueryList<Lock>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(forwardRef(() => Lock)) locks !: QueryList<Lock>;
   frame: Frame;
 
   constructor(@Inject(forwardRef(() => Frame)) frame: Frame) { this.frame = frame; }
diff --git a/packages/core/test/linker/change_detection_integration_spec.ts b/packages/core/test/linker/change_detection_integration_spec.ts
index 01095e0541..2a4f42deb4 100644
--- a/packages/core/test/linker/change_detection_integration_spec.ts
+++ b/packages/core/test/linker/change_detection_integration_spec.ts
@@ -1310,8 +1310,10 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
            @Component({template: '<ng-template #vc>{{name}}</ng-template>'})
            class Comp {
              name = 'Tom';
-             @ViewChild('vc', {read: ViewContainerRef}) vc: ViewContainerRef;
-             @ViewChild(TemplateRef) template: TemplateRef<any>;
+             // TODO(issue/24571): remove '!'.
+             @ViewChild('vc', {read: ViewContainerRef}) vc !: ViewContainerRef;
+             // TODO(issue/24571): remove '!'.
+             @ViewChild(TemplateRef) template !: TemplateRef<any>;
            }
 
            TestBed.configureTestingModule({declarations: [Comp]});
@@ -1351,8 +1353,9 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
               `<span [i]="log('start')"></span><inner-cmp [outerTpl]="tpl"><ng-template><span [i]="log('tpl')"></span></ng-template></inner-cmp>`
         })
         class OuterComp {
+          // TODO(issue/24571): remove '!'.
           @ContentChild(TemplateRef)
-          tpl: TemplateRef<any>;
+          tpl !: TemplateRef<any>;
 
           constructor(public cdRef: ChangeDetectorRef) {}
           log(id: string) { log.push(`outer-${id}`); }
@@ -1364,11 +1367,13 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
               `<span [i]="log('start')"></span>><ng-container [ngTemplateOutlet]="outerTpl"></ng-container><ng-container [ngTemplateOutlet]="tpl"></ng-container>`
         })
         class InnerComp {
+          // TODO(issue/24571): remove '!'.
           @ContentChild(TemplateRef)
-          tpl: TemplateRef<any>;
+          tpl !: TemplateRef<any>;
 
+          // TODO(issue/24571): remove '!'.
           @Input()
-          outerTpl: TemplateRef<any>;
+          outerTpl !: TemplateRef<any>;
 
           constructor(public cdRef: ChangeDetectorRef) {}
           log(id: string) { log.push(`inner-${id}`); }
@@ -1517,7 +1522,8 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
           class MyChild {
             private thrown = LifetimeMethods.None;
 
-            @Input() inp: boolean;
+            // TODO(issue/24571): remove '!'.
+            @Input() inp !: boolean;
             @Output() outp = new EventEmitter<any>();
 
             constructor() {}
@@ -1793,13 +1799,16 @@ class TestDirective implements OnInit, DoCheck, OnChanges, AfterContentInit, Aft
     AfterViewInit, AfterViewChecked, OnDestroy {
   @Input() a: any;
   @Input() b: any;
-  changes: SimpleChanges;
+  // TODO(issue/24571): remove '!'.
+  changes !: SimpleChanges;
   event: any;
   eventEmitter: EventEmitter<string> = new EventEmitter<string>();
 
-  @Input('testDirective') name: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('testDirective') name !: string;
 
-  @Input() throwOn: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() throwOn !: string;
 
   constructor(public log: DirectiveLog) {}
 
@@ -1875,7 +1884,8 @@ class OnDestroyDirective implements OnDestroy {
 
 @Directive({selector: '[orderCheck0]'})
 class OrderCheckDirective0 {
-  private _name: string;
+  // TODO(issue/24571): remove '!'.
+  private _name !: string;
 
   @Input('orderCheck0')
   set name(value: string) {
@@ -1888,7 +1898,8 @@ class OrderCheckDirective0 {
 
 @Directive({selector: '[orderCheck1]'})
 class OrderCheckDirective1 {
-  private _name: string;
+  // TODO(issue/24571): remove '!'.
+  private _name !: string;
 
   @Input('orderCheck1')
   set name(value: string) {
@@ -1901,7 +1912,8 @@ class OrderCheckDirective1 {
 
 @Directive({selector: '[orderCheck2]'})
 class OrderCheckDirective2 {
-  private _name: string;
+  // TODO(issue/24571): remove '!'.
+  private _name !: string;
 
   @Input('orderCheck2')
   set name(value: string) {
@@ -1925,10 +1937,13 @@ class TestLocals {
 
 @Component({selector: 'root', template: 'empty'})
 class Person {
-  age: number;
-  name: string;
+  // TODO(issue/24571): remove '!'.
+  age !: number;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
   address: Address|null = null;
-  phones: number[];
+  // TODO(issue/24571): remove '!'.
+  phones !: number[];
 
   init(name: string, address: Address|null = null) {
     this.name = name;
@@ -1982,13 +1997,15 @@ class TestData {
 
 @Component({selector: 'root', template: 'empty'})
 class TestDataWithGetter {
-  public fn: Function;
+  // TODO(issue/24571): remove '!'.
+  public fn !: Function;
 
   get a() { return this.fn(); }
 }
 
 class Holder<T> {
-  value: T;
+  // TODO(issue/24571): remove '!'.
+  value !: T;
 }
 
 @Component({selector: 'root', template: 'empty'})
diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts
index 027a36f9f1..7ceff4a8c0 100644
--- a/packages/core/test/linker/integration_spec.ts
+++ b/packages/core/test/linker/integration_spec.ts
@@ -939,7 +939,8 @@ function declareTests({useJit}: {useJit: boolean}) {
         @Directive({selector: '[host-listener]', host: {'(click)': 'doIt(id, unknownProp)'}})
         class DirectiveWithHostListener {
           id = 'one';
-          receivedArgs: any[];
+          // TODO(issue/24571): remove '!'.
+          receivedArgs !: any[];
 
           doIt(...args: any[]) { this.receivedArgs = args; }
         }
@@ -1956,12 +1957,14 @@ class MyDir {
 
 @Directive({selector: '[title]', inputs: ['title']})
 class DirectiveWithTitle {
-  title: string;
+  // TODO(issue/24571): remove '!'.
+  title !: string;
 }
 
 @Directive({selector: '[title]', inputs: ['title'], host: {'[title]': 'title'}})
 class DirectiveWithTitleAndHostProperty {
-  title: string;
+  // TODO(issue/24571): remove '!'.
+  title !: string;
 }
 
 @Component({selector: 'event-cmp', template: '<div (click)="noop()"></div>'})
@@ -2032,7 +2035,8 @@ class PushCmpWithHostEvent {
 })
 class PushCmpWithAsyncPipe {
   numberOfChecks: number = 0;
-  resolve: (result: any) => void;
+  // TODO(issue/24571): remove '!'.
+  resolve !: (result: any) => void;
   promise: Promise<any>;
 
   constructor() {
@@ -2218,7 +2222,8 @@ class DirectiveListeningDomEventNoPrevent {
 
 @Directive({selector: '[id]', inputs: ['id']})
 class IdDir {
-  id: string;
+  // TODO(issue/24571): remove '!'.
+  id !: string;
 }
 
 @Directive({selector: '[customEvent]'})
@@ -2281,7 +2286,8 @@ class ToolbarViewContainer {
   template: 'TOOLBAR(<div *ngFor="let  part of query" [toolbarVc]="part"></div>)',
 })
 class ToolbarComponent {
-  @ContentChildren(ToolbarPart) query: QueryList<ToolbarPart>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(ToolbarPart) query !: QueryList<ToolbarPart>;
   ctxProp: string = 'hello world';
 
   constructor() {}
@@ -2481,10 +2487,12 @@ class ComponentWithTemplate {
 class DirectiveWithPropDecorators {
   target: any;
 
-  @Input('elProp') dirProp: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('elProp') dirProp !: string;
   @Output('elEvent') event = new EventEmitter();
 
-  @HostBinding('attr.my-attr') myAttr: string;
+  // TODO(issue/24571): remove '!'.
+  @HostBinding('attr.my-attr') myAttr !: string;
   @HostListener('click', ['$event.target'])
   onClick(target: any) { this.target = target; }
 
diff --git a/packages/core/test/linker/ng_container_integration_spec.ts b/packages/core/test/linker/ng_container_integration_spec.ts
index 743478ea0c..654c163f3e 100644
--- a/packages/core/test/linker/ng_container_integration_spec.ts
+++ b/packages/core/test/linker/ng_container_integration_spec.ts
@@ -161,16 +161,20 @@ class TextDirective {
 
 @Component({selector: 'needs-content-children', template: ''})
 class NeedsContentChildren implements AfterContentInit {
-  @ContentChildren(TextDirective) textDirChildren: QueryList<TextDirective>;
-  numberOfChildrenAfterContentInit: number;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TextDirective) textDirChildren !: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  numberOfChildrenAfterContentInit !: number;
 
   ngAfterContentInit() { this.numberOfChildrenAfterContentInit = this.textDirChildren.length; }
 }
 
 @Component({selector: 'needs-view-children', template: '<div text></div>'})
 class NeedsViewChildren implements AfterViewInit {
-  @ViewChildren(TextDirective) textDirChildren: QueryList<TextDirective>;
-  numberOfChildrenAfterViewInit: number;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) textDirChildren !: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  numberOfChildrenAfterViewInit !: number;
 
   ngAfterViewInit() { this.numberOfChildrenAfterViewInit = this.textDirChildren.length; }
 }
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 0ef56663cb..2f7665c320 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -55,7 +55,8 @@ class CarWithDashboard {
 
 @Injectable()
 class SportsCar extends Car {
-  engine: Engine;
+  // TODO(issue/24571): remove '!'.
+  engine !: Engine;
   constructor(engine: Engine) { super(engine); }
 }
 
@@ -82,8 +83,9 @@ class SomeComp {
 
 @Directive({selector: '[someDir]'})
 class SomeDirective {
+  // TODO(issue/24571): remove '!'.
   @HostBinding('title') @Input()
-  someDir: string;
+  someDir !: string;
 }
 
 @Pipe({name: 'somePipe'})
diff --git a/packages/core/test/linker/query_integration_spec.ts b/packages/core/test/linker/query_integration_spec.ts
index bf11d8aa9b..9e8cbc72a2 100644
--- a/packages/core/test/linker/query_integration_spec.ts
+++ b/packages/core/test/linker/query_integration_spec.ts
@@ -614,11 +614,13 @@ import {stringify} from '../../src/util';
            @Component(
                {selector: 'auto-projecting', template: '<div *ngIf="true; then: content"></div>'})
            class AutoProjecting {
+             // TODO(issue/24571): remove '!'.
              @ContentChild(TemplateRef)
-             content: TemplateRef<any>;
+             content !: TemplateRef<any>;
 
+             // TODO(issue/24571): remove '!'.
              @ContentChildren(TextDirective)
-             query: QueryList<TextDirective>;
+             query !: QueryList<TextDirective>;
            }
 
            TestBed.configureTestingModule({declarations: [AutoProjecting]});
@@ -638,22 +640,27 @@ import {stringify} from '../../src/util';
 
 @Directive({selector: '[text]', inputs: ['text'], exportAs: 'textDir'})
 class TextDirective {
-  text: string;
+  // TODO(issue/24571): remove '!'.
+  text !: string;
   constructor() {}
 }
 
 @Component({selector: 'needs-content-children', template: ''})
 class NeedsContentChildren implements AfterContentInit {
-  @ContentChildren(TextDirective) textDirChildren: QueryList<TextDirective>;
-  numberOfChildrenAfterContentInit: number;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TextDirective) textDirChildren !: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  numberOfChildrenAfterContentInit !: number;
 
   ngAfterContentInit() { this.numberOfChildrenAfterContentInit = this.textDirChildren.length; }
 }
 
 @Component({selector: 'needs-view-children', template: '<div text></div>'})
 class NeedsViewChildren implements AfterViewInit {
-  @ViewChildren(TextDirective) textDirChildren: QueryList<TextDirective>;
-  numberOfChildrenAfterViewInit: number;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) textDirChildren !: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  numberOfChildrenAfterViewInit !: number;
 
   ngAfterViewInit() { this.numberOfChildrenAfterViewInit = this.textDirChildren.length; }
 }
@@ -661,7 +668,8 @@ class NeedsViewChildren implements AfterViewInit {
 @Component({selector: 'needs-content-child', template: ''})
 class NeedsContentChild implements AfterContentInit, AfterContentChecked {
   /** @internal */
-  _child: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  _child !: TextDirective;
 
   @ContentChild(TextDirective)
   set child(value) {
@@ -679,7 +687,8 @@ class NeedsContentChild implements AfterContentInit, AfterContentChecked {
 
 @Directive({selector: '[directive-needs-content-child]'})
 class DirectiveNeedsContentChild {
-  @ContentChild(TextDirective) child: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TextDirective) child !: TextDirective;
 }
 
 @Component({selector: 'needs-view-child', template: `<div *ngIf="shouldShow" text="foo"></div>`})
@@ -687,7 +696,8 @@ class NeedsViewChild implements AfterViewInit, AfterViewChecked {
   shouldShow: boolean = true;
   shouldShow2: boolean = false;
   /** @internal */
-  _child: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  _child !: TextDirective;
 
   @ViewChild(TextDirective)
   set child(value) {
@@ -717,8 +727,10 @@ function createTestCmpAndDetectChanges<T>(type: Type<T>, template: string): Comp
 
 @Component({selector: 'needs-static-content-view-child', template: `<div text="viewFoo"></div>`})
 class NeedsStaticContentAndViewChild {
-  @ContentChild(TextDirective) contentChild: TextDirective;
-  @ViewChild(TextDirective) viewChild: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TextDirective) contentChild !: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild(TextDirective) viewChild !: TextDirective;
 }
 
 @Directive({selector: '[dir]'})
@@ -730,15 +742,20 @@ class InertDirective {
   template: '<div text="ignoreme"></div><b *ngFor="let  dir of query">{{dir.text}}|</b>'
 })
 class NeedsQuery {
-  @ContentChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TextDirective) query !: QueryList<TextDirective>;
 }
 
 @Component({selector: 'needs-four-queries', template: ''})
 class NeedsFourQueries {
-  @ContentChild(TextDirective) query1: TextDirective;
-  @ContentChild(TextDirective) query2: TextDirective;
-  @ContentChild(TextDirective) query3: TextDirective;
-  @ContentChild(TextDirective) query4: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TextDirective) query1 !: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TextDirective) query2 !: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TextDirective) query3 !: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TextDirective) query4 !: TextDirective;
 }
 
 @Component({
@@ -746,22 +763,26 @@ class NeedsFourQueries {
   template: '<ng-content></ng-content><div *ngFor="let  dir of query">{{dir.text}}|</div>'
 })
 class NeedsQueryDesc {
-  @ContentChildren(TextDirective, {descendants: true}) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TextDirective, {descendants: true}) query !: QueryList<TextDirective>;
 }
 
 @Component({selector: 'needs-query-by-ref-binding', template: '<ng-content>'})
 class NeedsQueryByLabel {
-  @ContentChildren('textLabel', {descendants: true}) query: QueryList<any>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren('textLabel', {descendants: true}) query !: QueryList<any>;
 }
 
 @Component({selector: 'needs-view-query-by-ref-binding', template: '<div #textLabel>text</div>'})
 class NeedsViewQueryByLabel {
-  @ViewChildren('textLabel') query: QueryList<any>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren('textLabel') query !: QueryList<any>;
 }
 
 @Component({selector: 'needs-query-by-ref-bindings', template: '<ng-content>'})
 class NeedsQueryByTwoLabels {
-  @ContentChildren('textLabel1,textLabel2', {descendants: true}) query: QueryList<any>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren('textLabel1,textLabel2', {descendants: true}) query !: QueryList<any>;
 }
 
 @Component({
@@ -769,7 +790,8 @@ class NeedsQueryByTwoLabels {
   template: '<div *ngFor="let  dir of query">{{dir.text}}|</div><ng-content></ng-content>'
 })
 class NeedsQueryAndProject {
-  @ContentChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TextDirective) query !: QueryList<TextDirective>;
 }
 
 @Component({
@@ -777,13 +799,15 @@ class NeedsQueryAndProject {
   template: '<div text="1"><div text="2"></div></div><div text="3"></div><div text="4"></div>'
 })
 class NeedsViewQuery {
-  @ViewChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) query !: QueryList<TextDirective>;
 }
 
 @Component({selector: 'needs-view-query-if', template: '<div *ngIf="show" text="1"></div>'})
 class NeedsViewQueryIf {
   show: boolean = false;
-  @ViewChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) query !: QueryList<TextDirective>;
 }
 
 @Component({
@@ -792,7 +816,8 @@ class NeedsViewQueryIf {
 })
 class NeedsViewQueryNestedIf {
   show: boolean = true;
-  @ViewChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) query !: QueryList<TextDirective>;
 }
 
 @Component({
@@ -802,7 +827,8 @@ class NeedsViewQueryNestedIf {
       '<div text="4"></div>'
 })
 class NeedsViewQueryOrder {
-  @ViewChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) query !: QueryList<TextDirective>;
   list: string[] = ['2', '3'];
 }
 
@@ -813,35 +839,44 @@ class NeedsViewQueryOrder {
       '<div text="4"></div></div>'
 })
 class NeedsViewQueryOrderWithParent {
-  @ViewChildren(TextDirective) query: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TextDirective) query !: QueryList<TextDirective>;
   list: string[] = ['2', '3'];
 }
 
 @Component({selector: 'needs-tpl', template: '<ng-template><div>shadow</div></ng-template>'})
 class NeedsTpl {
-  @ViewChildren(TemplateRef) viewQuery: QueryList<TemplateRef<Object>>;
-  @ContentChildren(TemplateRef) query: QueryList<TemplateRef<Object>>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(TemplateRef) viewQuery !: QueryList<TemplateRef<Object>>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(TemplateRef) query !: QueryList<TemplateRef<Object>>;
   constructor(public vc: ViewContainerRef) {}
 }
 
 @Component(
     {selector: 'needs-named-tpl', template: '<ng-template #tpl><div>shadow</div></ng-template>'})
 class NeedsNamedTpl {
-  @ViewChild('tpl') viewTpl: TemplateRef<Object>;
-  @ContentChild('tpl') contentTpl: TemplateRef<Object>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild('tpl') viewTpl !: TemplateRef<Object>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild('tpl') contentTpl !: TemplateRef<Object>;
   constructor(public vc: ViewContainerRef) {}
 }
 
 @Component({selector: 'needs-content-children-read', template: ''})
 class NeedsContentChildrenWithRead {
-  @ContentChildren('q', {read: TextDirective}) textDirChildren: QueryList<TextDirective>;
-  @ContentChildren('nonExisting', {read: TextDirective}) nonExistingVar: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren('q', {read: TextDirective}) textDirChildren !: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren('nonExisting', {read: TextDirective}) nonExistingVar !: QueryList<TextDirective>;
 }
 
 @Component({selector: 'needs-content-child-read', template: ''})
 class NeedsContentChildWithRead {
-  @ContentChild('q', {read: TextDirective}) textDirChild: TextDirective;
-  @ContentChild('nonExisting', {read: TextDirective}) nonExistingVar: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild('q', {read: TextDirective}) textDirChild !: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild('nonExisting', {read: TextDirective}) nonExistingVar !: TextDirective;
 }
 
 @Component({
@@ -849,7 +884,8 @@ class NeedsContentChildWithRead {
   template: '<div [ngTemplateOutlet]="templateRef"></div>'
 })
 class NeedsContentChildTemplateRef {
-  @ContentChild(TemplateRef) templateRef: TemplateRef<any>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TemplateRef) templateRef !: TemplateRef<any>;
 }
 
 @Component({
@@ -866,8 +902,10 @@ class NeedsContentChildTemplateRefApp {
   template: '<div #q text="va"></div><div #w text="vb"></div>',
 })
 class NeedsViewChildrenWithRead {
-  @ViewChildren('q,w', {read: TextDirective}) textDirChildren: QueryList<TextDirective>;
-  @ViewChildren('nonExisting', {read: TextDirective}) nonExistingVar: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren('q,w', {read: TextDirective}) textDirChildren !: QueryList<TextDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren('nonExisting', {read: TextDirective}) nonExistingVar !: QueryList<TextDirective>;
 }
 
 @Component({
@@ -875,15 +913,20 @@ class NeedsViewChildrenWithRead {
   template: '<div #q text="va"></div>',
 })
 class NeedsViewChildWithRead {
-  @ViewChild('q', {read: TextDirective}) textDirChild: TextDirective;
-  @ViewChild('nonExisting', {read: TextDirective}) nonExistingVar: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild('q', {read: TextDirective}) textDirChild !: TextDirective;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild('nonExisting', {read: TextDirective}) nonExistingVar !: TextDirective;
 }
 
 @Component({selector: 'needs-viewcontainer-read', template: '<div #q></div>'})
 class NeedsViewContainerWithRead {
-  @ViewChild('q', {read: ViewContainerRef}) vc: ViewContainerRef;
-  @ViewChild('nonExisting', {read: ViewContainerRef}) nonExistingVar: ViewContainerRef;
-  @ContentChild(TemplateRef) template: TemplateRef<Object>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild('q', {read: ViewContainerRef}) vc !: ViewContainerRef;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild('nonExisting', {read: ViewContainerRef}) nonExistingVar !: ViewContainerRef;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TemplateRef) template !: TemplateRef<Object>;
 
   createView() { this.vc.createEmbeddedView(this.template); }
 }
@@ -905,13 +948,16 @@ class MyCompBroken0 {
 
 @Component({selector: 'manual-projecting', template: '<div #vc></div>'})
 class ManualProjecting {
-  @ContentChild(TemplateRef) template: TemplateRef<any>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(TemplateRef) template !: TemplateRef<any>;
 
+  // TODO(issue/24571): remove '!'.
   @ViewChild('vc', {read: ViewContainerRef})
-  vc: ViewContainerRef;
+  vc !: ViewContainerRef;
 
+  // TODO(issue/24571): remove '!'.
   @ContentChildren(TextDirective)
-  query: QueryList<TextDirective>;
+  query !: QueryList<TextDirective>;
 
   create() { this.vc.createEmbeddedView(this.template); }
 
diff --git a/packages/core/test/linker/regression_integration_spec.ts b/packages/core/test/linker/regression_integration_spec.ts
index a4b37cdfaa..7fa02970ee 100644
--- a/packages/core/test/linker/regression_integration_spec.ts
+++ b/packages/core/test/linker/regression_integration_spec.ts
@@ -81,7 +81,8 @@ function declareTests({useJit}: {useJit: boolean}) {
            @Directive({selector: '[myDir]'})
            class MyDir {
              setterCalls: {[key: string]: any} = {};
-             changes: SimpleChanges;
+             // TODO(issue/24571): remove '!'.
+             changes !: SimpleChanges;
 
              @Input()
              set a(v: number) { this.setterCalls['a'] = v; }
@@ -124,7 +125,8 @@ function declareTests({useJit}: {useJit: boolean}) {
       it('should evaluate a conditional in a statement binding', () => {
         @Component({selector: 'some-comp', template: '<p (click)="nullValue?.click()"></p>'})
         class SomeComponent {
-          nullValue: SomeReferencedClass;
+          // TODO(issue/24571): remove '!'.
+          nullValue !: SomeReferencedClass;
         }
 
         class SomeReferencedClass {
@@ -272,7 +274,8 @@ function declareTests({useJit}: {useJit: boolean}) {
 
       @Directive({selector: '[someDir]'})
       class MyDir {
-        @Input('someDir') template: TemplateRef<any>;
+        // TODO(issue/24571): remove '!'.
+        @Input('someDir') template !: TemplateRef<any>;
       }
 
       const ctx =
@@ -292,8 +295,9 @@ function declareTests({useJit}: {useJit: boolean}) {
     it('should not recreate ViewContainerRefs in queries', () => {
       @Component({template: '<div #vc></div><div *ngIf="show" #vc></div>'})
       class MyComp {
+        // TODO(issue/24571): remove '!'.
         @ViewChildren('vc', {read: ViewContainerRef})
-        viewContainers: QueryList<ViewContainerRef>;
+        viewContainers !: QueryList<ViewContainerRef>;
 
         show = true;
       }
@@ -344,7 +348,8 @@ function declareTests({useJit}: {useJit: boolean}) {
     it('should support @ContentChild and @Input on the same property for static queries', () => {
       @Directive({selector: 'test'})
       class Test {
-        @Input() @ContentChild(TemplateRef) tpl: TemplateRef<any>;
+        // TODO(issue/24571): remove '!'.
+        @Input() @ContentChild(TemplateRef) tpl !: TemplateRef<any>;
       }
 
       @Component({
diff --git a/packages/core/test/linker/security_integration_spec.ts b/packages/core/test/linker/security_integration_spec.ts
index fc8396ef2c..dede02e5a1 100644
--- a/packages/core/test/linker/security_integration_spec.ts
+++ b/packages/core/test/linker/security_integration_spec.ts
@@ -168,8 +168,9 @@ function declareTests({useJit}: {useJit: boolean}) {
       it('should escape unsafe properties if they are used in host bindings', () => {
         @Directive({selector: '[dirHref]'})
         class HrefDirective {
+          // TODO(issue/24571): remove '!'.
           @HostBinding('href') @Input()
-          dirHref: string;
+          dirHref !: string;
         }
 
         const template = `<a [dirHref]="ctxProp">Link Title</a>`;
@@ -183,8 +184,9 @@ function declareTests({useJit}: {useJit: boolean}) {
       it('should escape unsafe attributes if they are used in host bindings', () => {
         @Directive({selector: '[dirHref]'})
         class HrefDirective {
+          // TODO(issue/24571): remove '!'.
           @HostBinding('attr.href') @Input()
-          dirHref: string;
+          dirHref !: string;
         }
 
         const template = `<a [dirHref]="ctxProp">Link Title</a>`;
diff --git a/packages/core/test/metadata/di_spec.ts b/packages/core/test/metadata/di_spec.ts
index c42b6135ad..733328e53c 100644
--- a/packages/core/test/metadata/di_spec.ts
+++ b/packages/core/test/metadata/di_spec.ts
@@ -76,26 +76,31 @@ import {TestBed} from '@angular/core/testing';
 
 @Directive({selector: 'simple'})
 class Simple {
-  @Input() marker: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() marker !: string;
 }
 
 @Component({selector: 'view-child-type-selector', template: ''})
 class ViewChildTypeSelectorComponent {
-  @ViewChild(Simple) child: Simple;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild(Simple) child !: Simple;
 }
 
 @Component({selector: 'view-child-string-selector', template: ''})
 class ViewChildStringSelectorComponent {
-  @ViewChild('child') child: ElementRef;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild('child') child !: ElementRef;
 }
 
 @Component({selector: 'view-children-type-selector', template: ''})
 class ViewChildrenTypeSelectorComponent {
-  @ViewChildren(Simple) children: QueryList<Simple>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(Simple) children !: QueryList<Simple>;
 }
 
 @Component({selector: 'view-child-string-selector', template: ''})
 class ViewChildrenStringSelectorComponent {
   // Allow comma separated selector (with spaces).
-  @ViewChildren('child1 , child2') children: QueryList<ElementRef>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren('child1 , child2') children !: QueryList<ElementRef>;
 }
diff --git a/packages/core/test/reflection/reflector_spec.ts b/packages/core/test/reflection/reflector_spec.ts
index 291a74a815..a5f022cb24 100644
--- a/packages/core/test/reflection/reflector_spec.ts
+++ b/packages/core/test/reflection/reflector_spec.ts
@@ -329,17 +329,21 @@ class TestObj {
         class C {}
 
         class Parent {
+          // TODO(issue/24571): remove '!'.
           @PropDecorator('a')
-          a: A;
+          a !: A;
+          // TODO(issue/24571): remove '!'.
           @PropDecorator('b1')
-          b: B;
+          b !: B;
         }
 
         class Child extends Parent {
+          // TODO(issue/24571): remove '!'.
           @PropDecorator('b2')
-          b: B;
+          b !: B;
+          // TODO(issue/24571): remove '!'.
           @PropDecorator('c')
-          c: C;
+          c !: C;
         }
 
         class NoDecorators {}
diff --git a/packages/core/test/render3/change_detection_spec.ts b/packages/core/test/render3/change_detection_spec.ts
index 5fcbc3c016..dd694d4430 100644
--- a/packages/core/test/render3/change_detection_spec.ts
+++ b/packages/core/test/render3/change_detection_spec.ts
@@ -676,7 +676,8 @@ describe('change detection', () => {
 
         class OnPushComp {
           /** @Input() */
-          value: string;
+          // TODO(issue/24571): remove '!'.
+          value !: string;
 
           constructor(public cdr: ChangeDetectorRef) {}
 
diff --git a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
index 90cd8ce01c..8667fd53dc 100644
--- a/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/component_directives_spec.ts
@@ -292,7 +292,8 @@ describe('components & directives', () => {
       changeDetection: ChangeDetectionStrategy.OnPush
     })
     class MyComp {
-      @Input() name: string;
+      // TODO(issue/24571): remove '!'.
+      @Input() name !: string;
 
       // NORMATIVE
       static ngComponentDef = $r3$.ɵdefineComponent({
@@ -416,7 +417,8 @@ describe('components & directives', () => {
       `
     })
     class MyArrayComp {
-      @Input() names: string[];
+      // TODO(issue/24571): remove '!'.
+      @Input() names !: string[];
 
       static ngComponentDef = $r3$.ɵdefineComponent({
         type: MyArrayComp,
@@ -524,7 +526,8 @@ describe('components & directives', () => {
 
       @Component({selector: 'my-comp', template: `{{ num }}`})
       class MyComp {
-        num: number;
+        // TODO(issue/24571): remove '!'.
+        num !: number;
 
         static ngComponentDef = $r3$.ɵdefineComponent({
           type: MyComp,
@@ -646,7 +649,8 @@ describe('components & directives', () => {
         `
       })
       class MyComp {
-        @Input() names: string[];
+        // TODO(issue/24571): remove '!'.
+        @Input() names !: string[];
 
         static ngComponentDef = $r3$.ɵdefineComponent({
           type: MyComp,
@@ -751,7 +755,8 @@ describe('components & directives', () => {
         `
       })
       class ObjectComp {
-        config: {[key: string]: any};
+        // TODO(issue/24571): remove '!'.
+        config !: {[key: string]: any};
 
         static ngComponentDef = $r3$.ɵdefineComponent({
           type: ObjectComp,
@@ -827,7 +832,8 @@ describe('components & directives', () => {
         `
       })
       class NestedComp {
-        config: {[key: string]: any};
+        // TODO(issue/24571): remove '!'.
+        config !: {[key: string]: any};
 
         static ngComponentDef = $r3$.ɵdefineComponent({
           type: NestedComp,
diff --git a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
index 6738ee94e0..f8cedef8ed 100644
--- a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
@@ -25,7 +25,8 @@ describe('lifecycle hooks', () => {
 
   @Component({selector: 'lifecycle-comp', template: ``})
   class LifecycleComp {
-    @Input('name') nameMin: string;
+    // TODO(issue/24571): remove '!'.
+    @Input('name') nameMin !: string;
 
     ngOnChanges() { events.push('changes' + this.nameMin); }
 
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index 4861072624..3946badeb4 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -44,8 +44,10 @@ describe('queries', () => {
     `
     })
     class ViewQueryComponent {
-      @ViewChild(SomeDirective) someDir: SomeDirective;
-      @ViewChildren(SomeDirective) someDirList: QueryList<SomeDirective>;
+      // TODO(issue/24571): remove '!'.
+      @ViewChild(SomeDirective) someDir !: SomeDirective;
+      // TODO(issue/24571): remove '!'.
+      @ViewChildren(SomeDirective) someDirList !: QueryList<SomeDirective>;
 
       // NORMATIVE
       static ngComponentDef = $r3$.ɵdefineComponent({
@@ -97,8 +99,10 @@ describe('queries', () => {
       `
     })
     class ContentQueryComponent {
-      @ContentChild(SomeDirective) someDir: SomeDirective;
-      @ContentChildren(SomeDirective) someDirList: QueryList<SomeDirective>;
+      // TODO(issue/24571): remove '!'.
+      @ContentChild(SomeDirective) someDir !: SomeDirective;
+      // TODO(issue/24571): remove '!'.
+      @ContentChildren(SomeDirective) someDirList !: QueryList<SomeDirective>;
 
       // NORMATIVE
       static ngComponentDef = $r3$.ɵdefineComponent({
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index 8f57e5d805..0633142d6b 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -27,11 +27,13 @@ describe('template variables', () => {
 
   @Directive({selector: '[forOf]'})
   class ForOfDirective {
-    private previous: any[];
+    // TODO(issue/24571): remove '!'.
+    private previous !: any[];
 
     constructor(private view: ViewContainerRef, private template: TemplateRef<any>) {}
 
-    @Input() forOf: any[];
+    // TODO(issue/24571): remove '!'.
+    @Input() forOf !: any[];
 
     ngOnChanges(simpleChanges: SimpleChanges) {
       if ('forOf' in simpleChanges) {
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index c73fc4c0f6..49a1e13857 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -130,7 +130,8 @@ describe('component with a container', () => {
   }
 
   class WrapperComponent {
-    items: string[];
+    // TODO(issue/24571): remove '!'.
+    items !: string[];
     static ngComponentDef = defineComponent({
       type: WrapperComponent,
       selectors: [['wrapper']],
@@ -367,7 +368,8 @@ describe('recursive components', () => {
 
   it('should map inputs minified & unminified names', async() => {
     class TestInputsComponent {
-      minifiedName: string;
+      // TODO(issue/24571): remove '!'.
+      minifiedName !: string;
       static ngComponentDef = defineComponent({
         type: TestInputsComponent,
         selectors: [['test-inputs']],
diff --git a/packages/core/test/render3/define_spec.ts b/packages/core/test/render3/define_spec.ts
index 165895866d..bd4d2bbac3 100644
--- a/packages/core/test/render3/define_spec.ts
+++ b/packages/core/test/render3/define_spec.ts
@@ -54,7 +54,8 @@ describe('define', () => {
         class MyDirective implements OnChanges {
           public log: Array<string|SimpleChange> = [];
           public valA: string = 'initValue';
-          public valB: string;
+          // TODO(issue/24571): remove '!'.
+          public valB !: string;
 
           ngOnChanges(changes: SimpleChanges): void {
             this.log.push('valA', changes['valA']);
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index e910548115..96e34f7cdc 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -556,7 +556,8 @@ describe('di', () => {
     describe('flags', () => {
 
       class DirB {
-        value: string;
+        // TODO(issue/24571): remove '!'.
+        value !: string;
 
         static ngDirectiveDef = defineDirective({
           type: DirB,
diff --git a/packages/core/test/render3/directive_spec.ts b/packages/core/test/render3/directive_spec.ts
index a84c9008b9..344105e3d4 100644
--- a/packages/core/test/render3/directive_spec.ts
+++ b/packages/core/test/render3/directive_spec.ts
@@ -61,8 +61,10 @@ describe('directive', () => {
           inputs: {test: 'test', other: 'other'}
         });
 
-        testValue: boolean;
-        other: boolean;
+        // TODO(issue/24571): remove '!'.
+        testValue !: boolean;
+        // TODO(issue/24571): remove '!'.
+        other !: boolean;
 
         /**
          * A setter to assert that a binding is not invoked with stringified attribute value
@@ -108,9 +110,12 @@ describe('directive', () => {
              inputs: {test: 'test', prop1: 'prop1', prop2: 'prop2'}
            });
 
-           prop1: boolean;
-           prop2: boolean;
-           testValue: boolean;
+           // TODO(issue/24571): remove '!'.
+           prop1 !: boolean;
+           // TODO(issue/24571): remove '!'.
+           prop2 !: boolean;
+           // TODO(issue/24571): remove '!'.
+           testValue !: boolean;
 
 
            /**
diff --git a/packages/core/test/render3/exports_spec.ts b/packages/core/test/render3/exports_spec.ts
index 0ff071c707..824b76e6c6 100644
--- a/packages/core/test/render3/exports_spec.ts
+++ b/packages/core/test/render3/exports_spec.ts
@@ -76,7 +76,8 @@ describe('exports', () => {
     }
 
     class MyDir {
-      myDir: MyComponent;
+      // TODO(issue/24571): remove '!'.
+      myDir !: MyComponent;
       constructor() { myDir = this; }
       static ngDirectiveDef = defineDirective({
         type: MyDir,
@@ -242,7 +243,8 @@ describe('exports', () => {
       }
 
       class MyDir {
-        myDir: MyComponent;
+        // TODO(issue/24571): remove '!'.
+        myDir !: MyComponent;
 
         constructor() { myDir = this; }
 
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 50d643dc28..48a6bcb652 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -459,7 +459,8 @@ class LocalSanitizedValue {
 }
 
 class LocalMockSanitizer implements Sanitizer {
-  public lastSanitizedValue: string|null;
+  // TODO(issue/24571): remove '!'.
+  public lastSanitizedValue !: string | null;
 
   constructor(private _interceptor: (value: string|null|any) => string) {}
 
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 37e0729b91..7307ab49a7 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -375,7 +375,8 @@ describe('render3 integration test', () => {
        * % }
        */
       class MyComp {
-        condition: boolean;
+        // TODO(issue/24571): remove '!'.
+        condition !: boolean;
         static ngComponentDef = defineComponent({
           type: MyComp,
           selectors: [['comp']],
@@ -491,8 +492,10 @@ describe('render3 integration test', () => {
     }
 
     class ChildComponent {
-      beforeTree: Tree;
-      afterTree: Tree;
+      // TODO(issue/24571): remove '!'.
+      beforeTree !: Tree;
+      // TODO(issue/24571): remove '!'.
+      afterTree !: Tree;
       static ngComponentDef = defineComponent({
         selectors: [['child']],
         type: ChildComponent,
diff --git a/packages/core/test/render3/listeners_spec.ts b/packages/core/test/render3/listeners_spec.ts
index f9aa7042ec..867a859d8e 100644
--- a/packages/core/test/render3/listeners_spec.ts
+++ b/packages/core/test/render3/listeners_spec.ts
@@ -46,7 +46,8 @@ describe('event listeners', () => {
 
   class PreventDefaultComp {
     handlerReturnValue: any = true;
-    event: Event;
+    // TODO(issue/24571): remove '!'.
+    event !: Event;
 
     onClick(e: any) {
       this.event = e;
diff --git a/packages/core/test/render3/outputs_spec.ts b/packages/core/test/render3/outputs_spec.ts
index f08cb0827b..c983fac6d8 100644
--- a/packages/core/test/render3/outputs_spec.ts
+++ b/packages/core/test/render3/outputs_spec.ts
@@ -358,7 +358,8 @@ describe('outputs', () => {
     let otherDir: OtherChangeDir;
 
     class OtherChangeDir {
-      change: boolean;
+      // TODO(issue/24571): remove '!'.
+      change !: boolean;
 
       static ngDirectiveDef = defineDirective({
         type: OtherChangeDir,
diff --git a/packages/core/test/render3/pipe_spec.ts b/packages/core/test/render3/pipe_spec.ts
index e5da9bbcbe..3d7c0369d6 100644
--- a/packages/core/test/render3/pipe_spec.ts
+++ b/packages/core/test/render3/pipe_spec.ts
@@ -382,10 +382,13 @@ class MultiArgPipe implements PipeTransform {
 }
 
 class Person {
-  age: number;
-  name: string|null;
+  // TODO(issue/24571): remove '!'.
+  age !: number;
+  // TODO(issue/24571): remove '!'.
+  name !: string | null;
   address: Address|null = null;
-  phones: number[];
+  // TODO(issue/24571): remove '!'.
+  phones !: number[];
 
   init(name: string|null, address: Address|null = null) {
     this.name = name;
diff --git a/packages/core/test/render3/properties_spec.ts b/packages/core/test/render3/properties_spec.ts
index 5bfd9fcfcf..e586dd49d7 100644
--- a/packages/core/test/render3/properties_spec.ts
+++ b/packages/core/test/render3/properties_spec.ts
@@ -99,7 +99,8 @@ describe('elementProperty', () => {
     let idDir: IdDir;
 
     class MyButton {
-      disabled: boolean;
+      // TODO(issue/24571): remove '!'.
+      disabled !: boolean;
 
       static ngDirectiveDef = defineDirective({
         type: MyButton,
@@ -110,7 +111,8 @@ describe('elementProperty', () => {
     }
 
     class OtherDir {
-      id: boolean;
+      // TODO(issue/24571): remove '!'.
+      id !: boolean;
       clickStream = new EventEmitter();
 
       static ngDirectiveDef = defineDirective({
@@ -123,7 +125,8 @@ describe('elementProperty', () => {
     }
 
     class OtherDisabledDir {
-      disabled: boolean;
+      // TODO(issue/24571): remove '!'.
+      disabled !: boolean;
 
       static ngDirectiveDef = defineDirective({
         type: OtherDisabledDir,
@@ -134,7 +137,8 @@ describe('elementProperty', () => {
     }
 
     class IdDir {
-      idNumber: number;
+      // TODO(issue/24571): remove '!'.
+      idNumber !: number;
 
       static ngDirectiveDef = defineDirective({
         type: IdDir,
@@ -208,7 +212,8 @@ describe('elementProperty', () => {
       let comp: Comp;
 
       class Comp {
-        id: number;
+        // TODO(issue/24571): remove '!'.
+        id !: number;
 
         static ngComponentDef = defineComponent({
           type: Comp,
@@ -358,8 +363,10 @@ describe('elementProperty', () => {
   describe('attributes and input properties', () => {
     let myDir: MyDir;
     class MyDir {
-      role: string;
-      direction: string;
+      // TODO(issue/24571): remove '!'.
+      role !: string;
+      // TODO(issue/24571): remove '!'.
+      direction !: string;
       changeStream = new EventEmitter();
 
       static ngDirectiveDef = defineDirective({
@@ -374,7 +381,8 @@ describe('elementProperty', () => {
 
     let dirB: MyDirB;
     class MyDirB {
-      roleB: string;
+      // TODO(issue/24571): remove '!'.
+      roleB !: string;
 
       static ngDirectiveDef = defineDirective({
         type: MyDirB,
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index c3290895f1..32d31f1f68 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -15,7 +15,8 @@ describe('array literals', () => {
   let myComp: MyComp;
 
   class MyComp {
-    names: string[];
+    // TODO(issue/24571): remove '!'.
+    names !: string[];
 
     static ngComponentDef = defineComponent({
       type: MyComp,
@@ -68,8 +69,10 @@ describe('array literals', () => {
     let manyPropComp: ManyPropComp;
 
     class ManyPropComp {
-      names1: string[];
-      names2: string[];
+      // TODO(issue/24571): remove '!'.
+      names1 !: string[];
+      // TODO(issue/24571): remove '!'.
+      names2 !: string[];
 
       static ngComponentDef = defineComponent({
         type: ManyPropComp,
@@ -331,7 +334,8 @@ describe('object literals', () => {
   let objectComp: ObjectComp;
 
   class ObjectComp {
-    config: {[key: string]: any};
+    // TODO(issue/24571): remove '!'.
+    config !: {[key: string]: any};
 
     static ngComponentDef = defineComponent({
       type: ObjectComp,
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 9c613e81d8..537f1b0b1d 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -933,7 +933,8 @@ describe('query', () => {
          * }
          */
         class Cmpt {
-          value: string[];
+          // TODO(issue/24571): remove '!'.
+          value !: string[];
           query: any;
           static ngComponentDef = defineComponent({
             type: Cmpt,
@@ -1689,7 +1690,8 @@ describe('query', () => {
 
       class WithContentComponent {
         // @ContentChildren('foo') foos;
-        foos: QueryList<ElementRef>;
+        // TODO(issue/24571): remove '!'.
+        foos !: QueryList<ElementRef>;
 
         static ngComponentDef = defineComponent({
           type: WithContentComponent,
diff --git a/packages/core/test/render3/renderer_factory_spec.ts b/packages/core/test/render3/renderer_factory_spec.ts
index 3cf26ecaf3..8edec6b303 100644
--- a/packages/core/test/render3/renderer_factory_spec.ts
+++ b/packages/core/test/render3/renderer_factory_spec.ts
@@ -136,7 +136,8 @@ describe('animation renderer factory', () => {
   }
 
   class SomeComponentWithAnimation {
-    exp: string;
+    // TODO(issue/24571): remove '!'.
+    exp !: string;
     callback(event: AnimationEvent) {
       eventLogs.push(`${event.fromState ? event.fromState : event.toState} - ${event.phaseName}`);
     }
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index d8282f76e7..cb4e31f50a 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -29,7 +29,8 @@ describe('ViewContainerRef', () => {
       inputs: {tplRef: 'tplRef'}
     });
 
-    tplRef: TemplateRef<{}>;
+    // TODO(issue/24571): remove '!'.
+    tplRef !: TemplateRef<{}>;
 
     // injecting a ViewContainerRef to create a dynamic container in which embedded views will be
     // created
@@ -215,7 +216,8 @@ describe('ViewContainerRef', () => {
             * |after
             */
            class TestComponent {
-             testDir: TestDirective;
+             // TODO(issue/24571): remove '!'.
+             testDir !: TestDirective;
              static ngComponentDef = defineComponent({
                type: TestComponent,
                selectors: [['test-cmp']],
@@ -278,7 +280,8 @@ describe('ViewContainerRef', () => {
             */
            class TestComponent {
              condition = false;
-             testDir: TestDirective;
+             // TODO(issue/24571): remove '!'.
+             testDir !: TestDirective;
              static ngComponentDef = defineComponent({
                type: TestComponent,
                selectors: [['test-cmp']],
@@ -335,7 +338,8 @@ describe('ViewContainerRef', () => {
       it('should apply directives and pipes of the host view to the TemplateRef', () => {
         @Component({selector: 'child', template: `{{name}}`})
         class Child {
-          name: string;
+          // TODO(issue/24571): remove '!'.
+          name !: string;
 
           static ngComponentDef = defineComponent({
             type: Child,
@@ -902,7 +906,8 @@ describe('ViewContainerRef', () => {
     it('should call all hooks in correct order', () => {
       @Component({selector: 'hooks', template: `{{name}}`})
       class ComponentWithHooks {
-        name: string;
+        // TODO(issue/24571): remove '!'.
+        name !: string;
 
         private log(msg: string) { log.push(msg); }
 
diff --git a/packages/core/test/view/query_spec.ts b/packages/core/test/view/query_spec.ts
index 4aded64ac0..1eba518ca9 100644
--- a/packages/core/test/view/query_spec.ts
+++ b/packages/core/test/view/query_spec.ts
@@ -20,7 +20,8 @@ import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedVi
     class AService {}
 
     class QueryService {
-      a: QueryList<AService>;
+      // TODO(issue/24571): remove '!'.
+      a !: QueryList<AService>;
     }
 
     function contentQueryProviders(checkIndex: number) {
@@ -247,7 +248,8 @@ import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedVi
     describe('QueryBindingType', () => {
       it('should query all matches', () => {
         class QueryService {
-          a: QueryList<AService>;
+          // TODO(issue/24571): remove '!'.
+          a !: QueryList<AService>;
         }
 
         const {view} = createAndGetRootNodes(compViewDef([
@@ -272,7 +274,8 @@ import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedVi
 
       it('should query the first match', () => {
         class QueryService {
-          a: AService;
+          // TODO(issue/24571): remove '!'.
+          a !: AService;
         }
 
         const {view} = createAndGetRootNodes(compViewDef([
@@ -295,7 +298,8 @@ import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedVi
     describe('query builtins', () => {
       it('should query ElementRef', () => {
         class QueryService {
-          a: ElementRef;
+          // TODO(issue/24571): remove '!'.
+          a !: ElementRef;
         }
 
         const {view} = createAndGetRootNodes(compViewDef([
@@ -314,7 +318,8 @@ import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedVi
 
       it('should query TemplateRef', () => {
         class QueryService {
-          a: TemplateRef<any>;
+          // TODO(issue/24571): remove '!'.
+          a !: TemplateRef<any>;
         }
 
         const {view} = createAndGetRootNodes(compViewDef([
@@ -335,7 +340,8 @@ import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedVi
 
       it('should query ViewContainerRef', () => {
         class QueryService {
-          a: ViewContainerRef;
+          // TODO(issue/24571): remove '!'.
+          a !: ViewContainerRef;
         }
 
         const {view} = createAndGetRootNodes(compViewDef([
diff --git a/packages/core/testing/src/async_test_completer.ts b/packages/core/testing/src/async_test_completer.ts
index 767017bfa8..cfa94d650e 100644
--- a/packages/core/testing/src/async_test_completer.ts
+++ b/packages/core/testing/src/async_test_completer.ts
@@ -10,8 +10,10 @@
  * Injectable completer that allows signaling completion of an asynchronous test. Used internally.
  */
 export class AsyncTestCompleter {
-  private _resolve: (result: any) => void;
-  private _reject: (err: any) => void;
+  // TODO(issue/24571): remove '!'.
+  private _resolve !: (result: any) => void;
+  // TODO(issue/24571): remove '!'.
+  private _reject !: (err: any) => void;
   private _promise: Promise<any> = new Promise((res, rej) => {
     this._resolve = res;
     this._reject = rej;
diff --git a/packages/elements/src/component-factory-strategy.ts b/packages/elements/src/component-factory-strategy.ts
index 2474c0fc9e..a160d174be 100644
--- a/packages/elements/src/component-factory-strategy.ts
+++ b/packages/elements/src/component-factory-strategy.ts
@@ -44,10 +44,12 @@ export class ComponentNgElementStrategyFactory implements NgElementStrategyFacto
  */
 export class ComponentNgElementStrategy implements NgElementStrategy {
   /** Merged stream of the component's output events. */
-  events: Observable<NgElementStrategyEvent>;
+  // TODO(issue/24571): remove '!'.
+  events !: Observable<NgElementStrategyEvent>;
 
   /** Reference to the component that was created on connect. */
-  private componentRef: ComponentRef<any>|null;
+  // TODO(issue/24571): remove '!'.
+  private componentRef !: ComponentRef<any>| null;
 
   /** Changes that have been made to the component ref since the last time onChanges was called. */
   private inputChanges: SimpleChanges|null = null;
diff --git a/packages/elements/src/create-custom-element.ts b/packages/elements/src/create-custom-element.ts
index ce70f3ae7a..85078e9205 100644
--- a/packages/elements/src/create-custom-element.ts
+++ b/packages/elements/src/create-custom-element.ts
@@ -43,7 +43,8 @@ export abstract class NgElement extends HTMLElement {
   /**
    * The strategy that controls how a component is transformed in a custom element.
    */
-  protected ngElementStrategy: NgElementStrategy;
+  // TODO(issue/24571): remove '!'.
+  protected ngElementStrategy !: NgElementStrategy;
   /**
    * A subscription to change, connect, and disconnect events in the custom element.
    */
diff --git a/packages/elements/test/create-custom-element_spec.ts b/packages/elements/test/create-custom-element_spec.ts
index dbb82d31e4..94be8b4137 100644
--- a/packages/elements/test/create-custom-element_spec.ts
+++ b/packages/elements/test/create-custom-element_spec.ts
@@ -103,7 +103,8 @@ if (typeof customElements !== 'undefined') {
 })
 class TestComponent {
   @Input() fooFoo: string = 'foo';
-  @Input('barbar') barBar: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('barbar') barBar !: string;
 
   @Output() bazBaz = new EventEmitter<boolean>();
   @Output('quxqux') quxQux = new EventEmitter<Object>();
diff --git a/packages/examples/common/pipes/ts/lowerupper_pipe.ts b/packages/examples/common/pipes/ts/lowerupper_pipe.ts
index ad071916ed..4e466b0cbb 100644
--- a/packages/examples/common/pipes/ts/lowerupper_pipe.ts
+++ b/packages/examples/common/pipes/ts/lowerupper_pipe.ts
@@ -18,7 +18,8 @@ import {Component} from '@angular/core';
   </div>`
 })
 export class LowerUpperPipeComponent {
-  value: string;
+  // TODO(issue/24571): remove '!'.
+  value !: string;
   change(value: string) { this.value = value; }
 }
 // #enddocregion
diff --git a/packages/examples/core/animation/ts/dsl/animation_example.ts b/packages/examples/core/animation/ts/dsl/animation_example.ts
index f561085b58..dc3e527ed7 100644
--- a/packages/examples/core/animation/ts/dsl/animation_example.ts
+++ b/packages/examples/core/animation/ts/dsl/animation_example.ts
@@ -43,7 +43,8 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
   `
 })
 export class MyExpandoCmp {
-  stateExpression: string;
+  // TODO(issue/24571): remove '!'.
+  stateExpression !: string;
   constructor() { this.collapse(); }
   expand() { this.stateExpression = 'expanded'; }
   collapse() { this.stateExpression = 'collapsed'; }
diff --git a/packages/examples/core/di/ts/contentChild/content_child_example.ts b/packages/examples/core/di/ts/contentChild/content_child_example.ts
index cde1dfa40f..a734781912 100644
--- a/packages/examples/core/di/ts/contentChild/content_child_example.ts
+++ b/packages/examples/core/di/ts/contentChild/content_child_example.ts
@@ -11,7 +11,8 @@ import {Component, ContentChild, Directive, Input} from '@angular/core';
 
 @Directive({selector: 'pane'})
 export class Pane {
-  @Input() id: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() id !: string;
 }
 
 @Component({
@@ -21,7 +22,8 @@ export class Pane {
   `
 })
 export class Tab {
-  @ContentChild(Pane) pane: Pane;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(Pane) pane !: Pane;
 }
 
 @Component({
diff --git a/packages/examples/core/di/ts/contentChild/content_child_howto.ts b/packages/examples/core/di/ts/contentChild/content_child_howto.ts
index 830aca8d3b..1000fb3a62 100644
--- a/packages/examples/core/di/ts/contentChild/content_child_howto.ts
+++ b/packages/examples/core/di/ts/contentChild/content_child_howto.ts
@@ -15,7 +15,8 @@ class ChildDirective {
 
 @Directive({selector: 'someDir'})
 class SomeDir implements AfterContentInit {
-  @ContentChild(ChildDirective) contentChild: ChildDirective;
+  // TODO(issue/24571): remove '!'.
+  @ContentChild(ChildDirective) contentChild !: ChildDirective;
 
   ngAfterContentInit() {
     // contentChild is set
diff --git a/packages/examples/core/di/ts/contentChildren/content_children_example.ts b/packages/examples/core/di/ts/contentChildren/content_children_example.ts
index 9e49b2077c..d298a93442 100644
--- a/packages/examples/core/di/ts/contentChildren/content_children_example.ts
+++ b/packages/examples/core/di/ts/contentChildren/content_children_example.ts
@@ -11,7 +11,8 @@ import {Component, ContentChildren, Directive, Input, QueryList} from '@angular/
 
 @Directive({selector: 'pane'})
 export class Pane {
-  @Input() id: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() id !: string;
 }
 
 @Component({
@@ -22,8 +23,10 @@ export class Pane {
   `
 })
 export class Tab {
-  @ContentChildren(Pane) topLevelPanes: QueryList<Pane>;
-  @ContentChildren(Pane, {descendants: true}) arbitraryNestedPanes: QueryList<Pane>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(Pane) topLevelPanes !: QueryList<Pane>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(Pane, {descendants: true}) arbitraryNestedPanes !: QueryList<Pane>;
 
   get serializedPanes(): string {
     return this.topLevelPanes ? this.topLevelPanes.map(p => p.id).join(', ') : '';
diff --git a/packages/examples/core/di/ts/contentChildren/content_children_howto.ts b/packages/examples/core/di/ts/contentChildren/content_children_howto.ts
index 268f5fefdf..776ed57daf 100644
--- a/packages/examples/core/di/ts/contentChildren/content_children_howto.ts
+++ b/packages/examples/core/di/ts/contentChildren/content_children_howto.ts
@@ -15,7 +15,8 @@ class ChildDirective {
 
 @Directive({selector: 'someDir'})
 class SomeDir implements AfterContentInit {
-  @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(ChildDirective) contentChildren !: QueryList<ChildDirective>;
 
   ngAfterContentInit() {
     // contentChildren is set
diff --git a/packages/examples/core/di/ts/provider_spec.ts b/packages/examples/core/di/ts/provider_spec.ts
index 605ec44398..087a376759 100644
--- a/packages/examples/core/di/ts/provider_spec.ts
+++ b/packages/examples/core/di/ts/provider_spec.ts
@@ -55,7 +55,9 @@ import {Injectable, InjectionToken, Injector, Optional, ReflectiveInjector} from
     describe('ClassProvider', () => {
       it('works', () => {
         // #docregion ClassProvider
-        abstract class Shape { name: string; }
+        abstract class Shape {  // TODO(issue/24571): remove '!'.
+          name !: string;
+        }
 
         class Square extends Shape {
           name = 'square';
@@ -92,7 +94,9 @@ import {Injectable, InjectionToken, Injector, Optional, ReflectiveInjector} from
     describe('StaticClassProvider', () => {
       it('works', () => {
         // #docregion StaticClassProvider
-        abstract class Shape { name: string; }
+        abstract class Shape {  // TODO(issue/24571): remove '!'.
+          name !: string;
+        }
 
         class Square extends Shape {
           name = 'square';
diff --git a/packages/examples/core/di/ts/viewChild/view_child_example.ts b/packages/examples/core/di/ts/viewChild/view_child_example.ts
index 8611d9037d..4f7ccd15b1 100644
--- a/packages/examples/core/di/ts/viewChild/view_child_example.ts
+++ b/packages/examples/core/di/ts/viewChild/view_child_example.ts
@@ -11,7 +11,8 @@ import {Component, Directive, Input, ViewChild} from '@angular/core';
 
 @Directive({selector: 'pane'})
 export class Pane {
-  @Input() id: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() id !: string;
 }
 
 @Component({
diff --git a/packages/examples/core/di/ts/viewChild/view_child_howto.ts b/packages/examples/core/di/ts/viewChild/view_child_howto.ts
index fb36209ad4..a0753ddbbb 100644
--- a/packages/examples/core/di/ts/viewChild/view_child_howto.ts
+++ b/packages/examples/core/di/ts/viewChild/view_child_howto.ts
@@ -15,7 +15,8 @@ class ChildDirective {
 
 @Component({selector: 'someCmp', templateUrl: 'someCmp.html'})
 class SomeCmp implements AfterViewInit {
-  @ViewChild(ChildDirective) child: ChildDirective;
+  // TODO(issue/24571): remove '!'.
+  @ViewChild(ChildDirective) child !: ChildDirective;
 
   ngAfterViewInit() {
     // child is set
diff --git a/packages/examples/core/di/ts/viewChildren/view_children_example.ts b/packages/examples/core/di/ts/viewChildren/view_children_example.ts
index 361e4a598b..bd5e95233b 100644
--- a/packages/examples/core/di/ts/viewChildren/view_children_example.ts
+++ b/packages/examples/core/di/ts/viewChildren/view_children_example.ts
@@ -11,7 +11,8 @@ import {AfterViewInit, Component, Directive, Input, QueryList, ViewChildren} fro
 
 @Directive({selector: 'pane'})
 export class Pane {
-  @Input() id: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() id !: string;
 }
 
 @Component({
@@ -27,7 +28,8 @@ export class Pane {
   `,
 })
 export class ViewChildrenComp implements AfterViewInit {
-  @ViewChildren(Pane) panes: QueryList<Pane>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(Pane) panes !: QueryList<Pane>;
   serializedPanes: string = '';
 
   shouldShow = false;
diff --git a/packages/examples/core/di/ts/viewChildren/view_children_howto.ts b/packages/examples/core/di/ts/viewChildren/view_children_howto.ts
index 38f1f93d05..7675788391 100644
--- a/packages/examples/core/di/ts/viewChildren/view_children_howto.ts
+++ b/packages/examples/core/di/ts/viewChildren/view_children_howto.ts
@@ -15,7 +15,8 @@ class ChildDirective {
 
 @Component({selector: 'someCmp', templateUrl: 'someCmp.html'})
 class SomeCmp implements AfterViewInit {
-  @ViewChildren(ChildDirective) viewChildren: QueryList<ChildDirective>;
+  // TODO(issue/24571): remove '!'.
+  @ViewChildren(ChildDirective) viewChildren !: QueryList<ChildDirective>;
 
   ngAfterViewInit() {
     // viewChildren is set
diff --git a/packages/examples/core/ts/metadata/lifecycle_hooks_spec.ts b/packages/examples/core/ts/metadata/lifecycle_hooks_spec.ts
index 197f64fa46..a4a0d76b59 100644
--- a/packages/examples/core/ts/metadata/lifecycle_hooks_spec.ts
+++ b/packages/examples/core/ts/metadata/lifecycle_hooks_spec.ts
@@ -106,8 +106,9 @@ import {TestBed} from '@angular/core/testing';
       // #docregion OnChanges
       @Component({selector: 'my-cmp', template: `...`})
       class MyComponent implements OnChanges {
+        // TODO(issue/24571): remove '!'.
         @Input()
-        prop: number;
+        prop !: number;
 
         ngOnChanges(changes: SimpleChanges) {
           // changes.prop contains the old and the new value...
diff --git a/packages/examples/upgrade/static/ts/module.ts b/packages/examples/upgrade/static/ts/module.ts
index 38abb49a04..832bfee563 100644
--- a/packages/examples/upgrade/static/ts/module.ts
+++ b/packages/examples/upgrade/static/ts/module.ts
@@ -30,7 +30,8 @@ interface Hero {
              <button (click)="addHero.emit()">Add Hero</button>`,
 })
 class Ng2HeroesComponent {
-  @Input() heroes: Hero[];
+  // TODO(issue/24571): remove '!'.
+  @Input() heroes !: Hero[];
   @Output() addHero = new EventEmitter();
   @Output() removeHero = new EventEmitter();
 }
@@ -69,8 +70,10 @@ class Ng1HeroComponentWrapper extends UpgradeComponent implements OnInit, OnChan
     OnDestroy {
   // The names of the input and output properties here must match the names of the
   // `<` and `&` bindings in the AngularJS component that is being wrapped
-  @Input() hero: Hero;
-  @Output() onRemove: EventEmitter<void>;
+  // TODO(issue/24571): remove '!'.
+  @Input() hero !: Hero;
+  // TODO(issue/24571): remove '!'.
+  @Output() onRemove !: EventEmitter<void>;
   constructor(@Inject(ElementRef) elementRef: ElementRef, @Inject(Injector) injector: Injector) {
     // We must pass the name of the directive as used by AngularJS to the super
     super('ng1Hero', elementRef, injector);
diff --git a/packages/forms/src/directives/abstract_form_group_directive.ts b/packages/forms/src/directives/abstract_form_group_directive.ts
index 91e446a33c..ff1cf32125 100644
--- a/packages/forms/src/directives/abstract_form_group_directive.ts
+++ b/packages/forms/src/directives/abstract_form_group_directive.ts
@@ -24,13 +24,16 @@ import {AsyncValidatorFn, ValidatorFn} from './validators';
  */
 export class AbstractFormGroupDirective extends ControlContainer implements OnInit, OnDestroy {
   /** @internal */
-  _parent: ControlContainer;
+  // TODO(issue/24571): remove '!'.
+  _parent !: ControlContainer;
 
   /** @internal */
-  _validators: any[];
+  // TODO(issue/24571): remove '!'.
+  _validators !: any[];
 
   /** @internal */
-  _asyncValidators: any[];
+  // TODO(issue/24571): remove '!'.
+  _asyncValidators !: any[];
 
   ngOnInit(): void {
     this._checkParentType();
diff --git a/packages/forms/src/directives/control_container.ts b/packages/forms/src/directives/control_container.ts
index 9002b212ab..1f5cd0293f 100644
--- a/packages/forms/src/directives/control_container.ts
+++ b/packages/forms/src/directives/control_container.ts
@@ -18,7 +18,8 @@ import {Form} from './form_interface';
  *
  */
 export abstract class ControlContainer extends AbstractControlDirective {
-  name: string;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
 
   /**
    * Get the form to which this container belongs.
diff --git a/packages/forms/src/directives/ng_form.ts b/packages/forms/src/directives/ng_form.ts
index ee285127bf..1ba42526b6 100644
--- a/packages/forms/src/directives/ng_form.ts
+++ b/packages/forms/src/directives/ng_form.ts
@@ -93,7 +93,8 @@ export class NgForm extends ControlContainer implements Form,
    * ```
    *
    */
-  @Input('ngFormOptions') options: {updateOn?: FormHooks};
+  // TODO(issue/24571): remove '!'.
+  @Input('ngFormOptions') options !: {updateOn?: FormHooks};
 
   constructor(
       @Optional() @Self() @Inject(NG_VALIDATORS) validators: any[],
diff --git a/packages/forms/src/directives/ng_model.ts b/packages/forms/src/directives/ng_model.ts
index 882153d794..966bbe04b2 100644
--- a/packages/forms/src/directives/ng_model.ts
+++ b/packages/forms/src/directives/ng_model.ts
@@ -115,8 +115,10 @@ export class NgModel extends NgControl implements OnChanges,
   _registered = false;
   viewModel: any;
 
-  @Input() name: string;
-  @Input('disabled') isDisabled: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() name !: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('disabled') isDisabled !: boolean;
   @Input('ngModel') model: any;
 
   /**
@@ -156,7 +158,9 @@ export class NgModel extends NgControl implements OnChanges,
    * ```
    *
    */
-  @Input('ngModelOptions') options: {name?: string, standalone?: boolean, updateOn?: FormHooks};
+  // TODO(issue/24571): remove '!'.
+  @Input('ngModelOptions')
+  options !: {name?: string, standalone?: boolean, updateOn?: FormHooks};
 
   @Output('ngModelChange') update = new EventEmitter();
 
diff --git a/packages/forms/src/directives/ng_model_group.ts b/packages/forms/src/directives/ng_model_group.ts
index 88af18344b..e6d88209c8 100644
--- a/packages/forms/src/directives/ng_model_group.ts
+++ b/packages/forms/src/directives/ng_model_group.ts
@@ -47,7 +47,8 @@ export const modelGroupProvider: any = {
  */
 @Directive({selector: '[ngModelGroup]', providers: [modelGroupProvider], exportAs: 'ngModelGroup'})
 export class NgModelGroup extends AbstractFormGroupDirective implements OnInit, OnDestroy {
-  @Input('ngModelGroup') name: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('ngModelGroup') name !: string;
 
   constructor(
       @Host() @SkipSelf() parent: ControlContainer,
diff --git a/packages/forms/src/directives/radio_control_value_accessor.ts b/packages/forms/src/directives/radio_control_value_accessor.ts
index 13343f7bd3..9816da683f 100644
--- a/packages/forms/src/directives/radio_control_value_accessor.ts
+++ b/packages/forms/src/directives/radio_control_value_accessor.ts
@@ -92,16 +92,21 @@ export class RadioControlRegistry {
 export class RadioControlValueAccessor implements ControlValueAccessor,
     OnDestroy, OnInit {
   /** @internal */
-  _state: boolean;
+  // TODO(issue/24571): remove '!'.
+  _state !: boolean;
   /** @internal */
-  _control: NgControl;
+  // TODO(issue/24571): remove '!'.
+  _control !: NgControl;
   /** @internal */
-  _fn: Function;
+  // TODO(issue/24571): remove '!'.
+  _fn !: Function;
   onChange = () => {};
   onTouched = () => {};
 
-  @Input() name: string;
-  @Input() formControlName: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() name !: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() formControlName !: string;
   @Input() value: any;
 
   constructor(
diff --git a/packages/forms/src/directives/reactive_directives/form_control_directive.ts b/packages/forms/src/directives/reactive_directives/form_control_directive.ts
index 0683aeba66..51b9068aae 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_directive.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_directive.ts
@@ -141,7 +141,8 @@ export const formControlBinding: any = {
 export class FormControlDirective extends NgControl implements OnChanges {
   viewModel: any;
 
-  @Input('formControl') form: FormControl;
+  // TODO(issue/24571): remove '!'.
+  @Input('formControl') form !: FormControl;
 
   @Input('disabled')
   set isDisabled(isDisabled: boolean) { ReactiveErrors.disabledAttrWarning(); }
diff --git a/packages/forms/src/directives/reactive_directives/form_control_name.ts b/packages/forms/src/directives/reactive_directives/form_control_name.ts
index da9bb6de83..66cfa050e7 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_name.ts
@@ -153,9 +153,11 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
   private _added = false;
   /** @internal */
   viewModel: any;
-  readonly control: FormControl;
+  // TODO(issue/24571): remove '!'.
+  readonly control !: FormControl;
 
-  @Input('formControlName') name: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('formControlName') name !: string;
 
   @Input('disabled')
   set isDisabled(isDisabled: boolean) { ReactiveErrors.disabledAttrWarning(); }
diff --git a/packages/forms/src/directives/reactive_directives/form_group_directive.ts b/packages/forms/src/directives/reactive_directives/form_group_directive.ts
index cd5562e83c..05b244ac59 100644
--- a/packages/forms/src/directives/reactive_directives/form_group_directive.ts
+++ b/packages/forms/src/directives/reactive_directives/form_group_directive.ts
@@ -68,7 +68,8 @@ export class FormGroupDirective extends ControlContainer implements Form,
     OnChanges {
   public readonly submitted: boolean = false;
 
-  private _oldForm: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  private _oldForm !: FormGroup;
   directives: FormControlName[] = [];
 
   @Input('formGroup') form: FormGroup = null !;
diff --git a/packages/forms/src/directives/reactive_directives/form_group_name.ts b/packages/forms/src/directives/reactive_directives/form_group_name.ts
index eb125784f0..b53d1464ab 100644
--- a/packages/forms/src/directives/reactive_directives/form_group_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_group_name.ts
@@ -69,7 +69,8 @@ export const formGroupNameProvider: any = {
  */
 @Directive({selector: '[formGroupName]', providers: [formGroupNameProvider]})
 export class FormGroupName extends AbstractFormGroupDirective implements OnInit, OnDestroy {
-  @Input('formGroupName') name: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('formGroupName') name !: string;
 
   constructor(
       @Optional() @Host() @SkipSelf() parent: ControlContainer,
@@ -152,7 +153,8 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
   /** @internal */
   _asyncValidators: any[];
 
-  @Input('formArrayName') name: string;
+  // TODO(issue/24571): remove '!'.
+  @Input('formArrayName') name !: string;
 
   constructor(
       @Optional() @Host() @SkipSelf() parent: ControlContainer,
diff --git a/packages/forms/src/directives/select_control_value_accessor.ts b/packages/forms/src/directives/select_control_value_accessor.ts
index bd3d8bafaf..1597ae8872 100644
--- a/packages/forms/src/directives/select_control_value_accessor.ts
+++ b/packages/forms/src/directives/select_control_value_accessor.ts
@@ -168,7 +168,8 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
  */
 @Directive({selector: 'option'})
 export class NgSelectOption implements OnDestroy {
-  id: string;
+  // TODO(issue/24571): remove '!'.
+  id !: string;
 
   constructor(
       private _element: ElementRef, private _renderer: Renderer2,
diff --git a/packages/forms/src/directives/select_multiple_control_value_accessor.ts b/packages/forms/src/directives/select_multiple_control_value_accessor.ts
index 4dae1c507a..d30433b1aa 100644
--- a/packages/forms/src/directives/select_multiple_control_value_accessor.ts
+++ b/packages/forms/src/directives/select_multiple_control_value_accessor.ts
@@ -35,7 +35,8 @@ interface HTMLOption {
 
 /** Mock interface for HTMLCollection */
 abstract class HTMLCollection {
-  length: number;
+  // TODO(issue/24571): remove '!'.
+  length !: number;
   abstract item(_: number): HTMLOption;
 }
 
@@ -177,7 +178,8 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
  */
 @Directive({selector: 'option'})
 export class NgSelectMultipleOption implements OnDestroy {
-  id: string;
+  // TODO(issue/24571): remove '!'.
+  id !: string;
   /** @internal */
   _value: any;
 
diff --git a/packages/forms/src/directives/validators.ts b/packages/forms/src/directives/validators.ts
index 791392770d..74bd818b55 100644
--- a/packages/forms/src/directives/validators.ts
+++ b/packages/forms/src/directives/validators.ts
@@ -79,8 +79,10 @@ export const CHECKBOX_REQUIRED_VALIDATOR: StaticProvider = {
   host: {'[attr.required]': 'required ? "" : null'}
 })
 export class RequiredValidator implements Validator {
-  private _required: boolean;
-  private _onChange: () => void;
+  // TODO(issue/24571): remove '!'.
+  private _required !: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _onChange !: () => void;
 
   @Input()
   get required(): boolean|string { return this._required; }
@@ -150,8 +152,10 @@ export const EMAIL_VALIDATOR: any = {
   providers: [EMAIL_VALIDATOR]
 })
 export class EmailValidator implements Validator {
-  private _enabled: boolean;
-  private _onChange: () => void;
+  // TODO(issue/24571): remove '!'.
+  private _enabled !: boolean;
+  // TODO(issue/24571): remove '!'.
+  private _onChange !: () => void;
 
   @Input()
   set email(value: boolean|string) {
@@ -198,10 +202,13 @@ export const MIN_LENGTH_VALIDATOR: any = {
 })
 export class MinLengthValidator implements Validator,
     OnChanges {
-  private _validator: ValidatorFn;
-  private _onChange: () => void;
+  // TODO(issue/24571): remove '!'.
+  private _validator !: ValidatorFn;
+  // TODO(issue/24571): remove '!'.
+  private _onChange !: () => void;
 
-  @Input() minlength: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() minlength !: string;
 
   ngOnChanges(changes: SimpleChanges): void {
     if ('minlength' in changes) {
@@ -248,10 +255,13 @@ export const MAX_LENGTH_VALIDATOR: any = {
 })
 export class MaxLengthValidator implements Validator,
     OnChanges {
-  private _validator: ValidatorFn;
-  private _onChange: () => void;
+  // TODO(issue/24571): remove '!'.
+  private _validator !: ValidatorFn;
+  // TODO(issue/24571): remove '!'.
+  private _onChange !: () => void;
 
-  @Input() maxlength: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() maxlength !: string;
 
   ngOnChanges(changes: SimpleChanges): void {
     if ('maxlength' in changes) {
@@ -299,10 +309,13 @@ export const PATTERN_VALIDATOR: any = {
 })
 export class PatternValidator implements Validator,
     OnChanges {
-  private _validator: ValidatorFn;
-  private _onChange: () => void;
+  // TODO(issue/24571): remove '!'.
+  private _validator !: ValidatorFn;
+  // TODO(issue/24571): remove '!'.
+  private _onChange !: () => void;
 
-  @Input() pattern: string|RegExp;
+  // TODO(issue/24571): remove '!'.
+  @Input() pattern !: string | RegExp;
 
   ngOnChanges(changes: SimpleChanges): void {
     if ('pattern' in changes) {
diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index c0edddc4c9..af833c8e39 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -133,18 +133,22 @@ function isOptionsObj(
  */
 export abstract class AbstractControl {
   /** @internal */
-  _pendingDirty: boolean;
+  // TODO(issue/24571): remove '!'.
+  _pendingDirty !: boolean;
 
   /** @internal */
-  _pendingTouched: boolean;
+  // TODO(issue/24571): remove '!'.
+  _pendingTouched !: boolean;
 
   /** @internal */
   _onCollectionChange = () => {};
 
   /** @internal */
-  _updateOn: FormHooks;
+  // TODO(issue/24571): remove '!'.
+  _updateOn !: FormHooks;
 
-  private _parent: FormGroup|FormArray;
+  // TODO(issue/24571): remove '!'.
+  private _parent !: FormGroup | FormArray;
   private _asyncValidationSubscription: any;
 
   /**
@@ -184,7 +188,8 @@ export abstract class AbstractControl {
    * These status values are mutually exclusive, so a control cannot be
    * both valid AND invalid or invalid AND disabled.
    */
-  public readonly status: string;
+  // TODO(issue/24571): remove '!'.
+  public readonly status !: string;
 
   /**
    * A control is `valid` when its `status` is `VALID`.
@@ -244,7 +249,8 @@ export abstract class AbstractControl {
    * An object containing any errors generated by failing validation,
    * or null if there are no errors.
    */
-  public readonly errors: ValidationErrors|null;
+  // TODO(issue/24571): remove '!'.
+  public readonly errors !: ValidationErrors | null;
 
   /**
    * A control is `pristine` if the user has not yet changed
@@ -284,13 +290,15 @@ export abstract class AbstractControl {
    * A multicasting observable that emits an event every time the value of the control changes, in
    * the UI or programmatically.
    */
-  public readonly valueChanges: Observable<any>;
+  // TODO(issue/24571): remove '!'.
+  public readonly valueChanges !: Observable<any>;
 
   /**
    * A multicasting observable that emits an event every time the validation `status` of the control
    * recalculates.
    */
-  public readonly statusChanges: Observable<any>;
+  // TODO(issue/24571): remove '!'.
+  public readonly statusChanges !: Observable<any>;
 
   /**
    * Reports the update strategy of the `AbstractControl` (meaning
diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts
index b1335d272c..2068970d86 100644
--- a/packages/forms/test/reactive_integration_spec.ts
+++ b/packages/forms/test/reactive_integration_spec.ts
@@ -2467,7 +2467,8 @@ function sortedClassList(el: HTMLElement) {
 
 @Component({selector: 'form-control-comp', template: `<input type="text" [formControl]="control">`})
 class FormControlComp {
-  control: FormControl;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
 }
 
 @Component({
@@ -2478,9 +2479,12 @@ class FormControlComp {
     </form>`
 })
 class FormGroupComp {
-  control: FormControl;
-  form: FormGroup;
-  event: Event;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  event !: Event;
 }
 
 @Component({
@@ -2495,7 +2499,8 @@ class FormGroupComp {
     </form>`
 })
 class NestedFormGroupComp {
-  form: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
 }
 
 @Component({
@@ -2510,8 +2515,10 @@ class NestedFormGroupComp {
      </form>`
 })
 class FormArrayComp {
-  form: FormGroup;
-  cityArray: FormArray;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  cityArray !: FormArray;
 }
 
 @Component({
@@ -2527,8 +2534,10 @@ class FormArrayComp {
      </div>`
 })
 class FormArrayNestedGroup {
-  form: FormGroup;
-  cityArray: FormArray;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  cityArray !: FormArray;
 }
 
 @Component({
@@ -2540,9 +2549,12 @@ class FormArrayNestedGroup {
    </form>`
 })
 class FormGroupNgModel {
-  form: FormGroup;
-  login: string;
-  password: string;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  login !: string;
+  // TODO(issue/24571): remove '!'.
+  password !: string;
 }
 
 @Component({
@@ -2553,10 +2565,14 @@ class FormGroupNgModel {
   `
 })
 class FormControlNgModel {
-  control: FormControl;
-  login: string;
-  passwordControl: FormControl;
-  password: string;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
+  // TODO(issue/24571): remove '!'.
+  login !: string;
+  // TODO(issue/24571): remove '!'.
+  passwordControl !: FormControl;
+  // TODO(issue/24571): remove '!'.
+  password !: string;
 }
 
 @Component({
@@ -2570,7 +2586,8 @@ class FormControlNgModel {
    </div>`
 })
 class LoginIsEmptyWrapper {
-  form: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
 }
 
 @Component({
@@ -2584,11 +2601,16 @@ class LoginIsEmptyWrapper {
    </div>`
 })
 class ValidationBindingsForm {
-  form: FormGroup;
-  required: boolean;
-  minLen: number;
-  maxLen: number;
-  pattern: string;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  required !: boolean;
+  // TODO(issue/24571): remove '!'.
+  minLen !: number;
+  // TODO(issue/24571): remove '!'.
+  maxLen !: number;
+  // TODO(issue/24571): remove '!'.
+  pattern !: string;
 }
 
 @Component({
@@ -2596,7 +2618,8 @@ class ValidationBindingsForm {
   template: `<input type="checkbox" [formControl]="control">`
 })
 class FormControlCheckboxRequiredValidator {
-  control: FormControl;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
 }
 
 @Component({
@@ -2607,5 +2630,6 @@ class FormControlCheckboxRequiredValidator {
   </div>`
 })
 class UniqLoginWrapper {
-  form: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
 }
diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts
index fa8bca586b..8782a89966 100644
--- a/packages/forms/test/template_integration_spec.ts
+++ b/packages/forms/test/template_integration_spec.ts
@@ -1640,7 +1640,8 @@ import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integrat
   `
 })
 class StandaloneNgModel {
-  name: string;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
 }
 
 @Component({
@@ -1652,8 +1653,10 @@ class StandaloneNgModel {
   `
 })
 class NgModelForm {
-  name: string;
-  event: Event;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
+  // TODO(issue/24571): remove '!'.
+  event !: Event;
   options = {};
 
   onReset() {}
@@ -1676,10 +1679,14 @@ class NgModelNativeValidateForm {
   `
 })
 class NgModelGroupForm {
-  first: string;
-  last: string;
-  email: string;
-  isDisabled: boolean;
+  // TODO(issue/24571): remove '!'.
+  first !: string;
+  // TODO(issue/24571): remove '!'.
+  last !: string;
+  // TODO(issue/24571): remove '!'.
+  email !: string;
+  // TODO(issue/24571): remove '!'.
+  isDisabled !: boolean;
   options = {updateOn: 'change'};
 }
 
@@ -1695,7 +1702,8 @@ class NgModelGroupForm {
   `
 })
 class NgModelValidBinding {
-  first: string;
+  // TODO(issue/24571): remove '!'.
+  first !: string;
 }
 
 
@@ -1711,10 +1719,12 @@ class NgModelValidBinding {
   `
 })
 class NgModelNgIfForm {
-  first: string;
+  // TODO(issue/24571): remove '!'.
+  first !: string;
   groupShowing = true;
   emailShowing = true;
-  email: string;
+  // TODO(issue/24571): remove '!'.
+  email !: string;
 }
 
 @Component({
@@ -1749,8 +1759,10 @@ class InvalidNgModelNoName {
   `
 })
 class NgModelOptionsStandalone {
-  one: string;
-  two: string;
+  // TODO(issue/24571): remove '!'.
+  one !: string;
+  // TODO(issue/24571): remove '!'.
+  two !: string;
   options: {name?: string, standalone?: boolean, updateOn?: string} = {standalone: true};
   formOptions = {};
 }
@@ -1767,10 +1779,14 @@ class NgModelOptionsStandalone {
   `
 })
 class NgModelValidationBindings {
-  required: boolean;
-  minLen: number;
-  maxLen: number;
-  pattern: string;
+  // TODO(issue/24571): remove '!'.
+  required !: boolean;
+  // TODO(issue/24571): remove '!'.
+  minLen !: number;
+  // TODO(issue/24571): remove '!'.
+  maxLen !: number;
+  // TODO(issue/24571): remove '!'.
+  pattern !: string;
 }
 
 @Component({
@@ -1782,9 +1798,12 @@ class NgModelValidationBindings {
   `
 })
 class NgModelMultipleValidators {
-  required: boolean;
-  minLen: number;
-  pattern: string|RegExp;
+  // TODO(issue/24571): remove '!'.
+  required !: boolean;
+  // TODO(issue/24571): remove '!'.
+  minLen !: number;
+  // TODO(issue/24571): remove '!'.
+  pattern !: string | RegExp;
 }
 
 @Component({
@@ -1832,7 +1851,8 @@ class NgModelAsyncValidation {
   `
 })
 class NgModelChangesForm {
-  name: string;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
   events: string[] = [];
   options: any;
 
diff --git a/packages/forms/test/value_accessor_integration_spec.ts b/packages/forms/test/value_accessor_integration_spec.ts
index dec9d7e418..609592b09e 100644
--- a/packages/forms/test/value_accessor_integration_spec.ts
+++ b/packages/forms/test/value_accessor_integration_spec.ts
@@ -1088,7 +1088,8 @@ import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'
 
 @Component({selector: 'form-control-comp', template: `<input type="text" [formControl]="control">`})
 export class FormControlComp {
-  control: FormControl;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
 }
 
 @Component({
@@ -1099,10 +1100,14 @@ export class FormControlComp {
     </form>`
 })
 export class FormGroupComp {
-  control: FormControl;
-  form: FormGroup;
-  myGroup: FormGroup;
-  event: Event;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  myGroup !: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  event !: Event;
 }
 
 @Component({
@@ -1110,7 +1115,8 @@ export class FormGroupComp {
   template: `<input type="number" [formControl]="control">`
 })
 class FormControlNumberInput {
-  control: FormControl;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
 }
 
 @Component({
@@ -1269,7 +1275,8 @@ class NgModelSelectMultipleWithCustomCompareFnForm {
   `
 })
 class NgModelSelectMultipleForm {
-  selectedCities: any[];
+  // TODO(issue/24571): remove '!'.
+  selectedCities !: any[];
   cities: any[] = [];
 }
 
@@ -1278,7 +1285,8 @@ class NgModelSelectMultipleForm {
   template: `<input type="range" [formControl]="control">`
 })
 class FormControlRangeInput {
-  control: FormControl;
+  // TODO(issue/24571): remove '!'.
+  control !: FormControl;
 }
 
 @Component({selector: 'ng-model-range-form', template: '<input type="range" [(ngModel)]="val">'})
@@ -1299,7 +1307,8 @@ class NgModelRangeForm {
     <input type="radio" [formControl]="showRadio" value="no">`
 })
 export class FormControlRadioButtons {
-  form: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
   showRadio = new FormControl('yes');
 }
 
@@ -1316,8 +1325,10 @@ export class FormControlRadioButtons {
   `
 })
 class NgModelRadioForm {
-  food: string;
-  drink: string;
+  // TODO(issue/24571): remove '!'.
+  food !: string;
+  // TODO(issue/24571): remove '!'.
+  drink !: string;
 }
 
 @Directive({
@@ -1330,7 +1341,8 @@ class NgModelRadioForm {
 })
 class WrappedValue implements ControlValueAccessor {
   value: any;
-  onChange: Function;
+  // TODO(issue/24571): remove '!'.
+  onChange !: Function;
 
   writeValue(value: any) { this.value = `!${value}!`; }
 
@@ -1345,7 +1357,8 @@ class WrappedValue implements ControlValueAccessor {
 @Component({selector: 'my-input', template: ''})
 export class MyInput implements ControlValueAccessor {
   @Output('input') onInput = new EventEmitter();
-  value: string;
+  // TODO(issue/24571): remove '!'.
+  value !: string;
 
   constructor(cd: NgControl) { cd.valueAccessor = this; }
 
@@ -1366,7 +1379,8 @@ export class MyInput implements ControlValueAccessor {
     </div>`
 })
 export class MyInputForm {
-  form: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
 }
 
 @Component({
@@ -1377,7 +1391,8 @@ export class MyInputForm {
     </div>`
 })
 class WrappedValueForm {
-  form: FormGroup;
+  // TODO(issue/24571): remove '!'.
+  form !: FormGroup;
 }
 
 @Component({
@@ -1388,9 +1403,11 @@ class WrappedValueForm {
   providers: [{provide: NG_VALUE_ACCESSOR, multi: true, useExisting: NgModelCustomComp}]
 })
 export class NgModelCustomComp implements ControlValueAccessor {
-  model: string;
+  // TODO(issue/24571): remove '!'.
+  model !: string;
   @Input('disabled') isDisabled: boolean = false;
-  changeFn: (value: any) => void;
+  // TODO(issue/24571): remove '!'.
+  changeFn !: (value: any) => void;
 
   writeValue(value: any) { this.model = value; }
 
@@ -1410,6 +1427,7 @@ export class NgModelCustomComp implements ControlValueAccessor {
   `
 })
 export class NgModelCustomWrapper {
-  name: string;
+  // TODO(issue/24571): remove '!'.
+  name !: string;
   isDisabled = false;
 }
diff --git a/packages/http/src/backends/jsonp_backend.ts b/packages/http/src/backends/jsonp_backend.ts
index a3fc353b8c..85a015cb3d 100644
--- a/packages/http/src/backends/jsonp_backend.ts
+++ b/packages/http/src/backends/jsonp_backend.ts
@@ -26,15 +26,18 @@ const JSONP_ERR_WRONG_METHOD = 'JSONP requests must use GET request method.';
  * @deprecated see https://angular.io/guide/http
  */
 export class JSONPConnection implements Connection {
-  private _id: string;
-  private _script: Element;
+  // TODO(issue/24571): remove '!'.
+  private _id !: string;
+  // TODO(issue/24571): remove '!'.
+  private _script !: Element;
   private _responseData: any;
   private _finished: boolean = false;
 
   /**
    * The {@link ReadyState} of this request.
    */
-  readyState: ReadyState;
+  // TODO(issue/24571): remove '!'.
+  readyState !: ReadyState;
 
   /**
    * The outgoing HTTP request.
diff --git a/packages/http/src/backends/xhr_backend.ts b/packages/http/src/backends/xhr_backend.ts
index 2238829b8a..44cda08ad9 100644
--- a/packages/http/src/backends/xhr_backend.ts
+++ b/packages/http/src/backends/xhr_backend.ts
@@ -37,7 +37,8 @@ export class XHRConnection implements Connection {
    * `XMLHttpRequest`.
    */
   response: Observable<Response>;
-  readyState: ReadyState;
+  // TODO(issue/24571): remove '!'.
+  readyState !: ReadyState;
   constructor(req: Request, browserXHR: BrowserXhr, baseResponseOptions?: ResponseOptions) {
     this.request = req;
     this.response = new Observable<Response>((responseObserver: Observer<Response>) => {
diff --git a/packages/http/src/interfaces.ts b/packages/http/src/interfaces.ts
index 4c84b44d44..e8252f32da 100644
--- a/packages/http/src/interfaces.ts
+++ b/packages/http/src/interfaces.ts
@@ -27,8 +27,10 @@ export abstract class ConnectionBackend { abstract createConnection(request: any
  * @deprecated see https://angular.io/guide/http
  */
 export abstract class Connection {
-  readyState: ReadyState;
-  request: Request;
+  // TODO(issue/24571): remove '!'.
+  readyState !: ReadyState;
+  // TODO(issue/24571): remove '!'.
+  request !: Request;
   response: any;  // TODO: generic of <Response>;
 }
 
diff --git a/packages/http/src/static_response.ts b/packages/http/src/static_response.ts
index 0cdaec8bc7..668cf146fb 100644
--- a/packages/http/src/static_response.ts
+++ b/packages/http/src/static_response.ts
@@ -70,13 +70,15 @@ export class Response extends Body {
    * Denotes how many of the response body's bytes have been loaded, for example if the response is
    * the result of a progress event.
    */
-  bytesLoaded: number;
+  // TODO(issue/24571): remove '!'.
+  bytesLoaded !: number;
   /**
    * Non-standard property
    *
    * Denotes how many bytes are expected in the final response body.
    */
-  totalBytes: number;
+  // TODO(issue/24571): remove '!'.
+  totalBytes !: number;
   /**
    * Headers object based on the `Headers` class in the [Fetch
    * Spec](https://fetch.spec.whatwg.org/#headers-class).
diff --git a/packages/http/test/backends/jsonp_backend_spec.ts b/packages/http/test/backends/jsonp_backend_spec.ts
index f9fc4f4f35..9f2cacf37e 100644
--- a/packages/http/test/backends/jsonp_backend_spec.ts
+++ b/packages/http/test/backends/jsonp_backend_spec.ts
@@ -20,7 +20,8 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
 let existingScripts: MockBrowserJsonp[] = [];
 
 class MockBrowserJsonp extends BrowserJsonp {
-  src: string;
+  // TODO(issue/24571): remove '!'.
+  src !: string;
   callbacks = new Map<string, (data: any) => any>();
 
   addEventListener(type: string, cb: (data: any) => any) { this.callbacks.set(type, cb); }
diff --git a/packages/http/test/backends/xhr_backend_spec.ts b/packages/http/test/backends/xhr_backend_spec.ts
index c9d966177b..8c2228c711 100644
--- a/packages/http/test/backends/xhr_backend_spec.ts
+++ b/packages/http/test/backends/xhr_backend_spec.ts
@@ -32,14 +32,20 @@ class MockBrowserXHR extends BrowserXhr {
   open: any;
   response: any;
   responseType: string;
-  responseText: string;
+  // TODO(issue/24571): remove '!'.
+  responseText !: string;
   setRequestHeader: any;
   callbacks = new Map<string, Function>();
-  status: number;
-  responseHeaders: string;
-  responseURL: string;
-  statusText: string;
-  withCredentials: boolean;
+  // TODO(issue/24571): remove '!'.
+  status !: number;
+  // TODO(issue/24571): remove '!'.
+  responseHeaders !: string;
+  // TODO(issue/24571): remove '!'.
+  responseURL !: string;
+  // TODO(issue/24571): remove '!'.
+  statusText !: string;
+  // TODO(issue/24571): remove '!'.
+  withCredentials !: boolean;
 
   constructor() {
     super();
diff --git a/packages/language-service/src/reflector_host.ts b/packages/language-service/src/reflector_host.ts
index d3443aa4df..42df27c8cc 100644
--- a/packages/language-service/src/reflector_host.ts
+++ b/packages/language-service/src/reflector_host.ts
@@ -33,7 +33,8 @@ class ReflectorModuleModuleResolutionHost implements ts.ModuleResolutionHost, Me
     return undefined !;
   }
 
-  directoryExists: (directoryName: string) => boolean;
+  // TODO(issue/24571): remove '!'.
+  directoryExists !: (directoryName: string) => boolean;
 
   getSourceFileMetadata(fileName: string) {
     const sf = this.getProgram().getSourceFile(fileName);
diff --git a/packages/language-service/src/typescript_host.ts b/packages/language-service/src/typescript_host.ts
index ab311f9a9d..de1e9f4afe 100644
--- a/packages/language-service/src/typescript_host.ts
+++ b/packages/language-service/src/typescript_host.ts
@@ -61,22 +61,33 @@ export class DummyResourceLoader extends ResourceLoader {
  * @experimental
  */
 export class TypeScriptServiceHost implements LanguageServiceHost {
-  private _resolver: CompileMetadataResolver|null;
+  // TODO(issue/24571): remove '!'.
+  private _resolver !: CompileMetadataResolver | null;
   private _staticSymbolCache = new StaticSymbolCache();
-  private _summaryResolver: AotSummaryResolver;
-  private _staticSymbolResolver: StaticSymbolResolver;
-  private _reflector: StaticReflector|null;
-  private _reflectorHost: ReflectorHost;
-  private _checker: ts.TypeChecker|null;
+  // TODO(issue/24571): remove '!'.
+  private _summaryResolver !: AotSummaryResolver;
+  // TODO(issue/24571): remove '!'.
+  private _staticSymbolResolver !: StaticSymbolResolver;
+  // TODO(issue/24571): remove '!'.
+  private _reflector !: StaticReflector | null;
+  // TODO(issue/24571): remove '!'.
+  private _reflectorHost !: ReflectorHost;
+  // TODO(issue/24571): remove '!'.
+  private _checker !: ts.TypeChecker | null;
   private _typeCache: Symbol[] = [];
   private context: string|undefined;
   private lastProgram: ts.Program|undefined;
   private modulesOutOfDate: boolean = true;
-  private analyzedModules: NgAnalyzedModules|null;
-  private service: LanguageService;
-  private fileToComponent: Map<string, StaticSymbol>|null;
-  private templateReferences: string[]|null;
-  private collectedErrors: Map<string, any[]>|null;
+  // TODO(issue/24571): remove '!'.
+  private analyzedModules !: NgAnalyzedModules | null;
+  // TODO(issue/24571): remove '!'.
+  private service !: LanguageService;
+  // TODO(issue/24571): remove '!'.
+  private fileToComponent !: Map<string, StaticSymbol>| null;
+  // TODO(issue/24571): remove '!'.
+  private templateReferences !: string[] | null;
+  // TODO(issue/24571): remove '!'.
+  private collectedErrors !: Map<string, any[]>| null;
   private fileVersions = new Map<string, string>();
 
   constructor(private host: ts.LanguageServiceHost, private tsService: ts.LanguageService) {}
diff --git a/packages/language-service/test/test_utils.ts b/packages/language-service/test/test_utils.ts
index a3357668f1..9032df6248 100644
--- a/packages/language-service/test/test_utils.ts
+++ b/packages/language-service/test/test_utils.ts
@@ -65,7 +65,8 @@ missingCache.set('/node_modules/@angular/forms/src/directives/form_interface.met
 
 export class MockTypescriptHost implements ts.LanguageServiceHost {
   private angularPath: string|undefined;
-  private nodeModulesPath: string;
+  // TODO(issue/24571): remove '!'.
+  private nodeModulesPath !: string;
   private scriptVersion = new Map<string, number>();
   private overrides = new Map<string, string>();
   private projectVersion = 0;
diff --git a/packages/platform-browser/src/browser/location/browser_platform_location.ts b/packages/platform-browser/src/browser/location/browser_platform_location.ts
index 523ef0b8cf..a9708b16b0 100644
--- a/packages/platform-browser/src/browser/location/browser_platform_location.ts
+++ b/packages/platform-browser/src/browser/location/browser_platform_location.ts
@@ -23,8 +23,10 @@ import {supportsState} from './history';
  */
 @Injectable()
 export class BrowserPlatformLocation extends PlatformLocation {
-  public readonly location: Location;
-  private _history: History;
+  // TODO(issue/24571): remove '!'.
+  public readonly location !: Location;
+  // TODO(issue/24571): remove '!'.
+  private _history !: History;
 
   constructor(@Inject(DOCUMENT) private _doc: any) {
     super();
diff --git a/packages/platform-browser/src/dom/dom_adapter.ts b/packages/platform-browser/src/dom/dom_adapter.ts
index 2cf70c64c0..5057f6dfbb 100644
--- a/packages/platform-browser/src/dom/dom_adapter.ts
+++ b/packages/platform-browser/src/dom/dom_adapter.ts
@@ -50,7 +50,8 @@ export abstract class DomAdapter {
   get attrToPropMap(): {[key: string]: string} { return this._attrToPropMap; }
   set attrToPropMap(value: {[key: string]: string}) { this._attrToPropMap = value; }
   /** @internal */
-  _attrToPropMap: {[key: string]: string};
+  // TODO(issue/24571): remove '!'.
+  _attrToPropMap !: {[key: string]: string};
 
   abstract contains(nodeA: any, nodeB: any): boolean;
   abstract parse(templateHtml: string): any;
diff --git a/packages/platform-browser/src/dom/events/event_manager.ts b/packages/platform-browser/src/dom/events/event_manager.ts
index 42217b304f..f362b9c0d2 100644
--- a/packages/platform-browser/src/dom/events/event_manager.ts
+++ b/packages/platform-browser/src/dom/events/event_manager.ts
@@ -88,7 +88,8 @@ export class EventManager {
 export abstract class EventManagerPlugin {
   constructor(private _doc: any) {}
 
-  manager: EventManager;
+  // TODO(issue/24571): remove '!'.
+  manager !: EventManager;
 
   abstract supports(eventName: string): boolean;
 
diff --git a/packages/platform-browser/test/browser/bootstrap_spec.ts b/packages/platform-browser/test/browser/bootstrap_spec.ts
index f6e86df934..778e695f72 100644
--- a/packages/platform-browser/test/browser/bootstrap_spec.ts
+++ b/packages/platform-browser/test/browser/bootstrap_spec.ts
@@ -79,8 +79,9 @@ class HelloUrlCmp {
 
 @Directive({selector: '[someDir]', host: {'[title]': 'someDir'}})
 class SomeDirective {
+  // TODO(issue/24571): remove '!'.
   @Input()
-  someDir: string;
+  someDir !: string;
 }
 
 @Pipe({name: 'somePipe'})
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index 37c1121e65..c02f739f5e 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -86,8 +86,9 @@ class TestViewProvidersComp {
 
 @Directive({selector: '[someDir]', host: {'[title]': 'someDir'}})
 class SomeDirective {
+  // TODO(issue/24571): remove '!'.
   @Input()
-  someDir: string;
+  someDir !: string;
 }
 
 @Pipe({name: 'somePipe'})
@@ -728,8 +729,9 @@ class CompWithUrlTemplate {
           class TestDir {
             constructor() { testDir = this; }
 
+            // TODO(issue/24571): remove '!'.
             @Input('test')
-            test: string;
+            test !: string;
           }
 
           TestBed.overrideTemplateUsingTestingModule(
diff --git a/packages/platform-server/src/http.ts b/packages/platform-server/src/http.ts
index 1fc55db209..58453a80ee 100644
--- a/packages/platform-server/src/http.ts
+++ b/packages/platform-server/src/http.ts
@@ -114,7 +114,8 @@ export abstract class ZoneMacroTaskWrapper<S, R> {
 export class ZoneMacroTaskConnection extends ZoneMacroTaskWrapper<Request, Response> implements
     Connection {
   response: Observable<Response>;
-  lastConnection: Connection;
+  // TODO(issue/24571): remove '!'.
+  lastConnection !: Connection;
 
   constructor(public request: Request, private backend: XHRBackend) {
     super();
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 311b4f52a7..3e7e8b2006 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -250,7 +250,8 @@ class NativeExampleModule {
 
 @Component({selector: 'my-child', template: 'Works!'})
 class MyChildComponent {
-  @Input() public attr: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() public attr !: boolean;
 }
 
 @Component({selector: 'app', template: '<my-child [attr]="false"></my-child>'})
diff --git a/packages/platform-webworker/src/web_workers/shared/post_message_bus.ts b/packages/platform-webworker/src/web_workers/shared/post_message_bus.ts
index 4de44d4301..dfb01bc6e4 100644
--- a/packages/platform-webworker/src/web_workers/shared/post_message_bus.ts
+++ b/packages/platform-webworker/src/web_workers/shared/post_message_bus.ts
@@ -18,7 +18,8 @@ export interface PostMessageTarget {
 }
 
 export class PostMessageBusSink implements MessageBusSink {
-  private _zone: NgZone;
+  // TODO(issue/24571): remove '!'.
+  private _zone !: NgZone;
   private _channels: {[key: string]: _Channel} = {};
   private _messageBuffer: Array<Object> = [];
 
@@ -67,7 +68,8 @@ export class PostMessageBusSink implements MessageBusSink {
 }
 
 export class PostMessageBusSource implements MessageBusSource {
-  private _zone: NgZone;
+  // TODO(issue/24571): remove '!'.
+  private _zone !: NgZone;
   private _channels: {[key: string]: _Channel} = {};
 
   constructor(eventTarget?: EventTarget) {
diff --git a/packages/platform-webworker/src/web_workers/ui/renderer.ts b/packages/platform-webworker/src/web_workers/ui/renderer.ts
index 84332b5202..6aceacd925 100644
--- a/packages/platform-webworker/src/web_workers/ui/renderer.ts
+++ b/packages/platform-webworker/src/web_workers/ui/renderer.ts
@@ -17,7 +17,8 @@ import {EventDispatcher} from '../ui/event_dispatcher';
 
 @Injectable()
 export class MessageBasedRenderer2 {
-  private _eventDispatcher: EventDispatcher;
+  // TODO(issue/24571): remove '!'.
+  private _eventDispatcher !: EventDispatcher;
 
   constructor(
       private _brokerFactory: ServiceMessageBrokerFactory, private _bus: MessageBus,
diff --git a/packages/platform-webworker/src/web_workers/worker/platform_location.ts b/packages/platform-webworker/src/web_workers/worker/platform_location.ts
index 4322cad88a..63fe2c546b 100644
--- a/packages/platform-webworker/src/web_workers/worker/platform_location.ts
+++ b/packages/platform-webworker/src/web_workers/worker/platform_location.ts
@@ -21,7 +21,8 @@ export class WebWorkerPlatformLocation extends PlatformLocation {
   private _location: LocationType = null !;
   private _channelSource: EventEmitter<Object>;
   public initialized: Promise<any>;
-  private initializedResolve: () => void;
+  // TODO(issue/24571): remove '!'.
+  private initializedResolve !: () => void;
 
   constructor(
       brokerFactory: ClientMessageBrokerFactory, bus: MessageBus, private _serializer: Serializer) {
diff --git a/packages/platform-webworker/src/web_workers/worker/renderer.ts b/packages/platform-webworker/src/web_workers/worker/renderer.ts
index 7c65abc9e7..45ec83a405 100644
--- a/packages/platform-webworker/src/web_workers/worker/renderer.ts
+++ b/packages/platform-webworker/src/web_workers/worker/renderer.ts
@@ -15,7 +15,8 @@ import {RenderStore} from '../shared/render_store';
 import {Serializer, SerializerTypes} from '../shared/serializer';
 
 export class NamedEventEmitter {
-  private _listeners: Map<string, Function[]>;
+  // TODO(issue/24571): remove '!'.
+  private _listeners !: Map<string, Function[]>;
 
   listen(eventName: string, callback: Function) { this._getListeners(eventName).push(callback); }
 
diff --git a/packages/platform-webworker/src/worker_render.ts b/packages/platform-webworker/src/worker_render.ts
index 889ca3359a..0fe5e41946 100644
--- a/packages/platform-webworker/src/worker_render.ts
+++ b/packages/platform-webworker/src/worker_render.ts
@@ -29,8 +29,10 @@ import {MessageBasedRenderer2} from './web_workers/ui/renderer';
  */
 @Injectable()
 export class WebWorkerInstance {
-  public worker: Worker;
-  public bus: MessageBus;
+  // TODO(issue/24571): remove '!'.
+  public worker !: Worker;
+  // TODO(issue/24571): remove '!'.
+  public bus !: MessageBus;
 
   /** @internal */
   public init(worker: Worker, bus: MessageBus) {
diff --git a/packages/platform-webworker/test/web_workers/shared/message_bus_util.ts b/packages/platform-webworker/test/web_workers/shared/message_bus_util.ts
index 1ac193f2e1..5b14c33b7a 100644
--- a/packages/platform-webworker/test/web_workers/shared/message_bus_util.ts
+++ b/packages/platform-webworker/test/web_workers/shared/message_bus_util.ts
@@ -23,7 +23,8 @@ export function createConnectedMessageBus(): MessageBus {
 }
 
 class MockPostMessage {
-  private _listener: EventListener;
+  // TODO(issue/24571): remove '!'.
+  private _listener !: EventListener;
 
   addEventListener(type: string, listener: EventListener, useCapture?: boolean): void {
     if (type === 'message') {
diff --git a/packages/router/src/directives/router_link.ts b/packages/router/src/directives/router_link.ts
index 135585702a..4a34f4c414 100644
--- a/packages/router/src/directives/router_link.ts
+++ b/packages/router/src/directives/router_link.ts
@@ -92,14 +92,21 @@ import {UrlTree} from '../url_tree';
  */
 @Directive({selector: ':not(a)[routerLink]'})
 export class RouterLink {
-  @Input() queryParams: {[k: string]: any};
-  @Input() fragment: string;
-  @Input() queryParamsHandling: QueryParamsHandling;
-  @Input() preserveFragment: boolean;
-  @Input() skipLocationChange: boolean;
-  @Input() replaceUrl: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() queryParams !: {[k: string]: any};
+  // TODO(issue/24571): remove '!'.
+  @Input() fragment !: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() queryParamsHandling !: QueryParamsHandling;
+  // TODO(issue/24571): remove '!'.
+  @Input() preserveFragment !: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() skipLocationChange !: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() replaceUrl !: boolean;
   private commands: any[] = [];
-  private preserve: boolean;
+  // TODO(issue/24571): remove '!'.
+  private preserve !: boolean;
 
   constructor(
       private router: Router, private route: ActivatedRoute,
@@ -164,19 +171,28 @@ export class RouterLink {
  */
 @Directive({selector: 'a[routerLink]'})
 export class RouterLinkWithHref implements OnChanges, OnDestroy {
-  @HostBinding('attr.target') @Input() target: string;
-  @Input() queryParams: {[k: string]: any};
-  @Input() fragment: string;
-  @Input() queryParamsHandling: QueryParamsHandling;
-  @Input() preserveFragment: boolean;
-  @Input() skipLocationChange: boolean;
-  @Input() replaceUrl: boolean;
+  // TODO(issue/24571): remove '!'.
+  @HostBinding('attr.target') @Input() target !: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() queryParams !: {[k: string]: any};
+  // TODO(issue/24571): remove '!'.
+  @Input() fragment !: string;
+  // TODO(issue/24571): remove '!'.
+  @Input() queryParamsHandling !: QueryParamsHandling;
+  // TODO(issue/24571): remove '!'.
+  @Input() preserveFragment !: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() skipLocationChange !: boolean;
+  // TODO(issue/24571): remove '!'.
+  @Input() replaceUrl !: boolean;
   private commands: any[] = [];
   private subscription: Subscription;
-  private preserve: boolean;
+  // TODO(issue/24571): remove '!'.
+  private preserve !: boolean;
 
   // the url displayed on the anchor element.
-  @HostBinding() href: string;
+  // TODO(issue/24571): remove '!'.
+  @HostBinding() href !: string;
 
   constructor(
       private router: Router, private route: ActivatedRoute,
diff --git a/packages/router/src/directives/router_link_active.ts b/packages/router/src/directives/router_link_active.ts
index f30b66ba4e..2953fafc5a 100644
--- a/packages/router/src/directives/router_link_active.ts
+++ b/packages/router/src/directives/router_link_active.ts
@@ -78,9 +78,12 @@ import {RouterLink, RouterLinkWithHref} from './router_link';
 })
 export class RouterLinkActive implements OnChanges,
     OnDestroy, AfterContentInit {
-  @ContentChildren(RouterLink, {descendants: true}) links: QueryList<RouterLink>;
+  // TODO(issue/24571): remove '!'.
+  @ContentChildren(RouterLink, {descendants: true})
+  links !: QueryList<RouterLink>;
+  // TODO(issue/24571): remove '!'.
   @ContentChildren(RouterLinkWithHref, {descendants: true})
-  linksWithHrefs: QueryList<RouterLinkWithHref>;
+  linksWithHrefs !: QueryList<RouterLinkWithHref>;
 
   private classes: string[] = [];
   private subscription: Subscription;
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index f68be1ba97..bbdd53a315 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -214,7 +214,8 @@ export class Router {
   private rawUrlTree: UrlTree;
   private navigations = new BehaviorSubject<NavigationParams>(null !);
 
-  private locationSubscription: Subscription;
+  // TODO(issue/24571): remove '!'.
+  private locationSubscription !: Subscription;
   private navigationId: number = 0;
   private configLoader: RouterConfigLoader;
   private ngModule: NgModuleRef<any>;
diff --git a/packages/router/src/router_preloader.ts b/packages/router/src/router_preloader.ts
index 67f4465abe..712f212c47 100644
--- a/packages/router/src/router_preloader.ts
+++ b/packages/router/src/router_preloader.ts
@@ -72,7 +72,8 @@ export class NoPreloading implements PreloadingStrategy {
 @Injectable()
 export class RouterPreloader implements OnDestroy {
   private loader: RouterConfigLoader;
-  private subscription: Subscription;
+  // TODO(issue/24571): remove '!'.
+  private subscription !: Subscription;
 
   constructor(
       private router: Router, moduleLoader: NgModuleFactoryLoader, compiler: Compiler,
diff --git a/packages/router/src/router_scroller.ts b/packages/router/src/router_scroller.ts
index 7d3dc4b90d..15a2393265 100644
--- a/packages/router/src/router_scroller.ts
+++ b/packages/router/src/router_scroller.ts
@@ -14,8 +14,10 @@ import {NavigationEnd, NavigationStart, Scroll} from './events';
 import {Router} from './router';
 
 export class RouterScroller implements OnDestroy {
-  private routerEventsSubscription: Unsubscribable;
-  private scrollEventsSubscription: Unsubscribable;
+  // TODO(issue/24571): remove '!'.
+  private routerEventsSubscription !: Unsubscribable;
+  // TODO(issue/24571): remove '!'.
+  private scrollEventsSubscription !: Unsubscribable;
 
   private lastId = 0;
   private lastSource: 'imperative'|'popstate'|'hashchange'|undefined = 'imperative';
diff --git a/packages/router/src/router_state.ts b/packages/router/src/router_state.ts
index 0afb6870d4..658e74e9f0 100644
--- a/packages/router/src/router_state.ts
+++ b/packages/router/src/router_state.ts
@@ -106,15 +106,19 @@ export function createEmptyStateSnapshot(
  */
 export class ActivatedRoute {
   /** The current snapshot of this route */
-  snapshot: ActivatedRouteSnapshot;
+  // TODO(issue/24571): remove '!'.
+  snapshot !: ActivatedRouteSnapshot;
   /** @internal */
   _futureSnapshot: ActivatedRouteSnapshot;
   /** @internal */
-  _routerState: RouterState;
+  // TODO(issue/24571): remove '!'.
+  _routerState !: RouterState;
   /** @internal */
-  _paramMap: Observable<ParamMap>;
+  // TODO(issue/24571): remove '!'.
+  _paramMap !: Observable<ParamMap>;
   /** @internal */
-  _queryParamMap: Observable<ParamMap>;
+  // TODO(issue/24571): remove '!'.
+  _queryParamMap !: Observable<ParamMap>;
 
   /** @internal */
   constructor(
@@ -257,13 +261,17 @@ export class ActivatedRouteSnapshot {
   /** @internal */
   _resolve: ResolveData;
   /** @internal */
-  _resolvedData: Data;
+  // TODO(issue/24571): remove '!'.
+  _resolvedData !: Data;
   /** @internal */
-  _routerState: RouterStateSnapshot;
+  // TODO(issue/24571): remove '!'.
+  _routerState !: RouterStateSnapshot;
   /** @internal */
-  _paramMap: ParamMap;
+  // TODO(issue/24571): remove '!'.
+  _paramMap !: ParamMap;
   /** @internal */
-  _queryParamMap: ParamMap;
+  // TODO(issue/24571): remove '!'.
+  _queryParamMap !: ParamMap;
 
   /** @internal */
   constructor(
diff --git a/packages/router/src/url_tree.ts b/packages/router/src/url_tree.ts
index c9b4101793..3ba437ff68 100644
--- a/packages/router/src/url_tree.ts
+++ b/packages/router/src/url_tree.ts
@@ -104,7 +104,8 @@ function containsSegmentGroupHelper(
  */
 export class UrlTree {
   /** @internal */
-  _queryParamMap: ParamMap;
+  // TODO(issue/24571): remove '!'.
+  _queryParamMap !: ParamMap;
 
   /** @internal */
   constructor(
@@ -137,9 +138,11 @@ export class UrlTree {
  */
 export class UrlSegmentGroup {
   /** @internal */
-  _sourceSegment: UrlSegmentGroup;
+  // TODO(issue/24571): remove '!'.
+  _sourceSegment !: UrlSegmentGroup;
   /** @internal */
-  _segmentIndexShift: number;
+  // TODO(issue/24571): remove '!'.
+  _segmentIndexShift !: number;
   /** The parent node in the url tree */
   parent: UrlSegmentGroup|null = null;
 
@@ -189,7 +192,8 @@ export class UrlSegmentGroup {
  */
 export class UrlSegment {
   /** @internal */
-  _parameterMap: ParamMap;
+  // TODO(issue/24571): remove '!'.
+  _parameterMap !: ParamMap;
 
   constructor(
       /** The path part of a URL segment */
diff --git a/packages/router/test/regression_integration.spec.ts b/packages/router/test/regression_integration.spec.ts
index d59c2c36d2..ab1d0681be 100644
--- a/packages/router/test/regression_integration.spec.ts
+++ b/packages/router/test/regression_integration.spec.ts
@@ -73,8 +73,10 @@ describe('Integration', () => {
         `
          })
          class ComponentWithRouterLink {
-           @ViewChild(TemplateRef) templateRef: TemplateRef<any>;
-           @ViewChild('container', {read: ViewContainerRef}) container: ViewContainerRef;
+           // TODO(issue/24571): remove '!'.
+           @ViewChild(TemplateRef) templateRef !: TemplateRef<any>;
+           // TODO(issue/24571): remove '!'.
+           @ViewChild('container', {read: ViewContainerRef}) container !: ViewContainerRef;
 
            addLink() {
              this.container.createEmbeddedView(this.templateRef, {$implicit: '/simple'});
diff --git a/packages/service-worker/cli/tsconfig.json b/packages/service-worker/cli/tsconfig.json
index 09c1527352..03305d9b4d 100644
--- a/packages/service-worker/cli/tsconfig.json
+++ b/packages/service-worker/cli/tsconfig.json
@@ -6,6 +6,7 @@
     "module": "es2015",
     "moduleResolution": "node",
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "outDir": "../../../dist/all/@angular/service-worker/cli-custom",
     "noImplicitAny": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/packages/service-worker/src/push.ts b/packages/service-worker/src/push.ts
index 9ea4cef004..2a9f244c79 100644
--- a/packages/service-worker/src/push.ts
+++ b/packages/service-worker/src/push.ts
@@ -23,7 +23,8 @@ export class SwPush {
   readonly messages: Observable<object>;
   readonly subscription: Observable<PushSubscription|null>;
 
-  private pushManager: Observable<PushManager>;
+  // TODO(issue/24571): remove '!'.
+  private pushManager !: Observable<PushManager>;
   private subscriptionChanges: Subject<PushSubscription|null> =
       new Subject<PushSubscription|null>();
 
diff --git a/packages/service-worker/worker/testing/mock.ts b/packages/service-worker/worker/testing/mock.ts
index bcdde49258..00f5b6d053 100644
--- a/packages/service-worker/worker/testing/mock.ts
+++ b/packages/service-worker/worker/testing/mock.ts
@@ -95,7 +95,8 @@ export class MockServerState {
   private requests: Request[] = [];
   private gate: Promise<void> = Promise.resolve();
   private resolve: Function|null = null;
-  private resolveNextRequest: Function;
+  // TODO(issue/24571): remove '!'.
+  private resolveNextRequest !: Function;
   online = true;
   nextRequest: Promise<Request>;
 
diff --git a/packages/service-worker/worker/testing/scope.ts b/packages/service-worker/worker/testing/scope.ts
index cb647c76dd..3c648e382a 100644
--- a/packages/service-worker/worker/testing/scope.ts
+++ b/packages/service-worker/worker/testing/scope.ts
@@ -79,7 +79,8 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
   private skippedWaiting = true;
 
   private selfMessageQueue: any[] = [];
-  unregistered: boolean;
+  // TODO(issue/24571): remove '!'.
+  unregistered !: boolean;
   readonly notifications: {title: string, options: Object}[] = [];
   readonly registration: ServiceWorkerRegistration = {
     active: {
diff --git a/packages/service-worker/worker/tsconfig.json b/packages/service-worker/worker/tsconfig.json
index e74e7ed7a0..c165ab4e8c 100644
--- a/packages/service-worker/worker/tsconfig.json
+++ b/packages/service-worker/worker/tsconfig.json
@@ -6,6 +6,7 @@
     "module": "es2015",
     "moduleResolution": "node",
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "outDir": "../../../dist/all/@angular/service-worker/worker-es2017",
     "noImplicitAny": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json
index d3334472cc..4979b6563f 100644
--- a/packages/tsconfig-build.json
+++ b/packages/tsconfig-build.json
@@ -9,6 +9,7 @@
     "stripInternal": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "noFallthroughCasesInSwitch": true,
     "moduleResolution": "node",
     "module": "es2015",
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index 162991e17b..fd47b5b67d 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -7,6 +7,7 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "strictNullChecks": true,
+    "strictPropertyInitialization": true,
     "outDir": "../dist/all/@angular",
     "noImplicitAny": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/packages/upgrade/src/common/component_info.ts b/packages/upgrade/src/common/component_info.ts
index 898bb72456..1eab41fd65 100644
--- a/packages/upgrade/src/common/component_info.ts
+++ b/packages/upgrade/src/common/component_info.ts
@@ -13,12 +13,18 @@
  * and attribute have the same identifier.
  */
 export class PropertyBinding {
-  bracketAttr: string;
-  bracketParenAttr: string;
-  parenAttr: string;
-  onAttr: string;
-  bindAttr: string;
-  bindonAttr: string;
+  // TODO(issue/24571): remove '!'.
+  bracketAttr !: string;
+  // TODO(issue/24571): remove '!'.
+  bracketParenAttr !: string;
+  // TODO(issue/24571): remove '!'.
+  parenAttr !: string;
+  // TODO(issue/24571): remove '!'.
+  onAttr !: string;
+  // TODO(issue/24571): remove '!'.
+  bindAttr !: string;
+  // TODO(issue/24571): remove '!'.
+  bindonAttr !: string;
 
   constructor(public prop: string, public attr: string) { this.parseBinding(); }
 
diff --git a/packages/upgrade/src/common/downgrade_component.ts b/packages/upgrade/src/common/downgrade_component.ts
index d87161e203..8dd26698b5 100644
--- a/packages/upgrade/src/common/downgrade_component.ts
+++ b/packages/upgrade/src/common/downgrade_component.ts
@@ -158,7 +158,8 @@ export function downgradeComponent(info: {
  * to preserve the synchronous nature of Angular 1's $compile.
  */
 class ParentInjectorPromise {
-  private injector: Injector;
+  // TODO(issue/24571): remove '!'.
+  private injector !: Injector;
   private injectorKey: string = controllerKey(INJECTOR_KEY);
   private callbacks: ((injector: Injector) => any)[] = [];
 
diff --git a/packages/upgrade/src/common/downgrade_component_adapter.ts b/packages/upgrade/src/common/downgrade_component_adapter.ts
index fd20b79e0a..bc41baba81 100644
--- a/packages/upgrade/src/common/downgrade_component_adapter.ts
+++ b/packages/upgrade/src/common/downgrade_component_adapter.ts
@@ -22,10 +22,13 @@ export class DowngradeComponentAdapter {
   private inputChangeCount: number = 0;
   private inputChanges: SimpleChanges = {};
   private componentScope: angular.IScope;
-  private componentRef: ComponentRef<any>;
+  // TODO(issue/24571): remove '!'.
+  private componentRef !: ComponentRef<any>;
   private component: any;
-  private changeDetector: ChangeDetectorRef;
-  private viewChangeDetector: ChangeDetectorRef;
+  // TODO(issue/24571): remove '!'.
+  private changeDetector !: ChangeDetectorRef;
+  // TODO(issue/24571): remove '!'.
+  private viewChangeDetector !: ChangeDetectorRef;
 
   constructor(
       private element: angular.IAugmentedJQuery, private attrs: angular.IAttributes,
diff --git a/packages/upgrade/src/common/util.ts b/packages/upgrade/src/common/util.ts
index 0407753b10..d505aec20c 100644
--- a/packages/upgrade/src/common/util.ts
+++ b/packages/upgrade/src/common/util.ts
@@ -43,8 +43,10 @@ export function isFunction(value: any): value is Function {
 
 export class Deferred<R> {
   promise: Promise<R>;
-  resolve: (value?: R|PromiseLike<R>) => void;
-  reject: (error?: any) => void;
+  // TODO(issue/24571): remove '!'.
+  resolve !: (value?: R | PromiseLike<R>) => void;
+  // TODO(issue/24571): remove '!'.
+  reject !: (error?: any) => void;
 
   constructor() {
     this.promise = new Promise((res, rej) => {
diff --git a/packages/upgrade/src/dynamic/upgrade_adapter.ts b/packages/upgrade/src/dynamic/upgrade_adapter.ts
index 6bacc19591..0ce767c1f0 100644
--- a/packages/upgrade/src/dynamic/upgrade_adapter.ts
+++ b/packages/upgrade/src/dynamic/upgrade_adapter.ts
@@ -112,10 +112,13 @@ export class UpgradeAdapter {
    */
   private ng1ComponentsToBeUpgraded: {[name: string]: UpgradeNg1ComponentAdapterBuilder} = {};
   private upgradedProviders: StaticProvider[] = [];
-  private ngZone: NgZone;
-  private ng1Module: angular.IModule;
+  // TODO(issue/24571): remove '!'.
+  private ngZone !: NgZone;
+  // TODO(issue/24571): remove '!'.
+  private ng1Module !: angular.IModule;
   private moduleRef: NgModuleRef<any>|null = null;
-  private ng2BootstrapDeferred: Deferred<angular.IInjectorService>;
+  // TODO(issue/24571): remove '!'.
+  private ng2BootstrapDeferred !: Deferred<angular.IInjectorService>;
 
   constructor(private ng2AppModule: Type<any>, private compilerOptions?: CompilerOptions) {
     if (!ng2AppModule) {
@@ -608,7 +611,8 @@ export class UpgradeAdapter {
  * to preserve the synchronous nature of AngularJS's $compile.
  */
 class ParentInjectorPromise {
-  private injector: Injector;
+  // TODO(issue/24571): remove '!'.
+  private injector !: Injector;
   private callbacks: ((injector: Injector) => any)[] = [];
 
   constructor(private element: angular.IAugmentedJQuery) {
diff --git a/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts b/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts
index 81f21e6a1c..ffee28a0bf 100644
--- a/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts
+++ b/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts
@@ -22,7 +22,8 @@ const NOT_SUPPORTED: any = 'NOT_SUPPORTED';
 
 
 export class UpgradeNg1ComponentAdapterBuilder {
-  type: Type<any>;
+  // TODO(issue/24571): remove '!'.
+  type !: Type<any>;
   inputs: string[] = [];
   inputsRename: string[] = [];
   outputs: string[] = [];
@@ -31,7 +32,8 @@ export class UpgradeNg1ComponentAdapterBuilder {
   checkProperties: string[] = [];
   propertyMap: {[name: string]: string} = {};
   directive: angular.IDirective|null = null;
-  template: string;
+  // TODO(issue/24571): remove '!'.
+  template !: string;
 
   constructor(public name: string) {
     const selector =
@@ -45,7 +47,8 @@ export class UpgradeNg1ComponentAdapterBuilder {
 
     @Directive(directive)
     class MyClass {
-      directive: angular.IDirective;
+      // TODO(issue/24571): remove '!'.
+      directive !: angular.IDirective;
       constructor(
           @Inject($SCOPE) scope: angular.IScope, injector: Injector, elementRef: ElementRef) {
         const helper = new UpgradeHelper(injector, name, elementRef, this.directive);
diff --git a/packages/upgrade/src/static/upgrade_component.ts b/packages/upgrade/src/static/upgrade_component.ts
index 009482db2e..3976a1fa47 100644
--- a/packages/upgrade/src/static/upgrade_component.ts
+++ b/packages/upgrade/src/static/upgrade_component.ts
@@ -76,14 +76,19 @@ export class UpgradeComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
   private directive: angular.IDirective;
   private bindings: Bindings;
 
-  private controllerInstance: IControllerInstance;
-  private bindingDestination: IBindingDestination;
+  // TODO(issue/24571): remove '!'.
+  private controllerInstance !: IControllerInstance;
+  // TODO(issue/24571): remove '!'.
+  private bindingDestination !: IBindingDestination;
 
-  // We will be instantiating the controller in the `ngOnInit` hook, when the first `ngOnChanges`
-  // will have been already triggered. We store the `SimpleChanges` and "play them back" later.
-  private pendingChanges: SimpleChanges|null;
+  // We will be instantiating the controller in the `ngOnInit` hook, when the
+  // first `ngOnChanges` will have been already triggered. We store the
+  // `SimpleChanges` and "play them back" later.
+  // TODO(issue/24571): remove '!'.
+  private pendingChanges !: SimpleChanges | null;
 
-  private unregisterDoCheckWatcher: Function;
+  // TODO(issue/24571): remove '!'.
+  private unregisterDoCheckWatcher !: Function;
 
   /**
    * Create a new `UpgradeComponent` instance. You should not normally need to do this.
diff --git a/packages/upgrade/test/common/downgrade_component_adapter_spec.ts b/packages/upgrade/test/common/downgrade_component_adapter_spec.ts
index c428c24bd8..eb3cc0683a 100644
--- a/packages/upgrade/test/common/downgrade_component_adapter_spec.ts
+++ b/packages/upgrade/test/common/downgrade_component_adapter_spec.ts
@@ -110,13 +110,18 @@ withEachNg1Version(() => {
         $evalAsync(exp: angular.Ng1Expression, locals?: any) {
           return () => {};
         }
-        $$childTail: angular.IScope;
-        $$childHead: angular.IScope;
-        $$nextSibling: angular.IScope;
+        // TODO(issue/24571): remove '!'.
+        $$childTail !: angular.IScope;
+        // TODO(issue/24571): remove '!'.
+        $$childHead !: angular.IScope;
+        // TODO(issue/24571): remove '!'.
+        $$nextSibling !: angular.IScope;
         [key: string]: any;
         $id = 'mockScope';
-        $parent: angular.IScope;
-        $root: angular.IScope;
+        // TODO(issue/24571): remove '!'.
+        $parent !: angular.IScope;
+        // TODO(issue/24571): remove '!'.
+        $root !: angular.IScope;
       }
 
       function getAdaptor(): DowngradeComponentAdapter {
diff --git a/packages/upgrade/test/dynamic/upgrade_spec.ts b/packages/upgrade/test/dynamic/upgrade_spec.ts
index 159f05c4ae..c99717d826 100644
--- a/packages/upgrade/test/dynamic/upgrade_spec.ts
+++ b/packages/upgrade/test/dynamic/upgrade_spec.ts
@@ -217,7 +217,8 @@ withEachNg1Version(() => {
 
            @Component({selector: 'my-app', template: '<my-child [value]="value"></my-child>'})
            class AppComponent {
-             value: number;
+             // TODO(issue/24571): remove '!'.
+             value !: number;
              constructor() { appComponent = this; }
            }
 
@@ -226,7 +227,8 @@ withEachNg1Version(() => {
              template: '<div>{{valueFromPromise}}',
            })
            class ChildComponent {
-             valueFromPromise: number;
+             // TODO(issue/24571): remove '!'.
+             valueFromPromise !: number;
              @Input()
              set value(v: number) { expect(NgZone.isInAngularZone()).toBe(true); }
 
@@ -496,8 +498,10 @@ withEachNg1Version(() => {
            class Ng2Component implements OnChanges {
              ngOnChangesCount = 0;
              firstChangesCount = 0;
-             initialValue: string;
-             @Input() foo: string;
+             // TODO(issue/24571): remove '!'.
+             initialValue !: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() foo !: string;
 
              ngOnChanges(changes: SimpleChanges) {
                this.ngOnChangesCount++;
@@ -742,7 +746,8 @@ withEachNg1Version(() => {
       it('should correctly project structural directives', async(() => {
            @Component({selector: 'ng2', template: 'ng2-{{ itemId }}(<ng-content></ng-content>)'})
            class Ng2Component {
-             @Input() itemId: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() itemId !: string;
            }
 
            @NgModule({imports: [BrowserModule], declarations: [Ng2Component]})
diff --git a/packages/upgrade/test/static/integration/change_detection_spec.ts b/packages/upgrade/test/static/integration/change_detection_spec.ts
index affa2cd02b..b01649f92c 100644
--- a/packages/upgrade/test/static/integration/change_detection_spec.ts
+++ b/packages/upgrade/test/static/integration/change_detection_spec.ts
@@ -80,7 +80,8 @@ withEachNg1Version(() => {
 
          @Component({selector: 'my-app', template: '<my-child [value]="value"></my-child>'})
          class AppComponent {
-           value: number;
+           // TODO(issue/24571): remove '!'.
+           value !: number;
            constructor() { appComponent = this; }
          }
 
@@ -89,7 +90,8 @@ withEachNg1Version(() => {
            template: '<div>{{ valueFromPromise }}</div>',
          })
          class ChildComponent {
-           valueFromPromise: number;
+           // TODO(issue/24571): remove '!'.
+           valueFromPromise !: number;
            @Input()
            set value(v: number) { expect(NgZone.isInAngularZone()).toBe(true); }
 
diff --git a/packages/upgrade/test/static/integration/content_projection_spec.ts b/packages/upgrade/test/static/integration/content_projection_spec.ts
index 6eea5ceb64..00b21ad536 100644
--- a/packages/upgrade/test/static/integration/content_projection_spec.ts
+++ b/packages/upgrade/test/static/integration/content_projection_spec.ts
@@ -60,7 +60,8 @@ withEachNg1Version(() => {
     it('should correctly project structural directives', async(() => {
          @Component({selector: 'ng2', template: 'ng2-{{ itemId }}(<ng-content></ng-content>)'})
          class Ng2Component {
-           @Input() itemId: string;
+           // TODO(issue/24571): remove '!'.
+           @Input() itemId !: string;
          }
 
          @NgModule({
diff --git a/packages/upgrade/test/static/integration/downgrade_component_spec.ts b/packages/upgrade/test/static/integration/downgrade_component_spec.ts
index 810d604c34..cff3718529 100644
--- a/packages/upgrade/test/static/integration/downgrade_component_spec.ts
+++ b/packages/upgrade/test/static/integration/downgrade_component_spec.ts
@@ -418,8 +418,10 @@ withEachNg1Version(() => {
          class Ng2Component implements OnChanges {
            ngOnChangesCount = 0;
            firstChangesCount = 0;
-           initialValue: string;
-           @Input() foo: string;
+           // TODO(issue/24571): remove '!'.
+           initialValue !: string;
+           // TODO(issue/24571): remove '!'.
+           @Input() foo !: string;
 
            ngOnChanges(changes: SimpleChanges) {
              this.ngOnChangesCount++;
diff --git a/packages/upgrade/test/static/integration/examples_spec.ts b/packages/upgrade/test/static/integration/examples_spec.ts
index 9266a8ced7..3a0989432c 100644
--- a/packages/upgrade/test/static/integration/examples_spec.ts
+++ b/packages/upgrade/test/static/integration/examples_spec.ts
@@ -29,7 +29,8 @@ withEachNg1Version(() => {
          // component
          @Directive({selector: 'ng1'})
          class Ng1Component extends UpgradeComponent {
-           @Input() title: string;
+           // TODO(issue/24571): remove '!'.
+           @Input() title !: string;
 
            constructor(elementRef: ElementRef, injector: Injector) {
              super('ng1', elementRef, injector);
@@ -42,7 +43,8 @@ withEachNg1Version(() => {
            template: 'ng2[<ng1 [title]="nameProp">transclude</ng1>](<ng-content></ng-content>)'
          })
          class Ng2Component {
-           @Input('name') nameProp: string;
+           // TODO(issue/24571): remove '!'.
+           @Input('name') nameProp !: string;
          }
 
          // This module represents the Angular pieces of the application
diff --git a/packages/upgrade/test/static/integration/upgrade_component_spec.ts b/packages/upgrade/test/static/integration/upgrade_component_spec.ts
index 58d07514bc..9c0ee94db2 100644
--- a/packages/upgrade/test/static/integration/upgrade_component_spec.ts
+++ b/packages/upgrade/test/static/integration/upgrade_component_spec.ts
@@ -476,8 +476,10 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input('inputAttrA') inputA: string;
-             @Input() inputB: string;
+             // TODO(issue/24571): remove '!'.
+             @Input('inputAttrA') inputA !: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() inputB !: string;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -551,8 +553,10 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input('inputAttrA') inputA: string;
-             @Input() inputB: string;
+             // TODO(issue/24571): remove '!'.
+             @Input('inputAttrA') inputA !: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() inputB !: string;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -626,10 +630,14 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input('inputAttrA') inputA: string;
-             @Output('inputAttrAChange') inputAChange: EventEmitter<any>;
-             @Input() inputB: string;
-             @Output() inputBChange: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Input('inputAttrA') inputA !: string;
+             // TODO(issue/24571): remove '!'.
+             @Output('inputAttrAChange') inputAChange !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Input() inputB !: string;
+             // TODO(issue/24571): remove '!'.
+             @Output() inputBChange !: EventEmitter<any>;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -701,8 +709,10 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Output('outputAttrA') outputA: EventEmitter<any>;
-             @Output() outputB: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output('outputAttrA') outputA !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output() outputB !: EventEmitter<any>;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -783,13 +793,17 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input() fullName: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() fullName !: string;
              @Input('dataA') modelA: any;
              @Input('dataB') modelB: any;
-             @Output('dataBChange') modelBChange: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output('dataBChange') modelBChange !: EventEmitter<any>;
              @Input() modelC: any;
-             @Output() modelCChange: EventEmitter<any>;
-             @Output() event: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output() modelCChange !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output() event !: EventEmitter<any>;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -862,12 +876,18 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input('inputAttrA') inputA: string;
-             @Output('inputAttrAChange') inputAChange: EventEmitter<any>;
-             @Input() inputB: string;
-             @Output() inputBChange: EventEmitter<any>;
-             @Output('outputAttrA') outputA: EventEmitter<any>;
-             @Output() outputB: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Input('inputAttrA') inputA !: string;
+             // TODO(issue/24571): remove '!'.
+             @Output('inputAttrAChange') inputAChange !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Input() inputB !: string;
+             // TODO(issue/24571): remove '!'.
+             @Output() inputBChange !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output('outputAttrA') outputA !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output() outputB !: EventEmitter<any>;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -957,9 +977,12 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: '[ng1]'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input() inputA: string;
-             @Output() inputAChange: EventEmitter<any>;
-             @Output() outputA: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Input() inputA !: string;
+             // TODO(issue/24571): remove '!'.
+             @Output() inputAChange !: EventEmitter<any>;
+             // TODO(issue/24571): remove '!'.
+             @Output() outputA !: EventEmitter<any>;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -1319,7 +1342,9 @@ withEachNg1Version(() => {
              scope: true,
              controllerAs: 'vm',
              controller: class {
-               hasElement: string; isClass: string; scope: string;
+               hasElement: string;  // TODO(issue/24571): remove '!'.
+               isClass !: string;
+               scope: string;
 
                constructor(public $element: angular.IAugmentedJQuery, $scope: angular.IScope) {
                  this.hasElement = $element[0].nodeName;
@@ -1393,7 +1418,8 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1A'})
            class Ng1ComponentAFacade extends UpgradeComponent {
-             @Input() title: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() title !: string;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1A', elementRef, injector);
@@ -1402,7 +1428,8 @@ withEachNg1Version(() => {
 
            @Directive({selector: 'ng1B'})
            class Ng1ComponentBFacade extends UpgradeComponent {
-             @Input() title: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() title !: string;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1B', elementRef, injector);
@@ -1459,7 +1486,8 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input() title: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() title !: string;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -1508,7 +1536,8 @@ withEachNg1Version(() => {
            // Define `Ng1ComponentFacade`
            @Directive({selector: 'ng1'})
            class Ng1ComponentFacade extends UpgradeComponent {
-             @Input() title: string;
+             // TODO(issue/24571): remove '!'.
+             @Input() title !: string;
 
              constructor(elementRef: ElementRef, injector: Injector) {
                super('ng1', elementRef, injector);
@@ -3336,7 +3365,8 @@ withEachNg1Version(() => {
            @Component(
                {selector: 'ng2', template: '<div *ngIf="show"><ng1A></ng1A> | <ng1B></ng1B></div>'})
            class Ng2Component {
-             @Input() show: boolean;
+             // TODO(issue/24571): remove '!'.
+             @Input() show !: boolean;
            }
 
            // Define `ng1Module`
@@ -3436,7 +3466,8 @@ withEachNg1Version(() => {
            @Component(
                {selector: 'ng2', template: '<div *ngIf="show"><ng1A></ng1A> | <ng1B></ng1B></div>'})
            class Ng2Component {
-             @Input() show: boolean;
+             // TODO(issue/24571): remove '!'.
+             @Input() show !: boolean;
            }
 
            // Define `ng1Module`
@@ -3720,7 +3751,8 @@ withEachNg1Version(() => {
 
          // Define `ng1Component`
          class Ng1ControllerX {
-           ng1XInputA: string;
+           // TODO(issue/24571): remove '!'.
+           ng1XInputA !: string;
            ng1XInputB: any;
            ng1XInputC: any;
 
@@ -3748,12 +3780,16 @@ withEachNg1Version(() => {
          // Define `Ng1ComponentFacade`
          @Directive({selector: 'ng1X'})
          class Ng1ComponentXFacade extends UpgradeComponent {
-           @Input() ng1XInputA: string;
+           // TODO(issue/24571): remove '!'.
+           @Input() ng1XInputA !: string;
            @Input() ng1XInputB: any;
            @Input() ng1XInputC: any;
-           @Output() ng1XInputCChange: EventEmitter<any>;
-           @Output() ng1XOutputA: EventEmitter<any>;
-           @Output() ng1XOutputB: EventEmitter<any>;
+           // TODO(issue/24571): remove '!'.
+           @Output() ng1XInputCChange !: EventEmitter<any>;
+           // TODO(issue/24571): remove '!'.
+           @Output() ng1XOutputA !: EventEmitter<any>;
+           // TODO(issue/24571): remove '!'.
+           @Output() ng1XOutputB !: EventEmitter<any>;
 
            constructor(elementRef: ElementRef, injector: Injector) {
              super('ng1X', elementRef, injector);

From fba3f10938d925d63b559284a860a2849b5a135e Mon Sep 17 00:00:00 2001
From: yjaaidi <yjaaidi@gmail.com>
Date: Wed, 20 Jun 2018 14:14:21 +0200
Subject: [PATCH 332/582] docs: add guide-angular.wishtack.io to education
 resources (#24585)

PR Close #24585
---
 aio/content/marketing/resources.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 2c75bf3534..f867de5fb8 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -490,6 +490,13 @@
             "rev": true,
             "title": "Angular-Buch (German)",
             "url": "https://angular-buch.com/"
+          },
+          "wishtack-guide-angular": {
+            "desc": "The free, open-source and up-to-date Angular guide. This pragmatic guide is focused on best practices and will drive you from scratch to cloud.",
+            "logo": "https://raw.githubusercontent.com/wishtack/gitbook-guide-angular/master/.gitbook/assets/wishtack-logo-with-text.png",
+            "rev": true,
+            "title": "The Angular Guide by Wishtack (Français)",
+            "url": "https://guide-angular.wishtack.io/"
           }
         }
       },

From 1e139d43395b7e17cae75405b023e97d39dc8fa7 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Thu, 21 Jun 2018 11:49:03 +0200
Subject: [PATCH 333/582] refactor(ivy): rename, limit usage of global vars
 (#24604)

PR Close #24604
---
 packages/core/src/render3/instructions.ts         | 15 ++++++++++-----
 .../hello_world/bundle.golden_symbols.json        |  2 +-
 .../test/bundling/todo/bundle.golden_symbols.json |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 390203239d..3f2b19c279 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -234,15 +234,16 @@ export function leaveView(newView: LViewData, creationOnly?: boolean): void {
 
 /**
  * Refreshes the view, executing the following steps in that order:
- * triggers init hooks, refreshes dynamic children, triggers content hooks, sets host bindings,
+ * triggers init hooks, refreshes dynamic embedded views, triggers content hooks, sets host
+ * bindings,
  * refreshes child components.
  * Note: view hooks are triggered later when leaving the view.
- * */
+ */
 function refreshView() {
   if (!checkNoChangesMode) {
     executeInitHooks(viewData, tView, creationMode);
   }
-  refreshDynamicChildren();
+  refreshDynamicEmbeddedViews(viewData);
   if (!checkNoChangesMode) {
     executeHooks(directives !, tView.contentHooks, tView.contentCheckHooks, creationMode);
   }
@@ -1679,8 +1680,12 @@ export function containerRefreshEnd(): void {
   }
 }
 
-function refreshDynamicChildren() {
-  for (let current = getLViewChild(viewData); current !== null; current = current[NEXT]) {
+/**
+ * Goes over dynamic embedded views (ones created through ViewContainerRef APIs) and refreshes them
+ * by executing an associated template function.
+ */
+function refreshDynamicEmbeddedViews(lViewData: LViewData) {
+  for (let current = getLViewChild(lViewData); current !== null; current = current[NEXT]) {
     // Note: current can be an LViewData or an LContainer instance, but here we are only interested
     // in LContainer. We can tell it's an LContainer because its length is less than the LViewData
     // header.
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 3b45ff5977..6bb70e8f53 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -195,7 +195,7 @@
     "name": "refreshChildComponents"
   },
   {
-    "name": "refreshDynamicChildren"
+    "name": "refreshDynamicEmbeddedViews"
   },
   {
     "name": "refreshView"
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 03d1fc5334..737f86ebae 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -468,7 +468,7 @@
     "name": "refreshChildComponents"
   },
   {
-    "name": "refreshDynamicChildren"
+    "name": "refreshDynamicEmbeddedViews"
   },
   {
     "name": "refreshView"

From 6e20e0aac8fb5aa0a44725ee16b69bd204c1a164 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 21 Jun 2018 22:55:47 -0700
Subject: [PATCH 334/582] fix(animations): set animations styles properly on
 platform-server (#24624)

Animations styles weren't getting properly set on platform-server because of erroneous checks and absence of reflection of style property to attribute on the server.

The fix corrects the check for platform and explicitly reflects the style property to the attribute.

PR Close #24624
---
 .../animations/browser/src/render/shared.ts   | 11 ++++-
 packages/animations/browser/src/util.ts       | 44 +++++++++++++++++++
 .../animations/browser/tsconfig-build.json    |  1 +
 .../platform-server/test/integration_spec.ts  | 20 +++++++--
 4 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/packages/animations/browser/src/render/shared.ts b/packages/animations/browser/src/render/shared.ts
index 7cb2f7a033..7027805b46 100644
--- a/packages/animations/browser/src/render/shared.ts
+++ b/packages/animations/browser/src/render/shared.ts
@@ -14,6 +14,10 @@ export function isBrowser() {
   return (typeof window !== 'undefined' && typeof window.document !== 'undefined');
 }
 
+export function isNode() {
+  return (typeof process !== 'undefined');
+}
+
 export function optimizeGroupPlayer(players: AnimationPlayer[]): AnimationPlayer {
   switch (players.length) {
     case 0:
@@ -142,11 +146,14 @@ let _query: (element: any, selector: string, multi: boolean) => any[] =
       return [];
     };
 
-if (isBrowser()) {
+// Define utility methods for browsers and platform-server(domino) where Element
+// and utility methods exist.
+const _isNode = isNode();
+if (_isNode || typeof Element !== 'undefined') {
   // this is well supported in all browsers
   _contains = (elm1: any, elm2: any) => { return elm1.contains(elm2) as boolean; };
 
-  if (Element.prototype.matches) {
+  if (_isNode || Element.prototype.matches) {
     _matches = (element: any, selector: string) => element.matches(selector);
   } else {
     const proto = Element.prototype as any;
diff --git a/packages/animations/browser/src/util.ts b/packages/animations/browser/src/util.ts
index 5b5d8a3587..0fe31caf4f 100644
--- a/packages/animations/browser/src/util.ts
+++ b/packages/animations/browser/src/util.ts
@@ -8,6 +8,7 @@
 import {AnimateTimings, AnimationMetadata, AnimationMetadataType, AnimationOptions, sequence, ɵStyleData} from '@angular/animations';
 import {Ast as AnimationAst, AstVisitor as AnimationAstVisitor} from './dsl/animation_ast';
 import {AnimationDslVisitor} from './dsl/animation_dsl_visitor';
+import {isNode} from './render/shared';
 
 export const ONE_SECOND = 1000;
 
@@ -125,12 +126,47 @@ export function copyStyles(
   return destination;
 }
 
+function getStyleAttributeString(element: any, key: string, value: string) {
+  // Return the key-value pair string to be added to the style attribute for the
+  // given CSS style key.
+  if (value) {
+    return key + ':' + value + ';';
+  } else {
+    return '';
+  }
+}
+
+function writeStyleAttribute(element: any) {
+  // Read the style property of the element and manually reflect it to the
+  // style attribute. This is needed because Domino on platform-server doesn't
+  // understand the full set of allowed CSS properties and doesn't reflect some
+  // of them automatically.
+  let styleAttrValue = '';
+  for (let i = 0; i < element.style.length; i++) {
+    const key = element.style.item(i);
+    styleAttrValue += getStyleAttributeString(element, key, element.style.getPropertyValue(key));
+  }
+  for (const key in element.style) {
+    // Skip internal Domino properties that don't need to be reflected.
+    if (!element.style.hasOwnProperty(key) || key.startsWith('_')) {
+      continue;
+    }
+    const dashKey = camelCaseToDashCase(key);
+    styleAttrValue += getStyleAttributeString(element, dashKey, element.style[key]);
+  }
+  element.setAttribute('style', styleAttrValue);
+}
+
 export function setStyles(element: any, styles: ɵStyleData) {
   if (element['style']) {
     Object.keys(styles).forEach(prop => {
       const camelProp = dashCaseToCamelCase(prop);
       element.style[camelProp] = styles[prop];
     });
+    // On the server set the 'style' attribute since it's not automatically reflected.
+    if (isNode()) {
+      writeStyleAttribute(element);
+    }
   }
 }
 
@@ -140,6 +176,10 @@ export function eraseStyles(element: any, styles: ɵStyleData) {
       const camelProp = dashCaseToCamelCase(prop);
       element.style[camelProp] = '';
     });
+    // On the server set the 'style' attribute since it's not automatically reflected.
+    if (isNode()) {
+      writeStyleAttribute(element);
+    }
   }
 }
 
@@ -231,6 +271,10 @@ export function dashCaseToCamelCase(input: string): string {
   return input.replace(DASH_CASE_REGEXP, (...m: any[]) => m[1].toUpperCase());
 }
 
+function camelCaseToDashCase(input: string): string {
+  return input.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+}
+
 export function allowPreviousPlayerStylesMerge(duration: number, delay: number) {
   return duration === 0 || delay === 0;
 }
diff --git a/packages/animations/browser/tsconfig-build.json b/packages/animations/browser/tsconfig-build.json
index 4e4dfedb12..963bc8dfa2 100644
--- a/packages/animations/browser/tsconfig-build.json
+++ b/packages/animations/browser/tsconfig-build.json
@@ -13,6 +13,7 @@
 
   "files": [
     "public_api.ts",
+    "../../../node_modules/@types/node/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 3e7e8b2006..1b77bab5e6 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationBuilder, animate, style, transition, trigger} from '@angular/animations';
+import {AnimationBuilder, animate, state, style, transition, trigger} from '@angular/animations';
 import {APP_BASE_HREF, PlatformLocation, isPlatformServer} from '@angular/common';
 import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';
 import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
@@ -136,12 +136,21 @@ class SVGServerModule {
 
 @Component({
   selector: 'app',
-  template: '<div @myAnimation>{{text}}</div>',
+  template: `<div [@myAnimation]="state">{{text}}</div>`,
   animations: [trigger(
       'myAnimation',
-      [transition('void => *', [style({'opacity': '0'}), animate(500, style({'opacity': '1'}))])])],
+      [
+        state('void', style({'opacity': '0'})),
+        state('active', style({
+                'opacity': '1',                       // simple supported property
+                'font-weight': 'bold',                // property with dashed name
+                'transform': 'translate3d(0, 0, 0)',  // not natively supported by Domino
+              })),
+        transition('void => *', [animate('0ms')]),
+      ], )]
 })
 class MyAnimationApp {
+  state = 'active';
   constructor(private builder: AnimationBuilder) {}
 
   text = 'Works!';
@@ -524,6 +533,8 @@ class HiddenModule {
         // PlatformConfig takes in a parsed document so that it can be cached across requests.
         doc = '<html><head></head><body><app></app></body></html>';
         called = false;
+        (global as any)['window'] = undefined;
+        (global as any)['document'] = undefined;
       });
       afterEach(() => { expect(called).toBe(true); });
 
@@ -576,6 +587,9 @@ class HiddenModule {
            renderModule(AnimationServerModule, {document: doc}).then(output => {
              expect(output).toContain('Works!');
              expect(output).toContain('ng-trigger-myAnimation');
+             expect(output).toContain('opacity:1;');
+             expect(output).toContain('transform:translate3d(0, 0, 0);');
+             expect(output).toContain('font-weight:bold;');
              called = true;
            });
          }));

From f229449c67709bb684b47e9d142ae5916b65fcde Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Fri, 22 Jun 2018 15:37:38 +0200
Subject: [PATCH 335/582] refactor(ivy): insert embedded views immediately
 (#24629)

PR Close #24629
---
 packages/core/src/render3/di.ts               |  34 ++++--
 packages/core/src/render3/i18n.ts             |   2 +
 packages/core/src/render3/instructions.ts     |  97 ++++++++++-------
 .../core/src/render3/node_manipulation.ts     | 100 ++++++++++++------
 .../hello_world/bundle.golden_symbols.json    |   6 +-
 .../bundling/todo/bundle.golden_symbols.json  |   6 ++
 .../test/render3/view_container_ref_spec.ts   |   7 +-
 7 files changed, 171 insertions(+), 81 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index ecd0bf65f4..33d7eb5971 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -19,16 +19,16 @@ import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_Vie
 import {Type} from '../type';
 
 import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
-import {addToViewTree, assertPreviousIsParent, createLContainer, createLNodeObject, createTNode, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
+import {addToViewTree, assertPreviousIsParent, createEmbeddedViewNode, createLContainer, createLNodeObject, createTNode, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {VIEWS} from './interfaces/container';
-import {ComponentTemplate, DirectiveDefInternal} from './interfaces/definition';
+import {ComponentTemplate, DirectiveDefInternal, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {DIRECTIVES, HOST_NODE, INJECTOR, LViewData, QUERIES, RENDERER, TVIEW, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
-import {appendChild, detachView, getParentLNode, insertView, removeView} from './node_manipulation';
+import {addRemoveViewFromContainer, appendChild, detachView, getChildLNode, getParentLNode, insertView, removeView} from './node_manipulation';
 import {notImplemented, stringify} from './util';
 import {EmbeddedViewRef, ViewRef} from './view_ref';
 
@@ -631,8 +631,11 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
 
   createEmbeddedView<C>(templateRef: viewEngine_TemplateRef<C>, context?: C, index?: number):
       viewEngine_EmbeddedViewRef<C> {
-    const viewRef = templateRef.createEmbeddedView(context || <any>{});
-    this.insert(viewRef, index);
+    const adjustedIdx = this._adjustIndex(index);
+    const viewRef = (templateRef as TemplateRef<C>)
+                        .createEmbeddedView(context || <any>{}, this._lContainerNode, adjustedIdx);
+    (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
+    this._viewRefs.splice(adjustedIdx, 0, viewRef);
     return viewRef;
   }
 
@@ -650,11 +653,15 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
     const lViewNode = (viewRef as EmbeddedViewRef<any>)._lViewNode;
     const adjustedIdx = this._adjustIndex(index);
 
-    (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
-
-    insertView(this._lContainerNode, lViewNode, adjustedIdx);
     lViewNode.dynamicParent = this._lContainerNode;
+    insertView(this._lContainerNode, lViewNode, adjustedIdx);
+    const views = this._lContainerNode.data[VIEWS];
+    const beforeNode = adjustedIdx + 1 < views.length ?
+        (getChildLNode(views[adjustedIdx + 1]) !).native :
+        this._lContainerNode.native;
+    addRemoveViewFromContainer(this._lContainerNode, lViewNode, true, beforeNode);
 
+    (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
 
     return viewRef;
@@ -724,9 +731,14 @@ class TemplateRef<T> implements viewEngine_TemplateRef<T> {
     this.elementRef = elementRef;
   }
 
-  createEmbeddedView(context: T): viewEngine_EmbeddedViewRef<T> {
-    const viewNode =
-        renderEmbeddedTemplate(null, this._tView, context, this._renderer, this._queries);
+  createEmbeddedView(context: T, containerNode?: LContainerNode, index?: number):
+      viewEngine_EmbeddedViewRef<T> {
+    const viewNode = createEmbeddedViewNode(this._tView, context, this._renderer, this._queries);
+    if (containerNode) {
+      viewNode.dynamicParent = containerNode;
+      insertView(containerNode, viewNode, index !);
+    }
+    renderEmbeddedTemplate(viewNode, this._tView, context, RenderFlags.Create);
     return new EmbeddedViewRef(viewNode, this._tView.template !as ComponentTemplate<T>, context);
   }
 }
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 9871b2e56f..f8eed32174 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -8,6 +8,7 @@
 
 import {assertEqual, assertLessThan} from './assert';
 import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load} from './instructions';
+import {RENDER_PARENT} from './interfaces/container';
 import {LContainerNode, LElementNode, LNode, TNodeType} from './interfaces/node';
 import {BINDING_INDEX} from './interfaces/view';
 import {appendChild, createTextNode, getParentLNode, removeChild} from './node_manipulation';
@@ -320,6 +321,7 @@ export function i18nApply(startIndex: number, instructions: I18nInstruction[]):
         if (removedNode.tNode.type === TNodeType.Container && removedNode.dynamicLContainerNode) {
           removeChild(parentNode, removedNode.dynamicLContainerNode.native || null, viewData);
           removedNode.dynamicLContainerNode.tNode.detached = true;
+          removedNode.dynamicLContainerNode.data[RENDER_PARENT] = null;
         }
         break;
     }
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 3f2b19c279..f4684373b8 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -6,19 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import './ng_dev_mode';
+
 import {Sanitizer} from '../sanitization/security';
+
 import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual} from './assert';
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
 import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {ACTIVE_INDEX, LContainer, RENDER_PARENT, VIEWS} from './interfaces/container';
 import {LInjector} from './interfaces/injector';
-import {AttributeMarker, InitialInputData, InitialInputs, LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, PropertyAliases, PropertyAliasValue, TAttributes, TContainerNode, TElementNode, TNode, TNodeFlags, TNodeType,} from './interfaces/node';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
-import {BINDING_INDEX, CLEANUP, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TVIEW, TView,} from './interfaces/view';
-import './ng_dev_mode';
-import {assertNodeType} from './node_assert';
-import {appendChild, appendProjectedNode, canInsertNativeNode, createTextNode, getChildLNode, getLViewChild, getNextLNode, getParentLNode, insertView, removeChild, removeView} from './node_manipulation';
+import {BINDING_INDEX, CLEANUP, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView} from './interfaces/view';
+
+import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
+import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
+import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
 import {ComponentDefInternal, ComponentTemplate, ComponentQuery, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
@@ -463,6 +466,30 @@ export function renderTemplate<T>(
   return host;
 }
 
+/**
+ * Used for creating the LViewNode of a dynamic embedded view,
+ * either through ViewContainerRef.createEmbeddedView() or TemplateRef.createEmbeddedView().
+ * Such lViewNode will then be renderer with renderEmbeddedTemplate() (see below).
+ */
+export function createEmbeddedViewNode<T>(
+    tView: TView, context: T, renderer: Renderer3, queries?: LQueries | null): LViewNode {
+  const _isParent = isParent;
+  const _previousOrParentNode = previousOrParentNode;
+  isParent = true;
+  previousOrParentNode = null !;
+
+  const lView =
+      createLViewData(renderer, tView, context, LViewFlags.CheckAlways, getCurrentSanitizer());
+  if (queries) {
+    lView[QUERIES] = queries.createView();
+  }
+  const viewNode = createLNode(-1, TNodeType.View, null, null, null, lView);
+
+  isParent = _isParent;
+  previousOrParentNode = _previousOrParentNode;
+  return viewNode;
+}
+
 /**
  * Used for rendering embedded views (e.g. dynamically created views)
  *
@@ -474,27 +501,14 @@ export function renderTemplate<T>(
  * TView for dynamically created views on their host TNode, which only has one instance.
  */
 export function renderEmbeddedTemplate<T>(
-    viewNode: LViewNode | null, tView: TView, context: T, renderer: Renderer3,
-    queries?: LQueries | null): LViewNode {
+    viewNode: LViewNode, tView: TView, context: T, rf: RenderFlags): LViewNode {
   const _isParent = isParent;
   const _previousOrParentNode = previousOrParentNode;
   let oldView: LViewData;
-  let rf: RenderFlags = RenderFlags.Update;
   try {
     isParent = true;
     previousOrParentNode = null !;
 
-    if (viewNode == null) {
-      const lView =
-          createLViewData(renderer, tView, context, LViewFlags.CheckAlways, getCurrentSanitizer());
-
-      if (queries) {
-        lView[QUERIES] = queries.createView();
-      }
-
-      viewNode = createLNode(-1, TNodeType.View, null, null, null, lView);
-      rf = RenderFlags.Create;
-    }
     oldView = enterView(viewNode.data, viewNode);
     namespaceHTML();
     tView.template !(rf, context);
@@ -1575,14 +1589,19 @@ function generateInitialInputs(
 export function createLContainer(
     parentLNode: LNode, currentView: LViewData, isForViewContainerRef?: boolean): LContainer {
   ngDevMode && assertDefined(parentLNode, 'containers should have a parent');
+  let renderParent = canInsertNativeNode(parentLNode, currentView) ?
+      parentLNode as LElementNode | LViewNode :
+      null;
+  if (renderParent && renderParent.tNode.type === TNodeType.View) {
+    renderParent = getParentLNode(renderParent as LViewNode) !.data[RENDER_PARENT];
+  }
   return [
     isForViewContainerRef ? null : 0,  // active index
     currentView,                       // parent
     null,                              // next
     null,                              // queries
     [],                                // views
-    canInsertNativeNode(parentLNode, currentView) ? parentLNode as LElementNode :
-                                                    null  // renderParent
+    renderParent as LElementNode
   ];
 }
 
@@ -1697,7 +1716,7 @@ function refreshDynamicEmbeddedViews(lViewData: LViewData) {
         const dynamicViewData = lViewNode.data;
         ngDevMode && assertDefined(dynamicViewData[TVIEW], 'TView must be allocated');
         renderEmbeddedTemplate(
-            lViewNode, dynamicViewData[TVIEW], dynamicViewData[CONTEXT] !, renderer);
+            lViewNode, dynamicViewData[TVIEW], dynamicViewData[CONTEXT] !, RenderFlags.Update);
       }
     }
   }
@@ -1764,6 +1783,17 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
     enterView(
         newView, viewNode = createLNode(viewBlockId, TNodeType.View, null, null, null, newView));
   }
+  const containerNode = getParentLNode(viewNode) as LContainerNode;
+  if (containerNode) {
+    ngDevMode && assertNodeType(viewNode, TNodeType.View);
+    ngDevMode && assertNodeType(containerNode, TNodeType.Container);
+    const lContainer = containerNode.data;
+    if (creationMode) {
+      // it is a new view, insert it into collection of views for a given container
+      insertView(containerNode, viewNode, lContainer[ACTIVE_INDEX] !);
+    }
+    lContainer[ACTIVE_INDEX] !++;
+  }
   return getRenderFlags(viewNode.data);
 }
 
@@ -1794,22 +1824,17 @@ function getOrCreateEmbeddedTView(viewIndex: number, parent: LContainerNode): TV
 export function embeddedViewEnd(): void {
   refreshView();
   isParent = false;
-  const viewNode = previousOrParentNode = viewData[HOST_NODE] as LViewNode;
-  const containerNode = getParentLNode(previousOrParentNode) as LContainerNode;
-  if (containerNode) {
-    ngDevMode && assertNodeType(viewNode, TNodeType.View);
-    ngDevMode && assertNodeType(containerNode, TNodeType.Container);
-    const lContainer = containerNode.data;
-
-    if (creationMode) {
+  previousOrParentNode = viewData[HOST_NODE] as LViewNode;
+  if (creationMode) {
+    const containerNode = getParentLNode(previousOrParentNode) as LContainerNode;
+    if (containerNode) {
+      ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
+      ngDevMode && assertNodeType(containerNode, TNodeType.Container);
       // When projected nodes are going to be inserted, the renderParent of the dynamic container
       // used by the ViewContainerRef must be set.
-      setRenderParentInProjectedNodes(lContainer[RENDER_PARENT], viewNode);
-      // it is a new view, insert it into collection of views for a given container
-      insertView(containerNode, viewNode, lContainer[ACTIVE_INDEX] !);
+      setRenderParentInProjectedNodes(
+          containerNode.data[RENDER_PARENT], previousOrParentNode as LViewNode);
     }
-
-    lContainer[ACTIVE_INDEX] !++;
   }
   leaveView(viewData[PARENT] !);
   ngDevMode && assertEqual(isParent, false, 'isParent');
@@ -2002,7 +2027,7 @@ export function projection(
 
   const currentParent = getParentLNode(node);
   if (canInsertNativeNode(currentParent, viewData)) {
-    ngDevMode && assertNodeType(currentParent, TNodeType.Element);
+    ngDevMode && assertNodeOfPossibleTypes(currentParent, TNodeType.Element, TNodeType.View);
     // process each node in the list of projected nodes:
     let nodeToProject: LNode|null = node.data.head;
     const lastNodeToProject = node.data.tail;
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 25c725e5a7..58a19e1965 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -12,7 +12,7 @@ import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNo
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {CLEANUP, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
-import {assertNodeType} from './node_assert';
+import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {stringify} from './util';
 
 const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4 + unused5;
@@ -313,16 +313,6 @@ export function insertView(
     lView[QUERIES] !.insertView(index);
   }
 
-  // If the container's renderParent is null, we know that it is a root node of its own parent view
-  // and we should wait until that parent processes its nodes (otherwise, we will insert this view's
-  // nodes twice - once now and once when its parent inserts its views).
-  if (container.data[RENDER_PARENT] !== null && !container.tNode.detached) {
-    // Find the node to insert in front of
-    const beforeNode =
-        index + 1 < views.length ? (getChildLNode(views[index + 1]) !).native : container.native;
-    addRemoveViewFromContainer(container, viewNode, true, beforeNode);
-  }
-
   // Sets the attached flag
   viewNode.data[FLAGS] |= LViewFlags.Attached;
 
@@ -485,27 +475,66 @@ function executePipeOnDestroys(viewData: LViewData): void {
 }
 
 /**
- * Returns whether a native element should be inserted in the given parent.
+ * Returns whether a native element can be inserted into the given parent.
+ * 
+ * There are two reasons why we may not be able to insert a element immediately.
+ * - Projection: When creating a child content element of a component, we have to skip the 
+ *   insertion because the content of a component will be projected.
+ *   `<component><content>delayed due to projection</content></component>`
+ * - Parent container is disconnected: This can happen when we are inserting a view into 
+ *   parent container, which itself is disconnected. For example the parent container is part 
+ *   of a View which has not be inserted or is mare for projection but has not been inserted 
+ *   into destination.
  *
- * The native node can be inserted when its parent is:
- * - A regular element => Yes
- * - A component host element =>
- *    - if the `currentView` === the parent `view`: The element is in the content (vs the
- *      template)
- *      => don't add as the parent component will project if needed.
- *    - `currentView` !== the parent `view` => The element is in the template (vs the content),
- *      add it
- * - View element => delay insertion, will be done on `viewEnd()`
+
  *
- * @param parent The parent in which to insert the child
- * @param currentView The LView being processed
- * @return boolean Whether the child element should be inserted.
+ * @param parent The parent where the child will be inserted into.
+ * @param currentView Current LView being processed.
+ * @return boolean Whether the child should be inserted now (or delayed until later).
  */
 export function canInsertNativeNode(parent: LNode, currentView: LViewData): boolean {
-  const parentIsElement = parent.tNode.type === TNodeType.Element;
+  // We can only insert into a Component or View. Any other type should be an Error.
+  ngDevMode && assertNodeOfPossibleTypes(parent, TNodeType.Element, TNodeType.View);
 
-  return parentIsElement &&
-      (parent.view !== currentView || parent.data === null /* Regular Element. */);
+  if (parent.tNode.type === TNodeType.Element) {
+    // Parent is an element.
+    if (parent.view !== currentView) {
+      // If the Parent view is not the same as current view than we are inserting across
+      // Views. This happens when we insert a root element of the component view into
+      // the component host element and it should always be eager.
+      return true;
+    }
+    // Parent elements can be a component which may have projection.
+    if (parent.data === null) {
+      // Parent is a regular non-component element. We should eagerly insert into it
+      // since we know that this relationship will never be broken.
+      return true;
+    } else {
+      // Parent is a Component. Component's content nodes are not inserted immediately
+      // because they will be projected, and so doing insert at this point would be wasteful.
+      // Since the projection would than move it to its final destination.
+      return false;
+    }
+  } else {
+    // Parent is a View.
+    ngDevMode && assertNodeType(parent, TNodeType.View);
+
+    // Because we are inserting into a `View` the `View` may be disconnected.
+    const grandParentContainer = getParentLNode(parent) as LContainerNode;
+    if (grandParentContainer == null) {
+      // The `View` is not inserted into a `Container` we have to delay insertion.
+      return false;
+    }
+    ngDevMode && assertNodeType(grandParentContainer, TNodeType.Container);
+    if (grandParentContainer.data[RENDER_PARENT] == null) {
+      // The parent `Container` itself is disconnected. So we have to delay.
+      return false;
+    } else {
+      // The parent `Container` is in inserted state, so we can eagerly insert into
+      // this location.
+      return true;
+    }
+  }
 }
 
 /**
@@ -520,10 +549,21 @@ export function canInsertNativeNode(parent: LNode, currentView: LViewData): bool
  */
 export function appendChild(parent: LNode, child: RNode | null, currentView: LViewData): boolean {
   if (child !== null && canInsertNativeNode(parent, currentView)) {
-    // We only add the element if not in View or not projected.
     const renderer = currentView[RENDERER];
-    isProceduralRenderer(renderer) ? renderer.appendChild(parent.native !as RElement, child) :
-                                     parent.native !.appendChild(child);
+    if (parent.tNode.type === TNodeType.View) {
+      const container = getParentLNode(parent) as LContainerNode;
+      const renderParent = container.data[RENDER_PARENT];
+      const views = container.data[VIEWS];
+      const index = views.indexOf(parent as LViewNode);
+      const beforeNode =
+          index + 1 < views.length ? (getChildLNode(views[index + 1]) !).native : container.native;
+      isProceduralRenderer(renderer) ?
+          renderer.insertBefore(renderParent !.native, child, beforeNode) :
+          renderParent !.native.insertBefore(child, beforeNode, true);
+    } else {
+      isProceduralRenderer(renderer) ? renderer.appendChild(parent.native !as RElement, child) :
+                                       parent.native !.appendChild(child);
+    }
     return true;
   }
   return false;
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 6bb70e8f53..231741d6aa 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -57,10 +57,10 @@
     "name": "RENDERER"
   },
   {
-    "name": "ROOT_DIRECTIVE_INDICES"
+    "name": "RENDER_PARENT"
   },
   {
-    "name": "SANITIZER"
+    "name": "ROOT_DIRECTIVE_INDICES"
   },
   {
     "name": "TVIEW"
@@ -156,7 +156,7 @@
     "name": "firstTemplatePass"
   },
   {
-    "name": "getCurrentSanitizer"
+    "name": "getChildLNode"
   },
   {
     "name": "getDirectiveInstance"
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 737f86ebae..9a7455412e 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -83,6 +83,9 @@
   {
     "name": "RENDERER"
   },
+  {
+    "name": "RENDER_PARENT"
+  },
   {
     "name": "ROOT_DIRECTIVE_INDICES"
   },
@@ -335,6 +338,9 @@
   {
     "name": "generatePropertyAliases"
   },
+  {
+    "name": "getChildLNode"
+  },
   {
     "name": "getCleanup"
   },
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index cb4e31f50a..4031992eb8 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -261,6 +261,11 @@ describe('ViewContainerRef', () => {
 
              insertTpl(ctx: {}) { this._vcRef.createEmbeddedView(this._tplRef, ctx); }
 
+             insertTpl2(ctx: {}) {
+               const viewRef = this._tplRef.createEmbeddedView(ctx);
+               this._vcRef.insert(viewRef);
+             }
+
              remove(index?: number) { this._vcRef.remove(index); }
            }
 
@@ -327,7 +332,7 @@ describe('ViewContainerRef', () => {
            fixture.update();
            expect(fixture.html).toEqual('before|A|after');
 
-           directiveInstance !.insertTpl({});
+           directiveInstance !.insertTpl2({});
            expect(fixture.html).toEqual('before|AA|after');
 
            fixture.component.condition = true;

From f841e365437d9fd93683f3c444ac213c35b34ac9 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Thu, 21 Jun 2018 21:56:51 -0700
Subject: [PATCH 336/582] ci: scripts to review PRs locally (#24623)

PR Close #24623
---
 docs/PR_REVIEW.md                | 155 +++++++++++++++++++++++++++++++
 scripts/github/push-pr           |  56 +++++++++++
 scripts/github/review-pr         |  60 ++++++++++++
 scripts/github/utils/git_util.js |  95 +++++++++++++++++++
 4 files changed, 366 insertions(+)
 create mode 100644 docs/PR_REVIEW.md
 create mode 100755 scripts/github/push-pr
 create mode 100755 scripts/github/review-pr
 create mode 100644 scripts/github/utils/git_util.js

diff --git a/docs/PR_REVIEW.md b/docs/PR_REVIEW.md
new file mode 100644
index 0000000000..5a4278513a
--- /dev/null
+++ b/docs/PR_REVIEW.md
@@ -0,0 +1,155 @@
+# PR Review
+
+## Tools
+
+A better way to do a code-review of a PR is to do it in your IDE.
+Here are two scripts which allow you to perform the review and create local changes which can be appended to the PR.
+
+### 1. Loading PR
+
+Run this command to load the changes into your local repository where your IDE is running.
+
+```
+$ ./scripts/github/review-pr 24623
+```
+
+This will result in output:
+
+```
+Already on 'master'
+Your branch is up to date with 'origin/master'.
+Fetching pull request #24623 with 1 SHA(s) into branch range: pr/24623_base..pr/24623_top
+======================================================================================
+cef93a51b (pr/24623_top) ci: scripts to review PRs locally
+======================================================================================
+Switched to a new branch 'pr/24623'
+On branch pr/24623
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+        docs/PR_REVIEW.md
+        scripts/github/push-pr
+        scripts/github/review-pr
+
+nothing added to commit but untracked files present (use "git add" to track)
+```
+
+Note that the script created `pr/24623_top` and `pr/24623_base` branches which denote SHAs where the PR start and end.
+
+```
+cef93a51b (pr/24623_top) ci: scripts to review PRs locally
+637805a0c (pr/24623_base) docs: update `lowercase` pipe example in "AngularJS to Angular" guide (#24588)
+```
+
+Knowing `pr/24623_top` and `pr/24623_base` makes it convenient to refer to different SHAs in PR when rebasing or reseting. 
+
+### 2. Review PR
+
+Because the script has reset the `HEAD` of the PR the changes show up as unstaged files.
+
+```
+$ git status
+On branch pr/24623
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+        docs/PR_REVIEW.md
+        scripts/github/push-pr
+        scripts/github/review-pr
+
+nothing added to commit but untracked files present (use "git add" to track)
+```
+
+Use your IDE to review the untracked files as needed.
+A good trick is to use your IDE to stage the files which were already reviewed.
+When all files are staged the review is done.
+
+### 3. Creating Edits
+
+At any point you can edit any line in the repository.
+The idea is to create edits locally and push them to the PR later.
+This is useful because it is often times easier to make minor changes locally than to request the PR author to change and repush through a comment (often times the comment is larger than the change.)
+
+Example of a local edit.
+```
+echo "# here is a change" >> docs/PR_REVIEW.md
+```
+
+### 4. Creating a Commit From Local Edits
+
+Since the HEAD has been reset to `pr/24623_base` so that changes show up in `git status` we have to reverse the reset to only see our local changes.
+To do that reset the `HEAD` to `pr/24623_top`.
+
+```
+$ git reset pr/24623_top
+```
+
+Doing so will remove all PR changes and only leave your local modifications which you have done.
+You can verify by running `git status` and `git diff` to see only your changes (PR changes have been removed.)
+
+```
+$ git status
+On branch pr/24623
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+        modified:   docs/PR_REVIEW.md
+
+no changes added to commit (use "git add" and/or "git commit -a")
+```
+```
+$ git diff
+diff --git a/docs/PR_REVIEW.md b/docs/PR_REVIEW.md
+index 184b5aeca..83517fbe0 100644
+--- a/docs/PR_REVIEW.md
++++ b/docs/PR_REVIEW.md
+@@ -8,4 +8,4 @@ A better way to do code review of the PR is to do it in your IDE. Here are two s
+existing text
+-
+\ No newline at end of file
++# here is a change
+```
+
+Next step is to turn your local changes into a `fixup!` commit.
+Run `git commit --all --fixup HEAD` to create a `fixup!` commit.
+
+NOTE: If you added new files they must be added using `git add .` or they will not be picked up by the `git commit --all` flag.
+
+```
+$ git commit --all --fixup HEAD
+[pr/24623 45ae87ce4] fixup! ci: scripts to review PRs locally
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+```
+
+You can verify that the `fixup!` commit with your local modifications was created.
+```
+$ git log --oneline
+45ae87ce4 (HEAD -> pr/24623) fixup! ci: scripts to review PRs locally
+cef93a51b (pr/24623_top) ci: scripts to review PRs locally
+```
+
+### 5. Pushing local edits back to the PR
+
+The last step is to push your local changes back into the PR. 
+Use `./scripts/github/push-pr` script for that.
+
+```
+$ ./scripts/github/push-pr
+Assuming PR #24623
+>>> git push  git@github.com:mhevery/angular.git HEAD:review_pr_script
+Counting objects: 4, done.
+Delta compression using up to 8 threads.
+Compressing objects: 100% (4/4), done.
+Writing objects: 100% (4/4), 392 bytes | 392.00 KiB/s, done.
+Total 4 (delta 3), reused 0 (delta 0)
+remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
+To github.com:mhevery/angular.git
+   cef93a51b..45ae87ce4  HEAD -> review_pr_script
+```
+
+NOTE: Notice that we did not have to specify the PR number since the script can guess it from the branch name.
+
+If you visit https://github.com/angular/angular/pull/24623/commits you will see that your `fixup!` commit has been added to the PR.
+This greatly simplifies the work for many minor changes to the PR. 
+
diff --git a/scripts/github/push-pr b/scripts/github/push-pr
new file mode 100755
index 0000000000..a32eceaaae
--- /dev/null
+++ b/scripts/github/push-pr
@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+const shell = require('shelljs');
+shell.config.fatal = true;
+const util = require('./utils/git_util');
+
+if (require.main === module) {
+  main(process.argv.splice(2)).then(
+    (v) => process.exitCode, 
+    (e) => console.error(process.exitCode = 1, e) 
+  );
+}
+
+async function main(args) {
+  let forceWithLease = '';
+  let prNumber = 0;
+  let printHelp = false;
+
+  args.forEach((arg) => {
+    if (prNumber == 0 && arg > 0) {
+      prNumber = arg;
+    } else if (arg == '--help') {
+      printHelp = true;
+    } else if (arg == '--force-with-lease') {
+      forceWithLease = ' --force-with-lease';
+    } else {
+      shell.echo('Unexpected argument: ', arg);
+    }
+  });
+
+  if (!prNumber) {
+    const branch = util.getCurrentBranch();
+    const maybePr = branch.split('/')[1];
+    if (maybePr > 0) {
+      shell.echo(`PR number not specified. Defaulting to #${maybePr}.`);
+      prNumber = maybePr;
+    }
+  }
+
+  if (!prNumber || printHelp) {
+    shell.echo(`Push the current HEAD into an existing pull request.`);
+    shell.echo(``);
+    shell.echo(`${process.argv[1]} [PR_NUMBER] [--force-with-lease]`);
+    shell.echo(``);
+    shell.echo(`    --force-with-lease    Continues even \if change can\'t be fast-forwarded.`);
+    shell.echo(`    [PR_NUMBER]           If not present the script guesses the PR from the branch name.`);
+    return 1;
+  }
+
+  const prInfo = await util.githubPrInfo(prNumber);
+  const prPushCmd = `git push${forceWithLease} ${prInfo.repository.gitUrl} HEAD:${prInfo.branch}`;
+  shell.echo(`>>> ${prPushCmd}`);
+  shell.exec(prPushCmd);
+
+  return 0;
+ }
diff --git a/scripts/github/review-pr b/scripts/github/review-pr
new file mode 100755
index 0000000000..d8883d0381
--- /dev/null
+++ b/scripts/github/review-pr
@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+
+const shell = require('shelljs');
+shell.config.fatal = true;
+const util = require('./utils/git_util');
+
+if (require.main === module) {
+  main(process.argv.splice(2)).then(
+    (v) => process.exitCode = v, 
+    (e) => console.error(process.exitCode = 1, e)
+  );
+}
+
+async function main(args) {
+  let prNumber = 0;
+
+  args.forEach((arg) => {
+    if (prNumber == 0 && arg > 0) {
+        prNumber = arg;
+    } else {
+        shell.echo('Unexpected argument: ', arg);
+    }
+  });
+
+  if (prNumber === 0) {
+    shell.echo('Bring github pull request onto your local repo for review and edit');
+    shell.echo('');
+    shell.echo(`${process.argv[1]} PR_NUMBER`);
+    shell.echo('');
+    return 1;
+  }
+
+  if (util.gitHasLocalModifications()) {
+    shell.echo('Local modification detected. exiting...');
+    return 1;
+  }
+
+  let prShaCount = (await util.githubPrInfo(prNumber)).commits;
+
+  shell.exec(`git checkout master`);
+  if (util.execNoFatal(`git rev-parse --verify --quiet pr/${prNumber}`).code == 0) {
+    shell.exec(`git branch -D pr/${prNumber}`);
+  }
+
+  shell.echo(`Fetching pull request #${prNumber} with ${prNumber} SHA(s) into branch range: pr/${prNumber}_base..pr/${prNumber}_top`);
+  shell.exec(`git fetch -f git@github.com:angular/angular.git pull/${prNumber}/head:pr/${prNumber}_top`);
+
+  shell.exec(`git branch -f pr/${prNumber}_base pr/${prNumber}_top~${prShaCount}`);
+
+  shell.echo(`======================================================================================`);
+  shell.exec(`git log --oneline --color pr/${prNumber}_base..pr/${prNumber}_top`);
+  shell.echo(`======================================================================================`);
+
+  // Reset the HEAD so that we can see changed files for review
+  shell.exec(`git checkout --force -b pr/${prNumber} pr/${prNumber}_top`);
+  shell.exec(`git reset pr/${prNumber}_base`);
+  shell.exec(`git status`);
+
+  return 0;
+}
diff --git a/scripts/github/utils/git_util.js b/scripts/github/utils/git_util.js
new file mode 100644
index 0000000000..35124df18e
--- /dev/null
+++ b/scripts/github/utils/git_util.js
@@ -0,0 +1,95 @@
+/**
+ * @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
+ */
+
+const https = require('https');
+const shell = require('shelljs');
+
+function httpGet(server, path, headers) {
+  return new Promise((resolve, reject) => {
+    const options = {
+      hostname: server,
+      port: 443,
+      path: path,
+      method: 'GET',
+      headers: {'User-Agent': 'script', ...headers}
+    };
+    https
+        .get(
+            options,
+            (res) => {
+              let json = '';
+              res.on('data', (chunk) => json += chunk.toString());
+              res.on('end', () => resolve(json));
+            })
+        .on('error', (e) => reject(e));
+  });
+};
+
+let warnNoToken = true;
+
+async function githubGet(path) {
+  const token = process.env['TOKEN'];
+  const headers = {};
+  if (token) {
+    headers.Authorization = 'token ' + token;
+  } else if (warnNoToken) {
+    warnNoToken = false;
+    console.warn('############################################################');
+    console.warn('############################################################');
+    console.warn('WARNING: you should set the TOKEN variable to a github token');
+    console.warn('############################################################');
+    console.warn('############################################################');
+  }
+
+  return JSON.parse(await httpGet('api.github.com', '/repos/angular/angular/' + path, headers));
+};
+
+async function githubPrInfo(prNumber) {
+  const pr = (await githubGet('pulls/' + prNumber));
+  const label = pr.head.label.split(':');
+  const user = label[0];
+  const branch = label[1];
+  return {
+    commits: pr.commits,
+    repository: {
+      user: user,
+      gitUrl: `git@github.com:${user}/angular.git`,
+    },
+    branch: branch
+  };
+};  // trailing ; so that clang-format is not confused on async function
+
+function gitHasLocalModifications() {
+  return execNoFatal('git diff-index --quiet HEAD --').code != 0;
+}
+
+function execNoFatal(cmd, options) {
+  const fatal = shell.config.fatal;
+  try {
+    shell.config.fatal = false;
+    return shell.exec(cmd, options);
+  } finally {
+    shell.config.fatal = fatal;
+  }
+}
+
+function getCurrentBranch() {
+  return shell.exec('git branch', {silent: true})
+      .stdout.toString()
+      .split('\n')                      // Break into lines
+      .map((v) => v.trim())             // trim
+      .filter((b) => b[0] == '*')       // select current branch
+      .map((b) => b.split(' ')[1])[0];  // remove leading `*`
+}
+
+exports.httpGet = httpGet;
+exports.githubGet = githubGet;
+exports.githubPrInfo = githubPrInfo;
+exports.gitHasLocalModifications = gitHasLocalModifications;
+exports.execNoFatal = execNoFatal;
+exports.getCurrentBranch = getCurrentBranch;
\ No newline at end of file

From 7d1f9c8a7c95a6fdf5524c422b335a8c20d70678 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 20 Jun 2018 13:29:37 +0300
Subject: [PATCH 337/582] build: upgrade AngularJS typings (#24583)

Previously, we were using [@types/angularjs][1], which is deprecated and
outdated (hasn't been updated for over two years). This PR switches to
[@types/angular][2], which is regularly updated (based on the
definitions on [DefinitelyTyped][3]).

[1]: https://www.npmjs.com/package/@types/angularjs
[2]: https://www.npmjs.com/package/@types/angular
[3]: https://github.com/DefinitelyTyped/DefinitelyTyped

PR Close #24583
---
 modules/tsconfig.json                   | 2 +-
 package.json                            | 2 +-
 packages/examples/tsconfig-build.json   | 2 +-
 packages/tsconfig.json                  | 2 +-
 packages/upgrade/src/common/angular1.ts | 2 +-
 yarn.lock                               | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index d5992a365a..5dedb93d0e 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -20,7 +20,7 @@
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
     "target": "es5",
-    "types": ["angularjs"]
+    "types": ["angular"]
   },
   "exclude": [
     "angular1_router",
diff --git a/package.json b/package.json
index 205b61772b..ad6fc0b735 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@bazel/ibazel": "^0.1.1",
-    "@types/angularjs": "1.5.14-alpha",
+    "@types/angular": "^1.6.47",
     "@types/base64-js": "1.2.5",
     "@types/chai": "^4.1.2",
     "@types/chokidar": "1.7.3",
diff --git a/packages/examples/tsconfig-build.json b/packages/examples/tsconfig-build.json
index 9fb861daf5..5b95650c02 100644
--- a/packages/examples/tsconfig-build.json
+++ b/packages/examples/tsconfig-build.json
@@ -11,7 +11,7 @@
       "rxjs/*": ["../../node_modules/rxjs/*"]
     },
     "outDir": "../../dist/examples",
-    "types": ["jasmine", "node", "angularjs", "systemjs"]
+    "types": ["jasmine", "node", "angular", "systemjs"]
   },
 
   "include": [
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index fd47b5b67d..c7892b33e0 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -23,7 +23,7 @@
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
     "target": "es5",
-    "types": ["angularjs"]
+    "types": ["angular"]
   },
   "bazelOptions": {
     "suppressTsconfigOverrideWarnings": true
diff --git a/packages/upgrade/src/common/angular1.ts b/packages/upgrade/src/common/angular1.ts
index 88183f2ba7..e64b8f28ec 100644
--- a/packages/upgrade/src/common/angular1.ts
+++ b/packages/upgrade/src/common/angular1.ts
@@ -10,7 +10,7 @@ export type Ng1Token = string;
 
 export type Ng1Expression = string | Function;
 
-export interface IAnnotatedFunction extends Function { $inject?: Ng1Token[]; }
+export interface IAnnotatedFunction extends Function { $inject?: ReadonlyArray<Ng1Token>; }
 
 export type IInjectable = (Ng1Token | Function)[] | IAnnotatedFunction;
 
diff --git a/yarn.lock b/yarn.lock
index b9ee164192..66cfc72758 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,9 +52,9 @@
     "@angular-devkit/schematics" "0.5.4"
     typescript "~2.6.2"
 
-"@types/angularjs@1.5.14-alpha":
-  version "1.5.14-alpha"
-  resolved "https://registry.yarnpkg.com/@types/angularjs/-/angularjs-1.5.14-alpha.tgz#2add80c88e1d84ade07e042918843093b6ac9808"
+"@types/angular@^1.6.47":
+  version "1.6.47"
+  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.47.tgz#f7a31279a02c0892ed9aa76aae2da1b17791bacd"
 
 "@types/base64-js@1.2.5":
   version "1.2.5"

From 941d2cdaaf3ff8057f5063a243777edb240dcd73 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 20 Jun 2018 14:01:23 +0300
Subject: [PATCH 338/582] test(aio): fix upgrade-phonecat examples e2e tests
 (#24583)

Closes #19625

PR Close #24583
---
 aio/content/examples/.gitignore               |  2 +
 .../tsconfig.ajs.json                         |  1 +
 .../tsconfig.json                             |  6 +--
 .../upgrade-phonecat-2-hybrid/app/main-aot.ts |  2 +-
 .../phone-detail.component.spec.ts            |  4 +-
 .../phone-list/phone-list.component.spec.ts   |  4 +-
 .../tsconfig-aot.json                         |  9 ++--
 .../upgrade-phonecat-2-hybrid/tsconfig.json   |  6 +--
 .../phone-detail.component.spec.ts            |  4 +-
 .../phone-list/phone-list.component.spec.ts   |  4 +-
 .../upgrade-phonecat-3-final/tsconfig.json    |  6 +--
 aio/package.json                              |  2 +-
 aio/tools/examples/run-example-e2e.js         |  1 -
 .../boilerplate/systemjs/src/tsconfig.json    |  6 +--
 aio/tools/examples/shared/package.json        | 13 +++---
 aio/tools/examples/shared/yarn.lock           | 42 ++++++++-----------
 16 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/aio/content/examples/.gitignore b/aio/content/examples/.gitignore
index 761853450c..d40a958d04 100644
--- a/aio/content/examples/.gitignore
+++ b/aio/content/examples/.gitignore
@@ -60,6 +60,8 @@ dist/
 !rollup-config.js
 aot-compiler/**/*.d.ts
 aot-compiler/**/*.factory.d.ts
+upgrade-phonecat-2-hybrid/aot/**/*
+!upgrade-phonecat-2-hybrid/aot/index.html
 
 # i18n
 !i18n/src/systemjs-text-plugin.js
diff --git a/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.ajs.json b/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.ajs.json
index 53da36ca95..8a60b91b02 100644
--- a/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.ajs.json
+++ b/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.ajs.json
@@ -8,6 +8,7 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "noImplicitAny": false,
+    "skipLibCheck": true,
     "suppressImplicitAnyIndexErrors": true
   }
 }
diff --git a/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.json b/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.json
index 8444d2ddea..1d3d14ae78 100644
--- a/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.json
+++ b/aio/content/examples/upgrade-phonecat-1-typescript/tsconfig.json
@@ -8,10 +8,8 @@
     "experimentalDecorators": true,
     "lib": [ "es2015", "dom" ],
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "typeRoots": [
-      "./node_modules/@types/"
-    ]
+    "skipLibCheck": true,
+    "suppressImplicitAnyIndexErrors": true
   },
   "compileOnSave": true,
   "exclude": [
diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/main-aot.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/main-aot.ts
index bbf091409d..d81fae073b 100644
--- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/main-aot.ts
+++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/main-aot.ts
@@ -1,6 +1,6 @@
 // #docregion
 import { platformBrowser } from '@angular/platform-browser';
 
-import { AppModuleNgFactory } from '../aot/app/app.module.ngfactory';
+import { AppModuleNgFactory } from './app.module.ngfactory';
 
 platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts
index 260794b98b..49a3bbf1cd 100644
--- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts
+++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts
@@ -3,7 +3,7 @@
 import { ActivatedRoute } from '@angular/router';
 
 // #enddocregion activatedroute
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 
 import { async, TestBed } from '@angular/core/testing';
 
@@ -21,7 +21,7 @@ function xyzPhoneData(): PhoneData {
 
 class MockPhone {
   get(id: string): Observable<PhoneData> {
-    return Observable.of(xyzPhoneData());
+    return of(xyzPhoneData());
   }
 }
 
diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts
index db77d7c844..21bd8182b7 100644
--- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts
+++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts
@@ -2,7 +2,7 @@
 // #docregion
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { SpyLocation } from '@angular/common/testing';
 
@@ -15,7 +15,7 @@ class ActivatedRouteMock {
 
 class MockPhone {
   query(): Observable<PhoneData[]> {
-    return Observable.of([
+    return of([
       {name: 'Nexus S', snippet: '', images: []},
       {name: 'Motorola DROID', snippet: '', images: []}
     ]);
diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig-aot.json b/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig-aot.json
index 91807a25a9..c7f1231897 100644
--- a/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig-aot.json
+++ b/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig-aot.json
@@ -9,10 +9,8 @@
     "lib": ["es2015", "dom"],
     "removeComments": false,
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "typeRoots": [
-      "./node_modules/@types/"
-    ]
+    "skipLibCheck": true,
+    "suppressImplicitAnyIndexErrors": true
   },
 
   "files": [
@@ -21,7 +19,6 @@
   ],
 
   "angularCompilerOptions": {
-   "genDir": "aot",
-   "skipMetadataEmit" : true
+    "skipMetadataEmit" : true
  }
 }
diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig.json b/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig.json
index bdf16643ce..5ee3c82f1e 100644
--- a/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig.json
+++ b/aio/content/examples/upgrade-phonecat-2-hybrid/tsconfig.json
@@ -8,10 +8,8 @@
     "experimentalDecorators": true,
     "lib": [ "es2015", "dom" ],
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "typeRoots": [
-      "./node_modules/@types/"
-    ]
+    "skipLibCheck": true,
+    "suppressImplicitAnyIndexErrors": true
   },
   "compileOnSave": true,
   "exclude": [
diff --git a/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts b/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts
index 260794b98b..49a3bbf1cd 100644
--- a/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts
+++ b/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts
@@ -3,7 +3,7 @@
 import { ActivatedRoute } from '@angular/router';
 
 // #enddocregion activatedroute
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 
 import { async, TestBed } from '@angular/core/testing';
 
@@ -21,7 +21,7 @@ function xyzPhoneData(): PhoneData {
 
 class MockPhone {
   get(id: string): Observable<PhoneData> {
-    return Observable.of(xyzPhoneData());
+    return of(xyzPhoneData());
   }
 }
 
diff --git a/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts b/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts
index 244c898461..588eabe76e 100644
--- a/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts
+++ b/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts
@@ -2,7 +2,7 @@
 // #docregion routestuff
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { SpyLocation } from '@angular/common/testing';
 
@@ -17,7 +17,7 @@ class ActivatedRouteMock {
 
 class MockPhone {
   query(): Observable<PhoneData[]> {
-    return Observable.of([
+    return of([
       {name: 'Nexus S', snippet: '', images: []},
       {name: 'Motorola DROID', snippet: '', images: []}
     ]);
diff --git a/aio/content/examples/upgrade-phonecat-3-final/tsconfig.json b/aio/content/examples/upgrade-phonecat-3-final/tsconfig.json
index bdf16643ce..5ee3c82f1e 100644
--- a/aio/content/examples/upgrade-phonecat-3-final/tsconfig.json
+++ b/aio/content/examples/upgrade-phonecat-3-final/tsconfig.json
@@ -8,10 +8,8 @@
     "experimentalDecorators": true,
     "lib": [ "es2015", "dom" ],
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "typeRoots": [
-      "./node_modules/@types/"
-    ]
+    "skipLibCheck": true,
+    "suppressImplicitAnyIndexErrors": true
   },
   "compileOnSave": true,
   "exclude": [
diff --git a/aio/package.json b/aio/package.json
index 6fde4027d0..b8cdcaff5f 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -32,7 +32,7 @@
     "test-pwa-score": "node scripts/test-pwa-score",
     "example-e2e": "yarn example-check-local && node ./tools/examples/run-example-e2e",
     "example-lint": "tslint -c \"content/examples/tslint.json\" \"content/examples/**/*.ts\" -e \"content/examples/styleguide/**/*.avoid.ts\"",
-    "example-use-local": "node tools/ng-packages-installer overwrite ./tools/examples/shared",
+    "example-use-local": "node tools/ng-packages-installer overwrite ./tools/examples/shared --debug",
     "example-use-npm": "node tools/ng-packages-installer restore ./tools/examples/shared",
     "example-check-local": "node tools/ng-packages-installer check ./tools/examples/shared",
     "deploy-preview": "scripts/deploy-preview.sh",
diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js
index e7d6291d0b..dba71961c4 100644
--- a/aio/tools/examples/run-example-e2e.js
+++ b/aio/tools/examples/run-example-e2e.js
@@ -18,7 +18,6 @@ const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
 const IGNORED_EXAMPLES = [ // temporary ignores
   'quickstart',
   'setup',
-  'upgrade-p'
 ];
 
 /**
diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/tsconfig.json b/aio/tools/examples/shared/boilerplate/systemjs/src/tsconfig.json
index eefc5bb779..e12e9a7fec 100644
--- a/aio/tools/examples/shared/boilerplate/systemjs/src/tsconfig.json
+++ b/aio/tools/examples/shared/boilerplate/systemjs/src/tsconfig.json
@@ -8,10 +8,8 @@
     "experimentalDecorators": true,
     "lib": [ "es2015", "dom" ],
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "typeRoots": [
-      "../node_modules/@types/"
-    ]
+    "skipLibCheck": true,
+    "suppressImplicitAnyIndexErrors": true
   },
   "compileOnSave": true,
   "exclude": [
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 0e3ff282e5..1267ad5a67 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -45,16 +45,15 @@
     "@angular/compiler-cli": "^6.0.0",
     "@angular/language-service": "^6.0.0",
     "@angular/platform-server": "^6.0.0",
-    "@types/angular": "^1.5.16",
-    "@types/angular-animate": "^1.5.5",
-    "@types/angular-cookies": "^1.4.2",
-    "@types/angular-mocks": "^1.5.5",
-    "@types/angular-resource": "^1.5.6",
-    "@types/angular-route": "^1.3.2",
-    "@types/angular-sanitize": "^1.3.3",
+    "@types/angular": "^1.6.47",
+    "@types/angular-animate": "^1.5.10",
+    "@types/angular-mocks": "^1.6.0",
+    "@types/angular-resource": "^1.5.14",
+    "@types/angular-route": "^1.3.5",
     "@types/express": "^4.0.35",
     "@types/jasmine": "~2.8.0",
     "@types/jasminewd2": "^2.0.3",
+    "@types/jquery": "^3.3.4",
     "@types/node": "^6.0.45",
     "canonical-path": "0.0.2",
     "concurrently": "^3.0.0",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index ab9ed54dc6..18af4cf4ea 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -240,45 +240,33 @@
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
 
-"@types/angular-animate@^1.5.5":
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/@types/angular-animate/-/angular-animate-1.5.8.tgz#578e058ee0ca5539e1795421a91ae2f52581dc8f"
+"@types/angular-animate@^1.5.10":
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/@types/angular-animate/-/angular-animate-1.5.10.tgz#b94b45358c61163f1478768e8b081c76439c515f"
   dependencies:
     "@types/angular" "*"
 
-"@types/angular-cookies@^1.4.2":
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/@types/angular-cookies/-/angular-cookies-1.4.5.tgz#f5ccf5f42a7b9f4d13e77afb8722034ea9f40bd3"
+"@types/angular-mocks@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@types/angular-mocks/-/angular-mocks-1.6.0.tgz#bd32f55b678c239880d2d0d9a3a79b5cad45547e"
   dependencies:
     "@types/angular" "*"
 
-"@types/angular-mocks@^1.5.5":
-  version "1.5.11"
-  resolved "https://registry.yarnpkg.com/@types/angular-mocks/-/angular-mocks-1.5.11.tgz#d5bbefbf742f2196071bda0fe051878b6f4fd72c"
-  dependencies:
-    "@types/angular" "*"
-
-"@types/angular-resource@^1.5.6":
+"@types/angular-resource@^1.5.14":
   version "1.5.14"
   resolved "https://registry.yarnpkg.com/@types/angular-resource/-/angular-resource-1.5.14.tgz#902f34e8c98f708ae99493c6d416b39b4a22d9fe"
   dependencies:
     "@types/angular" "*"
 
-"@types/angular-route@^1.3.2":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@types/angular-route/-/angular-route-1.3.4.tgz#10d3f7eb313fb8a4b832041f9401869803dcd4df"
+"@types/angular-route@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/angular-route/-/angular-route-1.3.5.tgz#78b8e0b069d5efe55ec7072461f4e2f6ae20767b"
   dependencies:
     "@types/angular" "*"
 
-"@types/angular-sanitize@^1.3.3":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@types/angular-sanitize/-/angular-sanitize-1.3.6.tgz#fec2bd040d38708e46f02e66fba5199e8a64b22e"
-  dependencies:
-    "@types/angular" "*"
-
-"@types/angular@*", "@types/angular@^1.5.16":
-  version "1.6.36"
-  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.36.tgz#15e73d632274b5655a391470844863548c7755f4"
+"@types/angular@*", "@types/angular@^1.6.47":
+  version "1.6.47"
+  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.47.tgz#f7a31279a02c0892ed9aa76aae2da1b17791bacd"
 
 "@types/body-parser@*":
   version "1.16.7"
@@ -315,6 +303,10 @@
   dependencies:
     "@types/jasmine" "*"
 
+"@types/jquery@^3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.4.tgz#f1850fb9a70041a14ace4f81a7ed782db8548317"
+
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"

From d244523ae62f3989d962c12782dfe42d1931a5ec Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 25 May 2018 14:44:33 -0700
Subject: [PATCH 339/582] docs: test api doc for pipes (#24141)

PR Close #24141
---
 .../common/src/pipes/case_conversion_pipes.ts |  42 ++++--
 packages/common/src/pipes/date_pipe.ts        | 123 +++++++++++-------
 packages/common/src/pipes/json_pipe.ts        |  11 +-
 packages/common/src/pipes/number_pipe.ts      | 122 +++++++++++------
 4 files changed, 201 insertions(+), 97 deletions(-)

diff --git a/packages/common/src/pipes/case_conversion_pipes.ts b/packages/common/src/pipes/case_conversion_pipes.ts
index 9e49183ad0..e2e6041dac 100644
--- a/packages/common/src/pipes/case_conversion_pipes.ts
+++ b/packages/common/src/pipes/case_conversion_pipes.ts
@@ -10,14 +10,24 @@ import {Pipe, PipeTransform} from '@angular/core';
 import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
 
 /**
- * Transforms text to lowercase.
+ * Transforms text to all lower case.
  *
- * {@example  common/pipes/ts/lowerupper_pipe.ts region='LowerUpperPipe' }
+ * @see `UpperCasePipe`
+ * @see `TitleCasePipe`
+ * @usageNotes
+ *
+ * The following example defines a view that allows the user to enter
+ * text, and then uses the pipe to convert the input text to all lower case.
+ *
+ * <code-example path="common/pipes/ts/lowerupper_pipe.ts" region='LowerUpperPipe'></code-example>
  *
  *
  */
 @Pipe({name: 'lowercase'})
 export class LowerCasePipe implements PipeTransform {
+  /**
+   * @param value The string to transform to lower case.
+   */
   transform(value: string): string {
     if (!value) return value;
     if (typeof value !== 'string') {
@@ -40,19 +50,26 @@ const unicodeWordMatch =
     /(?:[A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF40\uDF42-\uDF49\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46]|\uD808[\uDC00-\uDF99]|\uD809[\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D])\S*/g;
 
 /**
- * Transforms text to titlecase.
+ * Transforms text to title case.
+ * Capitalizes the first letter of each word, and transforms the
+ * rest of the word to lower case.
+ * Words are delimited by any whitespace character, such as a space, tab, or line-feed character.
  *
- * The pipe splits up a text into words, capitalizes the first letter of each word and transforms
- * the rest of the word into lowercase. In this case, whitespace characters (such as "space", "\t",
- * "\n", etc) are used as word separators.
+ * @see `LowerCasePipe`
+ * @see `UpperCasePipe`
  *
- * ## Example
- * {@example common/pipes/ts/titlecase_pipe.ts region='TitleCasePipe'}
+ * @usageNotes
+ * The following example shows the result of transforming various strings into title case.
+ *
+ * <code-example path="common/pipes/ts/titlecase_pipe.ts" region='TitleCasePipe'></code-example>
  *
  *
  */
 @Pipe({name: 'titlecase'})
 export class TitleCasePipe implements PipeTransform {
+  /**
+   * @param value The string to transform to title case.
+   */
   transform(value: string): string {
     if (!value) return value;
     if (typeof value !== 'string') {
@@ -65,12 +82,15 @@ export class TitleCasePipe implements PipeTransform {
 }
 
 /**
- * Transforms text to uppercase.
- *
- *
+ * Transforms text to all upper case.
+ * @see `LowerCasePipe`
+ * @see `TitleCasePipe`
  */
 @Pipe({name: 'uppercase'})
 export class UpperCasePipe implements PipeTransform {
+  /**
+   * @param value The string to transform to upper case.
+   */
   transform(value: string): string {
     if (!value) return value;
     if (typeof value !== 'string') {
diff --git a/packages/common/src/pipes/date_pipe.ts b/packages/common/src/pipes/date_pipe.ts
index 1c89c4df61..c0365c42b5 100644
--- a/packages/common/src/pipes/date_pipe.ts
+++ b/packages/common/src/pipes/date_pipe.ts
@@ -15,11 +15,48 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  * @ngModule CommonModule
  * @description
  *
- * Uses the function {@link formatDate} to format a date according to locale rules.
+ * Formats a date value according to locale rules.
  *
- * The following tabled describes the formatting options.
+ * Only the `en-US` locale data comes with Angular. To localize dates
+ * in another language, you must import the corresponding locale data.
+ * See the [I18n guide](guide/i18n#i18n-pipes) for more information.
  *
- *  | Field Type         | Format      | Description                                                   | Example Value                                              |
+ * @see `formatDate()`
+ *
+ *
+ * @usageNotes
+ *
+ * The result of this pipe is not reevaluated when the input is mutated. To avoid the need to
+ * reformat the date on every change-detection cycle, treat the date as an immutable object
+ * and change the reference when the pipe needs to run again.
+ *
+ * ### Pre-defined format options
+ *
+ * Examples are given in `en-US` locale.
+ *
+ * - `'short'`: equivalent to `'M/d/yy, h:mm a'` (`6/15/15, 9:03 AM`).
+ * - `'medium'`: equivalent to `'MMM d, y, h:mm:ss a'` (`Jun 15, 2015, 9:03:01 AM`).
+ * - `'long'`: equivalent to `'MMMM d, y, h:mm:ss a z'` (`June 15, 2015 at 9:03:01 AM
+ * GMT+1`).
+ * - `'full'`: equivalent to `'EEEE, MMMM d, y, h:mm:ss a zzzz'` (`Monday, June 15, 2015 at
+ * 9:03:01 AM GMT+01:00`).
+ * - `'shortDate'`: equivalent to `'M/d/yy'` (`6/15/15`).
+ * - `'mediumDate'`: equivalent to `'MMM d, y'` (`Jun 15, 2015`).
+ * - `'longDate'`: equivalent to `'MMMM d, y'` (`June 15, 2015`).
+ * - `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` (`Monday, June 15, 2015`).
+ * - `'shortTime'`: equivalent to `'h:mm a'` (`9:03 AM`).
+ * - `'mediumTime'`: equivalent to `'h:mm:ss a'` (`9:03:01 AM`).
+ * - `'longTime'`: equivalent to `'h:mm:ss a z'` (`9:03:01 AM GMT+1`).
+ * - `'fullTime'`: equivalent to `'h:mm:ss a zzzz'` (`9:03:01 AM GMT+01:00`).
+ *
+ * ### Custom format options
+ *
+ * You can construct a format string using symbols to specify the components
+ * of a date-time value, as described in the following table.
+ * Format details depend on the locale.
+ * Fields marked with (*) are only available in the extra data set for the given locale.
+ *
+ *  | Field type         | Format      | Description                                                   | Example Value                                              |
  *  |--------------------|-------------|---------------------------------------------------------------|------------------------------------------------------------|
  *  | Era                | G, GG & GGG | Abbreviated                                                   | AD                                                         |
  *  |                    | GGGG        | Wide                                                          | Anno Domini                                                |
@@ -75,30 +112,40 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  *  |                    | O, OO & OOO | Short localized GMT format                                    | GMT-8                                                      |
  *  |                    | OOOO        | Long localized GMT format                                     | GMT-08:00                                                  |
  *
+ * Note that timezone correction is not applied to an ISO string that has no time component, such as "2016-09-19"
  *
- * 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.
+ * ### Format examples
  *
- * WARNINGS:
- * - this pipe has only access to en-US locale data by default. If you want to localize the dates
- *   in another language, you will have to import data for other locales.
- *   See the ["I18n guide"](guide/i18n#i18n-pipes) to know how to import additional locale
- *   data.
- * - Fields suffixed with * are only available in the extra dataset.
- *   See the ["I18n guide"](guide/i18n#i18n-pipes) to know how to import extra locale
- *   data.
- * - 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
- *   pipe needs to re-run (this is to avoid reformatting the date on every change detection run
- *   which would be an expensive operation).
+ * These examples transform a date into various formats,
+ * assuming that `dateObj` is a JavaScript `Date` object for
+ * year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11,
+ * given in the local time for the `en-US` locale.
  *
- * ### Examples
+ * ```
+ * {{ dateObj | date }}               // output is 'Jun 15, 2015'
+ * {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+ * {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+ * {{ dateObj | date:'mmss' }}        // output is '43:11'
+ * ```
  *
- * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
- * in the _local_ time and locale is 'en-US':
+ * ### Usage example
  *
- * {@example common/pipes/ts/date_pipe.ts region='DatePipe'}
+ * The following component uses a date pipe to display the current date in different formats.
  *
+ * ```
+ * @Component({
+ *  selector: 'date-pipe',
+ *  template: `<div>
+ *    <p>Today is {{today | date}}</p>
+ *    <p>Or if you prefer, {{today | date:'fullDate'}}</p>
+ *    <p>The time is {{today | date:'h:mm a z'}}</p>
+ *  </div>`
+ * })
+ * // Get the current date and time as a date-time value.
+ * export class DatePipeComponent {
+ *   today: number = Date.now();
+ * }
+ * ```
  *
  */
 // clang-format on
@@ -107,29 +154,17 @@ export class DatePipe implements PipeTransform {
   constructor(@Inject(LOCALE_ID) private locale: string) {}
 
   /**
-   * @param value a date object or a number (milliseconds since UTC epoch) or an ISO string
-   * (https://www.w3.org/TR/NOTE-datetime).
-   * @param format indicates which date/time components to include. The format can be predefined as
-   *   shown below (all examples are given for `en-US`) or custom as shown in the table.
-   *   - `'short'`: equivalent to `'M/d/yy, h:mm a'` (e.g. `6/15/15, 9:03 AM`).
-   *   - `'medium'`: equivalent to `'MMM d, y, h:mm:ss a'` (e.g. `Jun 15, 2015, 9:03:01 AM`).
-   *   - `'long'`: equivalent to `'MMMM d, y, h:mm:ss a z'` (e.g. `June 15, 2015 at 9:03:01 AM
-   * GMT+1`).
-   *   - `'full'`: equivalent to `'EEEE, MMMM d, y, h:mm:ss a zzzz'` (e.g. `Monday, June 15, 2015 at
-   * 9:03:01 AM GMT+01:00`).
-   *   - `'shortDate'`: equivalent to `'M/d/yy'` (e.g. `6/15/15`).
-   *   - `'mediumDate'`: equivalent to `'MMM d, y'` (e.g. `Jun 15, 2015`).
-   *   - `'longDate'`: equivalent to `'MMMM d, y'` (e.g. `June 15, 2015`).
-   *   - `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` (e.g. `Monday, June 15, 2015`).
-   *   - `'shortTime'`: equivalent to `'h:mm a'` (e.g. `9:03 AM`).
-   *   - `'mediumTime'`: equivalent to `'h:mm:ss a'` (e.g. `9:03:01 AM`).
-   *   - `'longTime'`: equivalent to `'h:mm:ss a z'` (e.g. `9:03:01 AM GMT+1`).
-   *   - `'fullTime'`: equivalent to `'h:mm:ss a zzzz'` (e.g. `9:03:01 AM GMT+01:00`).
-   * @param timezone to be used for formatting the time. It understands UTC/GMT and the continental
-   * US time zone
-   *  abbreviations, but for general use, use a time zone offset (e.g. `'+0430'`).
-   * @param locale a `string` defining the locale to use (uses the current {@link LOCALE_ID} by
-   * default).
+   * @param value The date expression: a `Date` object,  a number
+   * (milliseconds since UTC epoch), or an ISO string (https://www.w3.org/TR/NOTE-datetime).
+   * @param format The date/time components to include, using predefined options or a
+   * custom format string.
+   * @param timezone A timezone offset (such as `'+0430'`), or a standard
+   * UTC/GMT or continental US timezone abbreviation. Default is
+   * the local system timezone of the end-user's machine.
+   * @param locale A locale code for the locale format rules to use.
+   * When not supplied, uses the value of `LOCALE_ID`, which is `en-US` by default.
+   * See [Setting your app locale](guide/i18n#setting-up-the-locale-of-your-app).
+   * @returns A date string in the desired format.
    */
   transform(value: any, format = 'mediumDate', timezone?: string, locale?: string): string|null {
     if (value == null || value === '' || value !== value) return null;
diff --git a/packages/common/src/pipes/json_pipe.ts b/packages/common/src/pipes/json_pipe.ts
index 50388a5618..c0c2d81ee9 100644
--- a/packages/common/src/pipes/json_pipe.ts
+++ b/packages/common/src/pipes/json_pipe.ts
@@ -12,14 +12,21 @@ import {Pipe, PipeTransform} from '@angular/core';
  * @ngModule CommonModule
  * @description
  *
- * Converts value into string using `JSON.stringify`. Useful for debugging.
+ * Converts a value into its JSON-format representation.  Useful for debugging.
  *
- * ### Example
+ * @usageNotes
+ *
+ * The following component uses a JSON pipe to convert an object
+ * to JSON format, and displays the string in both formats for comparison.
+
  * {@example common/pipes/ts/json_pipe.ts region='JsonPipe'}
  *
  *
  */
 @Pipe({name: 'json', pure: false})
 export class JsonPipe implements PipeTransform {
+  /**
+   * @param value A value of any type to convert into a JSON-format string.
+   */
   transform(value: any): string { return JSON.stringify(value, null, 2); }
 }
diff --git a/packages/common/src/pipes/number_pipe.ts b/packages/common/src/pipes/number_pipe.ts
index dcbaf44621..f6d8a69d11 100644
--- a/packages/common/src/pipes/number_pipe.ts
+++ b/packages/common/src/pipes/number_pipe.ts
@@ -15,14 +15,19 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  * @ngModule CommonModule
  * @description
  *
- * Uses the function {@link formatNumber} to format a number according to locale rules.
+ * Transforms a number into a string,
+ * formatted according to locale rules that determine group sizing and
+ * separator, decimal-point character, and other locale-specific
+ * configurations.
  *
- * Formats a number as text. Group sizing and separator and other locale-specific
- * configurations are based on the locale.
+ * @see `formatNumber()`
  *
- * ### Example
+ * @usageNotes
+ * The following code shows how the pipe transforms numbers
+ * into text strings, according to various format specifications,
+ * where the caller's default locale is `en-US`.
  *
- * {@example common/pipes/ts/number_pipe.ts region='NumberPipe'}
+ * <code-example path="common/pipes/ts/number_pipe.ts" region='NumberPipe'></code-example>
  *
  *
  */
@@ -31,16 +36,19 @@ export class DecimalPipe implements PipeTransform {
   constructor(@Inject(LOCALE_ID) private _locale: string) {}
 
   /**
-   * @param value a number to be formatted.
-   * @param digitsInfo a `string` which has a following format: <br>
+   * @param value The number to be formatted.
+   * @param digitsInfo Decimal representation options, specified by a string
+   * in the following format:<br>
    * <code>{minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}</code>.
-   *   - `minIntegerDigits` is the minimum number of integer digits to use. Defaults to `1`.
-   *   - `minFractionDigits` is the minimum number of digits after the decimal point. Defaults to
-   * `0`.
-   *   - `maxFractionDigits` is the maximum number of digits after the decimal point. Defaults to
-   * `3`.
-   * @param locale a `string` defining the locale to use (uses the current {@link LOCALE_ID} by
-   * default).
+   *   - `minIntegerDigits`: The minimum number of integer digits before the decimal point.
+   * Default is `1`.
+   *   - `minFractionDigits`: The minimum number of digits after the decimal point.
+   * Default is `0`.
+   *   - `maxFractionDigits`: The maximum number of digits after the decimal point.
+   * Default is `3`.
+   * @param locale A locale code for the locale format rules to use.
+   * When not supplied, uses the value of `LOCALE_ID`, which is `en-US` by default.
+   * See [Setting your app locale](guide/i18n#setting-up-the-locale-of-your-app).
    */
   transform(value: any, digitsInfo?: string, locale?: string): string|null {
     if (isEmpty(value)) return null;
@@ -60,12 +68,19 @@ export class DecimalPipe implements PipeTransform {
  * @ngModule CommonModule
  * @description
  *
- * Uses the function {@link formatPercent} to format a number as a percentage according
- * to locale rules.
+ * Transforms a number to a percentage
+ * string, formatted according to locale rules that determine group sizing and
+ * separator, decimal-point character, and other locale-specific
+ * configurations.
  *
- * ### Example
+ * @see `formatPercent()`
  *
- * {@example common/pipes/ts/percent_pipe.ts region='PercentPipe'}
+ * @usageNotes
+ * The following code shows how the pipe transforms numbers
+ * into text strings, according to various format specifications,
+ * where the caller's default locale is `en-US`.
+ *
+ * <code-example path="common/pipes/ts/percent_pipe.ts" region='PercentPipe'></code-example>
  *
  *
  */
@@ -75,10 +90,19 @@ export class PercentPipe implements PipeTransform {
 
   /**
    *
-   * @param value a number to be formatted as a percentage.
-   * @param digitsInfo see {@link DecimalPipe} for more details.
-   * @param locale a `string` defining the locale to use (uses the current {@link LOCALE_ID} by
- * default).
+   * @param value The number to be formatted as a percentage.
+   * @param digitsInfo Decimal representation options, specified by a string
+   * in the following format:<br>
+   * <code>{minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}</code>.
+   *   - `minIntegerDigits`: The minimum number of integer digits before the decimal point.
+   * Default is `1`.
+   *   - `minFractionDigits`: The minimum number of digits after the decimal point.
+   * Default is `0`.
+   *   - `maxFractionDigits`: The maximum number of digits after the decimal point.
+   * Default is `3`.
+   * @param locale A locale code for the locale format rules to use.
+   * When not supplied, uses the value of `LOCALE_ID`, which is `en-US` by default.
+   * See [Setting your app locale](guide/i18n#setting-up-the-locale-of-your-app).
    */
   transform(value: any, digitsInfo?: string, locale?: string): string|null {
     if (isEmpty(value)) return null;
@@ -98,12 +122,19 @@ export class PercentPipe implements PipeTransform {
  * @ngModule CommonModule
  * @description
  *
- * Uses the functions {@link getCurrencySymbol} and {@link formatCurrency} to format a
- * number as currency using locale rules.
+ * Transforms a number to a currency string, formatted according to locale rules
+ * that determine group sizing and separator, decimal-point character,
+ * and other locale-specific configurations.
  *
- * ### Example
+ * @see `getCurrencySymbol()`
+ * @see `formatCurrency()`
  *
- * {@example common/pipes/ts/currency_pipe.ts region='CurrencyPipe'}
+ * @usageNotes
+ * The following code shows how the pipe transforms numbers
+ * into text strings, according to various format specifications,
+ * where the caller's default locale is `en-US`.
+ *
+ * <code-example path="common/pipes/ts/currency_pipe.ts" region='CurrencyPipe'></code-example>
  *
  *
  */
@@ -113,20 +144,31 @@ export class CurrencyPipe implements PipeTransform {
 
   /**
    *
-   * @param value a number to be formatted as currency.
-   * @param currencyCodeis the [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) currency code,
+   * @param value The number to be formatted as currency.
+   * @param currencyCode The [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) currency code,
    * such as `USD` for the US dollar and `EUR` for the euro.
-   * @param display indicates whether to show the currency symbol, the code or a custom value:
-   *   - `code`: use code (e.g. `USD`).
-   *   - `symbol`(default): use symbol (e.g. `$`).
-   *   - `symbol-narrow`: some countries have two symbols for their currency, one regular and one
-   *     narrow (e.g. the canadian dollar CAD has the symbol `CA$` and the symbol-narrow `$`).
-   *   - `string`: use this value instead of a code or a symbol.
-   *   - boolean (deprecated from v5): `true` for symbol and false for `code`.
-   *   If there is no narrow symbol for the chosen currency, the regular symbol will be used.
-   * @param digitsInfo see {@link DecimalPipe} for more details.
-   * @param locale a `string` defining the locale to use (uses the current {@link LOCALE_ID} by
-   * default).
+   * @param display The format for the currency indicator. One of the following:
+   *   - `code`: Show the code (such as `USD`).
+   *   - `symbol`(default): Show the symbol (such as `$`).
+   *   - `symbol-narrow`: Use the narrow symbol for locales that have two symbols for their
+   * currency.
+   * For example, the Canadian dollar CAD has the symbol `CA$` and the symbol-narrow `$`. If the
+   * locale has no narrow symbol, uses the standard symbol for the locale.
+   *   - String: Use the given string value instead of a code or a symbol.
+   *   - Boolean (marked deprecated in v5): `true` for symbol and false for `code`.
+   *
+   * @param digitsInfo Decimal representation options, specified by a string
+   * in the following format:<br>
+   * <code>{minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}</code>.
+   *   - `minIntegerDigits`: The minimum number of integer digits before the decimal point.
+   * Default is `1`.
+   *   - `minFractionDigits`: The minimum number of digits after the decimal point.
+   * Default is `0`.
+   *   - `maxFractionDigits`: The maximum number of digits after the decimal point.
+   * Default is `3`.
+   * @param locale A locale code for the locale format rules to use.
+   * When not supplied, uses the value of `LOCALE_ID`, which is `en-US` by default.
+   * See [Setting your app locale](guide/i18n#setting-up-the-locale-of-your-app).
    */
   transform(
       value: any, currencyCode?: string,
@@ -167,7 +209,7 @@ function isEmpty(value: any): boolean {
 }
 
 /**
- * Transforms a string into a number (if needed)
+ * Transforms a string into a number (if needed).
  */
 function strToNumber(value: number | string): number {
   // Convert strings to numbers

From 2a68ba4cbbf96e40d0a918f60c8ddd6fb4b1eede Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 18 Jun 2018 14:58:30 -0700
Subject: [PATCH 340/582] docs: fix misdirected group links (#24569)

PR Close #24569
---
 packages/animations/src/animation_metadata.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/animations/src/animation_metadata.ts b/packages/animations/src/animation_metadata.ts
index a46524c412..f370757a48 100755
--- a/packages/animations/src/animation_metadata.ts
+++ b/packages/animations/src/animation_metadata.ts
@@ -40,11 +40,12 @@ export declare type AnimateTimings = {
 
 /**
  * @description Options that control animation styling and timing.
+ *
  * The following animation functions accept `AnimationOptions` data:
  *
  * - `transition()`
  * - `sequence()`
- * - `group()`
+ * - `{@link animations/group group()}`
  * - `query()`
  * - `animation()`
  * - `useAnimation()`
@@ -100,7 +101,7 @@ export const enum AnimationMetadataType {
   Sequence = 2,
   /**
    * Contains a set of animation steps.
-   * See `group()`
+   * See `{@link animations/group group()}`
    */
   Group = 3,
   /**
@@ -352,7 +353,7 @@ export interface AnimationSequenceMetadata extends AnimationMetadata {
 
 /**
  * Encapsulates an animation group.
- * Instantiated and returned by the `group()` function.
+ * Instantiated and returned by the `{@link animations/group group()}` function.
  */
 export interface AnimationGroupMetadata extends AnimationMetadata {
   /**
@@ -579,7 +580,7 @@ export function trigger(name: string, definitions: AnimationMetadata[]): Animati
  * @returns An object that encapsulates the animation step.
  *
  * @usageNotes
- * Call within an animation `sequence()`, `group()`, or
+ * Call within an animation `sequence()`, `{@link animations/group group()}`, or
  * `transition()` call to specify an animation step
  * that applies given style data to the parent animation for a given amount of time.
  *
@@ -676,9 +677,9 @@ export function group(
  * @usageNotes
  * When you pass an array of steps to a
  * `transition()` call, the steps run sequentially by default.
- * Compare this to the `group()` call, which runs animation steps in parallel.
+ * Compare this to the `{@link animations/group group()}` call, which runs animation steps in parallel.
  *
- * When a sequence is used within a `group()` or a `transition()` call,
+ * When a sequence is used within a `{@link animations/group group()}` or a `transition()` call,
  * execution continues to the next instruction only after each of the inner animation
  * steps have completed.
  *
@@ -863,7 +864,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  *  ...]
  * ```
  *
- * Note that when you call the `sequence()` function within a `group()`
+ * Note that when you call the `sequence()` function within a `{@link animations/group group()}`
  * or a `transition()` call, execution does not continue to the next instruction
  * until each of the inner animation steps have completed.
  *

From 7d318743c1337507d75847f2db2dfedcc0be7ca8 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 14 May 2018 08:37:43 -0700
Subject: [PATCH 341/582] docs: test doc for decorator templates (#23902)
 (#23902)

PR Close #23902

PR Close #23902
---
 packages/common/http/src/module.ts            |  48 +-
 packages/core/src/metadata/directives.ts      | 800 +++++++++---------
 packages/core/src/metadata/ng_module.ts       |  90 +-
 .../examples/core/ts/metadata/directives.ts   |  66 ++
 4 files changed, 549 insertions(+), 455 deletions(-)
 create mode 100644 packages/examples/core/ts/metadata/directives.ts

diff --git a/packages/common/http/src/module.ts b/packages/common/http/src/module.ts
index 83a9fbfc94..feceb505e0 100644
--- a/packages/common/http/src/module.ts
+++ b/packages/common/http/src/module.ts
@@ -19,12 +19,13 @@ import {BrowserXhr, HttpXhrBackend, XhrFactory} from './xhr';
 import {HttpXsrfCookieExtractor, HttpXsrfInterceptor, HttpXsrfTokenExtractor, XSRF_COOKIE_NAME, XSRF_HEADER_NAME} from './xsrf';
 
 /**
- * An `HttpHandler` that applies a bunch of `HttpInterceptor`s
+ * An injectable `HttpHandler` that applies multiple interceptors
  * to a request before passing it to the given `HttpBackend`.
  *
  * The interceptors are loaded lazily from the injector, to allow
  * interceptors to themselves inject classes depending indirectly
  * on `HttpInterceptingHandler` itself.
+ * @see `HttpInterceptor`
  */
 @Injectable()
 export class HttpInterceptingHandler implements HttpHandler {
@@ -42,6 +43,23 @@ export class HttpInterceptingHandler implements HttpHandler {
   }
 }
 
+/**
+ * Constructs an `HttpHandler` that applies interceptors
+ * to a request before passing it to the given `HttpBackend`.
+ *
+ * Use as a factory function within `HttpClientModule`.
+ *
+ *
+ */
+export function interceptingHandler(
+    backend: HttpBackend, interceptors: HttpInterceptor[] | null = []): HttpHandler {
+  if (!interceptors) {
+    return backend;
+  }
+  return interceptors.reduceRight(
+      (next, interceptor) => new HttpInterceptorHandler(next, interceptor), backend);
+}
+
 /**
  * Factory function that determines where to store JSONP callbacks.
  *
@@ -58,14 +76,14 @@ export function jsonpCallbackContext(): Object {
 }
 
 /**
- * `NgModule` which adds XSRF protection support to outgoing requests.
+ * An NgModule that adds XSRF protection support to outgoing requests.
  *
- * Provided the server supports a cookie-based XSRF protection system, this
- * module can be used directly to configure XSRF protection with the correct
+ * For a server that supports a cookie-based XSRF protection system,
+ * use directly to configure XSRF protection with the correct
  * cookie and header names.
  *
- * If no such names are provided, the default is to use `X-XSRF-TOKEN` for
- * the header name and `XSRF-TOKEN` for the cookie name.
+ * If no names are supplied, the default cookie name is `XSRF-TOKEN`
+ * and the default header name is `X-XSRF-TOKEN`.
  *
  *
  */
@@ -92,8 +110,12 @@ export class HttpClientXsrfModule {
   }
 
   /**
-   * Configure XSRF protection to use the given cookie name or header name,
-   * or the default names (as described above) if not provided.
+   * Configure XSRF protection.
+   * @param options An object that can specify either or both
+   * cookie name or header name.
+   * - Cookie name default is `XSRF-TOKEN`.
+   * - Header name default is `X-XSRF-TOKEN`.
+   *
    */
   static withOptions(options: {
     cookieName?: string,
@@ -110,7 +132,7 @@ export class HttpClientXsrfModule {
 }
 
 /**
- * `NgModule` which provides the `HttpClient` and associated services.
+ * An NgModule that provides the `HttpClient` and associated services.
  *
  * Interceptors can be added to the chain behind `HttpClient` by binding them
  * to the multiprovider for `HTTP_INTERCEPTORS`.
@@ -118,12 +140,18 @@ export class HttpClientXsrfModule {
  *
  */
 @NgModule({
+  /**
+   * Optional configuration for XSRF protection.
+   */
   imports: [
     HttpClientXsrfModule.withOptions({
       cookieName: 'XSRF-TOKEN',
       headerName: 'X-XSRF-TOKEN',
     }),
   ],
+  /**
+   * The module provides `HttpClient` itself, and supporting services.
+   */
   providers: [
     HttpClient,
     {provide: HttpHandler, useClass: HttpInterceptingHandler},
@@ -137,7 +165,7 @@ export class HttpClientModule {
 }
 
 /**
- * `NgModule` which enables JSONP support in `HttpClient`.
+ * An NgModule that enables JSONP support in `HttpClient`.
  *
  * Without this module, Jsonp requests will reach the backend
  * with method JSONP, where they'll be rejected.
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 61e3ef7cfa..4a5692cbb4 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -137,17 +137,6 @@ export interface Directive {
    *   bankName: string;
    *   id: string;
    *
-   *   // this property is not bound, and won't be automatically updated by Angular
-   *   normalizedBankName: string;
-   * }
-   *
-   * @Component({
-   *   selector: 'app',
-   *   template: `
-   *     <bank-account bankName="RBC" account-id="4747"></bank-account>
-   *   `
-   * })
-   * class App {}
    * ```
    */
   inputs?: string[];
@@ -169,29 +158,17 @@ export interface Directive {
    *
    * ```typescript
    * @Directive({
-   *   selector: 'interval-dir',
-   *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
+   *   selector: 'child-dir',
+   *   exportAs: 'child'
    * })
-   * class IntervalDir {
-   *   everySecond = new EventEmitter();
-   *   five5Secs = new EventEmitter();
-   *
-   *   constructor() {
-   *     setInterval(() => this.everySecond.emit("event"), 1000);
-   *     setInterval(() => this.five5Secs.emit("event"), 5000);
-   *   }
+   * class ChildDir {
    * }
    *
    * @Component({
-   *   selector: 'app',
-   *   template: `
-   *     <interval-dir (everySecond)="everySecond()" (everyFiveSeconds)="everyFiveSeconds()">
-   *     </interval-dir>
-   *   `
+   *   selector: 'main',
+   *   template: `<child-dir #c="child"></child-dir>`
    * })
-   * class App {
-   *   everySecond() { console.log('second'); }
-   *   everyFiveSeconds() { console.log('five seconds'); }
+   * class MainComponent {
    * }
    * ```
    */
@@ -243,6 +220,7 @@ export interface Directive {
    * })
    * class App {}
    * ```
+   * See [live demo](http://plnkr.co/edit/DlA5KU?p=preview)
    *
    * ### Host Property Bindings
    *
@@ -276,6 +254,7 @@ export interface Directive {
    *   prop;
    * }
    * ```
+   * See [live demo](http://plnkr.co/edit/gNg0ED?p=preview).
    *
    * ### Attributes
    *
@@ -294,17 +273,18 @@ export interface Directive {
    * class MyButton {
    * }
    * ```
-   */
-  host?: {[key: string]: string};
-
-  /**
-   * Defines the set of injectable objects that are visible to a Directive and its light DOM
-   * children.
+   * Attaching the `my-button` directive to the host `<div>` element
+   * ensures that this element gets the "button" role.
+   *
+   * ```html
+   * <div my-button></div>
+   * ```
    *
    * @usageNotes
    * ### Simple Example
    *
-   * Here is an example of a class that can be injected:
+   * The following simple example shows how a class is injected,
+   * using a provider specified in the directive metadata:
    *
    * ```
    * class Greeter {
@@ -364,6 +344,7 @@ export interface Directive {
    * @usageNotes
    * ### Example
    *
+   * The followoing example (shows what??)
    * ```
    * @Component({
    *   selector: 'someDir',
@@ -386,6 +367,8 @@ export interface Directive {
    *   }
    * }
    * ```
+   *
+   * @Annotation
    */
   queries?: {[key: string]: any};
 
@@ -403,94 +386,148 @@ export interface Directive {
  *
  * @Annotation
  */
-export const Directive: DirectiveDecorator = makeDecorator(
-    'Directive', (dir: Directive = {}) => dir, undefined, undefined,
-    (type: Type<any>, meta: Directive) => (R3_COMPILE_DIRECTIVE || (() => {}))(type, meta));
-
-/**
- * Type of the Component decorator / constructor function.
- */
-export interface ComponentDecorator {
+export interface Directive {
   /**
-   * Marks a class as an Angular component and collects component configuration
-   * metadata.
+   * The CSS selector that identifies this directive in a template
+   * and triggers instantiation of the directive.
    *
-   * Component decorator allows you to mark a class as an Angular component and provide additional
-   * metadata that determines how the component should be processed, instantiated and used at
-   * runtime.
+   * Declare as one of the following:
    *
-   * Components are the most basic building block of an UI in an Angular application.
-   * An Angular application is a tree of Angular components.
-   * Angular components are a subset of directives. Unlike directives, components always have
-   * a template and only one component can be instantiated per an element in a template.
+   * - `element-name`: Select by element name.
+   * - `.class`: Select by class name.
+   * - `[attribute]`: Select by attribute name.
+   * - `[attribute=value]`: Select by attribute name and value.
+   * - `:not(sub_selector)`: Select only if the element does not match the `sub_selector`.
+   * - `selector1, selector2`: Select if either `selector1` or `selector2` matches.
    *
-   * A component must belong to an NgModule in order for it to be usable
-   * by another component or application. To specify that a component is a member of an NgModule,
-   * you should list it in the `declarations` field of that NgModule.
+   * Angular only allows directives to apply on CSS selectors that do not cross
+   * element boundaries.
    *
-   * In addition to the metadata configuration specified via the Component decorator,
-   * components can control their runtime behavior by implementing various Life-Cycle hooks.
+   * For the following template HTML, a directive with an `input[type=text]` selector,
+   * would be instantiated only on the `<input type="text">` element.
    *
-   * **Metadata Properties:**
+   * ```html
+   * <form>
+   *   <input type="text">
+   *   <input type="radio">
+   * <form>
+   * ```
    *
-   * * **animations** - list of animations of this component
-   * * **changeDetection** - change detection strategy used by this component
-   * * **encapsulation** - style encapsulation strategy used by this component
-   * * **entryComponents** - list of components that are dynamically inserted into the view of this
-   *   component
-   * * **exportAs** - name under which the component instance is exported in a template
-   * * **host** - map of class property to host element bindings for events, properties and
-   *   attributes
-   * * **inputs** - list of class property names to data-bind as component inputs
-   * * **interpolation** - custom interpolation markers used in this component's template
-   * * **moduleId** - ES/CommonJS module id of the file in which this component is defined
-   * * **outputs** - list of class property names that expose output events that others can
-   *   subscribe to
-   * * **providers** - list of providers available to this component and its children
-   * * **queries** -  configure queries that can be injected into the component
-   * * **selector** - css selector that identifies this component in a template
-   * * **styleUrls** - list of urls to stylesheets to be applied to this component's view
-   * * **styles** - inline-defined styles to be applied to this component's view
-   * * **template** - inline-defined template for the view
-   * * **templateUrl** - url to an external file containing a template for the view
-   * * **viewProviders** - list of providers available to this component and its view children
-   *
-   * @usageNotes
-   * ### Example
-   *
-   * {@example core/ts/metadata/metadata.ts region='component'}
-   *
-   * @Annotation
    */
-  (obj: Component): TypeDecorator;
+  selector?: string;
+
+  /**
+   * The set of event-bound output properties.
+   * When an output property emits an event, an event handler attached
+   * to that event in the template is invoked.
+   *
+   * Each output property maps a `directiveProperty` to a `bindingProperty`:
+   * - `directiveProperty` specifies the component property that emits events.
+   * - `bindingProperty` specifies the HTML attribute the event handler is attached to.
+   *
+   */
+  outputs?: string[];
+
+  /**
+   * Maps class properties to host element bindings for properties,
+   * attributes, and events, using a set of key-value pairs.
+   *
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, Angular updates the directive's host element.
+   *
+   * When the key is a property of the host element, the property value is
+   * the propagated to the specified DOM property.
+   *
+   * When the key is a static attribute in the DOM, the attribute value
+   * is propagated to the specified property in the host element.
+   *
+   * For event handling:
+   * - The key is the DOM event that the directive listens to.
+   * To listen to global events, add the target to the event name.
+   * The target can be `window`, `document` or `body`.
+   * - The value is the statement to execute when the event occurs. If the
+   * statement evalueates to `false`, then `preventDefault` is applied on the DOM
+   * event. A handler method can refer to the `$event` local variable.
+   *
+   */
+  host?: {[key: string]: string};
+
   /**
    * See the `Component` decorator.
    */
-  new (obj: Component): Component;
+  providers?: Provider[];
+
+  /**
+   * The name or names that can be used in the template to assign this directive to a variable.
+   * For multiple names, use a comma-separated string.
+   *
+   */
+  exportAs?: string;
+
+  /**
+   * Configures the queries that will be injected into the directive.
+   *
+   * Content queries are set before the `ngAfterContentInit` callback is called.
+   * View queries are set before the `ngAfterViewInit` callback is called.
+   *
+   */
+  queries?: {[key: string]: any};
 }
 
 /**
  * Type of the Component metadata.
  */
-export interface Component extends Directive {
-  /**
-   * Defines the used change detection strategy.
-   *
-   * When a component is instantiated, Angular creates a change detector, which is responsible for
-   * propagating the component's bindings.
-   *
-   * The `changeDetection` property defines, whether the change detection will be checked every time
-   * or only when the component tells it to do so.
-   */
-  changeDetection?: ChangeDetectionStrategy;
+export const Directive: DirectiveDecorator = makeDecorator(
+    'Directive', (dir: Directive = {}) => dir, undefined, undefined,
+    (type: Type<any>, meta: Directive) => (R3_COMPILE_DIRECTIVE || (() => {}))(type, meta));
 
+/**
+ * Component decorator interface
+ *
+ */
+export interface ComponentDecorator {
   /**
-   * Defines the set of injectable objects that are visible to its view DOM children.
+   * Decorator that marks a class as an Angular component and provides configuration
+   * metadata that determines how the component should be processed,
+   * instantiated, and used at runtime.
+   *
+   * Components are the most basic UI building block of an Angular app.
+   * An Angular app contains a tree of Angular components.
+   *
+   * Angular components are a subset of directives, always associated with a template.
+   * Unlike other directives, only one component can be instantiated per an element in a template.
+   *
+   * A component must belong to an NgModule in order for it to be available
+   * to another component or application. To make it a member of an NgModule,
+   * list it in the `declarations` field of the `@NgModule` metadata.
+   *
+   * Note that, in addition to these options for configuring a directive,
+   * you can control a component's runtime behavior by implementing
+   * life-cycle hooks. For more information, see the
+   * [Lifecycle Hooks](guide/lifecycle-hooks) guide.
    *
    * @usageNotes
-   * ### Simple Example
    *
-   * Here is an example of a class that can be injected:
+   * ### Setting component inputs
+   *
+   * The following example creates a component with two data-bound properties,
+   * specified by the `inputs` value.
+   *
+   * <code-example path="core/ts/metadata/directives.ts" region="component-input">
+   * </code-example>
+   *
+   *
+   * ### Setting component outputs
+   *
+   * The following example shows two event emitters that emit on an interval. One
+   * emits an output every second, while the other emits every five seconds.
+   *
+   * {@example core/ts/metadata/directives.ts region='component-output-interval'}
+   *
+   * ### Injecting a class with a view provider
+   *
+   * The following simple example injects a class into a component
+   * using the view provider specified in component metadata:
    *
    * ```
    * class Greeter {
@@ -521,224 +558,117 @@ export interface Component extends Directive {
    * }
    *
    * ```
+   *
+   *
+   * @Annotation
+   */
+  (obj: Component): TypeDecorator;
+  /**
+   * See the `@Component` decorator.
+   */
+  new (obj: Component): Component;
+}
+
+/**
+ * Supplies configuration metadata for an Angular component.
+ */
+export interface Component extends Directive {
+  /**
+   * The change-detection strategy to use for this component.
+   *
+   * When a component is instantiated, Angular creates a change detector,
+   * which is responsible for propagating the component's bindings.
+   * The strategy is one of:
+   * - `ChangeDetectionStrategy#OnPush` sets the strategy to `CheckOnce` (on demand).
+   * - `ChangeDetectionStrategy#Default` sets the strategy to `CheckAlways`.
+   */
+  changeDetection?: ChangeDetectionStrategy;
+
+  /**
+   * Defines the set of injectable objects that are visible to its view DOM children.
+   * See [example](#injecting-a-class-with-a-view-provider).
+   *
    */
   viewProviders?: Provider[];
 
   /**
-   * The module id of the module that contains the component.
-   * Needed to be able to resolve relative urls for templates and styles.
-   * In CommonJS, this can always be set to `module.id`, similarly SystemJS exposes `__moduleName`
-   * variable within each module.
+   * The module ID of the module that contains the component.
+   * The component must be able to resolve relative URLs for templates and styles.
+   * SystemJS exposes the `__moduleName` variable within each module.
+   * In CommonJS, this can  be set to `module.id`.
    *
-   * @usageNotes
-   * ### Simple Example
-   *
-   * ```
-   * @Directive({
-   *   selector: 'someDir',
-   *   moduleId: module.id
-   * })
-   * class SomeDir {
-   * }
-   *
-   * ```
    */
   moduleId?: string;
 
   /**
-   * Specifies a template URL for an Angular component.
+   * The URL of a template file for an Angular component. If provided,
+   * do not supply an inline template using `template`.
    *
-   * Only one of `templateUrl` or `template` can be defined per View.
    */
   templateUrl?: string;
 
   /**
-   * Specifies an inline template for an Angular component.
+   * An inline template for an Angular component. If provided,
+   * do not supply a template file using `templateUrl`.
    *
-   * Only one of `templateUrl` or `template` can be defined per Component.
    */
   template?: string;
 
   /**
-   * Specifies stylesheet URLs for an Angular component.
+   * One or more URLs for files containing CSS stylesheets to use
+   * in this component.
    */
   styleUrls?: string[];
 
   /**
-   * Specifies inline stylesheets for an Angular component.
+   * One or more inline CSS stylesheets to use
+   * in this component.
    */
   styles?: string[];
 
   /**
-   * Animations are defined on components via an animation-like DSL. This DSL approach to describing
-   * animations allows for a flexibility that both benefits developers and the framework.
+   * One or more animation `trigger()` calls, containing
+   * `state()` and `transition()` definitions.
+   * See the [Animations guide](/guide/animations) and animations API documentation.
    *
-   * Animations work by listening on state changes that occur on an element within
-   * the template. When a state change occurs, Angular can then take advantage and animate the
-   * arc in between. This works similar to how CSS transitions work, however, by having a
-   * programmatic DSL, animations are not limited to environments that are DOM-specific.
-   * (Angular can also perform optimizations behind the scenes to make animations more performant.)
-   *
-   * For animations to be available for use, animation state changes are placed within
-   * {@link trigger animation triggers} which are housed inside of the `animations` annotation
-   * metadata. Within a trigger both `state` and `transition` entries
-   * can be placed.
-   *
-   * @usageNotes
-   * ### Example
-   *
-   * ```typescript
-   * @Component({
-   *   selector: 'animation-cmp',
-   *   templateUrl: 'animation-cmp.html',
-   *   animations: [
-   *     // this here is our animation trigger that
-   *     // will contain our state change animations.
-   *     trigger('myTriggerName', [
-   *       // the styles defined for the `on` and `off`
-   *       // states declared below are persisted on the
-   *       // element once the animation completes.
-   *       state('on', style({ opacity: 1 }),
-   *       state('off', style({ opacity: 0 }),
-   *
-   *       // this here is our animation that kicks off when
-   *       // this state change jump is true
-   *       transition('on => off', [
-   *         animate("1s")
-   *       ])
-   *     ])
-   *   ]
-   * })
-   * ```
-   *
-   * As depicted in the code above, a group of related animation states are all contained within
-   * an animation `trigger` (the code example above called the trigger `myTriggerName`).
-   * When a trigger is created then it can be bound onto an element within the component's
-   * template via a property prefixed by an `@` symbol followed by trigger name and an expression
-   * that
-   * is used to determine the state value for that trigger.
-   *
-   * ```html
-   * <!-- animation-cmp.html -->
-   * <div @myTriggerName="expression">...</div>
-   * ```
-   *
-   * For state changes to be executed, the `expression` value must change value from its existing
-   * value
-   * to something that we have set an animation to animate on (in the example above we are listening
-   * to a change of state between `on` and `off`). The `expression` value attached to the trigger
-   * must be something that can be evaluated with the template/component context.
-   *
-   * ### DSL Animation Functions
-   *
-   * Please visit each of the animation DSL functions listed below to gain a better understanding
-   * of how and why they are used for crafting animations in Angular:
-   *
-   * - `trigger()`
-   * - `state()`
-   * - `transition()`
-   * - `group()`
-   * - `sequence()`
-   * - `style()`
-   * - `animate()`
-   * - `keyframes()`
    */
   animations?: any[];
 
   /**
-   * Specifies how the template and the styles should be encapsulated:
-   * - `ViewEncapsulation.Native` to use shadow roots - only works if natively available on the
-   *   platform,
-   * - `ViewEncapsulation.Emulated` to use shimmed CSS that emulates the native behavior,
-   * - `ViewEncapsulation.None` to use global CSS without any encapsulation.
+   * An encapsulation policy for the template and CSS styles. One of:
+   * - `ViewEncapsulation.Native`: Use shadow roots. This works
+   * only if natively available on the platform.
+   * - `ViewEncapsulation.Emulated`: Use shimmed CSS that
+   * emulates the native behavior.
+   * - `ViewEncapsulation.None`: Use global CSS without any
+   * encapsulation.
    *
-   * When no `encapsulation` is defined for the component, the default value from the
-   * `CompilerOptions` is used. The default is `ViewEncapsulation.Emulated`. Provide a new
-   * `CompilerOptions` to override this value.
+   * If not supplied, the value is taken from `CompilerOptions`. The default compiler option is
+   * `ViewEncapsulation.Emulated`.
    *
-   * If the encapsulation is set to `ViewEncapsulation.Emulated` and the component has no `styles`
-   * nor `styleUrls` the encapsulation will automatically be switched to `ViewEncapsulation.None`.
+   * If the policy is set to `ViewEncapsulation.Emulated` and the component has no `styles`
+   * or `styleUrls` specified, the policy is automatically switched to `ViewEncapsulation.None`.
    */
   encapsulation?: ViewEncapsulation;
 
   /**
-   * Overrides the default encapsulation start and end delimiters (respectively `{{` and `}}`)
+   * Overrides the default encapsulation start and end delimiters (`{{` and `}}`)
    */
   interpolation?: [string, string];
 
   /**
-   * Defines the components that should be compiled as well when
-   * this component is defined. For each components listed here,
-   * Angular will create a `ComponentFactory` and store it in the
-   * `ComponentFactoryResolver`.
+   * A set of components that should be compiled along with
+   * this component. For each component listed here,
+   * Angular creates a {@link ComponentFactory} and stores it in the
+   * {@link ComponentFactoryResolver}.
    */
   entryComponents?: Array<Type<any>|any[]>;
 
   /**
-   * If `Component.preserveWhitespaces` is set to `false`
-   * potentially superfluous whitespace characters (ones matching the `\s` character class in
-   * JavaScript regular expressions) will be removed from a compiled template. This can greatly
-   * reduce AOT-generated code size as well as speed up view creation.
-   *
-   * Current implementation works according to the following rules:
-   * - all whitespaces at the beginning and the end of a template are removed (trimmed);
-   * - text nodes consisting of whitespaces only are removed (ex.:
-   *   `<button>Action 1</button>  <button>Action 2</button>` will be converted to
-   *   `<button>Action 1</button><button>Action 2</button>` (no whitespaces between buttons);
-   * - series of whitespaces in text nodes are replaced with one space (ex.:
-   *   `<span>\n some text\n</span>` will be converted to `<span> some text </span>`);
-   * - text nodes are left as-is inside HTML tags where whitespaces are significant (ex. `<pre>`,
-   *   `<textarea>`).
-   *
-   * Described transformations may (potentially) influence DOM nodes layout. However, the impact
-   * should so be minimal. That's why starting from Angular 6, the
-   * `preserveWhitespaces` option is `false` by default (whitespace removal).
-   * If you want to change the default setting for all components in your application you can use
-   * the `preserveWhitespaces` option of the AOT compiler.
-   *
-   * Even with the default behavior of whitespace removal, there are ways of preserving whitespaces
-   * in certain fragments of a template. You can either exclude entire DOM sub-tree by using the
-   * `ngPreserveWhitespaces` attribute, ex.:
-   *
-   * ```html
-   * <div ngPreserveWhitespaces>
-   *     whitespaces are preserved here
-   *     <span>    and here </span>
-   * </div>
-   * ```
-   *
-   * Alternatively you can force a space to be preserved in a text node by using the `&ngsp;`
-   * pseudo-entity. `&ngsp;` will be replaced with a space character by Angular's template
-   * compiler, ex.:
-   *
-   * ```html
-   * <a>Spaces</a>&ngsp;<a>between</a>&ngsp;<a>links.</a>
-   * ```
-   *
-   * will be compiled to the equivalent of:
-   *
-   * ```html
-   * <a>Spaces</a> <a>between</a> <a>links.</a>
-   * ```
-   *
-   * Please note that sequences of `&ngsp;` are still collapsed to just one space character when
-   * the `preserveWhitespaces` option is set to `false`. Ex.:
-   *
-   * ```html
-   * <a>before</a>&ngsp;&ngsp;&ngsp;<a>after</a>
-   * ```
-   *
-   * would be equivalent to:
-   *
-   * ```html
-   * <a>before</a> <a>after</a>
-   * ```
-   *
-   * The `&ngsp;` pseudo-entity is useful for forcing presence of
-   * one space (a text node having `&ngsp;` pseudo-entities will never be removed), but it is not
-   * meant to mark sequences of whitespace characters. The previously described
-   * `ngPreserveWhitespaces` attribute is more useful for preserving sequences of whitespace
-   * characters.
+   * True to preserve or false to remove potentially superfluous whitespace characters
+   * from the compiled template. Whitespace characters are those matching the `\s`
+   * character class in JavaScript regular expressions. Default is false, unless
+   * overridden in compiler options.
    */
   preserveWhitespaces?: boolean;
 }
@@ -746,6 +676,89 @@ export interface Component extends Directive {
 /**
  * Component decorator and metadata.
  *
+ * @usageNotes
+ *
+ * ### Using animations
+ *
+ * The following snippet shows an animation trigger in a component's
+ * metadata. The trigger is attached to an element in the component's
+ * template, using "@_trigger_name_", and a state expression that is evaluated
+ * at run time to determine whether the animation should start.
+ *
+ * ```typescript
+ * @Component({
+ *   selector: 'animation-cmp',
+ *   templateUrl: 'animation-cmp.html',
+ *   animations: [
+ *     trigger('myTriggerName', [
+ *       state('on', style({ opacity: 1 }),
+ *       state('off', style({ opacity: 0 }),
+ *       transition('on => off', [
+ *         animate("1s")
+ *       ])
+ *     ])
+ *   ]
+ * })
+ * ```
+ *
+ * ```html
+ * <!-- animation-cmp.html -->
+ * <div @myTriggerName="expression">...</div>
+ * ```
+ *
+ * ### Preserving whitespace
+ *
+ * Removing whitespace can greatly reduce AOT-generated code size, and speed up view creation.
+ * As of Angular 6, default for `preserveWhitespaces` is false (whitespace is removed).
+ * To change the default setting for all components in your application, set
+ * the `preserveWhitespaces` option of the AOT compiler.
+ *
+ * Current implementation removes whitespace characters as follows:
+ * - Trims all whitespaces at the beginning and the end of a template.
+ * - Removes whitespace-only text nodes. For example,
+ * `<button>Action 1</button>  <button>Action 2</button>` becomes
+ * `<button>Action 1</button><button>Action 2</button>`.
+ * - Replaces a series of whitespace characters in text nodes with a single space.
+ * For example, `<span>\n some text\n</span>` becomes `<span> some text </span>`.
+ * - Does NOT alter text nodes inside HTML tags such as `<pre>` or `<textarea>`,
+ * where whitespace characters are significant.
+ *
+ * Note that these transformations can influence DOM nodes layout, although impact
+ * should be minimal.
+ *
+ * You can override the default behavior to preserve whitespace characters
+ * in certain fragments of a template. For example, you can exclude an entire
+ * DOM sub-tree by using the `ngPreserveWhitespaces` attribute:
+ *
+ * ```html
+ * <div ngPreserveWhitespaces>
+ *     whitespaces are preserved here
+ *     <span>    and here </span>
+ * </div>
+ * ```
+ *
+ * You can force a single space to be preserved in a text node by using `&ngsp;`,
+ * which is replaced with a space character by Angular's template
+ * compiler:
+ *
+ * ```html
+ * <a>Spaces</a>&ngsp;<a>between</a>&ngsp;<a>links.</a>
+ * <!-->compiled to be equivalent to:</>
+ *  <a>Spaces</a> <a>between</a> <a>links.</a>
+ * ```
+ *
+ * Note that sequences of `&ngsp;` are still collapsed to just one space character when
+ * the `preserveWhitespaces` option is set to `false`.
+ *
+ * ```html
+ * <a>before</a>&ngsp;&ngsp;&ngsp;<a>after</a>
+ * <!-->compiled to be equivalent to:</>
+ *  <a>Spaces</a> <a>between</a> <a>links.</a>
+ * ```
+ *
+ * To preserve sequences of whitespace characters, use the
+ * `ngPreserveWhitespaces` attribute.
+ *
  * @Annotation
  */
 export const Component: ComponentDecorator = makeDecorator(
@@ -758,11 +771,8 @@ export const Component: ComponentDecorator = makeDecorator(
  */
 export interface PipeDecorator {
   /**
-   * Declare reusable pipe function.
+   * Declares a reusable pipe function, and supplies configuration metadata.
    *
-   * A "pure" pipe is only re-evaluated when either the input or any of the arguments change.
-   *
-   * When not specified, pipes default to being pure.
    */
   (obj: Pipe): TypeDecorator;
 
@@ -777,34 +787,26 @@ export interface PipeDecorator {
  */
 export interface Pipe {
   /**
-   * Name of the pipe.
+   * The pipe name to use in template bindings.
    *
-   * The pipe name is used in template bindings. For example if a pipe is named
-   * `myPipe` then it would be used in the template binding expression like
-   * so:  `{{ exp | myPipe }}`.
    */
   name: string;
 
   /**
-   * If Pipe is pure (its output depends only on its input.)
+   * When true, the pipe is pure, meaning that the
+   * `transform()` method is invoked only when its input arguments
+   * change. Pipes are pure by default.
    *
-   * Normally pipe's `transform` method is only invoked when the inputs to pipe`s
-   * `transform` method change. If the pipe has internal state (it's result are
-   * dependent on state other than its arguments) than set `pure` to `false` so
-   * that the pipe is invoked on each change-detection even if the arguments to the
-   * pipe do not change.
+   * If the pipe has internal state (that is, the result
+   * depends on state other than its arguments), set `pure` to false.
+   * In this case, the pipe is invoked on each change-detection cycle,
+   * even if the arguments have not changed.
    */
   pure?: boolean;
 }
 
 /**
- * Pipe decorator and metadata.
  *
- * Use the `@Pipe` annotation to declare that a given class is a pipe. A pipe
- * class must also implement `PipeTransform` interface.
- *
- * To use the pipe include a reference to the pipe class in
- * `NgModule.declarations`.
  *
  * @Annotation
  */
@@ -812,37 +814,68 @@ export const Pipe: PipeDecorator = makeDecorator('Pipe', (p: Pipe) => ({pure: tr
 
 
 /**
- * Type of the Input decorator / constructor function.
- *
  *
  */
 export interface InputDecorator {
   /**
-   * Declares a data-bound input property.
+   * Decorator that marks a class as pipe and supplies configuration metadata.
    *
-   * Angular automatically updates data-bound properties during change detection.
+   * A pipe class must implement the `PipeTransform` interface.
+   * For example, if the name is "myPipe", use a template binding expression
+   * such as the following:
    *
-   * `Input` takes an optional parameter that specifies the name
-   * used when instantiating a component in the template. When not provided,
-   * the name of the decorated property is used.
+   * ```
+   * {{ exp | myPipe }}
+   * ```
    *
-   * ### Example
+   * The result of the expression is passed to the pipe's `transform()` method.
    *
-   * The following example creates a component with two input properties.
+   * A pipe must belong to an NgModule in order for it to be available
+   * to a template. To make it a member of an NgModule,
+   * list it in the `declarations` field of the `@NgModule` metadata.
+   *
+   */
+  (bindingPropertyName?: string): any;
+  new (bindingPropertyName?: string): any;
+}
+
+/**
+ * Type of metadata for an `Input` property.
+ *
+ *
+ */
+export interface Input {
+  /**
+   * Decorator that marks a class field as an input property and supplies configuration metadata.
+   * Declares a data-bound input property, which Angular automatically updates
+   * during change detection.
+   *
+   * @usageNotes
+   *
+   * You can supply an optional name to use in templates when the
+   * component is instantiated, that maps to the
+   * name of the bound property. By default, the original
+   * name of the bound property is used for input binding.
+   *
+   * The following example creates a component with two input properties,
+   * one of which is given a special binding name.
    *
    * ```typescript
    * @Component({
    *   selector: 'bank-account',
    *   template: `
    *     Bank Name: {{bankName}}
-   *     Account Id: {{id}}
+  *      Account Id: {{id}}
    *   `
    * })
    * class BankAccount {
+   *   // This property is bound using its original name.
    *   @Input() bankName: string;
+   *   // this property value is bound to a different property name
+   *   // when this component is instantiated in a template.
    *   @Input('account-id') id: string;
    *
-   *   // this property is not bound, and won't be automatically updated by Angular
+   *   // this property is not bound, and is not automatically updated by Angular
    *   normalizedBankName: string;
    * }
    *
@@ -856,22 +889,10 @@ export interface InputDecorator {
    * class App {}
    * ```
    */
-  (bindingPropertyName?: string): any;
-  new (bindingPropertyName?: string): any;
-}
-
-/**
- * Type of the Input metadata.
- */
-export interface Input {
-  /**
-   * Name used when instantiating a component in the template.
-   */
   bindingPropertyName?: string;
 }
 
 /**
- * Input decorator and metadata.
  *
  * @Annotation
  */
@@ -883,46 +904,20 @@ export const Input: InputDecorator =
  */
 export interface OutputDecorator {
   /**
-   * Declares an event-bound output property.
-   *
-   * When an output property emits an event, an event handler attached to that event
-   * the template is invoked.
-   *
-   * `Output` takes an optional parameter that specifies the name
-   * used when instantiating a component in the template. When not provided,
-   * the name of the decorated property is used.
-   *
-   * @usageNotes
-   * ### Example
-   *
-   * ```typescript
-   * @Directive({
-   *   selector: 'interval-dir',
-   * })
-   * class IntervalDir {
-   *   @Output() everySecond = new EventEmitter();
-   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
-   *
-   *   constructor() {
-   *     setInterval(() => this.everySecond.emit("event"), 1000);
-   *     setInterval(() => this.five5Secs.emit("event"), 5000);
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'app',
-   *   template: `
-   *     <interval-dir (everySecond)="everySecond()" (everyFiveSeconds)="everyFiveSeconds()">
-   *     </interval-dir>
-   *   `
-   * })
-   * class App {
-   *   everySecond() { console.log('second'); }
-   *   everyFiveSeconds() { console.log('five seconds'); }
-   * }
-   * ```
-   *
-   */
+  * Decorator that marks a class field as an output property and supplies configuration metadata.
+  * Declares a data-bound output property, which Angular automatically updates
+  * during change detection.
+  *
+  * @usageNotes
+  *
+  * You can supply an optional name to use in templates when the
+  * component is instantiated, that maps to the
+  * name of the bound property. By default, the original
+  * name of the bound property is used for output binding.
+  *
+  * See `@Input` decorator for an example of providing a binding name.
+  *
+  */
   (bindingPropertyName?: string): any;
   new (bindingPropertyName?: string): any;
 }
@@ -933,7 +928,6 @@ export interface OutputDecorator {
 export interface Output { bindingPropertyName?: string; }
 
 /**
- * Output decorator and metadata.
  *
  * @Annotation
  */
@@ -946,25 +940,20 @@ export const Output: OutputDecorator =
  */
 export interface HostBindingDecorator {
   /**
-   * Declares a host property binding.
-   *
-   * Angular automatically checks host property bindings during change detection.
-   * If a binding changes, it will update the host element of the directive.
-   *
-   * `HostBinding` takes an optional parameter that specifies the property
-   * name of the host element that will be updated. When not provided,
-   * the class property name is used.
+   * Decorator that marks a DOM property as a host-binding property and supplies configuration
+   * metadata.
+   * Angular automatically checks host property bindings during change detection, and
+   * if a binding changes it updates the host element of the directive.
    *
    * @usageNotes
-   * ### Example
    *
-   * The following example creates a directive that sets the `valid` and `invalid` classes
-   * on the DOM element that has ngModel directive on it.
+   * The following example creates a directive that sets the `valid` and `invalid`
+   * properties on the DOM element that has an `ngModel` directive on it.
    *
    * ```typescript
    * @Directive({selector: '[ngModel]'})
    * class NgModelStatus {
-   *   constructor(public control:NgModel) {}
+   *   constructor(public control: NgModel) {}
    *   @HostBinding('class.valid') get valid() { return this.control.valid; }
    *   @HostBinding('class.invalid') get invalid() { return this.control.invalid; }
    * }
@@ -984,11 +973,11 @@ export interface HostBindingDecorator {
 
 /**
  * Type of the HostBinding metadata.
+ *
  */
 export interface HostBinding { hostPropertyName?: string; }
 
 /**
- * HostBinding decorator and metadata.
  *
  * @Annotation
  */
@@ -1000,39 +989,6 @@ export const HostBinding: HostBindingDecorator =
  * Type of the HostListener decorator / constructor function.
  */
 export interface HostListenerDecorator {
-  /**
-   * Declares a host listener.
-   *
-   * Angular will invoke the decorated method when the host element emits the specified event.
-   *
-   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM event.
-   *
-   * @usageNotes
-   * ### Example
-   *
-   * The following example declares a directive that attaches a click listener to the button and
-   * counts clicks.
-   *
-   * ```typescript
-   * @Directive({selector: 'button[counting]'})
-   * class CountClicks {
-   *   numberOfClicks = 0;
-   *
-   *   @HostListener('click', ['$event.target'])
-   *   onClick(btn) {
-   *     console.log('button', btn, 'number of clicks:', this.numberOfClicks++);
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'app',
-   *   template: '<button counting>Increment</button>',
-   * })
-   * class App {}
-   * ```
-   *
-   * @Annotation
-   */
   (eventName: string, args?: string[]): any;
   new (eventName: string, args?: string[]): any;
 }
@@ -1041,12 +997,44 @@ export interface HostListenerDecorator {
  * Type of the HostListener metadata.
  */
 export interface HostListener {
+  /**
+   * The CSS event to listen for.
+   */
   eventName?: string;
+  /**
+   * A set of arguments to pass to the handler method when the event occurs.
+   */
   args?: string[];
 }
 
 /**
- * HostListener decorator and metadata.
+ * Binds a CSS event to a host listener and supplies configuration metadata.
+ * Angular invokes the supplied handler method when the host element emits the specified event,
+ * and updates the bound element with the result.
+ * If the handler method returns false, applies `preventDefault` on the bound element.
+ *
+ * @usageNotes
+ *
+ * The following example declares a directive
+ * that attaches a click listener to a button and counts clicks.
+ *
+ * ```
+ * @Directive({selector: 'button[counting]'})
+ * class CountClicks {
+ *   numberOfClicks = 0;
+ *
+ *   @HostListener('click', ['$event.target'])
+ *   onClick(btn) {
+ *     console.log('button', btn, 'number of clicks:', this.numberOfClicks++);
+ *  }
+ * }
+ *
+ * @Component({
+ *   selector: 'app',
+ *   template: '<button counting>Increment</button>',
+ * })
+ * class App {}
+ * ```
  *
  * @Annotation
  */
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 2bc8151c07..ed4634a25c 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -71,7 +71,7 @@ export interface NgModuleDef<T, Declarations, Imports, Exports> {
 }
 
 /**
- * A wrapper around a module that also includes the providers.
+ * A wrapper around an NgModule that associates it with the providers.
  *
  *
  */
@@ -81,17 +81,21 @@ export interface ModuleWithProviders {
 }
 
 /**
- * Interface for schema definitions in @NgModules.
+ * A schema definition associated with an NgModule.
+ * 
+ * @see `@NgModule`, `CUSTOM_ELEMENTS_SCHEMA`, `NO_ERRORS_SCHEMA`
+ * 
+ * @param name The name of a defined schema.
  *
  * @experimental
  */
 export interface SchemaMetadata { name: string; }
 
 /**
- * Defines a schema that will allow:
- * - any non-Angular elements with a `-` in their name,
- * - any properties on elements with a `-` in their name which is the common rule for custom
- * elements.
+ * Defines a schema that allows an NgModule to contain the following:
+ * - Non-Angular elements named with dash case (`-`).
+ * - Element properties named with dash case (`-`).
+ * Dash case is the naming convention for custom elements.
  *
  *
  */
@@ -100,7 +104,7 @@ export const CUSTOM_ELEMENTS_SCHEMA: SchemaMetadata = {
 };
 
 /**
- * Defines a schema that will allow any property on any element.
+ * Defines a schema that allows any property on any element.
  *
  * @experimental
  */
@@ -116,7 +120,7 @@ export const NO_ERRORS_SCHEMA: SchemaMetadata = {
  */
 export interface NgModuleDecorator {
   /**
-   * Defines an NgModule.
+   * Marks a class as an NgModule and supplies configuration metadata.
    */
   (obj?: NgModule): TypeDecorator;
   new (obj?: NgModule): NgModule;
@@ -129,12 +133,13 @@ export interface NgModuleDecorator {
  */
 export interface NgModule {
   /**
-   * Defines the set of injectable objects that are available in the injector
+   * The set of injectable objects that are available in the injector
    * of this module.
    *
-   * ## Simple Example
+   * @usageNotes
    *
-   * Here is an example of a class that can be injected:
+   * The following example defines a class that is injected in
+   * the HelloWorld NgModule:
    *
    * ```
    * class Greeter {
@@ -160,9 +165,12 @@ export interface NgModule {
   providers?: Provider[];
 
   /**
-   * Specifies a list of directives/pipes that belong to this module.
+   * The set of directives and pipes that belong to this module.
    *
-   * ### Example
+   * @usageNotes
+   *
+   * The following example allows the CommonModule to use the `NgFor`
+   * directive.
    *
    * ```javascript
    * @NgModule({
@@ -175,11 +183,13 @@ export interface NgModule {
   declarations?: Array<Type<any>|any[]>;
 
   /**
-   * Specifies a list of modules whose exported directives/pipes
-   * should be available to templates in this module.
-   * This can also contain {@link ModuleWithProviders}.
+   * The set of NgModules, with or without providers,
+   * whose exported directives/pipes
+   * are available to templates in this module.
    *
-   * ### Example
+   * @usageNotes
+   *
+   * The following example allows MainModule to use CommonModule:
    *
    * ```javascript
    * @NgModule({
@@ -188,15 +198,18 @@ export interface NgModule {
    * class MainModule {
    * }
    * ```
+   *  @see {@link ModuleWithProviders}
    */
   imports?: Array<Type<any>|ModuleWithProviders|any[]>;
 
   /**
-   * Specifies a list of directives/pipes/modules that can be used within the template
-   * of any component that is part of an Angular module
-   * that imports this Angular module.
+   * The set of directives, pipe, and NgModules that can be used
+   * within the template of any component that is part of an
+   * NgModule that imports this NgModule.
    *
-   * ### Example
+   * @usageNotes
+   *
+   * The following example exports the `NgFor` directive from CommonModule.
    *
    * ```javascript
    * @NgModule({
@@ -209,36 +222,34 @@ export interface NgModule {
   exports?: Array<Type<any>|any[]>;
 
   /**
-   * Specifies a list of components that should be compiled when this module is defined.
-   * For each component listed here, Angular will create a {@link ComponentFactory}
-   * and store it in the {@link ComponentFactoryResolver}.
+   * The set of components to compile when this NgModule is defined.
+   * For each component listed here, Angular creates a `ComponentFactory`
+   * and stores it in the `ComponentFactoryResolver`.
    */
   entryComponents?: Array<Type<any>|any[]>;
 
   /**
-   * Defines the components that should be bootstrapped when
+   * The set of components that are bootstrapped when
    * this module is bootstrapped. The components listed here
-   * will automatically be added to `entryComponents`.
+   * are automatically added to `entryComponents`.
    */
   bootstrap?: Array<Type<any>|any[]>;
 
   /**
-   * Elements and properties that are not Angular components nor directives have to be declared in
-   * the schema.
+   * The set of schemas that declare elements to be allowed in the NgModule.
+   * Elements and properties that are neither Angular components nor directives
+   * must be declared in a schema.
    *
-   * Available schemas:
-   * - `NO_ERRORS_SCHEMA`: any elements and properties are allowed,
-   * - `CUSTOM_ELEMENTS_SCHEMA`: any custom elements (tag name has "-") with any properties are
-   *   allowed.
+   * Allowed value are `NO_ERRORS_SCHEMA` and `CUSTOM_ELEMENTS_SCHEMA`.
    *
-   * @security When using one of `NO_ERRORS_SCHEMA` or `CUSTOM_ELEMENTS_SCHEMA` we're trusting that
-   * allowed elements (and its properties) securely escape inputs.
+   * @security When using one of `NO_ERRORS_SCHEMA` or `CUSTOM_ELEMENTS_SCHEMA`
+   * you must ensure that allowed elements and properties securely escape inputs.
    */
   schemas?: Array<SchemaMetadata|any[]>;
 
   /**
-   * An opaque ID for this module, e.g. a name or a path. Used to identify modules in
-   * `getModuleFactory`. If left `undefined`, the `NgModule` will not be registered with
+   * A name or path that uniquely identifies this NgModule in `getModuleFactory`.
+   * If left `undefined`, the NgModule is not registered with
    * `getModuleFactory`.
    */
   id?: string;
@@ -266,11 +277,12 @@ function preR3NgModuleCompile(moduleType: InjectorType<any>, metadata: NgModule)
 }
 
 /**
- * NgModule decorator and metadata.
- *
- *
  * @Annotation
  */
 export const NgModule: NgModuleDecorator = makeDecorator(
     'NgModule', (ngModule: NgModule) => ngModule, undefined, undefined,
+    /**
+     * Decorator that marks the following class as an NgModule, and supplies
+     * configuration metadata for it.
+     */
     (type: Type<any>, meta: NgModule) => (R3_COMPILE_NGMODULE || preR3NgModuleCompile)(type, meta));
diff --git a/packages/examples/core/ts/metadata/directives.ts b/packages/examples/core/ts/metadata/directives.ts
new file mode 100644
index 0000000000..d7e63780c1
--- /dev/null
+++ b/packages/examples/core/ts/metadata/directives.ts
@@ -0,0 +1,66 @@
+/**
+ * @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
+ */
+/* tslint:disable:no-console  */
+import {Component, Directive, EventEmitter} from '@angular/core';
+
+// #docregion component-input
+@Component({
+  selector: 'app-bank-account',
+  inputs: ['bankName', 'id: account-id'],
+  template: `
+    Bank Name: {{ bankName }}
+    Account Id: {{ id }}
+  `
+})
+export class BankAccountComponent {
+  bankName: string;
+  id: string;
+
+  // this property is not bound, and won't be automatically updated by Angular
+  normalizedBankName: string;
+}
+
+@Component({
+  selector: 'app-my-input',
+  template: `
+    <app-bank-account
+      bankName="RBC"
+      account-id="4747">
+    </app-bank-account>
+  `
+})
+export class MyInputComponent {
+}
+// #enddocregion component-input
+
+// #docregion component-output-interval
+@Directive({selector: 'app-interval-dir', outputs: ['everySecond', 'fiveSecs: everyFiveSeconds']})
+export class IntervalDirComponent {
+  everySecond = new EventEmitter<string>();
+  fiveSecs = new EventEmitter<string>();
+
+  constructor() {
+    setInterval(() => this.everySecond.emit('event'), 1000);
+    setInterval(() => this.fiveSecs.emit('event'), 5000);
+  }
+}
+
+@Component({
+  selector: 'app-my-output',
+  template: `
+    <app-interval-dir
+      (everySecond)="onEverySecond()"
+      (everyFiveSeconds)="onEveryFiveSeconds()">
+    </app-interval-dir>
+  `
+})
+export class MyOutputComponent {
+  onEverySecond() { console.log('second'); }
+  onEveryFiveSeconds() { console.log('five seconds'); }
+}
+// #enddocregion component-output-interval
\ No newline at end of file

From 166d90d2a98908898fe9cf482f7b91208b03e685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Mon, 25 Jun 2018 11:36:35 -0700
Subject: [PATCH 342/582] ci: fix broken build

---
 packages/examples/core/ts/metadata/directives.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/examples/core/ts/metadata/directives.ts b/packages/examples/core/ts/metadata/directives.ts
index d7e63780c1..d1fa0b28aa 100644
--- a/packages/examples/core/ts/metadata/directives.ts
+++ b/packages/examples/core/ts/metadata/directives.ts
@@ -18,11 +18,11 @@ import {Component, Directive, EventEmitter} from '@angular/core';
   `
 })
 export class BankAccountComponent {
-  bankName: string;
-  id: string;
+  bankName: string|null = null;
+  id: string|null = null;
 
   // this property is not bound, and won't be automatically updated by Angular
-  normalizedBankName: string;
+  normalizedBankName: string|null = null;
 }
 
 @Component({

From ae9418c7de59d9dd66ece0882bd5f301178ac02a Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 18 Jun 2018 16:28:02 -0700
Subject: [PATCH 343/582] feat(ivy): generate ngInjectorDef for @NgModule in
 AOT mode (#24632)

This change generates ngInjectorDef as well as ngModuleDef for @NgModule
annotated types, reflecting the dual nature of @NgModules as both compilation
scopes and as DI configuration containers.

This required implementing ngInjectorDef compilation in @angular/compiler as
well as allowing for multiple generated definitions for a single decorator in
the core of ngtsc.

PR Close #24632
---
 .../src/ngtsc/annotations/src/component.ts    |  2 +-
 .../src/ngtsc/annotations/src/directive.ts    |  2 +-
 .../src/ngtsc/annotations/src/injectable.ts   |  2 +-
 .../src/ngtsc/annotations/src/ng_module.ts    | 72 +++++++++++++------
 packages/compiler-cli/src/ngtsc/program.ts    |  2 +-
 .../src/ngtsc/transform/src/api.ts            |  4 +-
 .../src/ngtsc/transform/src/compilation.ts    |  7 +-
 .../src/ngtsc/transform/src/declaration.ts    | 17 +++--
 .../src/ngtsc/transform/src/transform.ts      | 31 +++++---
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 42 +++++++++++
 packages/compiler/src/compiler.ts             |  2 +-
 .../compiler/src/render3/r3_identifiers.ts    |  5 ++
 .../src/render3/r3_module_compiler.ts         | 30 ++++++++
 13 files changed, 174 insertions(+), 44 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index e539ef1dc1..ca4bdb788e 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -116,7 +116,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
 
     const res = compileComponentFromMetadata(analysis, pool, makeBindingParser());
     return {
-      field: 'ngComponentDef',
+      name: 'ngComponentDef',
       initializer: res.expression,
       statements: pool.statements,
       type: res.type,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index ada4ec4633..837f70a83c 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -44,7 +44,7 @@ export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMe
     const pool = new ConstantPool();
     const res = compileDirectiveFromMetadata(analysis, pool, makeBindingParser());
     return {
-      field: 'ngDirectiveDef',
+      name: 'ngDirectiveDef',
       initializer: res.expression,
       statements: pool.statements,
       type: res.type,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
index e93baf233d..ab2370f510 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
@@ -35,7 +35,7 @@ export class InjectableDecoratorHandler implements DecoratorHandler<R3Injectable
   compile(node: ts.ClassDeclaration, analysis: R3InjectableMetadata): CompileResult {
     const res = compileIvyInjectable(analysis);
     return {
-      field: 'ngInjectableDef',
+      name: 'ngInjectableDef',
       initializer: res.expression,
       statements: [],
       type: res.type,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index 7ca9acb324..d52d2eb9f9 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -6,29 +6,36 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ConstantPool, Expression, R3DirectiveMetadata, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule, makeBindingParser, parseTemplate} from '@angular/compiler';
+import {ConstantPool, Expression, LiteralArrayExpr, R3DirectiveMetadata, R3InjectorMetadata, R3NgModuleMetadata, WrappedNodeExpr, compileInjector, compileNgModule, makeBindingParser, parseTemplate} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {Decorator} from '../../host';
+import {Decorator, ReflectionHost} from '../../host';
 import {Reference, ResolvedValue, reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {isAngularCore, referenceToExpression} from './util';
+import {getConstructorDependencies, isAngularCore, referenceToExpression} from './util';
+
+export interface NgModuleAnalysis {
+  ngModuleDef: R3NgModuleMetadata;
+  ngInjectorDef: R3InjectorMetadata;
+}
 
 /**
  * Compiles @NgModule annotations to ngModuleDef fields.
  *
  * TODO(alxhub): handle injector side of things as well.
  */
-export class NgModuleDecoratorHandler implements DecoratorHandler<R3NgModuleMetadata> {
-  constructor(private checker: ts.TypeChecker, private scopeRegistry: SelectorScopeRegistry) {}
+export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalysis> {
+  constructor(
+      private checker: ts.TypeChecker, private reflector: ReflectionHost,
+      private scopeRegistry: SelectorScopeRegistry) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
     return decorators.find(decorator => decorator.name === 'NgModule' && isAngularCore(decorator));
   }
 
-  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3NgModuleMetadata> {
+  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<NgModuleAnalysis> {
     if (decorator.args === null || decorator.args.length !== 1) {
       throw new Error(`Incorrect number of arguments to @NgModule decorator`);
     }
@@ -66,26 +73,51 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<R3NgModuleMeta
 
     const context = node.getSourceFile();
 
+    const ngModuleDef: R3NgModuleMetadata = {
+      type: new WrappedNodeExpr(node.name !),
+      bootstrap: [],
+      declarations: declarations.map(decl => referenceToExpression(decl, context)),
+      exports: exports.map(exp => referenceToExpression(exp, context)),
+      imports: imports.map(imp => referenceToExpression(imp, context)),
+      emitInline: false,
+    };
+
+    const providers: Expression = ngModule.has('providers') ?
+        new WrappedNodeExpr(ngModule.get('providers') !) :
+        new LiteralArrayExpr([]);
+
+    const ngInjectorDef: R3InjectorMetadata = {
+      name: node.name !.text,
+      type: new WrappedNodeExpr(node.name !),
+      deps: getConstructorDependencies(node, this.reflector), providers,
+      imports: new LiteralArrayExpr(
+          [...imports, ...exports].map(imp => referenceToExpression(imp, context))),
+    };
+
     return {
       analysis: {
-        type: new WrappedNodeExpr(node.name !),
-        bootstrap: [],
-        declarations: declarations.map(decl => referenceToExpression(decl, context)),
-        exports: exports.map(exp => referenceToExpression(exp, context)),
-        imports: imports.map(imp => referenceToExpression(imp, context)),
-        emitInline: false,
+          ngModuleDef, ngInjectorDef,
       },
     };
   }
 
-  compile(node: ts.ClassDeclaration, analysis: R3NgModuleMetadata): CompileResult {
-    const res = compileNgModule(analysis);
-    return {
-      field: 'ngModuleDef',
-      initializer: res.expression,
-      statements: [],
-      type: res.type,
-    };
+  compile(node: ts.ClassDeclaration, analysis: NgModuleAnalysis): CompileResult[] {
+    const ngInjectorDef = compileInjector(analysis.ngInjectorDef);
+    const ngModuleDef = compileNgModule(analysis.ngModuleDef);
+    return [
+      {
+        name: 'ngModuleDef',
+        initializer: ngModuleDef.expression,
+        statements: [],
+        type: ngModuleDef.type,
+      },
+      {
+        name: 'ngInjectorDef',
+        initializer: ngInjectorDef.expression,
+        statements: [],
+        type: ngInjectorDef.type,
+      },
+    ];
   }
 }
 
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 95ef841abe..7d1bff4e35 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -99,7 +99,7 @@ export class NgtscProgram implements api.Program {
       new ComponentDecoratorHandler(checker, reflector, scopeRegistry),
       new DirectiveDecoratorHandler(checker, reflector, scopeRegistry),
       new InjectableDecoratorHandler(reflector),
-      new NgModuleDecoratorHandler(checker, scopeRegistry),
+      new NgModuleDecoratorHandler(checker, reflector, scopeRegistry),
     ];
     const compilation = new IvyCompilation(handlers, checker, reflector);
 
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/api.ts b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
index 6dac390d0b..445216bc96 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
@@ -37,7 +37,7 @@ export interface DecoratorHandler<A> {
    * Generate a description of the field which should be added to the class, including any
    * initialization code to be generated.
    */
-  compile(node: ts.Declaration, analysis: A): CompileResult;
+  compile(node: ts.Declaration, analysis: A): CompileResult|CompileResult[];
 }
 
 /**
@@ -55,7 +55,7 @@ export interface AnalysisOutput<A> {
  * and a type for the .d.ts file.
  */
 export interface CompileResult {
-  field: string;
+  name: string;
   initializer: Expression;
   statements: Statement[];
   type: Type;
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index bebda19a99..d58a0db402 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -107,7 +107,7 @@ export class IvyCompilation {
    * Perform a compilation operation on the given class declaration and return instructions to an
    * AST transformer if any are available.
    */
-  compileIvyFieldFor(node: ts.Declaration): CompileResult|undefined {
+  compileIvyFieldFor(node: ts.Declaration): CompileResult[]|undefined {
     // Look to see whether the original node was analyzed. If not, there's nothing to do.
     const original = ts.getOriginalNode(node) as ts.Declaration;
     if (!this.analysis.has(original)) {
@@ -116,7 +116,10 @@ export class IvyCompilation {
     const op = this.analysis.get(original) !;
 
     // Run the actual compilation, which generates an Expression for the Ivy field.
-    const res = op.adapter.compile(node, op.analysis);
+    let res: CompileResult|CompileResult[] = op.adapter.compile(node, op.analysis);
+    if (!Array.isArray(res)) {
+      res = [res];
+    }
 
     // Look up the .d.ts transformer for the input file and record that a field was generated,
     // which will allow the .d.ts to be transformed later.
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
index 3038806287..499e6406e7 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
@@ -17,13 +17,13 @@ import {ImportManager, translateType} from './translator';
  * Processes .d.ts file text and adds static field declarations, with types.
  */
 export class DtsFileTransformer {
-  private ivyFields = new Map<string, CompileResult>();
+  private ivyFields = new Map<string, CompileResult[]>();
   private imports = new ImportManager();
 
   /**
    * Track that a static field was added to the code for a class.
    */
-  recordStaticField(name: string, decl: CompileResult): void { this.ivyFields.set(name, decl); }
+  recordStaticField(name: string, decls: CompileResult[]): void { this.ivyFields.set(name, decls); }
 
   /**
    * Process the .d.ts text for a file and add any declarations which were recorded.
@@ -36,11 +36,18 @@ export class DtsFileTransformer {
       const stmt = dtsFile.statements[i];
       if (ts.isClassDeclaration(stmt) && stmt.name !== undefined &&
           this.ivyFields.has(stmt.name.text)) {
-        const desc = this.ivyFields.get(stmt.name.text) !;
+        const decls = this.ivyFields.get(stmt.name.text) !;
         const before = dts.substring(0, stmt.end - 1);
         const after = dts.substring(stmt.end - 1);
-        const type = translateType(desc.type, this.imports);
-        dts = before + `    static ${desc.field}: ${type};\n` + after;
+
+        dts = before +
+            decls
+                .map(decl => {
+                  const type = translateType(decl.type, this.imports);
+                  return `    static ${decl.name}: ${type};\n`;
+                })
+                .join('') +
+            after;
       }
     }
 
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index 6878b2278c..47fc8c05b2 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -11,6 +11,7 @@ import * as ts from 'typescript';
 
 import {VisitListEntryResult, Visitor, visit} from '../../util/src/visitor';
 
+import {CompileResult} from './api';
 import {IvyCompilation} from './compilation';
 import {ImportManager, translateExpression, translateStatement} from './translator';
 
@@ -33,14 +34,26 @@ class IvyVisitor extends Visitor {
     // Determine if this class has an Ivy field that needs to be added, and compile the field
     // to an expression if so.
     const res = this.compilation.compileIvyFieldFor(node);
-    if (res !== undefined) {
-      // There is a field to add. Translate the initializer for the field into TS nodes.
-      const exprNode = translateExpression(res.initializer, this.importManager);
 
-      // Create a static property declaration for the new field.
-      const property = ts.createProperty(
-          undefined, [ts.createToken(ts.SyntaxKind.StaticKeyword)], res.field, undefined, undefined,
-          exprNode);
+    if (res !== undefined) {
+      // There is at least one field to add.
+      const statements: ts.Statement[] = [];
+      const members = [...node.members];
+
+      res.forEach(field => {
+        // Translate the initializer for the field into TS nodes.
+        const exprNode = translateExpression(field.initializer, this.importManager);
+
+        // Create a static property declaration for the new field.
+        const property = ts.createProperty(
+            undefined, [ts.createToken(ts.SyntaxKind.StaticKeyword)], field.name, undefined,
+            undefined, exprNode);
+
+        field.statements.map(stmt => translateStatement(stmt, this.importManager))
+            .forEach(stmt => statements.push(stmt));
+
+        members.push(property);
+      });
 
       // Replace the class declaration with an updated version.
       node = ts.updateClassDeclaration(
@@ -48,9 +61,7 @@ class IvyVisitor extends Visitor {
           // Remove the decorator which triggered this compilation, leaving the others alone.
           maybeFilterDecorator(
               node.decorators, this.compilation.ivyDecoratorFor(node) !.node as ts.Decorator),
-          node.modifiers, node.name, node.typeParameters, node.heritageClauses || [],
-          [...node.members, property]);
-      const statements = res.statements.map(stmt => translateStatement(stmt, this.importManager));
+          node.modifiers, node.name, node.typeParameters, node.heritageClauses || [], members);
       return {node, before: statements};
     }
 
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index b4869e1728..af0867849c 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -180,4 +180,46 @@ describe('ngtsc behavioral tests', () => {
         .toContain('static ngModuleDef: i0.NgModuleDef<TestModule, [TestCmp], [], []>');
     expect(dtsContents).not.toContain('__decorate');
   });
+
+  it('should compile NgModules with services without errors', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Component, NgModule} from '@angular/core';
+
+        export class Token {}
+
+        @NgModule({})
+        export class OtherModule {}
+
+        @Component({
+          selector: 'test-cmp',
+          template: 'this is a test',
+        })
+        export class TestCmp {}
+
+        @NgModule({
+          declarations: [TestCmp],
+          providers: [{provide: Token, useValue: 'test'}],
+          imports: [OtherModule],
+        })
+        export class TestModule {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain('i0.ɵdefineNgModule({ type: TestModule,');
+    expect(jsContents)
+        .toContain(
+            `TestModule.ngInjectorDef = i0.defineInjector({ factory: ` +
+            `function TestModule_Factory() { return new TestModule(); }, providers: [{ provide: ` +
+            `Token, useValue: 'test' }], imports: [OtherModule] });`);
+
+    const dtsContents = getContents('test.d.ts');
+    expect(dtsContents)
+        .toContain('static ngModuleDef: i0.NgModuleDef<TestModule, [TestCmp], [OtherModule], []>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.InjectorDef');
+  });
 });
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index f3067a6c0e..22ca91c682 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -83,7 +83,7 @@ export * from './injectable_compiler_2';
 export * from './render3/view/api';
 export {jitExpression} from './render3/r3_jit';
 export {R3DependencyMetadata, R3FactoryMetadata, R3ResolvedDependencyType} from './render3/r3_factory';
-export {compileNgModule, R3NgModuleMetadata} from './render3/r3_module_compiler';
+export {compileInjector, compileNgModule, R3InjectorMetadata, R3NgModuleMetadata} from './render3/r3_module_compiler';
 export {makeBindingParser, parseTemplate} from './render3/view/template';
 export {compileComponentFromMetadata, compileDirectiveFromMetadata, parseHostBindings} from './render3/view/compiler';
 // This file only reexports content of the `src` folder. Keep it that way.
\ No newline at end of file
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 03f6f8e5fe..2d5475c6eb 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -114,6 +114,11 @@ export class Identifiers {
     moduleName: CORE,
   };
 
+  static InjectorDef: o.ExternalReference = {
+    name: 'InjectorDef',
+    moduleName: CORE,
+  };
+
   static defineInjector: o.ExternalReference = {
     name: 'defineInjector',
     moduleName: CORE,
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index 78f3e0db84..8b83f25931 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -13,6 +13,7 @@ import {mapLiteral} from '../output/map_util';
 import * as o from '../output/output_ast';
 import {OutputContext} from '../util';
 
+import {R3DependencyMetadata, compileFactoryFunction} from './r3_factory';
 import {Identifiers as R3} from './r3_identifiers';
 import {convertMetaToOutput, mapToMapExpression} from './util';
 
@@ -81,6 +82,35 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
   return {expression, type, additionalStatements};
 }
 
+export interface R3InjectorDef {
+  expression: o.Expression;
+  type: o.Type;
+}
+
+export interface R3InjectorMetadata {
+  name: string;
+  type: o.Expression;
+  deps: R3DependencyMetadata[];
+  providers: o.Expression;
+  imports: o.Expression;
+}
+
+export function compileInjector(meta: R3InjectorMetadata): R3InjectorDef {
+  const expression = o.importExpr(R3.defineInjector).callFn([mapToMapExpression({
+    factory: compileFactoryFunction({
+      name: meta.name,
+      fnOrClass: meta.type,
+      deps: meta.deps,
+      useNew: true,
+      injectFn: R3.inject,
+    }),
+    providers: meta.providers,
+    imports: meta.imports,
+  })]);
+  const type = new o.ExpressionType(o.importExpr(R3.InjectorDef));
+  return {expression, type};
+}
+
 // TODO(alxhub): integrate this with `compileNgModule`. Currently the two are separate operations.
 export function compileNgModuleFromRender2(
     ctx: OutputContext, ngModule: CompileShallowModuleMetadata,

From 89c442270a3b677e0ce0be9665eb317592234ea3 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 19 Jun 2018 11:40:29 -0700
Subject: [PATCH 344/582] feat(ivy): generate ngInjectorDef for @NgModule in
 JIT mode (#24632)

This commit takes advantage of the @angular/compiler work for ngInjectorDef
in AOT mode in order to generate the same definition in JIT mode.

PR Close #24632
---
 karma-js.conf.js                              |  1 +
 packages/core/src/render3/jit/fields.ts       |  1 +
 packages/core/src/render3/jit/module.ts       | 36 +++++++++++++++----
 packages/core/test/render3/ivy/BUILD.bazel    |  7 ----
 packages/core/test/render3/ivy/jit_spec.ts    | 28 +++++++++++++++
 .../core/test/render3/jit_environment_spec.ts |  1 +
 6 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/karma-js.conf.js b/karma-js.conf.js
index 0028c738c2..4c63692ba0 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -70,6 +70,7 @@ module.exports = function(config) {
       'dist/all/@angular/compiler/test/aot/**',
       'dist/all/@angular/compiler/test/render3/**',
       'dist/all/@angular/core/test/bundling/**',
+      'dist/all/@angular/core/test/render3/**',
       'dist/all/@angular/elements/schematics/**',
       'dist/all/@angular/examples/**/e2e_test/*',
       'dist/all/@angular/language-service/**',
diff --git a/packages/core/src/render3/jit/fields.ts b/packages/core/src/render3/jit/fields.ts
index 6ddef85fee..416c702a50 100644
--- a/packages/core/src/render3/jit/fields.ts
+++ b/packages/core/src/render3/jit/fields.ts
@@ -12,5 +12,6 @@ const TARGET = {} as any;
 
 export const NG_COMPONENT_DEF = getClosureSafeProperty({ngComponentDef: TARGET}, TARGET);
 export const NG_DIRECTIVE_DEF = getClosureSafeProperty({ngDirectiveDef: TARGET}, TARGET);
+export const NG_INJECTOR_DEF = getClosureSafeProperty({ngInjectorDef: TARGET}, TARGET);
 export const NG_PIPE_DEF = getClosureSafeProperty({ngPipeDef: TARGET}, TARGET);
 export const NG_MODULE_DEF = getClosureSafeProperty({ngModuleDef: TARGET}, TARGET);
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 004cf80e06..823f30a001 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -6,24 +6,25 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, R3NgModuleMetadata, WrappedNodeExpr, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
+import {Expression, R3InjectorMetadata, R3NgModuleMetadata, WrappedNodeExpr, compileInjector, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
 
 import {ModuleWithProviders, NgModule, NgModuleDefInternal, NgModuleTransitiveScopes} from '../../metadata/ng_module';
 import {Type} from '../../type';
 import {ComponentDefInternal} from '../interfaces/definition';
 
 import {angularCoreEnv} from './environment';
-import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
+import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_INJECTOR_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
+import {reflectDependencies} from './util';
 
 const EMPTY_ARRAY: Type<any>[] = [];
 
 export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
   const declarations: Type<any>[] = flatten(ngModule.declarations || EMPTY_ARRAY);
 
-  let def: any = null;
+  let ngModuleDef: any = null;
   Object.defineProperty(type, NG_MODULE_DEF, {
     get: () => {
-      if (def === null) {
+      if (ngModuleDef === null) {
         const meta: R3NgModuleMetadata = {
           type: wrap(type),
           bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(wrap),
@@ -35,9 +36,32 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
           emitInline: true,
         };
         const res = compileR3NgModule(meta);
-        def = jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngModuleDef.js`);
+        ngModuleDef =
+            jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngModuleDef.js`);
       }
-      return def;
+      return ngModuleDef;
+    },
+  });
+
+  let ngInjectorDef: any = null;
+  Object.defineProperty(type, NG_INJECTOR_DEF, {
+    get: () => {
+      if (ngInjectorDef === null) {
+        const meta: R3InjectorMetadata = {
+          name: type.name,
+          type: wrap(type),
+          deps: reflectDependencies(type),
+          providers: new WrappedNodeExpr(ngModule.providers || EMPTY_ARRAY),
+          imports: new WrappedNodeExpr([
+            ngModule.imports || EMPTY_ARRAY,
+            ngModule.exports || EMPTY_ARRAY,
+          ]),
+        };
+        const res = compileInjector(meta);
+        ngInjectorDef =
+            jitExpression(res.expression, angularCoreEnv, `ng://${type.name}/ngInjectorDef.js`);
+      }
+      return ngInjectorDef;
     },
   });
 
diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel
index a6e21830bd..dd78fb48fa 100644
--- a/packages/core/test/render3/ivy/BUILD.bazel
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@@ -35,10 +35,3 @@ jasmine_node_test(
         ":ivy_node_lib",
     ],
 )
-
-ts_web_test_suite(
-    name = "ivy_web",
-    deps = [
-        ":ivy_lib",
-    ],
-)
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index 6d31afb2bf..919df879d8 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -6,6 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import 'reflect-metadata';
+
+import {InjectorDef, defineInjectable} from '@angular/core/src/di/defs';
 import {Injectable} from '@angular/core/src/di/injectable';
 import {inject, setCurrentInjector} from '@angular/core/src/di/injector';
 import {ivyEnabled} from '@angular/core/src/ivy_switch';
@@ -140,6 +143,31 @@ ivyEnabled && describe('render3 jit', () => {
     expect(moduleDef.declarations[0]).toBe(Cmp);
   });
 
+  it('compiles a module to an ngInjectorDef with the providers', () => {
+    class Token {
+      static ngInjectableDef = defineInjectable({
+        providedIn: 'root',
+        factory: () => 'default',
+      });
+    }
+
+    @NgModule({
+      providers: [{provide: Token, useValue: 'test'}],
+    })
+    class Module {
+      constructor(public token: Token) {}
+    }
+
+    const injectorDef: InjectorDef<Module> = (Module as any).ngInjectorDef;
+    const instance = injectorDef.factory();
+
+    // Since the instance was created outside of an injector using the module, the
+    // injection will use the default provider, not the provider from the module.
+    expect(instance.token).toBe('default');
+
+    expect(injectorDef.providers).toEqual([{provide: Token, useValue: 'test'}]);
+  });
+
   it('patches a module onto the component', () => {
     @Component({
       template: 'foo',
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
index b88abe1a84..0927739564 100644
--- a/packages/core/test/render3/jit_environment_spec.ts
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -14,6 +14,7 @@ import {angularCoreEnv} from '../../src/render3/jit/environment';
 const INTERFACE_EXCEPTIONS = new Set<string>([
   'ComponentDef',
   'DirectiveDef',
+  'InjectorDef',
   'NgModuleDef',
 ]);
 

From 855e8ad9f6548012f04bda650e0032045824f96e Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 19 Jun 2018 11:41:00 -0700
Subject: [PATCH 345/582] fix(ivy): use closure-safe field name for JIT of
 ngInjectableDef (#24632)

PR Close #24632
---
 packages/core/src/render3/jit/fields.ts     | 1 +
 packages/core/src/render3/jit/injectable.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/render3/jit/fields.ts b/packages/core/src/render3/jit/fields.ts
index 416c702a50..0937656784 100644
--- a/packages/core/src/render3/jit/fields.ts
+++ b/packages/core/src/render3/jit/fields.ts
@@ -12,6 +12,7 @@ const TARGET = {} as any;
 
 export const NG_COMPONENT_DEF = getClosureSafeProperty({ngComponentDef: TARGET}, TARGET);
 export const NG_DIRECTIVE_DEF = getClosureSafeProperty({ngDirectiveDef: TARGET}, TARGET);
+export const NG_INJECTABLE_DEF = getClosureSafeProperty({ngInjectableDef: TARGET}, TARGET);
 export const NG_INJECTOR_DEF = getClosureSafeProperty({ngInjectorDef: TARGET}, TARGET);
 export const NG_PIPE_DEF = getClosureSafeProperty({ngPipeDef: TARGET}, TARGET);
 export const NG_MODULE_DEF = getClosureSafeProperty({ngModuleDef: TARGET}, TARGET);
diff --git a/packages/core/src/render3/jit/injectable.ts b/packages/core/src/render3/jit/injectable.ts
index 0b0b132421..4fc86832e1 100644
--- a/packages/core/src/render3/jit/injectable.ts
+++ b/packages/core/src/render3/jit/injectable.ts
@@ -14,6 +14,7 @@ import {Type} from '../../type';
 import {getClosureSafeProperty} from '../../util/property';
 
 import {angularCoreEnv} from './environment';
+import {NG_INJECTABLE_DEF} from './fields';
 import {convertDependencies, reflectDependencies} from './util';
 
 
@@ -28,7 +29,7 @@ export function compileInjectable(type: Type<any>, meta?: Injectable): void {
   }
 
   let def: any = null;
-  Object.defineProperty(type, 'ngInjectableDef', {
+  Object.defineProperty(type, NG_INJECTABLE_DEF, {
     get: () => {
       if (def === null) {
         // Check whether the injectable metadata includes a provider specification.

From cf0968f98e844043a0f6c2548201f3c0dfd329a7 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 14 Jun 2018 23:51:34 +0100
Subject: [PATCH 346/582] build(docs-infra): support hiding constructors of
 injectable classes (#24529)

Classes that are injectable often have constructors that should not be
called by the application developer. It is the responsibility of the
injector to instantiate the class and the constructor often contains
private implementation details that may need to change.

This commit removes constructors from the docs for API items that are
both:

a) Marked with an injectable decorator (e.g. Injectable, Directive,
Component, Pipe), and
b) Have no constructor description

This second rule allows the developer to override the removal if there
is something useful to say about the constructor.

Note that "normal" classes such as `angimations/HttpHeaders` do not have
their constructor removed, despite (at this time) having no description.

PR Close #24529
---
 .../transforms/angular-api-package/index.js   |  1 +
 .../removeInjectableConstructors.js           | 18 ++++++
 .../removeInjectableConstructors.spec.js      | 58 +++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.js
 create mode 100644 aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.spec.js

diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index 5e0931a724..d6838c892f 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -32,6 +32,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
   .processor(require('./processors/computeSearchTitle'))
   .processor(require('./processors/simplifyMemberAnchors'))
   .processor(require('./processors/computeStability'))
+  .processor(require('./processors/removeInjectableConstructors'))
 
   /**
    * These are the API doc types that will be rendered to actual files.
diff --git a/aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.js b/aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.js
new file mode 100644
index 0000000000..ea8daeb231
--- /dev/null
+++ b/aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.js
@@ -0,0 +1,18 @@
+module.exports = function removeInjectableConstructors() {
+  return {
+    $runAfter: ['processing-docs', 'splitDescription'],
+    $runBefore: ['docs-processed'],
+    injectableDecorators: ['Injectable', 'Directive', 'Component', 'Pipe', 'NgModule'],
+    $process(docs) {
+      docs.forEach(doc => {
+        if (
+          doc.constructorDoc &&
+          !doc.constructorDoc.shortDescription &&
+          doc.decorators &&
+          doc.decorators.some(decorator => this.injectableDecorators.indexOf(decorator.name) !== -1)) {
+          delete doc.constructorDoc;
+        }
+      });
+    }
+  };
+};
diff --git a/aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.spec.js b/aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.spec.js
new file mode 100644
index 0000000000..d7372fa7c3
--- /dev/null
+++ b/aio/tools/transforms/angular-api-package/processors/removeInjectableConstructors.spec.js
@@ -0,0 +1,58 @@
+const processorFactory = require('./removeInjectableConstructors');
+const testPackage = require('../../helpers/test-package');
+const Dgeni = require('dgeni');
+
+describe('removeInjectableConstructors processor', () => {
+
+  it('should be available on the injector', () => {
+    const dgeni = new Dgeni([testPackage('angular-api-package')]);
+    const injector = dgeni.configureInjector();
+    const processor = injector.get('removeInjectableConstructors');
+    expect(processor.$process).toBeDefined();
+    expect(processor.$runAfter).toEqual(['processing-docs', 'splitDescription']);
+    expect(processor.$runBefore).toEqual(['docs-processed']);
+  });
+
+  it('should remove undocumented constructors from docs that have an "Injectable" decorator on them', () => {
+    const processor = processorFactory();
+    const docs = [
+      { constructorDoc: {} },
+      { constructorDoc: {}, decorators: [] },
+      { constructorDoc: {}, decorators: [{ name: 'Injectable' }] },
+      { constructorDoc: {}, decorators: [{ name: 'Component' }] },
+      { constructorDoc: {}, decorators: [{ name: 'Directive' }] },
+      { constructorDoc: {}, decorators: [{ name: 'Pipe' }] },
+      { constructorDoc: {}, decorators: [{ name: 'Other' }, { name: 'Injectable' }] },
+      { constructorDoc: {}, decorators: [{ name: 'Other' }] },
+
+      { constructorDoc: { shortDescription: 'Blah' } },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [] },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [{ name: 'Injectable' }] },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [{ name: 'Component' }] },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [{ name: 'Directive' }] },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [{ name: 'Pipe' }] },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [{ name: 'Other' }, { name: 'Injectable' }] },
+      { constructorDoc: { shortDescription: 'Blah' }, decorators: [{ name: 'Other' }] },
+    ];
+
+    processor.$process(docs);
+
+    expect(docs[0].constructorDoc).toBeDefined();
+    expect(docs[1].constructorDoc).toBeDefined();
+    expect(docs[2].constructorDoc).toBeUndefined();
+    expect(docs[3].constructorDoc).toBeUndefined();
+    expect(docs[4].constructorDoc).toBeUndefined();
+    expect(docs[5].constructorDoc).toBeUndefined();
+    expect(docs[6].constructorDoc).toBeUndefined();
+    expect(docs[7].constructorDoc).toBeDefined();
+
+    expect(docs[8].constructorDoc).toBeDefined();
+    expect(docs[9].constructorDoc).toBeDefined();
+    expect(docs[10].constructorDoc).toBeDefined();
+    expect(docs[11].constructorDoc).toBeDefined();
+    expect(docs[12].constructorDoc).toBeDefined();
+    expect(docs[13].constructorDoc).toBeDefined();
+    expect(docs[14].constructorDoc).toBeDefined();
+    expect(docs[15].constructorDoc).toBeDefined();
+  });
+});

From 002a5afa9880ac3a885a54f9bfcdb994af3ae9e8 Mon Sep 17 00:00:00 2001
From: Tomasz Kula <tomaszkulawebdev@gmail.com>
Date: Mon, 7 May 2018 12:41:07 +0200
Subject: [PATCH 347/582] docs(aio): add cross field validation example
 (#23743)

PR Close #23743
---
 .../form-validation/e2e/src/app.e2e-spec.ts   |  34 ++++-
 .../form-validation/src/app/app.module.ts     |   5 +-
 .../hero-form-reactive.component.1.ts         |  42 ++++++
 .../reactive/hero-form-reactive.component.css |   5 +
 .../hero-form-reactive.component.html         |  73 +++++++---
 .../reactive/hero-form-reactive.component.ts  |  26 ++--
 .../app/shared/identity-revealed.directive.ts |  28 ++++
 .../template/hero-form-template.component.css |   4 +
 .../hero-form-template.component.html         |  88 ++++++++----
 .../template/hero-form-template.component.ts  |   5 +-
 .../examples/form-validation/stackblitz.json  |   3 +-
 aio/content/guide/form-validation.md          | 128 +++++++++++++++++-
 12 files changed, 373 insertions(+), 68 deletions(-)
 create mode 100644 aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.1.ts
 create mode 100644 aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.css
 create mode 100644 aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
 create mode 100644 aio/content/examples/form-validation/src/app/template/hero-form-template.component.css

diff --git a/aio/content/examples/form-validation/e2e/src/app.e2e-spec.ts b/aio/content/examples/form-validation/e2e/src/app.e2e-spec.ts
index 8956ace183..e6b8bbf605 100644
--- a/aio/content/examples/form-validation/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/form-validation/e2e/src/app.e2e-spec.ts
@@ -16,6 +16,7 @@ describe('Form Validation Tests', function () {
 
     tests('Template-Driven Form');
     bobTests();
+    crossValidationTests();
   });
 
   describe('Reactive form', () => {
@@ -25,6 +26,7 @@ describe('Form Validation Tests', function () {
 
     tests('Reactive Form');
     bobTests();
+    crossValidationTests();
   });
 });
 
@@ -42,7 +44,8 @@ let page: {
   powerOption: ElementFinder,
   errorMessages: ElementArrayFinder,
   heroFormButtons: ElementArrayFinder,
-  heroSubmitted: ElementFinder
+  heroSubmitted: ElementFinder,
+  crossValidationErrorMessage: ElementFinder,
 };
 
 function getPage(sectionTag: string) {
@@ -59,7 +62,8 @@ function getPage(sectionTag: string) {
     powerOption: section.element(by.css('#power option')),
     errorMessages: section.all(by.css('div.alert')),
     heroFormButtons: buttons,
-    heroSubmitted: section.element(by.css('.submitted-message'))
+    heroSubmitted: section.element(by.css('.submitted-message')),
+    crossValidationErrorMessage: section.element(by.css('.cross-validation-error-message')),
   };
 }
 
@@ -172,3 +176,29 @@ function bobTests() {
     expectFormIsValid();
   });
 }
+
+function crossValidationTests() {
+  const emsg = 'Name cannot match alter ego.';
+
+  it(`should produce "${emsg}" error after setting name and alter ego to the same value`, function () {
+    page.nameInput.clear();
+    page.nameInput.sendKeys('Batman');
+
+    page.alterEgoInput.clear();
+    page.alterEgoInput.sendKeys('Batman');
+
+    expectFormIsInvalid();
+    expect(page.crossValidationErrorMessage.getText()).toBe(emsg);
+  });
+
+  it('should be ok again with different values', function () {
+    page.nameInput.clear();
+    page.nameInput.sendKeys('Batman');
+
+    page.alterEgoInput.clear();
+    page.alterEgoInput.sendKeys('Superman');
+
+    expectFormIsValid();
+    expect(page.crossValidationErrorMessage.isPresent()).toBe(false);
+  });
+}
diff --git a/aio/content/examples/form-validation/src/app/app.module.ts b/aio/content/examples/form-validation/src/app/app.module.ts
index 0a5d1cf455..f25504e6ea 100644
--- a/aio/content/examples/form-validation/src/app/app.module.ts
+++ b/aio/content/examples/form-validation/src/app/app.module.ts
@@ -7,7 +7,7 @@ import { AppComponent }           from './app.component';
 import { HeroFormTemplateComponent } from './template/hero-form-template.component';
 import { HeroFormReactiveComponent } from './reactive/hero-form-reactive.component';
 import { ForbiddenValidatorDirective } from './shared/forbidden-name.directive';
-
+import { IdentityRevealedValidatorDirective } from './shared/identity-revealed.directive';
 
 @NgModule({
   imports: [
@@ -19,7 +19,8 @@ import { ForbiddenValidatorDirective } from './shared/forbidden-name.directive';
     AppComponent,
     HeroFormTemplateComponent,
     HeroFormReactiveComponent,
-    ForbiddenValidatorDirective
+    ForbiddenValidatorDirective,
+    IdentityRevealedValidatorDirective
   ],
   bootstrap:    [ AppComponent ]
 })
diff --git a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.1.ts b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.1.ts
new file mode 100644
index 0000000000..72b5dbeaec
--- /dev/null
+++ b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.1.ts
@@ -0,0 +1,42 @@
+/* tslint:disable: member-ordering forin */
+// #docplaster
+// #docregion
+import { Component, OnInit }                  from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { forbiddenNameValidator } from '../shared/forbidden-name.directive';
+
+@Component({
+  selector: 'app-hero-form-reactive',
+  templateUrl: './hero-form-reactive.component.html',
+  styleUrls: ['./hero-form-reactive.component.css'],
+})
+export class HeroFormReactiveComponent implements OnInit {
+
+  powers = ['Really Smart', 'Super Flexible', 'Weather Changer'];
+
+  hero = {name: 'Dr.', alterEgo: 'Dr. What', power: this.powers[0]};
+
+  heroForm: FormGroup;
+
+  // #docregion form-group
+  ngOnInit(): void {
+    // #docregion custom-validator
+    this.heroForm = new FormGroup({
+      'name': new FormControl(this.hero.name, [
+        Validators.required,
+        Validators.minLength(4),
+        forbiddenNameValidator(/bob/i) // <-- Here's how you pass in the custom validator.
+      ]),
+      'alterEgo': new FormControl(this.hero.alterEgo),
+      'power': new FormControl(this.hero.power, Validators.required)
+    });
+    // #enddocregion custom-validator
+
+  }
+
+  get name() { return this.heroForm.get('name'); }
+
+  get power() { return this.heroForm.get('power'); }
+  // #enddocregion form-group
+}
+// #enddocregion
diff --git a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.css b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.css
new file mode 100644
index 0000000000..8e1db2c511
--- /dev/null
+++ b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.css
@@ -0,0 +1,5 @@
+/* #docregion cross-validation-error-css */
+.cross-validation-error input {
+  border-left: 5px solid red;
+}
+/* #enddocregion cross-validation-error-css */
\ No newline at end of file
diff --git a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
index 36cebbaca4..5edb6500f9 100644
--- a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
+++ b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
@@ -3,38 +3,67 @@
 
   <h1>Reactive Form</h1>
 
+  <!-- #docregion cross-validation -->
   <form [formGroup]="heroForm" #formDir="ngForm">
+  <!-- #enddocregion cross-validation -->
 
     <div [hidden]="formDir.submitted">
 
-      <div class="form-group">
+      <!-- #docregion cross-validation -->
+      <!-- #docregion cross-validation-error-class -->
+      <div class="cross-validation" [class.cross-validation-error]="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)">
+      <!-- #enddocregion cross-validation-error-class -->
+      <!-- #enddocregion cross-validation -->
+        <div class="form-group">
 
-        <label for="name">Name</label>
-        <!-- #docregion name-with-error-msg -->
-        <input id="name" class="form-control"
-               formControlName="name" required >
+          <label for="name">Name</label>
+          <!-- #docregion name-with-error-msg -->
+          <!-- #docregion cross-validation -->
+          <!-- #docregion cross-validation-error-class-->
+          <input id="name" class="form-control"
+                formControlName="name" required >
+          <!-- #enddocregion cross-validation -->
+          <!-- #enddocregion cross-validation-error-class-->
 
-        <div *ngIf="name.invalid && (name.dirty || name.touched)"
-             class="alert alert-danger">
+          <div *ngIf="name.invalid && (name.dirty || name.touched)"
+              class="alert alert-danger">
 
-          <div *ngIf="name.errors.required">
-            Name is required.
-          </div>
-          <div *ngIf="name.errors.minlength">
-            Name must be at least 4 characters long.
-          </div>
-          <div *ngIf="name.errors.forbiddenName">
-            Name cannot be Bob.
+            <div *ngIf="name.errors.required">
+              Name is required.
+            </div>
+            <div *ngIf="name.errors.minlength">
+              Name must be at least 4 characters long.
+            </div>
+            <div *ngIf="name.errors.forbiddenName">
+              Name cannot be Bob.
+            </div>
           </div>
+          <!-- #enddocregion name-with-error-msg -->
         </div>
-        <!-- #enddocregion name-with-error-msg -->
-      </div>
 
-      <div class="form-group">
-        <label for="alterEgo">Alter Ego</label>
-        <input id="alterEgo" class="form-control"
-            formControlName="alterEgo"  >
+        <div class="form-group">
+          <label for="alterEgo">Alter Ego</label>
+          <!-- #docregion cross-validation -->
+          <!-- #docregion cross-validation-error-class-->
+          <input id="alterEgo" class="form-control"
+              formControlName="alterEgo"  >
+          <!-- #enddocregion cross-validation -->
+          <!-- #enddocregion cross-validation-error-class -->
+        </div>
+
+        <!-- #docregion cross-validation-error-message -->
+        <!-- #docregion cross-validation -->
+        <div *ngIf="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)" class="cross-validation-error-message alert alert-danger">
+            Name cannot match alter ego.
+        </div>
+        <!-- #enddocregion cross-validation -->
+        <!-- #enddocregion cross-validation-error-message -->
+
+      <!-- #docregion cross-validation -->
+      <!-- #docregion cross-validation-error-class-->
       </div>
+      <!-- #enddocregion cross-validation -->
+      <!-- #enddocregion cross-validation-error-class -->
 
       <div class="form-group">
         <label for="power">Hero Power</label>
@@ -53,7 +82,9 @@
       <button type="button" class="btn btn-default"
              (click)="formDir.resetForm({})">Reset</button>
     </div>
+  <!-- #docregion cross-validation -->
   </form>
+  <!-- #enddocregion cross-validation -->
 
   <div class="submitted-message" *ngIf="formDir.submitted">
     <p>You've submitted your hero, {{ heroForm.value.name }}!</p>
diff --git a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
index e1b3d6bc8b..4b15c6053e 100644
--- a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
+++ b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
@@ -1,40 +1,44 @@
 /* tslint:disable: member-ordering forin */
-// #docplaster
 // #docregion
-import { Component, OnInit }                  from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { forbiddenNameValidator } from '../shared/forbidden-name.directive';
+import { identityRevealedValidator } from '../shared/identity-revealed.directive';
 
+// #docregion cross-validation-component
 @Component({
   selector: 'app-hero-form-reactive',
-  templateUrl: './hero-form-reactive.component.html'
+  templateUrl: './hero-form-reactive.component.html',
+  styleUrls: ['./hero-form-reactive.component.css'],
 })
 export class HeroFormReactiveComponent implements OnInit {
+// #enddocregion cross-validation-component
 
   powers = ['Really Smart', 'Super Flexible', 'Weather Changer'];
 
-  hero = {name: 'Dr.', alterEgo: 'Dr. What', power: this.powers[0]};
+  hero = { name: 'Dr.', alterEgo: 'Dr. What', power: this.powers[0] };
 
+  // #docregion cross-validation-component
   heroForm: FormGroup;
 
-  // #docregion form-group
+  // #docregion cross-validation-register
   ngOnInit(): void {
-    // #docregion custom-validator
     this.heroForm = new FormGroup({
       'name': new FormControl(this.hero.name, [
         Validators.required,
         Validators.minLength(4),
-        forbiddenNameValidator(/bob/i) // <-- Here's how you pass in the custom validator.
+        forbiddenNameValidator(/bob/i)
       ]),
       'alterEgo': new FormControl(this.hero.alterEgo),
       'power': new FormControl(this.hero.power, Validators.required)
-    });
-    // #enddocregion custom-validator
+    },  { validators: identityRevealedValidator }); // <-- add custom validator at the FormGroup level
   }
+  // #enddocregion cross-validation-register
+  // #enddocregion cross-validation-component
 
   get name() { return this.heroForm.get('name'); }
 
   get power() { return this.heroForm.get('power'); }
-  // #enddocregion form-group
+// #docregion cross-validation-component
 }
-// #enddocregion
+// #enddocregion cross-validation-component
diff --git a/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts b/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
new file mode 100644
index 0000000000..4a57cd225e
--- /dev/null
+++ b/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
@@ -0,0 +1,28 @@
+// #docregion
+import { Directive } from '@angular/core';
+import { AbstractControl, FormGroup, NG_VALIDATORS, ValidationErrors, Validator, ValidatorFn } from '@angular/forms';
+
+// #docregion cross-validation-directive-with-validator
+// #docregion cross-validation-validator
+/** A hero's name can't match the hero's alter ego */
+export const identityRevealedValidator: ValidatorFn = (control: FormGroup): ValidationErrors | null => {
+  const name = control.get('name');
+  const alterEgo = control.get('alterEgo');
+
+  return name && alterEgo && name.value !== alterEgo.value ? null : { 'identityRevealed': { value: true } };
+};
+// #enddocregion cross-validation-validator
+
+// #docregion cross-validation-directive
+@Directive({
+  selector: '[appIdentityRevealed]',
+  providers: [{ provide: NG_VALIDATORS, useExisting: IdentityRevealedValidatorDirective, multi: true }]
+})
+export class IdentityRevealedValidatorDirective implements Validator {
+  validate(control: AbstractControl): ValidationErrors {
+    return identityRevealedValidator(control)
+  }
+}
+// #enddocregion cross-validation-directive
+// #enddocregion cross-validation-directive-with-validator
+
diff --git a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.css b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.css
new file mode 100644
index 0000000000..9699072894
--- /dev/null
+++ b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.css
@@ -0,0 +1,4 @@
+/* #docregion */
+.cross-validation-error input {
+  border-left: 5px solid red;
+}
\ No newline at end of file
diff --git a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
index c695abaa26..b60531ae1c 100644
--- a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
+++ b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
@@ -2,42 +2,71 @@
 <div class="container">
 
   <h1>Template-Driven Form</h1>
-  <!-- #docregion form-tag-->
-  <form #heroForm="ngForm">
-  <!-- #enddocregion form-tag-->
+  <!-- #docregion cross-validation -->
+  <!-- #docregion cross-validation-register-validator -->
+  <form #heroForm="ngForm" appIdentityRevealed>
+  <!-- #enddocregion cross-validation-register-validator -->
+  <!-- #enddocregion cross-validation -->
     <div [hidden]="heroForm.submitted">
+      <!-- #docregion cross-validation -->
+      <!-- #docregion cross-validation-error-class -->
+      <div class="cross-validation" [class.cross-validation-error]="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)">
+      <!-- #enddocregion cross-validation-error-class -->
+      <!-- #enddocregion cross-validation -->
+        <div class="form-group">
+          <label for="name">Name</label>
+          <!-- #docregion name-with-error-msg -->
+          <!-- #docregion name-input -->
+          <!-- #docregion cross-validation -->
+          <!-- #docregion cross-validation-error-class -->
+          <input id="name" name="name" class="form-control" 
+                required minlength="4" appForbiddenName="bob"
+                [(ngModel)]="hero.name" #name="ngModel" >
+          <!-- #enddocregion cross-validation-error-class-->
+          <!-- #enddocregion cross-validation-->
+          <!-- #enddocregion name-input -->
 
-      <div class="form-group">
-        <label for="name">Name</label>
-        <!-- #docregion name-with-error-msg -->
-        <!-- #docregion name-input -->
-        <input id="name" name="name" class="form-control"
-               required minlength="4" appForbiddenName="bob"
-               [(ngModel)]="hero.name" #name="ngModel" >
-        <!-- #enddocregion name-input -->
+          <div *ngIf="name.invalid && (name.dirty || name.touched)"
+              class="alert alert-danger">
 
-        <div *ngIf="name.invalid && (name.dirty || name.touched)"
-             class="alert alert-danger">
+            <div *ngIf="name.errors.required">
+              Name is required.
+            </div>
+            <div *ngIf="name.errors.minlength">
+              Name must be at least 4 characters long.
+            </div>
+            <div *ngIf="name.errors.forbiddenName">
+              Name cannot be Bob.
+            </div>
 
-          <div *ngIf="name.errors.required">
-            Name is required.
           </div>
-          <div *ngIf="name.errors.minlength">
-            Name must be at least 4 characters long.
-          </div>
-          <div *ngIf="name.errors.forbiddenName">
-            Name cannot be Bob.
-          </div>
-
+          <!-- #enddocregion name-with-error-msg -->
         </div>
-        <!-- #enddocregion name-with-error-msg -->
-      </div>
 
-      <div class="form-group">
-        <label for="alterEgo">Alter Ego</label>
-        <input id="alterEgo" class="form-control"
-               name="alterEgo" [(ngModel)]="hero.alterEgo" >
+        <div class="form-group">
+          <label for="alterEgo">Alter Ego</label>
+          <!-- #docregion cross-validation -->
+          <!-- #docregion cross-validation-error-class -->
+          <input id="alterEgo" class="form-control"
+                name="alterEgo" [(ngModel)]="hero.alterEgo" >
+          <!-- #enddocregion cross-validation-error-class -->
+          <!-- #enddocregion cross-validation -->
+        </div>
+
+        <!-- #docregion cross-validation -->
+        <!-- #docregion cross-validation-error-message -->
+        <div *ngIf="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)" class="cross-validation-error-message alert alert-danger">
+            Name cannot match alter ego.
+        </div>
+        <!-- #enddocregion cross-validation-error-message -->
+        <!-- #enddocregion cross-validation -->
+
+      <!-- #docregion cross-validation-->
+      <!-- #docregion cross-validation-error-class -->
       </div>
+      <!-- #enddocregion cross-validation-error-class -->
+      <!-- #enddocregion cross-validation -->
+
 
       <div class="form-group">
         <label for="power">Hero Power</label>
@@ -61,6 +90,9 @@
       <p>You've submitted your hero, {{ heroForm.value.name }}!</p>
       <button (click)="heroForm.resetForm({})">Add new hero</button>
     </div>
+
+  <!-- #docregion cross-validation -->
   </form>
+  <!-- #enddocregion cross-validation -->
 
 </div>
diff --git a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.ts b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.ts
index cc8bd0b30f..f1e88e92f6 100644
--- a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.ts
+++ b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.ts
@@ -3,9 +3,11 @@
 // #docregion
 import { Component } from '@angular/core';
 
+// #docregion component
 @Component({
   selector: 'app-hero-form-template',
-  templateUrl: './hero-form-template.component.html'
+  templateUrl: './hero-form-template.component.html',
+  styleUrls: ['./hero-form-template.component.css'],
 })
 export class HeroFormTemplateComponent {
 
@@ -14,3 +16,4 @@ export class HeroFormTemplateComponent {
   hero = {name: 'Dr.', alterEgo: 'Dr. What', power: this.powers[0]};
 
 }
+// #enddocregion
diff --git a/aio/content/examples/form-validation/stackblitz.json b/aio/content/examples/form-validation/stackblitz.json
index 4871b07c6e..80f399a6dd 100644
--- a/aio/content/examples/form-validation/stackblitz.json
+++ b/aio/content/examples/form-validation/stackblitz.json
@@ -2,6 +2,7 @@
   "description": "Validation",
   "files":[
     "!**/*.d.ts",
-    "!**/*.js"
+    "!**/*.js",
+    "!**/*.[1].*"
   ]
 }
diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index 6be1a0293a..c277b314e5 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -92,7 +92,7 @@ built-in validators&mdash;this time, in function form. See below:
 
 {@a reactive-component-class}
 
-<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="form-group" title="reactive/hero-form-reactive.component.ts (validator functions)" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.1.ts" region="form-group" title="reactive/hero-form-reactive.component.ts (validator functions)" linenums="false">
 </code-example>
 
 Note that:
@@ -148,7 +148,7 @@ at which point the form uses the last value emitted for validation.
 In reactive forms, custom validators are fairly simple to add. All you have to do is pass the function directly 
 to the `FormControl`.
 
-<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="custom-validator" title="reactive/hero-form-reactive.component.ts (validator functions)" linenums="false">
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.1.ts" region="custom-validator" title="reactive/hero-form-reactive.component.ts (validator functions)" linenums="false">
 </code-example>
 
 ### Adding to template-driven forms
@@ -208,5 +208,129 @@ set the color of each form control's border.
 
 </code-example>
 
+## Cross field validation 
+This section shows how to perform cross field validation. It assumes some basic knowledge of creating custom validators.
+
+<div class="l-sub-section">
+
+If you haven't created custom validators before, start by reviewing the [CustomValidators](guide/form-validation#custom-validators).
+
+</div>
+
+In the following section we will make sure that our heroes do not reveal their true identities by filling out the Hero Form. We will do that by validating that the hero names and alter egos do not match. The form has the following structure:
+
+```javascript
+const heroForm = new FormGroup({
+  'name': new FormControl(),
+  'alterEgo': new FormControl(),
+  'power': new FormControl()
+};
+```
+
+Notice that the `name` and `alterEgo` are sibling controls. To evaluate both controls in a single custom validator, we should perform the validation in the ancestor control. That way we can query the form tree for the child controls which will allow us to compare their values.
+
+```javascript
+const heroForm = new FormGroup({
+  'name': new FormControl(),
+  'alterEgo': new FormControl(), 
+  'power': new FormControl()   
+}, { validators: identityRevealedValidator });
+```
+
+The validator code is as follows:
+
+<code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-validator" title="shared/identity-revealed.directive.ts" linenums="false">
+</code-example>
+
+Identity validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or ValidationErrors otherwise.
+
+First we retrieve the child controls by calling the `FormGroup`'s [get](api/forms/AbstractControl#get) method. Then we simply compare the values of the `name` and `alterEgo` controls. 
+
+If the values do not match the hero's identity remains disguised, and we can safely return null. Otherwise, the hero's identity is revealed and we must mark the form as invalid by returning an error object.
+
+
+### Adding to reactive forms
+
+As with all reactive forms, the validator can be registered during the form creation. We make sure to register it at the `FormGroup` level, to give it access to the child controls.
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="cross-validation-register" title="reactive/hero-form-template.component.ts" linenums="false">
+</code-example>
+
+Next, to provide better user experience, we show an appropriate error message when the form is invalid.
+<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation-error-message" title="reactive/hero-form-template.component.html" linenums="false">
+</code-example>
+
+Note that we check if:
+- the `FormGroup` has the cross validation error returned by the `identityRevealed` validator, 
+- the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
+
+Finally, we want to style the `input` elements to give visual feedback about form control's validity. Unfortunately, the `identityRevealed` error is on the form group control (`heroForm`) and not on the child form controls (`name`, `alterEgo`). That means that the `<input formControlName="name" />` and `<input formControlName="alterEgo" />` will not have the `ng-invalid` class after the cross validation fails. 
+
+We can get around this problem by binding our own css class to the same expression that was used to show and hide the validation error message.
+
+<code-tabs linenums="false">
+  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation-error-class" title="reactive/hero-form-reactive.component.html" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.css" title="reactive/hero-form-reactive.component.css" linenums="false">
+  </code-pane>
+</code-tabs>
+
+Below you can inspect the cross validation example for the reactive forms. The example skips over the parts that are not related to cross validation to keep this section focused on a single task. You can see the complete code example at the end of this chapter.
+
+<code-tabs linenums="false">
+  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation" title="reactive/hero-form-reactive.component.html" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="cross-validation-component" title="reactive/hero-form-reactive.component.ts" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.css" title="reactive/hero-form-reactive.component.css" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/shared/identity-revealed.directive.ts" title="shared/identity-revealed.directive.ts" region="cross-validation-validator" linenums="false">
+  </code-pane>
+</code-tabs>
+
+### Adding to template driven forms
+First we must create a directive that will wrap the validator function. We provide it as the validator using the `NG_VALIDATORS` token. If you are not sure why, or you do not fully understand the syntax revisit the previous [section](guide/form-validation#adding-to-template-driven-forms).
+
+<code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-directive" title="shared/identity-revealed.directive.ts (directive)" linenums="false">
+</code-example>
+
+Next, we have to add the directive to the html template. Since the validator must be registered at the `FormGroup` level, we put the directive on the `form` tag.
+<code-example path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-register-validator" title="template/hero-form-template.component.html" linenums="false">
+</code-example>
+
+To provide better user experience, we show an appropriate error message when the form is invalid.
+<code-example path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-error-message" title="template/hero-form-template.component.html" linenums="false">
+</code-example>
+
+Note that we check if:
+- the `FormGroup` has the cross validation error returned by the `identityRevealed` validator, 
+- the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
+
+Finally, we want to style the `input` elements to give visual feedback about form control's validity. Unfortunately, the `identityRevealed` error is on the form group control (`heroForm`) and not on the child form controls (`name`, `alterEgo`). That means that the `<input [(ngModel)]="hero.name" />` and `<input [(ngModel)]="hero.alterEgo" />` will not have the `ng-invalid` class after the cross validation fails. 
+
+We can get around this problem by binding our own css class to the same expression that was used to show and hide the validation error message.
+
+<code-tabs linenums="false">
+  <code-pane path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-error-class" title="template/hero-form-template.component.html" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/template/hero-form-template.component.css" title="template/hero-form-template.component.css" linenums="false">
+  </code-pane>
+</code-tabs>
+
+Below you can inspect the cross validation example for the template-driven forms. The example skips over parts that are not related to cross validation to keep this section focused on a single task. You can see the complete code example at the end of this chapter.
+<code-tabs linenums="false">
+  <code-pane path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation" title="template/hero-form-template.component.html" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/template/hero-form-template.component.ts" region="component" title="template/hero-form-template.component.ts" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/template/hero-form-template.component.css" title="template/hero-form-template.component.css" linenums="false">
+  </code-pane>
+  <code-pane path="form-validation/src/app/shared/identity-revealed.directive.ts" title="shared/identity-revealed.directive.ts" region="cross-validation-directive-with-validator" linenums="false">
+  </code-pane>
+</code-tabs>
+
+This completes the cross validation example. We managed to:
+- validate the form based on the values of two sibling controls, 
+- show a descriptive error message after the user interacted with the form and the validation failed,
+- give visual feedback on the form validity.
 
 **You can run the <live-example></live-example> to see the complete reactive and template-driven example code.**

From 5feb9e193554f54969b9d3dbd693f79467972ff9 Mon Sep 17 00:00:00 2001
From: Tomasz Kula <tomaszkulawebdev@gmail.com>
Date: Mon, 4 Jun 2018 11:40:56 +0200
Subject: [PATCH 348/582] docs(aio): address pr review issues (#23743)

PR Close #23743
---
 .../hero-form-reactive.component.html         | 23 -----
 .../reactive/hero-form-reactive.component.ts  |  8 --
 .../app/shared/identity-revealed.directive.ts |  5 +-
 .../hero-form-template.component.html         | 26 ------
 aio/content/guide/form-validation.md          | 83 ++++---------------
 5 files changed, 18 insertions(+), 127 deletions(-)

diff --git a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
index 5edb6500f9..b1bc5a4150 100644
--- a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
+++ b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.html
@@ -3,27 +3,17 @@
 
   <h1>Reactive Form</h1>
 
-  <!-- #docregion cross-validation -->
   <form [formGroup]="heroForm" #formDir="ngForm">
-  <!-- #enddocregion cross-validation -->
 
     <div [hidden]="formDir.submitted">
 
-      <!-- #docregion cross-validation -->
-      <!-- #docregion cross-validation-error-class -->
       <div class="cross-validation" [class.cross-validation-error]="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)">
-      <!-- #enddocregion cross-validation-error-class -->
-      <!-- #enddocregion cross-validation -->
         <div class="form-group">
 
           <label for="name">Name</label>
           <!-- #docregion name-with-error-msg -->
-          <!-- #docregion cross-validation -->
-          <!-- #docregion cross-validation-error-class-->
           <input id="name" class="form-control"
                 formControlName="name" required >
-          <!-- #enddocregion cross-validation -->
-          <!-- #enddocregion cross-validation-error-class-->
 
           <div *ngIf="name.invalid && (name.dirty || name.touched)"
               class="alert alert-danger">
@@ -43,27 +33,16 @@
 
         <div class="form-group">
           <label for="alterEgo">Alter Ego</label>
-          <!-- #docregion cross-validation -->
-          <!-- #docregion cross-validation-error-class-->
           <input id="alterEgo" class="form-control"
               formControlName="alterEgo"  >
-          <!-- #enddocregion cross-validation -->
-          <!-- #enddocregion cross-validation-error-class -->
         </div>
 
         <!-- #docregion cross-validation-error-message -->
-        <!-- #docregion cross-validation -->
         <div *ngIf="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)" class="cross-validation-error-message alert alert-danger">
             Name cannot match alter ego.
         </div>
-        <!-- #enddocregion cross-validation -->
         <!-- #enddocregion cross-validation-error-message -->
-
-      <!-- #docregion cross-validation -->
-      <!-- #docregion cross-validation-error-class-->
       </div>
-      <!-- #enddocregion cross-validation -->
-      <!-- #enddocregion cross-validation-error-class -->
 
       <div class="form-group">
         <label for="power">Hero Power</label>
@@ -82,9 +61,7 @@
       <button type="button" class="btn btn-default"
              (click)="formDir.resetForm({})">Reset</button>
     </div>
-  <!-- #docregion cross-validation -->
   </form>
-  <!-- #enddocregion cross-validation -->
 
   <div class="submitted-message" *ngIf="formDir.submitted">
     <p>You've submitted your hero, {{ heroForm.value.name }}!</p>
diff --git a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
index 4b15c6053e..1c1956b51f 100644
--- a/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
+++ b/aio/content/examples/form-validation/src/app/reactive/hero-form-reactive.component.ts
@@ -5,23 +5,19 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { forbiddenNameValidator } from '../shared/forbidden-name.directive';
 import { identityRevealedValidator } from '../shared/identity-revealed.directive';
 
-// #docregion cross-validation-component
 @Component({
   selector: 'app-hero-form-reactive',
   templateUrl: './hero-form-reactive.component.html',
   styleUrls: ['./hero-form-reactive.component.css'],
 })
 export class HeroFormReactiveComponent implements OnInit {
-// #enddocregion cross-validation-component
 
   powers = ['Really Smart', 'Super Flexible', 'Weather Changer'];
 
   hero = { name: 'Dr.', alterEgo: 'Dr. What', power: this.powers[0] };
 
-  // #docregion cross-validation-component
   heroForm: FormGroup;
 
-  // #docregion cross-validation-register
   ngOnInit(): void {
     this.heroForm = new FormGroup({
       'name': new FormControl(this.hero.name, [
@@ -33,12 +29,8 @@ export class HeroFormReactiveComponent implements OnInit {
       'power': new FormControl(this.hero.power, Validators.required)
     },  { validators: identityRevealedValidator }); // <-- add custom validator at the FormGroup level
   }
-  // #enddocregion cross-validation-register
-  // #enddocregion cross-validation-component
 
   get name() { return this.heroForm.get('name'); }
 
   get power() { return this.heroForm.get('power'); }
-// #docregion cross-validation-component
 }
-// #enddocregion cross-validation-component
diff --git a/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts b/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
index 4a57cd225e..a5ae08d2ae 100644
--- a/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
+++ b/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
@@ -2,14 +2,13 @@
 import { Directive } from '@angular/core';
 import { AbstractControl, FormGroup, NG_VALIDATORS, ValidationErrors, Validator, ValidatorFn } from '@angular/forms';
 
-// #docregion cross-validation-directive-with-validator
 // #docregion cross-validation-validator
 /** A hero's name can't match the hero's alter ego */
 export const identityRevealedValidator: ValidatorFn = (control: FormGroup): ValidationErrors | null => {
   const name = control.get('name');
   const alterEgo = control.get('alterEgo');
 
-  return name && alterEgo && name.value !== alterEgo.value ? null : { 'identityRevealed': { value: true } };
+  return name && alterEgo && name.value !== alterEgo.value ? null : { 'identityRevealed': true };
 };
 // #enddocregion cross-validation-validator
 
@@ -24,5 +23,3 @@ export class IdentityRevealedValidatorDirective implements Validator {
   }
 }
 // #enddocregion cross-validation-directive
-// #enddocregion cross-validation-directive-with-validator
-
diff --git a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
index b60531ae1c..573fa060d4 100644
--- a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
+++ b/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
@@ -2,28 +2,18 @@
 <div class="container">
 
   <h1>Template-Driven Form</h1>
-  <!-- #docregion cross-validation -->
   <!-- #docregion cross-validation-register-validator -->
   <form #heroForm="ngForm" appIdentityRevealed>
   <!-- #enddocregion cross-validation-register-validator -->
-  <!-- #enddocregion cross-validation -->
     <div [hidden]="heroForm.submitted">
-      <!-- #docregion cross-validation -->
-      <!-- #docregion cross-validation-error-class -->
       <div class="cross-validation" [class.cross-validation-error]="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)">
-      <!-- #enddocregion cross-validation-error-class -->
-      <!-- #enddocregion cross-validation -->
         <div class="form-group">
           <label for="name">Name</label>
           <!-- #docregion name-with-error-msg -->
           <!-- #docregion name-input -->
-          <!-- #docregion cross-validation -->
-          <!-- #docregion cross-validation-error-class -->
           <input id="name" name="name" class="form-control" 
                 required minlength="4" appForbiddenName="bob"
                 [(ngModel)]="hero.name" #name="ngModel" >
-          <!-- #enddocregion cross-validation-error-class-->
-          <!-- #enddocregion cross-validation-->
           <!-- #enddocregion name-input -->
 
           <div *ngIf="name.invalid && (name.dirty || name.touched)"
@@ -45,28 +35,16 @@
 
         <div class="form-group">
           <label for="alterEgo">Alter Ego</label>
-          <!-- #docregion cross-validation -->
-          <!-- #docregion cross-validation-error-class -->
           <input id="alterEgo" class="form-control"
                 name="alterEgo" [(ngModel)]="hero.alterEgo" >
-          <!-- #enddocregion cross-validation-error-class -->
-          <!-- #enddocregion cross-validation -->
         </div>
 
-        <!-- #docregion cross-validation -->
         <!-- #docregion cross-validation-error-message -->
         <div *ngIf="heroForm.errors?.identityRevealed && (heroForm.touched || heroForm.dirty)" class="cross-validation-error-message alert alert-danger">
             Name cannot match alter ego.
         </div>
         <!-- #enddocregion cross-validation-error-message -->
-        <!-- #enddocregion cross-validation -->
-
-      <!-- #docregion cross-validation-->
-      <!-- #docregion cross-validation-error-class -->
       </div>
-      <!-- #enddocregion cross-validation-error-class -->
-      <!-- #enddocregion cross-validation -->
-
 
       <div class="form-group">
         <label for="power">Hero Power</label>
@@ -90,9 +68,5 @@
       <p>You've submitted your hero, {{ heroForm.value.name }}!</p>
       <button (click)="heroForm.resetForm({})">Add new hero</button>
     </div>
-
-  <!-- #docregion cross-validation -->
   </form>
-  <!-- #enddocregion cross-validation -->
-
 </div>
diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index c277b314e5..91c8991b18 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -213,27 +213,33 @@ This section shows how to perform cross field validation. It assumes some basic
 
 <div class="l-sub-section">
 
-If you haven't created custom validators before, start by reviewing the [CustomValidators](guide/form-validation#custom-validators).
+If you haven't created custom validators before, start by reviewing the [custom validators section](guide/form-validation#custom-validators).
 
 </div>
 
-In the following section we will make sure that our heroes do not reveal their true identities by filling out the Hero Form. We will do that by validating that the hero names and alter egos do not match. The form has the following structure:
+In the following section, we will make sure that our heroes do not reveal their true identities by filling out the Hero Form. We will do that by validating that the hero names and alter egos do not match. 
+
+### Adding to reactive forms
+
+The form has the following structure:
 
 ```javascript
 const heroForm = new FormGroup({
   'name': new FormControl(),
   'alterEgo': new FormControl(),
   'power': new FormControl()
-};
+});
 ```
 
-Notice that the `name` and `alterEgo` are sibling controls. To evaluate both controls in a single custom validator, we should perform the validation in the ancestor control. That way we can query the form tree for the child controls which will allow us to compare their values.
+Notice that the name and alterEgo are sibling controls. To evaluate both controls in a single custom validator, we should perform the validation in a common ancestor control: the FormGroup. That way, we can query the FormGroup for the child controls which will allow us to compare their values.
+
+To add a validator to the FormGroup, pass the new validator in as the second argument on creation.
 
 ```javascript
 const heroForm = new FormGroup({
   'name': new FormControl(),
-  'alterEgo': new FormControl(), 
-  'power': new FormControl()   
+  'alterEgo': new FormControl(),
+  'power': new FormControl()
 }, { validators: identityRevealedValidator });
 ```
 
@@ -242,18 +248,11 @@ The validator code is as follows:
 <code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-validator" title="shared/identity-revealed.directive.ts" linenums="false">
 </code-example>
 
-Identity validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or ValidationErrors otherwise.
+Identity validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or `ValidationErrors` otherwise.
 
 First we retrieve the child controls by calling the `FormGroup`'s [get](api/forms/AbstractControl#get) method. Then we simply compare the values of the `name` and `alterEgo` controls. 
 
-If the values do not match the hero's identity remains disguised, and we can safely return null. Otherwise, the hero's identity is revealed and we must mark the form as invalid by returning an error object.
-
-
-### Adding to reactive forms
-
-As with all reactive forms, the validator can be registered during the form creation. We make sure to register it at the `FormGroup` level, to give it access to the child controls.
-<code-example path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="cross-validation-register" title="reactive/hero-form-template.component.ts" linenums="false">
-</code-example>
+If the values do not match, the hero's identity remains secret, and we can safely return null. Otherwise, the hero's identity is revealed and we must mark the form as invalid by returning an error object.
 
 Next, to provide better user experience, we show an appropriate error message when the form is invalid.
 <code-example path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation-error-message" title="reactive/hero-form-template.component.html" linenums="false">
@@ -263,34 +262,10 @@ Note that we check if:
 - the `FormGroup` has the cross validation error returned by the `identityRevealed` validator, 
 - the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
 
-Finally, we want to style the `input` elements to give visual feedback about form control's validity. Unfortunately, the `identityRevealed` error is on the form group control (`heroForm`) and not on the child form controls (`name`, `alterEgo`). That means that the `<input formControlName="name" />` and `<input formControlName="alterEgo" />` will not have the `ng-invalid` class after the cross validation fails. 
-
-We can get around this problem by binding our own css class to the same expression that was used to show and hide the validation error message.
-
-<code-tabs linenums="false">
-  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation-error-class" title="reactive/hero-form-reactive.component.html" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.css" title="reactive/hero-form-reactive.component.css" linenums="false">
-  </code-pane>
-</code-tabs>
-
-Below you can inspect the cross validation example for the reactive forms. The example skips over the parts that are not related to cross validation to keep this section focused on a single task. You can see the complete code example at the end of this chapter.
-
-<code-tabs linenums="false">
-  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation" title="reactive/hero-form-reactive.component.html" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.ts" region="cross-validation-component" title="reactive/hero-form-reactive.component.ts" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/reactive/hero-form-reactive.component.css" title="reactive/hero-form-reactive.component.css" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/shared/identity-revealed.directive.ts" title="shared/identity-revealed.directive.ts" region="cross-validation-validator" linenums="false">
-  </code-pane>
-</code-tabs>
-
 ### Adding to template driven forms
-First we must create a directive that will wrap the validator function. We provide it as the validator using the `NG_VALIDATORS` token. If you are not sure why, or you do not fully understand the syntax revisit the previous [section](guide/form-validation#adding-to-template-driven-forms).
+First we must create a directive that will wrap the validator function. We provide it as the validator using the `NG_VALIDATORS` token. If you are not sure why, or you do not fully understand the syntax, revisit the previous [section](guide/form-validation#adding-to-template-driven-forms).
 
-<code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-directive" title="shared/identity-revealed.directive.ts (directive)" linenums="false">
+<code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-directive" title="shared/identity-revealed.directive.ts" linenums="false">
 </code-example>
 
 Next, we have to add the directive to the html template. Since the validator must be registered at the `FormGroup` level, we put the directive on the `form` tag.
@@ -305,32 +280,8 @@ Note that we check if:
 - the `FormGroup` has the cross validation error returned by the `identityRevealed` validator, 
 - the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
 
-Finally, we want to style the `input` elements to give visual feedback about form control's validity. Unfortunately, the `identityRevealed` error is on the form group control (`heroForm`) and not on the child form controls (`name`, `alterEgo`). That means that the `<input [(ngModel)]="hero.name" />` and `<input [(ngModel)]="hero.alterEgo" />` will not have the `ng-invalid` class after the cross validation fails. 
-
-We can get around this problem by binding our own css class to the same expression that was used to show and hide the validation error message.
-
-<code-tabs linenums="false">
-  <code-pane path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-error-class" title="template/hero-form-template.component.html" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/template/hero-form-template.component.css" title="template/hero-form-template.component.css" linenums="false">
-  </code-pane>
-</code-tabs>
-
-Below you can inspect the cross validation example for the template-driven forms. The example skips over parts that are not related to cross validation to keep this section focused on a single task. You can see the complete code example at the end of this chapter.
-<code-tabs linenums="false">
-  <code-pane path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation" title="template/hero-form-template.component.html" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/template/hero-form-template.component.ts" region="component" title="template/hero-form-template.component.ts" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/template/hero-form-template.component.css" title="template/hero-form-template.component.css" linenums="false">
-  </code-pane>
-  <code-pane path="form-validation/src/app/shared/identity-revealed.directive.ts" title="shared/identity-revealed.directive.ts" region="cross-validation-directive-with-validator" linenums="false">
-  </code-pane>
-</code-tabs>
-
 This completes the cross validation example. We managed to:
 - validate the form based on the values of two sibling controls, 
-- show a descriptive error message after the user interacted with the form and the validation failed,
-- give visual feedback on the form validity.
+- show a descriptive error message after the user interacted with the form and the validation failed.
 
 **You can run the <live-example></live-example> to see the complete reactive and template-driven example code.**

From 49e900d6fcd43850d96d9c7637f356c29334adda Mon Sep 17 00:00:00 2001
From: Tomasz Kula <tomaszkulawebdev@gmail.com>
Date: Wed, 6 Jun 2018 10:09:52 +0200
Subject: [PATCH 349/582] docs(aio): fix issues suggested by Kara (#23743)

PR Close #23743
---
 .../src/app/shared/identity-revealed.directive.ts           | 2 +-
 aio/content/guide/form-validation.md                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts b/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
index a5ae08d2ae..b5dbd05c15 100644
--- a/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
+++ b/aio/content/examples/form-validation/src/app/shared/identity-revealed.directive.ts
@@ -8,7 +8,7 @@ export const identityRevealedValidator: ValidatorFn = (control: FormGroup): Vali
   const name = control.get('name');
   const alterEgo = control.get('alterEgo');
 
-  return name && alterEgo && name.value !== alterEgo.value ? null : { 'identityRevealed': true };
+  return name && alterEgo && name.value === alterEgo.value ? { 'identityRevealed': true } : null;
 };
 // #enddocregion cross-validation-validator
 
diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index 91c8991b18..3c27230cf8 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -231,9 +231,9 @@ const heroForm = new FormGroup({
 });
 ```
 
-Notice that the name and alterEgo are sibling controls. To evaluate both controls in a single custom validator, we should perform the validation in a common ancestor control: the FormGroup. That way, we can query the FormGroup for the child controls which will allow us to compare their values.
+Notice that the name and alterEgo are sibling controls. To evaluate both controls in a single custom validator, we should perform the validation in a common ancestor control: the `FormGroup`. That way, we can query the `FormGroup` for the child controls which will allow us to compare their values.
 
-To add a validator to the FormGroup, pass the new validator in as the second argument on creation.
+To add a validator to the `FormGroup`, pass the new validator in as the second argument on creation.
 
 ```javascript
 const heroForm = new FormGroup({
@@ -248,7 +248,7 @@ The validator code is as follows:
 <code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-validator" title="shared/identity-revealed.directive.ts" linenums="false">
 </code-example>
 
-Identity validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or `ValidationErrors` otherwise.
+The identity validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or `ValidationErrors` otherwise.
 
 First we retrieve the child controls by calling the `FormGroup`'s [get](api/forms/AbstractControl#get) method. Then we simply compare the values of the `name` and `alterEgo` controls. 
 

From 7d6e833a6f19a444ed5b1c2f3e4affac43e1e37f Mon Sep 17 00:00:00 2001
From: Tomasz Kula <tomaszkulawebdev@gmail.com>
Date: Wed, 6 Jun 2018 10:17:47 +0200
Subject: [PATCH 350/582] docs(aio): fix issues suggested by Brandon (#23743)

PR Close #23743
---
 aio/content/guide/form-validation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index 3c27230cf8..94f1e3ff05 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -277,7 +277,7 @@ To provide better user experience, we show an appropriate error message when the
 </code-example>
 
 Note that we check if:
-- the `FormGroup` has the cross validation error returned by the `identityRevealed` validator, 
+- the form has the cross validation error returned by the `identityRevealed` validator, 
 - the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
 
 This completes the cross validation example. We managed to:

From 5c0e681bf30121e7efec5304dd14d3e7e94ba6db Mon Sep 17 00:00:00 2001
From: Tomasz Kula <tomaszkulawebdev@gmail.com>
Date: Mon, 11 Jun 2018 14:27:54 +0200
Subject: [PATCH 351/582] docs(aio): fix adding to template driven forms
 (#23743)

PR Close #23743
---
 aio/content/guide/form-validation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index 94f1e3ff05..5f006b61ca 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -268,7 +268,7 @@ First we must create a directive that will wrap the validator function. We provi
 <code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-directive" title="shared/identity-revealed.directive.ts" linenums="false">
 </code-example>
 
-Next, we have to add the directive to the html template. Since the validator must be registered at the `FormGroup` level, we put the directive on the `form` tag.
+Next, we have to add the directive to the html template. Since the validator must be registered at the highest level in the form, we put the directive on the `form` tag.
 <code-example path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-register-validator" title="template/hero-form-template.component.html" linenums="false">
 </code-example>
 

From fe8fcc834ce8d12821788e4f710f3c5255edeab9 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 26 Jun 2018 11:39:56 -0700
Subject: [PATCH 352/582] refactor(ivy): remove dynamicParent from LNode
 (#24678)

PR Close #24678
---
 packages/core/src/render3/di.ts               | 11 ++---
 packages/core/src/render3/i18n.ts             |  1 -
 packages/core/src/render3/instructions.ts     | 14 ++----
 packages/core/src/render3/interfaces/node.ts  |  7 ---
 packages/core/src/render3/interfaces/view.ts  | 17 +++++--
 .../core/src/render3/node_manipulation.ts     | 45 +++++++++++-------
 .../hello_world/bundle.golden_symbols.json    |  3 ++
 .../bundling/todo/bundle.golden_symbols.json  |  3 ++
 .../test/render3/view_container_ref_spec.ts   | 46 +++++++++++++++----
 9 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 33d7eb5971..63a28cddd8 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -23,7 +23,7 @@ import {addToViewTree, assertPreviousIsParent, createEmbeddedViewNode, createLCo
 import {VIEWS} from './interfaces/container';
 import {ComponentTemplate, DirectiveDefInternal, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
-import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TNodeFlags, TNodeType} from './interfaces/node';
+import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TContainerNode, TElementNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
 import {Renderer3} from './interfaces/renderer';
 import {DIRECTIVES, HOST_NODE, INJECTOR, LViewData, QUERIES, RENDERER, TVIEW, TView} from './interfaces/view';
@@ -583,14 +583,14 @@ export function getOrCreateContainerRef(di: LInjector): viewEngine_ViewContainer
       lContainerNode.queries = vcRefHost.queries.container();
     }
 
-    const hostTNode = vcRefHost.tNode;
+    const hostTNode = vcRefHost.tNode as TElementNode | TContainerNode;
     if (!hostTNode.dynamicContainerNode) {
-      hostTNode.dynamicContainerNode = createTNode(TNodeType.Container, -1, null, null, null, null);
+      hostTNode.dynamicContainerNode =
+          createTNode(TNodeType.Container, -1, null, null, hostTNode, null);
     }
 
     lContainerNode.tNode = hostTNode.dynamicContainerNode;
     vcRefHost.dynamicLContainerNode = lContainerNode;
-    lContainerNode.dynamicParent = vcRefHost;
 
     addToViewTree(vcRefHost.view, hostTNode.index as number, lContainer);
 
@@ -653,7 +653,6 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
     const lViewNode = (viewRef as EmbeddedViewRef<any>)._lViewNode;
     const adjustedIdx = this._adjustIndex(index);
 
-    lViewNode.dynamicParent = this._lContainerNode;
     insertView(this._lContainerNode, lViewNode, adjustedIdx);
     const views = this._lContainerNode.data[VIEWS];
     const beforeNode = adjustedIdx + 1 < views.length ?
@@ -685,7 +684,6 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
   detach(index?: number): viewEngine_ViewRef|null {
     const adjustedIdx = this._adjustIndex(index, -1);
     const lViewNode = detachView(this._lContainerNode, adjustedIdx);
-    lViewNode.dynamicParent = null;
     return this._viewRefs.splice(adjustedIdx, 1)[0] || null;
   }
 
@@ -735,7 +733,6 @@ class TemplateRef<T> implements viewEngine_TemplateRef<T> {
       viewEngine_EmbeddedViewRef<T> {
     const viewNode = createEmbeddedViewNode(this._tView, context, this._renderer, this._queries);
     if (containerNode) {
-      viewNode.dynamicParent = containerNode;
       insertView(containerNode, viewNode, index !);
     }
     renderEmbeddedTemplate(viewNode, this._tView, context, RenderFlags.Create);
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index f8eed32174..67c1e7d1ed 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -301,7 +301,6 @@ export function i18nApply(startIndex: number, instructions: I18nInstruction[]):
         // But since this text doesn't have an index in `LViewData`, we need to create an
         // `LElementNode` with the index -1 so that it isn't saved in `LViewData`
         const textLNode = createLNode(-1, TNodeType.Element, textRNode, null, null);
-        textLNode.dynamicParent = localParentNode as LElementNode | LContainerNode;
         localPreviousNode = appendI18nNode(textLNode, localParentNode, localPreviousNode);
         break;
       case I18nInstructions.CloseNode:
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index f4684373b8..a7c73c9185 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -17,7 +17,7 @@ import {ACTIVE_INDEX, LContainer, RENDER_PARENT, VIEWS} from './interfaces/conta
 import {LInjector} from './interfaces/injector';
 import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
-import {BINDING_INDEX, CLEANUP, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView} from './interfaces/view';
+import {BINDING_INDEX, CLEANUP, CONTAINER_INDEX, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView} from './interfaces/view';
 
 import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
@@ -303,7 +303,8 @@ export function createLViewData<T>(
     viewData && viewData[INJECTOR],                                              // injector
     renderer,                                                                    // renderer
     sanitizer || null,                                                           // sanitizer
-    null                                                                         // tail
+    null,                                                                        // tail
+    -1                                                                           // containerIndex
   ];
 }
 
@@ -325,7 +326,6 @@ export function createLNodeObject(
     tNode: null !,
     pNextOrParent: null,
     dynamicLContainerNode: null,
-    dynamicParent: null,
     pChild: null,
   };
 }
@@ -1783,14 +1783,10 @@ export function embeddedViewStart(viewBlockId: number): RenderFlags {
     enterView(
         newView, viewNode = createLNode(viewBlockId, TNodeType.View, null, null, null, newView));
   }
-  const containerNode = getParentLNode(viewNode) as LContainerNode;
-  if (containerNode) {
-    ngDevMode && assertNodeType(viewNode, TNodeType.View);
-    ngDevMode && assertNodeType(containerNode, TNodeType.Container);
-    const lContainer = containerNode.data;
+  if (container) {
     if (creationMode) {
       // it is a new view, insert it into collection of views for a given container
-      insertView(containerNode, viewNode, lContainer[ACTIVE_INDEX] !);
+      insertView(container, viewNode, lContainer[ACTIVE_INDEX] !);
     }
     lContainer[ACTIVE_INDEX] !++;
   }
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 7559a67f83..f75ca24ce1 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -118,12 +118,6 @@ export interface LNode {
    */
   // TODO(kara): Remove when removing LNodes
   dynamicLContainerNode: LContainerNode|null;
-
-  /**
-   * A pointer to a parent LNode created dynamically and virtually by directives requesting
-   * ViewContainerRef. Applicable only to LContainerNode and LViewNode.
-   */
-  dynamicParent: LElementNode|LContainerNode|LViewNode|null;
 }
 
 
@@ -142,7 +136,6 @@ export interface LTextNode extends LNode {
   native: RText;
   readonly data: null;
   dynamicLContainerNode: null;
-  dynamicParent: null;
 }
 
 /** Abstract node which contains root nodes of a view. */
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index a98e10dd6b..6a68e87f7e 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -11,12 +11,12 @@ import {Sanitizer} from '../../sanitization/security';
 
 import {LContainer} from './container';
 import {ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefList, PipeDef, PipeDefList} from './definition';
-import {LElementNode, LViewNode, TNode} from './node';
+import {LContainerNode, LElementNode, LViewNode, TNode} from './node';
 import {LQueries} from './query';
 import {Renderer3} from './renderer';
 
 /** Size of LViewData's header. Necessary to adjust for it when setting slots.  */
-export const HEADER_OFFSET = 14;
+export const HEADER_OFFSET = 15;
 
 // Below are constants for LViewData indices to help us look up LViewData members
 // without having to remember the specific indices.
@@ -35,6 +35,7 @@ export const INJECTOR = 10;
 export const RENDERER = 11;
 export const SANITIZER = 12;
 export const TAIL = 13;
+export const CONTAINER_INDEX = 14;
 
 /**
  * `LViewData` stores all of the information needed to process the instructions as
@@ -122,7 +123,7 @@ export interface LViewData extends Array<any> {
    * - For embedded views, the context with which to render the template.
    * - For root view of the root component the context contains change detection data.
    * - `null` otherwise.
-  */
+   */
   [CONTEXT]: {}|RootContext|null;
 
   /** An optional Module Injector to be used as fall back after Element Injectors are consulted. */
@@ -142,6 +143,16 @@ export interface LViewData extends Array<any> {
    */
   // TODO: replace with global
   [TAIL]: LViewData|LContainer|null;
+
+  /**
+   * The index of the parent container's host node. Applicable only to embedded views that
+   * have been inserted dynamically. Will be -1 for component views and inline views.
+   *
+   * This is necessary to jump from dynamically created embedded views to their parent
+   * containers because their parent cannot be stored on the TViewNode (views may be inserted
+   * in multiple containers, so the parent cannot be shared between view instances).
+   */
+  [CONTAINER_INDEX]: number;
 }
 
 /** Flags associated with an LView (saved in LViewData[FLAGS]) */
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 58a19e1965..9f64c77d4a 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -11,7 +11,7 @@ import {LContainer, RENDER_PARENT, VIEWS, unusedValueExportToPlacateAjd as unuse
 import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
-import {CLEANUP, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
+import {CLEANUP, CONTAINER_INDEX, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {stringify} from './util';
 
@@ -45,9 +45,11 @@ export function getParentLNode(node: LContainerNode | LElementNode | LTextNode |
 export function getParentLNode(node: LViewNode): LContainerNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null;
 export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNode|null {
-  if (node.tNode.index === -1) {
-    // This is a dynamic container or an embedded view inside a dynamic container.
-    return node.dynamicParent;
+  if (node.tNode.index === -1 && node.tNode.type === TNodeType.View) {
+    // This is a dynamically created view inside a dynamic container.
+    // If the host index is -1, the view has not yet been inserted, so it has no parent.
+    const containerHostIndex = (node.data as LViewData)[CONTAINER_INDEX];
+    return containerHostIndex === -1 ? null : node.view[containerHostIndex].dynamicLContainerNode;
   }
   const parent = node.tNode.parent;
   return parent ? node.view[parent.index] : node.view[HOST_NODE];
@@ -293,28 +295,35 @@ export function insertView(
     container: LContainerNode, viewNode: LViewNode, index: number): LViewNode {
   const state = container.data;
   const views = state[VIEWS];
+  const lView = viewNode.data as LViewData;
 
   if (index > 0) {
     // This is a new view, we need to add it to the children.
-    views[index - 1].data[NEXT] = viewNode.data as LViewData;
+    views[index - 1].data[NEXT] = lView;
   }
 
   if (index < views.length) {
-    viewNode.data[NEXT] = views[index].data;
+    lView[NEXT] = views[index].data;
     views.splice(index, 0, viewNode);
   } else {
     views.push(viewNode);
-    viewNode.data[NEXT] = null;
+    lView[NEXT] = null;
+  }
+
+  // Dynamically inserted views need a reference to their parent container'S host so it's
+  // possible to jump from a view to its container's next when walking the node tree.
+  if (viewNode.tNode.index === -1) {
+    lView[CONTAINER_INDEX] = container.tNode.parent !.index;
+    (viewNode as{view: LViewData}).view = container.view;
   }
 
   // Notify query that a new view has been added
-  const lView = viewNode.data;
   if (lView[QUERIES]) {
     lView[QUERIES] !.insertView(index);
   }
 
   // Sets the attached flag
-  viewNode.data[FLAGS] |= LViewFlags.Attached;
+  lView[FLAGS] |= LViewFlags.Attached;
 
   return viewNode;
 }
@@ -340,10 +349,12 @@ export function detachView(container: LContainerNode, removeIndex: number): LVie
     addRemoveViewFromContainer(container, viewNode, false);
   }
   // Notify query that view has been removed
-  const removedLview = viewNode.data;
-  if (removedLview[QUERIES]) {
-    removedLview[QUERIES] !.removeView();
+  const removedLView = viewNode.data;
+  if (removedLView[QUERIES]) {
+    removedLView[QUERIES] !.removeView();
   }
+  removedLView[CONTAINER_INDEX] = -1;
+  (viewNode as{view: LViewData | null}).view = null;
   // Unsets the attached flag
   viewNode.data[FLAGS] &= ~LViewFlags.Attached;
   return viewNode;
@@ -476,14 +487,14 @@ function executePipeOnDestroys(viewData: LViewData): void {
 
 /**
  * Returns whether a native element can be inserted into the given parent.
- * 
+ *
  * There are two reasons why we may not be able to insert a element immediately.
- * - Projection: When creating a child content element of a component, we have to skip the 
+ * - Projection: When creating a child content element of a component, we have to skip the
  *   insertion because the content of a component will be projected.
  *   `<component><content>delayed due to projection</content></component>`
- * - Parent container is disconnected: This can happen when we are inserting a view into 
- *   parent container, which itself is disconnected. For example the parent container is part 
- *   of a View which has not be inserted or is mare for projection but has not been inserted 
+ * - Parent container is disconnected: This can happen when we are inserting a view into
+ *   parent container, which itself is disconnected. For example the parent container is part
+ *   of a View which has not be inserted or is mare for projection but has not been inserted
  *   into destination.
  *
 
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 231741d6aa..9c25ff15c7 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -8,6 +8,9 @@
   {
     "name": "CLEAN_PROMISE"
   },
+  {
+    "name": "CONTAINER_INDEX"
+  },
   {
     "name": "CONTEXT"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 9a7455412e..6d08095b91 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -17,6 +17,9 @@
   {
     "name": "CLEAN_PROMISE"
   },
+  {
+    "name": "CONTAINER_INDEX"
+  },
   {
     "name": "CONTEXT"
   },
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 4031992eb8..0285415566 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -14,7 +14,7 @@ import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {pipe, pipeBind1} from '../../src/render3/pipe';
 
 import {getRendererFactory2} from './imported_renderer2';
-import {ComponentFixture, TemplateFixture} from './render_util';
+import {ComponentFixture, TemplateFixture, createComponent} from './render_util';
 
 describe('ViewContainerRef', () => {
   let directiveInstance: DirectiveWithVCRef|null;
@@ -101,14 +101,8 @@ describe('ViewContainerRef', () => {
       });
 
       it('should work on components', () => {
-        class HeaderComponent {
-          static ngComponentDef = defineComponent({
-            type: HeaderComponent,
-            selectors: [['header-cmp']],
-            factory: () => new HeaderComponent(),
-            template: (rf: RenderFlags, cmp: HeaderComponent) => {}
-          });
-        }
+        const HeaderComponent =
+            createComponent('header-cmp', function(rf: RenderFlags, ctx: any) {});
 
         function createTemplate() {
           container(0, embeddedTemplate);
@@ -139,6 +133,38 @@ describe('ViewContainerRef', () => {
         expect(() => { createView('Z', 5); }).toThrow();
       });
 
+      it('should work with multiple instances with vcrefs', () => {
+        let firstDir: DirectiveWithVCRef;
+        let secondDir: DirectiveWithVCRef;
+
+        function createTemplate() {
+          container(0, embeddedTemplate);
+          elementStart(1, 'div', ['vcref', '']);
+          elementEnd();
+          elementStart(2, 'div', ['vcref', '']);
+          elementEnd();
+
+          // for testing only:
+          firstDir = loadDirective(0);
+          secondDir = loadDirective(1);
+        }
+
+        function update() {
+          // Hack until we can create local refs to templates
+          const tplRef = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(0)));
+          elementProperty(1, 'tplRef', bind(tplRef));
+          elementProperty(2, 'tplRef', bind(tplRef));
+        }
+
+        const fixture = new TemplateFixture(createTemplate, update, [DirectiveWithVCRef]);
+        expect(fixture.html).toEqual('<div vcref=""></div><div vcref=""></div>');
+
+        firstDir !.vcref.createEmbeddedView(firstDir !.tplRef, {name: 'A'});
+        secondDir !.vcref.createEmbeddedView(secondDir !.tplRef, {name: 'B'});
+        fixture.update();
+        expect(fixture.html).toEqual('<div vcref=""></div>A<div vcref=""></div>B');
+      });
+
       it('should work on containers', () => {
         function createTemplate() {
           container(0, embeddedTemplate, undefined, ['vcref', '']);
@@ -277,7 +303,7 @@ describe('ViewContainerRef', () => {
 
            /**
             * before|
-            * <ng-template directive>A<ng-template>
+            * <ng-template testDir>A<ng-template>
             * % if (condition) {
             *  B
             * % }

From 50fb13fb09187dbdf2cb18963fdc3cee60044a8e Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 26 Jun 2018 14:19:00 +0200
Subject: [PATCH 353/582] fix(ivy): report results to appropriate content
 queries (#24673)

PR Close #24673
---
 packages/core/src/render3/instructions.ts     |  12 +-
 packages/core/src/render3/interfaces/query.ts |   9 +-
 packages/core/src/render3/query.ts            |   4 +-
 packages/core/test/render3/query_spec.ts      | 136 ++++++++++++++++++
 4 files changed, 157 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a7c73c9185..c0d357a861 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -127,9 +127,19 @@ let tView: TView;
 
 let currentQueries: LQueries|null;
 
+/**
+ * Query instructions can ask for "current queries" in 2 different cases:
+ * - when creating view queries (at the root of a component view, before any node is created - in
+ * this case currentQueries points to view queries)
+ * - when creating content queries (inb this previousOrParentNode points to a node on which we
+ * create content queries).
+ */
 export function getCurrentQueries(QueryType: {new (): LQueries}): LQueries {
   // top level variables should not be exported for performance reasons (PERF_NOTES.md)
-  return currentQueries || (currentQueries = (previousOrParentNode.queries || new QueryType()));
+  return currentQueries ||
+      (currentQueries =
+           (previousOrParentNode.queries && previousOrParentNode.queries.clone() ||
+            new QueryType()));
 }
 
 /**
diff --git a/packages/core/src/render3/interfaces/query.ts b/packages/core/src/render3/interfaces/query.ts
index 331b3be81f..aa0e40b289 100644
--- a/packages/core/src/render3/interfaces/query.ts
+++ b/packages/core/src/render3/interfaces/query.ts
@@ -13,7 +13,14 @@ import {LNode} from './node';
 /** Used for tracking queries (e.g. ViewChild, ContentChild). */
 export interface LQueries {
   /**
-   * Used to ask querieis if those should be cloned to the child element.
+   * Ask queries to prepare copy of itself. This assures that tracking new queries on child nodes
+   * doesn't mutate list of queries tracked on a parent node. We will clone LQueries before
+   * constructing content queries.
+   */
+  clone(): LQueries|null;
+
+  /**
+   * Used to ask queries if those should be cloned to the child element.
    *
    * For example in the case of deep queries the `child()` returns
    * queries for the child node. In case of shallow queries it returns
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 1ec3ed22ee..5242b7dd2d 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -94,8 +94,6 @@ export class LQueries_ implements LQueries {
   track<T>(
       queryList: viewEngine_QueryList<T>, predicate: Type<T>|string[], descend?: boolean,
       read?: QueryReadType<T>|Type<T>): void {
-    // TODO(misko): This is not right. In case of inherited state, a calling track will incorrectly
-    // mutate parent.
     if (descend) {
       this.deep = createQuery(this.deep, queryList, predicate, read != null ? read : null);
     } else {
@@ -103,6 +101,8 @@ export class LQueries_ implements LQueries {
     }
   }
 
+  clone(): LQueries|null { return this.deep ? new LQueries_(this.deep) : null; }
+
   child(): LQueries|null {
     if (this.deep === null) {
       // if we don't have any deep queries then no need to track anything more.
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 537f1b0b1d..1a98c2f9a4 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -1752,5 +1752,141 @@ describe('query', () => {
       expect(viewQList.last.nativeElement.id).toBe('after');
     });
 
+    it('should report results to appropriate queries where content queries are nested', () => {
+
+      class QueryDirective {
+        fooBars: any;
+        static ngDirectiveDef = defineDirective({
+          type: QueryDirective,
+          selectors: [['', 'query', '']],
+          exportAs: 'query',
+          factory: () => {
+            // @ContentChildren('foo, bar, baz', {descendants: true}) fooBars:
+            // QueryList<ElementRef>;
+            return [
+              new QueryDirective(), query(null, ['foo', 'bar', 'baz'], true, QUERY_READ_FROM_NODE)
+            ];
+          },
+          hostBindings: function ContentQueryComponent_HostBindings(
+              dirIndex: number, elIndex: number) {
+            let tmp: any;
+            const instance = loadDirective<any[]>(dirIndex)[0];
+            queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
+                (instance.fooBars = tmp as QueryList<any>);
+          },
+        });
+      }
+
+      let outInstance: QueryDirective;
+      let inInstance: QueryDirective;
+
+      const AppComponent = createComponent(
+          'app-component',
+          /**
+           * <div query #out="query">
+           *   <span #foo></span>
+           *   <div query #in="query">
+           *     <span #bar></span>
+           *   </div>
+           *   <span #baz></span>
+           * </div>
+           */
+          function(rf: RenderFlags, ctx: any) {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'div', [AttributeMarker.SelectOnly, 'query'], ['out', 'query']);
+              {
+                element(2, 'span', ['id', 'foo'], ['foo', '']);
+                elementStart(4, 'div', [AttributeMarker.SelectOnly, 'query'], ['in', 'query']);
+                { element(6, 'span', ['id', 'bar'], ['bar', '']); }
+                elementEnd();
+                element(8, 'span', ['id', 'baz'], ['baz', '']);
+              }
+              elementEnd();
+            }
+            if (rf & RenderFlags.Update) {
+              outInstance = (<any>load(1))[0] as QueryDirective;
+              inInstance = (<any>load(5))[0] as QueryDirective;
+            }
+          },
+          [QueryDirective]);
+
+      const fixture = new ComponentFixture(AppComponent);
+      expect(outInstance !.fooBars.length).toBe(3);
+      expect(inInstance !.fooBars.length).toBe(1);
+    });
+
+    it('should respect shallow flag on content queries when mixing deep and shallow queries',
+       () => {
+         class ShallowQueryDirective {
+           foos: any;
+           static ngDirectiveDef = defineDirective({
+             type: ShallowQueryDirective,
+             selectors: [['', 'shallow-query', '']],
+             exportAs: 'shallow-query',
+             factory: () => {
+               // @ContentChildren('foo', {descendants: false}) fooBars: QueryList<ElementRef>;
+               return [
+                 new ShallowQueryDirective(), query(null, ['foo'], false, QUERY_READ_FROM_NODE)
+               ];
+             },
+             hostBindings: function ContentQueryComponent_HostBindings(
+                 dirIndex: number, elIndex: number) {
+               let tmp: any;
+               const instance = loadDirective<any[]>(dirIndex)[0];
+               queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
+                   (instance.foos = tmp as QueryList<any>);
+             },
+           });
+         }
+
+         class DeepQueryDirective {
+           foos: any;
+           static ngDirectiveDef = defineDirective({
+             type: DeepQueryDirective,
+             selectors: [['', 'deep-query', '']],
+             exportAs: 'deep-query',
+             factory: () => {
+               // @ContentChildren('foo', {descendants: true}) fooBars: QueryList<ElementRef>;
+               return [new DeepQueryDirective(), query(null, ['foo'], true, QUERY_READ_FROM_NODE)];
+             },
+             hostBindings: function ContentQueryComponent_HostBindings(
+                 dirIndex: number, elIndex: number) {
+               let tmp: any;
+               const instance = loadDirective<any[]>(dirIndex)[0];
+               queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
+                   (instance.foos = tmp as QueryList<any>);
+             },
+           });
+         }
+
+         let shallowInstance: ShallowQueryDirective;
+         let deepInstance: DeepQueryDirective;
+
+         const AppComponent = createComponent(
+             'app-component',
+             /**
+              * <div shallow-query #shallow="shallow-query" deep-query #deep="deep-query">
+               *   <span #foo></span>
+              * </div>
+              */
+             function(rf: RenderFlags, ctx: any) {
+               if (rf & RenderFlags.Create) {
+                 elementStart(
+                     0, 'div', [AttributeMarker.SelectOnly, 'shallow-query', 'deep-query'],
+                     ['shallow', 'shallow-query', 'deep', 'deep-query']);
+                 { element(3, 'span', ['id', 'foo'], ['foo', '']); }
+                 elementEnd();
+               }
+               if (rf & RenderFlags.Update) {
+                 shallowInstance = (<any>load(1))[0] as ShallowQueryDirective;
+                 deepInstance = (<any>load(2))[0] as DeepQueryDirective;
+               }
+             },
+             [ShallowQueryDirective, DeepQueryDirective]);
+
+         const fixture = new ComponentFixture(AppComponent);
+         expect(shallowInstance !.foos.length).toBe(1);
+         expect(deepInstance !.foos.length).toBe(1);
+       });
   });
 });

From 6d68f3e39af34c1c2ec55f5c88ada23162532c02 Mon Sep 17 00:00:00 2001
From: Max Ivanov <omaxphp@yandex.ru>
Date: Mon, 25 Jun 2018 14:20:43 +0300
Subject: [PATCH 354/582] docs(changelog): remove repeating blocks (#24654) PR
 Close #24654

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29e09a595c..04e682f3bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,10 +20,6 @@
 
 
 
-<a name="6.0.5"></a>
-## [6.0.5](https://github.com/angular/angular/compare/6.0.4...6.0.5) (2018-06-13)
-
-
 <a name="6.1.0-beta.1"></a>
 # [6.1.0-beta.1](https://github.com/angular/angular/compare/6.1.0-beta.0...6.1.0-beta.1) (2018-06-13)
 

From 32da3e160252d3fc2b016f5bf18e7dd3853d9567 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 27 Jun 2018 18:29:42 +0200
Subject: [PATCH 355/582] docs: add explanation for `enableResourceInlining`
 (#24644)

PR Close #24644
---
 aio/content/guide/aot-compiler.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/aio/content/guide/aot-compiler.md b/aio/content/guide/aot-compiler.md
index b53fa800d6..2bc21dc8dd 100644
--- a/aio/content/guide/aot-compiler.md
+++ b/aio/content/guide/aot-compiler.md
@@ -97,6 +97,9 @@ You can control your app compilation by providing template compiler options in t
   }
 }
 ```
+### *enableResourceInlining*
+This options tell the compiler to replace the `templateUrl` and `styleUrls` property in all `@Component` decorators with inlined contents in `template` and `styles` properties.
+When enabled, the `.js` output of ngc will have no lazy-loaded `templateUrl` or `styleUrls`.
 
 ### *skipMetadataEmit*
 
@@ -236,14 +239,14 @@ Tells the compiler to generate all the possible generated files even if they are
 how `bazel` rules track file dependencies. It is not recommended to use this option outside of the `bazel`
 rules.
 
-  ### *enableIvy*
+### *enableIvy*
 
-  Tells the compiler to generate definitions using the Render3 style code generation. This option defaults to `false`.
+Tells the compiler to generate definitions using the Render3 style code generation. This option defaults to `false`.
 
-  Not all features are supported with this option enabled. It is only supported
-  for experimentation and testing of Render3 style code generation.
+Not all features are supported with this option enabled. It is only supported
+for experimentation and testing of Render3 style code generation.
 
-  *Note*: Is it not recommended to use this option as it is not yet feature complete with the Render2 code generation.
+*Note*: Is it not recommended to use this option as it is not yet feature complete with the Render2 code generation.
 
 
 ## Angular Metadata and AOT

From 8dec3811450b0b81a94e91748eeace62a4eb70bf Mon Sep 17 00:00:00 2001
From: Nico de Haen <mail@ndh-websolutions.de>
Date: Wed, 13 Jun 2018 23:38:16 +0200
Subject: [PATCH 356/582] docs: fix unit tests in toh-pt6 (#24491)

Resolves #20373

PR Close #24491
---
 .../app/dashboard/dashboard.component.spec.ts | 35 ++++++++++++++++++-
 .../hero-search/hero-search.component.spec.ts |  6 +++-
 .../src/app/heroes/heroes.component.spec.ts   |  6 ++--
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.spec.ts b/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.spec.ts
index fea6bfb4db..3926c21e9f 100644
--- a/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.spec.ts
+++ b/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.spec.ts
@@ -1,16 +1,36 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DashboardComponent } from './dashboard.component';
+import { HeroSearchComponent } from '../hero-search/hero-search.component';
+
+import { RouterTestingModule } from '@angular/router/testing';
+import { of } from 'rxjs';
+import { HEROES } from '../mock-heroes';
+import { HeroService } from '../hero.service';
 
 describe('DashboardComponent', () => {
   let component: DashboardComponent;
   let fixture: ComponentFixture<DashboardComponent>;
+  let heroService;
+  let getHeroesSpy;
 
   beforeEach(async(() => {
+    heroService = jasmine.createSpyObj('HeroService', ['getHeroes']);
+    getHeroesSpy = heroService.getHeroes.and.returnValue( of(HEROES) );
     TestBed.configureTestingModule({
-      declarations: [ DashboardComponent ]
+      declarations: [
+        DashboardComponent,
+        HeroSearchComponent
+      ],
+      imports: [
+        RouterTestingModule.withRoutes([])
+      ],
+      providers: [
+        { provide: HeroService, useValue: heroService }
+      ]
     })
     .compileComponents();
+
   }));
 
   beforeEach(() => {
@@ -22,4 +42,17 @@ describe('DashboardComponent', () => {
   it('should be created', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should display "Top Heroes" as headline', () => {
+    expect(fixture.nativeElement.querySelector('h3').textContent).toEqual('Top Heroes');
+  });
+
+  it('should call heroService', async(() => {
+    expect(getHeroesSpy.calls.any()).toBe(true);
+    }));
+
+  it('should display 4 links', async(() => {
+    expect(fixture.nativeElement.querySelectorAll('a').length).toEqual(4);
+  }));
+
 });
diff --git a/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.spec.ts b/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.spec.ts
index 901bb7f2ab..8414f1c223 100644
--- a/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.spec.ts
+++ b/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.spec.ts
@@ -1,14 +1,18 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 import { HeroSearchComponent } from './hero-search.component';
 
+
 describe('HeroSearchComponent', () => {
   let component: HeroSearchComponent;
   let fixture: ComponentFixture<HeroSearchComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HeroSearchComponent ]
+      declarations: [ HeroSearchComponent ],
+      imports: [RouterTestingModule.withRoutes([]), HttpClientTestingModule]
     })
     .compileComponents();
   }));
diff --git a/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.spec.ts b/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.spec.ts
index 9c3b1c4d9f..6991d69010 100644
--- a/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.spec.ts
+++ b/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.spec.ts
@@ -1,6 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { RouterTestingModule } from '@angular/router/testing';
 import { HeroesComponent } from './heroes.component';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('HeroesComponent', () => {
   let component: HeroesComponent;
@@ -8,7 +9,8 @@ describe('HeroesComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HeroesComponent ]
+      declarations: [ HeroesComponent ],
+      imports: [RouterTestingModule.withRoutes([]), HttpClientTestingModule],
     })
     .compileComponents();
   }));

From 922908818fafb2e7e304d90343808ca5d756f327 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 5 Aug 2017 20:04:32 +0300
Subject: [PATCH 357/582] test: minor improvements in examples e2e tests script
 (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 packages/examples/build.sh | 50 ++++++++++++++++++++------------------
 packages/examples/test.sh  | 19 +++++++++++----
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/packages/examples/build.sh b/packages/examples/build.sh
index 3747ad560d..ce521af07a 100755
--- a/packages/examples/build.sh
+++ b/packages/examples/build.sh
@@ -9,34 +9,36 @@ set -u -e -o pipefail
 # can be used to run each of the examples in isolation via http as well.
 #
 
-cd `dirname $0`
+(
+  cd `dirname $0`
 
-DIST="../../dist/examples";
-rm -rf -- $DIST
-$(npm bin)/tsc -p ./tsconfig-build.json --importHelpers false
+  DIST="../../dist/examples";
+  rm -rf -- $DIST
+  $(npm bin)/tsc -p ./tsconfig-build.json --importHelpers false
 
-mkdir $DIST/vendor/
+  mkdir $DIST/vendor/
 
-ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular
+  ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular
 
-for FILE in \
-    ../../../node_modules/angular/angular.js \
-    ../../../node_modules/zone.js/dist/zone.js \
-    ../../../node_modules/zone.js/dist/task-tracking.js \
-    ../../../node_modules/systemjs/dist/system.js \
-    ../../../node_modules/reflect-metadata/Reflect.js \
-    ../../../node_modules/rxjs
-do
-  ln -s $FILE $DIST/vendor/`basename $FILE`
-done
+  for FILE in \
+      ../../../node_modules/angular/angular.js \
+      ../../../node_modules/zone.js/dist/zone.js \
+      ../../../node_modules/zone.js/dist/task-tracking.js \
+      ../../../node_modules/systemjs/dist/system.js \
+      ../../../node_modules/reflect-metadata/Reflect.js \
+      ../../../node_modules/rxjs
+  do
+    ln -s $FILE $DIST/vendor/`basename $FILE`
+  done
 
-for MODULE in `find . -name module.ts`; do
-  FINAL_DIR_PATH=$DIST/`dirname $MODULE`
+  for MODULE in `find . -name module.ts`; do
+    FINAL_DIR_PATH=$DIST/`dirname $MODULE`
 
-  echo "==== $MODULE"
-  cp _common/*.html $FINAL_DIR_PATH
-  cp $DIST/_common/*.js $FINAL_DIR_PATH
-  cp $DIST/_common/*.js.map $FINAL_DIR_PATH
+    echo "==== $MODULE"
+    cp _common/*.html $FINAL_DIR_PATH
+    cp $DIST/_common/*.js $FINAL_DIR_PATH
+    cp $DIST/_common/*.js.map $FINAL_DIR_PATH
 
-  find `dirname $MODULE` -name \*.css -exec cp {} $FINAL_DIR_PATH \;
-done
+    find `dirname $MODULE` -name \*.css -exec cp {} $FINAL_DIR_PATH \;
+  done
+)
diff --git a/packages/examples/test.sh b/packages/examples/test.sh
index 1d5e163c51..c8827305a8 100755
--- a/packages/examples/test.sh
+++ b/packages/examples/test.sh
@@ -1,8 +1,17 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-cd `dirname $0`
-./build.sh
+set -u -e -o pipefail
 
-gulp serve-examples &
+(
+  cd `dirname $0`
+  ./build.sh
 
-(cd ../../ && NODE_PATH=$NODE_PATH:dist/all $(npm bin)/protractor protractor-examples-e2e.conf.js --bundles=true)
+  gulp serve-examples &
+  trap "kill $!" EXIT
+
+  (
+    cd ../../
+    NODE_PATH=${NODE_PATH:-}:dist/all
+    $(npm bin)/protractor protractor-examples-e2e.conf.js --bundles=true
+  )
+)

From 24e0c3d43d16c2e9f36fd932e8c415da648b8c2b Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 2 Aug 2017 18:42:14 +0300
Subject: [PATCH 358/582] docs: minor fixes in `docs-style-guide` (#18487)
 (#18487)

PR Close #18487

PR Close #18487
---
 aio/content/guide/docs-style-guide.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aio/content/guide/docs-style-guide.md b/aio/content/guide/docs-style-guide.md
index 86ccdf7ebc..ff2d539930 100644
--- a/aio/content/guide/docs-style-guide.md
+++ b/aio/content/guide/docs-style-guide.md
@@ -31,6 +31,8 @@ Here are a few essential commands for guide page authors.
 
 1.  http://localhost:4200/  &mdash;  browse to the app running locally.
 
+You can combine `yarn docs-watch` and `yarn start` into one command with `yarn serve-and-sync`.
+
 ## Guide pages
 
  All but a few guide pages are [markdown](https://daringfireball.net/projects/markdown/syntax "markdown") files with an `.md` extension.

From 0b3d25d67e907d7a8e6e4293f6d022f097dd0744 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 2 Aug 2017 19:27:22 +0300
Subject: [PATCH 359/582] docs(upgrade): update API docs for upgrade/static
 (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 packages/examples/upgrade/static/ts/module.ts | 46 ++++++++-----------
 .../upgrade/src/static/upgrade_component.ts   |  5 --
 packages/upgrade/src/static/upgrade_module.ts | 46 +++++++++++++------
 3 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/packages/examples/upgrade/static/ts/module.ts b/packages/examples/upgrade/static/ts/module.ts
index 832bfee563..e8bf6cfcf4 100644
--- a/packages/examples/upgrade/static/ts/module.ts
+++ b/packages/examples/upgrade/static/ts/module.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {Component, Directive, DoCheck, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, OnChanges, OnDestroy, OnInit, Output, SimpleChanges} from '@angular/core';
+import {Component, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output, SimpleChanges} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {UpgradeComponent, UpgradeModule, downgradeComponent, downgradeInjectable} from '@angular/upgrade/static';
@@ -66,28 +66,18 @@ class HeroesService {
 // #docregion ng1-hero-wrapper
 // This Angular directive will act as an interface to the "upgraded" AngularJS component
 @Directive({selector: 'ng1-hero'})
-class Ng1HeroComponentWrapper extends UpgradeComponent implements OnInit, OnChanges, DoCheck,
-    OnDestroy {
+class Ng1HeroComponentWrapper extends UpgradeComponent {
   // The names of the input and output properties here must match the names of the
   // `<` and `&` bindings in the AngularJS component that is being wrapped
   // TODO(issue/24571): remove '!'.
   @Input() hero !: Hero;
   // TODO(issue/24571): remove '!'.
   @Output() onRemove !: EventEmitter<void>;
-  constructor(@Inject(ElementRef) elementRef: ElementRef, @Inject(Injector) injector: Injector) {
+
+  constructor(elementRef: ElementRef, injector: Injector) {
     // We must pass the name of the directive as used by AngularJS to the super
     super('ng1Hero', elementRef, injector);
   }
-
-  // For this class to work when compiled with AoT, we must implement these lifecycle hooks
-  // because the AoT compiler will not realise that the super class implements them
-  ngOnInit() { super.ngOnInit(); }
-
-  ngOnChanges(changes: SimpleChanges) { super.ngOnChanges(changes); }
-
-  ngDoCheck() { super.ngDoCheck(); }
-
-  ngOnDestroy() { super.ngOnDestroy(); }
 }
 // #enddocregion
 
@@ -107,11 +97,19 @@ class Ng1HeroComponentWrapper extends UpgradeComponent implements OnInit, OnChan
   // We must import `UpgradeModule` to get access to the AngularJS core services
   imports: [BrowserModule, UpgradeModule]
 })
+// #docregion bootstrap-ng1
 class Ng2AppModule {
-  ngDoBootstrap() { /* this is a placeholder to stop the bootstrapper from complaining */
+  // #enddocregion ng2-module
+  constructor(private upgrade: UpgradeModule) {}
+
+  ngDoBootstrap() {
+    // We bootstrap the AngularJS app.
+    this.upgrade.bootstrap(document.body, [ng1AppModule.name]);
   }
+  // #docregion ng2-module
 }
-// #enddocregion
+// #enddocregion bootstrap-ng1
+// #enddocregion ng2-module
 // #enddocregion
 
 
@@ -147,7 +145,7 @@ ng1AppModule.factory('heroesService', downgradeInjectable(HeroesService) as any)
 // #enddocregion
 
 // #docregion ng2-heroes-wrapper
-// This is directive will act as the interface to the "downgraded"  Angular component
+// This is directive will act as the interface to the "downgraded" Angular component
 ng1AppModule.directive('ng2Heroes', downgradeComponent({component: Ng2HeroesComponent}));
 // #enddocregion
 
@@ -171,16 +169,12 @@ ng1AppModule.component('exampleApp', {
                <p class="extra">There are {{ $ctrl.heroesService.heroes.length }} heroes.</p>
              </ng2-heroes>`
 } as any);
-// #enddocregion
+// #enddocregion
 // #enddocregion
 
 
-// #docregion bootstrap
-// First we bootstrap the Angular HybridModule
-// (We are using the dynamic browser platform as this example has not been compiled AoT)
-platformBrowserDynamic().bootstrapModule(Ng2AppModule).then(ref => {
-  // Once Angular bootstrap is complete then we bootstrap the AngularJS module
-  const upgrade = ref.injector.get(UpgradeModule) as UpgradeModule;
-  upgrade.bootstrap(document.body, [ng1AppModule.name]);
-});
+// #docregion bootstrap-ng2
+// We bootstrap the Angular module as we would do in a normal Angular app.
+// (We are using the dynamic browser platform as this example has not been compiled AoT.)
+platformBrowserDynamic().bootstrapModule(Ng2AppModule);
 // #enddocregion
diff --git a/packages/upgrade/src/static/upgrade_component.ts b/packages/upgrade/src/static/upgrade_component.ts
index 3976a1fa47..984067bb7a 100644
--- a/packages/upgrade/src/static/upgrade_component.ts
+++ b/packages/upgrade/src/static/upgrade_component.ts
@@ -100,11 +100,6 @@ export class UpgradeComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
    * * The `name` parameter should be the name of the AngularJS directive.
    * * The `elementRef` and `injector` parameters should be acquired from Angular by dependency
    *   injection into the base class constructor.
-   *
-   * Note that we must manually implement lifecycle hooks that call through to the super class.
-   * This is because, at the moment, the AoT compiler is not able to tell that the
-   * `UpgradeComponent`
-   * already implements them and so does not wire up calls to them at runtime.
    */
   constructor(private name: string, private elementRef: ElementRef, private injector: Injector) {
     this.helper = new UpgradeHelper(injector, name, elementRef);
diff --git a/packages/upgrade/src/static/upgrade_module.ts b/packages/upgrade/src/static/upgrade_module.ts
index d8e31b5e16..0b016d9c5c 100644
--- a/packages/upgrade/src/static/upgrade_module.ts
+++ b/packages/upgrade/src/static/upgrade_module.ts
@@ -22,13 +22,14 @@ import {NgAdapterInjector} from './util';
  * An `NgModule`, which you import to provide AngularJS core services,
  * and has an instance method used to bootstrap the hybrid upgrade application.
  *
- * *Part of the [upgrade/static](api?query=upgrade%2Fstatic)
+ * *Part of the [upgrade/static](api?query=upgrade/static)
  * library for hybrid upgrade apps that support AoT compilation*
  *
  * The `upgrade/static` package contains helpers that allow AngularJS and Angular components
  * to be used together inside a hybrid upgrade application, which supports AoT compilation.
  *
  * Specifically, the classes and functions in the `upgrade/static` module allow the following:
+ *
  * 1. Creation of an Angular directive that wraps and exposes an AngularJS component so
  *    that it can be used in an Angular template. See `UpgradeComponent`.
  * 2. Creation of an AngularJS directive that wraps and exposes an Angular component so
@@ -39,8 +40,15 @@ import {NgAdapterInjector} from './util';
  * 4. Creation of an AngularJS service that wraps and exposes an Angular injectable
  *    so that it can be injected into an AngularJS context. See `downgradeInjectable`.
  * 3. Bootstrapping of a hybrid Angular application which contains both of the frameworks
- *    coexisting in a single application. See the
- *    {@link UpgradeModule#examples example} below.
+ *    coexisting in a single application.
+ *
+ * @usageNotes
+ *
+ * ```ts
+ * import {UpgradeModule} from '@angular/upgrade/static';
+ * ```
+ *
+ * See also the {@link UpgradeModule#examples examples} below.
  *
  * ### Mental Model
  *
@@ -59,7 +67,7 @@ import {NgAdapterInjector} from './util';
  * 5. An AngularJS component can be "upgraded"" to an Angular component. This is achieved by
  *    defining an Angular directive, which bootstraps the AngularJS component at its location
  *    in the DOM. See `UpgradeComponent`.
- * 6. An Angular component can be "downgraded"" to an AngularJS component. This is achieved by
+ * 6. An Angular component can be "downgraded" to an AngularJS component. This is achieved by
  *    defining an AngularJS directive, which bootstraps the Angular component at its location
  *    in the DOM. See `downgradeComponent`.
  * 7. Whenever an "upgraded"/"downgraded" component is instantiated the host element is owned by
@@ -68,20 +76,25 @@ import {NgAdapterInjector} from './util';
  *    a. This implies that the component bindings will always follow the semantics of the
  *       instantiation framework.
  *    b. The DOM attributes are parsed by the framework that owns the current template. So
- *       attributes in AngularJS templates must use kebab-case, while AngularJS templates must
- *       use camelCase.
+ *       attributes in AngularJS templates must use kebab-case, while AngularJS templates must use
+ *       camelCase.
  *    c. However the template binding syntax will always use the Angular style, e.g. square
  *       brackets (`[...]`) for property binding.
  * 8. Angular is bootstrapped first; AngularJS is bootstrapped second. AngularJS always owns the
  *    root component of the application.
- * 9. The new application is running in an Angular zone, and therefore it no longer needs calls
- *    to `$apply()`.
+ * 9. The new application is running in an Angular zone, and therefore it no longer needs calls to
+ *    `$apply()`.
  *
- * ### Core AngularJS services
+ * ### The `UpgradeModule` class
+ *
+ * This class is an `NgModule`, which you import to provide AngularJS core services,
+ * and has an instance method used to bootstrap the hybrid upgrade application.
+ *
+ * #### Core AngularJS services
  * Importing this `NgModule` will add providers for the core
  * [AngularJS services](https://docs.angularjs.org/api/ng/service) to the root injector.
  *
- * ### Bootstrap
+ * #### Bootstrap
  * The runtime instance of this class contains a {@link UpgradeModule#bootstrap `bootstrap()`}
  * method, which you use to bootstrap the top level AngularJS module onto an element in the
  * DOM for the hybrid upgrade app.
@@ -96,14 +109,17 @@ import {NgAdapterInjector} from './util';
  *
  * {@example upgrade/static/ts/module.ts region='ng2-module'}
  *
- * Then bootstrap the hybrid upgrade app's module, get hold of the `UpgradeModule` instance
- * and use it to bootstrap the top level [AngularJS
- * module](https://docs.angularjs.org/api/ng/type/angular.Module).
+ * Then inject `UpgradeModule` into your Angular `NgModule` and use it to bootstrap the top level
+ * [AngularJS module](https://docs.angularjs.org/api/ng/type/angular.Module) in the
+ * `ngDoBootstrap()` method.
  *
- * {@example upgrade/static/ts/module.ts region='bootstrap'}
+ * {@example upgrade/static/ts/module.ts region='bootstrap-ng1'}
+ *
+ * Finally, kick off the whole process, by bootstraping your top level Angular `NgModule`.
+ *
+ * {@example upgrade/static/ts/module.ts region='bootstrap-ng2'}
  *
  * {@a upgrading-an-angular-1-service}
- *
  * ### Upgrading an AngularJS service
  *
  * There is no specific API for upgrading an AngularJS service. Instead you should just follow the

From ca0a55f4ee2276d27991c746cd0c77914b030a9b Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 2 Aug 2017 17:02:58 +0300
Subject: [PATCH 360/582] docs(upgrade): add API docs for `propagateDigest`
 (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 packages/upgrade/src/common/downgrade_component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/upgrade/src/common/downgrade_component.ts b/packages/upgrade/src/common/downgrade_component.ts
index 8dd26698b5..9a642fca1d 100644
--- a/packages/upgrade/src/common/downgrade_component.ts
+++ b/packages/upgrade/src/common/downgrade_component.ts
@@ -46,6 +46,11 @@ interface Thenable<T> {
  * @param info contains information about the Component that is being downgraded:
  *
  * * `component: Type<any>`: The type of the Component that will be downgraded
+ * * `propagateDigest?: boolean`: Whether to perform {@link ChangeDetectorRef#detectChanges
+ *   change detection} on the component on every
+ *   [$digest](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$digest). If set to `false`,
+ *   change detection will still be performed when any of the component's inputs changes.
+ *   (Default: true)
  *
  * @returns a factory function that can be used to register the component in an
  * AngularJS module.

From 2ac2ab7ff69124e604b408a91829cfc14490563c Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 2 Aug 2017 17:03:17 +0300
Subject: [PATCH 361/582] docs(upgrade): add API docs for `downgradeModule()`
 (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 .../e2e_test/static_full_spec.ts}             |  11 +-
 .../upgrade/static/ts/{ => full}/module.ts    |  36 +--
 .../upgrade/static/ts/{ => full}/styles.css   |   0
 .../static/ts/lite/e2e_test/e2e_util.ts       |  64 +++++
 .../ts/lite/e2e_test/static_lite_spec.ts      |  89 +++++++
 .../examples/upgrade/static/ts/lite/module.ts | 220 ++++++++++++++++++
 .../upgrade/static/ts/lite/styles.css         |  17 ++
 .../upgrade/src/common/downgrade_component.ts |   4 +-
 .../src/common/downgrade_injectable.ts        |   8 +-
 .../upgrade/src/static/downgrade_module.ts    |  81 ++++++-
 .../upgrade/src/static/upgrade_component.ts   |   6 +-
 packages/upgrade/src/static/upgrade_module.ts |  12 +-
 12 files changed, 508 insertions(+), 40 deletions(-)
 rename packages/examples/upgrade/static/ts/{e2e_test/static_spec.ts => full/e2e_test/static_full_spec.ts} (87%)
 rename packages/examples/upgrade/static/ts/{ => full}/module.ts (85%)
 rename packages/examples/upgrade/static/ts/{ => full}/styles.css (100%)
 create mode 100644 packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts
 create mode 100644 packages/examples/upgrade/static/ts/lite/e2e_test/static_lite_spec.ts
 create mode 100644 packages/examples/upgrade/static/ts/lite/module.ts
 create mode 100644 packages/examples/upgrade/static/ts/lite/styles.css

diff --git a/packages/examples/upgrade/static/ts/e2e_test/static_spec.ts b/packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts
similarity index 87%
rename from packages/examples/upgrade/static/ts/e2e_test/static_spec.ts
rename to packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts
index ed780162e6..5558ffb5b4 100644
--- a/packages/examples/upgrade/static/ts/e2e_test/static_spec.ts
+++ b/packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts
@@ -7,16 +7,15 @@
  */
 
 import {browser, by, element} from 'protractor';
-import {verifyNoBrowserErrors} from '../../../../_common/e2e_util';
+import {verifyNoBrowserErrors} from '../../../../../_common/e2e_util';
 
-function loadPage(url: string) {
-  browser.ng12Hybrid = true;
+function loadPage() {
   browser.rootEl = 'example-app';
-  browser.get(url);
+  browser.get('/upgrade/static/ts/full/');
 }
 
-describe('upgrade(static)', () => {
-  beforeEach(() => { loadPage('/upgrade/static/ts/'); });
+describe('upgrade/static (full)', () => {
+  beforeEach(loadPage);
   afterEach(verifyNoBrowserErrors);
 
   it('should render the `ng2-heroes` component', () => {
diff --git a/packages/examples/upgrade/static/ts/module.ts b/packages/examples/upgrade/static/ts/full/module.ts
similarity index 85%
rename from packages/examples/upgrade/static/ts/module.ts
rename to packages/examples/upgrade/static/ts/full/module.ts
index e8bf6cfcf4..7e842c4cee 100644
--- a/packages/examples/upgrade/static/ts/module.ts
+++ b/packages/examples/upgrade/static/ts/full/module.ts
@@ -5,11 +5,14 @@
  * 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, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output, SimpleChanges} from '@angular/core';
+
+import {Component, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {UpgradeComponent, UpgradeModule, downgradeComponent, downgradeInjectable} from '@angular/upgrade/static';
 
+declare var angular: ng.IAngularStatic;
+
 interface Hero {
   name: string;
   description: string;
@@ -116,7 +119,6 @@ class Ng2AppModule {
 // #docregion Angular 1 Stuff
 // #docregion ng1-module
 // This Angular 1 module represents the AngularJS pieces of the application
-declare var angular: ng.IAngularStatic;
 const ng1AppModule = angular.module('ng1AppModule', []);
 // #enddocregion
 
@@ -136,7 +138,7 @@ ng1AppModule.component('ng1Hero', {
 // This AngularJS service will be "upgraded" to be used in Angular
 ng1AppModule.factory(
     'titleCase',
-    (() => (value: string) => value.replace(/((^|\s)[a-z])/g, (_, c) => c.toUpperCase())) as any);
+    () => (value: string) => value.replace(/((^|\s)[a-z])/g, (_, c) => c.toUpperCase()));
 // #enddocregion
 
 // #docregion downgrade-ng2-heroes-service
@@ -145,7 +147,7 @@ ng1AppModule.factory('heroesService', downgradeInjectable(HeroesService) as any)
 // #enddocregion
 
 // #docregion ng2-heroes-wrapper
-// This is directive will act as the interface to the "downgraded" Angular component
+// This directive will act as the interface to the "downgraded" Angular component
 ng1AppModule.directive('ng2Heroes', downgradeComponent({component: Ng2HeroesComponent}));
 // #enddocregion
 
@@ -155,20 +157,18 @@ ng1AppModule.component('exampleApp', {
   // We inject the "downgraded" HeroesService into this AngularJS component
   // (We don't need the `HeroesService` type for AngularJS DI - it just helps with TypeScript
   // compilation)
-  controller:
-      [
-        'heroesService',
-        function(heroesService: HeroesService) { this.heroesService = heroesService; }
-      ],
-      // This template make use of the downgraded `ng2-heroes` component
-      // Note that because its element is compiled by AngularJS we must use kebab-case attributes
-      // for inputs and outputs
-      template: `<link rel="stylesheet" href="./styles.css">
-             <ng2-heroes [heroes]="$ctrl.heroesService.heroes" (add-hero)="$ctrl.heroesService.addHero()" (remove-hero)="$ctrl.heroesService.removeHero($event)">
-               <h1>Heroes</h1>
-               <p class="extra">There are {{ $ctrl.heroesService.heroes.length }} heroes.</p>
-             </ng2-heroes>`
-} as any);
+  controller: [
+    'heroesService', function(heroesService: HeroesService) { this.heroesService = heroesService; }
+  ],
+  // This template makes use of the downgraded `ng2-heroes` component
+  // Note that because its element is compiled by AngularJS we must use kebab-case attributes
+  // for inputs and outputs
+  template: `<link rel="stylesheet" href="./styles.css">
+          <ng2-heroes [heroes]="$ctrl.heroesService.heroes" (add-hero)="$ctrl.heroesService.addHero()" (remove-hero)="$ctrl.heroesService.removeHero($event)">
+            <h1>Heroes</h1>
+            <p class="extra">There are {{ $ctrl.heroesService.heroes.length }} heroes.</p>
+          </ng2-heroes>`
+});
 // #enddocregion
 // #enddocregion
 
diff --git a/packages/examples/upgrade/static/ts/styles.css b/packages/examples/upgrade/static/ts/full/styles.css
similarity index 100%
rename from packages/examples/upgrade/static/ts/styles.css
rename to packages/examples/upgrade/static/ts/full/styles.css
diff --git a/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts b/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts
new file mode 100644
index 0000000000..bc53502d01
--- /dev/null
+++ b/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts
@@ -0,0 +1,64 @@
+/**
+ * @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 {ElementFinder, by} from 'protractor';
+
+declare global {
+  namespace jasmine {
+  interface Matchers {
+    toBeAHero(): Promise<void>;
+    toHaveName(exectedName: string): Promise<void>;
+  }
+  }
+}
+
+const isTitleCased = (text: string) =>
+    text.split(/\s+/).every(word => word[0] === word[0].toUpperCase());
+
+export function addCustomMatchers() {
+  jasmine.addMatchers({
+    toBeAHero:
+        () => ({
+          compare(actualNg1Hero: ElementFinder | undefined) {
+            const getText = (selector: string) =>
+                actualNg1Hero !.element(by.css(selector)).getText();
+            const result = {
+              message: 'Expected undefined to be an `ng1Hero` ElementFinder.',
+              pass: !!actualNg1Hero &&
+                  Promise.all(['.title', 'h2', 'p'].map(getText) as PromiseLike<string>[])
+                      .then(([actualTitle, actualName, actualDescription]) => {
+                        const pass = (actualTitle === 'Super Hero') && isTitleCased(actualName) &&
+                            (actualDescription.length > 0);
+
+                        const actualHero =
+                            `Hero(${actualTitle}, ${actualName}, ${actualDescription})`;
+                        result.message =
+                            `Expected ${actualHero}'${pass ? ' not' : ''} to be a real hero.`;
+
+                        return pass;
+                      })
+            };
+            return result;
+          }
+        }),
+        toHaveName: () => ({
+          compare(actualNg1Hero: ElementFinder | undefined, expectedName: string) {
+            const result = {
+              message: 'Expected undefined to be an `ng1Hero` ElementFinder.',
+              pass: !!actualNg1Hero && actualNg1Hero.element(by.css('h2')).getText().then(actualName => {
+                const pass = actualName === expectedName;
+                result.message =
+                    `Expected Hero(${actualName})${pass ? ' not' : ''} to have name '${expectedName}'.`;
+                return pass;
+              })
+            };
+            return result;
+          }
+        }),
+  } as any);
+}
diff --git a/packages/examples/upgrade/static/ts/lite/e2e_test/static_lite_spec.ts b/packages/examples/upgrade/static/ts/lite/e2e_test/static_lite_spec.ts
new file mode 100644
index 0000000000..5e7b6395ef
--- /dev/null
+++ b/packages/examples/upgrade/static/ts/lite/e2e_test/static_lite_spec.ts
@@ -0,0 +1,89 @@
+/**
+ * @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 {ElementArrayFinder, ElementFinder, browser, by, element} from 'protractor';
+
+import {verifyNoBrowserErrors} from '../../../../../_common/e2e_util';
+import {addCustomMatchers} from './e2e_util';
+
+function loadPage() {
+  browser.rootEl = 'example-app';
+  browser.get('/upgrade/static/ts/lite/');
+}
+
+describe('upgrade/static (lite)', () => {
+  let showHideBtn: ElementFinder;
+  let ng2Heroes: ElementFinder;
+  let ng2HeroesHeader: ElementFinder;
+  let ng2HeroesExtra: ElementFinder;
+  let ng2HeroesAddBtn: ElementFinder;
+  let ng1Heroes: ElementArrayFinder;
+
+  const expectHeroes = (isShown: boolean, ng1HeroCount = 3, statusMessage = 'Ready') => {
+    // Verify the show/hide button text.
+    expect(showHideBtn.getText()).toBe(isShown ? 'Hide heroes' : 'Show heroes');
+
+    // Verify the `<ng2-heroes>` component.
+    expect(ng2Heroes.isPresent()).toBe(isShown);
+    if (isShown) {
+      expect(ng2HeroesHeader.getText()).toBe('Heroes');
+      expect(ng2HeroesExtra.getText()).toBe(`Status: ${statusMessage}`);
+    }
+
+    // Verify the `<ng1-hero>` components.
+    expect(ng1Heroes.count()).toBe(isShown ? ng1HeroCount : 0);
+    if (isShown) {
+      ng1Heroes.each(ng1Hero => expect(ng1Hero).toBeAHero());
+    }
+  };
+
+  beforeEach(() => {
+    showHideBtn = element(by.binding('toggleBtnText'));
+
+    ng2Heroes = element(by.css('.ng2-heroes'));
+    ng2HeroesHeader = ng2Heroes.element(by.css('h1'));
+    ng2HeroesExtra = ng2Heroes.element(by.css('.extra'));
+    ng2HeroesAddBtn = ng2Heroes.element(by.buttonText('Add Hero'));
+
+    ng1Heroes = element.all(by.css('.ng1-hero'));
+  });
+  beforeEach(addCustomMatchers);
+  beforeEach(loadPage);
+  afterEach(verifyNoBrowserErrors);
+
+  it('should initially not render the heroes', () => expectHeroes(false));
+
+  it('should toggle the heroes when clicking the "show/hide" button', () => {
+    showHideBtn.click();
+    expectHeroes(true);
+
+    showHideBtn.click();
+    expectHeroes(false);
+  });
+
+  it('should add a new hero when clicking the "add" button', () => {
+    showHideBtn.click();
+    ng2HeroesAddBtn.click();
+
+    expectHeroes(true, 4, 'Added hero Kamala Khan');
+    expect(ng1Heroes.last()).toHaveName('Kamala Khan');
+  });
+
+  it('should remove a hero when clicking its "remove" button', () => {
+    showHideBtn.click();
+
+    const firstHero = ng1Heroes.first();
+    expect(firstHero).toHaveName('Superman');
+
+    const removeBtn = firstHero.element(by.buttonText('Remove'));
+    removeBtn.click();
+
+    expectHeroes(true, 2, 'Removed hero Superman');
+    expect(ng1Heroes.first()).not.toHaveName('Superman');
+  });
+});
diff --git a/packages/examples/upgrade/static/ts/lite/module.ts b/packages/examples/upgrade/static/ts/lite/module.ts
new file mode 100644
index 0000000000..1a21702714
--- /dev/null
+++ b/packages/examples/upgrade/static/ts/lite/module.ts
@@ -0,0 +1,220 @@
+/**
+ * @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
+ */
+
+// #docplaster
+import {Component, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output, StaticProvider} from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+// #docregion basic-how-to
+// Alternatively, we could import and use an `NgModuleFactory` instead:
+// import {MyLazyAngularModuleNgFactory} from './my-lazy-angular-module.ngfactory';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+// #enddocregion
+/* tslint:disable: no-duplicate-imports */
+import {UpgradeComponent} from '@angular/upgrade/static';
+import {downgradeComponent} from '@angular/upgrade/static';
+import {downgradeInjectable} from '@angular/upgrade/static';
+// #docregion basic-how-to
+import {downgradeModule} from '@angular/upgrade/static';
+// #enddocregion
+/* tslint:enable: no-duplicate-imports */
+
+
+declare var angular: ng.IAngularStatic;
+
+interface Hero {
+  name: string;
+  description: string;
+}
+
+
+// This Angular service will use an "upgraded" AngularJS service.
+@Injectable()
+class HeroesService {
+  heroes: Hero[] = [
+    {name: 'superman', description: 'The man of steel'},
+    {name: 'wonder woman', description: 'Princess of the Amazons'},
+    {name: 'thor', description: 'The hammer-wielding god'}
+  ];
+
+  constructor(@Inject('titleCase') titleCase: (v: string) => string) {
+    // Change all the hero names to title case, using the "upgraded" AngularJS service.
+    this.heroes.forEach((hero: Hero) => hero.name = titleCase(hero.name));
+  }
+
+  addHero() {
+    const newHero: Hero = {name: 'Kamala Khan', description: 'Epic shape-shifting healer'};
+    this.heroes = this.heroes.concat([newHero]);
+    return newHero;
+  }
+
+  removeHero(hero: Hero) { this.heroes = this.heroes.filter((item: Hero) => item !== hero); }
+}
+
+
+// This Angular component will be "downgraded" to be used in AngularJS.
+@Component({
+  selector: 'ng2-heroes',
+  // This template uses the "upgraded" `ng1-hero` component
+  // (Note that because its element is compiled by Angular we must use camelCased attribute names.)
+  template: `
+    <div class="ng2-heroes">
+      <header><ng-content selector="h1"></ng-content></header>
+      <ng-content selector=".extra"></ng-content>
+      <div *ngFor="let hero of this.heroesService.heroes">
+        <ng1-hero [hero]="hero" (onRemove)="onRemoveHero(hero)">
+          <strong>Super Hero</strong>
+        </ng1-hero>
+      </div>
+      <button (click)="onAddHero()">Add Hero</button>
+    </div>
+  `,
+})
+class Ng2HeroesComponent {
+  @Output() private addHero = new EventEmitter<Hero>();
+  @Output() private removeHero = new EventEmitter<Hero>();
+
+  constructor(
+      @Inject('$rootScope') private $rootScope: ng.IRootScopeService,
+      public heroesService: HeroesService) {}
+
+  onAddHero() {
+    const newHero = this.heroesService.addHero();
+    this.addHero.emit(newHero);
+
+    // When a new instance of an "upgraded" component - such as `ng1Hero` - is created, we want to
+    // run a `$digest` to initialize its bindings. Here, the component will be created by `ngFor`
+    // asynchronously, thus we have to schedule the `$digest` to also happen asynchronously.
+    this.$rootScope.$applyAsync();
+  }
+
+  onRemoveHero(hero: Hero) {
+    this.heroesService.removeHero(hero);
+    this.removeHero.emit(hero);
+  }
+}
+
+
+// This Angular directive will act as an interface to the "upgraded" AngularJS component.
+@Directive({selector: 'ng1-hero'})
+class Ng1HeroComponentWrapper extends UpgradeComponent {
+  // The names of the input and output properties here must match the names of the
+  // `<` and `&` bindings in the AngularJS component that is being wrapped.
+  @Input() hero: Hero;
+  @Output() onRemove: EventEmitter<void>;
+
+  constructor(elementRef: ElementRef, injector: Injector) {
+    // We must pass the name of the directive as used by AngularJS to the super.
+    super('ng1Hero', elementRef, injector);
+  }
+}
+
+
+// This Angular module represents the Angular pieces of the application.
+@NgModule({
+  imports: [BrowserModule],
+  declarations: [Ng2HeroesComponent, Ng1HeroComponentWrapper],
+  providers: [
+    HeroesService,
+    // Register an Angular provider whose value is the "upgraded" AngularJS service.
+    {provide: 'titleCase', useFactory: (i: any) => i.get('titleCase'), deps: ['$injector']}
+  ],
+  // All components that are to be "downgraded" must be declared as `entryComponents`.
+  entryComponents: [Ng2HeroesComponent]
+  // Note that there are no `bootstrap` components, since the "downgraded" component
+  // will be instantiated by ngUpgrade.
+})
+class MyLazyAngularModule {
+  // Empty placeholder method to prevent the `Compiler` from complaining.
+  ngDoBootstrap() {}
+}
+
+
+// #docregion basic-how-to
+
+
+// The function that will bootstrap the Angular module (when/if necessary).
+// (This would be omitted if we provided an `NgModuleFactory` directly.)
+const ng2BootstrapFn = (extraProviders: StaticProvider[]) =>
+    platformBrowserDynamic(extraProviders).bootstrapModule(MyLazyAngularModule);
+// #enddocregion
+// (We are using the dynamic browser platform, as this example has not been compiled AoT.)
+
+
+// #docregion basic-how-to
+
+
+// This AngularJS module represents the AngularJS pieces of the application.
+const myMainAngularJsModule = angular.module('myMainAngularJsModule', [
+  // We declare a dependency on the "downgraded" Angular module.
+  downgradeModule(ng2BootstrapFn)
+  // or
+  // downgradeModule(MyLazyAngularModuleFactory)
+]);
+// #enddocregion
+
+
+// This AngularJS component will be "upgraded" to be used in Angular.
+myMainAngularJsModule.component('ng1Hero', {
+  bindings: {hero: '<', onRemove: '&'},
+  transclude: true,
+  template: `
+    <div class="ng1-hero">
+      <div class="title" ng-transclude></div>
+      <h2>{{ $ctrl.hero.name }}</h2>
+      <p>{{ $ctrl.hero.description }}</p>
+      <button ng-click="$ctrl.onRemove()">Remove</button>
+    </div>
+  `
+});
+
+
+// This AngularJS service will be "upgraded" to be used in Angular.
+myMainAngularJsModule.factory(
+    'titleCase', () => (value: string) => value.replace(/(^|\s)[a-z]/g, m => m.toUpperCase()));
+
+
+// This directive will act as the interface to the "downgraded" Angular component.
+myMainAngularJsModule.directive(
+    'ng2Heroes', downgradeComponent({
+      component: Ng2HeroesComponent,
+      // Optionally, disable `$digest` propagation to avoid unnecessary change detection.
+      // (Change detection is still run when the inputs of a "downgraded" component change.)
+      propagateDigest: false
+    }));
+
+
+// This is our top level application component.
+myMainAngularJsModule.component('exampleApp', {
+  // This template makes use of the "downgraded" `ng2-heroes` component,
+  // but loads it lazily only when/if the user clicks the button.
+  // (Note that because its element is compiled by AngularJS,
+  //  we must use kebab-case attributes for inputs and outputs.)
+  template: `
+    <link rel="stylesheet" href="./styles.css">
+    <button ng-click="$ctrl.toggleHeroes()">{{ $ctrl.toggleBtnText() }}</button>
+    <ng2-heroes
+        ng-if="$ctrl.showHeroes"
+        (add-hero)="$ctrl.setStatusMessage('Added hero ' + $event.name)"
+        (remove-hero)="$ctrl.setStatusMessage('Removed hero ' + $event.name)">
+      <h1>Heroes</h1>
+      <p class="extra">Status: {{ $ctrl.statusMessage }}</p>
+    </ng2-heroes>
+  `,
+  controller: function() {
+    this.showHeroes = false;
+    this.statusMessage = 'Ready';
+
+    this.setStatusMessage = (msg: string) => this.statusMessage = msg;
+    this.toggleHeroes = () => this.showHeroes = !this.showHeroes;
+    this.toggleBtnText = () => `${this.showHeroes ? 'Hide' : 'Show'} heroes`;
+  }
+});
+
+
+// We bootstrap the Angular module as we would do in a normal Angular app.
+angular.bootstrap(document.body, [myMainAngularJsModule.name]);
diff --git a/packages/examples/upgrade/static/ts/lite/styles.css b/packages/examples/upgrade/static/ts/lite/styles.css
new file mode 100644
index 0000000000..f3785c1c22
--- /dev/null
+++ b/packages/examples/upgrade/static/ts/lite/styles.css
@@ -0,0 +1,17 @@
+ng2-heroes {
+  border: solid black 2px;
+  display: block;
+  padding: 5px;
+}
+
+ng1-hero {
+  border: solid green 2px;
+  margin-top: 5px;
+  padding: 5px;
+  display: block;
+}
+
+.title {
+  background-color: blue;
+  color: white;
+}
diff --git a/packages/upgrade/src/common/downgrade_component.ts b/packages/upgrade/src/common/downgrade_component.ts
index 9a642fca1d..f536ca235b 100644
--- a/packages/upgrade/src/common/downgrade_component.ts
+++ b/packages/upgrade/src/common/downgrade_component.ts
@@ -34,14 +34,14 @@ interface Thenable<T> {
  * Let's assume that you have an Angular component called `ng2Heroes` that needs
  * to be made available in AngularJS templates.
  *
- * {@example upgrade/static/ts/module.ts region="ng2-heroes"}
+ * {@example upgrade/static/ts/full/module.ts region="ng2-heroes"}
  *
  * We must create an AngularJS [directive](https://docs.angularjs.org/guide/directive)
  * that will make this Angular component available inside AngularJS templates.
  * The `downgradeComponent()` function returns a factory function that we
  * can use to define the AngularJS directive that wraps the "downgraded" component.
  *
- * {@example upgrade/static/ts/module.ts region="ng2-heroes-wrapper"}
+ * {@example upgrade/static/ts/full/module.ts region="ng2-heroes-wrapper"}
  *
  * @param info contains information about the Component that is being downgraded:
  *
diff --git a/packages/upgrade/src/common/downgrade_injectable.ts b/packages/upgrade/src/common/downgrade_injectable.ts
index 64c13fc7c0..c763067eb2 100644
--- a/packages/upgrade/src/common/downgrade_injectable.ts
+++ b/packages/upgrade/src/common/downgrade_injectable.ts
@@ -26,21 +26,21 @@ import {INJECTOR_KEY} from './constants';
  * that will be part of the upgrade application. For example, let's assume we have
  * defined `HeroesService`
  *
- * {@example upgrade/static/ts/module.ts region="ng2-heroes-service"}
+ * {@example upgrade/static/ts/full/module.ts region="ng2-heroes-service"}
  *
  * and that we have included this in our upgrade app `NgModule`
  *
- * {@example upgrade/static/ts/module.ts region="ng2-module"}
+ * {@example upgrade/static/ts/full/module.ts region="ng2-module"}
  *
  * Now we can register the `downgradeInjectable` factory function for the service
  * on an AngularJS module.
  *
- * {@example upgrade/static/ts/module.ts region="downgrade-ng2-heroes-service"}
+ * {@example upgrade/static/ts/full/module.ts region="downgrade-ng2-heroes-service"}
  *
  * Inside an AngularJS component's controller we can get hold of the
  * downgraded service via the name we gave when downgrading.
  *
- * {@example upgrade/static/ts/module.ts region="example-app"}
+ * {@example upgrade/static/ts/full/module.ts region="example-app"}
  *
  * @param token an `InjectionToken` that identifies a service provided from Angular.
  *
diff --git a/packages/upgrade/src/static/downgrade_module.ts b/packages/upgrade/src/static/downgrade_module.ts
index dcd0d5fb79..cd9605a1e4 100644
--- a/packages/upgrade/src/static/downgrade_module.ts
+++ b/packages/upgrade/src/static/downgrade_module.ts
@@ -17,7 +17,86 @@ import {angular1Providers, setTempInjectorRef} from './angular1_providers';
 import {NgAdapterInjector} from './util';
 
 
-/** @experimental */
+/**
+ * <!-- TODO(gkalpak): Add link to guide. -->
+ *
+ * @description
+ *
+ * A helper function for creating an AngularJS module that can bootstrap an Angular module
+ * "on-demand" (possibly lazily) when a {@link downgradeComponent downgraded component} needs to be
+ * instantiated.
+ *
+ * *Part of the [upgrade/static](api?query=upgrade/static) library for hybrid upgrade apps that
+ * support AoT compilation.*
+ *
+ * It allows loading/bootstrapping the Angular part of a hybrid application lazily and not having to
+ * pay the cost up-front. For example, you can have an AngularJS application that uses Angular for
+ * specific routes and only instantiate the Angular modules if/when the user visits one of these
+ * routes.
+ *
+ * The Angular module will be bootstrapped once (when requested for the first time) and the same
+ * reference will be used from that point onwards.
+ *
+ * `downgradeModule()` requires either an `NgModuleFactory` or a function:
+ * - `NgModuleFactory`: If you pass an `NgModuleFactory`, it will be used to instantiate a module
+ *   using `platformBrowser`'s {@link PlatformRef#bootstrapModuleFactory bootstrapModuleFactory()}.
+ * - `Function`: If you pass a function, it is expected to return a promise resolving to an
+ *   `NgModuleRef`. The function is called with an array of extra {@link StaticProvider Providers}
+ *   that are expected to be available from the returned `NgModuleRef`'s `Injector`.
+ *
+ * `downgradeModule()` returns the name of the created AngularJS wrapper module. You can use it to
+ * declare a dependency in your main AngularJS module.
+ *
+ * {@example upgrade/static/ts/lite/module.ts region="basic-how-to"}
+ *
+ * @usageNotes
+ *
+ * Apart from `UpgradeModule`, you can use the rest of the `upgrade/static` helpers as usual to
+ * build a hybrid application. Note that the Angular pieces (e.g. downgraded services) will not be
+ * available until the downgraded module has been bootstrapped, i.e. by instantiating a downgraded
+ * component.
+ *
+ * <div class="alert is-important">
+ *
+ *   You cannot use `downgradeModule()` and `UpgradeModule` in the same hybrid application.<br />
+ *   Use one or the other.
+ *
+ * </div>
+ *
+ * ### Differences with `UpgradeModule`
+ *
+ * Besides their different API, there are two important internal differences between
+ * `downgradeModule()` and `UpgradeModule` that affect the behavior of hybrid applications:
+ *
+ * 1. Unlike `UpgradeModule`, `downgradeModule()` does not bootstrap the main AngularJS module
+ *    inside the {@link NgZone Angular zone}.
+ * 2. Unlike `UpgradeModule`, `downgradeModule()` does not automatically run a
+ *    [$digest()](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$digest) when changes are
+ *    detected in the Angular part of the application.
+ *
+ * What this means is that applications using `UpgradeModule` will run change detection more
+ * frequently in order to ensure that both frameworks are properly notified about possible changes.
+ * This will inevitably result in more change detection runs than necessary.
+ *
+ * `downgradeModule()`, on the other side, does not try to tie the two change detection systems as
+ * tightly, restricting the explicit change detection runs only to cases where it knows it is
+ * necessary (e.g. when the inputs of a downgraded component change). This improves performance,
+ * especially in change-detection-heavy applications, but leaves it up to the developer to manually
+ * notify each framework as needed.
+ *
+ * <div class="alert is-helpful">
+ *
+ *   You can manually trigger a change detection run in AngularJS using
+ *   [scope.$apply(...)](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$apply) or
+ *   [$rootScope.$digest()](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$digest).
+ *
+ *   You can manually trigger a change detection run in Angular using {@link NgZone#run
+ *   ngZone.run(...)}.
+ *
+ * </div>
+ *
+ * @experimental
+ */
 export function downgradeModule<T>(
     moduleFactoryOrBootstrapFn: NgModuleFactory<T>|
     ((extraProviders: StaticProvider[]) => Promise<NgModuleRef<T>>)): string {
diff --git a/packages/upgrade/src/static/upgrade_component.ts b/packages/upgrade/src/static/upgrade_component.ts
index 984067bb7a..a63699f8b4 100644
--- a/packages/upgrade/src/static/upgrade_component.ts
+++ b/packages/upgrade/src/static/upgrade_component.ts
@@ -42,12 +42,12 @@ class Bindings {
  * Let's assume that you have an AngularJS component called `ng1Hero` that needs
  * to be made available in Angular templates.
  *
- * {@example upgrade/static/ts/module.ts region="ng1-hero"}
+ * {@example upgrade/static/ts/full/module.ts region="ng1-hero"}
  *
  * We must create a `Directive` that will make this AngularJS component
  * available inside Angular templates.
  *
- * {@example upgrade/static/ts/module.ts region="ng1-hero-wrapper"}
+ * {@example upgrade/static/ts/full/module.ts region="ng1-hero-wrapper"}
  *
  * In this example you can see that we must derive from the `UpgradeComponent`
  * base class but also provide an {@link Directive `@Directive`} decorator. This is
@@ -95,7 +95,7 @@ export class UpgradeComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
    * Instead you should derive a new class from this one and call the super constructor
    * from the base class.
    *
-   * {@example upgrade/static/ts/module.ts region="ng1-hero-wrapper" }
+   * {@example upgrade/static/ts/full/module.ts region="ng1-hero-wrapper" }
    *
    * * The `name` parameter should be the name of the AngularJS directive.
    * * The `elementRef` and `injector` parameters should be acquired from Angular by dependency
diff --git a/packages/upgrade/src/static/upgrade_module.ts b/packages/upgrade/src/static/upgrade_module.ts
index 0b016d9c5c..9424b77c86 100644
--- a/packages/upgrade/src/static/upgrade_module.ts
+++ b/packages/upgrade/src/static/upgrade_module.ts
@@ -107,17 +107,17 @@ import {NgAdapterInjector} from './util';
  *
  * Import the `UpgradeModule` into your top level {@link NgModule Angular `NgModule`}.
  *
- * {@example upgrade/static/ts/module.ts region='ng2-module'}
+ * {@example upgrade/static/ts/full/module.ts region='ng2-module'}
  *
  * Then inject `UpgradeModule` into your Angular `NgModule` and use it to bootstrap the top level
  * [AngularJS module](https://docs.angularjs.org/api/ng/type/angular.Module) in the
  * `ngDoBootstrap()` method.
  *
- * {@example upgrade/static/ts/module.ts region='bootstrap-ng1'}
+ * {@example upgrade/static/ts/full/module.ts region='bootstrap-ng1'}
  *
  * Finally, kick off the whole process, by bootstraping your top level Angular `NgModule`.
  *
- * {@example upgrade/static/ts/module.ts region='bootstrap-ng2'}
+ * {@example upgrade/static/ts/full/module.ts region='bootstrap-ng2'}
  *
  * {@a upgrading-an-angular-1-service}
  * ### Upgrading an AngularJS service
@@ -127,17 +127,17 @@ import {NgAdapterInjector} from './util';
  *
  * Let's say you have an AngularJS service:
  *
- * {@example upgrade/static/ts/module.ts region="ng1-title-case-service"}
+ * {@example upgrade/static/ts/full/module.ts region="ng1-title-case-service"}
  *
  * Then you should define an Angular provider to be included in your `NgModule` `providers`
  * property.
  *
- * {@example upgrade/static/ts/module.ts region="upgrade-ng1-service"}
+ * {@example upgrade/static/ts/full/module.ts region="upgrade-ng1-service"}
  *
  * Then you can use the "upgraded" AngularJS service by injecting it into an Angular component
  * or service.
  *
- * {@example upgrade/static/ts/module.ts region="use-ng1-upgraded-service"}
+ * {@example upgrade/static/ts/full/module.ts region="use-ng1-upgraded-service"}
  *
  * @experimental
  */

From 70156bc4ed3515545c27fa0dfd7010220eea65b8 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 8 Aug 2017 21:24:07 +0300
Subject: [PATCH 362/582] docs(upgrade): add guide about `downgradeModule()`
 (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 aio/content/guide/upgrade-lite.md             | 357 ++++++++++++++++++
 aio/content/guide/upgrade.md                  |  12 +-
 aio/content/navigation.json                   |   5 +
 .../upgrade/src/static/downgrade_module.ts    |   8 +-
 4 files changed, 374 insertions(+), 8 deletions(-)
 create mode 100644 aio/content/guide/upgrade-lite.md

diff --git a/aio/content/guide/upgrade-lite.md b/aio/content/guide/upgrade-lite.md
new file mode 100644
index 0000000000..2ee360611e
--- /dev/null
+++ b/aio/content/guide/upgrade-lite.md
@@ -0,0 +1,357 @@
+# Upgrading from AngularJS (in a more flexible way)
+
+<div class="alert is-helpful">
+
+  _Angular_ is the name for the Angular of today and tomorrow.<br />
+  _AngularJS_ is the name for all 1.x versions of Angular.
+
+</div>
+
+This guide describes some of the built-in tools for efficiently migrating AngularJS projects over
+to the Angular platform, one piece at a time. It is very similar to the
+[main upgrade guide](guide/upgrade) with the exception that this one uses the {@link downgradeModule
+downgradeModule()} helper function instead of the {@link UpgradeModule UpgradeModule} class. This
+affects how the application is bootstrapped and how change detection is propagated between the two
+frameworks (more on that later).
+
+
+## Preparation
+
+Before we start discussing how you can use `downgradeModule()` to create hybrid applications, there
+are things that you can do to ease the upgrade process even before you begin upgrading. Although not
+strictly necessary, preparation goes a long way! The steps are the same regardless how you upgrade,
+so go ahead and read the [Preparation](guide/upgrade#preparation) section of the main upgrade guide.
+
+
+## Upgrading with ngUpgrade
+
+With the ngUpgrade library in Angular you can upgrade an existing AngularJS application
+incrementally, by building a hybrid application where you can run both frameworks side-by-side. In
+these hybrid applications you can mix and match AngularJS and Angular components and services and
+have them interoperate seamlessly. That means you don't have to do the upgrade work all at once,
+since there is a natural coexistence between the two frameworks during the transition period.
+
+
+### How ngUpgrade Works
+
+Regardless of whether you choose `downgradeModule()` or `UpgradeModule`, the basic principles of
+upgrading, the mental model behind hybrid applications and how you use the {@link upgrade/static
+upgrade/static} utilities remain the same. You can read about all that in the
+[How ngUpgrade Works](guide/upgrade#how-ngupgrade-works) section of the main upgrade guide.
+
+<div class="alert is-helpful">
+
+  The [Change Detection](guide/upgrade#change-detection) sub-section only applies to applications
+  that use `UpgradeModule`. Change detection is handled differently with `downgradeModule()`.<br />
+  We still recommend reading the sub-section in order to better understand the differences and their
+  implications.
+
+</div>
+
+
+#### Change Detection with `downgradeModule()`
+
+As mentioned before, one of the key differences between `downgradeModule()` and `UpgradeModule` has
+to do with change detection and how it is propagated between the two frameworks.
+
+With `UpgradeModule`, the two change detection systems are tied together more tightly. Whenever
+something happens in the AngularJS part of the application, change detection is automatically
+triggered on the Angular part and vice versa. This is convenient as it ensures that no important
+change is missed by either framework. Most of the time, though, these extra change detection runs
+are unnecesary.
+
+`downgradeModule()`, on the other side, avoids explicitly triggering change detection, unless it
+knows the other part of the application is interested in the changes. One way to know, for example,
+is when a value is bound to the {@link Input input} of a downgraded component. If the component
+defines an `Input`, chances are it needs to be change-detected when that value changes. Thus,
+`downgradeComponent()` _will_ automatically trigger change detection on that component.
+
+In most cases, though, the changes made locally in a particular component are of no interest to the
+rest of the application. For example, if the user clicks a button that submits a form the component
+will usually handle the result of this action. That being said, there _are_ cases, where you want to
+propagate changes to some other part of the application, that may be controlled by the other
+framework. In such cases, you are responsible for notifying the interested parties, by manually
+triggering change detection.
+
+If you want a particular piece of code to trigger change detection in the AngularJS part of the
+application, you need to wrap it in
+[scope.$apply(...)](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$apply). Similarly, for
+triggering change detection in Angular you would use {@link NgZone#run ngZone.run(...)}.
+
+In many cases, a few extra change detection runs may not matter much. On larger or
+change-detection-heavy applications, though, they can have a noticeable impact. By giving you more
+fine-grained control over the change detection propagation, `downgradeModule()` allows you to
+achieve better performance for your hybrid applications.
+
+
+### Using `downgradeModule()`
+
+Both AngularJS and Angular have their own concept of modules to help organize an application into
+cohesive blocks of functionality.
+
+Their details are quite different in architecture and implementation. In AngularJS, you create a
+module by specifying its name and dependencies with
+[angular.module()](https://docs.angularjs.org/api/ng/function/angular.module). Then you can add
+assets using its various methods. In Angular, you create a class adorned with an {@link NgModule
+NgModule} decorator that describes assets in metadata. The differences blossom from there.
+
+In a hybrid application you run both frameworks at the same time. This means that you need at least
+one module each from both AngularJS and Angular.
+
+For the most part, you specify the modules in the same way as you would for a regular application.
+Then, you use the `upgrade/static` helpers to let the two frameworks know about assets they can use
+from each other. This is known as "upgrading" and "downgrading" (more on how this is done later).
+
+<div class="alert is-helpful">
+
+  <b>Definitions:</b>
+
+  - _Upgrading_: The act of making an AngularJS asset (e.g. component or service) available to the
+    Angular part of the application.
+  - _Downgrading_: The act of making an Angular asset (e.g. component or service) available to the
+    AngularJS part of the application.
+
+</div>
+
+An important part of inter-linking dependencies, is linking the two main modules together. This is
+where `downgradeModule()` comes in. It is used to create an AngularJS module &mdash; one that you
+can use as a dependency in your main AngularJS module &mdash; that will bootstrap your main Angular
+module and kick off the Angular part of the hybrid application. In a sense, it takes an Angular
+module and "downgrades" it to an AngularJS module.
+
+There are a few things to note, though:
+
+1. You don't pass the Angular module directly to `downgradeModule()`. All `downgradeModule()` needs
+   is a "recipe" (e.g. a factory function) for creating an instance for your module.
+
+2. The Angular module is not instantiated until it is actually needed.
+
+We will expand on these two points below. For now, let's see how we can use `downgradeModule()` to
+link the two modules.
+
+```ts
+// Import `downgradeModule()`.
+import { downgradeModule } from '@angular/upgrade/static';
+
+// Use it to "downgrade" the Angular module to an AngularJS module.
+const downgradedModule = downgradeModule(MainAngularModuleFactory);
+
+// Use the downgraded module as a dependency to the main AngularJS module.
+angular.module('mainAngularJsModule', [
+  downgradedModule
+]);
+```
+
+
+#### Specifying a factory for the Angular module
+
+As mentioned before, `downgradeModule()` needs to know how to instantiate the Angular module. It
+needs a "recipe". You define that recipe, by providing a factory function that can create an
+instance of the Angular module. `downgradeModule()` accepts two types of factory functions:
+
+1. {@link NgModuleFactory NgModuleFactory}
+2. (extraProviders: {@link StaticProvider StaticProvider}[]) => Promise<{@link NgModuleRef NgModuleRef}>
+
+If you pass an `NgModuleFactory`, it will be used to instantiate the module using
+{@link platformBrowser platformBrowser}'s {@link PlatformRef#bootstrapModuleFactory
+bootstrapModuleFactory()}. This is great, because it is compatible with Ahead-of-Time (AoT)
+compilation. You can read more about AoT compilation and how to create an `NgModuleFactory` in the
+[AoT Compilation](guide/aot-compiler) guide.
+
+Alternatively, you can pass a plain function, which is expected to return a promise resolving to an
+{@link NgModuleRef NgModuleRef} (i.e. an instance of your Angular module). The function is called
+with an array of extra {@link StaticProvider Providers} that are expected to be available on the returned
+`NgModuleRef`'s {@link Injector Injector}. For example, if you are using {@link platformBrowser
+platformBrowser} or {@link platformBrowserDynamic platformBrowserDynamic}, you can pass the
+`extraProviders` array to them:
+
+```ts
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowserDynamic(extraProviders);
+  return platformRef.bootstrapModule(MainAngularModule);
+};
+// or
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowser(extraProviders);
+  return platformRef.bootstrapModuleFactory(MainAngularModuleFactory);
+};
+```
+
+Using an `NgModuleFactory` requires less boilerplate and is a good default option as it supports
+AoT out-of-the-box. Using a custom function requires slightly more code, but gives you greater
+flexibility.
+
+
+#### Instantiating the Angular module "on-demand"
+
+Another key difference between `downgradeModule()` and `UpgradeModule` is that the latter requires
+you to instantiate both the AngularJS and Angular modules up-front. This means that you have to pay
+the cost of instantiating the Angular part of the application, even if you don't use any Angular
+assets until later. `downgradeModule()` is again less aggressive: It will only instantiate the
+Angular part when it is required for the first time; i.e. as soon as a downgraded component needs to
+be created.
+
+You could go a step further and not even download the code for the Angular part of the application
+to the user's browser, until it is needed. This is especially useful, when you use Angular on parts
+of the hybrid application that are not necessary for the initial rendering or are not often reached
+by the user (or not reached by all types of users).
+
+A few examples:
+
+- You use Angular on specific routes only and you don't need it until/if such a route is visited by
+  the user.
+- You use Angular for features that are only visible to specific types of users (e.g. logged-in
+  users or administrators or VIP members). You don't need to load Angular until a user is
+  authenticated.
+- You use Angular for a feature that is not critical for the initial rendering of the application
+  and you can afford a small delay in favor of better initial load performance.
+
+
+### Bootstrapping with `downgradeModule()`
+
+As you may have guessed, you don't need to change anything in the way you bootstrap your existing
+AngularJS application. Unlike `UpgradeModule` &mdash; which requires some extra steps &mdash;
+`downgradeModule()` is able to take care of bootstrapping the Angular module (as long as you provide
+the recipe).
+
+In order to start using any `upgrade/static` APIs, you still need to load the Angular framework (as
+you would in a normal Angular application). You can see how this can be done with SystemJS by
+following the instructions in the [Setup](guide/setup) guide, selectively copying code from the
+[QuickStart github repository](https://github.com/angular/quickstart).
+
+You also need to install the `@angular/upgrade` package via `npm install @angular/upgrade --save`
+and add a mapping for the `@angular/upgrade/static` package:
+
+<code-example title="system.config.js">
+'@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
+</code-example>
+
+Next, create an `app.module.ts` file and add the following `NgModule` class:
+
+<code-example title="app.module.ts">
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+@NgModule({
+  imports: [
+    BrowserModule
+  ]
+})
+export class MainAngularModule {
+  // Empty placeholder method to prevent the `Compiler` from complaining.
+  ngDoBootstrap() {}
+}
+</code-example>
+
+This bare minimum `NgModule` imports `BrowserModule`, the module every Angular browser-based app
+must have. It also defines an empty `ngDoBootstrap()` method, to prevent the {@link Compiler
+Compiler} from complaining. This is necessary, because the module will not have a `bootstrap`
+declaration on its `NgModule` decorator.
+
+<div class="alert is-important">
+
+  You do not add a `bootstrap` declaration to the `NgModule` decorator, since AngularJS will own the
+  root template of the application and ngUpgrade will be bootstrapping the necessary components.
+
+</div>
+
+You can now link the AngularJS and Angular modules together using `downgradeModule()`.
+
+<code-example title="app.module.ts">
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { downgradeModule } from '@angular/upgrade/static';
+
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowserDynamic(extraProviders);
+  return platformRef.bootstrapModule(MainAngularModule);
+};
+const downgradedModule = downgradeModule(bootstrapFn);
+
+angular.module('mainAngularJsModule', [
+  downgradedModule
+]);
+</code-example>
+
+Congratulations! You are running a hybrid application! The existing AngularJS code works as before
+_and_ you are ready to start adding Angular code.
+
+
+### Using Components and Injectables
+
+The differences between `downgradeModule()` and `UpgradeModule` end here. The rest of the
+`upgrade/static` APIs and concepts work in the exact same way for both types of hybrid applications.
+Head over to the [main upgrade guide](guide/upgrade) to learn about:
+
+- [Using Angular Components from AngularJS Code](guide/upgrade#using-angular-components-from-angularjs-code)
+- [Using AngularJS Component Directives from Angular Code](guide/upgrade#using-angularjs-component-directives-from-angular-code)
+- [Projecting AngularJS Content into Angular Components](guide/upgrade#projecting-angularjs-content-into-angular-components)
+- [Transcluding Angular Content into AngularJS Component Directives](guide/upgrade#transcluding-angular-content-into-angularjs-component-directives)
+- [Making AngularJS Dependencies Injectable to Angular](guide/upgrade#making-angularjs-dependencies-injectable-to-angular)
+- [Making Angular Dependencies Injectable to AngularJS](guide/upgrade#making-angular-dependencies-injectable-to-angularjs)
+
+<div class="alert is-important">
+
+  While it is possible to downgrade injectables, the downgraded injectables will _not_ be available
+  until the Angular module is instantiated too. In order to be safe, you need to ensure that the
+  downgraded injectables are not used anywhere _outside_ the part of the application that is
+  controlled by Angular.
+
+  For example, it is _OK_ to use a downgraded service in an upgraded component that is only used
+  from Angular components, but it is _not OK_ to use it in an AngularJS component that may be used
+  independently of Angular.
+
+</div>
+
+
+## Using Ahead-of-Time compilation with hybrid applications
+
+You can take advantage of Ahead-of-Time (AoT) compilation on hybrid applications just like on any
+other Angular application. The setup for a hybrid application is mostly the same as described in the
+[AoT Compilation](guide/aot-compiler) guide save for differences in `index.html` and `main-aot.ts`.
+
+The `index.html` will likely have script tags loading AngularJS files, so the `index.html` for AoT
+must also load those files. An easy way to copy them is by adding each to the `copy-dist-files.js`
+file.
+
+You will also need to pass the generated `MainAngularModuleFactory` to `downgradeModule()`, instead of
+the custom bootstrap function:
+
+<code-example title="app/main-aot.ts">
+import { downgradeModule } from '@angular/upgrade/static';
+import { MainAngularModuleNgFactory } from '../aot/app/app.module.ngfactory';
+
+const downgradedModule = downgradeModule(MainAngularModuleNgFactory);
+
+angular.module('mainAngularJsModule', [
+  downgradedModule
+]);
+</code-example>
+
+And that is all you need to do to get the full benefit of AoT for Angular applications!
+
+
+## Wrap up
+
+You have learned how to use the {@link upgrade/static upgrade/static} package to incrementally
+upgrade existing AngularJS applications at your own pace and without impeding further development of
+the application for the duration of the upgrade process.
+
+More specifically, you have seen how you can achieve better performance and greater flexibility in
+your hybrid applications, by using {@link downgradeModule downgradeModule()} (instead of
+{@link UpgradeModule UpgradeModule}).
+
+To summarize, the key differentiating factors of `downgradeModule()` are:
+
+1. It allows instantiating (or even loading) the Angular part lazily, which improves the initial
+   loading time (and is some cases may waive the cost of running a second framework altogether).
+2. It improves performance by avoiding unnecessary change detection runs, instead putting more
+   responsibility on the developer.
+3. It does not require you to change how you bootstrap your AngularJS app.
+
+Based on that, `downgradeModule()` is a good option for hybrid applications that want keep the
+AngularJS and Angular parts less coupled. You can still mix and match components and services from
+both frameworks, but you might need to manually propagate change detection. In return,
+`downgradeModule()` offers more control and better performance characteristics.
+
+There is merit in both approaches, so you should always weight the pros and cons before deciding
+which one better meets the upgrading needs of each project.
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index 1db54114ce..d13603d104 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -1,7 +1,7 @@
 # Upgrading from AngularJS to Angular
 
-_Angular_ is the name for the Angular of today and tomorrow.
-_AngularJS_ is the name for all v1.x versions of Angular.
+_Angular_ is the name for the Angular of today and tomorrow.<br />
+_AngularJS_ is the name for all 1.x versions of Angular.
 
 AngularJS apps are great.
 Always consider the business case before moving to Angular.
@@ -195,7 +195,7 @@ transition period.
 
 ### How ngUpgrade Works
 
-The primary tool provided by ngUpgrade is called the `UpgradeModule`.
+One of the primary tools provided by ngUpgrade is called the `UpgradeModule`.
 This is a module that contains utilities for bootstrapping and managing hybrid
 applications that support both Angular and AngularJS code.
 
@@ -252,7 +252,7 @@ frameworks in how it actually works.
 </table>
 
 Even accounting for these differences you can still have dependency injection
-interoperability. The `UpgradeModule` resolves the differences and makes
+interoperability. `upgrade/static` resolves the differences and makes
 everything work seamlessly:
 
 * You can make AngularJS services available for injection to Angular code
@@ -569,7 +569,7 @@ So, you can write an Angular component and then use it from AngularJS
 code. This is useful when you start to migrate from lower-level
 components and work your way up. But in some cases it is more convenient
 to do things in the opposite order: To start with higher-level components
-and work your way down. This too can be done using the `UpgradeModule`.
+and work your way down. This too can be done using the `upgrade/static`.
 You can *upgrade* AngularJS component directives and then use them from
 Angular.
 
@@ -710,7 +710,7 @@ and then provide the input and output using Angular template syntax:
 When you are using a downgraded Angular component from an AngularJS
 template, the need may arise to *transclude* some content into it. This
 is also possible. While there is no such thing as transclusion in Angular,
-there is a very similar concept called *content projection*. The `UpgradeModule`
+there is a very similar concept called *content projection*. `upgrade/static`
 is able to make these two features interoperate.
 
 Angular components that support content projection make use of an `<ng-content>`
diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index c0006c1c0d..d566c19b26 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -514,6 +514,11 @@
               "title": "Upgrading Instructions",
               "tooltip": "Incrementally upgrade an AngularJS application to Angular."
             },
+            {
+              "url": "guide/upgrade-lite",
+              "title": "Lazy-loading Angular into AngularJS",
+              "tooltip": "Upgrade from AngularJS to Angular in a more flexible way."
+            },
             {
               "url": "guide/ajs-quick-reference",
               "title": "AngularJS-Angular Concepts",
diff --git a/packages/upgrade/src/static/downgrade_module.ts b/packages/upgrade/src/static/downgrade_module.ts
index cd9605a1e4..25c81cc00c 100644
--- a/packages/upgrade/src/static/downgrade_module.ts
+++ b/packages/upgrade/src/static/downgrade_module.ts
@@ -18,8 +18,6 @@ import {NgAdapterInjector} from './util';
 
 
 /**
- * <!-- TODO(gkalpak): Add link to guide. -->
- *
  * @description
  *
  * A helper function for creating an AngularJS module that can bootstrap an Angular module
@@ -49,6 +47,9 @@ import {NgAdapterInjector} from './util';
  *
  * {@example upgrade/static/ts/lite/module.ts region="basic-how-to"}
  *
+ * For more details on how to use `downgradeModule()` see
+ * [Upgrading for Performance](guide/upgrade-lite).
+ *
  * @usageNotes
  *
  * Apart from `UpgradeModule`, you can use the rest of the `upgrade/static` helpers as usual to
@@ -84,6 +85,9 @@ import {NgAdapterInjector} from './util';
  * especially in change-detection-heavy applications, but leaves it up to the developer to manually
  * notify each framework as needed.
  *
+ * For a more detailed discussion of the differences and their implications, see
+ * [Upgrading for Performance](guide/upgrade-lite).
+ *
  * <div class="alert is-helpful">
  *
  *   You can manually trigger a change detection run in AngularJS using

From 4258c3d1df1969e5a3f61a7918ace7abd478e851 Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 17 Aug 2017 13:38:12 +0100
Subject: [PATCH 363/582] docs(upgrade): fix sub-ordered-list syntax (#18487)
 (#18487)

We must always use 1., 2. etc, to indicate ordered lists, even for sub-lists.
We can change the sublist to display as a., b. etc, via CSS.

PR Close #18487

PR Close #18487
---
 packages/upgrade/src/static/upgrade_module.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/upgrade/src/static/upgrade_module.ts b/packages/upgrade/src/static/upgrade_module.ts
index 9424b77c86..8e641d1e29 100644
--- a/packages/upgrade/src/static/upgrade_module.ts
+++ b/packages/upgrade/src/static/upgrade_module.ts
@@ -73,12 +73,12 @@ import {NgAdapterInjector} from './util';
  * 7. Whenever an "upgraded"/"downgraded" component is instantiated the host element is owned by
  *    the framework doing the instantiation. The other framework then instantiates and owns the
  *    view for that component.
- *    a. This implies that the component bindings will always follow the semantics of the
+ *    1. This implies that the component bindings will always follow the semantics of the
  *       instantiation framework.
- *    b. The DOM attributes are parsed by the framework that owns the current template. So
+ *    2. The DOM attributes are parsed by the framework that owns the current template. So
  *       attributes in AngularJS templates must use kebab-case, while AngularJS templates must use
  *       camelCase.
- *    c. However the template binding syntax will always use the Angular style, e.g. square
+ *    3. However the template binding syntax will always use the Angular style, e.g. square
  *       brackets (`[...]`) for property binding.
  * 8. Angular is bootstrapped first; AngularJS is bootstrapped second. AngularJS always owns the
  *    root component of the application.

From bb6b59128f855d9d67519c592de04a23d2bbe1d6 Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 17 Aug 2017 13:56:04 +0100
Subject: [PATCH 364/582] docs(upgrade): use a class for upgraded service
 (#18487) (#18487)

This makes the resulting use in Angular more ideomatic, since we can just
use the class type as the injection indicator.

PR Close #18487

PR Close #18487
---
 .../examples/upgrade/static/ts/full/module.ts | 20 +++++++++++--------
 packages/upgrade/src/static/upgrade_module.ts |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/examples/upgrade/static/ts/full/module.ts b/packages/examples/upgrade/static/ts/full/module.ts
index 7e842c4cee..61da6b8a22 100644
--- a/packages/examples/upgrade/static/ts/full/module.ts
+++ b/packages/examples/upgrade/static/ts/full/module.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+// #docplaster
 import {Component, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
@@ -18,6 +18,12 @@ interface Hero {
   description: string;
 }
 
+// #docregion ng1-text-formatter-service
+class TextFormatter {
+  titleCase(value: string) { return value.replace(/((^|\s)[a-z])/g, (_, c) => c.toUpperCase()); }
+}
+
+// #enddocregion
 // #docregion Angular Stuff
 // #docregion ng2-heroes
 // This Angular component will be "downgraded" to be used in AngularJS
@@ -51,9 +57,9 @@ class HeroesService {
   ];
 
   // #docregion use-ng1-upgraded-service
-  constructor(@Inject('titleCase') titleCase: (v: string) => string) {
+  constructor(textFormatter: TextFormatter) {
     // Change all the hero names to title case, using the "upgraded" AngularJS service
-    this.heroes.forEach((hero: Hero) => hero.name = titleCase(hero.name));
+    this.heroes.forEach((hero: Hero) => hero.name = textFormatter.titleCase(hero.name));
   }
   // #enddocregion
 
@@ -92,7 +98,7 @@ class Ng1HeroComponentWrapper extends UpgradeComponent {
     HeroesService,
     // #docregion upgrade-ng1-service
     // Register an Angular provider whose value is the "upgraded" AngularJS service
-    {provide: 'titleCase', useFactory: (i: any) => i.get('titleCase'), deps: ['$injector']}
+    {provide: TextFormatter, useFactory: (i: any) => i.get('textFormatter'), deps: ['$injector']}
     // #enddocregion
   ],
   // All components that are to be "downgraded" must be declared as `entryComponents`
@@ -134,11 +140,9 @@ ng1AppModule.component('ng1Hero', {
 });
 // #enddocregion
 
-// #docregion ng1-title-case-service
+// #docregion ng1-text-formatter-service
 // This AngularJS service will be "upgraded" to be used in Angular
-ng1AppModule.factory(
-    'titleCase',
-    () => (value: string) => value.replace(/((^|\s)[a-z])/g, (_, c) => c.toUpperCase()));
+ng1AppModule.service('textFormatter', [TextFormatter]);
 // #enddocregion
 
 // #docregion downgrade-ng2-heroes-service
diff --git a/packages/upgrade/src/static/upgrade_module.ts b/packages/upgrade/src/static/upgrade_module.ts
index 8e641d1e29..bf62d6e49d 100644
--- a/packages/upgrade/src/static/upgrade_module.ts
+++ b/packages/upgrade/src/static/upgrade_module.ts
@@ -127,7 +127,7 @@ import {NgAdapterInjector} from './util';
  *
  * Let's say you have an AngularJS service:
  *
- * {@example upgrade/static/ts/full/module.ts region="ng1-title-case-service"}
+ * {@example upgrade/static/ts/full/module.ts region="ng1-text-formatter-service"}
  *
  * Then you should define an Angular provider to be included in your `NgModule` `providers`
  * property.

From 22758912a0b0ee1aec9a569700b0947c28c49c46 Mon Sep 17 00:00:00 2001
From: Kapunahele Wong <kapunahelewong@gmail.com>
Date: Mon, 11 Sep 2017 12:25:29 -0400
Subject: [PATCH 365/582] docs(aio): tech edits to upgrade-lazy (#18487)
 (#18487)

PR Close #18487

PR Close #18487
---
 aio/content/guide/upgrade-lite.md             | 357 ------------------
 aio/content/guide/upgrade-performance.md      | 352 +++++++++++++++++
 aio/content/navigation.json                   |   4 +-
 .../upgrade/src/static/downgrade_module.ts    |   4 +-
 4 files changed, 356 insertions(+), 361 deletions(-)
 delete mode 100644 aio/content/guide/upgrade-lite.md
 create mode 100644 aio/content/guide/upgrade-performance.md

diff --git a/aio/content/guide/upgrade-lite.md b/aio/content/guide/upgrade-lite.md
deleted file mode 100644
index 2ee360611e..0000000000
--- a/aio/content/guide/upgrade-lite.md
+++ /dev/null
@@ -1,357 +0,0 @@
-# Upgrading from AngularJS (in a more flexible way)
-
-<div class="alert is-helpful">
-
-  _Angular_ is the name for the Angular of today and tomorrow.<br />
-  _AngularJS_ is the name for all 1.x versions of Angular.
-
-</div>
-
-This guide describes some of the built-in tools for efficiently migrating AngularJS projects over
-to the Angular platform, one piece at a time. It is very similar to the
-[main upgrade guide](guide/upgrade) with the exception that this one uses the {@link downgradeModule
-downgradeModule()} helper function instead of the {@link UpgradeModule UpgradeModule} class. This
-affects how the application is bootstrapped and how change detection is propagated between the two
-frameworks (more on that later).
-
-
-## Preparation
-
-Before we start discussing how you can use `downgradeModule()` to create hybrid applications, there
-are things that you can do to ease the upgrade process even before you begin upgrading. Although not
-strictly necessary, preparation goes a long way! The steps are the same regardless how you upgrade,
-so go ahead and read the [Preparation](guide/upgrade#preparation) section of the main upgrade guide.
-
-
-## Upgrading with ngUpgrade
-
-With the ngUpgrade library in Angular you can upgrade an existing AngularJS application
-incrementally, by building a hybrid application where you can run both frameworks side-by-side. In
-these hybrid applications you can mix and match AngularJS and Angular components and services and
-have them interoperate seamlessly. That means you don't have to do the upgrade work all at once,
-since there is a natural coexistence between the two frameworks during the transition period.
-
-
-### How ngUpgrade Works
-
-Regardless of whether you choose `downgradeModule()` or `UpgradeModule`, the basic principles of
-upgrading, the mental model behind hybrid applications and how you use the {@link upgrade/static
-upgrade/static} utilities remain the same. You can read about all that in the
-[How ngUpgrade Works](guide/upgrade#how-ngupgrade-works) section of the main upgrade guide.
-
-<div class="alert is-helpful">
-
-  The [Change Detection](guide/upgrade#change-detection) sub-section only applies to applications
-  that use `UpgradeModule`. Change detection is handled differently with `downgradeModule()`.<br />
-  We still recommend reading the sub-section in order to better understand the differences and their
-  implications.
-
-</div>
-
-
-#### Change Detection with `downgradeModule()`
-
-As mentioned before, one of the key differences between `downgradeModule()` and `UpgradeModule` has
-to do with change detection and how it is propagated between the two frameworks.
-
-With `UpgradeModule`, the two change detection systems are tied together more tightly. Whenever
-something happens in the AngularJS part of the application, change detection is automatically
-triggered on the Angular part and vice versa. This is convenient as it ensures that no important
-change is missed by either framework. Most of the time, though, these extra change detection runs
-are unnecesary.
-
-`downgradeModule()`, on the other side, avoids explicitly triggering change detection, unless it
-knows the other part of the application is interested in the changes. One way to know, for example,
-is when a value is bound to the {@link Input input} of a downgraded component. If the component
-defines an `Input`, chances are it needs to be change-detected when that value changes. Thus,
-`downgradeComponent()` _will_ automatically trigger change detection on that component.
-
-In most cases, though, the changes made locally in a particular component are of no interest to the
-rest of the application. For example, if the user clicks a button that submits a form the component
-will usually handle the result of this action. That being said, there _are_ cases, where you want to
-propagate changes to some other part of the application, that may be controlled by the other
-framework. In such cases, you are responsible for notifying the interested parties, by manually
-triggering change detection.
-
-If you want a particular piece of code to trigger change detection in the AngularJS part of the
-application, you need to wrap it in
-[scope.$apply(...)](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$apply). Similarly, for
-triggering change detection in Angular you would use {@link NgZone#run ngZone.run(...)}.
-
-In many cases, a few extra change detection runs may not matter much. On larger or
-change-detection-heavy applications, though, they can have a noticeable impact. By giving you more
-fine-grained control over the change detection propagation, `downgradeModule()` allows you to
-achieve better performance for your hybrid applications.
-
-
-### Using `downgradeModule()`
-
-Both AngularJS and Angular have their own concept of modules to help organize an application into
-cohesive blocks of functionality.
-
-Their details are quite different in architecture and implementation. In AngularJS, you create a
-module by specifying its name and dependencies with
-[angular.module()](https://docs.angularjs.org/api/ng/function/angular.module). Then you can add
-assets using its various methods. In Angular, you create a class adorned with an {@link NgModule
-NgModule} decorator that describes assets in metadata. The differences blossom from there.
-
-In a hybrid application you run both frameworks at the same time. This means that you need at least
-one module each from both AngularJS and Angular.
-
-For the most part, you specify the modules in the same way as you would for a regular application.
-Then, you use the `upgrade/static` helpers to let the two frameworks know about assets they can use
-from each other. This is known as "upgrading" and "downgrading" (more on how this is done later).
-
-<div class="alert is-helpful">
-
-  <b>Definitions:</b>
-
-  - _Upgrading_: The act of making an AngularJS asset (e.g. component or service) available to the
-    Angular part of the application.
-  - _Downgrading_: The act of making an Angular asset (e.g. component or service) available to the
-    AngularJS part of the application.
-
-</div>
-
-An important part of inter-linking dependencies, is linking the two main modules together. This is
-where `downgradeModule()` comes in. It is used to create an AngularJS module &mdash; one that you
-can use as a dependency in your main AngularJS module &mdash; that will bootstrap your main Angular
-module and kick off the Angular part of the hybrid application. In a sense, it takes an Angular
-module and "downgrades" it to an AngularJS module.
-
-There are a few things to note, though:
-
-1. You don't pass the Angular module directly to `downgradeModule()`. All `downgradeModule()` needs
-   is a "recipe" (e.g. a factory function) for creating an instance for your module.
-
-2. The Angular module is not instantiated until it is actually needed.
-
-We will expand on these two points below. For now, let's see how we can use `downgradeModule()` to
-link the two modules.
-
-```ts
-// Import `downgradeModule()`.
-import { downgradeModule } from '@angular/upgrade/static';
-
-// Use it to "downgrade" the Angular module to an AngularJS module.
-const downgradedModule = downgradeModule(MainAngularModuleFactory);
-
-// Use the downgraded module as a dependency to the main AngularJS module.
-angular.module('mainAngularJsModule', [
-  downgradedModule
-]);
-```
-
-
-#### Specifying a factory for the Angular module
-
-As mentioned before, `downgradeModule()` needs to know how to instantiate the Angular module. It
-needs a "recipe". You define that recipe, by providing a factory function that can create an
-instance of the Angular module. `downgradeModule()` accepts two types of factory functions:
-
-1. {@link NgModuleFactory NgModuleFactory}
-2. (extraProviders: {@link StaticProvider StaticProvider}[]) => Promise<{@link NgModuleRef NgModuleRef}>
-
-If you pass an `NgModuleFactory`, it will be used to instantiate the module using
-{@link platformBrowser platformBrowser}'s {@link PlatformRef#bootstrapModuleFactory
-bootstrapModuleFactory()}. This is great, because it is compatible with Ahead-of-Time (AoT)
-compilation. You can read more about AoT compilation and how to create an `NgModuleFactory` in the
-[AoT Compilation](guide/aot-compiler) guide.
-
-Alternatively, you can pass a plain function, which is expected to return a promise resolving to an
-{@link NgModuleRef NgModuleRef} (i.e. an instance of your Angular module). The function is called
-with an array of extra {@link StaticProvider Providers} that are expected to be available on the returned
-`NgModuleRef`'s {@link Injector Injector}. For example, if you are using {@link platformBrowser
-platformBrowser} or {@link platformBrowserDynamic platformBrowserDynamic}, you can pass the
-`extraProviders` array to them:
-
-```ts
-const bootstrapFn = (extraProviders: StaticProvider[]) => {
-  const platformRef = platformBrowserDynamic(extraProviders);
-  return platformRef.bootstrapModule(MainAngularModule);
-};
-// or
-const bootstrapFn = (extraProviders: StaticProvider[]) => {
-  const platformRef = platformBrowser(extraProviders);
-  return platformRef.bootstrapModuleFactory(MainAngularModuleFactory);
-};
-```
-
-Using an `NgModuleFactory` requires less boilerplate and is a good default option as it supports
-AoT out-of-the-box. Using a custom function requires slightly more code, but gives you greater
-flexibility.
-
-
-#### Instantiating the Angular module "on-demand"
-
-Another key difference between `downgradeModule()` and `UpgradeModule` is that the latter requires
-you to instantiate both the AngularJS and Angular modules up-front. This means that you have to pay
-the cost of instantiating the Angular part of the application, even if you don't use any Angular
-assets until later. `downgradeModule()` is again less aggressive: It will only instantiate the
-Angular part when it is required for the first time; i.e. as soon as a downgraded component needs to
-be created.
-
-You could go a step further and not even download the code for the Angular part of the application
-to the user's browser, until it is needed. This is especially useful, when you use Angular on parts
-of the hybrid application that are not necessary for the initial rendering or are not often reached
-by the user (or not reached by all types of users).
-
-A few examples:
-
-- You use Angular on specific routes only and you don't need it until/if such a route is visited by
-  the user.
-- You use Angular for features that are only visible to specific types of users (e.g. logged-in
-  users or administrators or VIP members). You don't need to load Angular until a user is
-  authenticated.
-- You use Angular for a feature that is not critical for the initial rendering of the application
-  and you can afford a small delay in favor of better initial load performance.
-
-
-### Bootstrapping with `downgradeModule()`
-
-As you may have guessed, you don't need to change anything in the way you bootstrap your existing
-AngularJS application. Unlike `UpgradeModule` &mdash; which requires some extra steps &mdash;
-`downgradeModule()` is able to take care of bootstrapping the Angular module (as long as you provide
-the recipe).
-
-In order to start using any `upgrade/static` APIs, you still need to load the Angular framework (as
-you would in a normal Angular application). You can see how this can be done with SystemJS by
-following the instructions in the [Setup](guide/setup) guide, selectively copying code from the
-[QuickStart github repository](https://github.com/angular/quickstart).
-
-You also need to install the `@angular/upgrade` package via `npm install @angular/upgrade --save`
-and add a mapping for the `@angular/upgrade/static` package:
-
-<code-example title="system.config.js">
-'@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
-</code-example>
-
-Next, create an `app.module.ts` file and add the following `NgModule` class:
-
-<code-example title="app.module.ts">
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-
-@NgModule({
-  imports: [
-    BrowserModule
-  ]
-})
-export class MainAngularModule {
-  // Empty placeholder method to prevent the `Compiler` from complaining.
-  ngDoBootstrap() {}
-}
-</code-example>
-
-This bare minimum `NgModule` imports `BrowserModule`, the module every Angular browser-based app
-must have. It also defines an empty `ngDoBootstrap()` method, to prevent the {@link Compiler
-Compiler} from complaining. This is necessary, because the module will not have a `bootstrap`
-declaration on its `NgModule` decorator.
-
-<div class="alert is-important">
-
-  You do not add a `bootstrap` declaration to the `NgModule` decorator, since AngularJS will own the
-  root template of the application and ngUpgrade will be bootstrapping the necessary components.
-
-</div>
-
-You can now link the AngularJS and Angular modules together using `downgradeModule()`.
-
-<code-example title="app.module.ts">
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { downgradeModule } from '@angular/upgrade/static';
-
-const bootstrapFn = (extraProviders: StaticProvider[]) => {
-  const platformRef = platformBrowserDynamic(extraProviders);
-  return platformRef.bootstrapModule(MainAngularModule);
-};
-const downgradedModule = downgradeModule(bootstrapFn);
-
-angular.module('mainAngularJsModule', [
-  downgradedModule
-]);
-</code-example>
-
-Congratulations! You are running a hybrid application! The existing AngularJS code works as before
-_and_ you are ready to start adding Angular code.
-
-
-### Using Components and Injectables
-
-The differences between `downgradeModule()` and `UpgradeModule` end here. The rest of the
-`upgrade/static` APIs and concepts work in the exact same way for both types of hybrid applications.
-Head over to the [main upgrade guide](guide/upgrade) to learn about:
-
-- [Using Angular Components from AngularJS Code](guide/upgrade#using-angular-components-from-angularjs-code)
-- [Using AngularJS Component Directives from Angular Code](guide/upgrade#using-angularjs-component-directives-from-angular-code)
-- [Projecting AngularJS Content into Angular Components](guide/upgrade#projecting-angularjs-content-into-angular-components)
-- [Transcluding Angular Content into AngularJS Component Directives](guide/upgrade#transcluding-angular-content-into-angularjs-component-directives)
-- [Making AngularJS Dependencies Injectable to Angular](guide/upgrade#making-angularjs-dependencies-injectable-to-angular)
-- [Making Angular Dependencies Injectable to AngularJS](guide/upgrade#making-angular-dependencies-injectable-to-angularjs)
-
-<div class="alert is-important">
-
-  While it is possible to downgrade injectables, the downgraded injectables will _not_ be available
-  until the Angular module is instantiated too. In order to be safe, you need to ensure that the
-  downgraded injectables are not used anywhere _outside_ the part of the application that is
-  controlled by Angular.
-
-  For example, it is _OK_ to use a downgraded service in an upgraded component that is only used
-  from Angular components, but it is _not OK_ to use it in an AngularJS component that may be used
-  independently of Angular.
-
-</div>
-
-
-## Using Ahead-of-Time compilation with hybrid applications
-
-You can take advantage of Ahead-of-Time (AoT) compilation on hybrid applications just like on any
-other Angular application. The setup for a hybrid application is mostly the same as described in the
-[AoT Compilation](guide/aot-compiler) guide save for differences in `index.html` and `main-aot.ts`.
-
-The `index.html` will likely have script tags loading AngularJS files, so the `index.html` for AoT
-must also load those files. An easy way to copy them is by adding each to the `copy-dist-files.js`
-file.
-
-You will also need to pass the generated `MainAngularModuleFactory` to `downgradeModule()`, instead of
-the custom bootstrap function:
-
-<code-example title="app/main-aot.ts">
-import { downgradeModule } from '@angular/upgrade/static';
-import { MainAngularModuleNgFactory } from '../aot/app/app.module.ngfactory';
-
-const downgradedModule = downgradeModule(MainAngularModuleNgFactory);
-
-angular.module('mainAngularJsModule', [
-  downgradedModule
-]);
-</code-example>
-
-And that is all you need to do to get the full benefit of AoT for Angular applications!
-
-
-## Wrap up
-
-You have learned how to use the {@link upgrade/static upgrade/static} package to incrementally
-upgrade existing AngularJS applications at your own pace and without impeding further development of
-the application for the duration of the upgrade process.
-
-More specifically, you have seen how you can achieve better performance and greater flexibility in
-your hybrid applications, by using {@link downgradeModule downgradeModule()} (instead of
-{@link UpgradeModule UpgradeModule}).
-
-To summarize, the key differentiating factors of `downgradeModule()` are:
-
-1. It allows instantiating (or even loading) the Angular part lazily, which improves the initial
-   loading time (and is some cases may waive the cost of running a second framework altogether).
-2. It improves performance by avoiding unnecessary change detection runs, instead putting more
-   responsibility on the developer.
-3. It does not require you to change how you bootstrap your AngularJS app.
-
-Based on that, `downgradeModule()` is a good option for hybrid applications that want keep the
-AngularJS and Angular parts less coupled. You can still mix and match components and services from
-both frameworks, but you might need to manually propagate change detection. In return,
-`downgradeModule()` offers more control and better performance characteristics.
-
-There is merit in both approaches, so you should always weight the pros and cons before deciding
-which one better meets the upgrading needs of each project.
diff --git a/aio/content/guide/upgrade-performance.md b/aio/content/guide/upgrade-performance.md
new file mode 100644
index 0000000000..ddb11e9d20
--- /dev/null
+++ b/aio/content/guide/upgrade-performance.md
@@ -0,0 +1,352 @@
+# Upgrading for Performance
+
+<div class="alert is-helpful">
+
+  _Angular_ is the name for the Angular of today and tomorrow.<br />
+  _AngularJS_ is the name for all 1.x versions of Angular.
+
+</div>
+
+This guide describes some of the built-in tools for efficiently migrating AngularJS projects over to
+the Angular platform, one piece at a time. It is very similar to
+[Upgrading from AngularJS](guide/upgrade) with the exception that this one uses the {@link
+downgradeModule downgradeModule()} helper function instead of the {@link UpgradeModule
+UpgradeModule} class. This affects how the app is bootstrapped and how change detection is
+propagated between the two frameworks. It allows you to upgrade incrementally while improving the
+speed of your hybrid apps and leveraging the latest of Angular in AngularJS apps early in the
+process of upgrading.
+
+
+
+## Preparation
+
+Before discussing how you can use `downgradeModule()` to create hybrid apps, there are things that
+you can do to ease the upgrade process even before you begin upgrading. Because the steps are the
+same regardless of how you upgrade, refer to the [Preparation](guide/upgrade#preparation) section of
+[Upgrading from AngularJS](guide/upgrade).
+
+
+## Upgrading with `ngUpgrade`
+
+With the `ngUpgrade` library in Angular you can upgrade an existing AngularJS app incrementally by
+building a hybrid app where you can run both frameworks side-by-side. In these hybrid apps you can
+mix and match AngularJS and Angular components and services and have them interoperate seamlessly.
+That means you don't have to do the upgrade work all at once as there is a natural coexistence
+between the two frameworks during the transition period.
+
+
+### How `ngUpgrade` Works
+
+Regardless of whether you choose `downgradeModule()` or `UpgradeModule`, the basic principles of
+upgrading, the mental model behind hybrid apps, and how you use the {@link upgrade/static
+upgrade/static} utilities remain the same. For more information, see the
+[How `ngUpgrade` Works](guide/upgrade#how-ngupgrade-works) section of
+[Upgrading from AngularJS](guide/upgrade).
+
+<div class="alert is-helpful">
+
+  The [Change Detection](guide/upgrade#change-detection) section of
+  [Upgrading from AngularJS](guide/upgrade) only applies to apps that use `UpgradeModule`. Though
+  you handle change detection differently with `downgradeModule()`, which is the focus of this
+  guide, reading the [Change Detection](guide/upgrade#change-detection) section provides helpful
+  context for what follows.
+
+</div>
+
+
+#### Change Detection with `downgradeModule()`
+
+As mentioned before, one of the key differences between `downgradeModule()` and `UpgradeModule` has
+to do with change detection and how it is propagated between the two frameworks.
+
+With `UpgradeModule`, the two change detection systems are tied together more tightly. Whenever
+something happens in the AngularJS part of the app, change detection is automatically triggered on
+the Angular part and vice versa. This is convenient as it ensures that neither framework misses an
+important change. Most of the time, though, these extra change detection runs are unnecessary.
+
+`downgradeModule()`, on the other side, avoids explicitly triggering change detection unless it
+knows the other part of the app is interested in the changes. For example, if a downgraded component
+defines an `@Input()`, chances are that the app needs to be aware when that value changes. Thus,
+`downgradeComponent()` automatically triggers change detection on that component.
+
+In most cases, though, the changes made locally in a particular component are of no interest to the
+rest of the app. For example, if the user clicks a button that submits a form, the component usually
+handles the result of this action. That being said, there _are_ cases where you want to propagate
+changes to some other part of the app that may be controlled by the other framework. In such cases,
+you are responsible for notifying the interested parties by manually triggering change detection.
+
+If you want a particular piece of code to trigger change detection in the AngularJS part of the app,
+you need to wrap it in
+[scope.$apply()](https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$apply). Similarly, for
+triggering change detection in Angular you would use {@link NgZone#run ngZone.run()}.
+
+In many cases, a few extra change detection runs may not matter much. However, on larger or
+change-detection-heavy apps they can have a noticeable impact. By giving you more fine-grained
+control over the change detection propagation, `downgradeModule()` allows you to achieve better
+performance for your hybrid apps.
+
+
+## Using `downgradeModule()`
+
+Both AngularJS and Angular have their own concept of modules to help organize an app into cohesive
+blocks of functionality.
+
+Their details are quite different in architecture and implementation. In AngularJS, you create a
+module by specifying its name and dependencies with
+[angular.module()](https://docs.angularjs.org/api/ng/function/angular.module). Then you can add
+assets using its various methods. In Angular, you create a class adorned with an {@link NgModule
+NgModule} decorator that describes assets in metadata.
+
+In a hybrid app you run both frameworks at the same time. This means that you need at least one
+module each from both AngularJS and Angular.
+
+For the most part, you specify the modules in the same way you would for a regular app. Then, you
+use the `upgrade/static` helpers to let the two frameworks know about assets they can use from each
+other. This is known as "upgrading" and "downgrading".
+
+<div class="alert is-helpful">
+
+  <b>Definitions:</b>
+
+  - _Upgrading_: The act of making an AngularJS asset, such as a component or service, available to
+    the Angular part of the app.
+  - _Downgrading_: The act of making an Angular asset, such as a component or service, available to
+    the AngularJS part of the app.
+
+</div>
+
+An important part of inter-linking dependencies is linking the two main modules together. This is
+where `downgradeModule()` comes in. Use it to create an AngularJS module&mdash;one that you can use
+as a dependency in your main AngularJS module&mdash;that will bootstrap your main Angular module and
+kick off the Angular part of the hybrid app. In a sense, it "downgrades" an Angular module to an
+AngularJS module.
+
+There are a few things to note, though:
+
+1. You don't pass the Angular module directly to `downgradeModule()`. All `downgradeModule()` needs
+   is a "recipe", for example, a factory function, to create an instance for your module.
+
+2. The Angular module is not instantiated until the app actually needs it.
+
+The following is an example of how you can use `downgradeModule()` to link the two modules.
+
+```ts
+// Import `downgradeModule()`.
+import { downgradeModule } from '@angular/upgrade/static';
+
+// Use it to downgrade the Angular module to an AngularJS module.
+const downgradedModule = downgradeModule(MainAngularModuleFactory);
+
+// Use the downgraded module as a dependency to the main AngularJS module.
+angular.module('mainAngularJsModule', [
+  downgradedModule
+]);
+```
+
+
+#### Specifying a factory for the Angular module
+
+As mentioned earlier, `downgradeModule()` needs to know how to instantiate the Angular module. It
+needs a recipe. You define that recipe by providing a factory function that can create an instance
+of the Angular module. `downgradeModule()` accepts two types of factory functions:
+
+1. `NgModuleFactory`
+2. `(extraProviders: StaticProvider[]) => Promise<NgModuleRef>`
+
+When you pass an `NgModuleFactory`, `downgradeModule()` uses it to instantiate the module using
+{@link platformBrowser platformBrowser}'s {@link PlatformRef#bootstrapModuleFactory
+bootstrapModuleFactory()}, which is compatible with ahead-of-time (AOT) compilation. AOT compilation
+helps make your apps load faster. For more about AOT and how to create an `NgModuleFactory`, see the
+[Ahead-of-Time Compilation](guide/aot-compiler) guide.
+
+Alternatively, you can pass a plain function, which is expected to return a promise resolving to an
+{@link NgModuleRef NgModuleRef} (i.e. an instance of your Angular module). The function is called
+with an array of extra {@link StaticProvider Providers} that are expected to be available on the
+returned `NgModuleRef`'s {@link Injector Injector}. For example, if you are using {@link
+platformBrowser platformBrowser} or {@link platformBrowserDynamic platformBrowserDynamic}, you can
+pass the `extraProviders` array to them:
+
+```ts
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowserDynamic(extraProviders);
+  return platformRef.bootstrapModule(MainAngularModule);
+};
+// or
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowser(extraProviders);
+  return platformRef.bootstrapModuleFactory(MainAngularModuleFactory);
+};
+```
+
+Using an `NgModuleFactory` requires less boilerplate and is a good default option as it supports AOT
+out-of-the-box. Using a custom function requires slightly more code, but gives you greater
+flexibility.
+
+
+#### Instantiating the Angular module on-demand
+
+Another key difference between `downgradeModule()` and `UpgradeModule` is that the latter requires
+you to instantiate both the AngularJS and Angular modules up-front. This means that you have to pay
+the cost of instantiating the Angular part of the app, even if you don't use any Angular assets
+until later. `downgradeModule()` is again less aggressive. It will only instantiate the Angular part
+when it is required for the first time; that is, as soon as it needs to create a downgraded
+component.
+
+You could go a step further and not even download the code for the Angular part of the app to the
+user's browser until it is needed. This is especially useful when you use Angular on parts of the
+hybrid app that are not necessary for the initial rendering or that the user doesn't reach.
+
+
+A few examples are:
+
+- You use Angular on specific routes only and you don't need it until/if a user visits such a route.
+- You use Angular for features that are only visible to specific types of users; for example,
+  logged-in users, administrators, or VIP members. You don't need to load Angular until a user is
+  authenticated.
+- You use Angular for a feature that is not critical for the initial rendering of the app and you
+  can afford a small delay in favor of better initial load performance.
+
+
+### Bootstrapping with `downgradeModule()`
+
+As you might have guessed, you don't need to change anything in the way you bootstrap your existing
+AngularJS app. Unlike `UpgradeModule`&mdash;which requires some extra steps&mdash;
+`downgradeModule()` is able to take care of bootstrapping the Angular module, as long as you provide
+the recipe.
+
+In order to start using any `upgrade/static` APIs, you still need to load the Angular framework as
+you would in a normal Angular app. You can see how this can be done with SystemJS by following the
+instructions in the [Setup](guide/setup) guide, selectively copying code from the
+[QuickStart github repository](https://github.com/angular/quickstart).
+
+You also need to install the `@angular/upgrade` package via `npm install @angular/upgrade --save`
+and add a mapping for the `@angular/upgrade/static` package:
+
+<code-example title="system.config.js">
+'@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
+</code-example>
+
+Next, create an `app.module.ts` file and add the following `NgModule` class:
+
+<code-example title="app.module.ts">
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+@NgModule({
+  imports: [
+    BrowserModule
+  ]
+})
+export class MainAngularModule {
+  // Empty placeholder method to satisfy the `Compiler`.
+  ngDoBootstrap() {}
+}
+</code-example>
+
+This bare minimum `NgModule` imports `BrowserModule`, the module every Angular browser-based app
+must have. It also defines an empty `ngDoBootstrap()` method, to prevent the {@link Compiler
+Compiler} from returning errors. This is necessary because the module will not have a `bootstrap`
+declaration on its `NgModule` decorator.
+
+<div class="alert is-important">
+
+  You do not add a `bootstrap` declaration to the `NgModule` decorator since AngularJS owns the root
+  template of the app and `ngUpgrade` bootstraps the necessary components.
+
+</div>
+
+You can now link the AngularJS and Angular modules together using `downgradeModule()`.
+
+<code-example title="app.module.ts">
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { downgradeModule } from '@angular/upgrade/static';
+
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowserDynamic(extraProviders);
+  return platformRef.bootstrapModule(MainAngularModule);
+};
+const downgradedModule = downgradeModule(bootstrapFn);
+
+angular.module('mainAngularJsModule', [
+  downgradedModule
+]);
+</code-example>
+
+The existing AngularJS code works as before _and_ you are ready to start adding Angular code.
+
+
+### Using Components and Injectables
+
+The differences between `downgradeModule()` and `UpgradeModule` end here. The rest of the
+`upgrade/static` APIs and concepts work in the exact same way for both types of hybrid apps.
+See [Upgrading from AngularJS](guide/upgrade) to learn about:
+
+- [Using Angular Components from AngularJS Code](guide/upgrade#using-angular-components-from-angularjs-code).
+- [Using AngularJS Component Directives from Angular Code](guide/upgrade#using-angularjs-component-directives-from-angular-code).
+- [Projecting AngularJS Content into Angular Components](guide/upgrade#projecting-angularjs-content-into-angular-components).
+- [Transcluding Angular Content into AngularJS Component Directives](guide/upgrade#transcluding-angular-content-into-angularjs-component-directives).
+- [Making AngularJS Dependencies Injectable to Angular](guide/upgrade#making-angularjs-dependencies-injectable-to-angular).
+- [Making Angular Dependencies Injectable to AngularJS](guide/upgrade#making-angular-dependencies-injectable-to-angularjs).
+
+<div class="alert is-important">
+
+  While it is possible to downgrade injectables, downgraded injectables will not be available until
+  the Angular module is instantiated. In order to be safe, you need to ensure that the downgraded
+  injectables are not used anywhere _outside_ the part of the app that is controlled by Angular.
+
+  For example, it is _OK_ to use a downgraded service in an upgraded component that is only used
+  from Angular components, but it is _not OK_ to use it in an AngularJS component that may be used
+  independently of Angular.
+
+</div>
+
+
+## Using ahead-of-time compilation with hybrid apps
+
+You can take advantage of ahead-of-time (AOT) compilation in hybrid apps just like in any other
+Angular app. The setup for a hybrid app is mostly the same as described in the
+[Ahead-of-Time Compilation](guide/aot-compiler) guide save for differences in `index.html` and
+`main-aot.ts`.
+
+AOT needs to load any AngularJS files that are in the `<script>` tags in the AngularJS `index.html`.
+An easy way to copy them is to add each to the `copy-dist-files.js`file.
+
+You also need to pass the generated `MainAngularModuleFactory` to `downgradeModule()` instead of the
+custom bootstrap function:
+
+<code-example title="app/main-aot.ts">
+import { downgradeModule } from '@angular/upgrade/static';
+import { MainAngularModuleNgFactory } from '../aot/app/app.module.ngfactory';
+
+const downgradedModule = downgradeModule(MainAngularModuleNgFactory);
+
+angular.module('mainAngularJsModule', [
+  downgradedModule
+]);
+</code-example>
+
+And that is all you need to do to get the full benefit of AOT for hybrid Angular apps.
+
+
+## Conclusion
+
+This page covered how to use the {@link upgrade/static upgrade/static} package to incrementally
+upgrade existing AngularJS apps at your own pace and without impeding further development of the app
+for the duration of the upgrade process.
+
+Specifically, this guide showed how you can achieve better performance and greater flexibility in
+your hybrid apps by using {@link downgradeModule downgradeModule()} instead of {@link UpgradeModule
+UpgradeModule}.
+
+To summarize, the key differentiating factors of `downgradeModule()` are:
+
+1. It allows instantiating or even loading the Angular part lazily, which improves the initial
+   loading time. In some cases this may waive the cost of running a second framework altogether.
+2. It improves performance by avoiding unnecessary change detection runs while giving the developer
+   greater ability to customize.
+3. It does not require you to change how you bootstrap your AngularJS app.
+
+Using `downgradeModule()` is a good option for hybrid apps when you want to keep the AngularJS and
+Angular parts less coupled. You can still mix and match components and services from both
+frameworks, but you might need to manually propagate change detection. In return,
+`downgradeModule()` offers more control and better performance.
diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index d566c19b26..fb14f51ddc 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -515,8 +515,8 @@
               "tooltip": "Incrementally upgrade an AngularJS application to Angular."
             },
             {
-              "url": "guide/upgrade-lite",
-              "title": "Lazy-loading Angular into AngularJS",
+              "url": "guide/upgrade-performance",
+              "title": "Upgrading for Performance",
               "tooltip": "Upgrade from AngularJS to Angular in a more flexible way."
             },
             {
diff --git a/packages/upgrade/src/static/downgrade_module.ts b/packages/upgrade/src/static/downgrade_module.ts
index 25c81cc00c..ed450a7759 100644
--- a/packages/upgrade/src/static/downgrade_module.ts
+++ b/packages/upgrade/src/static/downgrade_module.ts
@@ -48,7 +48,7 @@ import {NgAdapterInjector} from './util';
  * {@example upgrade/static/ts/lite/module.ts region="basic-how-to"}
  *
  * For more details on how to use `downgradeModule()` see
- * [Upgrading for Performance](guide/upgrade-lite).
+ * [Upgrading for Performance](guide/upgrade-performance).
  *
  * @usageNotes
  *
@@ -86,7 +86,7 @@ import {NgAdapterInjector} from './util';
  * notify each framework as needed.
  *
  * For a more detailed discussion of the differences and their implications, see
- * [Upgrading for Performance](guide/upgrade-lite).
+ * [Upgrading for Performance](guide/upgrade-performance).
  *
  * <div class="alert is-helpful">
  *

From abed2cd52cde16b4936468d5ba2ae5c84e8ffa47 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 25 Jun 2018 21:38:21 +0300
Subject: [PATCH 366/582] refactor(upgrade): fix examples for
 `strictPropertyInitialization` and remove internal comments (#18487) (#18487)

PR Close #18487

PR Close #18487
---
 packages/examples/upgrade/static/ts/full/module.ts | 3 ---
 packages/examples/upgrade/static/ts/lite/module.ts | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/examples/upgrade/static/ts/full/module.ts b/packages/examples/upgrade/static/ts/full/module.ts
index 61da6b8a22..1e7c155dbf 100644
--- a/packages/examples/upgrade/static/ts/full/module.ts
+++ b/packages/examples/upgrade/static/ts/full/module.ts
@@ -39,7 +39,6 @@ class TextFormatter {
              <button (click)="addHero.emit()">Add Hero</button>`,
 })
 class Ng2HeroesComponent {
-  // TODO(issue/24571): remove '!'.
   @Input() heroes !: Hero[];
   @Output() addHero = new EventEmitter();
   @Output() removeHero = new EventEmitter();
@@ -78,9 +77,7 @@ class HeroesService {
 class Ng1HeroComponentWrapper extends UpgradeComponent {
   // The names of the input and output properties here must match the names of the
   // `<` and `&` bindings in the AngularJS component that is being wrapped
-  // TODO(issue/24571): remove '!'.
   @Input() hero !: Hero;
-  // TODO(issue/24571): remove '!'.
   @Output() onRemove !: EventEmitter<void>;
 
   constructor(elementRef: ElementRef, injector: Injector) {
diff --git a/packages/examples/upgrade/static/ts/lite/module.ts b/packages/examples/upgrade/static/ts/lite/module.ts
index 1a21702714..0a2e9b95f5 100644
--- a/packages/examples/upgrade/static/ts/lite/module.ts
+++ b/packages/examples/upgrade/static/ts/lite/module.ts
@@ -104,8 +104,8 @@ class Ng2HeroesComponent {
 class Ng1HeroComponentWrapper extends UpgradeComponent {
   // The names of the input and output properties here must match the names of the
   // `<` and `&` bindings in the AngularJS component that is being wrapped.
-  @Input() hero: Hero;
-  @Output() onRemove: EventEmitter<void>;
+  @Input() hero !: Hero;
+  @Output() onRemove !: EventEmitter<void>;
 
   constructor(elementRef: ElementRef, injector: Injector) {
     // We must pass the name of the directive as used by AngularJS to the super.

From 39c8baea318e740111b1c748718c3203a61b4cdf Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 25 Jun 2018 17:17:56 +0200
Subject: [PATCH 367/582] fix(common): use correct ICU plural for locale mk
 (#24659) PR Close #24659

---
 package.json                              |  2 +-
 packages/common/locales/closure-locale.ts |  2 +-
 packages/common/locales/mk.ts             |  2 +-
 yarn.lock                                 | 87 ++++++++++++++---------
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index ad6fc0b735..2fa3a75d71 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "canonical-path": "0.0.2",
     "chokidar": "1.7.0",
     "clang-format": "1.0.41",
-    "cldr": "4.8.0",
+    "cldr": "4.10.0",
     "cldr-data-downloader": "0.3.2",
     "cldrjs": "0.5.0",
     "conventional-changelog": "1.1.0",
diff --git a/packages/common/locales/closure-locale.ts b/packages/common/locales/closure-locale.ts
index 2437b3e38d..ec757cb71c 100644
--- a/packages/common/locales/closure-locale.ts
+++ b/packages/common/locales/closure-locale.ts
@@ -2947,7 +2947,7 @@ export const locale_lv = [
 function plural_mk(n: number): number {
   let i = Math.floor(Math.abs(n)), v = n.toString().replace(/^[^.]*\.?/, '').length,
       f = parseInt(n.toString().replace(/^[^.]*\.?/, ''), 10) || 0;
-  if (v === 0 && i % 10 === 1 || f % 10 === 1) return 1;
+  if (v === 0 && i % 10 === 1 && !(i % 100 === 11) || f % 10 === 1 && !(f % 100 === 11)) return 1;
   return 5;
 }
 
diff --git a/packages/common/locales/mk.ts b/packages/common/locales/mk.ts
index 6a08342051..aa328a9752 100644
--- a/packages/common/locales/mk.ts
+++ b/packages/common/locales/mk.ts
@@ -14,7 +14,7 @@ const u = undefined;
 function plural(n: number): number {
   let i = Math.floor(Math.abs(n)), v = n.toString().replace(/^[^.]*\.?/, '').length,
       f = parseInt(n.toString().replace(/^[^.]*\.?/, ''), 10) || 0;
-  if (v === 0 && i % 10 === 1 || f % 10 === 1) return 1;
+  if (v === 0 && i % 10 === 1 && !(i % 100 === 11) || f % 10 === 1 && !(f % 100 === 11)) return 1;
   return 5;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 66cfc72758..47f5573040 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -484,12 +484,18 @@ async@^1.3.0, async@^1.4.0, async@^1.5.2, async@~1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.0, async@^2.0.1:
+async@^2.0.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
     lodash "^4.14.0"
 
+async@^2.0.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  dependencies:
+    lodash "^4.17.10"
+
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -943,19 +949,19 @@ cldr-data-downloader@0.3.2:
     request "~2.74.0"
     request-progress "0.3.1"
 
-cldr@4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/cldr/-/cldr-4.8.0.tgz#ae7c9ae322c75ac0eac4d4825dcad0394e97b860"
+cldr@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/cldr/-/cldr-4.10.0.tgz#5a72a693728eca491bc8ee027d60fa4dc750a24f"
   dependencies:
-    memoizeasync "1.0.0"
-    passerror "1.1.1"
-    pegjs "0.9.0"
-    seq "0.3.5"
-    uglify-js "1.3.3"
-    underscore "1.3.3"
-    unicoderegexp "0.4.1"
-    xmldom "0.1.27"
-    xpath "0.0.24"
+    lodash "^4.17.10"
+    memoizeasync "^1.1.0"
+    passerror "^1.1.1"
+    pegjs "^0.10.0"
+    seq "^0.3.5"
+    uglify-js "^1.3.3"
+    unicoderegexp "^0.4.1"
+    xmldom "^0.1.27"
+    xpath "^0.0.27"
 
 cldrjs@0.5.0:
   version "0.5.0"
@@ -2978,7 +2984,11 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.2.0, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
+ini@^1.2.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
@@ -3745,6 +3755,10 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.1, lodash@^4.8.0, lodash@~4.17.2:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -3864,9 +3878,9 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-memoizeasync@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/memoizeasync/-/memoizeasync-1.0.0.tgz#7b02a346f3885abb5dc37c0a43c1d202de8cb40a"
+memoizeasync@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/memoizeasync/-/memoizeasync-1.1.0.tgz#9d7028a6f266deb733510bb7dbba5f51878c561e"
   dependencies:
     lru-cache "2.5.0"
     passerror "1.1.1"
@@ -4397,7 +4411,14 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.0, osenv@^0.1.4:
+osenv@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+osenv@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
@@ -4483,7 +4504,7 @@ parseurl@~1.3.0, parseurl@~1.3.1, parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
 
-passerror@1.1.1:
+passerror@1.1.1, passerror@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/passerror/-/passerror-1.1.1.tgz#a25b88dbdd910a29603aec7dcb96e9a7a97687b4"
 
@@ -4555,9 +4576,9 @@ pbkdf2-compat@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288"
 
-pegjs@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.9.0.tgz#f6aefa2e3ce56169208e52179dfe41f89141a369"
+pegjs@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"
 
 performance-now@^2.1.0:
   version "2.1.0"
@@ -5248,7 +5269,7 @@ send@0.13.2:
     range-parser "~1.0.3"
     statuses "~1.2.1"
 
-seq@0.3.5:
+seq@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38"
   dependencies:
@@ -6008,9 +6029,9 @@ uglify-js@1.2.6, uglify-js@~1.2.5:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.2.6.tgz#d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d"
 
-uglify-js@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.3.tgz#ddd3e98aa27f5f47e589cfb3f95cddba26096190"
+uglify-js@^1.3.3:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d"
 
 uglify-js@^2.6:
   version "2.8.29"
@@ -6066,15 +6087,11 @@ underscore.string@~3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.0.3.tgz#4617b8c1a250cf6e5064fbbb363d0fa96cf14552"
 
-underscore@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.3.3.tgz#47ac53683daf832bfa952e1774417da47817ae42"
-
 underscore@1.x:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
 
-unicoderegexp@0.4.1:
+unicoderegexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/unicoderegexp/-/unicoderegexp-0.4.1.tgz#afb10e4ef1eeddc711417bbb652bc885da9d4171"
 
@@ -6447,7 +6464,7 @@ xmlbuilder@^4.1.0:
   dependencies:
     lodash "^4.0.0"
 
-xmldom@0.1.27:
+xmldom@^0.1.27:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 
@@ -6455,9 +6472,9 @@ xmlhttprequest-ssl@1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
 
-xpath@0.0.24:
-  version "0.0.24"
-  resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.24.tgz#1ade162e1cc523c8d39fc7d06afc16ea216f29fb"
+xpath@^0.0.27:
+  version "0.0.27"
+  resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"

From 1dc7d0d29e99648942966674dc27d7eca8fb6afc Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 27 Jun 2018 16:54:22 -0700
Subject: [PATCH 368/582] release: cut the v6.0.7 release

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04e682f3bf..8a6211ffaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="6.0.7"></a>
+## [6.0.7](https://github.com/angular/angular/compare/6.0.6...6.0.7) (2018-06-27)
+
+
+### Bug Fixes
+
+* **animations:** set animations styles properly on platform-server ([#24624](https://github.com/angular/angular/issues/24624)) ([0b356d4](https://github.com/angular/angular/commit/0b356d4))
+* **common:** use correct ICU plural for locale mk ([#24659](https://github.com/angular/angular/issues/24659)) ([64a8584](https://github.com/angular/angular/commit/64a8584))
+
+
+
 <a name="6.1.0-beta.2"></a>
 # [6.1.0-beta.2](https://github.com/angular/angular/compare/6.1.0-beta.1...6.1.0-beta.2) (2018-06-20)
 
@@ -8,7 +19,6 @@
 * **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([ccbda9d](https://github.com/angular/angular/commit/ccbda9d))
 
 
-
 <a name="6.0.6"></a>
 ## [6.0.6](https://github.com/angular/angular/compare/6.0.5...6.0.6) (2018-06-20)
 

From c57b491778fbe5dc14315bbcc3c3867227ae9894 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 27 Jun 2018 18:12:36 -0700
Subject: [PATCH 369/582] release: cut the v6.1.0-beta.3 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a6211ffaf..268280b51b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+<a name="6.1.0-beta.3"></a>
+# [6.1.0-beta.3](https://github.com/angular/angular/compare/6.1.0-beta.2...6.1.0-beta.3) (2018-06-28)
+
+
 <a name="6.0.7"></a>
 ## [6.0.7](https://github.com/angular/angular/compare/6.0.6...6.0.7) (2018-06-27)
 
diff --git a/package.json b/package.json
index 2fa3a75d71..819ffd023a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.1.0-beta.2",
+  "version": "6.1.0-beta.3",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From 104d30507a2bea9d9347ca896288b27a735f9862 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 15:54:16 -0700
Subject: [PATCH 370/582] feat(ivy): able to compile @angular/core with ngtsc
 (#24677)

@angular/core is unique in that it defines the Angular decorators
(@Component, @Directive, etc). Ordinarily ngtsc looks for imports
from @angular/core in order to identify these decorators. Clearly
within core itself, this strategy doesn't work.

Instead, a special constant ITS_JUST_ANGULAR is declared within a
known file in @angular/core. If ngtsc sees this constant it knows
core is being compiled and can ignore the imports when evaluating
decorators.

Additionally, when compiling decorators ngtsc will often write an
import to @angular/core for needed symbols. However @angular/core
cannot import itself. This change creates a module within core to
export all the symbols needed to compile it and adds intelligence
within ngtsc to write relative imports to that module, instead of
absolute imports to @angular/core.

PR Close #24677
---
 .../src/ngtsc/annotations/src/component.ts    |  7 ++-
 .../src/ngtsc/annotations/src/directive.ts    | 12 ++--
 .../src/ngtsc/annotations/src/injectable.ts   | 15 ++---
 .../src/ngtsc/annotations/src/ng_module.ts    |  7 ++-
 .../src/ngtsc/annotations/src/util.ts         |  5 +-
 .../src/ngtsc/metadata/BUILD.bazel            |  1 +
 packages/compiler-cli/src/ngtsc/program.ts    | 62 ++++++++++++++++---
 .../src/ngtsc/transform/src/compilation.ts    | 17 +++--
 .../src/ngtsc/transform/src/declaration.ts    | 12 +++-
 .../src/ngtsc/transform/src/transform.ts      | 22 ++++---
 .../src/ngtsc/transform/src/translator.ts     | 36 +++++++++--
 .../compiler-cli/src/ngtsc/util/BUILD.bazel   |  3 +
 .../compiler-cli/src/ngtsc/util/src/path.ts   | 26 ++++++++
 packages/core/src/r3_symbols.ts               | 32 ++++++++++
 14 files changed, 208 insertions(+), 49 deletions(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/util/src/path.ts
 create mode 100644 packages/core/src/r3_symbols.ts

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index ca4bdb788e..2de6d830d9 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -25,10 +25,11 @@ const EMPTY_MAP = new Map<string, Expression>();
 export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMetadata> {
   constructor(
       private checker: ts.TypeChecker, private reflector: ReflectionHost,
-      private scopeRegistry: SelectorScopeRegistry) {}
+      private scopeRegistry: SelectorScopeRegistry, private isCore: boolean) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
-    return decorators.find(decorator => decorator.name === 'Component' && isAngularCore(decorator));
+    return decorators.find(
+        decorator => decorator.name === 'Component' && (this.isCore || isAngularCore(decorator)));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3ComponentMetadata> {
@@ -43,7 +44,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     // @Component inherits @Directive, so begin by extracting the @Directive metadata and building
     // on it.
     const directiveMetadata =
-        extractDirectiveMetadata(node, decorator, this.checker, this.reflector);
+        extractDirectiveMetadata(node, decorator, this.checker, this.reflector, this.isCore);
     if (directiveMetadata === undefined) {
       // `extractDirectiveMetadata` returns undefined when the @Directive has `jit: true`. In this
       // case, compilation of the decorator is skipped. Returning an empty object signifies
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 837f70a83c..7c2ebdf8a1 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -22,14 +22,16 @@ const EMPTY_OBJECT: {[key: string]: string} = {};
 export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMetadata> {
   constructor(
       private checker: ts.TypeChecker, private reflector: ReflectionHost,
-      private scopeRegistry: SelectorScopeRegistry) {}
+      private scopeRegistry: SelectorScopeRegistry, private isCore: boolean) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
-    return decorators.find(decorator => decorator.name === 'Directive' && isAngularCore(decorator));
+    return decorators.find(
+        decorator => decorator.name === 'Directive' && (this.isCore || isAngularCore(decorator)));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3DirectiveMetadata> {
-    const analysis = extractDirectiveMetadata(node, decorator, this.checker, this.reflector);
+    const analysis =
+        extractDirectiveMetadata(node, decorator, this.checker, this.reflector, this.isCore);
 
     // If the directive has a selector, it should be registered with the `SelectorScopeRegistry` so
     // when this directive appears in an `@NgModule` scope, its selector can be determined.
@@ -57,7 +59,7 @@ export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMe
  */
 export function extractDirectiveMetadata(
     clazz: ts.ClassDeclaration, decorator: Decorator, checker: ts.TypeChecker,
-    reflector: ReflectionHost): R3DirectiveMetadata|undefined {
+    reflector: ReflectionHost, isCore: boolean): R3DirectiveMetadata|undefined {
   if (decorator.args === null || decorator.args.length !== 1) {
     throw new Error(`Incorrect number of arguments to @${decorator.name} decorator`);
   }
@@ -108,7 +110,7 @@ export function extractDirectiveMetadata(
 
   return {
     name: clazz.name !.text,
-    deps: getConstructorDependencies(clazz, reflector),
+    deps: getConstructorDependencies(clazz, reflector, isCore),
     host: {
       attributes: {},
       listeners: {},
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
index ab2370f510..5d634895b6 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
@@ -20,15 +20,16 @@ import {getConstructorDependencies, isAngularCore} from './util';
  * Adapts the `compileIvyInjectable` compiler for `@Injectable` decorators to the Ivy compiler.
  */
 export class InjectableDecoratorHandler implements DecoratorHandler<R3InjectableMetadata> {
-  constructor(private reflector: ReflectionHost) {}
+  constructor(private reflector: ReflectionHost, private isCore: boolean) {}
 
   detect(decorator: Decorator[]): Decorator|undefined {
-    return decorator.find(decorator => decorator.name === 'Injectable' && isAngularCore(decorator));
+    return decorator.find(
+        decorator => decorator.name === 'Injectable' && (this.isCore || isAngularCore(decorator)));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3InjectableMetadata> {
     return {
-      analysis: extractInjectableMetadata(node, decorator, this.reflector),
+      analysis: extractInjectableMetadata(node, decorator, this.reflector, this.isCore),
     };
   }
 
@@ -48,8 +49,8 @@ export class InjectableDecoratorHandler implements DecoratorHandler<R3Injectable
  * metadata needed to run `compileIvyInjectable`.
  */
 function extractInjectableMetadata(
-    clazz: ts.ClassDeclaration, decorator: Decorator,
-    reflector: ReflectionHost): R3InjectableMetadata {
+    clazz: ts.ClassDeclaration, decorator: Decorator, reflector: ReflectionHost,
+    isCore: boolean): R3InjectableMetadata {
   if (clazz.name === undefined) {
     throw new Error(`@Injectables must have names`);
   }
@@ -63,7 +64,7 @@ function extractInjectableMetadata(
       name,
       type,
       providedIn: new LiteralExpr(null),
-      deps: getConstructorDependencies(clazz, reflector),
+      deps: getConstructorDependencies(clazz, reflector, isCore),
     };
   } else if (decorator.args.length === 1) {
     const metaNode = decorator.args[0];
@@ -102,7 +103,7 @@ function extractInjectableMetadata(
       }
       return {name, type, providedIn, useFactory: factory, deps};
     } else {
-      const deps = getConstructorDependencies(clazz, reflector);
+      const deps = getConstructorDependencies(clazz, reflector, isCore);
       return {name, type, providedIn, deps};
     }
   } else {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index d52d2eb9f9..dd5c304194 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -29,10 +29,11 @@ export interface NgModuleAnalysis {
 export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalysis> {
   constructor(
       private checker: ts.TypeChecker, private reflector: ReflectionHost,
-      private scopeRegistry: SelectorScopeRegistry) {}
+      private scopeRegistry: SelectorScopeRegistry, private isCore: boolean) {}
 
   detect(decorators: Decorator[]): Decorator|undefined {
-    return decorators.find(decorator => decorator.name === 'NgModule' && isAngularCore(decorator));
+    return decorators.find(
+        decorator => decorator.name === 'NgModule' && (this.isCore || isAngularCore(decorator)));
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<NgModuleAnalysis> {
@@ -89,7 +90,7 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
     const ngInjectorDef: R3InjectorMetadata = {
       name: node.name !.text,
       type: new WrappedNodeExpr(node.name !),
-      deps: getConstructorDependencies(node, this.reflector), providers,
+      deps: getConstructorDependencies(node, this.reflector, this.isCore), providers,
       imports: new LiteralArrayExpr(
           [...imports, ...exports].map(imp => referenceToExpression(imp, context))),
     };
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index 4a17e086ea..ec63dd357b 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -13,14 +13,15 @@ import {Decorator, ReflectionHost} from '../../host';
 import {Reference} from '../../metadata';
 
 export function getConstructorDependencies(
-    clazz: ts.ClassDeclaration, reflector: ReflectionHost): R3DependencyMetadata[] {
+    clazz: ts.ClassDeclaration, reflector: ReflectionHost,
+    isCore: boolean): R3DependencyMetadata[] {
   const useType: R3DependencyMetadata[] = [];
   const ctorParams = reflector.getConstructorParameters(clazz) || [];
   ctorParams.forEach((param, idx) => {
     let tokenExpr = param.type;
     let optional = false, self = false, skipSelf = false, host = false;
     let resolved = R3ResolvedDependencyType.Token;
-    (param.decorators || []).filter(isAngularCore).forEach(dec => {
+    (param.decorators || []).filter(dec => isCore || isAngularCore(dec)).forEach(dec => {
       if (dec.name === 'Inject') {
         if (dec.args === null || dec.args.length !== 1) {
           throw new Error(`Unexpected number of arguments to @Inject().`);
diff --git a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
index 6780665ad1..d782bc3878 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
@@ -13,5 +13,6 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/host",
+        "//packages/compiler-cli/src/ngtsc/util",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 7d1bff4e35..1b9793ee90 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -91,17 +91,21 @@ export class NgtscProgram implements api.Program {
     const mergeEmitResultsCallback = opts && opts.mergeEmitResultsCallback || mergeEmitResults;
 
     const checker = this.tsProgram.getTypeChecker();
+    const isCore = isAngularCorePackage(this.tsProgram);
     const reflector = new TypeScriptReflectionHost(checker);
     const scopeRegistry = new SelectorScopeRegistry(checker, reflector);
 
     // Set up the IvyCompilation, which manages state for the Ivy transformer.
     const handlers = [
-      new ComponentDecoratorHandler(checker, reflector, scopeRegistry),
-      new DirectiveDecoratorHandler(checker, reflector, scopeRegistry),
-      new InjectableDecoratorHandler(reflector),
-      new NgModuleDecoratorHandler(checker, reflector, scopeRegistry),
+      new ComponentDecoratorHandler(checker, reflector, scopeRegistry, isCore),
+      new DirectiveDecoratorHandler(checker, reflector, scopeRegistry, isCore),
+      new InjectableDecoratorHandler(reflector, isCore),
+      new NgModuleDecoratorHandler(checker, reflector, scopeRegistry, isCore),
     ];
-    const compilation = new IvyCompilation(handlers, checker, reflector);
+
+    const coreImportsFrom = isCore && getR3SymbolsFile(this.tsProgram) || null;
+
+    const compilation = new IvyCompilation(handlers, checker, reflector, coreImportsFrom);
 
     // Analyze every source file in the program.
     this.tsProgram.getSourceFiles()
@@ -115,7 +119,7 @@ export class NgtscProgram implements api.Program {
          sourceFiles: ReadonlyArray<ts.SourceFile>) => {
           if (fileName.endsWith('.d.ts')) {
             data = sourceFiles.reduce(
-                (data, sf) => compilation.transformedDtsFor(sf.fileName, data), data);
+                (data, sf) => compilation.transformedDtsFor(sf.fileName, data, fileName), data);
           }
           this.host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
         };
@@ -128,7 +132,7 @@ export class NgtscProgram implements api.Program {
       options: this.options,
       emitOnlyDtsFiles: false, writeFile,
       customTransformers: {
-        before: [ivyTransformFactory(compilation)],
+        before: [ivyTransformFactory(compilation, coreImportsFrom)],
       },
     });
     return emitResult;
@@ -152,3 +156,47 @@ function mergeEmitResults(emitResults: ts.EmitResult[]): ts.EmitResult {
   }
   return {diagnostics, emitSkipped, emittedFiles};
 }
+
+/**
+ * Find the 'r3_symbols.ts' file in the given `Program`, or return `null` if it wasn't there.
+ */
+function getR3SymbolsFile(program: ts.Program): ts.SourceFile|null {
+  return program.getSourceFiles().find(file => file.fileName.indexOf('r3_symbols.ts') >= 0) || null;
+}
+
+/**
+ * Determine if the given `Program` is @angular/core.
+ */
+function isAngularCorePackage(program: ts.Program): boolean {
+  // Look for its_just_angular.ts somewhere in the program.
+  const r3Symbols = getR3SymbolsFile(program);
+  if (r3Symbols === null) {
+    return false;
+  }
+
+  // Look for the constant ITS_JUST_ANGULAR in that file.
+  return r3Symbols.statements.some(stmt => {
+    // The statement must be a variable declaration statement.
+    if (!ts.isVariableStatement(stmt)) {
+      return false;
+    }
+    // It must be exported.
+    if (stmt.modifiers === undefined ||
+        !stmt.modifiers.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword)) {
+      return false;
+    }
+    // It must declare ITS_JUST_ANGULAR.
+    return stmt.declarationList.declarations.some(decl => {
+      // The declaration must match the name.
+      if (!ts.isIdentifier(decl.name) || decl.name.text !== 'ITS_JUST_ANGULAR') {
+        return false;
+      }
+      // It must initialize the variable to true.
+      if (decl.initializer === undefined || decl.initializer.kind !== ts.SyntaxKind.TrueKeyword) {
+        return false;
+      }
+      // This definition matches.
+      return true;
+    });
+  });
+}
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index d58a0db402..7129efa8f2 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -46,9 +46,18 @@ export class IvyCompilation {
    */
   private dtsMap = new Map<string, DtsFileTransformer>();
 
+  /**
+   * @param handlers array of `DecoratorHandler`s which will be executed against each class in the
+   * program
+   * @param checker TypeScript `TypeChecker` instance for the program
+   * @param reflector `ReflectionHost` through which all reflection operations will be performed
+   * @param coreImportsFrom a TypeScript `SourceFile` which exports symbols needed for Ivy imports
+   * when compiling @angular/core, or `null` if the current program is not @angular/core. This is
+   * `null` in most cases.
+   */
   constructor(
       private handlers: DecoratorHandler<any>[], private checker: ts.TypeChecker,
-      private reflector: ReflectionHost) {}
+      private reflector: ReflectionHost, private coreImportsFrom: ts.SourceFile|null) {}
 
   /**
    * Analyze a source file and produce diagnostics for it (if any).
@@ -147,19 +156,19 @@ export class IvyCompilation {
    * Process a .d.ts source string and return a transformed version that incorporates the changes
    * made to the source file.
    */
-  transformedDtsFor(tsFileName: string, dtsOriginalSource: string): string {
+  transformedDtsFor(tsFileName: string, dtsOriginalSource: string, dtsPath: string): string {
     // No need to transform if no changes have been requested to the input file.
     if (!this.dtsMap.has(tsFileName)) {
       return dtsOriginalSource;
     }
 
     // Return the transformed .d.ts source.
-    return this.dtsMap.get(tsFileName) !.transform(dtsOriginalSource);
+    return this.dtsMap.get(tsFileName) !.transform(dtsOriginalSource, tsFileName);
   }
 
   private getDtsTransformer(tsFileName: string): DtsFileTransformer {
     if (!this.dtsMap.has(tsFileName)) {
-      this.dtsMap.set(tsFileName, new DtsFileTransformer());
+      this.dtsMap.set(tsFileName, new DtsFileTransformer(this.coreImportsFrom));
     }
     return this.dtsMap.get(tsFileName) !;
   }
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
index 499e6406e7..3c24a6be95 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
@@ -8,6 +8,8 @@
 
 import * as ts from 'typescript';
 
+import {relativePathBetween} from '../../util/src/path';
+
 import {CompileResult} from './api';
 import {ImportManager, translateType} from './translator';
 
@@ -18,7 +20,11 @@ import {ImportManager, translateType} from './translator';
  */
 export class DtsFileTransformer {
   private ivyFields = new Map<string, CompileResult[]>();
-  private imports = new ImportManager();
+  private imports: ImportManager;
+
+  constructor(private coreImportsFrom: ts.SourceFile|null) {
+    this.imports = new ImportManager(coreImportsFrom !== null);
+  }
 
   /**
    * Track that a static field was added to the code for a class.
@@ -28,7 +34,7 @@ export class DtsFileTransformer {
   /**
    * Process the .d.ts text for a file and add any declarations which were recorded.
    */
-  transform(dts: string): string {
+  transform(dts: string, tsPath: string): string {
     const dtsFile =
         ts.createSourceFile('out.d.ts', dts, ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
 
@@ -51,7 +57,7 @@ export class DtsFileTransformer {
       }
     }
 
-    const imports = this.imports.getAllImports();
+    const imports = this.imports.getAllImports(tsPath, this.coreImportsFrom);
     if (imports.length !== 0) {
       dts = imports.map(i => `import * as ${i.as} from '${i.name}';\n`).join() + dts;
     }
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index 47fc8c05b2..f5a2ee9604 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -15,11 +15,12 @@ import {CompileResult} from './api';
 import {IvyCompilation} from './compilation';
 import {ImportManager, translateExpression, translateStatement} from './translator';
 
-export function ivyTransformFactory(compilation: IvyCompilation):
-    ts.TransformerFactory<ts.SourceFile> {
+export function ivyTransformFactory(
+    compilation: IvyCompilation,
+    coreImportsFrom: ts.SourceFile | null): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     return (file: ts.SourceFile): ts.SourceFile => {
-      return transformIvySourceFile(compilation, context, file);
+      return transformIvySourceFile(compilation, context, coreImportsFrom, file);
     };
   };
 }
@@ -74,18 +75,19 @@ class IvyVisitor extends Visitor {
  */
 function transformIvySourceFile(
     compilation: IvyCompilation, context: ts.TransformationContext,
-    file: ts.SourceFile): ts.SourceFile {
-  const importManager = new ImportManager();
+    coreImportsFrom: ts.SourceFile | null, file: ts.SourceFile): ts.SourceFile {
+  const importManager = new ImportManager(coreImportsFrom !== null);
 
   // Recursively scan through the AST and perform any updates requested by the IvyCompilation.
   const sf = visit(file, new IvyVisitor(compilation, importManager), context);
 
   // Generate the import statements to prepend.
-  const imports = importManager.getAllImports().map(
-      i => ts.createImportDeclaration(
-          undefined, undefined,
-          ts.createImportClause(undefined, ts.createNamespaceImport(ts.createIdentifier(i.as))),
-          ts.createLiteral(i.name)));
+  const imports = importManager.getAllImports(file.fileName, coreImportsFrom).map(i => {
+    return ts.createImportDeclaration(
+        undefined, undefined,
+        ts.createImportClause(undefined, ts.createNamespaceImport(ts.createIdentifier(i.as))),
+        ts.createLiteral(i.name));
+  });
 
   // Prepend imports if needed.
   if (imports.length > 0) {
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index 69ad563a71..b6b3122bad 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -8,6 +8,7 @@
 
 import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
 import * as ts from 'typescript';
+import {relativePathBetween} from '../../util/src/path';
 
 const BINARY_OPERATORS = new Map<BinaryOperator, ts.BinaryOperator>([
   [BinaryOperator.And, ts.SyntaxKind.AmpersandAmpersandToken],
@@ -28,20 +29,44 @@ const BINARY_OPERATORS = new Map<BinaryOperator, ts.BinaryOperator>([
   [BinaryOperator.Plus, ts.SyntaxKind.PlusToken],
 ]);
 
+const CORE_SUPPORTED_SYMBOLS = new Set<string>([
+  'defineInjectable',
+  'defineInjector',
+  'ɵdefineNgModule',
+  'inject',
+  'InjectableDef',
+  'InjectorDef',
+  'NgModuleDef',
+]);
+
 export class ImportManager {
   private moduleToIndex = new Map<string, string>();
   private nextIndex = 0;
 
-  generateNamedImport(moduleName: string): string {
+  constructor(private isCore: boolean) {}
+
+  generateNamedImport(moduleName: string, symbol: string): string {
     if (!this.moduleToIndex.has(moduleName)) {
       this.moduleToIndex.set(moduleName, `i${this.nextIndex++}`);
     }
+    if (this.isCore && moduleName === '@angular/core' && !CORE_SUPPORTED_SYMBOLS.has(symbol)) {
+      throw new Error(`Importing unexpected symbol ${symbol} while compiling core`);
+    }
     return this.moduleToIndex.get(moduleName) !;
   }
 
-  getAllImports(): {name: string, as: string}[] {
+  getAllImports(contextPath: string, rewriteCoreImportsTo: ts.SourceFile|null):
+      {name: string, as: string}[] {
     return Array.from(this.moduleToIndex.keys()).map(name => {
-      const as = this.moduleToIndex.get(name) !;
+      const as: string|null = this.moduleToIndex.get(name) !;
+      if (rewriteCoreImportsTo !== null && name === '@angular/core') {
+        const relative = relativePathBetween(contextPath, rewriteCoreImportsTo.fileName);
+        if (relative === null) {
+          throw new Error(
+              `Failed to rewrite import inside core: ${contextPath} -> ${rewriteCoreImportsTo.fileName}`);
+        }
+        name = relative;
+      }
       return {name, as};
     });
   }
@@ -166,7 +191,7 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
       throw new Error(`Import unknown module or symbol ${ast.value}`);
     }
     return ts.createPropertyAccess(
-        ts.createIdentifier(this.imports.generateNamedImport(ast.value.moduleName)),
+        ts.createIdentifier(this.imports.generateNamedImport(ast.value.moduleName, ast.value.name)),
         ts.createIdentifier(ast.value.name));
   }
 
@@ -314,7 +339,8 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     if (ast.value.moduleName === null || ast.value.name === null) {
       throw new Error(`Import unknown module or symbol`);
     }
-    const base = `${this.imports.generateNamedImport(ast.value.moduleName)}.${ast.value.name}`;
+    const moduleSymbol = this.imports.generateNamedImport(ast.value.moduleName, ast.value.name);
+    const base = `${moduleSymbol}.${ast.value.name}`;
     if (ast.typeParams !== null) {
       const generics = ast.typeParams.map(type => type.visitType(this, context)).join(', ');
       return `${base}<${generics}>`;
diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
index c8d3c82949..b8c65905d3 100644
--- a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
@@ -9,4 +9,7 @@ ts_library(
         "src/**/*.ts",
     ]),
     module_name = "@angular/compiler-cli/src/ngtsc/util",
+    deps = [
+        "//packages:types",
+    ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/util/src/path.ts b/packages/compiler-cli/src/ngtsc/util/src/path.ts
new file mode 100644
index 0000000000..8410083396
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/util/src/path.ts
@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as path from 'path';
+
+const TS_DTS_EXTENSION = /(\.d)?\.ts$/;
+
+export function relativePathBetween(from: string, to: string): string|null {
+  let relative = path.posix.relative(path.dirname(from), to).replace(TS_DTS_EXTENSION, '');
+
+  if (relative === '') {
+    return null;
+  }
+
+  // path.relative() does not include the leading './'.
+  if (!relative.startsWith('.')) {
+    relative = `./${relative}`;
+  }
+
+  return relative;
+}
\ No newline at end of file
diff --git a/packages/core/src/r3_symbols.ts b/packages/core/src/r3_symbols.ts
new file mode 100644
index 0000000000..e76e2d02e9
--- /dev/null
+++ b/packages/core/src/r3_symbols.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/*
+ * This file exists to support compilation of @angular/core in Ivy mode.
+ *
+ * When the Angular compiler processes a compilation unit, it normally writes imports to
+ * @angular/core. When compiling the core package itself this strategy isn't usable. Instead, the
+ * compiler writes imports to this file.
+ *
+ * Only a subset of such imports are supported - core is not allowed to declare components or pipes.
+ * A check in ngtsc's translator.ts validates this condition.
+ *
+ * The below symbols are used for @Injectable and @NgModule compilation.
+ */
+
+export {InjectableDef, InjectorDef, defineInjectable, defineInjector} from './di/defs';
+export {inject} from './di/injector';
+export {NgModuleDef} from './metadata/ng_module';
+export {defineNgModule as ɵdefineNgModule} from './render3/definition';
+
+
+/**
+ * The existence of this constant (in this particular file) informs the Angular compiler that the
+ * current program is actually @angular/core, which needs to be compiled specially.
+ */
+export const ITS_JUST_ANGULAR = true;

From fc4dc35426e3d55d4ff26a50ec87665ef283d390 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 15:57:40 -0700
Subject: [PATCH 371/582] feat(ivy): strip all Angular decorators in compiled
 classes (#24677)

Previously ngtsc removed the class-level decorators (@Component,
etc) but left all the ancillary decorators (@Input, @Optional,
etc).

This changes the transform to descend into the members of decorated
classes and remove any Angular decorators, not just the class-level
ones.

PR Close #24677
---
 packages/compiler-cli/src/ngtsc/program.ts    |   2 +-
 .../src/ngtsc/transform/src/transform.ts      | 131 +++++++++++++++++-
 2 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 1b9793ee90..bd3dcb537c 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -132,7 +132,7 @@ export class NgtscProgram implements api.Program {
       options: this.options,
       emitOnlyDtsFiles: false, writeFile,
       customTransformers: {
-        before: [ivyTransformFactory(compilation, coreImportsFrom)],
+        before: [ivyTransformFactory(compilation, reflector, coreImportsFrom)],
       },
     });
     return emitResult;
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index f5a2ee9604..8af657aa49 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -9,24 +9,30 @@
 import {WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
+import {Decorator, ReflectionHost} from '../../host';
+import {relativePathBetween} from '../../util/src/path';
 import {VisitListEntryResult, Visitor, visit} from '../../util/src/visitor';
 
 import {CompileResult} from './api';
 import {IvyCompilation} from './compilation';
 import {ImportManager, translateExpression, translateStatement} from './translator';
 
+const NO_DECORATORS = new Set<ts.Decorator>();
+
 export function ivyTransformFactory(
-    compilation: IvyCompilation,
+    compilation: IvyCompilation, reflector: ReflectionHost,
     coreImportsFrom: ts.SourceFile | null): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     return (file: ts.SourceFile): ts.SourceFile => {
-      return transformIvySourceFile(compilation, context, coreImportsFrom, file);
+      return transformIvySourceFile(compilation, context, reflector, coreImportsFrom, file);
     };
   };
 }
 
 class IvyVisitor extends Visitor {
-  constructor(private compilation: IvyCompilation, private importManager: ImportManager) {
+  constructor(
+      private compilation: IvyCompilation, private reflector: ReflectionHost,
+      private importManager: ImportManager, private isCore: boolean) {
     super();
   }
 
@@ -62,24 +68,133 @@ class IvyVisitor extends Visitor {
           // Remove the decorator which triggered this compilation, leaving the others alone.
           maybeFilterDecorator(
               node.decorators, this.compilation.ivyDecoratorFor(node) !.node as ts.Decorator),
-          node.modifiers, node.name, node.typeParameters, node.heritageClauses || [], members);
+          node.modifiers, node.name, node.typeParameters, node.heritageClauses || [],
+          // Map over the class members and remove any Angular decorators from them.
+          members.map(member => this._stripAngularDecorators(member)));
       return {node, before: statements};
     }
 
     return {node};
   }
+
+  /**
+   * Return all decorators on a `Declaration` which are from @angular/core, or an empty set if none
+   * are.
+   */
+  private _angularCoreDecorators(decl: ts.Declaration): Set<ts.Decorator> {
+    const decorators = this.reflector.getDecoratorsOfDeclaration(decl);
+    if (decorators === null) {
+      return NO_DECORATORS;
+    }
+    const coreDecorators = decorators.filter(dec => this.isCore || isFromAngularCore(dec))
+                               .map(dec => dec.node as ts.Decorator);
+    if (coreDecorators.length > 0) {
+      return new Set<ts.Decorator>(coreDecorators);
+    } else {
+      return NO_DECORATORS;
+    }
+  }
+
+  /**
+   * Given a `ts.Node`, filter the decorators array and return a version containing only non-Angular
+   * decorators.
+   *
+   * If all decorators are removed (or none existed in the first place), this method returns
+   * `undefined`.
+   */
+  private _nonCoreDecoratorsOnly(node: ts.Declaration): ts.NodeArray<ts.Decorator>|undefined {
+    // Shortcut if the node has no decorators.
+    if (node.decorators === undefined) {
+      return undefined;
+    }
+    // Build a Set of the decorators on this node from @angular/core.
+    const coreDecorators = this._angularCoreDecorators(node);
+
+    if (coreDecorators.size === node.decorators.length) {
+      // If all decorators are to be removed, return `undefined`.
+      return undefined;
+    } else if (coreDecorators.size === 0) {
+      // If no decorators need to be removed, return the original decorators array.
+      return node.decorators;
+    }
+
+    // Filter out the core decorators.
+    const filtered = node.decorators.filter(dec => !coreDecorators.has(dec));
+
+    // If no decorators survive, return `undefined`. This can only happen if a core decorator is
+    // repeated on the node.
+    if (filtered.length === 0) {
+      return undefined;
+    }
+
+    // Create a new `NodeArray` with the filtered decorators that sourcemaps back to the original.
+    const array = ts.createNodeArray(filtered);
+    array.pos = node.decorators.pos;
+    array.end = node.decorators.end;
+    return array;
+  }
+
+  /**
+   * Remove Angular decorators from a `ts.Node` in a shallow manner.
+   *
+   * This will remove decorators from class elements (getters, setters, properties, methods) as well
+   * as parameters of constructors.
+   */
+  private _stripAngularDecorators<T extends ts.Node>(node: T): T {
+    if (ts.isParameter(node)) {
+      // Strip decorators from parameters (probably of the constructor).
+      node = ts.updateParameter(
+                 node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.dotDotDotToken,
+                 node.name, node.questionToken, node.type, node.initializer) as T &
+          ts.ParameterDeclaration;
+    } else if (ts.isMethodDeclaration(node) && node.decorators !== undefined) {
+      // Strip decorators of methods.
+      node = ts.updateMethod(
+                 node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.asteriskToken,
+                 node.name, node.questionToken, node.typeParameters, node.parameters, node.type,
+                 node.body) as T &
+          ts.MethodDeclaration;
+    } else if (ts.isPropertyDeclaration(node) && node.decorators !== undefined) {
+      // Strip decorators of properties.
+      node = ts.updateProperty(
+                 node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.name,
+                 node.questionToken, node.type, node.initializer) as T &
+          ts.PropertyDeclaration;
+    } else if (ts.isGetAccessor(node)) {
+      // Strip decorators of getters.
+      node = ts.updateGetAccessor(
+                 node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.name,
+                 node.parameters, node.type, node.body) as T &
+          ts.GetAccessorDeclaration;
+    } else if (ts.isSetAccessor(node)) {
+      // Strip decorators of setters.
+      node = ts.updateSetAccessor(
+                 node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.name,
+                 node.parameters, node.body) as T &
+          ts.SetAccessorDeclaration;
+    } else if (ts.isConstructorDeclaration(node)) {
+      // For constructors, strip decorators of the parameters.
+      const parameters = node.parameters.map(param => this._stripAngularDecorators(param));
+      node =
+          ts.updateConstructor(node, node.decorators, node.modifiers, parameters, node.body) as T &
+          ts.ConstructorDeclaration;
+    }
+    return node;
+  }
 }
 
 /**
  * A transformer which operates on ts.SourceFiles and applies changes from an `IvyCompilation`.
  */
 function transformIvySourceFile(
-    compilation: IvyCompilation, context: ts.TransformationContext,
+    compilation: IvyCompilation, context: ts.TransformationContext, reflector: ReflectionHost,
     coreImportsFrom: ts.SourceFile | null, file: ts.SourceFile): ts.SourceFile {
   const importManager = new ImportManager(coreImportsFrom !== null);
 
   // Recursively scan through the AST and perform any updates requested by the IvyCompilation.
-  const sf = visit(file, new IvyVisitor(compilation, importManager), context);
+  const sf = visit(
+      file, new IvyVisitor(compilation, reflector, importManager, coreImportsFrom !== null),
+      context);
 
   // Generate the import statements to prepend.
   const imports = importManager.getAllImports(file.fileName, coreImportsFrom).map(i => {
@@ -108,3 +223,7 @@ function maybeFilterDecorator(
   }
   return ts.createNodeArray(filtered);
 }
+
+function isFromAngularCore(decorator: Decorator): boolean {
+  return decorator.import !== null && decorator.import.from === '@angular/core';
+}

From 2ecaa40e645d271708d398c0ea8166c90c553bf0 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 15:58:33 -0700
Subject: [PATCH 372/582] build(ivy): run latest build-optimizer on ngtsc
 compiled code (#24677)

Previously the repo was depending on an old version of build optimizer.
This change updates to the latest (an RC release in the CLI package).

Additionally, this changes the behavior of ng_rollup_bundle to apply
the optimizer to ngtsc compiled code, and configures it to treat the
@angular/compiler package as side-effect-free.

This results in a substantial size reduction of ngtsc compiled code.

PR Close #24677
---
 WORKSPACE                                     |   6 +-
 packages/bazel/src/ng_rollup_bundle.bzl       |   8 +-
 .../hello_world_r2/bundle.golden_symbols.json | 252 +-----------------
 3 files changed, 19 insertions(+), 247 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 290243dc3e..e85c06ba5b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -59,9 +59,9 @@ http_archive(
 # ts_library rules in the devkit repository.
 http_archive(
     name = "angular_devkit",
-    url = "https://github.com/angular/devkit/archive/v0.3.1.zip",
-    strip_prefix = "devkit-0.3.1",
-    sha256 = "31d4b597fe9336650acf13df053c1c84dcbe9c29c6a833bcac3819cd3fd8cad3",
+    url = "https://github.com/angular/angular-cli/archive/v6.1.0-rc.0.zip",
+    strip_prefix = "angular-cli-6.1.0-rc.0",
+    sha256 = "8cf320ea58c321e103f39087376feea502f20eaf79c61a4fdb05c7286c8684fd",
 )
 
 http_archive(
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index 66603099d2..49d8b330f0 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -21,7 +21,7 @@ load("@build_bazel_rules_nodejs//internal/rollup:rollup_bundle.bzl",
 load("@build_bazel_rules_nodejs//internal:collect_es6_sources.bzl", collect_es2015_sources = "collect_es6_sources")
 load(":esm5.bzl", "esm5_outputs_aspect", "flatten_esm5", "esm5_root_dir")
 
-PACKAGES=["packages/core/src", "packages/common/src", "external/rxjs"]
+PACKAGES=["packages/core/src", "packages/common/src", "packages/compiler/src", "external/rxjs"]
 PLUGIN_CONFIG="{sideEffectFreeModules: [\n%s]}" % ",\n".join(
     ["        '.esm5/{0}'".format(p) for p in PACKAGES])
 BO_ROLLUP="angular_devkit/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.js"
@@ -30,10 +30,10 @@ BO_PLUGIN="require('%s').default(%s)" % (BO_ROLLUP, PLUGIN_CONFIG)
 def _use_plain_rollup(ctx):
   """Determine whether to use the Angular or upstream versions of the rollup_bundle rule.
 
-  In legacy mode, the Angular version of rollup is used. This runs build optimizer as part of its
+  In most modes, the Angular version of rollup is used. This runs build optimizer as part of its
   processing, which affects decorators and annotations.
 
-  In other modes, an emulation of the upstream rollup_bundle rule is used. This avoids running
+  In JIT modes, an emulation of the upstream rollup_bundle rule is used. This avoids running
   build optimizer on code which isn't designed to be optimized by it.
 
   Args:
@@ -47,7 +47,7 @@ def _use_plain_rollup(ctx):
     return False
 
   strategy = ctx.var['compile']
-  return strategy != 'legacy'
+  return strategy == 'jit'
 
 
 def run_brotli(ctx, input, output):
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index c359140b00..ab45b5d0a1 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -164,9 +164,6 @@
   {
     "name": "$z"
   },
-  {
-    "name": "ADD_EVENT_LISTENER"
-  },
   {
     "name": "ALLOW_DEFAULT_VAR"
   },
@@ -176,9 +173,6 @@
   {
     "name": "ANALYZE_FOR_ENTRY_COMPONENTS"
   },
-  {
-    "name": "ANGULAR"
-  },
   {
     "name": "ANIMATE_PROP_PREFIX"
   },
@@ -200,9 +194,6 @@
   {
     "name": "ATTRIBUTE_PREFIX"
   },
-  {
-    "name": "AT_CHARCODE"
-  },
   {
     "name": "AbstractClassPart"
   },
@@ -224,9 +215,6 @@
   {
     "name": "AssertNotNull"
   },
-  {
-    "name": "AstMemoryEfficientTransformer"
-  },
   {
     "name": "AstTransformer"
   },
@@ -272,9 +260,6 @@
   {
     "name": "BindingPipe"
   },
-  {
-    "name": "BindingScope$1"
-  },
   {
     "name": "BoundDirectivePropertyAst"
   },
@@ -356,15 +341,9 @@
   {
     "name": "COMPILER_PROVIDERS"
   },
-  {
-    "name": "COMPONENT_REGEX"
-  },
   {
     "name": "COMPONENT_VARIABLE"
   },
-  {
-    "name": "COMPONENT_VARIABLE$1"
-  },
   {
     "name": "COMP_VAR"
   },
@@ -374,9 +353,6 @@
   {
     "name": "CONTENT_ATTR"
   },
-  {
-    "name": "CONTENT_ATTR$1"
-  },
   {
     "name": "CORE"
   },
@@ -401,6 +377,9 @@
   {
     "name": "Chain"
   },
+  {
+    "name": "ChangeDetectionStrategy"
+  },
   {
     "name": "ChangeDetectionStrategy$1"
   },
@@ -419,9 +398,6 @@
   {
     "name": "ClassStmt"
   },
-  {
-    "name": "CloneVisitor"
-  },
   {
     "name": "CodegenComponentFactoryResolver"
   },
@@ -524,9 +500,6 @@
   {
     "name": "DASH_CASE_REGEXP"
   },
-  {
-    "name": "DATA_URL_PATTERN"
-  },
   {
     "name": "DEFAULT_INTERPOLATION_CONFIG"
   },
@@ -578,9 +551,6 @@
   {
     "name": "DeclareVarStmt"
   },
-  {
-    "name": "DefaultDomRenderer2"
-  },
   {
     "name": "DefaultLocalResolver"
   },
@@ -650,9 +620,6 @@
   {
     "name": "ERROR_SYNTAX_ERROR"
   },
-  {
-    "name": "EVENT_NAMES"
-  },
   {
     "name": "EVENT_NAME_VAR"
   },
@@ -701,9 +668,6 @@
   {
     "name": "EventListener"
   },
-  {
-    "name": "EventManagerPlugin"
-  },
   {
     "name": "ExampleVisitor"
   },
@@ -734,9 +698,6 @@
   {
     "name": "ExtractionResult"
   },
-  {
-    "name": "FALSE"
-  },
   {
     "name": "FixupExpression"
   },
@@ -758,15 +719,9 @@
   {
     "name": "GOOG_GET_MSG"
   },
-  {
-    "name": "GenericBrowserDomAdapter"
-  },
   {
     "name": "HOST_ATTR"
   },
-  {
-    "name": "HOST_ATTR$1"
-  },
   {
     "name": "HOST_REG_EXP"
   },
@@ -857,9 +812,6 @@
   {
     "name": "ImplicitReceiver"
   },
-  {
-    "name": "InertBodyHelper"
-  },
   {
     "name": "Inject"
   },
@@ -974,9 +926,6 @@
   {
     "name": "LOG_VAR$1"
   },
-  {
-    "name": "LOWERED_SYMBOL"
-  },
   {
     "name": "Lexer"
   },
@@ -1007,12 +956,6 @@
   {
     "name": "MEANING_SEPARATOR"
   },
-  {
-    "name": "MODIFIER_KEYS"
-  },
-  {
-    "name": "MODIFIER_KEY_GETTERS"
-  },
   {
     "name": "MODULE_SUFFIX"
   },
@@ -1052,15 +995,6 @@
   {
     "name": "NAMED_ENTITIES"
   },
-  {
-    "name": "NAMESPACE_URIS"
-  },
-  {
-    "name": "NATIVE_ADD_LISTENER"
-  },
-  {
-    "name": "NATIVE_REMOVE_LISTENER"
-  },
   {
     "name": "NEW_LINE"
   },
@@ -1082,9 +1016,6 @@
   {
     "name": "NG_TOKEN_PATH"
   },
-  {
-    "name": "NON_ALPHANUMERIC_REGEXP"
-  },
   {
     "name": "NON_BINDABLE_VISITOR"
   },
@@ -1169,15 +1100,6 @@
   {
     "name": "OPEN_CURLY"
   },
-  {
-    "name": "OPTIONAL_END_TAG_BLOCK_ELEMENTS"
-  },
-  {
-    "name": "OPTIONAL_END_TAG_ELEMENTS"
-  },
-  {
-    "name": "OPTIONAL_END_TAG_INLINE_ELEMENTS"
-  },
   {
     "name": "ObjectUnsubscribedError"
   },
@@ -1205,9 +1127,6 @@
   {
     "name": "PLATFORM_INITIALIZER"
   },
-  {
-    "name": "PLATFORM_SERVER_ID"
-  },
   {
     "name": "PLURAL_CASES"
   },
@@ -1280,9 +1199,6 @@
   {
     "name": "PlatformRef"
   },
-  {
-    "name": "PopulatedScope"
-  },
   {
     "name": "PrefixNot"
   },
@@ -1334,9 +1250,6 @@
   {
     "name": "R3_COMPILE_INJECTABLE"
   },
-  {
-    "name": "REMOVE_EVENT_LISTENER"
-  },
   {
     "name": "ReadKeyExpr"
   },
@@ -1352,9 +1265,6 @@
   {
     "name": "RecursiveAstVisitor"
   },
-  {
-    "name": "RecursiveAstVisitor$1"
-  },
   {
     "name": "RefCountOperator$1"
   },
@@ -1394,12 +1304,6 @@
   {
     "name": "ReturnValue"
   },
-  {
-    "name": "SAFE_STYLE_VALUE"
-  },
-  {
-    "name": "SAFE_URL_PATTERN"
-  },
   {
     "name": "SCHEMA"
   },
@@ -1415,9 +1319,6 @@
   {
     "name": "SOURCE"
   },
-  {
-    "name": "SRCSET_ATTRS"
-  },
   {
     "name": "STRING"
   },
@@ -1433,45 +1334,21 @@
   {
     "name": "STYLE_PREFIX"
   },
-  {
-    "name": "SURROGATE_PAIR_REGEXP"
-  },
-  {
-    "name": "SafeHtmlImpl"
-  },
   {
     "name": "SafeMethodCall"
   },
   {
     "name": "SafePropertyRead"
   },
-  {
-    "name": "SafeResourceUrlImpl"
-  },
-  {
-    "name": "SafeScriptImpl"
-  },
   {
     "name": "SafeSelector"
   },
-  {
-    "name": "SafeStyleImpl"
-  },
   {
     "name": "SafeSubscriber"
   },
-  {
-    "name": "SafeUrlImpl"
-  },
-  {
-    "name": "SafeValueImpl"
-  },
   {
     "name": "Sanitizer"
   },
-  {
-    "name": "SanitizingHtmlSerializer"
-  },
   {
     "name": "SecurityContext"
   },
@@ -1664,6 +1541,9 @@
   {
     "name": "TokenType"
   },
+  {
+    "name": "TokenType$1"
+  },
   {
     "name": "TokenizeResult"
   },
@@ -1697,12 +1577,6 @@
   {
     "name": "UNDEFINED_VALUE"
   },
-  {
-    "name": "URI_ATTRS"
-  },
-  {
-    "name": "URL_RE"
-  },
   {
     "name": "URL_WITH_SCHEMA_REGEXP"
   },
@@ -1718,12 +1592,6 @@
   {
     "name": "UrlResolver"
   },
-  {
-    "name": "VALID_ATTRS"
-  },
-  {
-    "name": "VALID_ELEMENTS"
-  },
   {
     "name": "VERSION"
   },
@@ -1733,9 +1601,6 @@
   {
     "name": "VIEW_VAR"
   },
-  {
-    "name": "VOID_ELEMENTS"
-  },
   {
     "name": "ValueTransformer"
   },
@@ -1766,6 +1631,9 @@
   {
     "name": "ViewContainerRef_"
   },
+  {
+    "name": "ViewEncapsulation"
+  },
   {
     "name": "ViewEncapsulation$1"
   },
@@ -1853,6 +1721,9 @@
   {
     "name": "_CompileValueConverter"
   },
+  {
+    "name": "_ComponentIndex"
+  },
   {
     "name": "_ControlFlowError"
   },
@@ -2297,15 +2168,6 @@
   {
     "name": "_ruleRe"
   },
-  {
-    "name": "_sanitizeHtml"
-  },
-  {
-    "name": "_sanitizeStyle"
-  },
-  {
-    "name": "_sanitizeUrl"
-  },
   {
     "name": "_selectorReSuffix"
   },
@@ -2558,9 +2420,6 @@
   {
     "name": "checkNoChangesView"
   },
-  {
-    "name": "checkNoSyntheticProp"
-  },
   {
     "name": "checkStable"
   },
@@ -2861,9 +2720,6 @@
   {
     "name": "declaredViewContainer"
   },
-  {
-    "name": "decoratePreventDefault"
-  },
   {
     "name": "dedupeArray"
   },
@@ -2927,9 +2783,6 @@
   {
     "name": "empty"
   },
-  {
-    "name": "encodeEntities"
-  },
   {
     "name": "ensureExpressionMode"
   },
@@ -3038,9 +2891,6 @@
   {
     "name": "flattenStatements"
   },
-  {
-    "name": "flattenStyles"
-  },
   {
     "name": "flattenUnsubscriptionErrors"
   },
@@ -3110,9 +2960,6 @@
   {
     "name": "getHtmlTagDefinition"
   },
-  {
-    "name": "getLiteralFactory"
-  },
   {
     "name": "getNgZone"
   },
@@ -3149,9 +2996,6 @@
   {
     "name": "getSymbolIterator$1"
   },
-  {
-    "name": "getTemplateContent"
-  },
   {
     "name": "getTypeForTag"
   },
@@ -3161,12 +3005,6 @@
   {
     "name": "getXmlTagDefinition"
   },
-  {
-    "name": "globalListener"
-  },
-  {
-    "name": "hasBalancedQuotes"
-  },
   {
     "name": "hasLifecycleHook"
   },
@@ -3254,18 +3092,9 @@
   {
     "name": "isAsciiLetter"
   },
-  {
-    "name": "isBlackListedEvent"
-  },
-  {
-    "name": "isCall"
-  },
   {
     "name": "isComponentView"
   },
-  {
-    "name": "isDOMParserAvailable"
-  },
   {
     "name": "isDefined"
   },
@@ -3302,9 +3131,6 @@
   {
     "name": "isFunction"
   },
-  {
-    "name": "isFunctionCall"
-  },
   {
     "name": "isIdentifier"
   },
@@ -3323,12 +3149,6 @@
   {
     "name": "isListLikeIterable"
   },
-  {
-    "name": "isLoweredSymbol"
-  },
-  {
-    "name": "isMethodCallOnVariable"
-  },
   {
     "name": "isNameEnd"
   },
@@ -3356,9 +3176,6 @@
   {
     "name": "isObservable"
   },
-  {
-    "name": "isPlatformServer"
-  },
   {
     "name": "isPrefixEnd"
   },
@@ -3383,9 +3200,6 @@
   {
     "name": "isStyleUrlResolvable"
   },
-  {
-    "name": "isTemplateElement"
-  },
   {
     "name": "isTrustedSubscriber"
   },
@@ -3467,9 +3281,6 @@
   {
     "name": "merge"
   },
-  {
-    "name": "merge$2"
-  },
   {
     "name": "mergeAll"
   },
@@ -3611,12 +3422,6 @@
   {
     "name": "parseIntAutoRadix"
   },
-  {
-    "name": "pipeBindingCallInfo"
-  },
-  {
-    "name": "pipeBindingIdentifiers"
-  },
   {
     "name": "pipeDef"
   },
@@ -3671,12 +3476,6 @@
   {
     "name": "pureArrayDef"
   },
-  {
-    "name": "pureFunctionCallInfo"
-  },
-  {
-    "name": "pureFunctionIdentifiers"
-  },
   {
     "name": "pureObjectDef"
   },
@@ -3692,9 +3491,6 @@
   {
     "name": "refCount"
   },
-  {
-    "name": "registerContext"
-  },
   {
     "name": "registerModuleFactory"
   },
@@ -3773,9 +3569,6 @@
   {
     "name": "sanitizeIdentifier"
   },
-  {
-    "name": "sanitizeSrcset"
-  },
   {
     "name": "scheduleMicroTask"
   },
@@ -3827,12 +3620,6 @@
   {
     "name": "shiftInitState"
   },
-  {
-    "name": "shimContentAttribute"
-  },
-  {
-    "name": "shimHostAttribute"
-  },
   {
     "name": "shouldCallLifecycleInitHook"
   },
@@ -3872,12 +3659,6 @@
   {
     "name": "staticViewQueryIds"
   },
-  {
-    "name": "stopMethodSymbol"
-  },
-  {
-    "name": "stopSymbol"
-  },
   {
     "name": "stringToWords32"
   },
@@ -3917,15 +3698,9 @@
   {
     "name": "supportsState"
   },
-  {
-    "name": "symbolNames"
-  },
   {
     "name": "syntaxError"
   },
-  {
-    "name": "tagSet"
-  },
   {
     "name": "tagToString"
   },
@@ -3998,9 +3773,6 @@
   {
     "name": "unescape"
   },
-  {
-    "name": "unwrapResolvedMetadata"
-  },
   {
     "name": "unwrapValue"
   },

From ef1c6d8c260cc33c918a196762b1efaaa6c5f708 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 15:59:15 -0700
Subject: [PATCH 373/582] feat(ivy): dummy handler for @Pipe to cause decorator
 removal (#24677)

Currently ngtsc does not compile @Pipe. This has a side effect
of not removing the @Pipe decorator.

This adds a dummy DecoratorHandler that compiles @Pipe into an
empty ngPipeDef. Eventually this will be replaced with a full
implementation, but for now this solution allows compield code
to be tree-shaken properly.

PR Close #24677
---
 .../src/ngtsc/annotations/index.ts            |  1 +
 .../src/ngtsc/annotations/src/pipe.ts         | 39 +++++++++++++++++++
 packages/compiler-cli/src/ngtsc/program.ts    |  3 +-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts

diff --git a/packages/compiler-cli/src/ngtsc/annotations/index.ts b/packages/compiler-cli/src/ngtsc/annotations/index.ts
index f56e3074cc..4328de07ba 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/index.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/index.ts
@@ -10,4 +10,5 @@ export {ComponentDecoratorHandler} from './src/component';
 export {DirectiveDecoratorHandler} from './src/directive';
 export {InjectableDecoratorHandler} from './src/injectable';
 export {NgModuleDecoratorHandler} from './src/ng_module';
+export {PipeDecoratorHandler} from './src/pipe';
 export {CompilationScope, SelectorScopeRegistry} from './src/selector_scope';
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
new file mode 100644
index 0000000000..365d1ce33a
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
@@ -0,0 +1,39 @@
+/**
+ * @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 {Expression, ExpressionType, LiteralExpr, R3DependencyMetadata, R3InjectableMetadata, R3ResolvedDependencyType, WrappedNodeExpr, compileInjectable as compileIvyInjectable} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Decorator, ReflectionHost} from '../../host';
+import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
+
+import {isAngularCore} from './util';
+
+export class PipeDecoratorHandler implements DecoratorHandler<string> {
+  constructor(private reflector: ReflectionHost, private isCore: boolean) {}
+
+  detect(decorator: Decorator[]): Decorator|undefined {
+    return decorator.find(
+        decorator => decorator.name === 'Pipe' && (this.isCore || isAngularCore(decorator)));
+  }
+
+  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<string> {
+    return {
+      analysis: 'test',
+    };
+  }
+
+  compile(node: ts.ClassDeclaration, analysis: string): CompileResult {
+    return {
+      name: 'ngPipeDef',
+      initializer: new LiteralExpr(null),
+      statements: [],
+      type: new ExpressionType(new LiteralExpr(null)),
+    };
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index bd3dcb537c..314718e948 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -12,7 +12,7 @@ import * as ts from 'typescript';
 
 import * as api from '../transformers/api';
 
-import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, SelectorScopeRegistry} from './annotations';
+import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, SelectorScopeRegistry} from './annotations';
 import {CompilerHost} from './compiler_host';
 import {TypeScriptReflectionHost} from './metadata';
 import {IvyCompilation, ivyTransformFactory} from './transform';
@@ -101,6 +101,7 @@ export class NgtscProgram implements api.Program {
       new DirectiveDecoratorHandler(checker, reflector, scopeRegistry, isCore),
       new InjectableDecoratorHandler(reflector, isCore),
       new NgModuleDecoratorHandler(checker, reflector, scopeRegistry, isCore),
+      new PipeDecoratorHandler(reflector, isCore),
     ];
 
     const coreImportsFrom = isCore && getR3SymbolsFile(this.tsProgram) || null;

From 69510acb20f7214c1fa73a5e24f8e6387f753820 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 16:00:18 -0700
Subject: [PATCH 374/582] test(ivy): symbol extractor should handle different
 compile options (#24677)

The js_expected_symbol_test implementation extracts symbols names
from a rollup iife bundle. Previously, it only handled the case
with a simple 'var bundle = ...;' statement.

Sometimes, rollup produces a more complex bundle, where the 'bundle'
variable is not the only top-level variable declared in the same
declaration statement. This commit patches the symbol exctractor
to support this more complex case.

Additionally, when the symbol test fails, it prints a command to
accept the symbol diff. This command needs to include the
--define=compile flag to ensure the diff is applied in the same
compile mode as the test was run.

PR Close #24677
---
 tools/symbol-extractor/cli.ts                        |  4 +++-
 tools/symbol-extractor/symbol_extractor.ts           | 12 +++++-------
 .../symbol_extractor_spec/iife_with_export.js        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/symbol-extractor/cli.ts b/tools/symbol-extractor/cli.ts
index 6426485044..383c19ff71 100644
--- a/tools/symbol-extractor/cli.ts
+++ b/tools/symbol-extractor/cli.ts
@@ -40,9 +40,11 @@ function main(argv: [string, string, string] | [string, string]): boolean {
   } else {
     passed = symbolExtractor.compareAndPrintError(goldenFilePath, goldenContent);
     if (!passed) {
+      const compile = process.env['compile'];
+      const defineFlag = (compile !== 'legacy') ? `--define=compile=${compile} ` : '';
       console.error(`TEST FAILED!`);
       console.error(`  To update the golden file run: `);
-      console.error(`    bazel run ${process.env['BAZEL_TARGET']}.accept`);
+      console.error(`    bazel run ${defineFlag}${process.env['BAZEL_TARGET']}.accept`);
     }
   }
   return passed;
diff --git a/tools/symbol-extractor/symbol_extractor.ts b/tools/symbol-extractor/symbol_extractor.ts
index 8dc964a517..ed34816472 100644
--- a/tools/symbol-extractor/symbol_extractor.ts
+++ b/tools/symbol-extractor/symbol_extractor.ts
@@ -49,8 +49,7 @@ export class SymbolExtractor {
           if (varDecl.initializer && fnRecurseDepth !== 0) {
             symbols.push({name: varDecl.name.getText()});
           }
-          if (fnRecurseDepth == 0 &&
-              isRollupExportSymbol(child.parent as ts.VariableDeclarationList)) {
+          if (fnRecurseDepth == 0 && isRollupExportSymbol(varDecl)) {
             ts.forEachChild(child, visitor);
           }
           break;
@@ -122,13 +121,12 @@ function toName(symbol: Symbol): string {
 }
 
 /**
- * Detects if VariableDeclarationList is format `var x = function(){}()`;
+ * Detects if VariableDeclarationList is format `var ..., bundle = function(){}()`;
  *
  * Rollup produces this format when it wants to export symbols from a bundle.
  * @param child
  */
-function isRollupExportSymbol(child: ts.VariableDeclarationList): boolean {
-  if (child.declarations.length !== 1) return false;
-  const decl: ts.VariableDeclaration = child.declarations[0];
-  return !!(decl.initializer && decl.initializer.kind == ts.SyntaxKind.CallExpression);
+function isRollupExportSymbol(decl: ts.VariableDeclaration): boolean {
+  return !!(decl.initializer && decl.initializer.kind == ts.SyntaxKind.CallExpression) &&
+      ts.isIdentifier(decl.name) && decl.name.text === 'bundle';
 }
\ No newline at end of file
diff --git a/tools/symbol-extractor/symbol_extractor_spec/iife_with_export.js b/tools/symbol-extractor/symbol_extractor_spec/iife_with_export.js
index 2881163809..41df5cabeb 100644
--- a/tools/symbol-extractor/symbol_extractor_spec/iife_with_export.js
+++ b/tools/symbol-extractor/symbol_extractor_spec/iife_with_export.js
@@ -10,7 +10,7 @@
  * Rollup exports symbols in this particular way. This test demonstrates that we can correctly read
  * symbols.
  */
-var fooBar = function(exports) {
+var bundle = function(exports) {
   'use strict';
   // tslint:disable-next-line:no-console
   console.log('Hello, Alice in Wonderland');

From 50d4a4fe5c9047d8eb28d91a339f3e9ee41efe40 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 16:00:48 -0700
Subject: [PATCH 375/582] fix(compiler): fix a few non-tree-shakeable code
 patterns (#24677)

This change makes @angular/compiler more tree-shakeable by changing
an enum to a const enum and by getting rid of a top-level map that
the tree-shaker was seeing as a reference which caused r3_identifiers
to be retained.

This drops a few hundred bytes of JS from tree-shaken ngtsc compiled
apps.

PR Close #24677
---
 .../compiler/src/render3/view/template.ts     | 22 +++++++++++++------
 .../src/template_parser/template_ast.ts       |  2 +-
 .../hello_world_r2/bundle.golden_symbols.json |  9 --------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index decfe1ea94..2a2c92253b 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -32,12 +32,20 @@ import {htmlAstToRender3Ast} from '../r3_template_transform';
 import {R3QueryMetadata} from './api';
 import {CONTEXT_NAME, I18N_ATTR, I18N_ATTR_PREFIX, ID_SEPARATOR, IMPLICIT_REFERENCE, MEANING_SEPARATOR, REFERENCE_PREFIX, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, getQueryPredicate, invalid, mapToExpression, noop, temporaryAllocator, trimTrailingNulls, unsupported} from './util';
 
-const BINDING_INSTRUCTION_MAP: {[type: number]: o.ExternalReference} = {
-  [BindingType.Property]: R3.elementProperty,
-  [BindingType.Attribute]: R3.elementAttribute,
-  [BindingType.Class]: R3.elementClassNamed,
-  [BindingType.Style]: R3.elementStyleNamed,
-};
+function mapBindingToInstruction(type: BindingType): o.ExternalReference|undefined {
+  switch (type) {
+    case BindingType.Property:
+      return R3.elementProperty;
+    case BindingType.Attribute:
+      return R3.elementAttribute;
+    case BindingType.Class:
+      return R3.elementClassNamed;
+    case BindingType.Style:
+      return R3.elementStyleNamed;
+    default:
+      return undefined;
+  }
+}
 
 // `className` is used below instead of `class` because the interception
 // code (where this map is used) deals with DOM element property values
@@ -414,7 +422,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
         return;
       }
 
-      const instruction = BINDING_INSTRUCTION_MAP[input.type];
+      const instruction = mapBindingToInstruction(input.type);
       if (instruction) {
         // TODO(chuckj): runtime: security context?
         this.instruction(
diff --git a/packages/compiler/src/template_parser/template_ast.ts b/packages/compiler/src/template_parser/template_ast.ts
index 4f69a54608..df201b6766 100644
--- a/packages/compiler/src/template_parser/template_ast.ts
+++ b/packages/compiler/src/template_parser/template_ast.ts
@@ -58,7 +58,7 @@ export class AttrAst implements TemplateAst {
   visit(visitor: TemplateAstVisitor, context: any): any { return visitor.visitAttr(this, context); }
 }
 
-export enum PropertyBindingType {
+export const enum PropertyBindingType {
   // A normal binding to a property (e.g. `[property]="expression"`).
   Property,
   // A binding to an element attribute (e.g. `[attr.name]="expression"`).
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index ab45b5d0a1..84573d89a0 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -356,9 +356,6 @@
   {
     "name": "CORE"
   },
-  {
-    "name": "CORE$1"
-  },
   {
     "name": "CR"
   },
@@ -803,9 +800,6 @@
   {
     "name": "Identifiers"
   },
-  {
-    "name": "Identifiers$1"
-  },
   {
     "name": "IfStmt"
   },
@@ -1208,9 +1202,6 @@
   {
     "name": "PreparsedElementType"
   },
-  {
-    "name": "PropertyBindingType"
-  },
   {
     "name": "PropertyRead"
   },

From 34c42836cf6d6ba0ef28b2a48a40aa45d54449f8 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 20 Jun 2018 16:02:10 -0700
Subject: [PATCH 376/582] test(ivy): move hello_world and todo fully to ngtsc
 (#24677)

ngtsc is sufficiently capable now that it can compile hello_world
and todo and achieve equivalent results to ngc in ivy (global) mode.

Bundle sizes:
hello_world - 3.0 kB
todo        - 14.7 kB

PR Close #24677
---
 .../test/bundling/hello_world/BUILD.bazel     |  11 +-
 .../hello_world/bundle.golden_symbols.json    |  22 +-
 .../core/test/bundling/hello_world/index.ts   |  10 +-
 packages/core/test/bundling/todo/BUILD.bazel  |  10 +-
 .../bundling/todo/bundle.golden_symbols.json  | 190 ++++++++++++++++--
 packages/core/test/bundling/todo/index.ts     |   8 +-
 6 files changed, 210 insertions(+), 41 deletions(-)

diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index eebdb88453..5b221b3b00 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -1,14 +1,15 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ivy_ng_module", "ts_library")
+load("//tools:defaults.bzl", "ng_module", "ts_library")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools/http-server:http_server.bzl", "http_server")
 
-ivy_ng_module(
+ng_module(
     name = "hello_world",
     srcs = ["index.ts"],
+    tags = ["ivy-only"],
     deps = [
         "//packages/core",
     ],
@@ -23,6 +24,7 @@ ng_rollup_bundle(
     # has an "external" directory for external dependencies.
     # This should probably start with "angular/" and let the rule deal with it.
     entry_point = "packages/core/test/bundling/hello_world/index.js",
+    tags = ["ivy-only"],
     deps = [
         ":hello_world",
         "//packages/core",
@@ -50,6 +52,7 @@ jasmine_node_test(
     tags = [
         "ivy-jit",
         "ivy-local",
+        "ivy-only",
     ],
     deps = [":test_lib"],
 )
@@ -58,6 +61,10 @@ js_expected_symbol_test(
     name = "symbol_test",
     src = ":bundle.min_debug.js",
     golden = ":bundle.golden_symbols.json",
+    tags = [
+        "ivy-local",
+        "ivy-only",
+    ],
 )
 
 http_server(
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 9c25ff15c7..23c9cce6c6 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -14,11 +14,14 @@
   {
     "name": "CONTEXT"
   },
+  {
+    "name": "ChangeDetectionStrategy"
+  },
   {
     "name": "DIRECTIVES"
   },
   {
-    "name": "EMPTY$2"
+    "name": "EMPTY$1"
   },
   {
     "name": "EMPTY_RENDERER_TYPE_ID"
@@ -35,15 +38,9 @@
   {
     "name": "HOST_NODE"
   },
-  {
-    "name": "HelloWorld"
-  },
   {
     "name": "INJECTOR$1"
   },
-  {
-    "name": "INeedToExistEvenThoughIAmNotNeeded"
-  },
   {
     "name": "NEXT"
   },
@@ -74,6 +71,9 @@
   {
     "name": "VIEWS"
   },
+  {
+    "name": "ViewEncapsulation$1"
+  },
   {
     "name": "_CLEAN_PROMISE"
   },
@@ -128,9 +128,6 @@
   {
     "name": "defineComponent"
   },
-  {
-    "name": "defineInjector"
-  },
   {
     "name": "detectChangesInternal"
   },
@@ -194,6 +191,9 @@
   {
     "name": "locateHostElement"
   },
+  {
+    "name": "namespaceHTML"
+  },
   {
     "name": "refreshChildComponents"
   },
@@ -222,7 +222,7 @@
     "name": "setUpAttributes"
   },
   {
-    "name": "stringify$1"
+    "name": "stringify$2"
   },
   {
     "name": "text"
diff --git a/packages/core/test/bundling/hello_world/index.ts b/packages/core/test/bundling/hello_world/index.ts
index b052b5302f..ce8d7d5004 100644
--- a/packages/core/test/bundling/hello_world/index.ts
+++ b/packages/core/test/bundling/hello_world/index.ts
@@ -6,16 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule, ɵrenderComponent as renderComponent} from '@angular/core';
+import {Component, ɵrenderComponent as renderComponent} from '@angular/core';
 
 @Component({selector: 'hello-world', template: 'Hello World!'})
-export class HelloWorld {
+class HelloWorld {
 }
-// TODO(misko): Forgetting to export HelloWorld and not having NgModule fails silently.
-
-@NgModule({declarations: [HelloWorld]})
-export class INeedToExistEvenThoughIAmNotNeeded {
-}
-// TODO(misko): Package should not be required to make this work.
 
 renderComponent(HelloWorld);
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index 450ccb2b45..e4381ca297 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -1,15 +1,16 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ivy_ng_module", "ts_library")
+load("//tools:defaults.bzl", "ng_module", "ts_library")
 load("//tools/http-server:http_server.bzl", "http_server")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
 
-ivy_ng_module(
+ng_module(
     name = "todo",
     srcs = ["index.ts"],
+    tags = ["ivy-only"],
     deps = [
         "//packages/common",
         "//packages/core",
@@ -25,6 +26,7 @@ ng_rollup_bundle(
     # has an "external" directory for external dependencies.
     # This should probably start with "angular/" and let the rule deal with it.
     entry_point = "packages/core/test/bundling/todo/index.js",
+    tags = ["ivy-only"],
     deps = [
         ":todo",
         "//packages/common",
@@ -63,6 +65,10 @@ js_expected_symbol_test(
     name = "symbol_test",
     src = ":bundle.min_debug.js",
     golden = ":bundle.golden_symbols.json",
+    tags = [
+        "ivy-local",
+        "ivy-only",
+    ],
 )
 
 genrule(
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 6d08095b91..890b47afb7 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -9,7 +9,7 @@
     "name": "BLOOM_SIZE"
   },
   {
-    "name": "CIRCULAR$2"
+    "name": "CIRCULAR$1"
   },
   {
     "name": "CLEANUP"
@@ -24,17 +24,29 @@
     "name": "CONTEXT"
   },
   {
-    "name": "CommonModule"
+    "name": "ChangeDetectionStrategy"
   },
   {
     "name": "DIRECTIVES"
   },
   {
-    "name": "EMPTY$2"
+    "name": "DefaultIterableDiffer"
+  },
+  {
+    "name": "DefaultIterableDifferFactory"
+  },
+  {
+    "name": "EMPTY$1"
   },
   {
     "name": "EMPTY_RENDERER_TYPE_ID"
   },
+  {
+    "name": "ElementRef"
+  },
+  {
+    "name": "EmbeddedViewRef"
+  },
   {
     "name": "FLAGS"
   },
@@ -50,6 +62,12 @@
   {
     "name": "INJECTOR$1"
   },
+  {
+    "name": "IterableChangeRecord_"
+  },
+  {
+    "name": "IterableDiffers"
+  },
   {
     "name": "NEXT"
   },
@@ -77,6 +95,12 @@
   {
     "name": "NgIfContext"
   },
+  {
+    "name": "Optional"
+  },
+  {
+    "name": "PARAMETERS"
+  },
   {
     "name": "PARENT"
   },
@@ -98,6 +122,9 @@
   {
     "name": "SANITIZER"
   },
+  {
+    "name": "SkipSelf"
+  },
   {
     "name": "TAIL"
   },
@@ -105,10 +132,7 @@
     "name": "TVIEW"
   },
   {
-    "name": "ToDoAppComponent"
-  },
-  {
-    "name": "ToDoAppModule"
+    "name": "TemplateRef"
   },
   {
     "name": "Todo"
@@ -122,12 +146,39 @@
   {
     "name": "VIEWS"
   },
+  {
+    "name": "ViewContainerRef"
+  },
+  {
+    "name": "ViewEncapsulation$1"
+  },
   {
     "name": "_CLEAN_PROMISE"
   },
+  {
+    "name": "_DuplicateItemRecordList"
+  },
+  {
+    "name": "_DuplicateMap"
+  },
   {
     "name": "_ROOT_DIRECTIVE_INDICES"
   },
+  {
+    "name": "__extends"
+  },
+  {
+    "name": "__read"
+  },
+  {
+    "name": "__self"
+  },
+  {
+    "name": "__spread"
+  },
+  {
+    "name": "__window"
+  },
   {
     "name": "_c0"
   },
@@ -191,12 +242,21 @@
   {
     "name": "_getComponentHostLElementNode"
   },
+  {
+    "name": "_global"
+  },
   {
     "name": "_renderCompCount"
   },
+  {
+    "name": "_symbolIterator"
+  },
   {
     "name": "addComponentLogic"
   },
+  {
+    "name": "addRemoveViewFromContainer"
+  },
   {
     "name": "addToViewTree"
   },
@@ -233,9 +293,15 @@
   {
     "name": "canInsertNativeNode"
   },
+  {
+    "name": "checkNoChanges"
+  },
   {
     "name": "checkNoChangesMode"
   },
+  {
+    "name": "cleanUpView"
+  },
   {
     "name": "componentRefresh"
   },
@@ -245,6 +311,9 @@
   {
     "name": "createDirectivesAndLocals"
   },
+  {
+    "name": "createEmbeddedViewNode"
+  },
   {
     "name": "createLContainer"
   },
@@ -258,7 +327,7 @@
     "name": "createLViewData"
   },
   {
-    "name": "createOutput"
+    "name": "createOutput$1"
   },
   {
     "name": "createRootContext"
@@ -278,11 +347,23 @@
   {
     "name": "defineComponent"
   },
+  {
+    "name": "defineDirective"
+  },
   {
     "name": "defineInjectable"
   },
   {
-    "name": "defineInjector"
+    "name": "destroyLView"
+  },
+  {
+    "name": "destroyViewTree"
+  },
+  {
+    "name": "detachView"
+  },
+  {
+    "name": "detectChanges"
   },
   {
     "name": "detectChangesInternal"
@@ -320,6 +401,18 @@
   {
     "name": "executeInitHooks"
   },
+  {
+    "name": "executeNodeAction"
+  },
+  {
+    "name": "executeOnDestroys"
+  },
+  {
+    "name": "executePipeOnDestroys"
+  },
+  {
+    "name": "extendStatics"
+  },
   {
     "name": "extractDirectiveDef"
   },
@@ -356,6 +449,18 @@
   {
     "name": "getLViewChild"
   },
+  {
+    "name": "getNextLNode"
+  },
+  {
+    "name": "getNextLNodeWithProjection"
+  },
+  {
+    "name": "getOrCreateContainerRef"
+  },
+  {
+    "name": "getOrCreateElementRef"
+  },
   {
     "name": "getOrCreateInjectable"
   },
@@ -368,21 +473,39 @@
   {
     "name": "getOrCreateTView"
   },
+  {
+    "name": "getOrCreateTemplateRef"
+  },
   {
     "name": "getParentLNode"
   },
+  {
+    "name": "getParentState"
+  },
+  {
+    "name": "getPreviousIndex"
+  },
   {
     "name": "getPreviousOrParentNode"
   },
   {
     "name": "getRenderFlags"
   },
+  {
+    "name": "getRenderer"
+  },
   {
     "name": "getRootView"
   },
+  {
+    "name": "getSymbolIterator"
+  },
   {
     "name": "getTViewCleanup"
   },
+  {
+    "name": "getTypeNameForDebugging"
+  },
   {
     "name": "getTypeNameForDebugging$1"
   },
@@ -398,6 +521,15 @@
   {
     "name": "inject"
   },
+  {
+    "name": "injectTemplateRef"
+  },
+  {
+    "name": "injectViewContainerRef"
+  },
+  {
+    "name": "insertView"
+  },
   {
     "name": "instantiateDirectivesDirectly"
   },
@@ -416,6 +548,12 @@
   {
     "name": "isDifferent"
   },
+  {
+    "name": "isJsObject"
+  },
+  {
+    "name": "isListLikeIterable"
+  },
   {
     "name": "isNodeMatchingSelector"
   },
@@ -428,6 +566,9 @@
   {
     "name": "isProceduralRenderer"
   },
+  {
+    "name": "iterateListLike"
+  },
   {
     "name": "leaveView"
   },
@@ -443,6 +584,15 @@
   {
     "name": "locateHostElement"
   },
+  {
+    "name": "looseIdentical"
+  },
+  {
+    "name": "makeMetadataCtor"
+  },
+  {
+    "name": "makeParamDecorator"
+  },
   {
     "name": "markDirtyIfOnPush"
   },
@@ -452,6 +602,9 @@
   {
     "name": "namespaceHTML"
   },
+  {
+    "name": "notImplemented"
+  },
   {
     "name": "queueComponentIndexForCheck"
   },
@@ -482,6 +635,12 @@
   {
     "name": "refreshView"
   },
+  {
+    "name": "removeListeners"
+  },
+  {
+    "name": "removeView"
+  },
   {
     "name": "renderComponent"
   },
@@ -537,10 +696,10 @@
     "name": "storeCleanupWithContext"
   },
   {
-    "name": "stringify"
+    "name": "stringify$1"
   },
   {
-    "name": "stringify$1"
+    "name": "stringify$2"
   },
   {
     "name": "text"
@@ -560,19 +719,22 @@
   {
     "name": "tickRootContext"
   },
+  {
+    "name": "trackByIdentity"
+  },
   {
     "name": "updateViewQuery"
   },
   {
     "name": "viewAttached"
   },
+  {
+    "name": "walkLNodeTree"
+  },
   {
     "name": "wrapListenerWithDirtyAndDefault"
   },
   {
     "name": "wrapListenerWithDirtyLogic"
-  },
-  {
-    "name": "ɵ0"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index 2120f92677..8db4e40e6a 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -11,7 +11,7 @@ import 'reflect-metadata';
 import {CommonModule, NgForOf, NgIf} from '@angular/common';
 import {Component, Injectable, IterableDiffers, NgModule, defineInjector, ɵNgOnChangesFeature as NgOnChangesFeature, ɵdefineDirective as defineDirective, ɵdirectiveInject as directiveInject, ɵinjectTemplateRef as injectTemplateRef, ɵinjectViewContainerRef as injectViewContainerRef, ɵrenderComponent as renderComponent} from '@angular/core';
 
-export class Todo {
+class Todo {
   editing: boolean;
 
   // TODO(issue/24571): remove '!'.
@@ -26,7 +26,7 @@ export class Todo {
 }
 
 @Injectable({providedIn: 'root'})
-export class TodoStore {
+class TodoStore {
   todos: Array<Todo> = [
     new Todo('Demonstrate Components'),
     new Todo('Demonstrate Structural Directives', true),
@@ -109,7 +109,7 @@ export class TodoStore {
   // TODO(misko): switch over to OnPush
   // changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class ToDoAppComponent {
+class ToDoAppComponent {
   newTodoText = '';
 
   constructor(public todoStore: TodoStore) {}
@@ -149,7 +149,7 @@ export class ToDoAppComponent {
 }
 
 @NgModule({declarations: [ToDoAppComponent], imports: [CommonModule]})
-export class ToDoAppModule {
+class ToDoAppModule {
 }
 
 // TODO(misko): create cleaner way to publish component into global location for tests.

From 01e7ff682c4f9033f3c76fb4c18931b9eb4fd907 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 22 Jun 2018 10:38:30 -0700
Subject: [PATCH 377/582] test(ivy): todo app only includes reflect-metadata in
 JIT mode (#24677)

Previously the todo app imported reflect-metadata, since it is a dependency
of JIT and the todo app tests run in both JIT and AOT modes. However, the
code doesn't get tree-shaken away in AOT mode.

This change adds a target //packages/core/test/bundling/util:reflect_metadata
which, depending on whether the compile flag is in JIT or AOT mode, either
includes reflect-metadata or is a no-op.

Not including reflect-metadata gets the compressed todo bundle down to 12.5 kB.

PR Close #24677
---
 packages/core/test/bundling/todo/BUILD.bazel  |  2 ++
 packages/core/test/bundling/todo/index.ts     |  2 +-
 packages/core/test/bundling/util/BUILD.bazel  | 22 +++++++++++++++++++
 .../bundling/util/src/reflect_metadata.ts     |  9 ++++++++
 .../bundling/util/src/reflect_metadata_jit.ts |  9 ++++++++
 .../util/src/reflect_metadata_legacy.ts       |  9 ++++++++
 .../util/src/reflect_metadata_local.ts        |  9 ++++++++
 7 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/test/bundling/util/BUILD.bazel
 create mode 100644 packages/core/test/bundling/util/src/reflect_metadata.ts
 create mode 100644 packages/core/test/bundling/util/src/reflect_metadata_jit.ts
 create mode 100644 packages/core/test/bundling/util/src/reflect_metadata_legacy.ts
 create mode 100644 packages/core/test/bundling/util/src/reflect_metadata_local.ts

diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index e4381ca297..1535f80fb8 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -14,6 +14,7 @@ ng_module(
     deps = [
         "//packages/common",
         "//packages/core",
+        "//packages/core/test/bundling/util:reflect_metadata",
     ],
 )
 
@@ -31,6 +32,7 @@ ng_rollup_bundle(
         ":todo",
         "//packages/common",
         "//packages/core",
+        "//packages/core/test/bundling/util:reflect_metadata",
     ],
 )
 
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index 8db4e40e6a..60d65f0242 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import 'reflect-metadata';
+import '@angular/core/test/bundling/util/src/reflect_metadata';
 
 import {CommonModule, NgForOf, NgIf} from '@angular/common';
 import {Component, Injectable, IterableDiffers, NgModule, defineInjector, ɵNgOnChangesFeature as NgOnChangesFeature, ɵdefineDirective as defineDirective, ɵdirectiveInject as directiveInject, ɵinjectTemplateRef as injectTemplateRef, ɵinjectViewContainerRef as injectViewContainerRef, ɵrenderComponent as renderComponent} from '@angular/core';
diff --git a/packages/core/test/bundling/util/BUILD.bazel b/packages/core/test/bundling/util/BUILD.bazel
new file mode 100644
index 0000000000..dd5ec1b044
--- /dev/null
+++ b/packages/core/test/bundling/util/BUILD.bazel
@@ -0,0 +1,22 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+# Either loads reflect-metadata or is a no-op, depending on whether compilation is in JIT mode.
+ts_library(
+    name = "reflect_metadata",
+    srcs = [
+        "src/reflect_metadata_jit.ts",
+        "src/reflect_metadata_legacy.ts",
+        "src/reflect_metadata_local.ts",
+        ":metadata_switch",
+    ],
+    module_name = "@angular/core/test/bundling/util/src/reflect_metadata",
+)
+
+# See packages/core/BUILD.bazel.
+genrule(
+    name = "metadata_switch",
+    outs = ["src/reflect_metadata.ts"],
+    cmd = "echo import \"'./reflect_metadata_$(compile)';\" > $@",
+)
diff --git a/packages/core/test/bundling/util/src/reflect_metadata.ts b/packages/core/test/bundling/util/src/reflect_metadata.ts
new file mode 100644
index 0000000000..88c74cc7c2
--- /dev/null
+++ b/packages/core/test/bundling/util/src/reflect_metadata.ts
@@ -0,0 +1,9 @@
+/**
+ * @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 './reflect_metadata_legacy';
diff --git a/packages/core/test/bundling/util/src/reflect_metadata_jit.ts b/packages/core/test/bundling/util/src/reflect_metadata_jit.ts
new file mode 100644
index 0000000000..4c37fe91ba
--- /dev/null
+++ b/packages/core/test/bundling/util/src/reflect_metadata_jit.ts
@@ -0,0 +1,9 @@
+/**
+ * @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 'reflect-metadata';
diff --git a/packages/core/test/bundling/util/src/reflect_metadata_legacy.ts b/packages/core/test/bundling/util/src/reflect_metadata_legacy.ts
new file mode 100644
index 0000000000..d83b208107
--- /dev/null
+++ b/packages/core/test/bundling/util/src/reflect_metadata_legacy.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export const UNUSED = true;
diff --git a/packages/core/test/bundling/util/src/reflect_metadata_local.ts b/packages/core/test/bundling/util/src/reflect_metadata_local.ts
new file mode 100644
index 0000000000..d83b208107
--- /dev/null
+++ b/packages/core/test/bundling/util/src/reflect_metadata_local.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export const UNUSED = true;

From 676ec411b9b42b1301ad96beb1a36f893a354df5 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Thu, 14 Jun 2018 08:16:54 +0200
Subject: [PATCH 378/582] docs: consistent spacing in tutorial html files
 (#23105) (#24497)

- Removed surrounding spaces in interpolation expressions following the styleguide
- Consistant spacing of two spaces in html

Fixes #23105

PR Close #24497
---
 .../toh-pt1/src/app/heroes/heroes.component.1.html        | 8 ++++----
 .../examples/toh-pt1/src/app/heroes/heroes.component.html | 8 ++++----
 .../examples/toh-pt2/src/app/heroes/heroes.component.html | 2 +-
 .../src/app/hero-detail/hero-detail.component.html        | 2 +-
 .../src/app/hero-detail/hero-detail.component.html        | 2 +-
 .../src/app/hero-detail/hero-detail.component.html        | 2 +-
 .../src/app/hero-detail/hero-detail.component.html        | 2 +-
 .../examples/toh-pt6/src/app/heroes/heroes.component.html | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.1.html b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.1.html
index 1c71ce26db..611f67251c 100644
--- a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.1.html
+++ b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.1.html
@@ -3,15 +3,15 @@
 <!-- #enddocregion show-hero-1 -->
 
 <!-- #docregion show-hero-2 -->
-<h2>{{ hero.name }} Details</h2>
+<h2>{{hero.name}} Details</h2>
 <div><span>id: </span>{{hero.id}}</div>
 <div><span>name: </span>{{hero.name}}</div>
 <!-- #enddocregion show-hero-2 -->
 
 <!-- #docregion name-input -->
 <div>
-    <label>name:
-      <input [(ngModel)]="hero.name" placeholder="name">
-    </label>
+  <label>name:
+    <input [(ngModel)]="hero.name" placeholder="name">
+  </label>
 </div>
 <!-- #enddocregion name-input -->
diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.html b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.html
index e1f98c577f..fb2b96b5c6 100644
--- a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.html
+++ b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.html
@@ -1,10 +1,10 @@
 <!-- #docregion -->
 <!-- #docregion pipe -->
-<h2>{{ hero.name | uppercase }} Details</h2>
+<h2>{{hero.name | uppercase}} Details</h2>
 <!-- #enddocregion pipe -->
 <div><span>id: </span>{{hero.id}}</div>
 <div>
-    <label>name:
-      <input [(ngModel)]="hero.name" placeholder="name">
-    </label>
+  <label>name:
+    <input [(ngModel)]="hero.name" placeholder="name">
+  </label>
 </div>
diff --git a/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.html b/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.html
index a233263d84..ff9ba0206d 100644
--- a/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.html
+++ b/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.html
@@ -14,7 +14,7 @@
 <div *ngIf="selectedHero">
 
   <!-- #docregion selectedHero-details -->
-  <h2>{{ selectedHero.name | uppercase }} Details</h2>
+  <h2>{{selectedHero.name | uppercase}} Details</h2>
   <div><span>id: </span>{{selectedHero.id}}</div>
   <div>
     <label>name:
diff --git a/aio/content/examples/toh-pt3/src/app/hero-detail/hero-detail.component.html b/aio/content/examples/toh-pt3/src/app/hero-detail/hero-detail.component.html
index b2b52432a0..a495e1a84b 100644
--- a/aio/content/examples/toh-pt3/src/app/hero-detail/hero-detail.component.html
+++ b/aio/content/examples/toh-pt3/src/app/hero-detail/hero-detail.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="hero">
 
-  <h2>{{ hero.name | uppercase }} Details</h2>
+  <h2>{{hero.name | uppercase}} Details</h2>
   <div><span>id: </span>{{hero.id}}</div>
   <div>
     <label>name:
diff --git a/aio/content/examples/toh-pt4/src/app/hero-detail/hero-detail.component.html b/aio/content/examples/toh-pt4/src/app/hero-detail/hero-detail.component.html
index 9195b8aa85..c6c039a91c 100644
--- a/aio/content/examples/toh-pt4/src/app/hero-detail/hero-detail.component.html
+++ b/aio/content/examples/toh-pt4/src/app/hero-detail/hero-detail.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="hero">
-  <h2>{{ hero.name | uppercase }} Details</h2>
+  <h2>{{hero.name | uppercase}} Details</h2>
   <div><span>id: </span>{{hero.id}}</div>
   <div>
     <label>name:
diff --git a/aio/content/examples/toh-pt5/src/app/hero-detail/hero-detail.component.html b/aio/content/examples/toh-pt5/src/app/hero-detail/hero-detail.component.html
index 338a747291..5f7b1d46a3 100644
--- a/aio/content/examples/toh-pt5/src/app/hero-detail/hero-detail.component.html
+++ b/aio/content/examples/toh-pt5/src/app/hero-detail/hero-detail.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="hero">
-  <h2>{{ hero.name | uppercase }} Details</h2>
+  <h2>{{hero.name | uppercase}} Details</h2>
   <div><span>id: </span>{{hero.id}}</div>
   <div>
     <label>name:
diff --git a/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.html b/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.html
index a57d510897..860378b3b4 100644
--- a/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.html
+++ b/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="hero">
-  <h2>{{ hero.name | uppercase }} Details</h2>
+  <h2>{{hero.name | uppercase}} Details</h2>
   <div><span>id: </span>{{hero.id}}</div>
   <div>
     <label>name:
diff --git a/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.html b/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.html
index e674889f6d..5daa83bd64 100644
--- a/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.html
+++ b/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.html
@@ -20,7 +20,7 @@
     </a>
     <!-- #docregion delete -->
     <button class="delete" title="delete hero"
-    (click)="delete(hero)">x</button>
+      (click)="delete(hero)">x</button>
     <!-- #enddocregion delete -->
   </li>
 </ul>

From 71100e6d72848a2d7ad2bb9adb9349eca6e8fa76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mis=CC=8Cko=20Hevery?= <misko@hevery.com>
Date: Fri, 22 Jun 2018 18:26:28 -0700
Subject: [PATCH 379/582] feat(core): add support for using async/await with
 Jasmine (#24637)

Example:
```
it('...', await(async() => {
  doSomething();
  await asyncFn();
  doSomethingAfter();
}));
```

PR Close #24637
---
 .../test/testability/jasmine_await_spec.ts    | 31 +++++++++++++++++
 packages/core/testing/src/jasmine_await.ts    | 34 +++++++++++++++++++
 packages/core/testing/src/testing.ts          |  1 +
 tools/public_api_guard/core/testing.d.ts      |  5 +++
 4 files changed, 71 insertions(+)
 create mode 100644 packages/core/test/testability/jasmine_await_spec.ts
 create mode 100644 packages/core/testing/src/jasmine_await.ts

diff --git a/packages/core/test/testability/jasmine_await_spec.ts b/packages/core/test/testability/jasmine_await_spec.ts
new file mode 100644
index 0000000000..e4da8fb785
--- /dev/null
+++ b/packages/core/test/testability/jasmine_await_spec.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 {jasmineAwait} from '../../testing';
+
+
+describe('await', () => {
+  let pass: boolean;
+  beforeEach(() => pass = false);
+  afterEach(() => expect(pass).toBe(true));
+
+  it('should convert passes', jasmineAwait(async() => { pass = await Promise.resolve(true); }));
+
+  it('should convert failures', (done) => {
+    const error = new Error();
+    const fakeDone: DoneFn = function() { fail('passed, but should have failed'); } as any;
+    fakeDone.fail = function(value: any) {
+      expect(value).toBe(error);
+      done();
+    };
+    jasmineAwait(async() => {
+      pass = await Promise.resolve(true);
+      throw error;
+    })(fakeDone);
+  });
+});
\ No newline at end of file
diff --git a/packages/core/testing/src/jasmine_await.ts b/packages/core/testing/src/jasmine_await.ts
new file mode 100644
index 0000000000..a863e62149
--- /dev/null
+++ b/packages/core/testing/src/jasmine_await.ts
@@ -0,0 +1,34 @@
+/**
+ * @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
+ */
+
+/**
+ * Converts an `async` function, with `await`, into a function which is compatible with Jasmine test
+ * framework.
+ *
+ * For asynchronous function blocks, Jasmine expects `it` (and friends) to take a function which
+ * takes a `done` callback. (Jasmine does not understand functions which return `Promise`.) The
+ * `jasmineAwait()` wrapper converts the test function returning `Promise` into a function which
+ * Jasmine understands.
+ *
+ *
+ * Example:
+ * ```
+ * it('...', jasmineAwait(async() => {
+ *   doSomething();
+ *   await asyncFn();
+ *   doSomethingAfter();
+ * }));
+ * ```
+ *
+ */
+export function jasmineAwait(fn: () => Promise<any>):
+    (done: {(): void; fail: (message?: Error | string) => void;}) => void {
+  return function(done: {(): void; fail: (message?: Error | string) => void;}) {
+    fn().then(done, done.fail);
+  };
+}
diff --git a/packages/core/testing/src/testing.ts b/packages/core/testing/src/testing.ts
index d2d9476c80..c1ea067aa3 100644
--- a/packages/core/testing/src/testing.ts
+++ b/packages/core/testing/src/testing.ts
@@ -13,6 +13,7 @@
  */
 
 export * from './async';
+export * from './jasmine_await';
 export * from './component_fixture';
 export * from './fake_async';
 export * from './test_bed';
diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
index c7df004ea6..5759b364f6 100644
--- a/tools/public_api_guard/core/testing.d.ts
+++ b/tools/public_api_guard/core/testing.d.ts
@@ -53,6 +53,11 @@ export declare class InjectSetupWrapper {
     inject(tokens: any[], fn: Function): () => any;
 }
 
+export declare function jasmineAwait(fn: () => Promise<any>): (done: {
+    (): void;
+    fail: (message?: Error | string) => void;
+}) => void;
+
 /** @experimental */
 export declare type MetadataOverride<T> = {
     add?: Partial<T>;

From 0ede987ceda8fdddc3d5c0aff7198927f7791861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Fri, 22 Jun 2018 19:05:31 -0700
Subject: [PATCH 380/582] feat(ivy): Support resource resolution in JIT mode.
 (#24637)

Used to resolve resource URLs on `@Component` when used with JIT compilation.

```
@Component({
  selector: 'my-comp',
  templateUrl: 'my-comp.html', // This requires asynchronous resolution
})
class MyComponnent{
}

// Calling `renderComponent` will fail because `MyComponent`'s `@Compenent.templateUrl`
// needs to be resolved because `renderComponent` is synchronous process.
// renderComponent(MyComponent);

// Calling `resolveComponentResources` will resolve `@Compenent.templateUrl` into
// `@Compenent.template`, which would allow `renderComponent` to proceed in synchronous manner.
// Use browser's `fetch` function as the default resource resolution strategy.
resolveComponentResources(fetch).then(() => {
  // After resolution all URLs have been converted into strings.
  renderComponent(MyComponent);
});

```

PR Close #24637
---
 packages/core/src/core_private_export.ts      |   1 +
 packages/core/src/ivy_switch_on.ts            |   4 +-
 .../core/src/metadata/resource_loading.ts     | 103 +++++++++++++
 packages/core/src/render3/jit/directive.ts    |  66 ++++-----
 .../test/metadata/resource_loading_spec.ts    | 136 ++++++++++++++++++
 5 files changed, 267 insertions(+), 43 deletions(-)
 create mode 100644 packages/core/src/metadata/resource_loading.ts
 create mode 100644 packages/core/test/metadata/resource_loading_spec.ts

diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 5b35140710..24cddeb5e6 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -18,6 +18,7 @@ export {APP_ROOT as ɵAPP_ROOT} from './di/scope';
 export {ivyEnabled as ɵivyEnabled} from './ivy_switch';
 export {ComponentFactory as ɵComponentFactory} from './linker/component_factory';
 export {CodegenComponentFactoryResolver as ɵCodegenComponentFactoryResolver} from './linker/component_factory_resolver';
+export {resolveComponentResources as ɵresolveComponentResources} from './metadata/resource_loading';
 export {ReflectionCapabilities as ɵReflectionCapabilities} from './reflection/reflection_capabilities';
 export {GetterFn as ɵGetterFn, MethodFn as ɵMethodFn, SetterFn as ɵSetterFn} from './reflection/types';
 export {DirectRenderer as ɵDirectRenderer, RenderDebugInfo as ɵRenderDebugInfo} from './render/api';
diff --git a/packages/core/src/ivy_switch_on.ts b/packages/core/src/ivy_switch_on.ts
index 7b2d79214a..8d29031c72 100644
--- a/packages/core/src/ivy_switch_on.ts
+++ b/packages/core/src/ivy_switch_on.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {compileComponentDecorator, compileDirective} from './render3/jit/directive';
+import {compileComponent, compileDirective} from './render3/jit/directive';
 import {compileInjectable} from './render3/jit/injectable';
 import {compileNgModule} from './render3/jit/module';
 
 export const ivyEnabled = true;
-export const R3_COMPILE_COMPONENT = compileComponentDecorator;
+export const R3_COMPILE_COMPONENT = compileComponent;
 export const R3_COMPILE_DIRECTIVE = compileDirective;
 export const R3_COMPILE_INJECTABLE = compileInjectable;
 export const R3_COMPILE_NGMODULE = compileNgModule;
diff --git a/packages/core/src/metadata/resource_loading.ts b/packages/core/src/metadata/resource_loading.ts
new file mode 100644
index 0000000000..1870d997c0
--- /dev/null
+++ b/packages/core/src/metadata/resource_loading.ts
@@ -0,0 +1,103 @@
+/**
+ * @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 './directives';
+
+
+/**
+ * Used to resolve resource URLs on `@Component` when used with JIT compilation.
+ *
+ * Example:
+ * ```
+ * @Component({
+ *   selector: 'my-comp',
+ *   templateUrl: 'my-comp.html', // This requires asynchronous resolution
+ * })
+ * class MyComponnent{
+ * }
+ *
+ * // Calling `renderComponent` will fail because `MyComponent`'s `@Compenent.templateUrl`
+ * // needs to be resolved because `renderComponent` is synchronous process.
+ * // renderComponent(MyComponent);
+ *
+ * // Calling `resolveComponentResources` will resolve `@Compenent.templateUrl` into
+ * // `@Compenent.template`, which would allow `renderComponent` to proceed in synchronous manner.
+ * // Use browser's `fetch` function as the default resource resolution strategy.
+ * resolveComponentResources(fetch).then(() => {
+ *   // After resolution all URLs have been converted into strings.
+ *   renderComponent(MyComponent);
+ * });
+ *
+ * ```
+ *
+ * NOTE: In AOT the resolution happens during compilation, and so there should be no need
+ * to call this method outside JIT mode.
+ *
+ * @param resourceResolver a function which is responsible to returning a `Promise` of the resolved
+ * URL. Browser's `fetch` method is a good default implementation.
+ */
+export function resolveComponentResources(
+    resourceResolver: (url: string) => (Promise<string|{text(): Promise<string>}>)): Promise<null> {
+  // Store all promises which are fetching the resources.
+  const urlFetches: Promise<string>[] = [];
+
+  // Cache so that we don't fetch the same resource more than once.
+  const urlMap = new Map<string, Promise<string>>();
+  function cachedResourceResolve(url: string): Promise<string> {
+    let promise = urlMap.get(url);
+    if (!promise) {
+      const resp = resourceResolver(url);
+      urlMap.set(url, promise = resp.then(unwrapResponse));
+      urlFetches.push(promise);
+    }
+    return promise;
+  }
+
+  componentResourceResolutionQueue.forEach((component: Component) => {
+    if (component.templateUrl) {
+      cachedResourceResolve(component.templateUrl).then((template) => {
+        component.template = template;
+        component.templateUrl = undefined;
+      });
+    }
+    const styleUrls = component.styleUrls;
+    const styles = component.styles || (component.styles = []);
+    const styleOffset = component.styles.length;
+    styleUrls && styleUrls.forEach((styleUrl, index) => {
+      styles.push('');  // pre-allocate array.
+      cachedResourceResolve(styleUrl).then((style) => {
+        styles[styleOffset + index] = style;
+        styleUrls.splice(styleUrls.indexOf(styleUrl), 1);
+        if (styleUrls.length == 0) {
+          component.styleUrls = undefined;
+        }
+      });
+    });
+  });
+  componentResourceResolutionQueue.clear();
+  return Promise.all(urlFetches).then(() => null);
+}
+
+const componentResourceResolutionQueue: Set<Component> = new Set();
+
+export function maybeQueueResolutionOfComponentResources(metadata: Component) {
+  if (componentNeedsResolution(metadata)) {
+    componentResourceResolutionQueue.add(metadata);
+  }
+}
+
+export function componentNeedsResolution(component: Component) {
+  return component.templateUrl || component.styleUrls && component.styleUrls.length;
+}
+export function clearResolutionOfComponentResourcesQueue() {
+  componentResourceResolutionQueue.clear();
+}
+
+function unwrapResponse(response: string | {text(): Promise<string>}): string|Promise<string> {
+  return typeof response == 'string' ? response : response.text();
+}
\ No newline at end of file
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index b545f72306..e982be0a1c 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -9,16 +9,16 @@
 import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata as compileR3Component, compileDirectiveFromMetadata as compileR3Directive, jitExpression, makeBindingParser, parseHostBindings, parseTemplate} from '@angular/compiler';
 
 import {Component, Directive, HostBinding, HostListener, Input, Output} from '../../metadata/directives';
+import {componentNeedsResolution, maybeQueueResolutionOfComponentResources} from '../../metadata/resource_loading';
 import {ReflectionCapabilities} from '../../reflection/reflection_capabilities';
 import {Type} from '../../type';
+import {stringify} from '../../util';
 
 import {angularCoreEnv} from './environment';
 import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF} from './fields';
 import {patchComponentDefWithScope} from './module';
 import {getReflect, reflectDependencies} from './util';
 
-let _pendingPromises: Promise<void>[] = [];
-
 type StringMap = {
   [key: string]: string
 };
@@ -29,30 +29,39 @@ type StringMap = {
  *
  * Compilation may be asynchronous (due to the need to resolve URLs for the component template or
  * other resources, for example). In the event that compilation is not immediate, `compileComponent`
- * will return a `Promise` which will resolve when compilation completes and the component becomes
- * usable.
+ * will enqueue resource resolution into a global queue and will fail to return the `ngComponentDef`
+ * until the global queue has been resolved with a call to `resolveComponentResources`.
  */
-export function compileComponent(type: Type<any>, metadata: Component): Promise<void>|null {
-  // TODO(alxhub): implement ResourceLoader support for template compilation.
-  if (!metadata.template) {
-    throw new Error('templateUrl not yet supported');
-  }
-  const templateStr = metadata.template;
-
+export function compileComponent(type: Type<any>, metadata: Component): void {
   let def: any = null;
+  // Metadata may have resources which need to be resolved.
+  maybeQueueResolutionOfComponentResources(metadata);
   Object.defineProperty(type, NG_COMPONENT_DEF, {
     get: () => {
       if (def === null) {
+        if (componentNeedsResolution(metadata)) {
+          const error = [`Component '${stringify(type)}' is not resolved:`];
+          if (metadata.templateUrl) {
+            error.push(` - templateUrl: ${stringify(metadata.templateUrl)}`);
+          }
+          if (metadata.styleUrls && metadata.styleUrls.length) {
+            error.push(` - styleUrls: ${JSON.stringify(metadata.styleUrls)}`);
+          }
+          error.push(`Did you run and wait for 'resolveComponentResources()'?`);
+          throw new Error(error.join('\n'));
+        }
         // The ConstantPool is a requirement of the JIT'er.
         const constantPool = new ConstantPool();
 
         // Parse the template and check for errors.
-        const template = parseTemplate(templateStr, `ng://${type.name}/template.html`, {
-          preserveWhitespaces: metadata.preserveWhitespaces || false,
-        });
+        const template =
+            parseTemplate(metadata.template !, `ng://${stringify(type)}/template.html`, {
+              preserveWhitespaces: metadata.preserveWhitespaces || false,
+            });
         if (template.errors !== undefined) {
           const errors = template.errors.map(err => err.toString()).join(', ');
-          throw new Error(`Errors during JIT compilation of template for ${type.name}: ${errors}`);
+          throw new Error(
+              `Errors during JIT compilation of template for ${stringify(type)}: ${errors}`);
         }
 
         // Compile the component metadata, including template, into an expression.
@@ -81,8 +90,6 @@ export function compileComponent(type: Type<any>, metadata: Component): Promise<
       return def;
     },
   });
-
-  return null;
 }
 
 function hasSelectorScope<T>(component: Type<T>): component is Type<T>&
@@ -97,7 +104,7 @@ function hasSelectorScope<T>(component: Type<T>): component is Type<T>&
  * In the event that compilation is not immediate, `compileDirective` will return a `Promise` which
  * will resolve when compilation completes and the directive becomes usable.
  */
-export function compileDirective(type: Type<any>, directive: Directive): Promise<void>|null {
+export function compileDirective(type: Type<any>, directive: Directive): void {
   let def: any = null;
   Object.defineProperty(type, NG_DIRECTIVE_DEF, {
     get: () => {
@@ -111,31 +118,8 @@ export function compileDirective(type: Type<any>, directive: Directive): Promise
       return def;
     },
   });
-  return null;
 }
 
-/**
- * A wrapper around `compileComponent` which is intended to be used for the `@Component` decorator.
- *
- * This wrapper keeps track of the `Promise` returned by `compileComponent` and will cause
- * `awaitCurrentlyCompilingComponents` to wait on the compilation to be finished.
- */
-export function compileComponentDecorator(type: Type<any>, metadata: Component): void {
-  const res = compileComponent(type, metadata);
-  if (res !== null) {
-    _pendingPromises.push(res);
-  }
-}
-
-/**
- * Returns a promise which will await the compilation of any `@Component`s which have been defined
- * since the last time `awaitCurrentlyCompilingComponents` was called.
- */
-export function awaitCurrentlyCompilingComponents(): Promise<void> {
-  const res = Promise.all(_pendingPromises).then(() => undefined);
-  _pendingPromises = [];
-  return res;
-}
 
 /**
  * Extract the `R3DirectiveMetadata` for a particular directive (either a `Directive` or a
diff --git a/packages/core/test/metadata/resource_loading_spec.ts b/packages/core/test/metadata/resource_loading_spec.ts
new file mode 100644
index 0000000000..5ee74007ce
--- /dev/null
+++ b/packages/core/test/metadata/resource_loading_spec.ts
@@ -0,0 +1,136 @@
+/**
+ * @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 {jasmineAwait} from '@angular/core/testing';
+
+import {Component} from '../../src/core';
+import {clearResolutionOfComponentResourcesQueue, resolveComponentResources} from '../../src/metadata/resource_loading';
+import {ComponentType} from '../../src/render3/interfaces/definition';
+import {compileComponent} from '../../src/render3/jit/directive';
+
+describe('resource_loading', () => {
+  describe('error handling', () => {
+    afterEach(clearResolutionOfComponentResourcesQueue);
+    it('should throw an error when compiling component that has unresolved templateUrl', () => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      compileComponent(MyComponent, {templateUrl: 'someUrl'});
+      expect(() => MyComponent.ngComponentDef).toThrowError(`
+Component 'MyComponent' is not resolved:
+ - templateUrl: someUrl
+Did you run and wait for 'resolveComponentResources()'?`.trim());
+    });
+
+    it('should throw an error when compiling component that has unresolved styleUrls', () => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      compileComponent(MyComponent, {styleUrls: ['someUrl1', 'someUrl2']});
+      expect(() => MyComponent.ngComponentDef).toThrowError(`
+Component 'MyComponent' is not resolved:
+ - styleUrls: ["someUrl1","someUrl2"]
+Did you run and wait for 'resolveComponentResources()'?`.trim());
+    });
+
+    it('should throw an error when compiling component that has unresolved templateUrl and styleUrls',
+       () => {
+         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+         compileComponent(
+             MyComponent, {templateUrl: 'someUrl', styleUrls: ['someUrl1', 'someUrl2']});
+         expect(() => MyComponent.ngComponentDef).toThrowError(`
+Component 'MyComponent' is not resolved:
+ - templateUrl: someUrl
+ - styleUrls: ["someUrl1","someUrl2"]
+Did you run and wait for 'resolveComponentResources()'?`.trim());
+       });
+  });
+
+  describe('resolution', () => {
+    const URLS: {[url: string]: Promise<string>} = {
+      'test://content': Promise.resolve('content'),
+      'test://style1': Promise.resolve('style1'),
+      'test://style2': Promise.resolve('style2'),
+    };
+    let resourceFetchCount: number;
+    function testResolver(url: string): Promise<string> {
+      resourceFetchCount++;
+      return URLS[url] || Promise.reject('NOT_FOUND: ' + url);
+    }
+    beforeEach(() => resourceFetchCount = 0);
+
+    it('should resolve template', jasmineAwait(async() => {
+         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+         const metadata: Component = {templateUrl: 'test://content'};
+         compileComponent(MyComponent, metadata);
+         await resolveComponentResources(testResolver);
+         expect(MyComponent.ngComponentDef).toBeDefined();
+         expect(metadata.templateUrl).toBe(undefined);
+         expect(metadata.template).toBe('content');
+         expect(resourceFetchCount).toBe(1);
+       }));
+
+    it('should resolve styleUrls', jasmineAwait(async() => {
+         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+         const metadata: Component = {template: '', styleUrls: ['test://style1', 'test://style2']};
+         compileComponent(MyComponent, metadata);
+         await resolveComponentResources(testResolver);
+         expect(MyComponent.ngComponentDef).toBeDefined();
+         expect(metadata.styleUrls).toBe(undefined);
+         expect(metadata.styles).toEqual(['style1', 'style2']);
+         expect(resourceFetchCount).toBe(2);
+       }));
+
+    it('should cache multiple resolution to same URL', jasmineAwait(async() => {
+         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+         const metadata: Component = {template: '', styleUrls: ['test://style1', 'test://style1']};
+         compileComponent(MyComponent, metadata);
+         await resolveComponentResources(testResolver);
+         expect(MyComponent.ngComponentDef).toBeDefined();
+         expect(metadata.styleUrls).toBe(undefined);
+         expect(metadata.styles).toEqual(['style1', 'style1']);
+         expect(resourceFetchCount).toBe(1);
+       }));
+
+    it('should keep order even if the resolution is out of order', jasmineAwait(async() => {
+         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+         const metadata: Component = {
+           template: '',
+           styles: ['existing'],
+           styleUrls: ['test://style1', 'test://style2']
+         };
+         compileComponent(MyComponent, metadata);
+         const resolvers: any[] = [];
+         const resolved = resolveComponentResources(
+             (url) => new Promise((resolve, response) => resolvers.push(url, resolve)));
+         // Out of order resolution
+         expect(resolvers[0]).toEqual('test://style1');
+         expect(resolvers[2]).toEqual('test://style2');
+         resolvers[3]('second');
+         resolvers[1]('first');
+         await resolved;
+         expect(metadata.styleUrls).toBe(undefined);
+         expect(metadata.styles).toEqual(['existing', 'first', 'second']);
+       }));
+
+  });
+
+  describe('fetch', () => {
+    function fetch(url: string): Promise<Response> {
+      return Promise.resolve({
+        text() { return 'response for ' + url; }
+      } as any as Response);
+    }
+
+    it('should work with fetch', jasmineAwait(async() => {
+         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+         const metadata: Component = {templateUrl: 'test://content'};
+         compileComponent(MyComponent, metadata);
+         await resolveComponentResources(fetch);
+         expect(MyComponent.ngComponentDef).toBeDefined();
+         expect(metadata.templateUrl).toBe(undefined);
+         expect(metadata.template).toBe('response for test://content');
+       }));
+  });
+});

From 66e50f28d2143e52853625ac9b31d4c6d5dc45b2 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 27 Jun 2018 10:17:54 -0500
Subject: [PATCH 381/582] docs: include ts-loader as shared example dependency
 (#24691)

Closes #24671

PR Close #24691
---
 aio/tools/examples/shared/package.json |  1 +
 aio/tools/examples/shared/yarn.lock    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 1267ad5a67..1b74fa4af6 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -77,6 +77,7 @@
     "rollup-plugin-node-resolve": "2.0.0",
     "rollup-plugin-uglify": "^1.0.1",
     "source-map-explorer": "^1.3.2",
+    "ts-loader": "^4.2.0",
     "ts-node": "^5.0.1",
     "tslint": "^5.9.1",
     "typescript": "2.7.2",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index 18af4cf4ea..3313b5b4fb 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -7361,7 +7361,7 @@ semver-intersect@^1.1.2:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.5.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -8257,6 +8257,16 @@ trim-right@^1.0.1:
   dependencies:
     glob "^6.0.4"
 
+ts-loader@^4.2.0:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.4.1.tgz#c93a46eea430ebce1f790dfe438caefb8670d365"
+  dependencies:
+    chalk "^2.3.0"
+    enhanced-resolve "^4.0.0"
+    loader-utils "^1.0.2"
+    micromatch "^3.1.4"
+    semver "^5.0.1"
+
 ts-node@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"

From 3db9d57de394308cb03205b99ac5027a8cbb5af6 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 27 Jun 2018 10:20:09 -0500
Subject: [PATCH 382/582] fix(docs-infra): use clean package.json template when
 generating zips (#24691)

Closes #24689

PR Close #24691
---
 .../customizer/package-json/cli.json          |  2 +-
 .../customizer/package-json/i18n.json         |  2 +-
 .../package-json/packageJsonCustomizer.js     | 20 +++++++++++++------
 .../customizer/package-json/testing.json      |  1 +
 .../customizer/package-json/universal.json    |  1 +
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/aio/tools/example-zipper/customizer/package-json/cli.json b/aio/tools/example-zipper/customizer/package-json/cli.json
index 9dd7cce54c..965bd82407 100644
--- a/aio/tools/example-zipper/customizer/package-json/cli.json
+++ b/aio/tools/example-zipper/customizer/package-json/cli.json
@@ -9,8 +9,8 @@
   ],
   "dependencies": [],
   "devDependencies": [
-    "@angular/cli",
     "@angular-devkit/build-angular",
+    "@angular/cli",
     "@types/jasminewd2",
     "jasmine-spec-reporter",
     "karma-coverage-istanbul-reporter",
diff --git a/aio/tools/example-zipper/customizer/package-json/i18n.json b/aio/tools/example-zipper/customizer/package-json/i18n.json
index d257e96c1d..57320e769e 100644
--- a/aio/tools/example-zipper/customizer/package-json/i18n.json
+++ b/aio/tools/example-zipper/customizer/package-json/i18n.json
@@ -11,8 +11,8 @@
   ],
   "dependencies": [],
   "devDependencies": [
-    "@angular/cli",
     "@angular-devkit/build-angular",
+    "@angular/cli",
     "@types/jasminewd2",
     "jasmine-spec-reporter",
     "karma-coverage-istanbul-reporter",
diff --git a/aio/tools/example-zipper/customizer/package-json/packageJsonCustomizer.js b/aio/tools/example-zipper/customizer/package-json/packageJsonCustomizer.js
index 02858dacf0..2255244dcc 100644
--- a/aio/tools/example-zipper/customizer/package-json/packageJsonCustomizer.js
+++ b/aio/tools/example-zipper/customizer/package-json/packageJsonCustomizer.js
@@ -1,19 +1,21 @@
 'use strict';
 
 const path = require('canonical-path');
+const fs = require('fs');
 
 const examplesPath = path.resolve(__dirname, '../../../examples');
 const packageFolder = path.resolve(__dirname);
 
 class PackageJsonCustomizer {
   constructor() {
-    this.dependenciesPackageJson = require(path.join(examplesPath, '/shared/package.json'));
-    this.scriptsPackageJson = require(path.join(examplesPath, '/shared/boilerplate/systemjs/package.json'));
-    this.basePackageJson = require(`${packageFolder}/base.json`);
+    this.dependenciesPackageJson = this.readJson(path.join(examplesPath, '/shared/package.json'));
+    this.scriptsPackageJson = this.readJson(path.join(examplesPath, '/shared/boilerplate/systemjs/package.json'));
+    this.basePackageJson = this.readJson(`${packageFolder}/base.json`);
+    this.templatePackageJson = this.readJson(`${packageFolder}/package.json`, false);
   }
 
   generate(type = 'systemjs') {
-    let packageJson = require(`${packageFolder}/package.json`);
+    let packageJson = JSON.parse(this.templatePackageJson);
     let rules = require(`${packageFolder}/${type}.json`);
 
     this._mergeJSON(rules, this.basePackageJson);
@@ -39,8 +41,8 @@ class PackageJsonCustomizer {
     return JSON.stringify(packageJson, null, 2);
   }
 
-  _mergeJSON(json1,json2) {
-    var result = json1 ;
+  _mergeJSON(json1, json2) {
+    var result = json1;
     for (var prop in json2)
     {
         if (json2.hasOwnProperty(prop))
@@ -50,6 +52,12 @@ class PackageJsonCustomizer {
     }
     return result;
   }
+
+  readJson(jsonFile, parse = true) {
+    const contents = fs.readFileSync(jsonFile, 'utf8');
+
+    return parse ? JSON.parse(contents) : contents;
+  }
 }
 
 module.exports = PackageJsonCustomizer;
diff --git a/aio/tools/example-zipper/customizer/package-json/testing.json b/aio/tools/example-zipper/customizer/package-json/testing.json
index 5ce4c4788f..37c304b4cc 100644
--- a/aio/tools/example-zipper/customizer/package-json/testing.json
+++ b/aio/tools/example-zipper/customizer/package-json/testing.json
@@ -9,6 +9,7 @@
   ],
   "dependencies": [],
   "devDependencies": [
+    "@angular-devkit/build-angular",
     "@angular/cli",
     "@types/jasminewd2",
     "jasmine-marbles",
diff --git a/aio/tools/example-zipper/customizer/package-json/universal.json b/aio/tools/example-zipper/customizer/package-json/universal.json
index 2abfbcdd19..c3f649d529 100644
--- a/aio/tools/example-zipper/customizer/package-json/universal.json
+++ b/aio/tools/example-zipper/customizer/package-json/universal.json
@@ -15,6 +15,7 @@
     "@nguniversal/module-map-ngfactory-loader"
   ],
   "devDependencies": [
+    "@angular-devkit/build-angular",
     "@angular/cli",
     "@types/jasminewd2",
     "jasmine-spec-reporter",

From 99bdd257a6d793d1b432e1800831239d77056a98 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 27 Jun 2018 16:05:23 -0700
Subject: [PATCH 383/582] fix(ivy): support projecting containers into
 containers (#24695)

PR Close #24695
---
 packages/core/src/render3/instructions.ts     |  47 ++------
 .../core/src/render3/node_manipulation.ts     |  12 +-
 packages/core/test/render3/content_spec.ts    | 105 +++++++++++++++++-
 3 files changed, 114 insertions(+), 50 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index c0d357a861..a1013eff9b 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1831,48 +1831,11 @@ export function embeddedViewEnd(): void {
   refreshView();
   isParent = false;
   previousOrParentNode = viewData[HOST_NODE] as LViewNode;
-  if (creationMode) {
-    const containerNode = getParentLNode(previousOrParentNode) as LContainerNode;
-    if (containerNode) {
-      ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
-      ngDevMode && assertNodeType(containerNode, TNodeType.Container);
-      // When projected nodes are going to be inserted, the renderParent of the dynamic container
-      // used by the ViewContainerRef must be set.
-      setRenderParentInProjectedNodes(
-          containerNode.data[RENDER_PARENT], previousOrParentNode as LViewNode);
-    }
-  }
   leaveView(viewData[PARENT] !);
   ngDevMode && assertEqual(isParent, false, 'isParent');
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.View);
 }
 
-/**
- * For nodes which are projected inside an embedded view, this function sets the renderParent
- * of their dynamic LContainerNode.
- * @param renderParent the renderParent of the LContainer which contains the embedded view.
- * @param viewNode the embedded view.
- */
-function setRenderParentInProjectedNodes(
-    renderParent: LElementNode | null, viewNode: LViewNode): void {
-  if (renderParent != null) {
-    let node: LNode|null = getChildLNode(viewNode);
-    while (node) {
-      if (node.tNode.type === TNodeType.Projection) {
-        let nodeToProject: LNode|null = (node as LProjectionNode).data.head;
-        const lastNodeToProject = (node as LProjectionNode).data.tail;
-        while (nodeToProject) {
-          if (nodeToProject.dynamicLContainerNode) {
-            nodeToProject.dynamicLContainerNode.data[RENDER_PARENT] = renderParent;
-          }
-          nodeToProject = nodeToProject === lastNodeToProject ? null : nodeToProject.pNextOrParent;
-        }
-      }
-      node = getNextLNode(node);
-    }
-  }
-}
-
 /////////////
 
 /**
@@ -1946,7 +1909,7 @@ export function projectionDef(
     // execute selector matching logic if and only if:
     // - there are selectors defined
     // - a node has a tag name / attributes that can be matched
-    if (selectors && componentChild.tNode) {
+    if (selectors) {
       const matchedIdx = matchingSelectorIndex(componentChild.tNode, selectors, textSelectors !);
       distributedNodes[matchedIdx].push(componentChild);
     } else {
@@ -2037,10 +2000,14 @@ export function projection(
     // process each node in the list of projected nodes:
     let nodeToProject: LNode|null = node.data.head;
     const lastNodeToProject = node.data.tail;
+    const renderParent = currentParent.tNode.type === TNodeType.View ?
+        (getParentLNode(currentParent) as LContainerNode).data[RENDER_PARENT] ! :
+        currentParent as LElementNode;
+
     while (nodeToProject) {
       appendProjectedNode(
-          nodeToProject as LTextNode | LElementNode | LContainerNode, currentParent as LElementNode,
-          viewData);
+          nodeToProject as LTextNode | LElementNode | LContainerNode, currentParent, viewData,
+          renderParent);
       nodeToProject = nodeToProject === lastNodeToProject ? null : nodeToProject.pNextOrParent;
     }
   }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 9f64c77d4a..4806de5499 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -608,24 +608,24 @@ export function removeChild(parent: LNode, child: RNode | null, currentView: LVi
  * @param currentView Current LView
  */
 export function appendProjectedNode(
-    node: LElementNode | LTextNode | LContainerNode, currentParent: LElementNode,
-    currentView: LViewData): void {
+    node: LElementNode | LTextNode | LContainerNode, currentParent: LElementNode | LViewNode,
+    currentView: LViewData, renderParent: LElementNode): void {
   appendChild(currentParent, node.native, currentView);
   if (node.tNode.type === TNodeType.Container) {
-    // The node we are adding is a Container and we are adding it to Element which
+    // The node we are adding is a container and we are adding it to an element which
     // is not a component (no more re-projection).
     // Alternatively a container is projected at the root of a component's template
     // and can't be re-projected (as not content of any component).
-    // Assignee the final projection location in those cases.
+    // Assign the final projection location in those cases.
     const lContainer = (node as LContainerNode).data;
-    lContainer[RENDER_PARENT] = currentParent;
+    lContainer[RENDER_PARENT] = renderParent;
     const views = lContainer[VIEWS];
     for (let i = 0; i < views.length; i++) {
       addRemoveViewFromContainer(node as LContainerNode, views[i], true, null);
     }
   }
   if (node.dynamicLContainerNode) {
-    node.dynamicLContainerNode.data[RENDER_PARENT] = currentParent;
+    node.dynamicLContainerNode.data[RENDER_PARENT] = renderParent;
     appendChild(currentParent, node.dynamicLContainerNode.native, currentView);
   }
 }
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 058be8ca4b..a6c3316285 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -138,6 +138,7 @@ describe('content projection', () => {
   });
 
   it('should project content with container.', () => {
+    /** <div> <ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         projectionDef(0);
@@ -146,6 +147,16 @@ describe('content projection', () => {
         elementEnd();
       }
     });
+
+    /**
+     * <child>
+     *     (
+     *      % if (value) {
+     *        content
+     *      % }
+     *     )
+     * </child>
+     */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
@@ -182,12 +193,21 @@ describe('content projection', () => {
   });
 
   it('should project content with container into root', () => {
+    /** <ng-content></ng-content> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         projectionDef(0);
         projection(1, 0);
       }
     });
+
+    /**
+     * <child>
+     *    % if (value) {
+     *      content
+     *    % }
+     * </child>
+     */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
@@ -222,6 +242,7 @@ describe('content projection', () => {
   });
 
   it('should project content with container and if-else.', () => {
+    /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         projectionDef(0);
@@ -230,6 +251,18 @@ describe('content projection', () => {
         elementEnd();
       }
     });
+
+    /**
+     * <child>
+     *     (
+     *       % if (value) {
+     *         content
+     *       % } else {
+     *         else
+     *       % }
+     *     )
+     * </child>
+     */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
@@ -270,7 +303,7 @@ describe('content projection', () => {
     expect(toHtml(parent)).toEqual('<child><div>(else)</div></child>');
   });
 
-  it('should support projection in embedded views', () => {
+  it('should support projection into embedded views', () => {
     let childCmptInstance: any;
 
     /**
@@ -306,9 +339,7 @@ describe('content projection', () => {
       }
     });
 
-    /**
-     * <child>content</child>
-     */
+    /** <child>content</child> */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
@@ -383,6 +414,72 @@ describe('content projection', () => {
        expect(toHtml(parent)).toEqual('<child><div></div></child>');
      });
 
+  it('should project containers into embedded views', () => {
+    /**
+     * <div>
+     *  % if (!skipContent) {
+     *    <ng-content></ng-content>
+     *  % }
+     * </div>
+     */
+    const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        elementStart(1, 'div');
+        { container(2); }
+        elementEnd();
+      }
+      if (rf & RenderFlags.Update) {
+        containerRefreshStart(2);
+        {
+          if (!ctx.skipContent) {
+            let rf0 = embeddedViewStart(0);
+            if (rf0 & RenderFlags.Create) {
+              projection(0, 0);
+            }
+            embeddedViewEnd();
+          }
+        }
+        containerRefreshEnd();
+      }
+    });
+
+    /**
+     * <child>
+     *     % if (!skipContent) {
+     *       content
+     *     % }
+     * </child>
+     */
+    const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        { container(1); }
+        elementEnd();
+      }
+      if (rf & RenderFlags.Update) {
+        containerRefreshStart(1);
+        {
+          if (!ctx.skipContent) {
+            let rf0 = embeddedViewStart(0);
+            if (rf0 & RenderFlags.Create) {
+              text(0, 'content');
+            }
+            embeddedViewEnd();
+          }
+        }
+        containerRefreshEnd();
+      }
+    }, [Child]);
+
+    const fixture = new ComponentFixture(Parent);
+    expect(fixture.html).toEqual('<child><div>content</div></child>');
+
+    fixture.component.skipContent = true;
+    fixture.update();
+    expect(fixture.html).toEqual('<child><div></div></child>');
+  });
+
   it('should support projection in embedded views when ng-content is a root node of an embedded view, with other nodes after',
      () => {
        let childCmptInstance: any;

From d876700c2643a1ebbfb8ed837df8c09e061d04ab Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 15 Jun 2018 13:36:30 +0100
Subject: [PATCH 384/582] build(docs-infra): render short description of
 parameters in API docs (#24537)

PR Close #24537
---
 aio/tools/transforms/templates/api/lib/paramList.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aio/tools/transforms/templates/api/lib/paramList.html b/aio/tools/transforms/templates/api/lib/paramList.html
index 0f63ad32d9..8c8e3c9849 100644
--- a/aio/tools/transforms/templates/api/lib/paramList.html
+++ b/aio/tools/transforms/templates/api/lib/paramList.html
@@ -21,8 +21,7 @@
       {% if showType %}<td class="param-type"><code>{$ parameter.type $}</code></td>{% endif %}
       <td class="param-description">
       {% marked %}
-      {% if parameter.description | trim %}{$ parameter.description $}
-
+      {% if (parameter.shortDescription | trim) or (parameter.description | trim) %}{$ parameter.shortDescription + '\n\n' + parameter.description $}
       {% elseif not showType and parameter.type %}<p>Type: <code>{$ parameter.type $}</code>.</p>
       {% endif %}
 

From 13d60eac613d5f0079a9493be6edfafd98811474 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@google.com>
Date: Tue, 26 Jun 2018 16:41:43 -0700
Subject: [PATCH 385/582] fix(platform-browser): add missing deps for
 HammerGesturesPlugin (#24682)

PR Close #24682
---
 packages/platform-browser/src/browser.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index 9550029af9..8a73d64fa9 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, PlatformLocation, ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
-import {APP_ID, ApplicationModule, ClassProvider, ConstructorSansProvider, ErrorHandler, ExistingProvider, FactoryProvider, Inject, InjectionToken, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT} from '@angular/core';
+import {APP_ID, ApplicationModule, ClassProvider, ConstructorSansProvider, ErrorHandler, ExistingProvider, FactoryProvider, Inject, InjectionToken, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore, ɵAPP_ROOT as APP_ROOT, ɵConsole as Console} from '@angular/core';
 
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserPlatformLocation} from './browser/location/browser_platform_location';
@@ -21,7 +21,7 @@ import {DomRendererFactory2} from './dom/dom_renderer';
 import {DOCUMENT} from './dom/dom_tokens';
 import {DomEventsPlugin} from './dom/events/dom_events';
 import {EVENT_MANAGER_PLUGINS, EventManager, EventManagerPlugin} from './dom/events/event_manager';
-import {HAMMER_GESTURE_CONFIG, HammerGestureConfig, HammerGesturesPlugin} from './dom/events/hammer_gestures';
+import {HAMMER_GESTURE_CONFIG, HAMMER_LOADER, HammerGestureConfig, HammerGesturesPlugin} from './dom/events/hammer_gestures';
 import {KeyEventsPlugin} from './dom/events/key_events';
 import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
 import {DomSanitizer, DomSanitizerImpl} from './security/dom_sanitization_service';
@@ -75,7 +75,7 @@ export const BROWSER_MODULE_PROVIDERS: StaticProvider[] = [
     provide: EVENT_MANAGER_PLUGINS,
     useClass: HammerGesturesPlugin,
     multi: true,
-    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG]
+    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG, Console, [new Optional(), HAMMER_LOADER]]
   },
   {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig, deps: []},
   {

From 9803cb011e4b52046568020363f36f74e0fb5bb3 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 18 Jun 2018 08:05:06 -0700
Subject: [PATCH 386/582] feat(ivy): Add InheritanceDefinitionFeature to
 support directive inheritance (#24570)

- Adds InheritanceDefinitionFeature to ivy
- Ensures that lifecycle hooks are inherited from super classes whether they are defined as directives or not
- Directives cannot inherit from Components
- Components can inherit from Directives or Components
- Ensures that Inputs, Outputs, and Host Bindings are inherited
- Ensures that super class Features are run

PR Close #24570
---
 .../src/ngtsc/annotations/src/directive.ts    |   5 +-
 .../compiler/src/render3/r3_identifiers.ts    |   3 +
 packages/compiler/src/render3/view/api.ts     |   5 +
 .../compiler/src/render3/view/compiler.ts     |   9 +-
 .../render3/r3_compiler_compliance_spec.ts    |   6 +-
 packages/core/src/render3/definition.ts       | 256 +++++++-------
 .../features/inherit_definition_feature.ts    | 120 +++++++
 .../render3/features/ng_onchanges_feature.ts  | 116 +++++++
 .../src/render3/features/public_feature.ts    |  19 +
 packages/core/src/render3/index.ts            |   7 +-
 .../core/src/render3/interfaces/definition.ts |  11 +
 packages/core/src/render3/jit/directive.ts    |  41 ++-
 packages/core/src/render3/jit/environment.ts  |   1 +
 packages/core/test/bundling/todo/index.ts     |  34 +-
 .../Inherit_definition_feature_spec.ts        | 238 +++++++++++++
 packages/core/test/render3/common_with_def.ts |   3 +-
 .../compiler_canonical/life_cycle_spec.ts     |   4 +-
 .../template_variables_spec.ts                |   2 +-
 packages/core/test/render3/define_spec.ts     | 120 -------
 packages/core/test/render3/di_spec.ts         |   2 +-
 .../core/test/render3/jit/directive_spec.ts   |  39 +++
 packages/core/test/render3/lifecycle_spec.ts  |  17 +-
 .../render3/ng_on_changes_feature_spec.ts     | 325 ++++++++++++++++++
 packages/core/test/render3/render_util.ts     |   2 +-
 .../test/render3/view_container_ref_spec.ts   |   2 +-
 25 files changed, 1095 insertions(+), 292 deletions(-)
 create mode 100644 packages/core/src/render3/features/inherit_definition_feature.ts
 create mode 100644 packages/core/src/render3/features/ng_onchanges_feature.ts
 create mode 100644 packages/core/src/render3/features/public_feature.ts
 create mode 100644 packages/core/test/render3/Inherit_definition_feature_spec.ts
 delete mode 100644 packages/core/test/render3/define_spec.ts
 create mode 100644 packages/core/test/render3/jit/directive_spec.ts
 create mode 100644 packages/core/test/render3/ng_on_changes_feature_spec.ts

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 7c2ebdf8a1..4fc2b657cb 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -108,6 +108,9 @@ export function extractDirectiveMetadata(
                             member => member.isStatic && member.kind === ClassMemberKind.Method &&
                                 member.name === 'ngOnChanges') !== undefined;
 
+  // Detect if the component inherits from another class
+  const usesInheritance = clazz.heritageClauses !== undefined &&
+      clazz.heritageClauses.some(hc => hc.token === ts.SyntaxKind.ExtendsKeyword);
   return {
     name: clazz.name !.text,
     deps: getConstructorDependencies(clazz, reflector, isCore),
@@ -123,7 +126,7 @@ export function extractDirectiveMetadata(
     outputs: {...outputsFromMeta, ...outputsFromFields},
     queries: [], selector,
     type: new WrappedNodeExpr(clazz.name !),
-    typeSourceSpan: null !,
+    typeSourceSpan: null !, usesInheritance,
   };
 }
 
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 2d5475c6eb..78dd3ca0a7 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -138,6 +138,9 @@ export class Identifiers {
 
   static NgOnChangesFeature: o.ExternalReference = {name: 'ɵNgOnChangesFeature', moduleName: CORE};
 
+  static InheritDefinitionFeature:
+      o.ExternalReference = {name: 'ɵInheritDefinitionFeature', moduleName: CORE};
+
   static listener: o.ExternalReference = {name: 'ɵL', moduleName: CORE};
 
   // Reserve slots for pure functions
diff --git a/packages/compiler/src/render3/view/api.ts b/packages/compiler/src/render3/view/api.ts
index 495ccf8976..8ebcc44fb8 100644
--- a/packages/compiler/src/render3/view/api.ts
+++ b/packages/compiler/src/render3/view/api.ts
@@ -86,6 +86,11 @@ export interface R3DirectiveMetadata {
    * A mapping of output field names to the property names.
    */
   outputs: {[field: string]: string};
+
+  /**
+   * Whether or not the component or directive inherits from another class
+   */
+  usesInheritance: boolean;
 }
 
 /**
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 63a2462408..375c9e134b 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -64,10 +64,14 @@ function baseDirectiveFields(
   // e.g 'outputs: {a: 'a'}`
   definitionMap.set('outputs', conditionallyCreateMapObjectLiteral(meta.outputs));
 
-  // e.g. `features: [NgOnChangesFeature(MyComponent)]`
+  // e.g. `features: [NgOnChangesFeature]`
   const features: o.Expression[] = [];
+
+  if (meta.usesInheritance) {
+    features.push(o.importExpr(R3.InheritDefinitionFeature));
+  }
   if (meta.lifecycle.usesOnChanges) {
-    features.push(o.importExpr(R3.NgOnChangesFeature, null, null).callFn([meta.type]));
+    features.push(o.importExpr(R3.NgOnChangesFeature));
   }
   if (features.length) {
     definitionMap.set('features', o.literalArr(features));
@@ -255,6 +259,7 @@ function directiveMetadataFromGlobalMetadata(
     },
     inputs: directive.inputs,
     outputs: directive.outputs,
+    usesInheritance: false,
   };
 }
 
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index ee6b53d123..a7d9befbe6 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -1212,7 +1212,7 @@ describe('compiler compliance', () => {
             selectors: [['lifecycle-comp']],
             factory: function LifecycleComp_Factory() { return new LifecycleComp(); },
             inputs: {nameMin: 'name'},
-            features: [$r3$.ɵNgOnChangesFeature(LifecycleComp)],
+            features: [$r3$.ɵNgOnChangesFeature],
             template: function LifecycleComp_Template(rf: IDENT, ctx: IDENT) {}
           });`;
 
@@ -1328,7 +1328,7 @@ describe('compiler compliance', () => {
                 factory: function ForOfDirective_Factory() {
                   return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
                 },
-                features: [$r3$.ɵNgOnChangesFeature(NgForOf)],
+                features: [$r3$.ɵNgOnChangesFeature],
                 inputs: {forOf: 'forOf'}
               });
             `;
@@ -1401,7 +1401,7 @@ describe('compiler compliance', () => {
             factory: function ForOfDirective_Factory() {
               return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
             },
-            features: [$r3$.ɵNgOnChangesFeature(NgForOf)],
+            features: [$r3$.ɵNgOnChangesFeature],
             inputs: {forOf: 'forOf'}
           });
         `;
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index f8ce00f91c..e671928716 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -61,14 +61,47 @@ export function defineComponent<T>(componentDefinition: {
   /**
    * A map of input names.
    *
-   * The format is in: `{[actualPropertyName: string]:string}`.
+   * The format is in: `{[actualPropertyName: string]:(string|[string, string])}`.
    *
-   * Which the minifier may translate to: `{[minifiedPropertyName: string]:string}`.
+   * Given:
+   * ```
+   * class MyComponent {
+   *   @Input()
+   *   publicInput1: string;
    *
-   * This allows the render to re-construct the minified and non-minified names
+   *   @Input('publicInput2')
+   *   declaredInput2: string;
+   * }
+   * ```
+   *
+   * is described as:
+   * ```
+   * {
+   *   publicInput1: 'publicInput1',
+   *   declaredInput2: ['declaredInput2', 'publicInput2'],
+   * }
+   * ```
+   *
+   * Which the minifier may translate to:
+   * ```
+   * {
+   *   minifiedPublicInput1: 'publicInput1',
+   *   minifiedDeclaredInput2: [ 'publicInput2', 'declaredInput2'],
+   * }
+   * ```
+   *
+   * This allows the render to re-construct the minified, public, and declared names
    * of properties.
+   *
+   * NOTE:
+   *  - Because declared and public name are usually same we only generate the array
+   *    `['declared', 'public']` format when they differ.
+   *  - The reason why this API and `outputs` API is not the same is that `NgOnChanges` has
+   *    inconsistent behavior in that it uses declared names rather than minified or public. For
+   *    this reason `NgOnChanges` will be deprecated and removed in future version and this
+   *    API will be simplified to be consistent with `output`.
    */
-  inputs?: {[P in keyof T]?: string};
+  inputs?: {[P in keyof T]?: string | [string, string]};
 
   /**
    * A map of output names.
@@ -176,6 +209,7 @@ export function defineComponent<T>(componentDefinition: {
   const type = componentDefinition.type;
   const pipeTypes = componentDefinition.pipes !;
   const directiveTypes = componentDefinition.directives !;
+  const declaredInputs: {[P in keyof T]: P} = {} as any;
   const def: ComponentDefInternal<any> = {
     type: type,
     diPublic: null,
@@ -183,7 +217,8 @@ export function defineComponent<T>(componentDefinition: {
     template: componentDefinition.template || null !,
     hostBindings: componentDefinition.hostBindings || null,
     attributes: componentDefinition.attributes || null,
-    inputs: invertObject(componentDefinition.inputs),
+    inputs: invertObject(componentDefinition.inputs, declaredInputs),
+    declaredInputs: declaredInputs,
     outputs: invertObject(componentDefinition.outputs),
     rendererType: resolveRendererType2(componentDefinition.rendererType) || null,
     exportAs: componentDefinition.exportAs || null,
@@ -204,6 +239,7 @@ export function defineComponent<T>(componentDefinition: {
         null,
     selectors: componentDefinition.selectors,
     viewQuery: componentDefinition.viewQuery || null,
+    features: componentDefinition.features || null,
   };
   const feature = componentDefinition.features;
   feature && feature.forEach((fn) => fn(def));
@@ -239,115 +275,72 @@ export function defineNgModule<T>(def: {type: T} & Partial<NgModuleDef<T, any, a
   return res as never;
 }
 
-const PRIVATE_PREFIX = '__ngOnChanges_';
-
-type OnChangesExpando = OnChanges & {
-  __ngOnChanges_: SimpleChanges|null|undefined;
-  [key: string]: any;
-};
-
-/**
- * Creates an NgOnChangesFeature function for a component's features list.
- *
- * It accepts an optional map of minified input property names to original property names,
- * if any input properties have a public alias.
- *
- * The NgOnChangesFeature function that is returned decorates a component with support for
- * the ngOnChanges lifecycle hook, so it should be included in any component that implements
- * that hook.
- *
- * Example usage:
- *
- * ```
- * static ngComponentDef = defineComponent({
- *   ...
- *   inputs: {name: 'publicName'},
- *   features: [NgOnChangesFeature({name: 'name'})]
- * });
- * ```
- *
- * @param inputPropertyNames Map of input property names, if they are aliased
- * @returns DirectiveDefFeature
- */
-export function NgOnChangesFeature(inputPropertyNames?: {[key: string]: string}):
-    DirectiveDefFeature {
-  return function(definition: DirectiveDefInternal<any>): void {
-    const inputs = definition.inputs;
-    const proto = definition.type.prototype;
-    for (let pubKey in inputs) {
-      const minKey = inputs[pubKey];
-      const propertyName = inputPropertyNames && inputPropertyNames[minKey] || pubKey;
-      const privateMinKey = PRIVATE_PREFIX + minKey;
-      const originalProperty = Object.getOwnPropertyDescriptor(proto, minKey);
-      const getter = originalProperty && originalProperty.get;
-      const setter = originalProperty && originalProperty.set;
-      // create a getter and setter for property
-      Object.defineProperty(proto, minKey, {
-        get: getter ||
-            (setter ? undefined : function(this: OnChangesExpando) { return this[privateMinKey]; }),
-        set: function(this: OnChangesExpando, value: any) {
-          let simpleChanges = this[PRIVATE_PREFIX];
-          if (!simpleChanges) {
-            // Place where we will store SimpleChanges if there is a change
-            Object.defineProperty(
-                this, PRIVATE_PREFIX, {value: simpleChanges = {}, writable: true});
-          }
-          const isFirstChange = !this.hasOwnProperty(privateMinKey);
-          const currentChange: SimpleChange|undefined = simpleChanges[propertyName];
-          if (currentChange) {
-            currentChange.currentValue = value;
-          } else {
-            simpleChanges[propertyName] =
-                new SimpleChange(this[privateMinKey], value, isFirstChange);
-          }
-          if (isFirstChange) {
-            // Create a place where the actual value will be stored and make it non-enumerable
-            Object.defineProperty(this, privateMinKey, {value, writable: true});
-          } else {
-            this[privateMinKey] = value;
-          }
-          setter && setter.call(this, value);
-        }
-      });
-    }
-
-    // If an onInit hook is defined, it will need to wrap the ngOnChanges call
-    // so the call order is changes-init-check in creation mode. In subsequent
-    // change detection runs, only the check wrapper will be called.
-    if (definition.onInit != null) {
-      definition.onInit = onChangesWrapper(definition.onInit);
-    }
-
-    definition.doCheck = onChangesWrapper(definition.doCheck);
-  };
-
-  function onChangesWrapper(delegateHook: (() => void) | null) {
-    return function(this: OnChangesExpando) {
-      let simpleChanges = this[PRIVATE_PREFIX];
-      if (simpleChanges != null) {
-        this.ngOnChanges(simpleChanges);
-        this[PRIVATE_PREFIX] = null;
-      }
-      delegateHook && delegateHook.apply(this);
-    };
-  }
-}
-
-
-export function PublicFeature<T>(definition: DirectiveDefInternal<T>) {
-  definition.diPublic = diPublic;
-}
-
 const EMPTY = {};
 
-/** Swaps the keys and values of an object. */
-function invertObject(obj: any): any {
+/**
+ * Inverts an inputs or outputs lookup such that the keys, which were the
+ * minified keys, are part of the values, and the values are parsed so that
+ * the publicName of the property is the new key
+ *
+ * e.g. for
+ *
+ * ```
+ * class Comp {
+ *   @Input()
+ *   propName1: string;
+ *
+ *   @Input('publicName')
+ *   propName2: number;
+ * }
+ * ```
+ *
+ * will be serialized as
+ *
+ * ```
+ * {
+ *   a0: 'propName1',
+ *   b1: ['publicName', 'propName2'],
+ * }
+ * ```
+ *
+ * becomes
+ *
+ * ```
+ * {
+ *  'propName1': 'a0',
+ *  'publicName': 'b1'
+ * }
+ * ```
+ *
+ * Optionally the function can take `secondary` which will result in:
+ *
+ * ```
+ * {
+ *  'propName1': 'a0',
+ *  'propName2': 'b1'
+ * }
+ * ```
+ *
+
+ */
+function invertObject(obj: any, secondary?: any): any {
   if (obj == null) return EMPTY;
-  const newObj: any = {};
-  for (let minifiedKey in obj) {
-    newObj[obj[minifiedKey]] = minifiedKey;
+  const newLookup: any = {};
+  for (const minifiedKey in obj) {
+    if (obj.hasOwnProperty(minifiedKey)) {
+      let publicName = obj[minifiedKey];
+      let declaredName = publicName;
+      if (Array.isArray(publicName)) {
+        declaredName = publicName[1];
+        publicName = publicName[0];
+      }
+      newLookup[publicName] = minifiedKey;
+      if (secondary) {
+        (secondary[declaredName] = minifiedKey);
+      }
+    }
   }
-  return newObj;
+  return newLookup;
 }
 
 /**
@@ -389,14 +382,47 @@ export const defineDirective = defineComponent as any as<T>(directiveDefinition:
   /**
    * A map of input names.
    *
-   * The format is in: `{[actualPropertyName: string]:string}`.
+   * The format is in: `{[actualPropertyName: string]:(string|[string, string])}`.
    *
-   * Which the minifier may translate to: `{[minifiedPropertyName: string]:string}`.
+   * Given:
+   * ```
+   * class MyComponent {
+   *   @Input()
+   *   publicInput1: string;
    *
-   * This allows the render to re-construct the minified and non-minified names
+   *   @Input('publicInput2')
+   *   declaredInput2: string;
+   * }
+   * ```
+   *
+   * is described as:
+   * ```
+   * {
+   *   publicInput1: 'publicInput1',
+   *   declaredInput2: ['declaredInput2', 'publicInput2'],
+   * }
+   * ```
+   *
+   * Which the minifier may translate to:
+   * ```
+   * {
+   *   minifiedPublicInput1: 'publicInput1',
+   *   minifiedDeclaredInput2: [ 'publicInput2', 'declaredInput2'],
+   * }
+   * ```
+   *
+   * This allows the render to re-construct the minified, public, and declared names
    * of properties.
+   *
+   * NOTE:
+   *  - Because declared and public name are usually same we only generate the array
+   *    `['declared', 'public']` format when they differ.
+   *  - The reason why this API and `outputs` API is not the same is that `NgOnChanges` has
+   *    inconsistent behavior in that it uses declared names rather than minified or public. For
+   *    this reason `NgOnChanges` will be deprecated and removed in future version and this
+   *    API will be simplified to be consistent with `output`.
    */
-  inputs?: {[P in keyof T]?: string};
+  inputs?: {[P in keyof T]?: string | [string, string]};
 
   /**
    * A map of output names.
@@ -413,7 +439,7 @@ export const defineDirective = defineComponent as any as<T>(directiveDefinition:
   /**
    * A list of optional features to apply.
    *
-   * See: {@link NgOnChangesFeature}, {@link PublicFeature}
+   * See: {@link NgOnChangesFeature}, {@link PublicFeature}, {@link InheritDefinitionFeature}
    */
   features?: DirectiveDefFeature[];
 
diff --git a/packages/core/src/render3/features/inherit_definition_feature.ts b/packages/core/src/render3/features/inherit_definition_feature.ts
new file mode 100644
index 0000000000..8d4588459a
--- /dev/null
+++ b/packages/core/src/render3/features/inherit_definition_feature.ts
@@ -0,0 +1,120 @@
+/**
+ * @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 {Type} from '../../type';
+import {ComponentDefInternal, ComponentType, DirectiveDefFeature, DirectiveDefInternal} from '../interfaces/definition';
+
+
+/**
+ * Sets properties on a target object from a source object, but only if
+ * the property doesn't already exist on the target object.
+ * @param target The target to set properties on
+ * @param source The source of the property keys and values to set
+ */
+function fillProperties(target: {[key: string]: string}, source: {[key: string]: string}) {
+  for (const key in source) {
+    if (source.hasOwnProperty(key) && !target.hasOwnProperty(key)) {
+      target[key] = source[key];
+    }
+  }
+}
+/**
+ * Determines if a definition is a {@link ComponentDefInternal} or a {@link DirectiveDefInternal}
+ * @param definition The definition to examine
+ */
+function isComponentDef<T>(definition: ComponentDefInternal<T>| DirectiveDefInternal<T>):
+    definition is ComponentDefInternal<T> {
+  const def = definition as ComponentDefInternal<T>;
+  return typeof def.template === 'function';
+}
+
+function getSuperType(type: Type<any>): Type<any>&
+    {ngComponentDef?: ComponentDefInternal<any>, ngDirectiveDef?: DirectiveDefInternal<any>} {
+  return Object.getPrototypeOf(type.prototype).constructor;
+}
+
+/**
+ * Merges the definition from a super class to a sub class.
+ * @param definition The definition that is a SubClass of another directive of component
+ */
+export function InheritDefinitionFeature(
+    definition: DirectiveDefInternal<any>| ComponentDefInternal<any>): void {
+  let superType = getSuperType(definition.type);
+  let superDef: DirectiveDefInternal<any>|ComponentDefInternal<any>|undefined = undefined;
+
+  while (superType && !superDef) {
+    if (isComponentDef(definition)) {
+      superDef = superType.ngComponentDef || superType.ngDirectiveDef;
+    } else {
+      if (superType.ngComponentDef) {
+        throw new Error('Directives cannot inherit Components');
+      }
+      superDef = superType.ngDirectiveDef;
+    }
+
+    if (superDef) {
+      // Merge inputs and outputs
+      fillProperties(definition.inputs, superDef.inputs);
+      fillProperties(definition.declaredInputs, superDef.declaredInputs);
+      fillProperties(definition.outputs, superDef.outputs);
+
+      // Merge hostBindings
+      const prevHostBindings = definition.hostBindings;
+      const superHostBindings = superDef.hostBindings;
+      if (superHostBindings) {
+        if (prevHostBindings) {
+          definition.hostBindings = (directiveIndex: number, elementIndex: number) => {
+            superHostBindings(directiveIndex, elementIndex);
+            prevHostBindings(directiveIndex, elementIndex);
+          };
+        } else {
+          definition.hostBindings = superHostBindings;
+        }
+      }
+
+      // Inherit hooks
+      // Assume super class inheritance feature has already run.
+      definition.afterContentChecked =
+          definition.afterContentChecked || superDef.afterContentChecked;
+      definition.afterContentInit = definition.afterContentInit || superDef.afterContentInit;
+      definition.afterViewChecked = definition.afterViewChecked || superDef.afterViewChecked;
+      definition.afterViewInit = definition.afterViewInit || superDef.afterViewInit;
+      definition.doCheck = definition.doCheck || superDef.doCheck;
+      definition.onDestroy = definition.onDestroy || superDef.onDestroy;
+      definition.onInit = definition.onInit || superDef.onInit;
+
+      // Run parent features
+      const features = superDef.features;
+      if (features) {
+        for (const feature of features) {
+          if (feature && feature !== InheritDefinitionFeature) {
+            (feature as DirectiveDefFeature)(definition);
+          }
+        }
+      }
+    } else {
+      // Even if we don't have a definition, check the type for the hooks and use those if need be
+      const superPrototype = superType.prototype;
+
+      if (superPrototype) {
+        definition.afterContentChecked =
+            definition.afterContentChecked || superPrototype.afterContentChecked;
+        definition.afterContentInit =
+            definition.afterContentInit || superPrototype.afterContentInit;
+        definition.afterViewChecked =
+            definition.afterViewChecked || superPrototype.afterViewChecked;
+        definition.afterViewInit = definition.afterViewInit || superPrototype.afterViewInit;
+        definition.doCheck = definition.doCheck || superPrototype.doCheck;
+        definition.onDestroy = definition.onDestroy || superPrototype.onDestroy;
+        definition.onInit = definition.onInit || superPrototype.onInit;
+      }
+    }
+
+    superType = Object.getPrototypeOf(superType);
+  }
+}
diff --git a/packages/core/src/render3/features/ng_onchanges_feature.ts b/packages/core/src/render3/features/ng_onchanges_feature.ts
new file mode 100644
index 0000000000..09259a9eb5
--- /dev/null
+++ b/packages/core/src/render3/features/ng_onchanges_feature.ts
@@ -0,0 +1,116 @@
+/**
+ * @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 {SimpleChange} from '../../change_detection/change_detection_util';
+import {OnChanges, SimpleChanges} from '../../metadata/lifecycle_hooks';
+import {DirectiveDefInternal} from '../interfaces/definition';
+
+const PRIVATE_PREFIX = '__ngOnChanges_';
+
+type OnChangesExpando = OnChanges & {
+  __ngOnChanges_: SimpleChanges|null|undefined;
+  // tslint:disable-next-line:no-any Can hold any value
+  [key: string]: any;
+};
+
+/**
+ * The NgOnChangesFeature decorates a component with support for the ngOnChanges
+ * lifecycle hook, so it should be included in any component that implements
+ * that hook.
+ *
+ * If the component or directive uses inheritance, the NgOnChangesFeature MUST
+ * be included as a feature AFTER {@link InheritDefinitionFeature}, otherwise
+ * inherited properties will not be propagated to the ngOnChanges lifecycle
+ * hook.
+ *
+ * Example usage:
+ *
+ * ```
+ * static ngComponentDef = defineComponent({
+ *   ...
+ *   inputs: {name: 'publicName'},
+ *   features: [NgOnChangesFeature]
+ * });
+ * ```
+ */
+export function NgOnChangesFeature<T>(definition: DirectiveDefInternal<T>): void {
+  const declaredToMinifiedInputs = definition.declaredInputs;
+  const proto = definition.type.prototype;
+  for (const declaredName in declaredToMinifiedInputs) {
+    if (declaredToMinifiedInputs.hasOwnProperty(declaredName)) {
+      const minifiedKey = declaredToMinifiedInputs[declaredName];
+      const privateMinKey = PRIVATE_PREFIX + minifiedKey;
+
+      // Walk the prototype chain to see if we find a property descriptor
+      // That way we can honor setters and getters that were inherited.
+      let originalProperty: PropertyDescriptor|undefined = undefined;
+      let checkProto = proto;
+      while (!originalProperty && checkProto &&
+             Object.getPrototypeOf(checkProto) !== Object.getPrototypeOf(Object.prototype)) {
+        originalProperty = Object.getOwnPropertyDescriptor(checkProto, minifiedKey);
+        checkProto = Object.getPrototypeOf(checkProto);
+      }
+
+      const getter = originalProperty && originalProperty.get;
+      const setter = originalProperty && originalProperty.set;
+
+      // create a getter and setter for property
+      Object.defineProperty(proto, minifiedKey, {
+        get: getter ||
+            (setter ? undefined : function(this: OnChangesExpando) { return this[privateMinKey]; }),
+        set<T>(this: OnChangesExpando, value: T) {
+          let simpleChanges = this[PRIVATE_PREFIX];
+          if (!simpleChanges) {
+            simpleChanges = {};
+            // Place where we will store SimpleChanges if there is a change
+            Object.defineProperty(this, PRIVATE_PREFIX, {value: simpleChanges, writable: true});
+          }
+
+          const isFirstChange = !this.hasOwnProperty(privateMinKey);
+          const currentChange = simpleChanges[declaredName];
+
+          if (currentChange) {
+            currentChange.currentValue = value;
+          } else {
+            simpleChanges[declaredName] =
+                new SimpleChange(this[privateMinKey], value, isFirstChange);
+          }
+
+          if (isFirstChange) {
+            // Create a place where the actual value will be stored and make it non-enumerable
+            Object.defineProperty(this, privateMinKey, {value, writable: true});
+          } else {
+            this[privateMinKey] = value;
+          }
+
+          if (setter) setter.call(this, value);
+        }
+      });
+    }
+  }
+
+  // If an onInit hook is defined, it will need to wrap the ngOnChanges call
+  // so the call order is changes-init-check in creation mode. In subsequent
+  // change detection runs, only the check wrapper will be called.
+  if (definition.onInit != null) {
+    definition.onInit = onChangesWrapper(definition.onInit);
+  }
+
+  definition.doCheck = onChangesWrapper(definition.doCheck);
+}
+
+function onChangesWrapper(delegateHook: (() => void) | null) {
+  return function(this: OnChangesExpando) {
+    const simpleChanges = this[PRIVATE_PREFIX];
+    if (simpleChanges != null) {
+      this.ngOnChanges(simpleChanges);
+      this[PRIVATE_PREFIX] = null;
+    }
+    if (delegateHook) delegateHook.apply(this);
+  };
+}
diff --git a/packages/core/src/render3/features/public_feature.ts b/packages/core/src/render3/features/public_feature.ts
new file mode 100644
index 0000000000..6ed10af191
--- /dev/null
+++ b/packages/core/src/render3/features/public_feature.ts
@@ -0,0 +1,19 @@
+/**
+ * @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 {diPublic} from '../di';
+import {DirectiveDefInternal} from '../interfaces/definition';
+
+/**
+ * This feature publishes the directive (or component) into the DI system, making it visible to
+ * others for injection.
+ *
+ * @param definition
+ */
+export function PublicFeature<T>(definition: DirectiveDefInternal<T>) {
+  definition.diPublic = diPublic;
+}
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index b9a7ee98fc..963a4cd424 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -7,9 +7,13 @@
  */
 
 import {LifecycleHooksFeature, getHostElement, getRenderedText, renderComponent, whenRendered} from './component';
-import {NgOnChangesFeature, PublicFeature, defineComponent, defineDirective, defineNgModule, definePipe} from './definition';
+import {defineComponent, defineDirective, defineNgModule, definePipe} from './definition';
+import {InheritDefinitionFeature} from './features/inherit_definition_feature';
+import {NgOnChangesFeature} from './features/ng_onchanges_feature';
+import {PublicFeature} from './features/public_feature';
 import {I18nExpInstruction, I18nInstruction, i18nExpMapping, i18nInterpolation, i18nInterpolationV} from './i18n';
 import {ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
+
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
 export {RenderFlags} from './interfaces/definition';
@@ -133,6 +137,7 @@ export {
   DirectiveDefFlags,
   DirectiveType,
   NgOnChangesFeature,
+  InheritDefinitionFeature,
   PublicFeature,
   PipeDef,
   LifecycleHooksFeature,
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 69d685919b..cfcb79e308 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -96,6 +96,12 @@ export interface DirectiveDef<T, Selector extends string> {
    */
   readonly inputs: {[P in keyof T]: P};
 
+  /**
+   * @deprecated This is only here because `NgOnChanges` incorrectly uses declared name instead of
+   * public or minified name.
+   */
+  readonly declaredInputs: {[P in keyof T]: P};
+
   /**
    * A dictionary mapping the outputs' minified property names to their public API names, which
    * are their aliases if any, or their original unminified property names
@@ -135,6 +141,11 @@ export interface DirectiveDef<T, Selector extends string> {
   afterViewInit: (() => void)|null;
   afterViewChecked: (() => void)|null;
   onDestroy: (() => void)|null;
+
+  /**
+   * The features applied to this directive
+   */
+  features: DirectiveDefFeature[]|null;
 }
 
 /**
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index e982be0a1c..70ba78624d 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -121,6 +121,10 @@ export function compileDirective(type: Type<any>, directive: Directive): void {
 }
 
 
+export function extendsDirectlyFromObject(type: Type<any>): boolean {
+  return Object.getPrototypeOf(type.prototype) === Object.prototype;
+}
+
 /**
  * Extract the `R3DirectiveMetadata` for a particular directive (either a `Directive` or a
  * `Component`).
@@ -136,14 +140,16 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
 
   const inputsFromType: StringMap = {};
   const outputsFromType: StringMap = {};
-  for (let field in propMetadata) {
-    propMetadata[field].forEach(ann => {
-      if (isInput(ann)) {
-        inputsFromType[field] = ann.bindingPropertyName || field;
-      } else if (isOutput(ann)) {
-        outputsFromType[field] = ann.bindingPropertyName || field;
-      }
-    });
+  for (const field in propMetadata) {
+    if (propMetadata.hasOwnProperty(field)) {
+      propMetadata[field].forEach(ann => {
+        if (isInput(ann)) {
+          inputsFromType[field] = ann.bindingPropertyName || field;
+        } else if (isOutput(ann)) {
+          outputsFromType[field] = ann.bindingPropertyName || field;
+        }
+      });
+    }
   }
 
   return {
@@ -158,6 +164,7 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
       usesOnChanges: type.prototype.ngOnChanges !== undefined,
     },
     typeSourceSpan: null !,
+    usesInheritance: !extendsDirectlyFromObject(type),
   };
 }
 
@@ -174,14 +181,16 @@ function extractHostBindings(metadata: Directive, propMetadata: {[key: string]:
   }
 
   // Next, loop over the properties of the object, looking for @HostBinding and @HostListener.
-  for (let field in propMetadata) {
-    propMetadata[field].forEach(ann => {
-      if (isHostBinding(ann)) {
-        properties[ann.hostPropertyName || field] = field;
-      } else if (isHostListener(ann)) {
-        listeners[ann.eventName || field] = `${field}(${(ann.args || []).join(',')})`;
-      }
-    });
+  for (const field in propMetadata) {
+    if (propMetadata.hasOwnProperty(field)) {
+      propMetadata[field].forEach(ann => {
+        if (isHostBinding(ann)) {
+          properties[ann.hostPropertyName || field] = field;
+        } else if (isHostListener(ann)) {
+          listeners[ann.eventName || field] = `${field}(${(ann.args || []).join(',')})`;
+        }
+      });
+    }
   }
 
   return {attributes, listeners, properties};
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index b82abaa389..d1abad4ff3 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -31,6 +31,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵinjectTemplateRef': r3.injectTemplateRef,
   'ɵinjectViewContainerRef': r3.injectViewContainerRef,
   'ɵNgOnChangesFeature': r3.NgOnChangesFeature,
+  'ɵInheritDefinitionFeature': r3.InheritDefinitionFeature,
   'ɵa': r3.a,
   'ɵb': r3.b,
   'ɵC': r3.C,
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
index 60d65f0242..7584c645df 100644
--- a/packages/core/test/bundling/todo/index.ts
+++ b/packages/core/test/bundling/todo/index.ts
@@ -8,8 +8,8 @@
 
 import '@angular/core/test/bundling/util/src/reflect_metadata';
 
-import {CommonModule, NgForOf, NgIf} from '@angular/common';
-import {Component, Injectable, IterableDiffers, NgModule, defineInjector, ɵNgOnChangesFeature as NgOnChangesFeature, ɵdefineDirective as defineDirective, ɵdirectiveInject as directiveInject, ɵinjectTemplateRef as injectTemplateRef, ɵinjectViewContainerRef as injectViewContainerRef, ɵrenderComponent as renderComponent} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Component, Injectable, NgModule, ɵrenderComponent as renderComponent} from '@angular/core';
 
 class Todo {
   editing: boolean;
@@ -63,32 +63,32 @@ class TodoStore {
   <section class="todoapp">
     <header class="header">
       <h1>todos</h1>
-      <input class="new-todo" placeholder="What needs to be done?" autofocus="" 
-             [value]="newTodoText" 
+      <input class="new-todo" placeholder="What needs to be done?" autofocus=""
+             [value]="newTodoText"
              (keyup)="$event.code == 'Enter' ? addTodo() : newTodoText = $event.target.value">
     </header>
     <section *ngIf="todoStore.todos.length > 0" class="main">
-      <input *ngIf="todoStore.todos.length" 
-             #toggleall class="toggle-all" type="checkbox" 
-             [checked]="todoStore.allCompleted()" 
+      <input *ngIf="todoStore.todos.length"
+             #toggleall class="toggle-all" type="checkbox"
+             [checked]="todoStore.allCompleted()"
              (click)="todoStore.setAllTo(toggleall.checked)">
       <ul class="todo-list">
-        <li *ngFor="let todo of todoStore.todos" 
-            [class.completed]="todo.completed" 
+        <li *ngFor="let todo of todoStore.todos"
+            [class.completed]="todo.completed"
             [class.editing]="todo.editing">
           <div class="view">
-            <input class="toggle" type="checkbox" 
-                   (click)="toggleCompletion(todo)" 
+            <input class="toggle" type="checkbox"
+                   (click)="toggleCompletion(todo)"
                    [checked]="todo.completed">
             <label (dblclick)="editTodo(todo)">{{todo.title}}</label>
             <button class="destroy" (click)="remove(todo)"></button>
           </div>
-          <input *ngIf="todo.editing" 
+          <input *ngIf="todo.editing"
                  class="edit" #editedtodo
-                 [value]="todo.title" 
+                 [value]="todo.title"
                  (blur)="stopEditing(todo, editedtodo.value)"
-                 (keyup)="todo.title = $event.target.value" 
-                 (keyup)="$event.code == 'Enter' && updateEditingTodo(todo, editedtodo.value)" 
+                 (keyup)="todo.title = $event.target.value"
+                 (keyup)="$event.code == 'Enter' && updateEditingTodo(todo, editedtodo.value)"
                  (keyup)="$event.code == 'Escape' && cancelEditingTodo(todo)">
         </li>
       </ul>
@@ -98,8 +98,8 @@ class TodoStore {
         <strong>{{todoStore.getRemaining().length}}</strong>
         {{todoStore.getRemaining().length == 1 ? 'item' : 'items'}} left
       </span>
-      <button *ngIf="todoStore.getCompleted().length > 0" 
-              class="clear-completed" 
+      <button *ngIf="todoStore.getCompleted().length > 0"
+              class="clear-completed"
               (click)="removeCompleted()">
         Clear completed
       </button>
diff --git a/packages/core/test/render3/Inherit_definition_feature_spec.ts b/packages/core/test/render3/Inherit_definition_feature_spec.ts
new file mode 100644
index 0000000000..f4babe51b4
--- /dev/null
+++ b/packages/core/test/render3/Inherit_definition_feature_spec.ts
@@ -0,0 +1,238 @@
+/**
+ * @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 {DoCheck, EventEmitter, Input, OnChanges, Output, SimpleChange, SimpleChanges} from '../../src/core';
+import {InheritDefinitionFeature} from '../../src/render3/features/inherit_definition_feature';
+import {DirectiveDefInternal, NgOnChangesFeature, defineComponent, defineDirective} from '../../src/render3/index';
+
+describe('InheritDefinitionFeature', () => {
+  it('should inherit lifecycle hooks', () => {
+    class SuperDirective {
+      ngOnInit() {}
+      ngOnDestroy() {}
+      ngAfterContentInit() {}
+      ngAfterContentChecked() {}
+      ngAfterViewInit() {}
+      ngAfterViewChecked() {}
+      ngDoCheck() {}
+    }
+
+    class SubDirective extends SuperDirective {
+      ngAfterViewInit() {}
+      ngAfterViewChecked() {}
+      ngDoCheck() {}
+
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature]
+      });
+    }
+
+    const finalDef = SubDirective.ngDirectiveDef as DirectiveDefInternal<any>;
+
+
+    expect(finalDef.onInit).toBe(SuperDirective.prototype.ngOnInit);
+    expect(finalDef.onDestroy).toBe(SuperDirective.prototype.ngOnDestroy);
+    expect(finalDef.afterContentChecked).toBe(SuperDirective.prototype.ngAfterContentChecked);
+    expect(finalDef.afterContentInit).toBe(SuperDirective.prototype.ngAfterContentInit);
+    expect(finalDef.afterViewChecked).toBe(SubDirective.prototype.ngAfterViewChecked);
+    expect(finalDef.afterViewInit).toBe(SubDirective.prototype.ngAfterViewInit);
+    expect(finalDef.doCheck).toBe(SubDirective.prototype.ngDoCheck);
+  });
+
+  it('should inherit inputs', () => {
+    // tslint:disable-next-line:class-as-namespace
+    class SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        inputs: {
+          superFoo: ['foo', 'declaredFoo'],
+          superBar: 'bar',
+          superBaz: 'baz',
+        },
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperDirective(),
+      });
+    }
+
+    // tslint:disable-next-line:class-as-namespace
+    class SubDirective extends SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        inputs: {
+          subBaz: 'baz',
+          subQux: 'qux',
+        },
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature]
+      });
+    }
+
+    const subDef = SubDirective.ngDirectiveDef as DirectiveDefInternal<any>;
+
+    expect(subDef.inputs).toEqual({
+      foo: 'superFoo',
+      bar: 'superBar',
+      baz: 'subBaz',
+      qux: 'subQux',
+    });
+    expect(subDef.declaredInputs).toEqual({
+      declaredFoo: 'superFoo',
+      bar: 'superBar',
+      baz: 'subBaz',
+      qux: 'subQux',
+    });
+  });
+
+  it('should inherit outputs', () => {
+    // tslint:disable-next-line:class-as-namespace
+    class SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        outputs: {
+          superFoo: 'foo',
+          superBar: 'bar',
+          superBaz: 'baz',
+        },
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperDirective(),
+      });
+    }
+
+    // tslint:disable-next-line:class-as-namespace
+    class SubDirective extends SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        outputs: {
+          subBaz: 'baz',
+          subQux: 'qux',
+        },
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature]
+      });
+    }
+
+    const subDef = SubDirective.ngDirectiveDef as DirectiveDefInternal<any>;
+
+    expect(subDef.outputs).toEqual({
+      foo: 'superFoo',
+      bar: 'superBar',
+      baz: 'subBaz',
+      qux: 'subQux',
+    });
+  });
+
+  it('should compose hostBindings', () => {
+    const log: Array<[string, number, number]> = [];
+
+    // tslint:disable-next-line:class-as-namespace
+    class SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        hostBindings: (directiveIndex: number, elementIndex: number) => {
+          log.push(['super', directiveIndex, elementIndex]);
+        },
+        factory: () => new SuperDirective(),
+      });
+    }
+
+    // tslint:disable-next-line:class-as-namespace
+    class SubDirective extends SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'subDir', '']],
+        hostBindings: (directiveIndex: number, elementIndex: number) => {
+          log.push(['sub', directiveIndex, elementIndex]);
+        },
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature]
+      });
+    }
+
+    const subDef = SubDirective.ngDirectiveDef as DirectiveDefInternal<any>;
+
+    subDef.hostBindings !(1, 2);
+
+    expect(log).toEqual([['super', 1, 2], ['sub', 1, 2]]);
+  });
+
+  it('should throw if inheriting a component from a directive', () => {
+    // tslint:disable-next-line:class-as-namespace
+    class SuperComponent {
+      static ngComponentDef = defineComponent({
+        type: SuperComponent,
+        template: () => {},
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperComponent()
+      });
+    }
+
+    expect(() => {
+      // tslint:disable-next-line:class-as-namespace
+      class SubDirective extends SuperComponent{static ngDirectiveDef = defineDirective({
+                                                  type: SubDirective,
+                                                  selectors: [['', 'subDir', '']],
+                                                  factory: () => new SubDirective(),
+                                                  features: [InheritDefinitionFeature]
+                                                });}
+    }).toThrowError('Directives cannot inherit Components');
+  });
+
+  it('should run inherited features', () => {
+    const log: any[] = [];
+
+    // tslint:disable-next-line:class-as-namespace
+    class SuperDirective {
+      static ngDirectiveDef = defineDirective({
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperDirective(),
+        features: [
+          (arg: any) => { log.push('super1', arg); },
+          (arg: any) => { log.push('super2', arg); },
+        ]
+      });
+    }
+
+    class SubDirective extends SuperDirective {
+      @Output()
+      baz = new EventEmitter();
+
+      @Output()
+      qux = new EventEmitter();
+
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature, (arg: any) => { log.push('sub1', arg); }]
+      });
+    }
+
+    const superDef = SuperDirective.ngDirectiveDef as DirectiveDefInternal<any>;
+    const subDef = SubDirective.ngDirectiveDef as DirectiveDefInternal<any>;
+
+    expect(log).toEqual([
+      'super1',
+      superDef,
+      'super2',
+      superDef,
+      'super1',
+      subDef,
+      'super2',
+      subDef,
+      'sub1',
+      subDef,
+    ]);
+  });
+});
diff --git a/packages/core/test/render3/common_with_def.ts b/packages/core/test/render3/common_with_def.ts
index 39d1077f0b..b030cd9ddf 100644
--- a/packages/core/test/render3/common_with_def.ts
+++ b/packages/core/test/render3/common_with_def.ts
@@ -38,8 +38,7 @@ NgForOf.ngDirectiveDef = defineDirective({
   type: NgTemplateOutletDef,
   selectors: [['', 'ngTemplateOutlet', '']],
   factory: () => new NgTemplateOutletDef(injectViewContainerRef()),
-  features: [NgOnChangesFeature(
-      {ngTemplateOutlet: 'ngTemplateOutlet', ngTemplateOutletContext: 'ngTemplateOutletContext'})],
+  features: [NgOnChangesFeature],
   inputs:
       {ngTemplateOutlet: 'ngTemplateOutlet', ngTemplateOutletContext: 'ngTemplateOutletContext'}
 });
diff --git a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
index f8cedef8ed..c3bda43937 100644
--- a/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/life_cycle_spec.ts
@@ -47,8 +47,8 @@ describe('lifecycle hooks', () => {
       selectors: [['lifecycle-comp']],
       factory: function LifecycleComp_Factory() { return new LifecycleComp(); },
       template: function LifecycleComp_Template(rf: $RenderFlags$, ctx: $LifecycleComp$) {},
-      inputs: {nameMin: 'name'},
-      features: [$r3$.ɵNgOnChangesFeature({nameMin: 'nameMin'})]
+      inputs: {nameMin: ['name', 'nameMin']},
+      features: [$r3$.ɵNgOnChangesFeature]
     });
     // /NORMATIVE
   }
diff --git a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
index 0633142d6b..5b0bc8fcfe 100644
--- a/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/template_variables_spec.ts
@@ -72,7 +72,7 @@ describe('template variables', () => {
         return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
       },
       // TODO(chuckj): Enable when ngForOf enabling lands.
-      // features: [NgOnChangesFeature(NgForOf)],
+      // features: [NgOnChangesFeature],
       inputs: {forOf: 'forOf'}
     });
     // /NORMATIVE
diff --git a/packages/core/test/render3/define_spec.ts b/packages/core/test/render3/define_spec.ts
deleted file mode 100644
index bd4d2bbac3..0000000000
--- a/packages/core/test/render3/define_spec.ts
+++ /dev/null
@@ -1,120 +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 {DoCheck, OnChanges, SimpleChange, SimpleChanges} from '../../src/core';
-import {DirectiveDefInternal, NgOnChangesFeature, defineDirective} from '../../src/render3/index';
-
-describe('define', () => {
-  describe('component', () => {
-    describe('NgOnChangesFeature', () => {
-      it('should patch class', () => {
-        class MyDirective implements OnChanges, DoCheck {
-          public log: Array<string|SimpleChange> = [];
-          public valA: string = 'initValue';
-          public set valB(value: string) { this.log.push(value); }
-
-          public get valB() { return 'works'; }
-
-          ngDoCheck(): void { this.log.push('ngDoCheck'); }
-          ngOnChanges(changes: SimpleChanges): void {
-            this.log.push('ngOnChanges');
-            this.log.push('valA', changes['valA']);
-            this.log.push('valB', changes['valB']);
-          }
-
-          static ngDirectiveDef = defineDirective({
-            type: MyDirective,
-            selectors: [['', 'myDir', '']],
-            factory: () => new MyDirective(),
-            features: [NgOnChangesFeature()],
-            inputs: {valA: 'valA', valB: 'valB'}
-          });
-        }
-
-        const myDir = (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>)
-                          .factory() as MyDirective;
-        myDir.valA = 'first';
-        expect(myDir.valA).toEqual('first');
-        myDir.valB = 'second';
-        expect(myDir.log).toEqual(['second']);
-        expect(myDir.valB).toEqual('works');
-        myDir.log.length = 0;
-        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
-        const changeA = new SimpleChange(undefined, 'first', true);
-        const changeB = new SimpleChange(undefined, 'second', true);
-        expect(myDir.log).toEqual(['ngOnChanges', 'valA', changeA, 'valB', changeB, 'ngDoCheck']);
-      });
-
-      it('correctly computes firstChange', () => {
-        class MyDirective implements OnChanges {
-          public log: Array<string|SimpleChange> = [];
-          public valA: string = 'initValue';
-          // TODO(issue/24571): remove '!'.
-          public valB !: string;
-
-          ngOnChanges(changes: SimpleChanges): void {
-            this.log.push('valA', changes['valA']);
-            this.log.push('valB', changes['valB']);
-          }
-
-          static ngDirectiveDef = defineDirective({
-            type: MyDirective,
-            selectors: [['', 'myDir', '']],
-            factory: () => new MyDirective(),
-            features: [NgOnChangesFeature()],
-            inputs: {valA: 'valA', valB: 'valB'}
-          });
-        }
-
-        const myDir = (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>)
-                          .factory() as MyDirective;
-        myDir.valA = 'first';
-        myDir.valB = 'second';
-        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
-        const changeA1 = new SimpleChange(undefined, 'first', true);
-        const changeB1 = new SimpleChange(undefined, 'second', true);
-        expect(myDir.log).toEqual(['valA', changeA1, 'valB', changeB1]);
-
-        myDir.log.length = 0;
-        myDir.valA = 'third';
-        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
-        const changeA2 = new SimpleChange('first', 'third', false);
-        expect(myDir.log).toEqual(['valA', changeA2, 'valB', undefined]);
-      });
-
-      it('should not create a getter when only a setter is originally defined', () => {
-        class MyDirective implements OnChanges {
-          public log: Array<string|SimpleChange> = [];
-
-          public set onlySetter(value: string) { this.log.push(value); }
-
-          ngOnChanges(changes: SimpleChanges): void {
-            this.log.push('ngOnChanges');
-            this.log.push('onlySetter', changes['onlySetter']);
-          }
-
-          static ngDirectiveDef = defineDirective({
-            type: MyDirective,
-            selectors: [['', 'myDir', '']],
-            factory: () => new MyDirective(),
-            features: [NgOnChangesFeature()],
-            inputs: {onlySetter: 'onlySetter'}
-          });
-        }
-
-        const myDir = (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>)
-                          .factory() as MyDirective;
-        myDir.onlySetter = 'someValue';
-        expect(myDir.onlySetter).toBeUndefined();
-        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
-        const changeSetter = new SimpleChange(undefined, 'someValue', true);
-        expect(myDir.log).toEqual(['someValue', 'ngOnChanges', 'onlySetter', changeSetter]);
-      });
-    });
-  });
-});
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 96e34f7cdc..2db6233f48 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -995,7 +995,7 @@ describe('di', () => {
         selectors: [['', 'myIf', '']],
         factory: () => new IfDirective(injectTemplateRef(), injectViewContainerRef()),
         inputs: {myIf: 'myIf'},
-        features: [PublicFeature, NgOnChangesFeature()]
+        features: [PublicFeature, NgOnChangesFeature]
       });
     }
 
diff --git a/packages/core/test/render3/jit/directive_spec.ts b/packages/core/test/render3/jit/directive_spec.ts
new file mode 100644
index 0000000000..85c50a613a
--- /dev/null
+++ b/packages/core/test/render3/jit/directive_spec.ts
@@ -0,0 +1,39 @@
+/**
+ * @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 {extendsDirectlyFromObject} from '../../../src/render3/jit/directive';
+
+describe('extendsDirectlyFromObject', () => {
+  it('should correctly behave with instanceof', () => {
+    expect(new Child() instanceof Object).toBeTruthy();
+    expect(new Child() instanceof Parent).toBeTruthy();
+    expect(new Parent() instanceof Child).toBeFalsy();
+
+    expect(new Child5() instanceof Object).toBeTruthy();
+    expect(new Child5() instanceof Parent5).toBeTruthy();
+    expect(new Parent5() instanceof Child5).toBeFalsy();
+  });
+
+  it('should detect direct inheritance form Object', () => {
+    expect(extendsDirectlyFromObject(Parent)).toBeTruthy();
+    expect(extendsDirectlyFromObject(Child)).toBeFalsy();
+
+    expect(extendsDirectlyFromObject(Parent5)).toBeTruthy();
+    expect(extendsDirectlyFromObject(Child5)).toBeFalsy();
+  });
+});
+
+// Inheritance Example using Classes
+class Parent {}
+class Child extends Parent {}
+
+// Inheritance Example using Function
+const Parent5 = function Parent5() {} as any as{new (): {}};
+const Child5 = function Child5() {} as any as{new (): {}};
+Child5.prototype = new Parent5;
+Child5.prototype.constructor = Child5;
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 3a190ccd0a..bec48f81db 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -1932,8 +1932,8 @@ describe('lifecycles', () => {
           type: Component,
           selectors: [[name]],
           factory: () => new Component(),
-          features: [NgOnChangesFeature({b: 'val2'})],
-          inputs: {a: 'val1', b: 'publicName'}, template,
+          features: [NgOnChangesFeature],
+          inputs: {a: 'val1', b: ['publicName', 'val2']}, template,
           directives: directives
         });
       };
@@ -1953,8 +1953,8 @@ describe('lifecycles', () => {
         type: Directive,
         selectors: [['', 'dir', '']],
         factory: () => new Directive(),
-        features: [NgOnChangesFeature({b: 'val2'})],
-        inputs: {a: 'val1', b: 'publicName'}
+        features: [NgOnChangesFeature],
+        inputs: {a: 'val1', b: ['publicName', 'val2']}
       });
     }
 
@@ -1976,11 +1976,10 @@ describe('lifecycles', () => {
       renderToHtml(Template, {val1: '1', val2: 'a'}, defs);
       expect(events).toEqual(['comp=comp val1=1 val2=a - changed=[val1,val2]']);
 
+      events.length = 0;
+
       renderToHtml(Template, {val1: '2', val2: 'b'}, defs);
-      expect(events).toEqual([
-        'comp=comp val1=1 val2=a - changed=[val1,val2]',
-        'comp=comp val1=2 val2=b - changed=[val1,val2]'
-      ]);
+      expect(events).toEqual(['comp=comp val1=2 val2=b - changed=[val1,val2]']);
     });
 
     it('should call parent onChanges before child onChanges', () => {
@@ -2336,7 +2335,7 @@ describe('lifecycles', () => {
           selectors: [[name]],
           factory: () => new Component(),
           inputs: {val: 'val'}, template,
-          features: [NgOnChangesFeature()],
+          features: [NgOnChangesFeature],
           directives: directives
         });
       };
diff --git a/packages/core/test/render3/ng_on_changes_feature_spec.ts b/packages/core/test/render3/ng_on_changes_feature_spec.ts
new file mode 100644
index 0000000000..719a5dde5b
--- /dev/null
+++ b/packages/core/test/render3/ng_on_changes_feature_spec.ts
@@ -0,0 +1,325 @@
+/**
+ * @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 {DoCheck, EventEmitter, Input, OnChanges, Output, SimpleChange, SimpleChanges} from '../../src/core';
+import {InheritDefinitionFeature} from '../../src/render3/features/inherit_definition_feature';
+import {DirectiveDefInternal, NgOnChangesFeature, defineComponent, defineDirective} from '../../src/render3/index';
+
+describe('NgOnChangesFeature', () => {
+  it('should patch class', () => {
+    class MyDirective implements OnChanges, DoCheck {
+      public log: Array<string|SimpleChange> = [];
+      public valA: string = 'initValue';
+      public set valB(value: string) { this.log.push(value); }
+
+      public get valB() { return 'works'; }
+
+      ngDoCheck(): void { this.log.push('ngDoCheck'); }
+      ngOnChanges(changes: SimpleChanges): void {
+        this.log.push('ngOnChanges');
+        this.log.push('valA', changes['valA']);
+        this.log.push('valB', changes['valB']);
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: MyDirective,
+        selectors: [['', 'myDir', '']],
+        factory: () => new MyDirective(),
+        features: [NgOnChangesFeature],
+        inputs: {valA: 'valA', valB: 'valB'}
+      });
+    }
+
+    const myDir =
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).factory() as MyDirective;
+    myDir.valA = 'first';
+    expect(myDir.valA).toEqual('first');
+    myDir.valB = 'second';
+    expect(myDir.log).toEqual(['second']);
+    expect(myDir.valB).toEqual('works');
+    myDir.log.length = 0;
+    (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
+    const changeA = new SimpleChange(undefined, 'first', true);
+    const changeB = new SimpleChange(undefined, 'second', true);
+    expect(myDir.log).toEqual(['ngOnChanges', 'valA', changeA, 'valB', changeB, 'ngDoCheck']);
+  });
+
+  it('should inherit the behavior from super class', () => {
+    const log: any[] = [];
+
+    class SuperDirective implements OnChanges, DoCheck {
+      valA = 'initValue';
+
+      set valB(value: string) { log.push(value); }
+
+      get valB() { return 'works'; }
+
+      ngDoCheck(): void { log.push('ngDoCheck'); }
+      ngOnChanges(changes: SimpleChanges): void {
+        log.push('ngOnChanges');
+        log.push('valA', changes['valA']);
+        log.push('valB', changes['valB']);
+        log.push('valC', changes['valC']);
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperDirective(),
+        features: [NgOnChangesFeature],
+        inputs: {valA: 'valA', valB: 'valB'},
+      });
+    }
+
+    class SubDirective extends SuperDirective {
+      valC = 'initValue';
+
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature],
+        inputs: {valC: 'valC'},
+      });
+    }
+
+    const myDir = (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>)
+                      .factory() as SubDirective;
+    myDir.valA = 'first';
+    expect(myDir.valA).toEqual('first');
+
+    myDir.valB = 'second';
+    expect(myDir.valB).toEqual('works');
+
+    myDir.valC = 'third';
+    expect(myDir.valC).toEqual('third');
+
+    log.length = 0;
+    (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>).doCheck !.call(myDir);
+    const changeA = new SimpleChange(undefined, 'first', true);
+    const changeB = new SimpleChange(undefined, 'second', true);
+    const changeC = new SimpleChange(undefined, 'third', true);
+
+    expect(log).toEqual(
+        ['ngOnChanges', 'valA', changeA, 'valB', changeB, 'valC', changeC, 'ngDoCheck']);
+  });
+
+  it('should not run the parent doCheck if it is not called explicitly on super class', () => {
+    const log: any[] = [];
+
+    class SuperDirective implements OnChanges, DoCheck {
+      valA = 'initValue';
+
+      ngDoCheck(): void { log.push('ERROR: Child overrides it without super call'); }
+      ngOnChanges(changes: SimpleChanges): void { log.push(changes.valA, changes.valB); }
+
+      static ngDirectiveDef = defineDirective({
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperDirective(),
+        features: [NgOnChangesFeature],
+        inputs: {valA: 'valA'},
+      });
+    }
+
+    class SubDirective extends SuperDirective implements DoCheck {
+      valB = 'initValue';
+
+      ngDoCheck(): void { log.push('sub ngDoCheck'); }
+
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature],
+        inputs: {valB: 'valB'},
+      });
+    }
+
+    const myDir = (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>)
+                      .factory() as SubDirective;
+    myDir.valA = 'first';
+    myDir.valB = 'second';
+
+    (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>).doCheck !.call(myDir);
+    const changeA = new SimpleChange(undefined, 'first', true);
+    const changeB = new SimpleChange(undefined, 'second', true);
+    expect(log).toEqual([changeA, changeB, 'sub ngDoCheck']);
+  });
+
+  it('should run the parent doCheck if it is inherited from super class', () => {
+    const log: any[] = [];
+
+    class SuperDirective implements OnChanges, DoCheck {
+      valA = 'initValue';
+
+      ngDoCheck(): void { log.push('super ngDoCheck'); }
+      ngOnChanges(changes: SimpleChanges): void { log.push(changes.valA, changes.valB); }
+
+      static ngDirectiveDef = defineDirective({
+        type: SuperDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SuperDirective(),
+        features: [NgOnChangesFeature],
+        inputs: {valA: 'valA'},
+      });
+    }
+
+    class SubDirective extends SuperDirective implements DoCheck {
+      valB = 'initValue';
+
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'subDir', '']],
+        factory: () => new SubDirective(),
+        features: [InheritDefinitionFeature],
+        inputs: {valB: 'valB'},
+      });
+    }
+
+    const myDir = (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>)
+                      .factory() as SubDirective;
+    myDir.valA = 'first';
+    myDir.valB = 'second';
+
+    (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>).doCheck !.call(myDir);
+    const changeA = new SimpleChange(undefined, 'first', true);
+    const changeB = new SimpleChange(undefined, 'second', true);
+    expect(log).toEqual([changeA, changeB, 'super ngDoCheck']);
+  });
+
+  it('should apply the feature to inherited properties if on sub class', () => {
+    const log: any[] = [];
+
+    class SuperDirective {
+      valC = 'initValue';
+
+      static ngDirectiveDef = defineDirective({
+        type: SuperDirective,
+        selectors: [['', 'subDir', '']],
+        factory: () => new SuperDirective(),
+        features: [],
+        inputs: {valC: 'valC'},
+      });
+    }
+
+    class SubDirective extends SuperDirective implements OnChanges, DoCheck {
+      valA = 'initValue';
+
+      set valB(value: string) { log.push(value); }
+
+      get valB() { return 'works'; }
+
+      ngDoCheck(): void { log.push('ngDoCheck'); }
+      ngOnChanges(changes: SimpleChanges): void {
+        log.push('ngOnChanges');
+        log.push('valA', changes['valA']);
+        log.push('valB', changes['valB']);
+        log.push('valC', changes['valC']);
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: SubDirective,
+        selectors: [['', 'superDir', '']],
+        factory: () => new SubDirective(),
+        // Inheritance must always be before OnChanges feature.
+        features: [
+          InheritDefinitionFeature,
+          NgOnChangesFeature,
+        ],
+        inputs: {valA: 'valA', valB: 'valB'}
+      });
+    }
+
+    const myDir = (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>)
+                      .factory() as SubDirective;
+    myDir.valA = 'first';
+    expect(myDir.valA).toEqual('first');
+
+    myDir.valB = 'second';
+    expect(log).toEqual(['second']);
+    expect(myDir.valB).toEqual('works');
+
+    myDir.valC = 'third';
+    expect(myDir.valC).toEqual('third');
+
+    log.length = 0;
+    (SubDirective.ngDirectiveDef as DirectiveDefInternal<SubDirective>).doCheck !.call(myDir);
+    const changeA = new SimpleChange(undefined, 'first', true);
+    const changeB = new SimpleChange(undefined, 'second', true);
+    const changeC = new SimpleChange(undefined, 'third', true);
+    expect(log).toEqual(
+        ['ngOnChanges', 'valA', changeA, 'valB', changeB, 'valC', changeC, 'ngDoCheck']);
+  });
+
+  it('correctly computes firstChange', () => {
+    class MyDirective implements OnChanges {
+      public log: Array<string|SimpleChange> = [];
+      public valA: string = 'initValue';
+      // TODO(issue/24571): remove '!'.
+      public valB !: string;
+
+      ngOnChanges(changes: SimpleChanges): void {
+        this.log.push('valA', changes['valA']);
+        this.log.push('valB', changes['valB']);
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: MyDirective,
+        selectors: [['', 'myDir', '']],
+        factory: () => new MyDirective(),
+        features: [NgOnChangesFeature],
+        inputs: {valA: 'valA', valB: 'valB'}
+      });
+    }
+
+    const myDir =
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).factory() as MyDirective;
+    myDir.valA = 'first';
+    myDir.valB = 'second';
+    (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
+    const changeA1 = new SimpleChange(undefined, 'first', true);
+    const changeB1 = new SimpleChange(undefined, 'second', true);
+    expect(myDir.log).toEqual(['valA', changeA1, 'valB', changeB1]);
+
+    myDir.log.length = 0;
+    myDir.valA = 'third';
+    (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
+    const changeA2 = new SimpleChange('first', 'third', false);
+    expect(myDir.log).toEqual(['valA', changeA2, 'valB', undefined]);
+  });
+
+  it('should not create a getter when only a setter is originally defined', () => {
+    class MyDirective implements OnChanges {
+      public log: Array<string|SimpleChange> = [];
+
+      public set onlySetter(value: string) { this.log.push(value); }
+
+      ngOnChanges(changes: SimpleChanges): void {
+        this.log.push('ngOnChanges');
+        this.log.push('onlySetter', changes['onlySetter']);
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: MyDirective,
+        selectors: [['', 'myDir', '']],
+        factory: () => new MyDirective(),
+        features: [NgOnChangesFeature],
+        inputs: {onlySetter: 'onlySetter'}
+      });
+    }
+
+    const myDir =
+        (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).factory() as MyDirective;
+    myDir.onlySetter = 'someValue';
+    expect(myDir.onlySetter).toBeUndefined();
+    (MyDirective.ngDirectiveDef as DirectiveDefInternal<MyDirective>).doCheck !.call(myDir);
+    const changeSetter = new SimpleChange(undefined, 'someValue', true);
+    expect(myDir.log).toEqual(['someValue', 'ngOnChanges', 'onlySetter', changeSetter]);
+  });
+});
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 6f34b01f80..7ec49e6f32 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -11,7 +11,7 @@ import {stringifyElement} from '@angular/platform-browser/testing/src/browser_ut
 import {Injector} from '../../src/di/injector';
 import {CreateComponentOptions} from '../../src/render3/component';
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
-import {ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefInternal, DirectiveType, PublicFeature, RenderFlags, defineComponent, defineDirective, renderComponent as _renderComponent, tick} from '../../src/render3/index';
+import {ComponentTemplate, ComponentType, DirectiveDefInternal, DirectiveType, PublicFeature, RenderFlags, defineComponent, defineDirective, renderComponent as _renderComponent, tick} from '../../src/render3/index';
 import {NG_HOST_SYMBOL, renderTemplate} from '../../src/render3/instructions';
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {LElementNode} from '../../src/render3/interfaces/node';
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 0285415566..34a300ab4b 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -966,7 +966,7 @@ describe('ViewContainerRef', () => {
               textBinding(0, interpolation1('', cmp.name, ''));
             }
           },
-          features: [NgOnChangesFeature()],
+          features: [NgOnChangesFeature],
           inputs: {name: 'name'}
         });
       }

From 87ddbdf919b8b67781db85f10d3b8af85fe84c10 Mon Sep 17 00:00:00 2001
From: Peter Mihalik <peter.mihalik@gmail.com>
Date: Wed, 27 Jun 2018 22:08:48 +0200
Subject: [PATCH 387/582] docs(core): rephrase doc for Injector.get (#24670)

PR Close #24670
---
 packages/core/src/di/injector.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index 712ded66fa..0b70e82f09 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -64,10 +64,8 @@ export abstract class Injector {
 
   /**
    * Retrieves an instance from the injector based on the provided token.
-   * If not found:
-   * - Throws an error if no `notFoundValue` that is not equal to
-   * Injector.THROW_IF_NOT_FOUND is given
-   * - Returns the `notFoundValue` otherwise
+   * @returns The instance from the injector if defined, otherwise the `notFoundValue`.
+   * @throws When the `notFoundValue` is `undefined` or `Injector.THROW_IF_NOT_FOUND`.
    */
   abstract get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
   /**

From ff84c5c4da73e6d8b15e8cfae4fca3d45f3ff118 Mon Sep 17 00:00:00 2001
From: Trotyl <trotyl@qq.com>
Date: Wed, 27 Jun 2018 13:05:56 +0800
Subject: [PATCH 388/582] fix(common): properly update collection reference in
 NgForOf (#24684)

closes #24155

PR Close #24684
---
 packages/common/src/directives/ng_for_of.ts    | 1 +
 packages/common/test/directives/ng_for_spec.ts | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/common/src/directives/ng_for_of.ts b/packages/common/src/directives/ng_for_of.ts
index a3ca619cbd..89cb9c1b2e 100644
--- a/packages/common/src/directives/ng_for_of.ts
+++ b/packages/common/src/directives/ng_for_of.ts
@@ -182,6 +182,7 @@ export class NgForOf<T> implements DoCheck {
       const viewRef = <EmbeddedViewRef<NgForOfContext<T>>>this._viewContainer.get(i);
       viewRef.context.index = i;
       viewRef.context.count = ilen;
+      viewRef.context.ngForOf = this._ngForOf;
     }
 
     changes.forEachIdentityChange((record: any) => {
diff --git a/packages/common/test/directives/ng_for_spec.ts b/packages/common/test/directives/ng_for_spec.ts
index 683333d0b6..0935650f7e 100644
--- a/packages/common/test/directives/ng_for_spec.ts
+++ b/packages/common/test/directives/ng_for_spec.ts
@@ -183,9 +183,12 @@ let thisArg: any;
 
     it('should allow of saving the collection', async(() => {
          const template =
-             '<ul><li *ngFor="let item of [1,2,3] as items; index as i">{{i}}/{{items.length}} - {{item}};</li></ul>';
+             '<ul><li *ngFor="let item of items as collection; index as i">{{i}}/{{collection.length}} - {{item}};</li></ul>';
          fixture = createTestComponent(template);
 
+         detectChangesAndExpectText('0/2 - 1;1/2 - 2;');
+
+         getComponent().items = [1, 2, 3];
          detectChangesAndExpectText('0/3 - 1;1/3 - 2;2/3 - 3;');
        }));
 

From d243baf48a66369030acd8a97c55ac15486a5c4e Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 28 Jun 2018 16:40:16 -0700
Subject: [PATCH 389/582] refactor(ivy): remove pChild from LNode (#24705)

PR Close #24705
---
 packages/core/src/render3/i18n.ts             | 27 ++++++++++++-------
 packages/core/src/render3/instructions.ts     | 22 +++------------
 packages/core/src/render3/interfaces/node.ts  |  7 -----
 .../core/src/render3/node_manipulation.ts     |  3 ---
 packages/core/test/render3/i18n_spec.ts       |  2 +-
 5 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 67c1e7d1ed..350b1a4f28 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -7,10 +7,10 @@
  */
 
 import {assertEqual, assertLessThan} from './assert';
-import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load} from './instructions';
+import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load, resetApplicationState} from './instructions';
 import {RENDER_PARENT} from './interfaces/container';
 import {LContainerNode, LElementNode, LNode, TNodeType} from './interfaces/node';
-import {BINDING_INDEX} from './interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
 import {appendChild, createTextNode, getParentLNode, removeChild} from './node_manipulation';
 import {stringify} from './util';
 
@@ -240,10 +240,16 @@ function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
 
   appendChild(parentNode, node.native || null, viewData);
 
-  if (previousNode === parentNode && parentNode.pChild === null) {
-    parentNode.pChild = node;
-  } else {
-    previousNode.pNextOrParent = node;
+  // On first pass, re-organize node tree to put this node in the correct position.
+  if (node.view[TVIEW].firstTemplatePass) {
+    node.tNode.next = null;
+    if (previousNode === parentNode && node.tNode !== parentNode.tNode.child) {
+      node.tNode.next = parentNode.tNode.child;
+      parentNode.tNode.child = node.tNode;
+    } else if (previousNode !== parentNode && node.tNode !== previousNode.tNode.next) {
+      node.tNode.next = previousNode.tNode.next;
+      previousNode.tNode.next = node.tNode;
+    }
   }
 
   // Template containers also have a comment node for the `ViewContainerRef` that should be moved
@@ -278,6 +284,7 @@ export function i18nApply(startIndex: number, instructions: I18nInstruction[]):
   const renderer = getRenderer();
   let localParentNode: LNode = getParentLNode(load(startIndex)) || getPreviousOrParentNode();
   let localPreviousNode: LNode = localParentNode;
+  resetApplicationState();  // We don't want to add to the tree with the wrong previous node
 
   for (let i = 0; i < instructions.length; i++) {
     const instruction = instructions[i] as number;
@@ -298,10 +305,12 @@ export function i18nApply(startIndex: number, instructions: I18nInstruction[]):
         const value = instructions[++i];
         const textRNode = createTextNode(value, renderer);
         // If we were to only create a `RNode` then projections won't move the text.
-        // But since this text doesn't have an index in `LViewData`, we need to create an
-        // `LElementNode` with the index -1 so that it isn't saved in `LViewData`
-        const textLNode = createLNode(-1, TNodeType.Element, textRNode, null, null);
+        // Create text node at the current end of viewData. Must subtract header offset because
+        // createLNode takes a raw index (not adjusted by header offset).
+        const textLNode =
+            createLNode(viewData.length - HEADER_OFFSET, TNodeType.Element, textRNode, null, null);
         localPreviousNode = appendI18nNode(textLNode, localParentNode, localPreviousNode);
+        resetApplicationState();
         break;
       case I18nInstructions.CloseNode:
         localPreviousNode = localParentNode;
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a1013eff9b..208e91d740 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -335,8 +335,7 @@ export function createLNodeObject(
     queries: queries,
     tNode: null !,
     pNextOrParent: null,
-    dynamicLContainerNode: null,
-    pChild: null,
+    dynamicLContainerNode: null
   };
 }
 
@@ -440,7 +439,7 @@ export function createLNode(
 /**
  * Resets the application state.
  */
-function resetApplicationState() {
+export function resetApplicationState() {
   isParent = false;
   previousOrParentNode = null !;
 }
@@ -1894,16 +1893,7 @@ export function projectionDef(
   }
 
   const componentNode: LElementNode = findComponentHost(viewData);
-  let isProjectingI18nNodes = false;
-  let componentChild: LNode|null;
-  // for i18n translations we use pChild to point to the next child
-  // TODO(kara): Remove when removing LNodes
-  if (componentNode.pChild) {
-    isProjectingI18nNodes = true;
-    componentChild = componentNode.pChild;
-  } else {
-    componentChild = getChildLNode(componentNode);
-  }
+  let componentChild = getChildLNode(componentNode);
 
   while (componentChild !== null) {
     // execute selector matching logic if and only if:
@@ -1916,11 +1906,7 @@ export function projectionDef(
       distributedNodes[0].push(componentChild);
     }
 
-    if (isProjectingI18nNodes) {
-      componentChild = componentChild.pNextOrParent;
-    } else {
-      componentChild = getNextLNode(componentChild);
-    }
+    componentChild = getNextLNode(componentChild);
   }
 
   ngDevMode && assertDataNext(index + HEADER_OFFSET);
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index f75ca24ce1..9194bb547b 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -100,13 +100,6 @@ export interface LNode {
    */
   pNextOrParent: LNode|null;
 
-  /**
-   * If this node is part of an i18n block, pointer to the first child after translation
-   * If this node is not part of an i18n block, this field is null.
-   */
-  // TODO(kara): Remove this when removing pNextOrParent
-  pChild: LNode|null;
-
   /**
    * Pointer to the corresponding TNode object, which stores static
    * data about this node.
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 4806de5499..d577a15c9b 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -29,9 +29,6 @@ export function getNextLNode(node: LNode): LNode|null {
 
 /** Retrieves the first child of a given node */
 export function getChildLNode(node: LNode): LNode|null {
-  if (node.pChild) {
-    return node.pChild;
-  }
   if (node.tNode.child) {
     const viewData = node.tNode.type === TNodeType.View ? node.data as LViewData : node.view;
     return viewData[node.tNode.child.index];
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index b83f5080f3..98cbf07b3c 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -518,7 +518,7 @@ describe('Runtime i18n', () => {
 
           // Translated to:
           // <ul i18n>
-          //   <li *ngFor="let item of items">valeur: {{item}}</li>
+          //   <li *ngFor="let item of items">valeur: {{item}}!</li>
           // </ul>
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {

From d1805d04d5362b51a19e588a2e1b70a99e9d8b5f Mon Sep 17 00:00:00 2001
From: "Arunkarthick S. R" <arunkarthick.s.r@gmail.com>
Date: Fri, 18 May 2018 01:07:47 +0530
Subject: [PATCH 390/582] docs: fix docregion in attribute directives for
 highlight directive (#23972)

Fixes #23503

PR Close #23972
---
 .../attribute-directives/src/app/highlight.directive.2.ts     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aio/content/examples/attribute-directives/src/app/highlight.directive.2.ts b/aio/content/examples/attribute-directives/src/app/highlight.directive.2.ts
index fdf8ba0c85..d039083beb 100644
--- a/aio/content/examples/attribute-directives/src/app/highlight.directive.2.ts
+++ b/aio/content/examples/attribute-directives/src/app/highlight.directive.2.ts
@@ -40,5 +40,7 @@ export class HighlightDirective {
   // #docregion color-2
   @Input() appHighlight: string;
   // #enddocregion color-2
-}
 
+// #docregion
+}
+// #enddocregion

From 4e7a44c816bee68813f70b82dca3992649c3f99b Mon Sep 17 00:00:00 2001
From: Conner Chyung <chyungspice@gmail.com>
Date: Tue, 12 Jun 2018 14:24:24 -0600
Subject: [PATCH 391/582] docs: fix typo in pipes guide (#24452)

PR Close #24452
---
 aio/content/guide/pipes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/pipes.md b/aio/content/guide/pipes.md
index 0ff418003d..4d2d57ec25 100644
--- a/aio/content/guide/pipes.md
+++ b/aio/content/guide/pipes.md
@@ -3,7 +3,7 @@
 Every application starts out with what seems like a simple task: get data, transform them, and show them to users.
 Getting data could be as simple as creating a local variable or as complex as streaming data over a WebSocket.
 
-Once data arrive, you could push their raw `toString` values directly to the view,
+Once data arrives, you could push their raw `toString` values directly to the view,
 but that rarely makes for a good user experience.
 For example, in most use cases, users prefer to see a date in a simple format like
 <samp>April 15, 1988</samp> rather than the raw string format

From 1ae3f87383b05e70137a4a84bf794c76b32bca5c Mon Sep 17 00:00:00 2001
From: Jonathan Sharpe <j.r.sharpe+github@gmail.com>
Date: Thu, 28 Jun 2018 21:48:45 +0100
Subject: [PATCH 392/582] docs: update HTTP error test example again (#24701)

This has somehow regressed since angular/angular#22844 was merged.

PR Close #24701
---
 aio/content/guide/http.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/http.md b/aio/content/guide/http.md
index ceee6e1067..92fec8e76a 100644
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@@ -1034,7 +1034,7 @@ Call `request.flush()` with an error message, as seen in the following example.
 
 <code-example 
   path="http/src/testing/http-client.spec.ts"
-  region="network-error"
+  region="404"
   linenums="false">
 </code-example>
 

From 3553977bd75c8e168f1d4bfa42b7f09c677f7cbf Mon Sep 17 00:00:00 2001
From: Rob Wormald <robwormald@gmail.com>
Date: Thu, 28 Jun 2018 12:42:04 -0700
Subject: [PATCH 393/582] feat(core): add support for ShadowDOM v1 (#24718)

add a new ViewEncapsulation.ShadowDom option that uses the v1 Shadow DOM API to provide style encapsulation.

PR Close #24718
---
 aio/content/guide/component-styles.md         |   8 +-
 packages/compiler/src/core.ts                 |   3 +-
 packages/core/src/metadata/view.ts            |  18 ++-
 .../core/ts/metadata/encapsulation.ts         |  35 +++++
 .../platform-browser/src/dom/dom_renderer.ts  |   7 +-
 .../test/dom/dom_renderer_spec.ts             |  12 +-
 .../test/dom/shadow_dom_spec.ts               | 122 ++++++++++++++++++
 tools/public_api_guard/core/core.d.ts         |   1 +
 8 files changed, 198 insertions(+), 8 deletions(-)
 create mode 100644 packages/examples/core/ts/metadata/encapsulation.ts
 create mode 100644 packages/platform-browser/test/dom/shadow_dom_spec.ts

diff --git a/aio/content/guide/component-styles.md b/aio/content/guide/component-styles.md
index aef31566b0..f7d564fca1 100644
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@@ -280,12 +280,14 @@ To control how this encapsulation happens on a *per
 component* basis, you can set the *view encapsulation mode* in the component metadata.
 Choose from the following modes:
 
-* `Native` view encapsulation uses the browser's native shadow DOM implementation (see
+* `ShadowDom` view encapsulation uses the browser's native shadow DOM implementation (see
   [Shadow DOM](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Shadow_DOM)
   on the [MDN](https://developer.mozilla.org) site)
   to attach a shadow DOM to the component's host element, and then puts the component
   view inside that shadow DOM. The component's styles are included within the shadow DOM.
 
+* `Native` view encapsulation uses a now deprecated version of the browser's native shadow DOM implementation - [learn about the changes](https://hayato.io/2016/shadowdomv1/).
+
 * `Emulated` view encapsulation (the default) emulates the behavior of shadow DOM by preprocessing
   (and renaming) the CSS code to effectively scope the CSS to the component's view.
   For details, see [Appendix 1](guide/component-styles#inspect-generated-css).
@@ -300,8 +302,8 @@ To set the components encapsulation mode, use the `encapsulation` property in th
 <code-example path="component-styles/src/app/quest-summary.component.ts" region="encapsulation.native" title="src/app/quest-summary.component.ts" linenums="false">
 </code-example>
 
-`Native` view encapsulation only works on browsers that have native support
-for shadow DOM (see [Shadow DOM v0](http://caniuse.com/#feat=shadowdom) on the
+`ShadowDom` view encapsulation only works on browsers that have native support
+for shadow DOM (see [Shadow DOM v1](https://caniuse.com/#feat=shadowdomv1) on the
 [Can I use](http://caniuse.com) site). The support is still limited,
 which is why `Emulated` view encapsulation is the default mode and recommended
 in most cases.
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index 1c704baf3f..001db134b9 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -75,7 +75,8 @@ export interface Component extends Directive {
 export enum ViewEncapsulation {
   Emulated = 0,
   Native = 1,
-  None = 2
+  None = 2,
+  ShadowDom = 3
 }
 
 export enum ChangeDetectionStrategy {
diff --git a/packages/core/src/metadata/view.ts b/packages/core/src/metadata/view.ts
index 1874257075..84efefcd5e 100644
--- a/packages/core/src/metadata/view.ts
+++ b/packages/core/src/metadata/view.ts
@@ -23,14 +23,28 @@ export enum ViewEncapsulation {
    */
   Emulated = 0,
   /**
+   * @deprecated v6.1.0 - use {ViewEncapsulation.ShadowDom} instead.
    * Use the native encapsulation mechanism of the renderer.
    *
-   * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+   * For the DOM this means using the deprecated [Shadow DOM
+   * v0](https://w3c.github.io/webcomponents/spec/shadow/) and
    * creating a ShadowRoot for Component's Host Element.
    */
   Native = 1,
   /**
    * Don't provide any template or style encapsulation.
    */
-  None = 2
+  None = 2,
+
+  /**
+   * Use Shadow DOM to encapsulate styles.
+   *
+   * For the DOM this means using modern [Shadow
+   * DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+   * creating a ShadowRoot for Component's Host Element.
+   *
+   * ### Example
+   * {@example core/ts/metadata/encapsulation.ts region='longform'}
+   */
+  ShadowDom = 3
 }
diff --git a/packages/examples/core/ts/metadata/encapsulation.ts b/packages/examples/core/ts/metadata/encapsulation.ts
new file mode 100644
index 0000000000..04ac6928cc
--- /dev/null
+++ b/packages/examples/core/ts/metadata/encapsulation.ts
@@ -0,0 +1,35 @@
+/**
+ * @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, ViewEncapsulation} from '@angular/core';
+
+// #docregion longform
+@Component({
+  selector: 'my-app',
+  template: `
+    <h1>Hello World!</h1>
+    <span class="red">Shadow DOM Rocks!</span>
+  `,
+  styles: [`
+    :host {
+      display: block;
+      border: 1px solid black;
+    }
+    h1 {
+      color: blue;
+    }
+    .red {
+      background-color: red;
+    }
+
+  `],
+  encapsulation: ViewEncapsulation.ShadowDom
+})
+class MyApp {
+}
+// #enddocregion
diff --git a/packages/platform-browser/src/dom/dom_renderer.ts b/packages/platform-browser/src/dom/dom_renderer.ts
index 6715d20513..9b583692ce 100644
--- a/packages/platform-browser/src/dom/dom_renderer.ts
+++ b/packages/platform-browser/src/dom/dom_renderer.ts
@@ -83,6 +83,7 @@ export class DomRendererFactory2 implements RendererFactory2 {
         return renderer;
       }
       case ViewEncapsulation.Native:
+      case ViewEncapsulation.ShadowDom:
         return new ShadowDomRenderer(this.eventManager, this.sharedStylesHost, element, type);
       default: {
         if (!this.rendererByCompId.has(type.id)) {
@@ -256,7 +257,11 @@ class ShadowDomRenderer extends DefaultDomRenderer2 {
       eventManager: EventManager, private sharedStylesHost: DomSharedStylesHost,
       private hostEl: any, private component: RendererType2) {
     super(eventManager);
-    this.shadowRoot = (hostEl as any).createShadowRoot();
+    if (component.encapsulation === ViewEncapsulation.ShadowDom) {
+      this.shadowRoot = (hostEl as any).attachShadow({mode: 'open'});
+    } else {
+      this.shadowRoot = (hostEl as any).createShadowRoot();
+    }
     this.sharedStylesHost.addHost(this.shadowRoot);
     const styles = flattenStyles(component.id, component.styles, []);
     for (let i = 0; i < styles.length; i++) {
diff --git a/packages/platform-browser/test/dom/dom_renderer_spec.ts b/packages/platform-browser/test/dom/dom_renderer_spec.ts
index 1386e8b617..9e69d3d5ad 100644
--- a/packages/platform-browser/test/dom/dom_renderer_spec.ts
+++ b/packages/platform-browser/test/dom/dom_renderer_spec.ts
@@ -20,7 +20,8 @@ import {NAMESPACE_URIS} from '../../src/dom/dom_renderer';
     beforeEach(() => {
       TestBed.configureTestingModule({
         declarations: [
-          TestCmp, SomeApp, CmpEncapsulationEmulated, CmpEncapsulationNative, CmpEncapsulationNone
+          TestCmp, SomeApp, CmpEncapsulationEmulated, CmpEncapsulationNative, CmpEncapsulationNone,
+          CmpEncapsulationNative
         ]
       });
       renderer = TestBed.createComponent(TestCmp).componentInstance.renderer;
@@ -135,6 +136,15 @@ class CmpEncapsulationEmulated {
 class CmpEncapsulationNone {
 }
 
+@Component({
+  selector: 'cmp-shadow',
+  template: `<div class="shadow"></div><cmp-emulated></cmp-emulated><cmp-none></cmp-none>`,
+  styles: [`.native { color: red; }`],
+  encapsulation: ViewEncapsulation.ShadowDom
+})
+class CmpEncapsulationShadow {
+}
+
 @Component({
   selector: 'some-app',
   template: `
diff --git a/packages/platform-browser/test/dom/shadow_dom_spec.ts b/packages/platform-browser/test/dom/shadow_dom_spec.ts
new file mode 100644
index 0000000000..b7a1b8f1e5
--- /dev/null
+++ b/packages/platform-browser/test/dom/shadow_dom_spec.ts
@@ -0,0 +1,122 @@
+/**
+ * @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, EventEmitter, Injector, Input, NgModule, Output, Renderer2, ViewEncapsulation, destroyPlatform} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {BrowserModule} from '@angular/platform-browser';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
+
+function supportsShadowDOMV1() {
+  const testEl = document.createElement('div');
+  return (typeof customElements !== 'undefined') && (typeof testEl.attachShadow !== 'undefined');
+}
+
+if (supportsShadowDOMV1()) {
+  describe('ShadowDOM Support', () => {
+
+    let testContainer: HTMLDivElement;
+
+    beforeEach(() => { TestBed.configureTestingModule({imports: [TestModule]}); });
+
+    it('should attach and use a shadowRoot when ViewEncapsulation.Native is set', () => {
+      const compEl = TestBed.createComponent(ShadowComponent).nativeElement;
+      expect(compEl.shadowRoot !.textContent).toEqual('Hello World');
+    });
+
+    it('should use the shadow root to encapsulate styles', () => {
+      const compEl = TestBed.createComponent(StyledShadowComponent).nativeElement;
+      expect(window.getComputedStyle(compEl).border).toEqual('1px solid rgb(0, 0, 0)');
+      const redDiv = compEl.shadowRoot.querySelector('div.red');
+      expect(window.getComputedStyle(redDiv).border).toEqual('1px solid rgb(255, 0, 0)');
+    });
+
+    it('should allow the usage of <slot> elements', () => {
+      const el = TestBed.createComponent(ShadowSlotComponent).nativeElement;
+      const projectedContent = document.createTextNode('Hello Slot!');
+      el.appendChild(projectedContent);
+      const slot = el.shadowRoot !.querySelector('slot');
+
+      expect(slot !.assignedNodes().length).toBe(1);
+      expect(slot !.assignedNodes()[0].textContent).toBe('Hello Slot!');
+    });
+
+    it('should allow the usage of named <slot> elements', () => {
+      const el = TestBed.createComponent(ShadowSlotsComponent).nativeElement;
+
+      const headerContent = document.createElement('h1');
+      headerContent.setAttribute('slot', 'header');
+      headerContent.textContent = 'Header Text!';
+
+      const articleContent = document.createElement('span');
+      articleContent.setAttribute('slot', 'article');
+      articleContent.textContent = 'Article Text!';
+
+      const articleSubcontent = document.createElement('span');
+      articleSubcontent.setAttribute('slot', 'article');
+      articleSubcontent.textContent = 'Article Subtext!';
+
+      el.appendChild(headerContent);
+      el.appendChild(articleContent);
+      el.appendChild(articleSubcontent);
+
+      const headerSlot = el.shadowRoot !.querySelector('slot[name=header]') as HTMLSlotElement;
+      const articleSlot = el.shadowRoot !.querySelector('slot[name=article]') as HTMLSlotElement;
+
+      expect(headerSlot !.assignedNodes().length).toBe(1);
+      expect(headerSlot !.assignedNodes()[0].textContent).toBe('Header Text!');
+      expect(headerContent.assignedSlot).toBe(headerSlot);
+
+      expect(articleSlot !.assignedNodes().length).toBe(2);
+      expect(articleSlot !.assignedNodes()[0].textContent).toBe('Article Text!');
+      expect(articleSlot !.assignedNodes()[1].textContent).toBe('Article Subtext!');
+      expect(articleContent.assignedSlot).toBe(articleSlot);
+      expect(articleSubcontent.assignedSlot).toBe(articleSlot);
+    });
+  });
+}
+
+@Component(
+    {selector: 'shadow-comp', template: 'Hello World', encapsulation: ViewEncapsulation.ShadowDom})
+class ShadowComponent {
+}
+
+@Component({
+  selector: 'styled-shadow-comp',
+  template: '<div class="red"></div>',
+  encapsulation: ViewEncapsulation.ShadowDom,
+  styles: [`:host { border: 1px solid black; } .red { border: 1px solid red; }`]
+})
+class StyledShadowComponent {
+}
+
+@Component({
+  selector: 'shadow-slot-comp',
+  template: '<slot></slot>',
+  encapsulation: ViewEncapsulation.ShadowDom
+})
+class ShadowSlotComponent {
+}
+
+@Component({
+  selector: 'shadow-slots-comp',
+  template:
+      '<header><slot name="header"></slot></header><article><slot name="article"></slot></article>',
+  encapsulation: ViewEncapsulation.ShadowDom
+})
+class ShadowSlotsComponent {
+}
+
+@NgModule({
+  imports: [BrowserModule],
+  declarations: [ShadowComponent, ShadowSlotComponent, ShadowSlotsComponent, StyledShadowComponent],
+  entryComponents:
+      [ShadowComponent, ShadowSlotComponent, ShadowSlotsComponent, StyledShadowComponent],
+})
+class TestModule {
+  ngDoBootstrap() {}
+}
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index a522d23f7f..a24304599d 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -938,6 +938,7 @@ export declare enum ViewEncapsulation {
     Emulated = 0,
     Native = 1,
     None = 2,
+    ShadowDom = 3,
 }
 
 export declare abstract class ViewRef extends ChangeDetectorRef {

From a294e0dd79bbc6969d63ba528b321300b681a224 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 29 Jun 2018 16:44:54 -0700
Subject: [PATCH 394/582] fix(ivy): correct position for re-projected
 containers (#24721)

PR Close #24721
---
 packages/core/src/render3/i18n.ts             |  10 +-
 packages/core/src/render3/instructions.ts     |  45 ++-
 .../core/src/render3/node_manipulation.ts     |   2 +-
 packages/core/test/render3/content_spec.ts    | 320 +++++++++++++++++-
 .../test/render3/view_container_ref_spec.ts   |  32 +-
 5 files changed, 356 insertions(+), 53 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 350b1a4f28..4262df274a 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -9,7 +9,7 @@
 import {assertEqual, assertLessThan} from './assert';
 import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load, resetApplicationState} from './instructions';
 import {RENDER_PARENT} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, TNodeType} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, TContainerNode, TNodeType} from './interfaces/node';
 import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
 import {appendChild, createTextNode, getParentLNode, removeChild} from './node_manipulation';
 import {stringify} from './util';
@@ -241,7 +241,8 @@ function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
   appendChild(parentNode, node.native || null, viewData);
 
   // On first pass, re-organize node tree to put this node in the correct position.
-  if (node.view[TVIEW].firstTemplatePass) {
+  const firstTemplatePass = node.view[TVIEW].firstTemplatePass;
+  if (firstTemplatePass) {
     node.tNode.next = null;
     if (previousNode === parentNode && node.tNode !== parentNode.tNode.child) {
       node.tNode.next = parentNode.tNode.child;
@@ -257,7 +258,10 @@ function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
     // (node.native as RComment).textContent = 'test';
     // console.log(node.native);
     appendChild(parentNode, node.dynamicLContainerNode.native || null, viewData);
-    node.pNextOrParent = node.dynamicLContainerNode;
+    if (firstTemplatePass) {
+      node.tNode.dynamicContainerNode = node.dynamicLContainerNode.tNode;
+      node.dynamicLContainerNode.tNode.parent = node.tNode as TContainerNode;
+    }
     return node.dynamicLContainerNode;
   }
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 208e91d740..39777958b4 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1920,7 +1920,7 @@ export function projectionDef(
  * @param appendedFirst First node of the linked list to append.
  * @param appendedLast Last node of the linked list to append.
  */
-function appendToProjectionNode(
+function addToProjectionList(
     projectionNode: LProjectionNode,
     appendedFirst: LElementNode | LTextNode | LContainerNode | null,
     appendedLast: LElementNode | LTextNode | LContainerNode | null) {
@@ -1965,36 +1965,33 @@ export function projection(
   const distributedNodes = loadInternal(localIndex, componentLView) as Array<LNode[]>;
   const nodesForSelector = distributedNodes[selectorIndex];
 
-  // build the linked list of projected nodes:
+  const currentParent = getParentLNode(node);
+  const canInsert = canInsertNativeNode(currentParent, viewData);
+  const renderParent = currentParent.tNode.type === TNodeType.View ?
+      (getParentLNode(currentParent) as LContainerNode).data[RENDER_PARENT] ! :
+      currentParent as LElementNode;
+
   for (let i = 0; i < nodesForSelector.length; i++) {
     const nodeToProject = nodesForSelector[i];
+    let head = nodeToProject as LTextNode | LElementNode | LContainerNode | null;
+    let tail = nodeToProject as LTextNode | LElementNode | LContainerNode | null;
+
     if (nodeToProject.tNode.type === TNodeType.Projection) {
-      // Reprojecting a projection -> append the list of previously projected nodes
       const previouslyProjected = (nodeToProject as LProjectionNode).data;
-      appendToProjectionNode(node, previouslyProjected.head, previouslyProjected.tail);
-    } else {
-      // Projecting a single node
-      appendToProjectionNode(
-          node, nodeToProject as LTextNode | LElementNode | LContainerNode,
-          nodeToProject as LTextNode | LElementNode | LContainerNode);
+      head = previouslyProjected.head;
+      tail = previouslyProjected.tail;
     }
-  }
 
-  const currentParent = getParentLNode(node);
-  if (canInsertNativeNode(currentParent, viewData)) {
-    ngDevMode && assertNodeOfPossibleTypes(currentParent, TNodeType.Element, TNodeType.View);
-    // process each node in the list of projected nodes:
-    let nodeToProject: LNode|null = node.data.head;
-    const lastNodeToProject = node.data.tail;
-    const renderParent = currentParent.tNode.type === TNodeType.View ?
-        (getParentLNode(currentParent) as LContainerNode).data[RENDER_PARENT] ! :
-        currentParent as LElementNode;
+    addToProjectionList(node, head, tail);
 
-    while (nodeToProject) {
-      appendProjectedNode(
-          nodeToProject as LTextNode | LElementNode | LContainerNode, currentParent, viewData,
-          renderParent);
-      nodeToProject = nodeToProject === lastNodeToProject ? null : nodeToProject.pNextOrParent;
+    if (canInsert) {
+      let currentNode: LNode|null = head;
+      while (currentNode) {
+        appendProjectedNode(
+            currentNode as LTextNode | LElementNode | LContainerNode, currentParent, viewData,
+            renderParent);
+        currentNode = currentNode === tail ? null : currentNode.pNextOrParent;
+      }
     }
   }
 }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index d577a15c9b..95a4a35715 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -618,7 +618,7 @@ export function appendProjectedNode(
     lContainer[RENDER_PARENT] = renderParent;
     const views = lContainer[VIEWS];
     for (let i = 0; i < views.length; i++) {
-      addRemoveViewFromContainer(node as LContainerNode, views[i], true, null);
+      addRemoveViewFromContainer(node as LContainerNode, views[i], true, node.native);
     }
   }
   if (node.dynamicLContainerNode) {
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index a6c3316285..8f16a1fa00 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -45,12 +45,15 @@ describe('content projection', () => {
   });
 
   it('should project content when root.', () => {
+    /** <ng-content></ng-content> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         projectionDef(0);
         projection(1, 0);
       }
     });
+
+    /** <child>content</child> */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
@@ -64,6 +67,7 @@ describe('content projection', () => {
   });
 
   it('should re-project content when root.', () => {
+    /** <div><ng-content></ng-content></div> */
     const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         projectionDef(0);
@@ -72,6 +76,8 @@ describe('content projection', () => {
         elementEnd();
       }
     });
+
+    /** <grand-child><ng-content></ng-content></grand-child> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         projectionDef(0);
@@ -80,6 +86,8 @@ describe('content projection', () => {
         elementEnd();
       }
     }, [GrandChild]);
+
+    /** <child><b>Hello</b>World!</child> */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
@@ -137,6 +145,59 @@ describe('content projection', () => {
         .toEqual('<child><div><projected-comp>content</projected-comp></div></child>');
   });
 
+  it('should project components that have their own projection', () => {
+    /** <div><ng-content></ng-content></div> */
+    const Child = createComponent('child', (rf: RenderFlags, ctx: any) => {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        elementStart(1, 'div');
+        { projection(2, 0); }
+        elementEnd();
+      }
+    });
+
+    /** <p><ng-content></ng-content></p> */
+    const ProjectedComp = createComponent('projected-comp', (rf: RenderFlags, ctx: any) => {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        elementStart(1, 'p');
+        projection(2, 0);
+        elementEnd();
+      }
+    });
+
+    /**
+     * <child>
+     *   <projected-comp>
+     *       <div> Some content </div>
+     *       Other content
+     *   </projected-comp>
+     * </child>
+     */
+    const Parent = createComponent('parent', (rf: RenderFlags, ctx: any) => {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        {
+          elementStart(1, 'projected-comp');
+          {
+            elementStart(2, 'div');
+            text(3, 'Some content');
+            elementEnd();
+            text(4, 'Other content');
+          }
+
+          elementEnd();
+        }
+        elementEnd();
+      }
+    }, [Child, ProjectedComp]);
+
+    const parent = renderComponent(Parent);
+    expect(toHtml(parent))
+        .toEqual(
+            '<child><div><projected-comp><p><div>Some content</div>Other content</p></projected-comp></div></child>');
+  });
+
   it('should project content with container.', () => {
     /** <div> <ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
@@ -366,8 +427,8 @@ describe('content projection', () => {
        /**
         * <div>
         *  % if (!skipContent) {
-        *    <ng-content></ng-content>
-        *  % }
+         *    <ng-content></ng-content>
+         *  % }
         * </div>
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
@@ -414,7 +475,89 @@ describe('content projection', () => {
        expect(toHtml(parent)).toEqual('<child><div></div></child>');
      });
 
-  it('should project containers into embedded views', () => {
+  it('should project containers into containers', () => {
+    /**
+     * <div>
+     *  Before (inside)
+     *  % if (!skipContent) {
+     *    <ng-content></ng-content>
+     *  % }
+     *  After (inside)
+     * </div>
+     */
+    const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        elementStart(1, 'div');
+        {
+          text(2, 'Before (inside)-');
+          container(3);
+          text(4, '-After (inside)');
+        }
+        elementEnd();
+      }
+      if (rf & RenderFlags.Update) {
+        containerRefreshStart(3);
+        {
+          if (!ctx.skipContent) {
+            let rf0 = embeddedViewStart(0);
+            if (rf0 & RenderFlags.Create) {
+              projection(0, 0);
+            }
+            embeddedViewEnd();
+          }
+        }
+        containerRefreshEnd();
+      }
+    });
+
+    /**
+     * <child>
+     *     Before text-
+     *     % if (!skipContent) {
+     *       content
+     *     % }
+     *     -After text
+     * </child>
+     */
+    const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        {
+          text(1, 'Before text-');
+          container(2);
+          text(3, '-After text');
+        }
+        elementEnd();
+      }
+      if (rf & RenderFlags.Update) {
+        containerRefreshStart(2);
+        {
+          if (!ctx.skipContent) {
+            let rf0 = embeddedViewStart(0);
+            if (rf0 & RenderFlags.Create) {
+              text(0, 'content');
+            }
+            embeddedViewEnd();
+          }
+        }
+        containerRefreshEnd();
+      }
+    }, [Child]);
+
+    const fixture = new ComponentFixture(Parent);
+    expect(fixture.html)
+        .toEqual(
+            '<child><div>Before (inside)-Before text-content-After text-After (inside)</div></child>');
+
+    fixture.component.skipContent = true;
+    fixture.update();
+    expect(fixture.html)
+        .toEqual(
+            '<child><div>Before (inside)-Before text--After text-After (inside)</div></child>');
+  });
+
+  it('should re-project containers into containers', () => {
     /**
      * <div>
      *  % if (!skipContent) {
@@ -446,24 +589,31 @@ describe('content projection', () => {
 
     /**
      * <child>
+     *     Before text
      *     % if (!skipContent) {
-     *       content
+     *       <ng-content></ng-content>
      *     % }
+     *     -After text
      * </child>
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        elementStart(0, 'child');
-        { container(1); }
+        projectionDef(0);
+        elementStart(1, 'child');
+        {
+          text(2, 'Before text');
+          container(3);
+          text(4, '-After text');
+        }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        containerRefreshStart(1);
+        containerRefreshStart(3);
         {
           if (!ctx.skipContent) {
             let rf0 = embeddedViewStart(0);
             if (rf0 & RenderFlags.Create) {
-              text(0, 'content');
+              projection(0, 0);
             }
             embeddedViewEnd();
           }
@@ -472,14 +622,33 @@ describe('content projection', () => {
       }
     }, [Child]);
 
-    const fixture = new ComponentFixture(Parent);
-    expect(fixture.html).toEqual('<child><div>content</div></child>');
+    let parent: any;
+    /** <parent><p>text</p></parent> */
+    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'parent');
+        {
+          elementStart(1, 'p');
+          { text(2, 'text'); }
+          elementEnd();
+        }
+        elementEnd();
+        // testing
+        parent = loadDirective(0);
+      }
+    }, [Parent]);
 
-    fixture.component.skipContent = true;
+    const fixture = new ComponentFixture(App);
+    expect(fixture.html)
+        .toEqual('<parent><child><div>Before text<p>text</p>-After text</div></child></parent>');
+
+    parent.skipContent = true;
     fixture.update();
-    expect(fixture.html).toEqual('<child><div></div></child>');
+    expect(fixture.html)
+        .toEqual('<parent><child><div>Before text-After text</div></child></parent>');
   });
 
+
   it('should support projection in embedded views when ng-content is a root node of an embedded view, with other nodes after',
      () => {
        let childCmptInstance: any;
@@ -487,8 +656,8 @@ describe('content projection', () => {
        /**
         * <div>
         *  % if (!skipContent) {
-        *    before-<ng-content></ng-content>-after
-        *  % }
+         *    before-<ng-content></ng-content>-after
+         *  % }
         * </div>
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
@@ -633,6 +802,129 @@ describe('content projection', () => {
     expect(toHtml(parent)).toEqual('<child><div>content</div></child>');
   });
 
+  it('should project with multiple instances of a component with projection', () => {
+    const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        text(1, 'Before');
+        projection(2, 0);
+        text(3, 'After');
+      }
+    });
+
+    /**
+     * <projection-comp>
+     *     <div>A</div>
+     *     <p>123</p>
+     * </projection-comp>
+     * <projection-comp>
+     *     <div>B</div>
+     *     <p>456</p>
+     * </projection-comp>
+     */
+    const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'projection-comp');
+        elementStart(1, 'div');
+        text(2, 'A');
+        elementEnd();
+        elementStart(3, 'p');
+        text(4, '123');
+        elementEnd();
+        elementEnd();
+        elementStart(5, 'projection-comp');
+        elementStart(6, 'div');
+        text(7, 'B');
+        elementEnd();
+        elementStart(8, 'p');
+        text(9, '456');
+        elementEnd();
+        elementEnd();
+      }
+    }, [ProjectionComp]);
+
+    const fixture = new ComponentFixture(AppComp);
+    fixture.update();
+    expect(fixture.html)
+        .toEqual(
+            '<projection-comp>Before<div>A</div><p>123</p>After</projection-comp><projection-comp>Before<div>B</div><p>456</p>After</projection-comp>');
+  });
+
+  it('should re-project with multiple instances of a component with projection', () => {
+    /**
+     * Before
+     * <ng-content></ng-content>
+     * After
+     */
+    const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        text(1, 'Before');
+        projection(2, 0);
+        text(3, 'After');
+      }
+    });
+
+    /**
+     * <projection-comp>
+     *     <div>A</div>
+     *     <ng-content></ng-content>
+     *     <p>123</p>
+     * </projection-comp>
+     * <projection-comp>
+     *     <div>B</div>
+     *     <p>456</p>
+     * </projection-comp>
+     */
+    const ProjectionParent = createComponent('parent-comp', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        elementStart(1, 'projection-comp');
+        elementStart(2, 'div');
+        text(3, 'A');
+        elementEnd();
+        projection(4, 0);
+        elementStart(5, 'p');
+        text(6, '123');
+        elementEnd();
+        elementEnd();
+        elementStart(7, 'projection-comp');
+        elementStart(8, 'div');
+        text(9, 'B');
+        elementEnd();
+        elementStart(10, 'p');
+        text(11, '456');
+        elementEnd();
+        elementEnd();
+      }
+    }, [ProjectionComp]);
+
+    /**
+     * <parent-comp>
+     *    **ABC**
+     * </parent-comp>
+     * <parent-comp>
+     *    **DEF**
+     * </parent-comp>
+     */
+    const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'parent-comp');
+        text(1, '**ABC**');
+        elementEnd();
+        elementStart(2, 'parent-comp');
+        text(3, '**DEF**');
+        elementEnd();
+      }
+    }, [ProjectionParent]);
+
+    const fixture = new ComponentFixture(AppComp);
+    fixture.update();
+    expect(fixture.html)
+        .toEqual(
+            '<parent-comp><projection-comp>Before<div>A</div>**ABC**<p>123</p>After</projection-comp><projection-comp>Before<div>B</div><p>456</p>After</projection-comp></parent-comp><parent-comp><projection-comp>Before<div>A</div>**DEF**<p>123</p>After</projection-comp><projection-comp>Before<div>B</div><p>456</p>After</projection-comp></parent-comp>');
+  });
+
   describe('with selectors', () => {
 
     it('should project nodes using attribute selectors', () => {
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 34a300ab4b..75ed3c4502 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -727,9 +727,12 @@ describe('ViewContainerRef', () => {
       @Component({
         selector: 'child-with-view',
         template: `
-      % if (show) {
-        <ng-content></ng-content>
-      % }`
+          Before (inside)-
+          % if (show) {
+            <ng-content></ng-content>
+          % }
+          After (inside)
+        `
       })
       class ChildWithView {
         show: boolean = true;
@@ -740,10 +743,12 @@ describe('ViewContainerRef', () => {
           template: (rf: RenderFlags, cmp: ChildWithView) => {
             if (rf & RenderFlags.Create) {
               projectionDef(0);
-              container(1);
+              text(1, 'Before (inside)-');
+              container(2);
+              text(3, 'After (inside)');
             }
             if (rf & RenderFlags.Update) {
-              containerRefreshStart(1);
+              containerRefreshStart(2);
               if (cmp.show) {
                 let rf0 = embeddedViewStart(0);
                 if (rf0 & RenderFlags.Create) {
@@ -764,7 +769,9 @@ describe('ViewContainerRef', () => {
               <span>{{name}}</span>
           </ng-template>
           <child-with-view>
+            Before projected
             <header vcref [tplRef]="foo" [name]="name">blah</header>
+            After projected
           </child-with-view>`
       })
       class Parent {
@@ -777,15 +784,17 @@ describe('ViewContainerRef', () => {
             if (rf & RenderFlags.Create) {
               container(0, embeddedTemplate);
               elementStart(1, 'child-with-view');
-              elementStart(2, 'header', ['vcref', '']);
-              text(3, 'blah');
+              text(2, 'Before projected');
+              elementStart(3, 'header', ['vcref', '']);
+              text(4, 'blah');
               elementEnd();
+              text(5, 'After projected-');
               elementEnd();
             }
             if (rf & RenderFlags.Update) {
               const tplRef = getOrCreateTemplateRef(getOrCreateNodeInjectorForNode(load(0)));
-              elementProperty(2, 'tplRef', bind(tplRef));
-              elementProperty(2, 'name', bind(cmp.name));
+              elementProperty(3, 'tplRef', bind(tplRef));
+              elementProperty(3, 'name', bind(cmp.name));
             }
           },
           directives: [ChildWithView, DirectiveWithVCRef]
@@ -794,13 +803,14 @@ describe('ViewContainerRef', () => {
 
       const fixture = new ComponentFixture(Parent);
       expect(fixture.html)
-          .toEqual('<child-with-view><header vcref="">blah</header></child-with-view>');
+          .toEqual(
+              '<child-with-view>Before (inside)-Before projected<header vcref="">blah</header>After projected-After (inside)</child-with-view>');
 
       directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, fixture.component);
       fixture.update();
       expect(fixture.html)
           .toEqual(
-              '<child-with-view><header vcref="">blah</header><span>bar</span></child-with-view>');
+              '<child-with-view>Before (inside)-Before projected<header vcref="">blah</header><span>bar</span>After projected-After (inside)</child-with-view>');
     });
 
     describe('with select', () => {

From 948e2236c016fe7d7ba02b90411ce7095e8cd446 Mon Sep 17 00:00:00 2001
From: Michael Prentice <splaktar@gmail.com>
Date: Wed, 9 May 2018 01:57:04 -0400
Subject: [PATCH 395/582] docs(aio): update contributors entry (#23786)

PR Close #23786
---
 aio/content/marketing/contributors.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 47797f3d5d..dad43ab3ca 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -360,7 +360,7 @@
    "picture": "jorgeucano.jpg",
    "twitter": "jorgeucano",
    "website": "https://medium.com/@jorgeucano",
-   "bio": "Jorge is a Fulll Stack Developer in ByteDefault ... Professor in several courses related to javascript , speaker, and writer of technical articles and a book ‘Entendiendo Angular’, Google Developer Expert in web technologies nominate by Google, Nativescript Developer Expert nominated by Telerik.",
+   "bio": "Jorge is a Full Stack Developer in ByteDefault, a professor for several courses related to JavaScript, a speaker, and an author of technical articles and the book \"Entendiendo Angular.\" He is a Google Developer Expert in web technologies (nominated by Google) and a NativeScript Developer Expert (nominated by Telerik).",
    "group": "GDE"
  },
 
@@ -378,8 +378,8 @@
    "picture": "michaelprentice.jpg",
    "twitter": "splaktar",
    "website": "https://www.DevIntent.com",
-   "bio": "Owner and consultant at DevIntent. Active open-source contributor and leader. Passionate advocate, coach, and consultant for LEAN and Agile teams. Google Developer Expert (GDE) in Angular. Founder and organizer for the Google Developers Group (GDG) community on the Space Coast of Florida, USA.",
-   "group": "GDE"
+   "bio": "Lead for AngularJS Material. Owner and consultant at DevIntent. Ex-Angular GDE. Founder of the Google Developers Group (GDG) community on the Space Coast of Florida, USA.",
+   "group": "Angular"
  },
 
 "mikebrocchi": {

From c94a2c9e3f63244f88a415ee2a0e491068ded9d8 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 2 Jul 2018 15:13:59 -0700
Subject: [PATCH 396/582] build(bazel): update to latest rules_typescript
 (#24737)

PR Close #24737
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index e85c06ba5b..e1a2722e6a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
-    strip_prefix = "rules_typescript-0.15.0",
-    sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/7c49a0943e7ccca73bee0b8fc5f01ca2c3dcfe8b.zip",
+    strip_prefix = "rules_typescript-7c49a0943e7ccca73bee0b8fc5f01ca2c3dcfe8b",
+    sha256 = "9707cdafc0e59f06cf5336b1c68d8f3d04fae9f3471c0eb205a669b8b5fafc81",
 )
 
 http_archive(

From 09222280249c6d76658c911740d8397a01029dba Mon Sep 17 00:00:00 2001
From: Kevin Villela <villela@google.com>
Date: Sun, 25 Mar 2018 12:11:49 -0700
Subject: [PATCH 397/582] fix(core): use addCustomEqualityTester instead of
 overriding toEqual (#22983)

This propagates other custom equality testers added by users. Additionally, if
an Angular project is using jasmine 2.6+, it will allow Jasmine's custom object
differ to print out pretty test error messages.

fixes #22939

PR Close #22983
---
 packages/core/test/testing_internal_spec.ts   | 12 ++++++
 .../platform-browser/testing/src/matchers.ts  | 38 ++++++++-----------
 packages/types.d.ts                           |  9 +++++
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/packages/core/test/testing_internal_spec.ts b/packages/core/test/testing_internal_spec.ts
index 03320aa72f..9de173b199 100644
--- a/packages/core/test/testing_internal_spec.ts
+++ b/packages/core/test/testing_internal_spec.ts
@@ -21,6 +21,18 @@ class SpyTestObj extends SpyObject {
 
 {
   describe('testing', () => {
+    describe('should respect custom equality tester', () => {
+      beforeEach(() => {
+        const equalIfMarried =
+            (first: any, second: any) => { return first === 'kevin' && second === 'patricia'; };
+        jasmine.addCustomEqualityTester(equalIfMarried);
+      });
+
+      it('for positive test', () => { expect('kevin').toEqual('patricia'); });
+
+      it('for negative test', () => { expect('kevin').not.toEqual('kevin'); });
+    });
+
     describe('equality', () => {
       it('should structurally compare objects', () => {
         const expected = new TestObj(new TestObj({'one': [1, 2]}));
diff --git a/packages/platform-browser/testing/src/matchers.ts b/packages/platform-browser/testing/src/matchers.ts
index 01417f570b..45c51c53e4 100644
--- a/packages/platform-browser/testing/src/matchers.ts
+++ b/packages/platform-browser/testing/src/matchers.ts
@@ -112,29 +112,23 @@ export const expect: (actual: any) => NgMatchers = <any>_global.expect;
 };
 
 _global.beforeEach(function() {
-  jasmine.addMatchers({
-    // Custom handler for Map as Jasmine does not support it yet
-    toEqual: function(util) {
-      return {
-        compare: function(actual: any, expected: any) {
-          return {pass: util.equals(actual, expected, [compareMap])};
-        }
-      };
-
-      function compareMap(actual: any, expected: any): boolean {
-        if (actual instanceof Map) {
-          let pass = actual.size === expected.size;
-          if (pass) {
-            actual.forEach((v: any, k: any) => { pass = pass && util.equals(v, expected.get(k)); });
-          }
-          return pass;
-        } else {
-          // TODO(misko): we should change the return, but jasmine.d.ts is not null safe
-          return undefined !;
-        }
+  // Custom handler for Map as we use Jasmine 2.4, and support for maps is not
+  // added until Jasmine 2.6.
+  jasmine.addCustomEqualityTester(function compareMap(actual: any, expected: any): boolean {
+    if (actual instanceof Map) {
+      let pass = actual.size === expected.size;
+      if (pass) {
+        actual.forEach((v: any, k: any) => {
+          pass = pass && jasmine.matchersUtil.equals(v, expected.get(k));
+        });
       }
-    },
-
+      return pass;
+    } else {
+      // TODO(misko): we should change the return, but jasmine.d.ts is not null safe
+      return undefined !;
+    }
+  });
+  jasmine.addMatchers({
     toBePromise: function() {
       return {
         compare: function(actual: any) {
diff --git a/packages/types.d.ts b/packages/types.d.ts
index ad0b87d802..96996ea8e0 100644
--- a/packages/types.d.ts
+++ b/packages/types.d.ts
@@ -25,3 +25,12 @@ declare namespace jasmine {
     toHaveProperties(obj: any): boolean;
   }
 }
+
+/**
+*Jasmine matching utilities. These are added in the a more recent version of
+*the Jasmine typedefs than what we are using:
+*https://github.com/DefinitelyTyped/DefinitelyTyped/pull/20771
+*/
+declare namespace jasmine {
+  const matchersUtil: MatchersUtil;
+}

From 0c3738a780c1392bb9e1e9cba00e5c8e134e4ebd Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 26 Jun 2018 15:01:09 -0700
Subject: [PATCH 398/582] feat(ivy): support templateUrl for ngtsc (#24704)

This commit adds support for templateUrl in component templates within
ngtsc. The compilation pipeline is split into sync and async versions,
where asynchronous compilation invokes a special preanalyze() phase of
analysis. The preanalyze() phase can optionally return a Promise which
will delay compilation until it resolves.

A ResourceLoader interface is used to resolve templateUrls to template
strings and can return results either synchronously or asynchronously.
During sync compilation it is an error if the ResourceLoader returns a
Promise.

Two ResourceLoader implementations are provided. One uses 'fs' to read
resources directly from disk and is chosen if the CompilerHost doesn't
provide a readResource method. The other wraps the readResource method
from CompilerHost if it's provided.

PR Close #24704
---
 .../src/ngtsc/annotations/index.ts            |  1 +
 .../src/ngtsc/annotations/src/api.ts          | 12 +++
 .../src/ngtsc/annotations/src/component.ts    | 73 ++++++++++----
 packages/compiler-cli/src/ngtsc/program.ts    | 96 +++++++++++++------
 .../compiler-cli/src/ngtsc/resource_loader.ts | 59 ++++++++++++
 .../src/ngtsc/transform/src/api.ts            |  9 ++
 .../src/ngtsc/transform/src/compilation.ts    | 73 +++++++++-----
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 21 ++++
 8 files changed, 278 insertions(+), 66 deletions(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/src/api.ts
 create mode 100644 packages/compiler-cli/src/ngtsc/resource_loader.ts

diff --git a/packages/compiler-cli/src/ngtsc/annotations/index.ts b/packages/compiler-cli/src/ngtsc/annotations/index.ts
index 4328de07ba..3beccc7aa8 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/index.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/index.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+export {ResourceLoader} from './src/api';
 export {ComponentDecoratorHandler} from './src/component';
 export {DirectiveDecoratorHandler} from './src/directive';
 export {InjectableDecoratorHandler} from './src/injectable';
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/api.ts b/packages/compiler-cli/src/ngtsc/annotations/src/api.ts
new file mode 100644
index 0000000000..32b4c3ff00
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/api.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export interface ResourceLoader {
+  preload?(url: string): Promise<void>|undefined;
+  load(url: string): string;
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index 2de6d830d9..64b2913fe1 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -7,12 +7,14 @@
  */
 
 import {ConstantPool, Expression, R3ComponentMetadata, R3DirectiveMetadata, WrappedNodeExpr, compileComponentFromMetadata, makeBindingParser, parseTemplate} from '@angular/compiler';
+import * as path from 'path';
 import * as ts from 'typescript';
 
 import {Decorator, ReflectionHost} from '../../host';
 import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
+import {ResourceLoader} from './api';
 import {extractDirectiveMetadata} from './directive';
 import {SelectorScopeRegistry} from './selector_scope';
 import {isAngularCore} from './util';
@@ -25,21 +27,35 @@ const EMPTY_MAP = new Map<string, Expression>();
 export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMetadata> {
   constructor(
       private checker: ts.TypeChecker, private reflector: ReflectionHost,
-      private scopeRegistry: SelectorScopeRegistry, private isCore: boolean) {}
+      private scopeRegistry: SelectorScopeRegistry, private isCore: boolean,
+      private resourceLoader: ResourceLoader) {}
+
+  private literalCache = new Map<Decorator, ts.ObjectLiteralExpression>();
+
 
   detect(decorators: Decorator[]): Decorator|undefined {
     return decorators.find(
         decorator => decorator.name === 'Component' && (this.isCore || isAngularCore(decorator)));
   }
 
+  preanalyze(node: ts.ClassDeclaration, decorator: Decorator): Promise<void>|undefined {
+    const meta = this._resolveLiteral(decorator);
+    const component = reflectObjectLiteral(meta);
+
+    if (this.resourceLoader.preload !== undefined && component.has('templateUrl')) {
+      const templateUrl = staticallyResolve(component.get('templateUrl') !, this.checker);
+      if (typeof templateUrl !== 'string') {
+        throw new Error(`templateUrl should be a string`);
+      }
+      const url = path.posix.resolve(path.dirname(node.getSourceFile().fileName), templateUrl);
+      return this.resourceLoader.preload(url);
+    }
+    return undefined;
+  }
+
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3ComponentMetadata> {
-    if (decorator.args === null || decorator.args.length !== 1) {
-      throw new Error(`Incorrect number of arguments to @Component decorator`);
-    }
-    const meta = decorator.args[0];
-    if (!ts.isObjectLiteralExpression(meta)) {
-      throw new Error(`Decorator argument must be literal.`);
-    }
+    const meta = this._resolveLiteral(decorator);
+    this.literalCache.delete(decorator);
 
     // @Component inherits @Directive, so begin by extracting the @Directive metadata and building
     // on it.
@@ -55,14 +71,23 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     // Next, read the `@Component`-specific fields.
     const component = reflectObjectLiteral(meta);
 
-    // Resolve and parse the template.
-    if (!component.has('template')) {
-      throw new Error(`For now, components must directly have a template.`);
-    }
-    const templateExpr = component.get('template') !;
-    const templateStr = staticallyResolve(templateExpr, this.checker);
-    if (typeof templateStr !== 'string') {
-      throw new Error(`Template must statically resolve to a string: ${node.name!.text}`);
+    let templateStr: string|null = null;
+    if (component.has('templateUrl')) {
+      const templateUrl = staticallyResolve(component.get('templateUrl') !, this.checker);
+      if (typeof templateUrl !== 'string') {
+        throw new Error(`templateUrl should be a string`);
+      }
+      const url = path.posix.resolve(path.dirname(node.getSourceFile().fileName), templateUrl);
+      templateStr = this.resourceLoader.load(url);
+    } else if (component.has('template')) {
+      const templateExpr = component.get('template') !;
+      const resolvedTemplate = staticallyResolve(templateExpr, this.checker);
+      if (typeof resolvedTemplate !== 'string') {
+        throw new Error(`Template must statically resolve to a string: ${node.name!.text}`);
+      }
+      templateStr = resolvedTemplate;
+    } else {
+      throw new Error(`Component has no template or templateUrl`);
     }
 
     let preserveWhitespaces: boolean = false;
@@ -123,4 +148,20 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
       type: res.type,
     };
   }
+
+  private _resolveLiteral(decorator: Decorator): ts.ObjectLiteralExpression {
+    if (this.literalCache.has(decorator)) {
+      return this.literalCache.get(decorator) !;
+    }
+    if (decorator.args === null || decorator.args.length !== 1) {
+      throw new Error(`Incorrect number of arguments to @Component decorator`);
+    }
+    const meta = decorator.args[0];
+    if (!ts.isObjectLiteralExpression(meta)) {
+      throw new Error(`Decorator argument must be literal.`);
+    }
+
+    this.literalCache.set(decorator, meta);
+    return meta;
+  }
 }
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 314718e948..c1990f974b 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -12,17 +12,28 @@ import * as ts from 'typescript';
 
 import * as api from '../transformers/api';
 
-import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, SelectorScopeRegistry} from './annotations';
+import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, ResourceLoader, SelectorScopeRegistry} from './annotations';
 import {CompilerHost} from './compiler_host';
 import {TypeScriptReflectionHost} from './metadata';
+import {FileResourceLoader, HostResourceLoader} from './resource_loader';
 import {IvyCompilation, ivyTransformFactory} from './transform';
 
 export class NgtscProgram implements api.Program {
   private tsProgram: ts.Program;
+  private resourceLoader: ResourceLoader;
+  private compilation: IvyCompilation|undefined = undefined;
+
+  private _coreImportsFrom: ts.SourceFile|null|undefined = undefined;
+  private _reflector: TypeScriptReflectionHost|undefined = undefined;
+  private _isCore: boolean|undefined = undefined;
 
   constructor(
       rootNames: ReadonlyArray<string>, private options: api.CompilerOptions,
       private host: api.CompilerHost, oldProgram?: api.Program) {
+    this.resourceLoader = host.readResource !== undefined ?
+        new HostResourceLoader(host.readResource.bind(host)) :
+        new FileResourceLoader();
+
     this.tsProgram =
         ts.createProgram(rootNames, options, host, oldProgram && oldProgram.getTsProgram());
   }
@@ -62,7 +73,16 @@ export class NgtscProgram implements api.Program {
     return [];
   }
 
-  loadNgStructureAsync(): Promise<void> { return Promise.resolve(); }
+  async loadNgStructureAsync(): Promise<void> {
+    if (this.compilation === undefined) {
+      this.compilation = this.makeCompilation();
+
+      await this.tsProgram.getSourceFiles()
+          .filter(file => !file.fileName.endsWith('.d.ts'))
+          .map(file => this.compilation !.analyzeAsync(file))
+          .filter((result): result is Promise<void> => result !== undefined);
+    }
+  }
 
   listLazyRoutes(entryRoute?: string|undefined): api.LazyRoute[] {
     throw new Error('Method not implemented.');
@@ -88,30 +108,13 @@ export class NgtscProgram implements api.Program {
     mergeEmitResultsCallback?: api.TsMergeEmitResultsCallback
   }): ts.EmitResult {
     const emitCallback = opts && opts.emitCallback || defaultEmitCallback;
-    const mergeEmitResultsCallback = opts && opts.mergeEmitResultsCallback || mergeEmitResults;
 
-    const checker = this.tsProgram.getTypeChecker();
-    const isCore = isAngularCorePackage(this.tsProgram);
-    const reflector = new TypeScriptReflectionHost(checker);
-    const scopeRegistry = new SelectorScopeRegistry(checker, reflector);
-
-    // Set up the IvyCompilation, which manages state for the Ivy transformer.
-    const handlers = [
-      new ComponentDecoratorHandler(checker, reflector, scopeRegistry, isCore),
-      new DirectiveDecoratorHandler(checker, reflector, scopeRegistry, isCore),
-      new InjectableDecoratorHandler(reflector, isCore),
-      new NgModuleDecoratorHandler(checker, reflector, scopeRegistry, isCore),
-      new PipeDecoratorHandler(reflector, isCore),
-    ];
-
-    const coreImportsFrom = isCore && getR3SymbolsFile(this.tsProgram) || null;
-
-    const compilation = new IvyCompilation(handlers, checker, reflector, coreImportsFrom);
-
-    // Analyze every source file in the program.
-    this.tsProgram.getSourceFiles()
-        .filter(file => !file.fileName.endsWith('.d.ts'))
-        .forEach(file => compilation.analyze(file));
+    if (this.compilation === undefined) {
+      this.compilation = this.makeCompilation();
+      this.tsProgram.getSourceFiles()
+          .filter(file => !file.fileName.endsWith('.d.ts'))
+          .forEach(file => this.compilation !.analyzeSync(file));
+    }
 
     // Since there is no .d.ts transformation API, .d.ts files are transformed during write.
     const writeFile: ts.WriteFileCallback =
@@ -120,7 +123,8 @@ export class NgtscProgram implements api.Program {
          sourceFiles: ReadonlyArray<ts.SourceFile>) => {
           if (fileName.endsWith('.d.ts')) {
             data = sourceFiles.reduce(
-                (data, sf) => compilation.transformedDtsFor(sf.fileName, data, fileName), data);
+                (data, sf) => this.compilation !.transformedDtsFor(sf.fileName, data, fileName),
+                data);
           }
           this.host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
         };
@@ -133,11 +137,49 @@ export class NgtscProgram implements api.Program {
       options: this.options,
       emitOnlyDtsFiles: false, writeFile,
       customTransformers: {
-        before: [ivyTransformFactory(compilation, reflector, coreImportsFrom)],
+        before: [ivyTransformFactory(this.compilation !, this.reflector, this.coreImportsFrom)],
       },
     });
     return emitResult;
   }
+
+  private makeCompilation(): IvyCompilation {
+    const checker = this.tsProgram.getTypeChecker();
+    const scopeRegistry = new SelectorScopeRegistry(checker, this.reflector);
+
+    // Set up the IvyCompilation, which manages state for the Ivy transformer.
+    const handlers = [
+      new ComponentDecoratorHandler(
+          checker, this.reflector, scopeRegistry, this.isCore, this.resourceLoader),
+      new DirectiveDecoratorHandler(checker, this.reflector, scopeRegistry, this.isCore),
+      new InjectableDecoratorHandler(this.reflector, this.isCore),
+      new NgModuleDecoratorHandler(checker, this.reflector, scopeRegistry, this.isCore),
+      new PipeDecoratorHandler(this.reflector, this.isCore),
+    ];
+
+    return new IvyCompilation(handlers, checker, this.reflector, this.coreImportsFrom);
+  }
+
+  private get reflector(): TypeScriptReflectionHost {
+    if (this._reflector === undefined) {
+      this._reflector = new TypeScriptReflectionHost(this.tsProgram.getTypeChecker());
+    }
+    return this._reflector;
+  }
+
+  private get coreImportsFrom(): ts.SourceFile|null {
+    if (this._coreImportsFrom === undefined) {
+      this._coreImportsFrom = this.isCore && getR3SymbolsFile(this.tsProgram) || null;
+    }
+    return this._coreImportsFrom;
+  }
+
+  private get isCore(): boolean {
+    if (this._isCore === undefined) {
+      this._isCore = isAngularCorePackage(this.tsProgram);
+    }
+    return this._isCore;
+  }
 }
 
 const defaultEmitCallback: api.TsEmitCallback =
diff --git a/packages/compiler-cli/src/ngtsc/resource_loader.ts b/packages/compiler-cli/src/ngtsc/resource_loader.ts
new file mode 100644
index 0000000000..ea54032e3c
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/resource_loader.ts
@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as fs from 'fs';
+
+import {ResourceLoader} from './annotations';
+
+/**
+ * `ResourceLoader` which delegates to a `CompilerHost` resource loading method.
+ */
+export class HostResourceLoader implements ResourceLoader {
+  private cache = new Map<string, string>();
+  private fetching = new Set<string>();
+
+  constructor(private host: (url: string) => string | Promise<string>) {}
+
+  preload(url: string): Promise<void>|undefined {
+    if (this.cache.has(url) || this.fetching.has(url)) {
+      return undefined;
+    }
+
+    const result = this.host(url);
+    if (typeof result === 'string') {
+      this.cache.set(url, result);
+      return undefined;
+    } else {
+      this.fetching.add(url);
+      return result.then(str => {
+        this.fetching.delete(url);
+        this.cache.set(url, str);
+      });
+    }
+  }
+
+  load(url: string): string {
+    if (this.cache.has(url)) {
+      return this.cache.get(url) !;
+    }
+
+    const result = this.host(url);
+    if (typeof result !== 'string') {
+      throw new Error(`HostResourceLoader: host(${url}) returned a Promise`);
+    }
+    this.cache.set(url, result);
+    return result;
+  }
+}
+
+/**
+ * `ResourceLoader` which directly uses the filesystem to resolve resources synchronously.
+ */
+export class FileResourceLoader implements ResourceLoader {
+  load(url: string): string { return fs.readFileSync(url, 'utf8'); }
+}
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/api.ts b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
index 445216bc96..97e33e2cf1 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
@@ -26,6 +26,15 @@ export interface DecoratorHandler<A> {
    */
   detect(decorator: Decorator[]): Decorator|undefined;
 
+
+  /**
+   * Asynchronously perform pre-analysis on the decorator/class combination.
+   *
+   * `preAnalyze` is optional and is not guaranteed to be called through all compilation flows. It
+   * will only be called if asynchronicity is supported in the CompilerHost.
+   */
+  preanalyze?(node: ts.Declaration, decorator: Decorator): Promise<void>|undefined;
+
   /**
    * Perform analysis on the decorator/class combination, producing instructions for compilation
    * if successful, or an array of diagnostic messages if the analysis fails or the decorator
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index 7129efa8f2..153375463b 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, Type} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Decorator, ReflectionHost} from '../../host';
@@ -14,9 +13,6 @@ import {reflectNameOfDeclaration} from '../../metadata/src/reflector';
 
 import {AnalysisOutput, CompileResult, DecoratorHandler} from './api';
 import {DtsFileTransformer} from './declaration';
-import {ImportManager, translateType} from './translator';
-
-
 
 /**
  * Record of an adapter which decided to emit a static field, and the analysis it performed to
@@ -45,6 +41,8 @@ export class IvyCompilation {
    * Tracks the `DtsFileTransformer`s for each TS file that needs .d.ts transformations.
    */
   private dtsMap = new Map<string, DtsFileTransformer>();
+  private _diagnostics: ts.Diagnostic[] = [];
+
 
   /**
    * @param handlers array of `DecoratorHandler`s which will be executed against each class in the
@@ -59,11 +57,18 @@ export class IvyCompilation {
       private handlers: DecoratorHandler<any>[], private checker: ts.TypeChecker,
       private reflector: ReflectionHost, private coreImportsFrom: ts.SourceFile|null) {}
 
+
+  analyzeSync(sf: ts.SourceFile): void { return this.analyze(sf, false); }
+
+  analyzeAsync(sf: ts.SourceFile): Promise<void>|undefined { return this.analyze(sf, true); }
+
   /**
    * Analyze a source file and produce diagnostics for it (if any).
    */
-  analyze(sf: ts.SourceFile): ts.Diagnostic[] {
-    const diagnostics: ts.Diagnostic[] = [];
+  private analyze(sf: ts.SourceFile, preanalyze: false): undefined;
+  private analyze(sf: ts.SourceFile, preanalyze: true): Promise<void>|undefined;
+  private analyze(sf: ts.SourceFile, preanalyze: boolean): Promise<void>|undefined {
+    const promises: Promise<void>[] = [];
 
     const analyzeClass = (node: ts.Declaration): void => {
       // The first step is to reflect the decorators.
@@ -79,23 +84,38 @@ export class IvyCompilation {
           return;
         }
 
-        // Check for multiple decorators on the same node. Technically speaking this
-        // could be supported, but right now it's an error.
-        if (this.analysis.has(node)) {
-          throw new Error('TODO.Diagnostic: Class has multiple Angular decorators.');
-        }
+        const completeAnalysis = () => {
+          // Check for multiple decorators on the same node. Technically speaking this
+          // could be supported, but right now it's an error.
+          if (this.analysis.has(node)) {
+            throw new Error('TODO.Diagnostic: Class has multiple Angular decorators.');
+          }
 
-        // Run analysis on the decorator. This will produce either diagnostics, an
-        // analysis result, or both.
-        const analysis = adapter.analyze(node, decorator);
-        if (analysis.diagnostics !== undefined) {
-          diagnostics.push(...analysis.diagnostics);
-        }
-        if (analysis.analysis !== undefined) {
-          this.analysis.set(node, {
-            adapter,
-            analysis: analysis.analysis, decorator,
-          });
+          // Run analysis on the decorator. This will produce either diagnostics, an
+          // analysis result, or both.
+          const analysis = adapter.analyze(node, decorator);
+
+          if (analysis.analysis !== undefined) {
+            this.analysis.set(node, {
+              adapter,
+              analysis: analysis.analysis, decorator,
+            });
+          }
+
+          if (analysis.diagnostics !== undefined) {
+            this._diagnostics.push(...analysis.diagnostics);
+          }
+        };
+
+        if (preanalyze && adapter.preanalyze !== undefined) {
+          const preanalysis = adapter.preanalyze(node, decorator);
+          if (preanalysis !== undefined) {
+            promises.push(preanalysis.then(() => completeAnalysis()));
+          } else {
+            completeAnalysis();
+          }
+        } else {
+          completeAnalysis();
         }
       });
     };
@@ -109,7 +129,12 @@ export class IvyCompilation {
     };
 
     visit(sf);
-    return diagnostics;
+
+    if (preanalyze && promises.length > 0) {
+      return Promise.all(promises).then(() => undefined);
+    } else {
+      return undefined;
+    }
   }
 
   /**
@@ -166,6 +191,8 @@ export class IvyCompilation {
     return this.dtsMap.get(tsFileName) !.transform(dtsOriginalSource, tsFileName);
   }
 
+  get diagnostics(): ReadonlyArray<ts.Diagnostic> { return this._diagnostics; }
+
   private getDtsTransformer(tsFileName: string): DtsFileTransformer {
     if (!this.dtsMap.has(tsFileName)) {
       this.dtsMap.set(tsFileName, new DtsFileTransformer(this.coreImportsFrom));
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index af0867849c..e280dd90b2 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -147,6 +147,27 @@ describe('ngtsc behavioral tests', () => {
     expect(dtsContents).toContain('static ngComponentDef: i0.ComponentDef<TestCmp, \'test-cmp\'>');
   });
 
+  it('should compile Components without errors', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Component} from '@angular/core';
+
+        @Component({
+          selector: 'test-cmp',
+          templateUrl: './dir/test.html',
+        })
+        export class TestCmp {}
+    `);
+    write('dir/test.html', '<p>Hello World</p>');
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain('Hello World');
+  });
+
   it('should compile NgModules without errors', () => {
     writeConfig();
     write('test.ts', `

From e3064d5432d5332f54592f405e7e589a3feea18d Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Mon, 25 Jun 2018 11:11:22 +0200
Subject: [PATCH 399/582] feat: typescript 2.9 support (#24652)

PR Close #24652
---
 WORKSPACE                                     |   6 +-
 integration/typings_test_ts29/include-all.ts  |  49 +++++++++
 integration/typings_test_ts29/package.json    |  31 ++++++
 integration/typings_test_ts29/tsconfig.json   |  24 +++++
 modules/benchmarks/src/tree/ng2_next/tree.ts  |   6 +-
 modules/benchmarks/src/tree/render3/tree.ts   |   5 +-
 package.json                                  |   4 +-
 packages/bazel/package.json                   |   2 +-
 packages/bazel/src/ng_package/packager.ts     |   2 +-
 packages/common/locales/BUILD.bazel           |   4 +
 packages/compiler-cli/package.json            |   4 +-
 .../compiler-cli/src/transformers/program.ts  |   2 +-
 .../test/metadata/collector_spec.ts           |  33 +-----
 packages/core/src/core_private_export.ts      |   2 +-
 packages/core/src/render3/definition.ts       |   2 +-
 packages/core/src/render3/instructions.ts     |   2 +-
 .../core/src/render3/interfaces/definition.ts |   4 +-
 packages/core/src/util.ts                     |   4 -
 packages/core/src/zone/ng_zone.ts             |   3 -
 packages/language-service/src/ts_plugin.ts    |  26 +++--
 .../src/dom/events/dom_events.ts              |   4 -
 .../platform-browser/src/private_export.ts    |   1 +
 .../router/src/directives/router_outlet.ts    |   3 +-
 scripts/ci/test-js.sh                         |   2 +-
 test.sh                                       |   2 +-
 tools/cjs-jasmine/index.ts                    |   2 +
 .../animations/animations.d.ts                |  10 +-
 tools/public_api_guard/common/common.d.ts     |  26 ++---
 tools/public_api_guard/common/http.d.ts       |   2 +-
 tools/public_api_guard/core/core.d.ts         |  70 ++++++------
 tools/public_api_guard/core/testing.d.ts      |  12 +--
 tools/public_api_guard/forms/forms.d.ts       |   2 +-
 tools/public_api_guard/http/http.d.ts         |  10 +-
 .../platform-webworker.d.ts                   |   4 +-
 tools/public_api_guard/router/router.d.ts     | 102 +++++++++---------
 tools/public_api_guard/upgrade/static.d.ts    |   4 +-
 tools/tsc-watch/index.ts                      |   7 +-
 yarn.lock                                     |  19 ++--
 38 files changed, 293 insertions(+), 204 deletions(-)
 create mode 100644 integration/typings_test_ts29/include-all.ts
 create mode 100644 integration/typings_test_ts29/package.json
 create mode 100644 integration/typings_test_ts29/tsconfig.json

diff --git a/WORKSPACE b/WORKSPACE
index e1a2722e6a..be1785a0ea 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/7c49a0943e7ccca73bee0b8fc5f01ca2c3dcfe8b.zip",
-    strip_prefix = "rules_typescript-7c49a0943e7ccca73bee0b8fc5f01ca2c3dcfe8b",
-    sha256 = "9707cdafc0e59f06cf5336b1c68d8f3d04fae9f3471c0eb205a669b8b5fafc81",
+    url = "https://github.com/rkirov/rules_typescript/archive/v0.16.0.zip",
+    strip_prefix = "rules_typescript-0.16.0",
+    sha256 = "f5aedd3a792e5af19cd0c0f0318cb692e2989e816e896e794152d07808fccacd",
 )
 
 http_archive(
diff --git a/integration/typings_test_ts29/include-all.ts b/integration/typings_test_ts29/include-all.ts
new file mode 100644
index 0000000000..ca81c56472
--- /dev/null
+++ b/integration/typings_test_ts29/include-all.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as compiler from '@angular/compiler';
+import * as compilerTesting from '@angular/compiler/testing';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
+import * as elements from '@angular/elements';
+import * as forms from '@angular/forms';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as platformWebworker from '@angular/platform-webworker';
+import * as platformWebworkerDynamic from '@angular/platform-webworker-dynamic';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
+import * as serviceWorker from '@angular/service-worker';
+import * as upgrade from '@angular/upgrade';
+
+export default {
+  compiler,
+  compilerTesting,
+  core,
+  coreTesting,
+  elements,
+  forms,
+  http,
+  httpTesting,
+  platformBrowser,
+  platformBrowserTesting,
+  platformBrowserDynamic,
+  platformServer,
+  platformServerTesting,
+  platformWebworker,
+  platformWebworkerDynamic,
+  router,
+  routerTesting,
+  serviceWorker,
+  upgrade,
+};
diff --git a/integration/typings_test_ts29/package.json b/integration/typings_test_ts29/package.json
new file mode 100644
index 0000000000..10a38622bd
--- /dev/null
+++ b/integration/typings_test_ts29/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "angular-integration",
+  "description": "Assert that users with TypeScript 2.8 can type-check an Angular application",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/elements": "file:../../dist/packages-dist/elements",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/platform-webworker": "file:../../dist/packages-dist/platform-webworker",
+    "@angular/platform-webworker-dynamic": "file:../../dist/packages-dist/platform-webworker-dynamic",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/service-worker": "file:../../dist/packages-dist/service-worker",
+    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
+    "@types/jasmine": "2.5.41",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "2.8.x",
+    "zone.js": "file:../../node_modules/zone.js"
+  },
+  "scripts": {
+    "test": "tsc"
+  }
+}
diff --git a/integration/typings_test_ts29/tsconfig.json b/integration/typings_test_ts29/tsconfig.json
new file mode 100644
index 0000000000..165bd7a957
--- /dev/null
+++ b/integration/typings_test_ts29/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/typings_test_ts28/",
+    "rootDir": ".",
+    "target": "es5",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.collection",
+      "es2015.iterable",
+      "es2015.promise"
+    ],
+    "types": [],
+    "strictNullChecks": true
+  },
+  "files": [
+    "include-all.ts",
+    "node_modules/@types/jasmine/index.d.ts"
+  ]
+}
diff --git a/modules/benchmarks/src/tree/ng2_next/tree.ts b/modules/benchmarks/src/tree/ng2_next/tree.ts
index 3ed87ed055..ebd8c05e6a 100644
--- a/modules/benchmarks/src/tree/ng2_next/tree.ts
+++ b/modules/benchmarks/src/tree/ng2_next/tree.ts
@@ -7,10 +7,8 @@
  */
 
 import {NgIf} from '@angular/common';
-import {ComponentFactory, ComponentFactoryResolver, ComponentRef, ErrorHandler, Injector, NgModuleRef, RendererFactory2, RootRenderer, Sanitizer, TemplateRef, ViewContainerRef} from '@angular/core';
-import {ArgumentType, BindingFlags, NodeFlags, ViewDefinition, ViewFlags, anchorDef, createComponentFactory, directiveDef, elementDef, initServicesIfNeeded, textDef, viewDef} from '@angular/core/src/view/index';
-import {DomRendererFactory2} from '@angular/platform-browser/src/dom/dom_renderer';
-import {DomSanitizerImpl, SafeStyle} from '@angular/platform-browser/src/security/dom_sanitization_service';
+import {ComponentFactory, ComponentFactoryResolver, ComponentRef, ErrorHandler, Injector, NgModuleRef, RendererFactory2, RootRenderer, Sanitizer, TemplateRef, ViewContainerRef, ɵArgumentType as ArgumentType, ɵBindingFlags as BindingFlags, ɵNodeFlags as NodeFlags, ɵViewDefinition as ViewDefinition, ɵViewFlags as ViewFlags, ɵand as anchorDef, ɵccf as createComponentFactory, ɵdid as directiveDef, ɵeld as elementDef, ɵinitServicesIfNeeded as initServicesIfNeeded, ɵted as textDef, ɵvid as viewDef} from '@angular/core';
+import {SafeStyle, ɵDomRendererFactory2 as DomRendererFactory2, ɵDomSanitizerImpl as DomSanitizerImpl} from '@angular/platform-browser';
 
 import {TreeNode, emptyTree} from '../util';
 
diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts
index 8b629df4b5..e81f401b4f 100644
--- a/modules/benchmarks/src/tree/render3/tree.ts
+++ b/modules/benchmarks/src/tree/render3/tree.ts
@@ -7,7 +7,6 @@
  */
 
 import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as _detectChanges, ɵe as e, ɵi1 as i1, ɵp as p, ɵsn as sn, ɵt as t, ɵv as v} from '@angular/core';
-import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 import {TreeNode, buildTree, emptyTree} from '../util';
 
@@ -35,7 +34,7 @@ export class TreeComponent {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef: ComponentDefInternal<TreeComponent> = defineComponent({
+  static ngComponentDef = defineComponent({
     type: TreeComponent,
     selectors: [['tree']],
     template: function(rf: RenderFlags, ctx: TreeComponent) {
@@ -95,7 +94,7 @@ export class TreeFunction {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef: ComponentDefInternal<TreeFunction> = defineComponent({
+  static ngComponentDef = defineComponent({
     type: TreeFunction,
     selectors: [['tree']],
     template: function(rf: RenderFlags, ctx: TreeFunction) {
diff --git a/package.json b/package.json
index 819ffd023a..a40c4f1e49 100644
--- a/package.json
+++ b/package.json
@@ -110,11 +110,11 @@
     "source-map": "0.5.7",
     "source-map-support": "0.4.18",
     "systemjs": "0.18.10",
-    "tsickle": "^0.29.0",
+    "tsickle": "0.32",
     "tslint": "5.7.0",
     "tslint-eslint-rules": "4.1.1",
     "tsutils": "2.20.0",
-    "typescript": "2.8.x",
+    "typescript": "2.9.x",
     "uglify-es": "^3.3.9",
     "universal-analytics": "0.4.15",
     "vlq": "0.2.2",
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index 2b6744cadf..72464fafba 100644
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@@ -13,7 +13,7 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "typescript": ">=2.7.2 <2.9"
+    "typescript": ">=2.7.2 <2.10"
   },
   "repository": {
     "type": "git",
diff --git a/packages/bazel/src/ng_package/packager.ts b/packages/bazel/src/ng_package/packager.ts
index 65733c52fe..59358020e0 100644
--- a/packages/bazel/src/ng_package/packager.ts
+++ b/packages/bazel/src/ng_package/packager.ts
@@ -152,7 +152,7 @@ function main(args: string[]): number {
   allsrcs.filter(hasFileExtension('.d.ts')).forEach((f: string) => {
     const content = fs.readFileSync(f, 'utf-8')
                         // Strip the named AMD module for compatibility with non-bazel users
-                        .replace(/^\/\/\/ <amd-module name=.*\/>\n/, '');
+                        .replace(/^\/\/\/ <amd-module name=.*\/>\n/gm, '');
     writeFileFromInputPath(f, content);
   });
 
diff --git a/packages/common/locales/BUILD.bazel b/packages/common/locales/BUILD.bazel
index 2ee8afc3a1..07be1c9fc1 100644
--- a/packages/common/locales/BUILD.bazel
+++ b/packages/common/locales/BUILD.bazel
@@ -22,6 +22,10 @@ npm_package(
         # We don't actually import anything in the locale code so we can
         # null out the require reference passed into the module.
         "factory\(require, exports\)": "factory(null, exports)",
+
+        # Workaround for `.d.ts`` containing `/// <amd-module .../>`
+        # which are generated in TypeScript v2.9, but not before.
+        "/// <amd-module name=.*/>": "",
     },
     deps = [":locales"],
 )
diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json
index 07fcee7d02..ac7f6bdc07 100644
--- a/packages/compiler-cli/package.json
+++ b/packages/compiler-cli/package.json
@@ -11,11 +11,11 @@
   "dependencies": {
     "reflect-metadata": "^0.1.2",
     "minimist": "^1.2.0",
-    "tsickle": "^0.29.0",
+    "tsickle": "^0.30.0",
     "chokidar": "^1.4.2"
   },
   "peerDependencies": {
-    "typescript": ">=2.7.2 <2.9",
+    "typescript": ">=2.7.2 <2.10",
     "@angular/compiler": "0.0.0-PLACEHOLDER"
   },
   "engines" : {
diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts
index a21fb7bf3d..d5de233924 100644
--- a/packages/compiler-cli/src/transformers/program.ts
+++ b/packages/compiler-cli/src/transformers/program.ts
@@ -109,7 +109,7 @@ const MIN_TS_VERSION = '2.7.2';
  * ∀ supported typescript version v, v < MAX_TS_VERSION
  * MAX_TS_VERSION is not considered as a supported TypeScript version
  */
-const MAX_TS_VERSION = '2.9.0';
+const MAX_TS_VERSION = '2.10.0';
 
 class AngularCompilerProgram implements Program {
   private rootNames: string[];
diff --git a/packages/compiler-cli/test/metadata/collector_spec.ts b/packages/compiler-cli/test/metadata/collector_spec.ts
index 8be8f40b12..e49149569d 100644
--- a/packages/compiler-cli/test/metadata/collector_spec.ts
+++ b/packages/compiler-cli/test/metadata/collector_spec.ts
@@ -974,7 +974,7 @@ describe('Collector', () => {
     });
   });
 
-  describe('regerssion', () => {
+  describe('regression', () => {
     it('should be able to collect a short-hand property value', () => {
       const metadata = collectSource(`
         const children = { f1: 1 };
@@ -1040,37 +1040,6 @@ describe('Collector', () => {
           .not.toBeUndefined('typeGuard was not collected');
     });
 
-    it('should be able to collect an invalid access expression', () => {
-      const source = createSource(`
-        import {Component} from '@angular/core';
-
-        const value = [];
-        @Component({
-          provider: [{provide: 'some token', useValue: value[]}]
-        })
-        export class MyComponent {}
-      `);
-      const metadata = collector.getMetadata(source) !;
-      expect(metadata.metadata.MyComponent).toEqual({
-        __symbolic: 'class',
-        decorators: [{
-          __symbolic: 'call',
-          expression: {
-            __symbolic: 'reference',
-            module: '@angular/core',
-            name: 'Component',
-            line: 4,
-            character: 9
-          },
-          arguments: [{
-            __symbolic: 'error',
-            message: 'Expression form not supported',
-            line: 5,
-            character: 55
-          }]
-        }]
-      });
-    });
   });
 
   describe('references', () => {
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 24cddeb5e6..f5e015b94e 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -28,5 +28,5 @@ export {_sanitizeUrl as ɵ_sanitizeUrl} from './sanitization/url_sanitizer';
 export {global as ɵglobal, looseIdentical as ɵlooseIdentical, stringify as ɵstringify} from './util';
 export {makeDecorator as ɵmakeDecorator} from './util/decorators';
 export {isObservable as ɵisObservable, isPromise as ɵisPromise} from './util/lang';
-export {clearOverrides as ɵclearOverrides, overrideComponentView as ɵoverrideComponentView, overrideProvider as ɵoverrideProvider} from './view/index';
+export {clearOverrides as ɵclearOverrides, initServicesIfNeeded as ɵinitServicesIfNeeded, overrideComponentView as ɵoverrideComponentView, overrideProvider as ɵoverrideProvider} from './view/index';
 export {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR as ɵNOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from './view/provider';
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index e671928716..2cda88b570 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -209,7 +209,7 @@ export function defineComponent<T>(componentDefinition: {
   const type = componentDefinition.type;
   const pipeTypes = componentDefinition.pipes !;
   const directiveTypes = componentDefinition.directives !;
-  const declaredInputs: {[P in keyof T]: P} = {} as any;
+  const declaredInputs: {[key: string]: string} = {} as any;
   const def: ComponentDefInternal<any> = {
     type: type,
     diPublic: null,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 39777958b4..938d97516f 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1525,7 +1525,7 @@ export function baseDirectiveCreate<T>(
  * @param tNode The static data for this node
  */
 function setInputsFromAttrs<T>(
-    directiveIndex: number, instance: T, inputs: {[key: string]: string}, tNode: TNode): void {
+    directiveIndex: number, instance: T, inputs: {[P in keyof T]: string;}, tNode: TNode): void {
   let initialInputData = tNode.initialInputs as InitialInputData | undefined;
   if (initialInputData === undefined || directiveIndex >= initialInputData.length) {
     initialInputData = generateInitialInputs(directiveIndex, inputs, tNode);
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index cfcb79e308..8df6820645 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -84,7 +84,7 @@ export interface DirectiveDef<T, Selector extends string> {
   type: Type<T>;
 
   /** Function that makes a directive public to the DI system. */
-  diPublic: ((def: DirectiveDef<any, string>) => void)|null;
+  diPublic: ((def: DirectiveDef<T, string>) => void)|null;
 
   /** The selectors that will be used to match nodes to this directive. */
   selectors: CssSelectorList;
@@ -94,7 +94,7 @@ export interface DirectiveDef<T, Selector extends string> {
    * are their aliases if any, or their original unminified property names
    * (as in `@Input('alias') propertyName: any;`).
    */
-  readonly inputs: {[P in keyof T]: P};
+  readonly inputs: {[P in keyof T]: string};
 
   /**
    * @deprecated This is only here because `NgOnChanges` incorrectly uses declared name instead of
diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
index df27d9a748..4c0011dbb4 100644
--- a/packages/core/src/util.ts
+++ b/packages/core/src/util.ts
@@ -6,10 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// Import zero symbols from zone.js. This causes the zone ambient type to be
-// added to the type-checker, without emitting any runtime module load statement
-import {} from 'zone.js';
-
 // TODO(jteplitz602): Load WorkerGlobalScope from lib.webworker.d.ts file #3492
 declare var WorkerGlobalScope: any /** TODO #9100 */;
 // CommonJS / Node have global context exposed as "global" variable.
diff --git a/packages/core/src/zone/ng_zone.ts b/packages/core/src/zone/ng_zone.ts
index 17b68225d8..222254d2c8 100644
--- a/packages/core/src/zone/ng_zone.ts
+++ b/packages/core/src/zone/ng_zone.ts
@@ -6,9 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// Import zero symbols from zone.js. This causes the zone ambient type to be
-// added to the type-checker, without emitting any runtime module load statement
-import {} from 'zone.js';
 import {EventEmitter} from '../event_emitter';
 
 /**
diff --git a/packages/language-service/src/ts_plugin.ts b/packages/language-service/src/ts_plugin.ts
index 6457c4ef52..00853dc8ad 100644
--- a/packages/language-service/src/ts_plugin.ts
+++ b/packages/language-service/src/ts_plugin.ts
@@ -63,6 +63,14 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
                tryCall(fileName, () => <T>(m.call(ls, fileName, p1, p2, p3, p4)));
   }
 
+  function tryFilenameFiveCall<T, P1, P2, P3, P4, P5>(
+      m: (fileName: string, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) =>
+          T): (fileName: string, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) => T {
+    return (fileName, p1, p2, p3, p4, p5) =>
+               tryCall(fileName, () => <T>(m.call(ls, fileName, p1, p2, p3, p4, p5)));
+  }
+
+
   function typescriptOnly(ls: ts.LanguageService): ts.LanguageService {
     const languageService: ts.LanguageService = {
       cleanupSemanticCache: () => ls.cleanupSemanticCache(),
@@ -74,7 +82,7 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
       getEncodedSyntacticClassifications: tryFilenameOneCall(ls.getEncodedSyntacticClassifications),
       getEncodedSemanticClassifications: tryFilenameOneCall(ls.getEncodedSemanticClassifications),
       getCompletionsAtPosition: tryFilenameTwoCall(ls.getCompletionsAtPosition),
-      getCompletionEntryDetails: tryFilenameFourCall(ls.getCompletionEntryDetails),
+      getCompletionEntryDetails: tryFilenameFiveCall(ls.getCompletionEntryDetails),
       getCompletionEntrySymbol: tryFilenameThreeCall(ls.getCompletionEntrySymbol),
       getQuickInfoAtPosition: tryFilenameOneCall(ls.getQuickInfoAtPosition),
       getNameOrDottedNameSpan: tryFilenameTwoCall(ls.getNameOrDottedNameSpan),
@@ -106,22 +114,28 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
       getDocCommentTemplateAtPosition: tryFilenameOneCall(ls.getDocCommentTemplateAtPosition),
       isValidBraceCompletionAtPosition: tryFilenameTwoCall(ls.isValidBraceCompletionAtPosition),
       getSpanOfEnclosingComment: tryFilenameTwoCall(ls.getSpanOfEnclosingComment),
-      getCodeFixesAtPosition: tryFilenameFourCall(ls.getCodeFixesAtPosition),
+      getCodeFixesAtPosition: tryFilenameFiveCall(ls.getCodeFixesAtPosition),
       applyCodeActionCommand:
           <any>((action: any) => tryCall(undefined, () => ls.applyCodeActionCommand(action))),
       getEmitOutput: tryFilenameCall(ls.getEmitOutput),
       getProgram: () => ls.getProgram(),
       dispose: () => ls.dispose(),
-      getApplicableRefactors: tryFilenameOneCall(ls.getApplicableRefactors),
-      getEditsForRefactor: tryFilenameFourCall(ls.getEditsForRefactor),
+      getApplicableRefactors: tryFilenameTwoCall(ls.getApplicableRefactors),
+      getEditsForRefactor: tryFilenameFiveCall(ls.getEditsForRefactor),
       getDefinitionAndBoundSpan: tryFilenameOneCall(ls.getDefinitionAndBoundSpan),
       getCombinedCodeFix:
-          (scope: ts.CombinedCodeFixScope, fixId: {}, formatOptions: ts.FormatCodeSettings) =>
-              tryCall(undefined, () => ls.getCombinedCodeFix(scope, fixId, formatOptions)),
+          (scope: ts.CombinedCodeFixScope, fixId: {}, formatOptions: ts.FormatCodeSettings,
+           preferences: ts.UserPreferences) =>
+              tryCall(
+                  undefined, () => ls.getCombinedCodeFix(scope, fixId, formatOptions, preferences)),
       // TODO(kyliau): dummy implementation to compile with ts 2.8, create real one
       getSuggestionDiagnostics: (fileName: string) => [],
       // TODO(kyliau): dummy implementation to compile with ts 2.8, create real one
       organizeImports: (scope: ts.CombinedCodeFixScope, formatOptions: ts.FormatCodeSettings) => [],
+      // TODO: dummy implementation to compile with ts 2.9, create a real one
+      getEditsForFileRename:
+          (oldFilePath: string, newFilePath: string, formatOptions: ts.FormatCodeSettings,
+           preferences: ts.UserPreferences | undefined) => []
     } as ts.LanguageService;
     return languageService;
   }
diff --git a/packages/platform-browser/src/dom/events/dom_events.ts b/packages/platform-browser/src/dom/events/dom_events.ts
index 5b4c6acaac..4e1895adba 100644
--- a/packages/platform-browser/src/dom/events/dom_events.ts
+++ b/packages/platform-browser/src/dom/events/dom_events.ts
@@ -10,10 +10,6 @@ import {isPlatformServer} from '@angular/common';
 import {Inject, Injectable, NgZone, Optional, PLATFORM_ID} from '@angular/core';
 
 
-// Import zero symbols from zone.js. This causes the zone ambient type to be
-// added to the type-checker, without emitting any runtime module load statement
-import {} from 'zone.js';
-
 import {DOCUMENT} from '../dom_tokens';
 
 import {EventManagerPlugin} from './event_manager';
diff --git a/packages/platform-browser/src/private_export.ts b/packages/platform-browser/src/private_export.ts
index 0355d5e248..0deb396d77 100644
--- a/packages/platform-browser/src/private_export.ts
+++ b/packages/platform-browser/src/private_export.ts
@@ -19,3 +19,4 @@ export {DomEventsPlugin as ɵDomEventsPlugin} from './dom/events/dom_events';
 export {HammerGesturesPlugin as ɵHammerGesturesPlugin} from './dom/events/hammer_gestures';
 export {KeyEventsPlugin as ɵKeyEventsPlugin} from './dom/events/key_events';
 export {DomSharedStylesHost as ɵDomSharedStylesHost, SharedStylesHost as ɵSharedStylesHost} from './dom/shared_styles_host';
+export {DomSanitizerImpl as ɵDomSanitizerImpl} from './security/dom_sanitization_service';
diff --git a/packages/router/src/directives/router_outlet.ts b/packages/router/src/directives/router_outlet.ts
index 92ea3cd362..77d6283fc8 100644
--- a/packages/router/src/directives/router_outlet.ts
+++ b/packages/router/src/directives/router_outlet.ts
@@ -8,6 +8,7 @@
 
 import {Attribute, ChangeDetectorRef, ComponentFactoryResolver, ComponentRef, Directive, EventEmitter, Injector, OnDestroy, OnInit, Output, ViewContainerRef} from '@angular/core';
 
+import {Data} from '../config';
 import {ChildrenOutletContexts} from '../router_outlet_context';
 import {ActivatedRoute} from '../router_state';
 import {PRIMARY_OUTLET} from '../shared';
@@ -83,7 +84,7 @@ export class RouterOutlet implements OnDestroy, OnInit {
     return this._activatedRoute as ActivatedRoute;
   }
 
-  get activatedRouteData() {
+  get activatedRouteData(): Data {
     if (this._activatedRoute) {
       return this._activatedRoute.snapshot.data;
     }
diff --git a/scripts/ci/test-js.sh b/scripts/ci/test-js.sh
index 67db3eafcf..ba83077c92 100755
--- a/scripts/ci/test-js.sh
+++ b/scripts/ci/test-js.sh
@@ -21,7 +21,7 @@ travisFoldEnd "test.unit.tools"
 
 # Run unit tests in node
 travisFoldStart "test.unit.node"
-  node ./dist/tools/tsc-watch/ node runCmdsOnly
+  node --harmony ./dist/tools/tsc-watch/ node runCmdsOnly
 travisFoldEnd "test.unit.node"
 
 
diff --git a/test.sh b/test.sh
index 5eb7fa9964..812448f086 100755
--- a/test.sh
+++ b/test.sh
@@ -27,5 +27,5 @@ else
     echo "Creating packages .metadata.json files..."
     node --max-old-space-size=3000 dist/tools/@angular/compiler-cli/src/main -p packages/tsconfig-metadata.json
   fi
-  node dist/tools/tsc-watch/ $1 watch $2
+  node --harmony dist/tools/tsc-watch/ $1 watch $2
 fi
diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts
index 9c61e12cbd..4508806380 100644
--- a/tools/cjs-jasmine/index.ts
+++ b/tools/cjs-jasmine/index.ts
@@ -60,6 +60,8 @@ var specFiles: any =
                        '@angular/examples/**',
                        '@angular/platform-browser/**',
                        '@angular/platform-browser-dynamic/**',
+                       '@angular/compiler/test/aot/**',
+                       '@angular/compiler/test/render3/**',
                        '@angular/core/test/bundling/**',
                        '@angular/core/test/zone/**',
                        '@angular/core/test/render3/**',
diff --git a/tools/public_api_guard/animations/animations.d.ts b/tools/public_api_guard/animations/animations.d.ts
index 2f85467bdc..8835462f46 100644
--- a/tools/public_api_guard/animations/animations.d.ts
+++ b/tools/public_api_guard/animations/animations.d.ts
@@ -2,7 +2,7 @@ export declare function animate(timings: string | number, styles?: AnimationStyl
 
 export declare function animateChild(options?: AnimateChildOptions | null): AnimationAnimateChildMetadata;
 
-export interface AnimateChildOptions extends AnimationOptions {
+export declare interface AnimateChildOptions extends AnimationOptions {
     duration?: number | string;
 }
 
@@ -75,10 +75,10 @@ export declare const enum AnimationMetadataType {
     AnimateChild = 9,
     AnimateRef = 10,
     Query = 11,
-    Stagger = 12,
+    Stagger = 12
 }
 
-export interface AnimationOptions {
+export declare interface AnimationOptions {
     delay?: number | string;
     params?: {
         [name: string]: any;
@@ -102,7 +102,7 @@ export interface AnimationPlayer {
     play(): void;
     reset(): void;
     restart(): void;
-    setPosition(p: any): void;
+    setPosition(p: any /** TODO #9100 */): void;
 }
 
 export interface AnimationQueryMetadata extends AnimationMetadata {
@@ -111,7 +111,7 @@ export interface AnimationQueryMetadata extends AnimationMetadata {
     selector: string;
 }
 
-export interface AnimationQueryOptions extends AnimationOptions {
+export declare interface AnimationQueryOptions extends AnimationOptions {
     limit?: number;
     optional?: boolean;
 }
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index 9c77a29a94..7d2c87b652 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -3,8 +3,8 @@ export declare const APP_BASE_HREF: InjectionToken<string>;
 export declare class AsyncPipe implements OnDestroy, PipeTransform {
     constructor(_ref: ChangeDetectorRef);
     ngOnDestroy(): void;
-    transform<T>(obj: Promise<T> | null | undefined): T | null;
     transform<T>(obj: Observable<T> | null | undefined): T | null;
+    transform<T>(obj: Promise<T> | null | undefined): T | null;
     transform<T>(obj: undefined): undefined;
     transform<T>(obj: null): null;
 }
@@ -66,13 +66,13 @@ export declare enum FormatWidth {
     Short = 0,
     Medium = 1,
     Long = 2,
-    Full = 3,
+    Full = 3
 }
 
 /** @experimental */
 export declare enum FormStyle {
     Format = 0,
-    Standalone = 1,
+    Standalone = 1
 }
 
 /** @experimental */
@@ -291,10 +291,10 @@ export declare class NgIfContext {
 
 /** @experimental */
 export declare class NgLocaleLocalization extends NgLocalization {
-    /** @deprecated */ protected deprecatedPluralFn: ((locale: string, value: string | number) => Plural) | null | undefined;
+    /** @deprecated */ protected deprecatedPluralFn?: ((locale: string, value: string | number) => Plural) | null | undefined;
     protected locale: string;
     constructor(locale: string,
-        /** @deprecated */ deprecatedPluralFn?: ((locale: string, value: string | number) => Plural) | null | undefined);
+    /** @deprecated */ deprecatedPluralFn?: ((locale: string, value: string | number) => Plural) | null | undefined);
     getPluralCategory(value: any, locale?: string): string;
 }
 
@@ -350,7 +350,7 @@ export declare enum NumberFormatStyle {
     Decimal = 0,
     Percent = 1,
     Currency = 2,
-    Scientific = 3,
+    Scientific = 3
 }
 
 /** @experimental */
@@ -368,7 +368,7 @@ export declare enum NumberSymbol {
     NaN = 10,
     TimeSeparator = 11,
     CurrencyDecimal = 12,
-    CurrencyGroup = 13,
+    CurrencyGroup = 13
 }
 
 export declare class PathLocationStrategy extends LocationStrategy {
@@ -389,9 +389,9 @@ export declare class PercentPipe implements PipeTransform {
 }
 
 export declare abstract class PlatformLocation {
-    readonly abstract hash: string;
-    readonly abstract pathname: string;
-    readonly abstract search: string;
+    abstract readonly hash: string;
+    abstract readonly pathname: string;
+    abstract readonly search: string;
     abstract back(): void;
     abstract forward(): void;
     abstract getBaseHrefFromDOM(): string;
@@ -408,7 +408,7 @@ export declare enum Plural {
     Two = 2,
     Few = 3,
     Many = 4,
-    Other = 5,
+    Other = 5
 }
 
 /** @experimental */
@@ -441,7 +441,7 @@ export declare enum TranslationWidth {
     Narrow = 0,
     Abbreviated = 1,
     Wide = 2,
-    Short = 3,
+    Short = 3
 }
 
 export declare class UpperCasePipe implements PipeTransform {
@@ -467,5 +467,5 @@ export declare enum WeekDay {
     Wednesday = 3,
     Thursday = 4,
     Friday = 5,
-    Saturday = 6,
+    Saturday = 6
 }
diff --git a/tools/public_api_guard/common/http.d.ts b/tools/public_api_guard/common/http.d.ts
index 3c3aad3ad8..fc444dfab6 100644
--- a/tools/public_api_guard/common/http.d.ts
+++ b/tools/public_api_guard/common/http.d.ts
@@ -1516,7 +1516,7 @@ export declare enum HttpEventType {
     ResponseHeader = 2,
     DownloadProgress = 3,
     Response = 4,
-    User = 5,
+    User = 5
 }
 
 export declare abstract class HttpHandler {
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index a24304599d..04893d869f 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -59,7 +59,7 @@ export declare const Attribute: AttributeDecorator;
 
 export declare enum ChangeDetectionStrategy {
     OnPush = 0,
-    Default = 1,
+    Default = 1
 }
 
 export declare abstract class ChangeDetectorRef {
@@ -114,17 +114,17 @@ export interface ComponentDecorator {
 }
 
 export declare abstract class ComponentFactory<C> {
-    readonly abstract componentType: Type<any>;
-    readonly abstract inputs: {
+    abstract readonly componentType: Type<any>;
+    abstract readonly inputs: {
         propName: string;
         templateName: string;
     }[];
-    readonly abstract ngContentSelectors: string[];
-    readonly abstract outputs: {
+    abstract readonly ngContentSelectors: string[];
+    abstract readonly outputs: {
         propName: string;
         templateName: string;
     }[];
-    readonly abstract selector: string;
+    abstract readonly selector: string;
     abstract create(injector: Injector, projectableNodes?: any[][], rootSelectorOrNode?: string | any, ngModule?: NgModuleRef<any>): ComponentRef<C>;
 }
 
@@ -134,12 +134,12 @@ export declare abstract class ComponentFactoryResolver {
 }
 
 export declare abstract class ComponentRef<C> {
-    readonly abstract changeDetectorRef: ChangeDetectorRef;
-    readonly abstract componentType: Type<any>;
-    readonly abstract hostView: ViewRef;
-    readonly abstract injector: Injector;
-    readonly abstract instance: C;
-    readonly abstract location: ElementRef;
+    abstract readonly changeDetectorRef: ChangeDetectorRef;
+    abstract readonly componentType: Type<any>;
+    abstract readonly hostView: ViewRef;
+    abstract readonly injector: Injector;
+    abstract readonly instance: C;
+    abstract readonly location: ElementRef;
     abstract destroy(): void;
     abstract onDestroy(callback: Function): void;
 }
@@ -280,8 +280,8 @@ export declare class ElementRef<T = any> {
 
 /** @experimental */
 export declare abstract class EmbeddedViewRef<C> extends ViewRef {
-    readonly abstract context: C;
-    readonly abstract rootNodes: any[];
+    abstract readonly context: C;
+    abstract readonly rootNodes: any[];
 }
 
 export declare function enableProdMode(): void;
@@ -378,7 +378,7 @@ export declare const enum InjectFlags {
     Host = 1,
     Self = 2,
     SkipSelf = 4,
-    Optional = 8,
+    Optional = 8
 }
 
 export declare class InjectionToken<T> {
@@ -494,7 +494,7 @@ export declare const LOCALE_ID: InjectionToken<string>;
 export declare enum MissingTranslationStrategy {
     Error = 0,
     Warning = 1,
-    Ignore = 2,
+    Ignore = 2
 }
 
 /** @experimental */
@@ -515,7 +515,7 @@ export declare const NgModule: NgModuleDecorator;
 
 /** @experimental */
 export declare abstract class NgModuleFactory<T> {
-    readonly abstract moduleType: Type<T>;
+    abstract readonly moduleType: Type<T>;
     abstract create(parentInjector: Injector | null): NgModuleRef<T>;
 }
 
@@ -524,9 +524,9 @@ export declare abstract class NgModuleFactoryLoader {
 }
 
 export declare abstract class NgModuleRef<T> {
-    readonly abstract componentFactoryResolver: ComponentFactoryResolver;
-    readonly abstract injector: Injector;
-    readonly abstract instance: T;
+    abstract readonly componentFactoryResolver: ComponentFactoryResolver;
+    abstract readonly injector: Injector;
+    abstract readonly instance: T;
     abstract destroy(): void;
     abstract onDestroy(callback: () => void): void;
 }
@@ -547,7 +547,7 @@ export declare class NgZone {
     readonly onMicrotaskEmpty: EventEmitter<any>;
     readonly onStable: EventEmitter<any>;
     readonly onUnstable: EventEmitter<any>;
-    constructor({enableLongStackTrace}: {
+    constructor({ enableLongStackTrace }: {
         enableLongStackTrace?: boolean;
     });
     run<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
@@ -642,7 +642,7 @@ export declare class QueryList<T> {
 
 /** @deprecated */
 export declare abstract class ReflectiveInjector implements Injector {
-    readonly abstract parent: Injector | null;
+    abstract readonly parent: Injector | null;
     abstract createChildFromResolved(providers: ResolvedReflectiveProvider[]): ReflectiveInjector;
     abstract get(token: any, notFoundValue?: any): any;
     abstract instantiateResolved(provider: ResolvedReflectiveProvider): any;
@@ -699,7 +699,7 @@ export declare abstract class Renderer {
 
 /** @experimental */
 export declare abstract class Renderer2 {
-    readonly abstract data: {
+    abstract readonly data: {
         [key: string]: any;
     };
     destroyNode: ((node: any) => void) | null;
@@ -735,7 +735,7 @@ export declare abstract class RendererFactory2 {
 /** @experimental */
 export declare enum RendererStyleFlags2 {
     Important = 1,
-    DashCase = 2,
+    DashCase = 2
 }
 
 /** @experimental */
@@ -753,8 +753,8 @@ export declare class ResolvedReflectiveFactory {
     dependencies: ReflectiveDependency[];
     factory: Function;
     constructor(
-        factory: Function,
-        dependencies: ReflectiveDependency[]);
+    factory: Function,
+    dependencies: ReflectiveDependency[]);
 }
 
 /** @experimental */
@@ -787,7 +787,7 @@ export declare enum SecurityContext {
     STYLE = 2,
     SCRIPT = 3,
     URL = 4,
-    RESOURCE_URL = 5,
+    RESOURCE_URL = 5
 }
 
 export declare const Self: SelfDecorator;
@@ -834,7 +834,7 @@ export declare abstract class SystemJsNgModuleLoaderConfig {
 }
 
 export declare abstract class TemplateRef<C> {
-    readonly abstract elementRef: ElementRef;
+    abstract readonly elementRef: ElementRef;
     abstract createEmbeddedView(context: C): EmbeddedViewRef<C>;
 }
 
@@ -919,10 +919,10 @@ export interface ViewChildrenDecorator {
 }
 
 export declare abstract class ViewContainerRef {
-    readonly abstract element: ElementRef;
-    readonly abstract injector: Injector;
-    readonly abstract length: number;
-    readonly abstract parentInjector: Injector;
+    abstract readonly element: ElementRef;
+    abstract readonly injector: Injector;
+    abstract readonly length: number;
+    abstract readonly parentInjector: Injector;
     abstract clear(): void;
     abstract createComponent<C>(componentFactory: ComponentFactory<C>, index?: number, injector?: Injector, projectableNodes?: any[][], ngModule?: NgModuleRef<any>): ComponentRef<C>;
     abstract createEmbeddedView<C>(templateRef: TemplateRef<C>, context?: C, index?: number): EmbeddedViewRef<C>;
@@ -938,13 +938,13 @@ export declare enum ViewEncapsulation {
     Emulated = 0,
     Native = 1,
     None = 2,
-    ShadowDom = 3,
+    ShadowDom = 3
 }
 
 export declare abstract class ViewRef extends ChangeDetectorRef {
-    readonly abstract destroyed: boolean;
+    abstract readonly destroyed: boolean;
     abstract destroy(): void;
-    abstract onDestroy(callback: Function): any;
+    abstract onDestroy(callback: Function): any /** TODO #9100 */;
 }
 
 export declare class WrappedValue {
diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
index 5759b364f6..ce962ef4bb 100644
--- a/tools/public_api_guard/core/testing.d.ts
+++ b/tools/public_api_guard/core/testing.d.ts
@@ -78,13 +78,13 @@ export declare class TestBed implements Injector {
     }): void;
     configureTestingModule(moduleDef: TestModuleMetadata): void;
     createComponent<T>(component: Type<T>): ComponentFixture<T>;
-    deprecatedOverrideProvider(token: any, provider: {
-        useValue: any;
-    }): void;
     /** @deprecated */ deprecatedOverrideProvider(token: any, provider: {
         useFactory: Function;
         deps: any[];
     }): void;
+    deprecatedOverrideProvider(token: any, provider: {
+        useValue: any;
+    }): void;
     execute(tokens: any[], fn: Function, context?: any): any;
     get(token: any, notFoundValue?: any): any;
     /** @experimental */ initTestEnvironment(ngModule: Type<any> | Type<any>[], platform: PlatformRef, aotSummaries?: () => any[]): void;
@@ -123,11 +123,11 @@ export declare class TestBed implements Injector {
     static overrideModule(ngModule: Type<any>, override: MetadataOverride<NgModule>): typeof TestBed;
     static overridePipe(pipe: Type<any>, override: MetadataOverride<Pipe>): typeof TestBed;
     static overrideProvider(token: any, provider: {
-        useFactory: Function;
-        deps: any[];
+        useValue: any;
     }): typeof TestBed;
     static overrideProvider(token: any, provider: {
-        useValue: any;
+        useFactory: Function;
+        deps: any[];
     }): typeof TestBed;
     static overrideTemplate(component: Type<any>, template: string): typeof TestBed;
     static overrideTemplateUsingTestingModule(component: Type<any>, template: string): typeof TestBed;
diff --git a/tools/public_api_guard/forms/forms.d.ts b/tools/public_api_guard/forms/forms.d.ts
index dcb2921f8e..4af0d6af73 100644
--- a/tools/public_api_guard/forms/forms.d.ts
+++ b/tools/public_api_guard/forms/forms.d.ts
@@ -64,7 +64,7 @@ export declare abstract class AbstractControl {
 }
 
 export declare abstract class AbstractControlDirective {
-    readonly abstract control: AbstractControl | null;
+    abstract readonly control: AbstractControl | null;
     readonly dirty: boolean | null;
     readonly disabled: boolean | null;
     readonly enabled: boolean | null;
diff --git a/tools/public_api_guard/http/http.d.ts b/tools/public_api_guard/http/http.d.ts
index 8c87d94618..dc419ff40a 100644
--- a/tools/public_api_guard/http/http.d.ts
+++ b/tools/public_api_guard/http/http.d.ts
@@ -108,7 +108,7 @@ export declare enum ReadyState {
     HeadersReceived = 2,
     Loading = 3,
     Done = 4,
-    Cancelled = 5,
+    Cancelled = 5
 }
 
 /** @deprecated */
@@ -132,7 +132,7 @@ export declare enum RequestMethod {
     Delete = 3,
     Options = 4,
     Head = 5,
-    Patch = 6,
+    Patch = 6
 }
 
 /** @deprecated */
@@ -184,7 +184,7 @@ export declare enum ResponseContentType {
     Text = 0,
     Json = 1,
     ArrayBuffer = 2,
-    Blob = 3,
+    Blob = 3
 }
 
 /** @deprecated */
@@ -213,7 +213,7 @@ export declare enum ResponseType {
     Cors = 1,
     Default = 2,
     Error = 3,
-    Opaque = 4,
+    Opaque = 4
 }
 
 /** @deprecated */
@@ -249,7 +249,7 @@ export declare class XHRConnection implements Connection {
     request: Request;
     response: Observable<Response>;
     constructor(req: Request, browserXHR: BrowserXhr, baseResponseOptions?: ResponseOptions);
-    setDetectedContentType(req: any, _xhr: any): void;
+    setDetectedContentType(req: any /** TODO Request */, _xhr: any /** XMLHttpRequest */): void;
 }
 
 /** @deprecated */
diff --git a/tools/public_api_guard/platform-webworker/platform-webworker.d.ts b/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
index c239f471cf..78f321e3f4 100644
--- a/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
+++ b/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
@@ -58,7 +58,7 @@ export interface ReceivedMessage {
 export declare const enum SerializerTypes {
     RENDERER_TYPE_2 = 0,
     PRIMITIVE = 1,
-    RENDER_STORE_OBJECT = 2,
+    RENDER_STORE_OBJECT = 2
 }
 
 /** @experimental */
@@ -73,7 +73,7 @@ export declare class ServiceMessageBrokerFactory {
 
 /** @experimental */
 export declare class UiArguments {
-    args: FnArg[] | undefined;
+    args?: FnArg[] | undefined;
     method: string;
     constructor(method: string, args?: FnArg[] | undefined);
 }
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index 3c635c50a5..91b0190edd 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -41,7 +41,7 @@ export declare class ActivatedRouteSnapshot {
 export declare class ActivationEnd {
     snapshot: ActivatedRouteSnapshot;
     constructor(
-        snapshot: ActivatedRouteSnapshot);
+    snapshot: ActivatedRouteSnapshot);
     toString(): string;
 }
 
@@ -49,7 +49,7 @@ export declare class ActivationEnd {
 export declare class ActivationStart {
     snapshot: ActivatedRouteSnapshot;
     constructor(
-        snapshot: ActivatedRouteSnapshot);
+    snapshot: ActivatedRouteSnapshot);
     toString(): string;
 }
 
@@ -73,7 +73,7 @@ export interface CanLoad {
 export declare class ChildActivationEnd {
     snapshot: ActivatedRouteSnapshot;
     constructor(
-        snapshot: ActivatedRouteSnapshot);
+    snapshot: ActivatedRouteSnapshot);
     toString(): string;
 }
 
@@ -81,7 +81,7 @@ export declare class ChildActivationEnd {
 export declare class ChildActivationStart {
     snapshot: ActivatedRouteSnapshot;
     constructor(
-        snapshot: ActivatedRouteSnapshot);
+    snapshot: ActivatedRouteSnapshot);
     toString(): string;
 }
 
@@ -129,11 +129,11 @@ export declare class GuardsCheckEnd extends RouterEvent {
     state: RouterStateSnapshot;
     urlAfterRedirects: string;
     constructor(
-        id: number,
-        url: string,
-        urlAfterRedirects: string,
-        state: RouterStateSnapshot,
-        shouldActivate: boolean);
+    id: number,
+    url: string,
+    urlAfterRedirects: string,
+    state: RouterStateSnapshot,
+    shouldActivate: boolean);
     toString(): string;
 }
 
@@ -142,10 +142,10 @@ export declare class GuardsCheckStart extends RouterEvent {
     state: RouterStateSnapshot;
     urlAfterRedirects: string;
     constructor(
-        id: number,
-        url: string,
-        urlAfterRedirects: string,
-        state: RouterStateSnapshot);
+    id: number,
+    url: string,
+    urlAfterRedirects: string,
+    state: RouterStateSnapshot);
     toString(): string;
 }
 
@@ -156,27 +156,27 @@ export declare type LoadChildrenCallback = () => Type<any> | NgModuleFactory<any
 export declare class NavigationCancel extends RouterEvent {
     reason: string;
     constructor(
-        id: number,
-        url: string,
-        reason: string);
+    id: number,
+    url: string,
+    reason: string);
     toString(): string;
 }
 
 export declare class NavigationEnd extends RouterEvent {
     urlAfterRedirects: string;
     constructor(
-        id: number,
-        url: string,
-        urlAfterRedirects: string);
+    id: number,
+    url: string,
+    urlAfterRedirects: string);
     toString(): string;
 }
 
 export declare class NavigationError extends RouterEvent {
     error: any;
     constructor(
-        id: number,
-        url: string,
-        error: any);
+    id: number,
+    url: string,
+    error: any);
     toString(): string;
 }
 
@@ -197,10 +197,10 @@ export declare class NavigationStart extends RouterEvent {
         navigationId: number;
     } | null;
     constructor(
-        id: number,
-        url: string,
-        navigationTrigger?: 'imperative' | 'popstate' | 'hashchange',
-        restoredState?: {
+    id: number,
+    url: string,
+    navigationTrigger?: 'imperative' | 'popstate' | 'hashchange',
+    restoredState?: {
         navigationId: number;
     } | null);
     toString(): string;
@@ -257,10 +257,10 @@ export declare class ResolveEnd extends RouterEvent {
     state: RouterStateSnapshot;
     urlAfterRedirects: string;
     constructor(
-        id: number,
-        url: string,
-        urlAfterRedirects: string,
-        state: RouterStateSnapshot);
+    id: number,
+    url: string,
+    urlAfterRedirects: string,
+    state: RouterStateSnapshot);
     toString(): string;
 }
 
@@ -269,10 +269,10 @@ export declare class ResolveStart extends RouterEvent {
     state: RouterStateSnapshot;
     urlAfterRedirects: string;
     constructor(
-        id: number,
-        url: string,
-        urlAfterRedirects: string,
-        state: RouterStateSnapshot);
+    id: number,
+    url: string,
+    urlAfterRedirects: string,
+    state: RouterStateSnapshot);
     toString(): string;
 }
 
@@ -298,7 +298,7 @@ export interface Route {
 export declare class RouteConfigLoadEnd {
     route: Route;
     constructor(
-        route: Route);
+    route: Route);
     toString(): string;
 }
 
@@ -306,7 +306,7 @@ export declare class RouteConfigLoadEnd {
 export declare class RouteConfigLoadStart {
     route: Route;
     constructor(
-        route: Route);
+    route: Route);
     toString(): string;
 }
 
@@ -354,8 +354,8 @@ export declare class RouterEvent {
     id: number;
     url: string;
     constructor(
-        id: number,
-        url: string);
+    id: number,
+    url: string);
 }
 
 export declare class RouterLink {
@@ -417,9 +417,7 @@ export declare class RouterModule {
 export declare class RouterOutlet implements OnDestroy, OnInit {
     activateEvents: EventEmitter<any>;
     readonly activatedRoute: ActivatedRoute;
-    readonly activatedRouteData: {
-        [name: string]: any;
-    };
+    readonly activatedRouteData: Data;
     readonly component: Object;
     deactivateEvents: EventEmitter<any>;
     readonly isActivated: boolean;
@@ -458,10 +456,10 @@ export declare class RoutesRecognized extends RouterEvent {
     state: RouterStateSnapshot;
     urlAfterRedirects: string;
     constructor(
-        id: number,
-        url: string,
-        urlAfterRedirects: string,
-        state: RouterStateSnapshot);
+    id: number,
+    url: string,
+    urlAfterRedirects: string,
+    state: RouterStateSnapshot);
     toString(): string;
 }
 
@@ -473,9 +471,9 @@ export declare class Scroll {
     readonly position: [number, number] | null;
     readonly routerEvent: NavigationEnd;
     constructor(
-        routerEvent: NavigationEnd,
-        position: [number, number] | null,
-        anchor: string | null);
+    routerEvent: NavigationEnd,
+    position: [number, number] | null,
+    anchor: string | null);
     toString(): string;
 }
 
@@ -504,8 +502,8 @@ export declare class UrlSegment {
     };
     path: string;
     constructor(
-        path: string,
-        parameters: {
+    path: string,
+    parameters: {
         [name: string]: string;
     });
     toString(): string;
@@ -519,8 +517,8 @@ export declare class UrlSegmentGroup {
     parent: UrlSegmentGroup | null;
     segments: UrlSegment[];
     constructor(
-        segments: UrlSegment[],
-        children: {
+    segments: UrlSegment[],
+    children: {
         [key: string]: UrlSegmentGroup;
     });
     hasChildren(): boolean;
diff --git a/tools/public_api_guard/upgrade/static.d.ts b/tools/public_api_guard/upgrade/static.d.ts
index 435cfbd851..3cfdbc7d07 100644
--- a/tools/public_api_guard/upgrade/static.d.ts
+++ b/tools/public_api_guard/upgrade/static.d.ts
@@ -38,8 +38,8 @@ export declare class UpgradeModule {
     injector: Injector;
     ngZone: NgZone;
     constructor(
-        injector: Injector,
-        ngZone: NgZone);
+    injector: Injector,
+    ngZone: NgZone);
     bootstrap(element: Element, modules?: string[], config?: any): void;
 }
 
diff --git a/tools/tsc-watch/index.ts b/tools/tsc-watch/index.ts
index a9d2befd1e..26080d13ab 100644
--- a/tools/tsc-watch/index.ts
+++ b/tools/tsc-watch/index.ts
@@ -32,8 +32,11 @@ const runMode: string = process.argv.length >= 4 ? process.argv[3] : null;
 const debugMode = process.argv.some(arg => arg === '--debug');
 const BaseConfig = {
   start: 'File change detected. Starting incremental compilation...',
-  error: 'error',
-  complete: 'Compilation complete. Watching for file changes.'
+  // This regex uses a negative lookbehind group (?<! 0 ), which causes it to not match a string
+  // containing " 0 error" but to match anything else containing "error". It requires the --harmony
+  // flag to run under node versions < 9.
+  error: /(?<! 0 )error/,
+  complete: 'Found 0 errors. Watching for file changes.',
 };
 
 if (platform == 'node') {
diff --git a/yarn.lock b/yarn.lock
index 47f5573040..36ff64d652 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3264,6 +3264,12 @@ jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
 
+jasmine-diff@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
+  dependencies:
+    diff "^3.2.0"
+
 jasmine@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.4.1.tgz#9016dda453213d27ac6d43dc4ea97315a189085e"
@@ -5907,10 +5913,11 @@ trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
-tsickle@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
+tsickle@0.32:
+  version "0.32.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.0.tgz#8027eecf5872b4451ffae821a5fdbd0b3206c139"
   dependencies:
+    jasmine-diff "^0.1.3"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
@@ -6010,9 +6017,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@2.8.x:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
+typescript@2.9.x:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
 
 typescript@~2.6.2:
   version "2.6.2"

From 7f3242affb26888b44ca5c8ca39fa7b8742186ef Mon Sep 17 00:00:00 2001
From: paulmojicatech <paulmojicatech@gmail.com>
Date: Fri, 8 Jun 2018 01:06:44 -0400
Subject: [PATCH 400/582] docs: fix documention for attributes directive
 (#24367)

fix:update documentation for attributes directive to fix error

PR Close #24367
---
 aio/content/guide/attribute-directives.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/attribute-directives.md b/aio/content/guide/attribute-directives.md
index f3ab4d5e54..6f5287627a 100644
--- a/aio/content/guide/attribute-directives.md
+++ b/aio/content/guide/attribute-directives.md
@@ -96,7 +96,7 @@ Now edit the generated `src/app/highlight.directive.ts` to look as follows:
 
 The `import` statement specifies an additional `ElementRef` symbol from the Angular `core` library:
 
-You use the `ElementRef`in the directive's constructor
+You use the `ElementRef` in the directive's constructor
 to [inject](guide/dependency-injection) a reference to the host DOM element, 
 the element to which you applied `appHighlight`.
 

From ffbacdf4aca1c7ae79c2aa12bec1509662e9fa23 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 26 Jun 2018 10:37:45 -0700
Subject: [PATCH 401/582] fix(ivy): export the true ComponentDef/DirectiveDef
 types (not internal) (#24703)

This was a bug introduced in a previous commit.

PR Close #24703
---
 packages/core/src/core_render3_private_export.ts | 4 ++--
 packages/core/src/render3/index.ts               | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index c312ee55cd..333e3ab300 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -83,8 +83,8 @@ export {
   st as ɵst,
   ld as ɵld,
   Pp as ɵPp,
-  ComponentDefInternal as ɵComponentDef,
-  DirectiveDefInternal as ɵDirectiveDef,
+  ComponentDef as ɵComponentDef,
+  DirectiveDef as ɵDirectiveDef,
   PipeDef as ɵPipeDef,
   whenRendered as ɵwhenRendered,
   iA as ɵiA,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 963a4cd424..ba81cc9b2a 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -12,7 +12,7 @@ import {InheritDefinitionFeature} from './features/inherit_definition_feature';
 import {NgOnChangesFeature} from './features/ng_onchanges_feature';
 import {PublicFeature} from './features/public_feature';
 import {I18nExpInstruction, I18nInstruction, i18nExpMapping, i18nInterpolation, i18nInterpolationV} from './i18n';
-import {ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
+import {ComponentDef, ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
 export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
@@ -130,11 +130,13 @@ export {
 // clang-format on
 
 export {
+  ComponentDef,
   ComponentDefInternal,
   ComponentTemplate,
   ComponentType,
-  DirectiveDefInternal,
+  DirectiveDef,
   DirectiveDefFlags,
+  DirectiveDefInternal,
   DirectiveType,
   NgOnChangesFeature,
   InheritDefinitionFeature,

From dbdcfed2bd7015665890f0718598beb1c873506e Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 26 Jun 2018 10:43:06 -0700
Subject: [PATCH 402/582] feat(ivy): support pipe compilation from local
 metadata (#24703)

This updates the r3_pipe_compiler to not depend on global analysis,
and to produce ngPipeDef instructions in the same way that the other
compilers do. It's a precursor to JIT and AOT implementations of
@Pipe compilation.

PR Close #24703
---
 packages/compiler/src/aot/compiler.ts         |  2 +-
 packages/compiler/src/compiler.ts             |  1 +
 .../compiler/src/render3/r3_identifiers.ts    |  2 +
 .../compiler/src/render3/r3_pipe_compiler.ts  | 73 +++++++++++++------
 .../compiler/test/render3/mock_compile.ts     |  4 +-
 .../render3/r3_compiler_compliance_spec.ts    |  2 +-
 packages/core/src/render3/definition.ts       |  6 +-
 .../core/src/render3/interfaces/definition.ts | 11 ++-
 packages/core/src/render3/interfaces/view.ts  |  4 +-
 packages/core/src/render3/pipe.ts             | 10 +--
 packages/core/test/render3/render_util.ts     |  6 +-
 11 files changed, 78 insertions(+), 43 deletions(-)

diff --git a/packages/compiler/src/aot/compiler.ts b/packages/compiler/src/aot/compiler.ts
index 45d80a6206..660c1eeb26 100644
--- a/packages/compiler/src/aot/compiler.ts
+++ b/packages/compiler/src/aot/compiler.ts
@@ -23,7 +23,7 @@ import {OutputEmitter} from '../output/abstract_emitter';
 import * as o from '../output/output_ast';
 import {ParseError} from '../parse_util';
 import {compileNgModuleFromRender2 as compileR3Module} from '../render3/r3_module_compiler';
-import {compilePipe as compileR3Pipe} from '../render3/r3_pipe_compiler';
+import {compilePipeFromRender2 as compileR3Pipe} from '../render3/r3_pipe_compiler';
 import {htmlAstToRender3Ast} from '../render3/r3_template_transform';
 import {compileComponentFromRender2 as compileR3Component, compileDirectiveFromRender2 as compileR3Directive} from '../render3/view/compiler';
 import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index 22ca91c682..98398f2716 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -84,6 +84,7 @@ export * from './render3/view/api';
 export {jitExpression} from './render3/r3_jit';
 export {R3DependencyMetadata, R3FactoryMetadata, R3ResolvedDependencyType} from './render3/r3_factory';
 export {compileInjector, compileNgModule, R3InjectorMetadata, R3NgModuleMetadata} from './render3/r3_module_compiler';
+export {compilePipeFromMetadata, R3PipeMetadata} from './render3/r3_pipe_compiler';
 export {makeBindingParser, parseTemplate} from './render3/view/template';
 export {compileComponentFromMetadata, compileDirectiveFromMetadata, parseHostBindings} from './render3/view/compiler';
 // This file only reexports content of the `src` folder. Keep it that way.
\ No newline at end of file
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 78dd3ca0a7..f5acfbca01 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -131,6 +131,8 @@ export class Identifiers {
 
   static defineNgModule: o.ExternalReference = {name: 'ɵdefineNgModule', moduleName: CORE};
 
+  static PipeDef: o.ExternalReference = {name: 'ɵPipeDef', moduleName: CORE};
+
   static definePipe: o.ExternalReference = {name: 'ɵdefinePipe', moduleName: CORE};
 
   static query: o.ExternalReference = {name: 'ɵQ', moduleName: CORE};
diff --git a/packages/compiler/src/render3/r3_pipe_compiler.ts b/packages/compiler/src/render3/r3_pipe_compiler.ts
index a7456b4e7a..4f534054e2 100644
--- a/packages/compiler/src/render3/r3_pipe_compiler.ts
+++ b/packages/compiler/src/render3/r3_pipe_compiler.ts
@@ -12,55 +12,84 @@ import {DefinitionKind} from '../constant_pool';
 import * as o from '../output/output_ast';
 import {OutputContext, error} from '../util';
 
-import {compileFactoryFunction, dependenciesFromGlobalMetadata} from './r3_factory';
+import {R3DependencyMetadata, compileFactoryFunction, dependenciesFromGlobalMetadata} from './r3_factory';
 import {Identifiers as R3} from './r3_identifiers';
 
+export interface R3PipeMetadata {
+  name: string;
+  type: o.Expression;
+  pipeName: string;
+  deps: R3DependencyMetadata[];
+  pure: boolean;
+}
 
-/**
- * Write a pipe definition to the output context.
- */
-export function compilePipe(
-    outputCtx: OutputContext, pipe: CompilePipeMetadata, reflector: CompileReflector) {
+export interface R3PipeDef {
+  expression: o.Expression;
+  type: o.Type;
+}
+
+export function compilePipeFromMetadata(metadata: R3PipeMetadata) {
   const definitionMapValues: {key: string, quoted: boolean, value: o.Expression}[] = [];
 
   // e.g. `name: 'myPipe'`
-  definitionMapValues.push({key: 'name', value: o.literal(pipe.name), quoted: false});
+  definitionMapValues.push({key: 'name', value: o.literal(metadata.pipeName), quoted: false});
 
   // e.g. `type: MyPipe`
-  definitionMapValues.push(
-      {key: 'type', value: outputCtx.importExpr(pipe.type.reference), quoted: false});
+  definitionMapValues.push({key: 'type', value: metadata.type, quoted: false});
 
-  // e.g. `factory: function MyPipe_Factory() { return new MyPipe(); }`
-  const deps = dependenciesFromGlobalMetadata(pipe.type, outputCtx, reflector);
   const templateFactory = compileFactoryFunction({
-    name: identifierName(pipe.type) !,
-    fnOrClass: outputCtx.importExpr(pipe.type.reference), deps,
+    name: metadata.name,
+    fnOrClass: metadata.type,
+    deps: metadata.deps,
     useNew: true,
     injectFn: R3.directiveInject,
   });
   definitionMapValues.push({key: 'factory', value: templateFactory, quoted: false});
 
   // e.g. `pure: true`
-  if (pipe.pure) {
-    definitionMapValues.push({key: 'pure', value: o.literal(true), quoted: false});
+  definitionMapValues.push({key: 'pure', value: o.literal(metadata.pure), quoted: false});
+
+  const expression = o.importExpr(R3.definePipe).callFn([o.literalMap(definitionMapValues)]);
+  const type = new o.ExpressionType(o.importExpr(R3.PipeDef, [
+    new o.ExpressionType(metadata.type),
+    new o.ExpressionType(new o.LiteralExpr(metadata.pipeName)),
+  ]));
+  return {expression, type};
+}
+
+/**
+ * Write a pipe definition to the output context.
+ */
+export function compilePipeFromRender2(
+    outputCtx: OutputContext, pipe: CompilePipeMetadata, reflector: CompileReflector) {
+  const definitionMapValues: {key: string, quoted: boolean, value: o.Expression}[] = [];
+
+  const name = identifierName(pipe.type);
+  if (!name) {
+    return error(`Cannot resolve the name of ${pipe.type}`);
   }
 
-  const className = identifierName(pipe.type) !;
-  className || error(`Cannot resolve the name of ${pipe.type}`);
+  const metadata: R3PipeMetadata = {
+    name,
+    pipeName: pipe.name,
+    type: outputCtx.importExpr(pipe.type.reference),
+    deps: dependenciesFromGlobalMetadata(pipe.type, outputCtx, reflector),
+    pure: pipe.pure,
+  };
+
+  const res = compilePipeFromMetadata(metadata);
 
   const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Pipe);
-  const definitionFunction =
-      o.importExpr(R3.definePipe).callFn([o.literalMap(definitionMapValues)]);
 
   outputCtx.statements.push(new o.ClassStmt(
-      /* name */ className,
+      /* name */ name,
       /* parent */ null,
       /* fields */[new o.ClassField(
           /* name */ definitionField,
           /* type */ o.INFERRED_TYPE,
           /* modifiers */[o.StmtModifier.Static],
-          /* initializer */ definitionFunction)],
+          /* initializer */ res.expression)],
       /* getters */[],
       /* constructorMethod */ new o.ClassMethod(null, [], []),
       /* methods */[]));
-}
\ No newline at end of file
+}
diff --git a/packages/compiler/test/render3/mock_compile.ts b/packages/compiler/test/render3/mock_compile.ts
index d7ec3bdad0..441a53c942 100644
--- a/packages/compiler/test/render3/mock_compile.ts
+++ b/packages/compiler/test/render3/mock_compile.ts
@@ -15,7 +15,7 @@ import {ConstantPool} from '../../src/constant_pool';
 import * as html from '../../src/ml_parser/ast';
 import {removeWhitespaces} from '../../src/ml_parser/html_whitespaces';
 import * as o from '../../src/output/output_ast';
-import {compilePipe} from '../../src/render3/r3_pipe_compiler';
+import {compilePipeFromRender2} from '../../src/render3/r3_pipe_compiler';
 import {htmlAstToRender3Ast} from '../../src/render3/r3_template_transform';
 import {compileComponentFromRender2, compileDirectiveFromRender2} from '../../src/render3/view/compiler';
 import {BindingParser} from '../../src/template_parser/binding_parser';
@@ -320,7 +320,7 @@ export function compile(
           } else if (resolver.isPipe(pipeOrDirective)) {
             const metadata = resolver.getPipeMetadata(pipeOrDirective);
             if (metadata) {
-              compilePipe(outputCtx, metadata, reflector);
+              compilePipeFromRender2(outputCtx, metadata, reflector);
             }
           }
         }
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index a7d9befbe6..332071aec4 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -1072,7 +1072,7 @@ describe('compiler compliance', () => {
       it('should render pipes', () => {
         const MyPipeDefinition = `
             static ngPipeDef = $r3$.ɵdefinePipe(
-                {name: 'myPipe', type: MyPipe, factory: function MyPipe_Factory() { return new MyPipe(); }});
+                {name: 'myPipe', type: MyPipe, factory: function MyPipe_Factory() { return new MyPipe(); }, pure: false});
         `;
 
         const MyPurePipeDefinition = `
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index 2cda88b570..bcdce3f532 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -16,7 +16,7 @@ import {Type} from '../type';
 import {resolveRendererType2} from '../view/util';
 
 import {diPublic} from './di';
-import {ComponentDefFeature, ComponentDefInternal, ComponentQuery, ComponentTemplate, ComponentType, DirectiveDefFeature, DirectiveDefInternal, DirectiveDefListOrFactory, DirectiveType, DirectiveTypesOrFactory, PipeDef, PipeType, PipeTypesOrFactory} from './interfaces/definition';
+import {ComponentDefFeature, ComponentDefInternal, ComponentQuery, ComponentTemplate, ComponentType, DirectiveDefFeature, DirectiveDefInternal, DirectiveDefListOrFactory, DirectiveType, DirectiveTypesOrFactory, PipeDefInternal, PipeType, PipeTypesOrFactory} from './interfaces/definition';
 import {CssSelectorList, SelectorFlags} from './interfaces/projection';
 
 
@@ -255,7 +255,7 @@ export function extractDirectiveDef(type: DirectiveType<any>& ComponentType<any>
   return def;
 }
 
-export function extractPipeDef(type: PipeType<any>): PipeDef<any> {
+export function extractPipeDef(type: PipeType<any>): PipeDefInternal<any> {
   const def = type.ngPipeDef;
   if (ngDevMode && !def) {
     throw new Error(`'${type.name}' is not a 'PipeType'.`);
@@ -483,7 +483,7 @@ export function definePipe<T>(pipeDef: {
   /** Whether the pipe is pure. */
   pure?: boolean
 }): never {
-  return (<PipeDef<T>>{
+  return (<PipeDefInternal<T>>{
     name: pipeDef.name,
     factory: pipeDef.factory,
     pure: pipeDef.pure !== false,
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 8df6820645..232df396a9 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -226,13 +226,13 @@ export interface ComponentDef<T, Selector extends string> extends DirectiveDef<T
  *
  * See: {@link definePipe}
  */
-export interface PipeDef<T> {
+export interface PipeDef<T, S extends string> {
   /**
    * Pipe name.
    *
    * Used to resolve pipe in templates.
    */
-  name: string;
+  name: S;
 
   /**
    * Factory function used to create a new pipe instance.
@@ -251,6 +251,8 @@ export interface PipeDef<T> {
   onDestroy: (() => void)|null;
 }
 
+export type PipeDefInternal<T> = PipeDef<T, string>;
+
 export type DirectiveDefFeature = <T>(directiveDef: DirectiveDef<T, string>) => void;
 export type ComponentDefFeature = <T>(componentDef: ComponentDef<T, string>) => void;
 
@@ -276,12 +278,13 @@ export type DirectiveTypeList =
  */
 export type PipeDefListOrFactory = (() => PipeDefList) | PipeDefList;
 
-export type PipeDefList = PipeDef<any>[];
+export type PipeDefList = PipeDefInternal<any>[];
 
 export type PipeTypesOrFactory = (() => DirectiveTypeList) | DirectiveTypeList;
 
 export type PipeTypeList =
-    (PipeDef<any>| Type<any>/* Type as workaround for: Microsoft/TypeScript/issues/4881 */)[];
+    (PipeDefInternal<any>|
+     Type<any>/* Type as workaround for: Microsoft/TypeScript/issues/4881 */)[];
 
 
 // Note: This hack is necessary so we don't erroneously get a circular dependency
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 6a68e87f7e..1548b16dd8 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -10,7 +10,7 @@ import {Injector} from '../../di/injector';
 import {Sanitizer} from '../../sanitization/security';
 
 import {LContainer} from './container';
-import {ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefList, PipeDef, PipeDefList} from './definition';
+import {ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefList, PipeDefInternal, PipeDefList} from './definition';
 import {LContainerNode, LElementNode, LViewNode, TNode} from './node';
 import {LQueries} from './query';
 import {Renderer3} from './renderer';
@@ -456,7 +456,7 @@ export type HookData = (number | (() => void))[];
  * as its pipe instance in the data array. Any nodes that do not have static
  * data store a null value in tData to avoid a sparse array.
  */
-export type TData = (TNode | PipeDef<any>| null)[];
+export type TData = (TNode | PipeDefInternal<any>| null)[];
 
 /** Type for TView.currentMatches */
 export type CurrentMatchesList = [DirectiveDefInternal<any>, (string | number | null)];
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index 2bd2ef7cfe..d956528ede 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -9,7 +9,7 @@
 import {PipeTransform} from '../change_detection/pipe_transform';
 
 import {getTView, load, store} from './instructions';
-import {PipeDef, PipeDefList} from './interfaces/definition';
+import {PipeDefInternal, PipeDefList} from './interfaces/definition';
 import {HEADER_OFFSET} from './interfaces/view';
 import {pureFunction1, pureFunction2, pureFunction3, pureFunction4, pureFunctionV} from './pure_function';
 
@@ -22,7 +22,7 @@ import {pureFunction1, pureFunction2, pureFunction3, pureFunction4, pureFunction
  */
 export function pipe(index: number, pipeName: string): any {
   const tView = getTView();
-  let pipeDef: PipeDef<any>;
+  let pipeDef: PipeDefInternal<any>;
   const adjustedIndex = index + HEADER_OFFSET;
 
   if (tView.firstTemplatePass) {
@@ -33,7 +33,7 @@ export function pipe(index: number, pipeName: string): any {
        ])).push(adjustedIndex, pipeDef.onDestroy);
     }
   } else {
-    pipeDef = tView.data[adjustedIndex] as PipeDef<any>;
+    pipeDef = tView.data[adjustedIndex] as PipeDefInternal<any>;
   }
 
   const pipeInstance = pipeDef.factory();
@@ -49,7 +49,7 @@ export function pipe(index: number, pipeName: string): any {
  * @param registry Full list of available pipes
  * @returns Matching PipeDef
  */
-function getPipeDef(name: string, registry: PipeDefList | null): PipeDef<any> {
+function getPipeDef(name: string, registry: PipeDefList | null): PipeDefInternal<any> {
   if (registry) {
     for (let i = 0; i < registry.length; i++) {
       const pipeDef = registry[i];
@@ -151,5 +151,5 @@ export function pipeBindV(index: number, slotOffset: number, values: any[]): any
 }
 
 function isPure(index: number): boolean {
-  return (<PipeDef<any>>getTView().data[index + HEADER_OFFSET]).pure;
+  return (<PipeDefInternal<any>>getTView().data[index + HEADER_OFFSET]).pure;
 }
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 7ec49e6f32..dedd1ae988 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -13,7 +13,7 @@ import {CreateComponentOptions} from '../../src/render3/component';
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
 import {ComponentTemplate, ComponentType, DirectiveDefInternal, DirectiveType, PublicFeature, RenderFlags, defineComponent, defineDirective, renderComponent as _renderComponent, tick} from '../../src/render3/index';
 import {NG_HOST_SYMBOL, renderTemplate} from '../../src/render3/instructions';
-import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
+import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, PipeDefInternal, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {LElementNode} from '../../src/render3/interfaces/node';
 import {RElement, RText, Renderer3, RendererFactory3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {Sanitizer} from '../../src/sanitization/security';
@@ -183,10 +183,10 @@ function toDefs(
     mapFn: (type: Type<any>) => DirectiveDefInternal<any>): DirectiveDefList|null;
 function toDefs(
     types: PipeTypesOrFactory | undefined | null,
-    mapFn: (type: Type<any>) => PipeDef<any>): PipeDefList|null;
+    mapFn: (type: Type<any>) => PipeDefInternal<any>): PipeDefList|null;
 function toDefs(
     types: PipeTypesOrFactory | DirectiveTypesOrFactory | undefined | null,
-    mapFn: (type: Type<any>) => PipeDef<any>| DirectiveDefInternal<any>): any {
+    mapFn: (type: Type<any>) => PipeDefInternal<any>| DirectiveDefInternal<any>): any {
   if (!types) return null;
   if (typeof types == 'function') {
     types = types();

From 3d52174bf1cad9531b4d4985d3b5f7e326b3eb1f Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 26 Jun 2018 10:44:05 -0700
Subject: [PATCH 403/582] feat(ivy): JIT support for compilation of @Pipes
 (#24703)

Adds support for compiling @Pipe in JIT mode, along with tests
to verify that certain aspects of compilation are correct.

PR Close #24703
---
 packages/core/src/ivy_switch_legacy.ts        |  1 +
 packages/core/src/ivy_switch_on.ts            |  2 +
 packages/core/src/metadata/directives.ts      |  6 ++-
 packages/core/src/render3/jit/pipe.ts         | 40 +++++++++++++++++++
 packages/core/test/render3/ivy/jit_spec.ts    | 25 +++++++++++-
 .../core/test/render3/jit_environment_spec.ts |  1 +
 6 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 packages/core/src/render3/jit/pipe.ts

diff --git a/packages/core/src/ivy_switch_legacy.ts b/packages/core/src/ivy_switch_legacy.ts
index 0da653c104..3b50412715 100644
--- a/packages/core/src/ivy_switch_legacy.ts
+++ b/packages/core/src/ivy_switch_legacy.ts
@@ -11,3 +11,4 @@ export const R3_COMPILE_COMPONENT: ((type: any, meta: any) => void)|null = null;
 export const R3_COMPILE_DIRECTIVE: ((type: any, meta: any) => void)|null = null;
 export const R3_COMPILE_INJECTABLE: ((type: any, meta: any) => void)|null = null;
 export const R3_COMPILE_NGMODULE: ((type: any, meta: any) => void)|null = null;
+export const R3_COMPILE_PIPE: ((type: any, meta: any) => void)|null = null;
diff --git a/packages/core/src/ivy_switch_on.ts b/packages/core/src/ivy_switch_on.ts
index 8d29031c72..9c21b13a7b 100644
--- a/packages/core/src/ivy_switch_on.ts
+++ b/packages/core/src/ivy_switch_on.ts
@@ -9,9 +9,11 @@
 import {compileComponent, compileDirective} from './render3/jit/directive';
 import {compileInjectable} from './render3/jit/injectable';
 import {compileNgModule} from './render3/jit/module';
+import {compilePipe} from './render3/jit/pipe';
 
 export const ivyEnabled = true;
 export const R3_COMPILE_COMPONENT = compileComponent;
 export const R3_COMPILE_DIRECTIVE = compileDirective;
 export const R3_COMPILE_INJECTABLE = compileInjectable;
 export const R3_COMPILE_NGMODULE = compileNgModule;
+export const R3_COMPILE_PIPE = compilePipe;
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 4a5692cbb4..4c5a08f544 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy} from '../change_detection/constants';
 import {Provider} from '../di';
-import {R3_COMPILE_COMPONENT, R3_COMPILE_DIRECTIVE} from '../ivy_switch';
+import {R3_COMPILE_COMPONENT, R3_COMPILE_DIRECTIVE, R3_COMPILE_PIPE} from '../ivy_switch';
 import {Type} from '../type';
 import {TypeDecorator, makeDecorator, makePropDecorator} from '../util/decorators';
 import {ViewEncapsulation} from './view';
@@ -810,7 +810,9 @@ export interface Pipe {
  *
  * @Annotation
  */
-export const Pipe: PipeDecorator = makeDecorator('Pipe', (p: Pipe) => ({pure: true, ...p}));
+export const Pipe: PipeDecorator = makeDecorator(
+    'Pipe', (p: Pipe) => ({pure: true, ...p}), undefined, undefined,
+    (type: Type<any>, meta: Pipe) => (R3_COMPILE_PIPE || (() => {}))(type, meta));
 
 
 /**
diff --git a/packages/core/src/render3/jit/pipe.ts b/packages/core/src/render3/jit/pipe.ts
new file mode 100644
index 0000000000..57abcb9d55
--- /dev/null
+++ b/packages/core/src/render3/jit/pipe.ts
@@ -0,0 +1,40 @@
+/**
+ * @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 {Expression, WrappedNodeExpr, compilePipeFromMetadata, jitExpression} from '@angular/compiler';
+
+import {Pipe} from '../../metadata/directives';
+import {Type} from '../../type';
+import {stringify} from '../util';
+
+import {angularCoreEnv} from './environment';
+import {NG_PIPE_DEF} from './fields';
+import {reflectDependencies} from './util';
+
+export function compilePipe(type: Type<any>, meta: Pipe): void {
+  let def: any = null;
+  Object.defineProperty(type, NG_PIPE_DEF, {
+    get: () => {
+      if (def === null) {
+        const sourceMapUrl = `ng://${stringify(type)}/ngPipeDef.js`;
+
+        const name = type.name;
+        const res = compilePipeFromMetadata({
+          name,
+          type: new WrappedNodeExpr(type),
+          deps: reflectDependencies(type),
+          pipeName: meta.name,
+          pure: meta.pure !== undefined ? meta.pure : true,
+        });
+
+        def = jitExpression(res.expression, angularCoreEnv, sourceMapUrl);
+      }
+      return def;
+    }
+  });
+}
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index 919df879d8..3e16eea884 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -12,9 +12,9 @@ import {InjectorDef, defineInjectable} from '@angular/core/src/di/defs';
 import {Injectable} from '@angular/core/src/di/injectable';
 import {inject, setCurrentInjector} from '@angular/core/src/di/injector';
 import {ivyEnabled} from '@angular/core/src/ivy_switch';
-import {Component, HostBinding, HostListener} from '@angular/core/src/metadata/directives';
+import {Component, HostBinding, HostListener, Pipe} from '@angular/core/src/metadata/directives';
 import {NgModule, NgModuleDefInternal} from '@angular/core/src/metadata/ng_module';
-import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
+import {ComponentDefInternal, PipeDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 ivyEnabled && describe('render3 jit', () => {
   let injector: any;
@@ -212,6 +212,27 @@ ivyEnabled && describe('render3 jit', () => {
     expect(cmpDef.hostBindings).toBeDefined();
     expect(cmpDef.hostBindings !.length).toBe(2);
   });
+
+  it('should compile @Pipes without errors', () => {
+    @Pipe({name: 'test-pipe', pure: false})
+    class P {
+    }
+
+    const pipeDef = (P as any).ngPipeDef as PipeDefInternal<P>;
+    expect(pipeDef.name).toBe('test-pipe');
+    expect(pipeDef.pure).toBe(false, 'pipe should not be pure');
+    expect(pipeDef.factory() instanceof P)
+        .toBe(true, 'factory() should create an instance of the pipe');
+  });
+
+  it('should default @Pipe to pure: true', () => {
+    @Pipe({name: 'test-pipe'})
+    class P {
+    }
+
+    const pipeDef = (P as any).ngPipeDef as PipeDefInternal<P>;
+    expect(pipeDef.pure).toBe(true, 'pipe should be pure');
+  });
 });
 
 it('ensure at least one spec exists', () => {});
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
index 0927739564..ea7e22b898 100644
--- a/packages/core/test/render3/jit_environment_spec.ts
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -16,6 +16,7 @@ const INTERFACE_EXCEPTIONS = new Set<string>([
   'DirectiveDef',
   'InjectorDef',
   'NgModuleDef',
+  'ɵPipeDef',
 ]);
 
 describe('r3 jit environment', () => {

From b6af8700ce8b5413decbd9fe3422b786ba864d78 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 26 Jun 2018 10:44:22 -0700
Subject: [PATCH 404/582] feat(ivy): AOT support for compilation of @Pipes
 (#24703)

This commit adds support to ngtsc for compilation of the @Pipe
annotation, including support for pipes in @NgModule scopes.

PR Close #24703
---
 .../src/ngtsc/annotations/src/pipe.ts         | 60 ++++++++++++---
 .../ngtsc/annotations/src/selector_scope.ts   | 49 +++++++++++-
 packages/compiler-cli/src/ngtsc/program.ts    |  2 +-
 .../test/ngtsc/fake_core/index.ts             |  1 +
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 76 +++++++++++++++++++
 .../compiler/src/render3/view/template.ts     |  2 +-
 6 files changed, 175 insertions(+), 15 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
index 365d1ce33a..06a208291e 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
@@ -6,34 +6,76 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, ExpressionType, LiteralExpr, R3DependencyMetadata, R3InjectableMetadata, R3ResolvedDependencyType, WrappedNodeExpr, compileInjectable as compileIvyInjectable} from '@angular/compiler';
+import {LiteralExpr, R3PipeMetadata, WrappedNodeExpr, compilePipeFromMetadata} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Decorator, ReflectionHost} from '../../host';
+import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
-import {isAngularCore} from './util';
+import {SelectorScopeRegistry} from './selector_scope';
+import {getConstructorDependencies, isAngularCore} from './util';
 
-export class PipeDecoratorHandler implements DecoratorHandler<string> {
-  constructor(private reflector: ReflectionHost, private isCore: boolean) {}
+export class PipeDecoratorHandler implements DecoratorHandler<R3PipeMetadata> {
+  constructor(
+      private checker: ts.TypeChecker, private reflector: ReflectionHost,
+      private scopeRegistry: SelectorScopeRegistry, private isCore: boolean) {}
 
   detect(decorator: Decorator[]): Decorator|undefined {
     return decorator.find(
         decorator => decorator.name === 'Pipe' && (this.isCore || isAngularCore(decorator)));
   }
 
-  analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<string> {
+  analyze(clazz: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3PipeMetadata> {
+    if (clazz.name === undefined) {
+      throw new Error(`@Pipes must have names`);
+    }
+    const name = clazz.name.text;
+    const type = new WrappedNodeExpr(clazz.name);
+    if (decorator.args === null) {
+      throw new Error(`@Pipe must be called`);
+    }
+    const meta = decorator.args[0];
+    if (!ts.isObjectLiteralExpression(meta)) {
+      throw new Error(`Decorator argument must be literal.`);
+    }
+    const pipe = reflectObjectLiteral(meta);
+
+    if (!pipe.has('name')) {
+      throw new Error(`@Pipe decorator is missing name field`);
+    }
+    const pipeName = staticallyResolve(pipe.get('name') !, this.checker);
+    if (typeof pipeName !== 'string') {
+      throw new Error(`@Pipe.name must be a string`);
+    }
+    this.scopeRegistry.registerPipe(clazz, pipeName);
+
+    let pure = false;
+    if (pipe.has('pure')) {
+      const pureValue = staticallyResolve(pipe.get('pure') !, this.checker);
+      if (typeof pureValue !== 'boolean') {
+        throw new Error(`@Pipe.pure must be a boolean`);
+      }
+      pure = pureValue;
+    }
+
     return {
-      analysis: 'test',
+      analysis: {
+        name,
+        type,
+        pipeName,
+        deps: getConstructorDependencies(clazz, this.reflector, this.isCore), pure,
+      }
     };
   }
 
-  compile(node: ts.ClassDeclaration, analysis: string): CompileResult {
+  compile(node: ts.ClassDeclaration, analysis: R3PipeMetadata): CompileResult {
+    const res = compilePipeFromMetadata(analysis);
     return {
       name: 'ngPipeDef',
-      initializer: new LiteralExpr(null),
+      initializer: res.expression,
       statements: [],
-      type: new ExpressionType(new LiteralExpr(null)),
+      type: res.type,
     };
   }
 }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
index 0c067fb5f3..06778fbc10 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
@@ -118,7 +118,11 @@ export class SelectorScopeRegistry {
   /**
    * Register the name of a pipe with the registry.
    */
-  registerPipe(node: ts.Declaration, name: string): void { this._pipeToName.set(node, name); }
+  registerPipe(node: ts.Declaration, name: string): void {
+    node = ts.getOriginalNode(node) as ts.Declaration;
+
+    this._pipeToName.set(node, name);
+  }
 
   /**
    * Produce the compilation scope of a component, which is determined by the module that declares
@@ -153,10 +157,19 @@ export class SelectorScopeRegistry {
     // The initial value of ngModuleImportedFrom is 'null' which signifies that the NgModule
     // was not imported from a .d.ts source.
     this.lookupScopes(module !, /* ngModuleImportedFrom */ null).compilation.forEach(ref => {
-      const selector = this.lookupDirectiveSelector(ts.getOriginalNode(ref.node) as ts.Declaration);
+      const node = ts.getOriginalNode(ref.node) as ts.Declaration;
+
+      // Either the node represents a directive or a pipe. Look for both.
+      const selector = this.lookupDirectiveSelector(node);
       // Only directives/components with selectors get added to the scope.
       if (selector != null) {
         directives.set(selector, ref);
+        return;
+      }
+
+      const name = this.lookupPipeName(node);
+      if (name != null) {
+        pipes.set(name, ref);
       }
     });
 
@@ -238,8 +251,12 @@ export class SelectorScopeRegistry {
     }
   }
 
-  private lookupPipeName(node: ts.Declaration): string|undefined {
-    return this._pipeToName.get(node);
+  private lookupPipeName(node: ts.Declaration): string|null {
+    if (this._pipeToName.has(node)) {
+      return this._pipeToName.get(node) !;
+    } else {
+      return this._readNameFromCompiledClass(node);
+    }
   }
 
   /**
@@ -300,6 +317,30 @@ export class SelectorScopeRegistry {
     return type.literal.text;
   }
 
+  /**
+   * Get the selector from type metadata for a class with a precompiled ngComponentDef or
+   * ngDirectiveDef.
+   */
+  private _readNameFromCompiledClass(clazz: ts.Declaration): string|null {
+    const def = this.reflector.getMembersOfClass(clazz).find(
+        field => field.isStatic && field.name === 'ngPipeDef');
+    if (def === undefined) {
+      // No definition could be found.
+      return null;
+    } else if (
+        def.type === null || !ts.isTypeReferenceNode(def.type) ||
+        def.type.typeArguments === undefined || def.type.typeArguments.length !== 2) {
+      // The type metadata was the wrong shape.
+      return null;
+    }
+    const type = def.type.typeArguments[1];
+    if (!ts.isLiteralTypeNode(type) || !ts.isStringLiteral(type.literal)) {
+      // The type metadata was the wrong type.
+      return null;
+    }
+    return type.literal.text;
+  }
+
   /**
    * Process a `TypeNode` which is a tuple of references to other types, and return `Reference`s to
    * them.
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index c1990f974b..d2e5731ab3 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -154,7 +154,7 @@ export class NgtscProgram implements api.Program {
       new DirectiveDecoratorHandler(checker, this.reflector, scopeRegistry, this.isCore),
       new InjectableDecoratorHandler(this.reflector, this.isCore),
       new NgModuleDecoratorHandler(checker, this.reflector, scopeRegistry, this.isCore),
-      new PipeDecoratorHandler(this.reflector, this.isCore),
+      new PipeDecoratorHandler(checker, this.reflector, scopeRegistry, this.isCore),
     ];
 
     return new IvyCompilation(handlers, checker, this.reflector, this.coreImportsFrom);
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index a87052c3a1..beceb52459 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -20,6 +20,7 @@ export const Component = callableClassDecorator();
 export const Directive = callableClassDecorator();
 export const Injectable = callableClassDecorator();
 export const NgModule = callableClassDecorator();
+export const Pipe = callableClassDecorator();
 
 export const Inject = callableParamDecorator();
 export const Self = callableParamDecorator();
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index e280dd90b2..48e230e17e 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -243,4 +243,80 @@ describe('ngtsc behavioral tests', () => {
         .toContain('static ngModuleDef: i0.NgModuleDef<TestModule, [TestCmp], [OtherModule], []>');
     expect(dtsContents).toContain('static ngInjectorDef: i0.InjectorDef');
   });
+
+  it('should compile Pipes without errors', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Pipe} from '@angular/core';
+
+        @Pipe({
+          name: 'test-pipe',
+          pure: false,
+        })
+        export class TestPipe {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    const dtsContents = getContents('test.d.ts');
+
+    expect(jsContents)
+        .toContain(
+            'TestPipe.ngPipeDef = i0.ɵdefinePipe({ name: "test-pipe", type: TestPipe, ' +
+            'factory: function TestPipe_Factory() { return new TestPipe(); }, pure: false })');
+    expect(dtsContents).toContain('static ngPipeDef: i0.ɵPipeDef<TestPipe, \'test-pipe\'>;');
+  });
+
+  it('should compile Pipes with dependencies', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Pipe} from '@angular/core';
+
+        export class Dep {}
+
+        @Pipe({
+          name: 'test-pipe',
+          pure: false,
+        })
+        export class TestPipe {
+          constructor(dep: Dep) {}
+        }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain('return new TestPipe(i0.ɵdirectiveInject(Dep));');
+  });
+
+  it('should include @Pipes in @NgModule scopes', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Component, NgModule, Pipe} from '@angular/core';
+
+        @Pipe({name: 'test'})
+        export class TestPipe {}
+
+        @Component({selector: 'test-cmp', template: '{{value | test}}'})
+        export class TestCmp {}
+
+        @NgModule({declarations: [TestPipe, TestCmp]})
+        export class TestModule {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain('pipes: [TestPipe]');
+
+    const dtsContents = getContents('test.d.ts');
+    expect(dtsContents).toContain('i0.NgModuleDef<TestModule, [TestPipe,TestCmp], [], []>');
+  });
 });
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 2a2c92253b..e2b3bb064a 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -886,6 +886,6 @@ export function parseTemplate(
  */
 export function makeBindingParser(): BindingParser {
   return new BindingParser(
-      new Parser(new Lexer()), DEFAULT_INTERPOLATION_CONFIG, new DomElementSchemaRegistry(), [],
+      new Parser(new Lexer()), DEFAULT_INTERPOLATION_CONFIG, new DomElementSchemaRegistry(), null,
       []);
 }

From 8fe8b8fcff6e10563224b015b4dd75ea8b29b37b Mon Sep 17 00:00:00 2001
From: Rafael <rafaelsantana3095@gmail.com>
Date: Sat, 9 Sep 2017 18:51:16 -0300
Subject: [PATCH 405/582] docs: fix typos in 'Httpclient' docs (#19127)

PR Close #19127
---
 packages/common/http/src/client.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/common/http/src/client.ts b/packages/common/http/src/client.ts
index 0d26fc0461..bdcff69ce6 100644
--- a/packages/common/http/src/client.ts
+++ b/packages/common/http/src/client.ts
@@ -917,7 +917,7 @@ export class HttpClient {
   }): Observable<string>;
 
   /**
-   * Construct a GET request which interprets the body as an `ArrayBuffer` and returns the full event stream.
+   * Construct a HEAD request which interprets the body as an `ArrayBuffer` and returns the full event stream.
    *
    * @return an `Observable` of all `HttpEvent`s for the request, with a body type of `ArrayBuffer`.
    */
@@ -1151,7 +1151,7 @@ export class HttpClient {
   }): Observable<Blob>;
 
   /**
-   * Construct a OPTIONS request which interprets the body as text and returns it.
+   * Construct an OPTIONS request which interprets the body as text and returns it.
    *
    * @return an `Observable` of the body as a `string`.
    */
@@ -1598,7 +1598,7 @@ export class HttpClient {
   }): Observable<string>;
 
   /**
-   * Construct a PATCH request which interprets the body as an `ArrayBuffer` and returns the full event stream.
+   * Construct a POST request which interprets the body as an `ArrayBuffer` and returns the full event stream.
    *
    * @return an `Observable` of all `HttpEvent`s for the request, with a body type of `ArrayBuffer`.
    */

From b72dbc843faf8a39b829b0d0c9e63079d627c2ab Mon Sep 17 00:00:00 2001
From: Sarun Intaralawan <sarun.intaralawan@gmail.com>
Date: Mon, 5 Mar 2018 20:34:55 +0700
Subject: [PATCH 406/582] docs(router): add `paramsInheritanceStrategy`
 documentation (#22590)

PR Close #22590
---
 packages/router/src/router_module.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index b4a7eca8bd..22ed2210a3 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -152,6 +152,8 @@ export class RouterModule {
    * * `preloadingStrategy` configures a preloading strategy (see `PreloadAllModules`).
    * * `onSameUrlNavigation` configures how the router handles navigation to the current URL. See
    * `ExtraOptions` for more details.
+   * * `paramsInheritanceStrategy` defines how the router merges params, data and resolved data
+   * from parent to child routes.
    */
   static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders {
     return {

From 56a8533cf3a228bc63bdcb327c8287e8006f6a6e Mon Sep 17 00:00:00 2001
From: ampGular <ampgular@gmail.com>
Date: Sat, 12 May 2018 21:09:40 +0200
Subject: [PATCH 407/582] docs: add app.module to changed documents (#23876)

PR Close #23876
---
 aio/content/tutorial/toh-pt3.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aio/content/tutorial/toh-pt3.md b/aio/content/tutorial/toh-pt3.md
index 8ac0e7c366..ff53e9a032 100644
--- a/aio/content/tutorial/toh-pt3.md
+++ b/aio/content/tutorial/toh-pt3.md
@@ -142,6 +142,9 @@ Here are the code files discussed on this page and your app should look like thi
   <code-pane title="src/app/heroes/heroes.component.html" path="toh-pt3/src/app/heroes/heroes.component.html">
   </code-pane>
 
+  <code-pane title="src/app/app.module.ts" path="toh-pt3/src/app/app.module.ts">
+  </code-pane>
+
 </code-tabs>
 
 ## Summary

From b719905f9b19852d41a06cb08bbc959526589cc3 Mon Sep 17 00:00:00 2001
From: Kapunahele Wong <kapunahelewong@gmail.com>
Date: Wed, 23 May 2018 14:51:05 -0400
Subject: [PATCH 408/582] docs: clarify faqs about services (#24079)

PR Close #24079
---
 aio/content/guide/ngmodule-faq.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/aio/content/guide/ngmodule-faq.md b/aio/content/guide/ngmodule-faq.md
index 27e0a78de2..980a75a670 100644
--- a/aio/content/guide/ngmodule-faq.md
+++ b/aio/content/guide/ngmodule-faq.md
@@ -219,7 +219,7 @@ configure services in root and feature modules respectively.
 
 Angular doesn't recognize these names but Angular developers do.
 Follow this convention when you write similar modules with configurable service providers.
-<!--KW--I don't understand how Angular doesn't understand these methods...-->
+
 
 <hr/>
 
@@ -233,9 +233,8 @@ When you import an NgModule,
 Angular adds the module's service providers (the contents of its `providers` list)
 to the application root injector.
 
-This makes the provider visible to every class in the application that knows the provider's lookup token, or knows its name.
+This makes the provider visible to every class in the application that knows the provider's lookup token, or name.
 
-This is by design.
 Extensibility through NgModule imports is a primary goal of the NgModule system.
 Merging NgModule providers into the application injector
 makes it easy for a module library to enrich the entire application with new services.
@@ -247,6 +246,8 @@ If the `HeroModule` provides the `HeroService` and the root `AppModule` imports
 any class that knows the `HeroService` _type_ can inject that service,
 not just the classes declared in the `HeroModule`.
 
+To limit access to a service, consider lazy loading the NgModule that provides that service. See [How do I restrict service scope to a module?](guide/ngmodule-faq#service-scope) for more information.
+
 <hr/>
 
 {@a q-lazy-loaded-module-provider-visibility}
@@ -288,6 +289,7 @@ The `AppModule` always wins.
 
 <hr/>
 
+{@a service-scope}
 
 ## How do I restrict service scope to a module?
 
@@ -335,6 +337,8 @@ You can embed the child components in the top component's template.
 Alternatively, make the top component a routing host by giving it a `<router-outlet>`.
 Define child routes and let the router load module components into that outlet.
 
+Though you can limit access to a service by providing it in a lazy loaded module or providing it in a component, providing services in a component can lead to multiple instances of those services. Thus, the lazy loading is preferable.
+
 <hr/>
 
 {@a q-root-component-or-module}

From 568612349f0075d0658ddb867f6f9461c4b410aa Mon Sep 17 00:00:00 2001
From: Will <doggy.huang@gmail.com>
Date: Thu, 7 Jun 2018 02:14:04 +0800
Subject: [PATCH 409/582] docs(aio): added a link to Angular Zero online course
 (Traditional Chinese) (#24228)

PR Close #24228
---
 aio/content/marketing/resources.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index f867de5fb8..da1097e96d 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -612,6 +612,12 @@
             "title": "Ultimate Angular",
             "url": "https://ultimateangular.com/"
           },
+          "willh-angular-zero": {
+            "desc": "Online video course in Chinese for newbies who need to learning from the scratch in Chinese.  It's covering Angular, Angular CLI, TypeScript, VSCode, and some must known knowledge of Angular development.",
+            "rev": true,
+            "title": "Angular in Action: Start From Scratch (正體中文)",
+            "url": "https://www.udemy.com/angular-zero/?couponCode=ANGULAR.IO"
+          },
           "angular-firebase": {
             "desc": "Video lessons covering progressive web apps with Angular, Firebase, RxJS, and related APIs.",
             "rev": true,

From f974c48885f900a9cf394b14ac4a7a3970983f22 Mon Sep 17 00:00:00 2001
From: Sergej <sergej1995@gmail.com>
Date: Fri, 29 Jun 2018 08:38:39 +0200
Subject: [PATCH 410/582] docs: describe rounding behaviour of 'DecimalPipe'
 (#24303)

PR Close #24303
---
 packages/common/src/pipes/number_pipe.ts        | 17 ++++++++++++++++-
 .../examples/common/pipes/ts/number_pipe.ts     |  3 +++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/common/src/pipes/number_pipe.ts b/packages/common/src/pipes/number_pipe.ts
index f6d8a69d11..8ad02f59b9 100644
--- a/packages/common/src/pipes/number_pipe.ts
+++ b/packages/common/src/pipes/number_pipe.ts
@@ -19,7 +19,20 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  * formatted according to locale rules that determine group sizing and
  * separator, decimal-point character, and other locale-specific
  * configurations.
- *
+ * 
+ * If no parameters are specified, the function rounds off to the nearest value using this
+ * [rounding method](https://en.wikibooks.org/wiki/Arithmetic/Rounding).
+ * The behavior differs from that of the JavaScript ```Math.round()``` function.
+ * In the following case for example, the pipe rounds down where 
+ * ```Math.round()``` rounds up:
+ * 
+ * ```html
+ * -2.5 | number:'1.0-0'
+ * > -3
+ * Math.round(-2.5)
+ * > -2
+ * ```
+ * 
  * @see `formatNumber()`
  *
  * @usageNotes
@@ -27,6 +40,8 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  * into text strings, according to various format specifications,
  * where the caller's default locale is `en-US`.
  *
+ * ### Example
+ *
  * <code-example path="common/pipes/ts/number_pipe.ts" region='NumberPipe'></code-example>
  *
  *
diff --git a/packages/examples/common/pipes/ts/number_pipe.ts b/packages/examples/common/pipes/ts/number_pipe.ts
index b56c625864..40388a670d 100644
--- a/packages/examples/common/pipes/ts/number_pipe.ts
+++ b/packages/examples/common/pipes/ts/number_pipe.ts
@@ -38,6 +38,9 @@ registerLocaleData(localeFr);
 
     <!--output '003.14000'-->
     <p>pi (3.5-5): {{pi | number:'3.5-5'}}</p>
+
+    <!--output '-3' / unlike '-2' by Math.round()-->
+    <p>-2.5 (1.0-0): {{-2.5 | number:'1.0-0'}}</p>
   </div>`
 })
 export class NumberPipeComponent {

From 5fe1e74dd32d63b00aafaf367252c07a89f28018 Mon Sep 17 00:00:00 2001
From: riren <gizinska.anna@gmail.com>
Date: Thu, 14 Jun 2018 23:57:46 +0200
Subject: [PATCH 411/582] docs(common): fix in the documentation of PUT
 (#24528) PR Close #24528

---
 packages/common/http/src/client.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/http/src/client.ts b/packages/common/http/src/client.ts
index bdcff69ce6..5b604d5433 100644
--- a/packages/common/http/src/client.ts
+++ b/packages/common/http/src/client.ts
@@ -1974,8 +1974,8 @@ export class HttpClient {
 
   /**
    * Constructs an `Observable` which, when subscribed, will cause the configured
-   * POST request to be executed on the server. See the individual overloads for
-   * details of `post()`'s return type based on the provided options.
+   * PUT request to be executed on the server. See the individual overloads for
+   * details of `put()`'s return type based on the provided options.
    */
   put(url: string, body: any|null, options: {
     headers?: HttpHeaders | {[header: string]: string | string[]},

From 3e6a722ddbe8d3fabe8fdf09665d990595472ed4 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 22 Jun 2018 10:49:47 -0700
Subject: [PATCH 412/582] docs: add workspace and related cli terms (#24633)

PR Close #24633
---
 aio/content/guide/glossary.md | 72 ++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 10 deletions(-)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 0bf407fccc..7284498984 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -114,19 +114,23 @@ The following class types can be declared:
 
 A [decorator](guide/glossary#decorator) statement immediately before a field in a class definition that declares the type of that field. Some examples are `@Input` and `@Output`. 
 
+{@a cli}
+
 ## CLI
 
-The [Angular CLI](https://cli.angular.io/) is a command-line tool that can create a project, add files, and perform a variety of ongoing development tasks such as testing, bundling, and deployment.
+The [Angular CLI](https://cli.angular.io/) is a command-line tool for managing the Angular development cycle. Use it to create the initial filesystem scaffolding for a [workspace](guide/glossary#workspace) or [project](guide/glossary#project), and to run [schematics](guide/glossary#schematic) that add and modify code for initial generic versions of various elements. The tool supports all stages of the development cycle, including building, testing, bundling, and deployment.
 
-Learn more in the [Getting Started](guide/quickstart) guide. 
+* To begin using the CLI for a new project, see [Getting Started](guide/quickstart) guide.
+* To learn more about the full capabilities of the CLI, see the [Angular CLI documentation].(https://github.com/angular/angular-cli/wiki).
 
 {@a component}
 
 ## Component
 
-A class with the `@Component` [decorator](guide/glossary#decorator) that associates it with a companion [template](guide/glossary#template). 
+A class with the `@Component` [decorator](guide/glossary#decorator) that associates it with a companion [template](guide/glossary#template). Together, the component and template define a [view](guide/glossary#view).
 
-A component is a special type of [directive](guide/glossary#directive) that represents a [view](guide/glossary#view).The `@Component` decorator extends the `@Directive` decorator with template-oriented features. 
+A component is a special type of [directive](guide/glossary#directive).
+The `@Component` decorator extends the `@Directive` decorator with template-oriented features. 
 
 An Angular component class is responsible for exposing data and handling most of the view's display and user-interaction logic through [data binding](guide/glossary#data-binding).
 
@@ -208,7 +212,8 @@ See [Class decorator](guide/glossary#class-decorator), [Class field decorator](g
 
 A design pattern and mechanism for creating and delivering parts of an application (dependencies) to other parts of an application that require them.
 
-In Angular, dependencies are typically services, but can also be values, such as strings or functions. An [injector](guide/glossary#injector) for an app (created automatically during bootstrap) creates dependencies when needed, using a registered [provider](guide/glossary#provider) of the service or value. Different providers can provide different implementations of the same service. 
+In Angular, dependencies are typically services, but can also be values, such as strings or functions.
+An [injector](guide/glossary#injector) for an app (created automatically during bootstrap) instantiates dependencies when needed, using a configured [provider](guide/glossary#provider) of the service or value.
 
 Learn more in the [Dependency Injection](guide/dependency-injection) guide.
 
@@ -280,7 +285,7 @@ Compare [Custom element](guide/glossary#custom-element).
 
 ## Entry point
 
-A JavaScript ID that makes parts of an NPM package available for import by other code. 
+A JavaScript symbol that makes parts of an npm package available for import by other code. 
 The Angular [scoped packages](guide/glossary#scoped-package) each have an entry point named `index`.
 
 Within Angular, use [NgModules](guide/glossary#ngmodule) to achieve the same result.
@@ -310,7 +315,17 @@ Both a [service](guide/glossary#service) and a [component](guide/glossary#compon
 
 An object in the Angular [dependency-injection system](guide/glossary#dependency-injection)
 that can find a named dependency in its cache or create a dependency
-with a registered [provider](guide/glossary#provider). Injectors are created for NgModules automatically as part of the bootstrap process, and inherited through the component hierarchy.
+using a configured [provider](guide/glossary#provider). 
+Injectors are created for NgModules automatically as part of the bootstrap process
+and are inherited through the component hierarchy.
+
+* An injector provides a singleton instance of a dependency, and can inject this same instance in multiple components.
+
+* A hierarchy of injectors at the NgModule and component level can provide different instances of a dependency to their own components and child components.
+
+* You can configure injectors with different providers that can provide different implementations of the same dependency.
+
+Learn more about the injector hierarchy in the [Dependency Injection guide](guide/hierarchical-dependency-injection).
 
 
 ## Input
@@ -373,6 +388,17 @@ Lazy loading speeds up application load time by splitting the application into m
 For example, dependencies can be lazy-loaded as needed&emdash;as opposed to "eager-loaded" modules that are required by the root module, and are thus loaded on launch. 
 Similarly, the [router](guide/glossary#router) can load child views only when the parent view is activated, and you can build custom elements that can be loaded into an Angular app when needed.
 
+{@a library}
+
+## Library
+
+In Angular, a [project](guide/glossary#project) that provides functionality that can be included in other Angular apps. A library is not a complete Angular app, and it cannot run independently. 
+
+* Library developers can use the [CLI](guide/glossary#cli) to `generate` scaffolding for a new library in an existing [workspace](guide/glossary#workspace), and can publish a library as an `npm` package. 
+
+* App developers can use the [CLI](guide/glossary#cli) to `add` a published library for use with an app in the same [workspace](guide/glossary#workspace). 
+
+
 ## Lifecycle hook
 
 An interface that allows you to tap into the lifecycle of [directives](guide/glossary#directive) and [components](guide/glossary#component) as they are created, updated, and destroyed.
@@ -402,7 +428,7 @@ In general, a module collects a block of code dedicated to a single purpose. Ang
 
 In JavaScript (ECMAScript), each file is a module and all objects defined in the file belong to that module. Objects can exported, making them public, and public objects can be imported for use by other modules.
 
-Angular ships as a collection of JavaScript modules, or libraries. Each Angular library name begins with the `@angular` prefix. Install them with the NPM package manager and import parts of them with JavaScript `import` declarations.
+Angular ships as a collection of JavaScript modules, or libraries. Each Angular library name begins with the `@angular` prefix. Install them with the npm package manager and import parts of them with JavaScript `import` declarations.
 
 Compare the Angular [NgModule](guide/glossary#ngmodule).
 
@@ -470,8 +496,13 @@ To learn more, see the [pipes](guide/pipes) page.
 
 ## Polyfill
 
-An [NPM package](guide/npm-packages) that plugs gaps in a browser's JavaScript implementation. See the [Browser Support](guide/browser-support) guide for polyfills that support particular functionality for particular platforms. 
+An [npm package](guide/npm-packages) that plugs gaps in a browser's JavaScript implementation. See the [Browser Support](guide/browser-support) guide for polyfills that support particular functionality for particular platforms. 
 
+{@a project}
+
+## Project
+
+In Angular, a folder within a [workspace](guide/glossary#workspace) that contains one or more Angular apps or [libraries](guide/glossary#library). 
 
 ## Provider
 
@@ -531,9 +562,24 @@ For more information, see the [Routing & Navigation](guide/router) page.
 
 {@a S}
 
+{@a schematic}
+
+## Schematic
+
+A scaffolding library that defines how to generate or transform a programming project by creating, modifying, refactoring, or moving files and code. 
+
+The Angular [CLI](guide/glossary#cli) uses schematics to generate and modify [Angular projects](guide/glossary#project) and parts of projects.
+
+* Angular provides a set of schematics for use with the CLI. 
+For details, see [Angular CLI documentation].(https://github.com/angular/angular-cli/wiki).
+
+* Library developers can create schematics that enable the CLI to generate their published libraries.
+For more information, see https://www.npmjs.com/package/@angular-devkit/schematics. 
+
+
 ## Scoped package
 
-A way to group related NPM packages. 
+A way to group related npm packages. 
 NgModules are delivered within *scoped packages* whose names begin with the Angular *scope name* `@angular`. For example, `@angular/core`, `@angular/common`, `@angular/http`, and `@angular/router`.
 
 Import a scoped package in the same way that you import a normal package. 
@@ -677,6 +723,12 @@ The view hierarchy does not imply a component hierarchy. Views that are embedded
 
 See [Custom element](guide/glossary#custom-element)
 
+{@a workspace}
+
+## Workspace
+
+In Angular, a folder that contains a [project](guide/glossary#project).
+The [CLI](guide/glossary#cli) `new` command creates a workspace to contain apps and libraries, and other commands must be executed from within a workspace folder. 
 
 {@a X}
 

From d5a9396017b4abc4088ea7d0e1dd76a34d2e7274 Mon Sep 17 00:00:00 2001
From: Max Ivanov <omaxphp@yandex.ru>
Date: Fri, 29 Jun 2018 13:58:01 +0300
Subject: [PATCH 413/582] docs(changelog): correct inaccuracies (#24713) PR
 Close #24713

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 268280b51b..3389c97134 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 <a name="6.1.0-beta.3"></a>
 # [6.1.0-beta.3](https://github.com/angular/angular/compare/6.1.0-beta.2...6.1.0-beta.3) (2018-06-28)
 
+### Bug Fixes
+
+* **animations:** set animations styles properly on platform-server ([#24624](https://github.com/angular/angular/issues/24624)) ([0b356d4](https://github.com/angular/angular/commit/0b356d4))
+* **common:** use correct ICU plural for locale mk ([#24659](https://github.com/angular/angular/issues/24659)) ([64a8584](https://github.com/angular/angular/commit/64a8584))
 
 <a name="6.0.7"></a>
 ## [6.0.7](https://github.com/angular/angular/compare/6.0.6...6.0.7) (2018-06-27)
@@ -77,7 +81,7 @@
 
 
 <a name="6.1.0-beta.0"></a>
-## [6.1.0-beta.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0-beta.0) (2018-06-06)
+# [6.1.0-beta.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0-beta.0) (2018-06-06)
 
 
 ### Bug Fixes

From fddd2af4fc2e1450185033a31bdb7cb91434d9fd Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 3 Jul 2018 23:24:31 +0200
Subject: [PATCH 414/582] test: integration test for TS 2.9.x (#24749)

PR Close #24749
---
 integration/typings_test_ts29/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/typings_test_ts29/package.json b/integration/typings_test_ts29/package.json
index 10a38622bd..3b1a092dc9 100644
--- a/integration/typings_test_ts29/package.json
+++ b/integration/typings_test_ts29/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-integration",
-  "description": "Assert that users with TypeScript 2.8 can type-check an Angular application",
+  "description": "Assert that users with TypeScript 2.9 can type-check an Angular application",
   "version": "0.0.0",
   "license": "MIT",
   "dependencies": {
@@ -22,7 +22,7 @@
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",
-    "typescript": "2.8.x",
+    "typescript": "2.9.x",
     "zone.js": "file:../../node_modules/zone.js"
   },
   "scripts": {

From f62876bbcb45200f729ff6336dbe5aefe535f296 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Wed, 4 Jul 2018 01:13:54 +0200
Subject: [PATCH 415/582] fix(ivy): pipes are pure by default (#24750)

PR Close #24750
---
 .../src/ngtsc/annotations/src/pipe.ts         |  2 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
index 06a208291e..c3da6204eb 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
@@ -50,7 +50,7 @@ export class PipeDecoratorHandler implements DecoratorHandler<R3PipeMetadata> {
     }
     this.scopeRegistry.registerPipe(clazz, pipeName);
 
-    let pure = false;
+    let pure = true;
     if (pipe.has('pure')) {
       const pureValue = staticallyResolve(pipe.get('pure') !, this.checker);
       if (typeof pureValue !== 'boolean') {
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 48e230e17e..1ea38268bc 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -270,6 +270,31 @@ describe('ngtsc behavioral tests', () => {
     expect(dtsContents).toContain('static ngPipeDef: i0.ɵPipeDef<TestPipe, \'test-pipe\'>;');
   });
 
+  it('should compile pure Pipes without errors', () => {
+    writeConfig();
+    write('test.ts', `
+        import {Pipe} from '@angular/core';
+
+        @Pipe({
+          name: 'test-pipe',
+        })
+        export class TestPipe {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    const dtsContents = getContents('test.d.ts');
+
+    expect(jsContents)
+        .toContain(
+            'TestPipe.ngPipeDef = i0.ɵdefinePipe({ name: "test-pipe", type: TestPipe, ' +
+            'factory: function TestPipe_Factory() { return new TestPipe(); }, pure: true })');
+    expect(dtsContents).toContain('static ngPipeDef: i0.ɵPipeDef<TestPipe, \'test-pipe\'>;');
+  });
+
   it('should compile Pipes with dependencies', () => {
     writeConfig();
     write('test.ts', `

From 1e74ea9e6018437323e000627b453bbe8753baf3 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 4 Jul 2018 09:37:51 -0700
Subject: [PATCH 416/582] build(bazel): update to rule_nodejs 0.10.0 (#24759)

PR Close #24759
---
 WORKSPACE                                     |  6 ++--
 .../hello_world_r2/bundle.golden_symbols.json | 31 +++++++++----------
 .../injection/bundle.golden_symbols.json      |  6 ++--
 tools/symbol-extractor/index.bzl              |  1 +
 tools/ts-api-guardian/index.bzl               |  1 +
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index be1785a0ea..87bfdb923a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -6,9 +6,9 @@ workspace(name = "angular")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
-    strip_prefix = "rules_nodejs-0.9.1",
-    sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.10.0.zip",
+    strip_prefix = "rules_nodejs-0.10.0",
+    sha256 = "2f77623311da8b5009b1c7eade12de8e15fa3cd2adf9dfcc9f87cb2082b2211f",
 )
 
 http_archive(
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index 84573d89a0..ce849e0a5f 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -1238,9 +1238,6 @@
   {
     "name": "Quote"
   },
-  {
-    "name": "R3_COMPILE_INJECTABLE"
-  },
   {
     "name": "ReadKeyExpr"
   },
@@ -1257,10 +1254,10 @@
     "name": "RecursiveAstVisitor"
   },
   {
-    "name": "RefCountOperator$1"
+    "name": "RefCountOperator"
   },
   {
-    "name": "RefCountSubscriber$1"
+    "name": "RefCountSubscriber"
   },
   {
     "name": "ReferenceAst"
@@ -1916,21 +1913,9 @@
   {
     "name": "__extends$2"
   },
-  {
-    "name": "__extends$26"
-  },
-  {
-    "name": "__extends$28"
-  },
-  {
-    "name": "__extends$29"
-  },
   {
     "name": "__extends$3"
   },
-  {
-    "name": "__extends$30"
-  },
   {
     "name": "__extends$4"
   },
@@ -1943,6 +1928,18 @@
   {
     "name": "__extends$7"
   },
+  {
+    "name": "__extends$q"
+  },
+  {
+    "name": "__extends$r"
+  },
+  {
+    "name": "__extends$s"
+  },
+  {
+    "name": "__extends$u"
+  },
   {
     "name": "__read"
   },
diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
index 0d458e76e0..fa888017ba 100644
--- a/packages/core/test/bundling/injection/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -9,10 +9,10 @@
     "name": "EMPTY_ARRAY$1"
   },
   {
-    "name": "GET_PROPERTY_NAME$1"
+    "name": "GET_PROPERTY_NAME"
   },
   {
-    "name": "INJECTOR$1"
+    "name": "INJECTOR"
   },
   {
     "name": "Inject"
@@ -51,7 +51,7 @@
     "name": "THROW_IF_NOT_FOUND"
   },
   {
-    "name": "USE_VALUE$1"
+    "name": "USE_VALUE"
   },
   {
     "name": "_THROW_IF_NOT_FOUND"
diff --git a/tools/symbol-extractor/index.bzl b/tools/symbol-extractor/index.bzl
index fd96fbbc4d..54117dabba 100644
--- a/tools/symbol-extractor/index.bzl
+++ b/tools/symbol-extractor/index.bzl
@@ -15,6 +15,7 @@ def js_expected_symbol_test(name, src, golden, **kwargs):
   """
   all_data = [src, golden]
   all_data += [Label("//tools/symbol-extractor:lib")]
+  all_data += [Label("@bazel_tools//tools/bash/runfiles")]
   entry_point = "angular/tools/symbol-extractor/cli.js"
 
   nodejs_test(
diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl
index 702b210e5a..019eb022e5 100644
--- a/tools/ts-api-guardian/index.bzl
+++ b/tools/ts-api-guardian/index.bzl
@@ -24,6 +24,7 @@ def ts_api_guardian_test(name, golden, actual, data = [], **kwargs):
   data += [
       "//tools/ts-api-guardian:lib",
       "//tools/ts-api-guardian:bin/ts-api-guardian",
+      "@bazel_tools//tools/bash/runfiles",
   ]
 
   args = [

From 00c110b055e9b59abd77d3515befdef586cdcebf Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 24 Oct 2017 14:54:08 +0300
Subject: [PATCH 417/582] build: upgrade jasmine (and related typings) to
 latest version (#19904)

With these changes, the types are a little stricter now and also not
compatible with Protractor's jasmine-like syntax. So, we have to also
use `@types/jasminewd2` for e2e tests (but not for non-e2e tests).

I also had to "augment" `@types/jasminewd2`, because the latest
typings from [DefinitelyTyped][1] do not reflect the fact that the
`jasminewd2` version (v2.1.0) currently used by Protractor supports
passing a `done` callback to a spec.

[1]: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/566e0394859fdc1dc893658ccec6b06372d56a91/types/jasminewd2/index.d.ts#L9-L15

Fixes #23952
Closes #24733

PR Close #19904
---
 build.sh                                      |   4 +
 .../dynamic-compiler/e2e/tsconfig.json        |   5 +-
 integration/dynamic-compiler/package.json     |   3 +-
 modules/types.d.ts                            |   5 +-
 package.json                                  |   7 +-
 .../bazel/test/ngc-wrapped/test_support.ts    |   2 +-
 .../test/metric/user_metric_spec.ts           |  12 +-
 .../directives/ng_component_outlet_spec.ts    |   6 +-
 .../ngtools_src/feature2/feature2.module.ts   |   7 +-
 packages/compiler-cli/src/ngtools_api.ts      |   2 +-
 .../expression_diagnostics_spec.ts            |   4 +-
 .../test/metadata/collector_spec.ts           |  58 +++----
 packages/compiler-cli/test/ngc_spec.ts        |   2 +-
 .../test/transformers/node_emitter_spec.ts    |   4 +-
 .../test/transformers/program_spec.ts         |  15 +-
 packages/compiler/test/core_spec.ts           | 143 +++++++++---------
 .../test/css_parser/css_lexer_spec.ts         |   4 +-
 .../test/css_parser/css_visitor_spec.ts       |   7 +-
 .../test/i18n/extractor_merger_spec.ts        |   4 +-
 .../output/abstract_emitter_node_only_spec.ts |   7 +-
 .../testing/src/output/source_map_util.ts     |   2 +-
 .../source_map_integration_node_only_spec.ts  |   6 +
 .../system_ng_module_factory_loader_spec.ts   |   7 +-
 .../core/test/reflection/reflector_spec.ts    |   2 +-
 packages/core/test/render3/di_spec.ts         |  14 +-
 .../render3/ng_on_changes_feature_spec.ts     |   2 +-
 packages/core/test/render3/properties_spec.ts |  11 +-
 .../core/test/render3/pure_function_spec.ts   |  10 +-
 .../core/test/view/component_view_spec.ts     |   2 +-
 packages/core/test/view/element_spec.ts       |   4 +-
 packages/core/testing/src/testing_internal.ts |   2 +-
 .../e2e_test/testability_example_spec.ts      |   2 +-
 packages/examples/tsconfig-build.json         |  10 +-
 packages/examples/tsconfig.json               |  19 +++
 .../ts/full/e2e_test/static_full_spec.ts      |   2 +-
 .../static/ts/lite/e2e_test/e2e_util.ts       |   2 +-
 packages/forms/test/directives_spec.ts        |   4 +-
 .../forms/test/reactive_integration_spec.ts   |   6 +-
 .../forms/test/template_integration_spec.ts   |  10 +-
 .../test/value_accessor_integration_spec.ts   |   6 +-
 .../test/browser/transfer_state_spec.ts       |   6 +-
 .../test/testing_public_spec.ts               |   2 +-
 .../platform-browser/testing/src/matchers.ts  |   2 +-
 packages/router/src/url_tree.ts               |  18 +--
 packages/router/test/bootstrap.spec.ts        |   4 +-
 .../router/test/create_router_state.spec.ts   |   2 +-
 packages/router/test/recognize.spec.ts        |   2 +-
 packages/router/test/router.spec.ts           |  21 +--
 packages/router/test/router_state.spec.ts     |  20 +--
 .../test/spy_ng_module_factory_loader.spec.ts |   2 +-
 packages/service-worker/test/comm_spec.ts     |  16 +-
 packages/tsconfig.json                        |   7 +-
 packages/types.d.ts                           |   7 +-
 .../integration/downgrade_component_spec.ts   |   2 +-
 scripts/ci/build.sh                           |   1 +
 tools/public_api_guard/router/router.d.ts     |   4 +-
 tools/tsc-watch/index.ts                      |   5 +-
 tools/types-ext/jasminewd2.d.ts               |  28 ++++
 yarn.lock                                     |  42 ++---
 59 files changed, 332 insertions(+), 283 deletions(-)
 create mode 100644 packages/examples/tsconfig.json
 create mode 100644 tools/types-ext/jasminewd2.d.ts

diff --git a/build.sh b/build.sh
index 9690b0ddcd..269d6719b2 100755
--- a/build.sh
+++ b/build.sh
@@ -409,6 +409,10 @@ if [[ ${BUILD_ALL} == true && ${TYPECHECK_ALL} == true ]]; then
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
     $TSC -p ${TSCONFIG}
   travisFoldEnd "tsc -p ${TSCONFIG}"
+  TSCONFIG="packages/examples/tsconfig.json"
+  travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
+    $TSC -p ${TSCONFIG}
+  travisFoldEnd "tsc -p ${TSCONFIG}"
   TSCONFIG="modules/tsconfig.json"
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
     $TSC -p ${TSCONFIG}
diff --git a/integration/dynamic-compiler/e2e/tsconfig.json b/integration/dynamic-compiler/e2e/tsconfig.json
index 2badee6f7a..c560c74bad 100644
--- a/integration/dynamic-compiler/e2e/tsconfig.json
+++ b/integration/dynamic-compiler/e2e/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "compilerOptions": {
     "outDir": "../dist/e2e",
-    "types": ["jasmine"],
+    "types": [
+      "jasmine",
+      "jasminewd2"
+    ],
     "skipLibCheck": true
   }
 }
diff --git a/integration/dynamic-compiler/package.json b/integration/dynamic-compiler/package.json
index 24c178f7e0..71f48d5a38 100644
--- a/integration/dynamic-compiler/package.json
+++ b/integration/dynamic-compiler/package.json
@@ -18,8 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/jasmine": "file:../../node_modules/@types/jasmine",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@types/jasmine": "file:../../node_modules/@types/jasmine",
+    "@types/jasminewd2": "file:../../node_modules/@types/jasminewd2",
     "concurrently": "3.4.0",
     "lite-server": "2.2.2",
     "protractor": "file:../../node_modules/protractor",
diff --git a/modules/types.d.ts b/modules/types.d.ts
index 009398d12f..0dbf2fff2b 100644
--- a/modules/types.d.ts
+++ b/modules/types.d.ts
@@ -8,10 +8,11 @@
 
 // This file contains all ambient imports needed to compile the modules/ source code
 
-/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
 /// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
 /// <reference path="../node_modules/@types/jasmine/index.d.ts" />
+/// <reference path="../node_modules/@types/jasminewd2/index.d.ts" />
 /// <reference path="../node_modules/@types/node/index.d.ts" />
-/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
+/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
+/// <reference path="../tools/types-ext/jasminewd2.d.ts" />
 /// <reference path="./es6-subset.d.ts" />
 /// <reference path="./system.d.ts" />
diff --git a/package.json b/package.json
index a40c4f1e49..2d42212d1c 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,8 @@
     "@types/diff": "^3.2.2",
     "@types/fs-extra": "4.0.2",
     "@types/hammerjs": "2.0.35",
-    "@types/jasmine": "2.2.22-alpha",
+    "@types/jasmine": "^2.8.8",
+    "@types/jasminewd2": "^2.0.3",
     "@types/minimist": "^1.2.0",
     "@types/node": "6.0.88",
     "@types/selenium-webdriver": "3.0.7",
@@ -84,8 +85,8 @@
     "hammerjs": "2.0.8",
     "husky": "^0.14.3",
     "incremental-dom": "0.4.1",
-    "jasmine": "2.4.1",
-    "jasmine-core": "2.4.1",
+    "jasmine": "2.8",
+    "jasmine-core": "2.8",
     "jpm": "1.3.1",
     "karma": "0.13.20",
     "karma-browserstack-launcher": "0.1.9",
diff --git a/packages/bazel/test/ngc-wrapped/test_support.ts b/packages/bazel/test/ngc-wrapped/test_support.ts
index eec4cb8ee0..3e331f66d4 100644
--- a/packages/bazel/test/ngc-wrapped/test_support.ts
+++ b/packages/bazel/test/ngc-wrapped/test_support.ts
@@ -30,7 +30,7 @@ export interface TestSupport {
   writeFiles(...mockDirs: {[fileName: string]: string}[]): void;
   shouldExist(fileName: string): void;
   shouldNotExist(fileName: string): void;
-  runOneBuild(): void;
+  runOneBuild(): boolean;
 }
 
 export function setup(
diff --git a/packages/benchpress/test/metric/user_metric_spec.ts b/packages/benchpress/test/metric/user_metric_spec.ts
index 15e8a1b85f..0225154a58 100644
--- a/packages/benchpress/test/metric/user_metric_spec.ts
+++ b/packages/benchpress/test/metric/user_metric_spec.ts
@@ -48,13 +48,11 @@ import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} fr
            const metric = createMetric(
                [[]], new PerfLogFeatures(),
                {userMetrics: {'loadTime': 'time to load', 'content': 'time to see content'}});
-           metric.beginMeasure()
-               .then((_) => metric.endMeasure(true))
-               .then((values: {[key: string]: string}) => {
-                 expect(values['loadTime']).toBe(25);
-                 expect(values['content']).toBe(250);
-                 async.done();
-               });
+           metric.beginMeasure().then(() => metric.endMeasure(true)).then(values => {
+             expect(values['loadTime']).toBe(25);
+             expect(values['content']).toBe(250);
+             async.done();
+           });
 
            wdAdapter.data['loadTime'] = 25;
            // Wait before setting 2nd property.
diff --git a/packages/common/test/directives/ng_component_outlet_spec.ts b/packages/common/test/directives/ng_component_outlet_spec.ts
index 9a8acd16ce..39f0b3d317 100644
--- a/packages/common/test/directives/ng_component_outlet_spec.ts
+++ b/packages/common/test/directives/ng_component_outlet_spec.ts
@@ -166,12 +166,12 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
          fixture.componentInstance.currentComponent = Module2InjectedComponent;
          fixture.detectChanges();
 
-         const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'];
+         const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'] !;
          spyOn(moduleRef, 'destroy').and.callThrough();
 
-         expect(moduleRef !.destroy).not.toHaveBeenCalled();
+         expect(moduleRef.destroy).not.toHaveBeenCalled();
          fixture.destroy();
-         expect(moduleRef !.destroy).toHaveBeenCalled();
+         expect(moduleRef.destroy).toHaveBeenCalled();
        }));
 
     it('should not re-create moduleRef when it didn\'t actually change', async(() => {
diff --git a/packages/compiler-cli/integrationtest/ngtools_src/feature2/feature2.module.ts b/packages/compiler-cli/integrationtest/ngtools_src/feature2/feature2.module.ts
index 196bcba850..7e0c5f0a51 100644
--- a/packages/compiler-cli/integrationtest/ngtools_src/feature2/feature2.module.ts
+++ b/packages/compiler-cli/integrationtest/ngtools_src/feature2/feature2.module.ts
@@ -16,10 +16,9 @@ export class FeatureComponent {
 @NgModule({
   declarations: [FeatureComponent],
   imports: [RouterModule.forChild([
-    {path: '', component: FeatureComponent}, {path: 'd', loadChildren: './default.module'} {
-      path: 'e',
-      loadChildren: 'feature/feature.module#FeatureModule'
-    }
+    {path: '', component: FeatureComponent},
+    {path: 'd', loadChildren: './default.module'},
+    {path: 'e', loadChildren: 'feature/feature.module#FeatureModule'},
   ])]
 })
 export class Feature2Module {
diff --git a/packages/compiler-cli/src/ngtools_api.ts b/packages/compiler-cli/src/ngtools_api.ts
index d08f6a226e..665aed0e08 100644
--- a/packages/compiler-cli/src/ngtools_api.ts
+++ b/packages/compiler-cli/src/ngtools_api.ts
@@ -21,7 +21,7 @@
 
 import * as ts from 'typescript';
 
-import {CompilerHost, CompilerOptions, LazyRoute} from './transformers/api';
+import {CompilerOptions} from './transformers/api';
 import {getOriginalReferences} from './transformers/compiler_host';
 import {createProgram} from './transformers/entry_points';
 
diff --git a/packages/compiler-cli/test/diagnostics/expression_diagnostics_spec.ts b/packages/compiler-cli/test/diagnostics/expression_diagnostics_spec.ts
index 74b0574719..f3e4c304a2 100644
--- a/packages/compiler-cli/test/diagnostics/expression_diagnostics_spec.ts
+++ b/packages/compiler-cli/test/diagnostics/expression_diagnostics_spec.ts
@@ -76,7 +76,7 @@ describe('expression diagnostics', () => {
     }
   }
 
-  function reject(template: string, expected: string | RegExp) {
+  function reject(template: string, expected: string) {
     const info = getDiagnosticTemplateInfo(context, type, 'app/app.component.html', template);
     if (info) {
       const diagnostics = getTemplateExpressionDiagnostics(info);
@@ -240,4 +240,4 @@ const FILES: Directory = {
       `
     }
   }
-};
\ No newline at end of file
+};
diff --git a/packages/compiler-cli/test/metadata/collector_spec.ts b/packages/compiler-cli/test/metadata/collector_spec.ts
index e49149569d..138473d7f1 100644
--- a/packages/compiler-cli/test/metadata/collector_spec.ts
+++ b/packages/compiler-cli/test/metadata/collector_spec.ts
@@ -9,7 +9,7 @@
 import * as ts from 'typescript';
 
 import {MetadataCollector} from '../../src/metadata/collector';
-import {ClassMetadata, ConstructorMetadata, METADATA_VERSION, MetadataEntry, ModuleMetadata, isClassMetadata, isMetadataGlobalReferenceExpression} from '../../src/metadata/schema';
+import {ClassMetadata, ConstructorMetadata, METADATA_VERSION, MetadataEntry, MetadataMap, MetadataSymbolicExpression, ModuleMetadata, isClassMetadata, isMetadataGlobalReferenceExpression} from '../../src/metadata/schema';
 
 import {Directory, Host, expectValidSources} from './typescript.mocks';
 
@@ -269,9 +269,11 @@ describe('Collector', () => {
   it('should provide any reference for an any ctor parameter type', () => {
     const casesAny = <ClassMetadata>casesMetadata.metadata['CaseAny'];
     expect(casesAny).toBeTruthy();
-    const ctorData = casesAny.members !['__ctor__'];
-    expect(ctorData).toEqual(
-        [{__symbolic: 'constructor', parameters: [{__symbolic: 'reference', name: 'any'}]}]);
+    const ctorData = casesAny.members !['__ctor__'] as ConstructorMetadata[];
+    expect(ctorData).toEqual([{
+      __symbolic: 'constructor',
+      parameters: [{__symbolic: 'reference', name: 'any'} as MetadataSymbolicExpression]
+    }]);
   });
 
   it('should record annotations on set and get declarations', () => {
@@ -285,7 +287,8 @@ describe('Collector', () => {
           arguments: ['firstName']
         }]
       }]
-    });
+    } as any as MetadataMap);  // TODO: Review use of `any` here (#19904)
+
     const caseGetProp = <ClassMetadata>casesMetadata.metadata['GetProp'];
     expect(caseGetProp.members).toEqual(propertyData(11));
     const caseSetProp = <ClassMetadata>casesMetadata.metadata['SetProp'];
@@ -297,8 +300,7 @@ describe('Collector', () => {
   it('should record references to parameterized types', () => {
     const casesForIn = <ClassMetadata>casesMetadata.metadata['NgFor'];
     expect(casesForIn).toEqual({
-      __symbolic: 'class',
-      decorators: [{
+      __symbolic: 'class', decorators: [{
         __symbolic: 'call',
         expression: {
           __symbolic: 'reference',
@@ -308,17 +310,17 @@ describe('Collector', () => {
           character: 7
         }
       }],
-      members: {
-        __ctor__: [{
-          __symbolic: 'constructor',
-          parameters: [{
-            __symbolic: 'reference',
-            name: 'ClassReference',
-            arguments: [{__symbolic: 'reference', name: 'NgForRow'}]
-          }]
-        }]
-      }
-    });
+          members: {
+            __ctor__: [{
+              __symbolic: 'constructor',
+              parameters: [{
+                __symbolic: 'reference',
+                name: 'ClassReference',
+                arguments: [{__symbolic: 'reference', name: 'NgForRow'}]
+              }]
+            }]
+          }
+    } as any as ClassMetadata);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should report errors for destructured imports', () => {
@@ -358,9 +360,9 @@ describe('Collector', () => {
     const someClass = <ClassMetadata>metadata.metadata['SomeClass'];
     const ctor = <ConstructorMetadata>someClass.members !['__ctor__'][0];
     const parameters = ctor.parameters;
-    expect(parameters).toEqual([
-      {__symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29}
-    ]);
+    expect(parameters).toEqual([{
+      __symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29
+    } as MetadataSymbolicExpression]);
   });
 
   it('should record all exported classes', () => {
@@ -443,9 +445,9 @@ describe('Collector', () => {
     const someClass = <ClassMetadata>metadata.metadata['SomeClass'];
     const ctor = <ConstructorMetadata>someClass.members !['__ctor__'][0];
     const parameters = ctor.parameters;
-    expect(parameters).toEqual([
-      {__symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29}
-    ]);
+    expect(parameters).toEqual([{
+      __symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29
+    } as MetadataSymbolicExpression]);
   });
 
   it('should be able to collect the value of an enum', () => {
@@ -533,7 +535,7 @@ describe('Collector', () => {
           arguments: ['a']
         }
       }]
-    }]);
+    }] as any as MetadataSymbolicExpression[]);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should be able to collect a static field', () => {
@@ -576,7 +578,7 @@ describe('Collector', () => {
           }
         }]
       }]
-    }]);
+    }] as any as MetadataSymbolicExpression[]);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should be able to collect a method with a conditional expression', () => {
@@ -764,7 +766,7 @@ describe('Collector', () => {
         }]],
         parameters: [{__symbolic: 'reference', name: 'any'}]
       }]
-    });
+    } as any as MetadataMap);  // TODO: Review use of `any` here (#19904)
   });
 
   describe('with interpolations', () => {
@@ -868,7 +870,7 @@ describe('Collector', () => {
           {__symbolic: 'reference', module: './foo', name: 'Foo', line: 3, character: 24}
         ]
       }]
-    });
+    } as any as MetadataMap);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should treat exported class expressions as a class', () => {
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index f7264872e3..ca4d822aa0 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -1747,7 +1747,7 @@ describe('ngc transformer command-line', () => {
       const exitCode =
           main(['-p', path.join(basePath, 'src/tsconfig.json')], message => messages.push(message));
       expect(exitCode).toBe(1, 'Compile was expected to fail');
-      expect(messages[0]).toContain(['Tagged template expressions are not supported in metadata']);
+      expect(messages[0]).toContain('Tagged template expressions are not supported in metadata');
     });
 
     // Regression: #20076
diff --git a/packages/compiler-cli/test/transformers/node_emitter_spec.ts b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
index 6eddfd22d1..353a0c0a64 100644
--- a/packages/compiler-cli/test/transformers/node_emitter_spec.ts
+++ b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
@@ -502,7 +502,7 @@ describe('TypeScriptNodeEmitter', () => {
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 0,
-          name: null
+          name: null !  // TODO: Review use of `!` here (#19904)
         },
         {
           source: sourceUrl,
@@ -510,7 +510,7 @@ describe('TypeScriptNodeEmitter', () => {
           generatedColumn: 16,
           originalLine: 1,
           originalColumn: 26,
-          name: null
+          name: null !  // TODO: Review use of `!` here (#19904)
         }
       ]);
     });
diff --git a/packages/compiler-cli/test/transformers/program_spec.ts b/packages/compiler-cli/test/transformers/program_spec.ts
index 6fee0ea657..7a93043277 100644
--- a/packages/compiler-cli/test/transformers/program_spec.ts
+++ b/packages/compiler-cli/test/transformers/program_spec.ts
@@ -373,8 +373,8 @@ describe('ng program', () => {
         {rootNames: [path.resolve(testSupport.basePath, 'src/main.ts')], options, host});
     program.loadNgStructureAsync().then(() => {
       program.emit();
-      const factory =
-          fs.readFileSync(path.resolve(testSupport.basePath, 'built/src/main.ngfactory.js'));
+      const ngFactoryPath = path.resolve(testSupport.basePath, 'built/src/main.ngfactory.js');
+      const factory = fs.readFileSync(ngFactoryPath, 'utf8');
       expect(factory).toContain('Hello world!');
       done();
     });
@@ -677,8 +677,9 @@ describe('ng program', () => {
       program.listLazyRoutes();
       program.emit();
 
-      const lazyNgFactory =
-          fs.readFileSync(path.resolve(testSupport.basePath, 'built/src/lazy/lazy.ngfactory.js'));
+      const ngFactoryPath = path.resolve(testSupport.basePath, 'built/src/lazy/lazy.ngfactory.js');
+      const lazyNgFactory = fs.readFileSync(ngFactoryPath, 'utf8');
+
       expect(lazyNgFactory).toContain('import * as i1 from "./lazy";');
     });
 
@@ -735,8 +736,10 @@ describe('ng program', () => {
       expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([
         {
           module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')},
-          referencedModule:
-              {name: undefined, filePath: path.resolve(testSupport.basePath, 'src/child.ts')},
+          referencedModule: {
+            name: undefined as any as string,  // TODO: Review use of `any` here (#19904)
+            filePath: path.resolve(testSupport.basePath, 'src/child.ts')
+          },
           route: './child'
         },
       ]);
diff --git a/packages/compiler/test/core_spec.ts b/packages/compiler/test/core_spec.ts
index c28abf31d9..f5864584cc 100644
--- a/packages/compiler/test/core_spec.ts
+++ b/packages/compiler/test/core_spec.ts
@@ -103,83 +103,86 @@ import * as core from '@angular/core';
     });
 
     it('const enums should be equal', () => {
-      expect(compilerCore.NodeFlags.None).toBe(core.ɵNodeFlags.None);
-      expect(compilerCore.NodeFlags.TypeElement).toBe(core.ɵNodeFlags.TypeElement);
-      expect(compilerCore.NodeFlags.TypeText).toBe(core.ɵNodeFlags.TypeText);
-      expect(compilerCore.NodeFlags.ProjectedTemplate).toBe(core.ɵNodeFlags.ProjectedTemplate);
-      expect(compilerCore.NodeFlags.CatRenderNode).toBe(core.ɵNodeFlags.CatRenderNode);
-      expect(compilerCore.NodeFlags.TypeNgContent).toBe(core.ɵNodeFlags.TypeNgContent);
-      expect(compilerCore.NodeFlags.TypePipe).toBe(core.ɵNodeFlags.TypePipe);
-      expect(compilerCore.NodeFlags.TypePureArray).toBe(core.ɵNodeFlags.TypePureArray);
-      expect(compilerCore.NodeFlags.TypePureObject).toBe(core.ɵNodeFlags.TypePureObject);
-      expect(compilerCore.NodeFlags.TypePurePipe).toBe(core.ɵNodeFlags.TypePurePipe);
-      expect(compilerCore.NodeFlags.CatPureExpression).toBe(core.ɵNodeFlags.CatPureExpression);
-      expect(compilerCore.NodeFlags.TypeValueProvider).toBe(core.ɵNodeFlags.TypeValueProvider);
-      expect(compilerCore.NodeFlags.TypeClassProvider).toBe(core.ɵNodeFlags.TypeClassProvider);
-      expect(compilerCore.NodeFlags.TypeFactoryProvider).toBe(core.ɵNodeFlags.TypeFactoryProvider);
-      expect(compilerCore.NodeFlags.TypeUseExistingProvider)
-          .toBe(core.ɵNodeFlags.TypeUseExistingProvider);
-      expect(compilerCore.NodeFlags.LazyProvider).toBe(core.ɵNodeFlags.LazyProvider);
-      expect(compilerCore.NodeFlags.PrivateProvider).toBe(core.ɵNodeFlags.PrivateProvider);
-      expect(compilerCore.NodeFlags.TypeDirective).toBe(core.ɵNodeFlags.TypeDirective);
-      expect(compilerCore.NodeFlags.Component).toBe(core.ɵNodeFlags.Component);
-      expect(compilerCore.NodeFlags.CatProviderNoDirective)
-          .toBe(core.ɵNodeFlags.CatProviderNoDirective);
-      expect(compilerCore.NodeFlags.CatProvider).toBe(core.ɵNodeFlags.CatProvider);
-      expect(compilerCore.NodeFlags.OnInit).toBe(core.ɵNodeFlags.OnInit);
-      expect(compilerCore.NodeFlags.OnDestroy).toBe(core.ɵNodeFlags.OnDestroy);
-      expect(compilerCore.NodeFlags.DoCheck).toBe(core.ɵNodeFlags.DoCheck);
-      expect(compilerCore.NodeFlags.OnChanges).toBe(core.ɵNodeFlags.OnChanges);
-      expect(compilerCore.NodeFlags.AfterContentInit).toBe(core.ɵNodeFlags.AfterContentInit);
-      expect(compilerCore.NodeFlags.AfterContentChecked).toBe(core.ɵNodeFlags.AfterContentChecked);
-      expect(compilerCore.NodeFlags.AfterViewInit).toBe(core.ɵNodeFlags.AfterViewInit);
-      expect(compilerCore.NodeFlags.AfterViewChecked).toBe(core.ɵNodeFlags.AfterViewChecked);
-      expect(compilerCore.NodeFlags.EmbeddedViews).toBe(core.ɵNodeFlags.EmbeddedViews);
-      expect(compilerCore.NodeFlags.ComponentView).toBe(core.ɵNodeFlags.ComponentView);
-      expect(compilerCore.NodeFlags.TypeContentQuery).toBe(core.ɵNodeFlags.TypeContentQuery);
-      expect(compilerCore.NodeFlags.TypeViewQuery).toBe(core.ɵNodeFlags.TypeViewQuery);
-      expect(compilerCore.NodeFlags.StaticQuery).toBe(core.ɵNodeFlags.StaticQuery);
-      expect(compilerCore.NodeFlags.DynamicQuery).toBe(core.ɵNodeFlags.DynamicQuery);
-      expect(compilerCore.NodeFlags.CatQuery).toBe(core.ɵNodeFlags.CatQuery);
-      expect(compilerCore.NodeFlags.Types).toBe(core.ɵNodeFlags.Types);
+      const expectToBe = (val1: any, val2: any) => expect(val1).toBe(val2);
 
-      expect(compilerCore.DepFlags.None).toBe(core.ɵDepFlags.None);
-      expect(compilerCore.DepFlags.SkipSelf).toBe(core.ɵDepFlags.SkipSelf);
-      expect(compilerCore.DepFlags.Optional).toBe(core.ɵDepFlags.Optional);
-      expect(compilerCore.DepFlags.Value).toBe(core.ɵDepFlags.Value);
+      expectToBe(compilerCore.NodeFlags.None, core.ɵNodeFlags.None);
+      expectToBe(compilerCore.NodeFlags.TypeElement, core.ɵNodeFlags.TypeElement);
+      expectToBe(compilerCore.NodeFlags.TypeText, core.ɵNodeFlags.TypeText);
+      expectToBe(compilerCore.NodeFlags.ProjectedTemplate, core.ɵNodeFlags.ProjectedTemplate);
+      expectToBe(compilerCore.NodeFlags.CatRenderNode, core.ɵNodeFlags.CatRenderNode);
+      expectToBe(compilerCore.NodeFlags.TypeNgContent, core.ɵNodeFlags.TypeNgContent);
+      expectToBe(compilerCore.NodeFlags.TypePipe, core.ɵNodeFlags.TypePipe);
+      expectToBe(compilerCore.NodeFlags.TypePureArray, core.ɵNodeFlags.TypePureArray);
+      expectToBe(compilerCore.NodeFlags.TypePureObject, core.ɵNodeFlags.TypePureObject);
+      expectToBe(compilerCore.NodeFlags.TypePurePipe, core.ɵNodeFlags.TypePurePipe);
+      expectToBe(compilerCore.NodeFlags.CatPureExpression, core.ɵNodeFlags.CatPureExpression);
+      expectToBe(compilerCore.NodeFlags.TypeValueProvider, core.ɵNodeFlags.TypeValueProvider);
+      expectToBe(compilerCore.NodeFlags.TypeClassProvider, core.ɵNodeFlags.TypeClassProvider);
+      expectToBe(compilerCore.NodeFlags.TypeFactoryProvider, core.ɵNodeFlags.TypeFactoryProvider);
+      expectToBe(
+          compilerCore.NodeFlags.TypeUseExistingProvider, core.ɵNodeFlags.TypeUseExistingProvider);
+      expectToBe(compilerCore.NodeFlags.LazyProvider, core.ɵNodeFlags.LazyProvider);
+      expectToBe(compilerCore.NodeFlags.PrivateProvider, core.ɵNodeFlags.PrivateProvider);
+      expectToBe(compilerCore.NodeFlags.TypeDirective, core.ɵNodeFlags.TypeDirective);
+      expectToBe(compilerCore.NodeFlags.Component, core.ɵNodeFlags.Component);
+      expectToBe(
+          compilerCore.NodeFlags.CatProviderNoDirective, core.ɵNodeFlags.CatProviderNoDirective);
+      expectToBe(compilerCore.NodeFlags.CatProvider, core.ɵNodeFlags.CatProvider);
+      expectToBe(compilerCore.NodeFlags.OnInit, core.ɵNodeFlags.OnInit);
+      expectToBe(compilerCore.NodeFlags.OnDestroy, core.ɵNodeFlags.OnDestroy);
+      expectToBe(compilerCore.NodeFlags.DoCheck, core.ɵNodeFlags.DoCheck);
+      expectToBe(compilerCore.NodeFlags.OnChanges, core.ɵNodeFlags.OnChanges);
+      expectToBe(compilerCore.NodeFlags.AfterContentInit, core.ɵNodeFlags.AfterContentInit);
+      expectToBe(compilerCore.NodeFlags.AfterContentChecked, core.ɵNodeFlags.AfterContentChecked);
+      expectToBe(compilerCore.NodeFlags.AfterViewInit, core.ɵNodeFlags.AfterViewInit);
+      expectToBe(compilerCore.NodeFlags.AfterViewChecked, core.ɵNodeFlags.AfterViewChecked);
+      expectToBe(compilerCore.NodeFlags.EmbeddedViews, core.ɵNodeFlags.EmbeddedViews);
+      expectToBe(compilerCore.NodeFlags.ComponentView, core.ɵNodeFlags.ComponentView);
+      expectToBe(compilerCore.NodeFlags.TypeContentQuery, core.ɵNodeFlags.TypeContentQuery);
+      expectToBe(compilerCore.NodeFlags.TypeViewQuery, core.ɵNodeFlags.TypeViewQuery);
+      expectToBe(compilerCore.NodeFlags.StaticQuery, core.ɵNodeFlags.StaticQuery);
+      expectToBe(compilerCore.NodeFlags.DynamicQuery, core.ɵNodeFlags.DynamicQuery);
+      expectToBe(compilerCore.NodeFlags.CatQuery, core.ɵNodeFlags.CatQuery);
+      expectToBe(compilerCore.NodeFlags.Types, core.ɵNodeFlags.Types);
 
-      expect(compilerCore.InjectFlags.Default).toBe(core.InjectFlags.Default);
-      expect(compilerCore.InjectFlags.SkipSelf).toBe(core.InjectFlags.SkipSelf);
-      expect(compilerCore.InjectFlags.Self).toBe(core.InjectFlags.Self);
+      expectToBe(compilerCore.DepFlags.None, core.ɵDepFlags.None);
+      expectToBe(compilerCore.DepFlags.SkipSelf, core.ɵDepFlags.SkipSelf);
+      expectToBe(compilerCore.DepFlags.Optional, core.ɵDepFlags.Optional);
+      expectToBe(compilerCore.DepFlags.Value, core.ɵDepFlags.Value);
 
-      expect(compilerCore.ArgumentType.Inline).toBe(core.ɵArgumentType.Inline);
-      expect(compilerCore.ArgumentType.Dynamic).toBe(core.ɵArgumentType.Dynamic);
+      expectToBe(compilerCore.InjectFlags.Default, core.InjectFlags.Default);
+      expectToBe(compilerCore.InjectFlags.SkipSelf, core.InjectFlags.SkipSelf);
+      expectToBe(compilerCore.InjectFlags.Self, core.InjectFlags.Self);
 
-      expect(compilerCore.BindingFlags.TypeElementAttribute)
-          .toBe(core.ɵBindingFlags.TypeElementAttribute);
-      expect(compilerCore.BindingFlags.TypeElementClass).toBe(core.ɵBindingFlags.TypeElementClass);
-      expect(compilerCore.BindingFlags.TypeElementStyle).toBe(core.ɵBindingFlags.TypeElementStyle);
-      expect(compilerCore.BindingFlags.TypeProperty).toBe(core.ɵBindingFlags.TypeProperty);
-      expect(compilerCore.BindingFlags.SyntheticProperty)
-          .toBe(core.ɵBindingFlags.SyntheticProperty);
-      expect(compilerCore.BindingFlags.SyntheticHostProperty)
-          .toBe(core.ɵBindingFlags.SyntheticHostProperty);
-      expect(compilerCore.BindingFlags.CatSyntheticProperty)
-          .toBe(core.ɵBindingFlags.CatSyntheticProperty);
-      expect(compilerCore.BindingFlags.Types).toBe(core.ɵBindingFlags.Types);
 
-      expect(compilerCore.QueryBindingType.First).toBe(core.ɵQueryBindingType.First);
-      expect(compilerCore.QueryBindingType.All).toBe(core.ɵQueryBindingType.All);
+      expectToBe(compilerCore.ArgumentType.Inline, core.ɵArgumentType.Inline);
+      expectToBe(compilerCore.ArgumentType.Dynamic, core.ɵArgumentType.Dynamic);
 
-      expect(compilerCore.QueryValueType.ElementRef).toBe(core.ɵQueryValueType.ElementRef);
-      expect(compilerCore.QueryValueType.RenderElement).toBe(core.ɵQueryValueType.RenderElement);
-      expect(compilerCore.QueryValueType.TemplateRef).toBe(core.ɵQueryValueType.TemplateRef);
-      expect(compilerCore.QueryValueType.ViewContainerRef)
-          .toBe(core.ɵQueryValueType.ViewContainerRef);
-      expect(compilerCore.QueryValueType.Provider).toBe(core.ɵQueryValueType.Provider);
+      expectToBe(
+          compilerCore.BindingFlags.TypeElementAttribute, core.ɵBindingFlags.TypeElementAttribute);
+      expectToBe(compilerCore.BindingFlags.TypeElementClass, core.ɵBindingFlags.TypeElementClass);
+      expectToBe(compilerCore.BindingFlags.TypeElementStyle, core.ɵBindingFlags.TypeElementStyle);
+      expectToBe(compilerCore.BindingFlags.TypeProperty, core.ɵBindingFlags.TypeProperty);
+      expectToBe(compilerCore.BindingFlags.SyntheticProperty, core.ɵBindingFlags.SyntheticProperty);
+      expectToBe(
+          compilerCore.BindingFlags.SyntheticHostProperty,
+          core.ɵBindingFlags.SyntheticHostProperty);
+      expectToBe(
+          compilerCore.BindingFlags.CatSyntheticProperty, core.ɵBindingFlags.CatSyntheticProperty);
+      expectToBe(compilerCore.BindingFlags.Types, core.ɵBindingFlags.Types);
 
-      expect(compilerCore.ViewFlags.None).toBe(core.ɵViewFlags.None);
-      expect(compilerCore.ViewFlags.OnPush).toBe(core.ɵViewFlags.OnPush);
+      expectToBe(compilerCore.QueryBindingType.First, core.ɵQueryBindingType.First);
+      expectToBe(compilerCore.QueryBindingType.All, core.ɵQueryBindingType.All);
+
+      expectToBe(compilerCore.QueryValueType.ElementRef, core.ɵQueryValueType.ElementRef);
+      expectToBe(compilerCore.QueryValueType.RenderElement, core.ɵQueryValueType.RenderElement);
+      expectToBe(compilerCore.QueryValueType.TemplateRef, core.ɵQueryValueType.TemplateRef);
+      expectToBe(
+          compilerCore.QueryValueType.ViewContainerRef, core.ɵQueryValueType.ViewContainerRef);
+      expectToBe(compilerCore.QueryValueType.Provider, core.ɵQueryValueType.Provider);
+
+      expectToBe(compilerCore.ViewFlags.None, core.ɵViewFlags.None);
+      expectToBe(compilerCore.ViewFlags.OnPush, core.ɵViewFlags.OnPush);
     });
   });
 }
diff --git a/packages/compiler/test/css_parser/css_lexer_spec.ts b/packages/compiler/test/css_parser/css_lexer_spec.ts
index a5551fc195..64a44d6c64 100644
--- a/packages/compiler/test/css_parser/css_lexer_spec.ts
+++ b/packages/compiler/test/css_parser/css_lexer_spec.ts
@@ -274,7 +274,7 @@ import {CssLexer, CssLexerMode, CssToken, CssTokenType, cssScannerError, getRawM
       it('should throw an error if a selector is being parsed while in the wrong mode', () => {
         const cssCode = '.class > tag';
 
-        let capturedMessage: string = undefined !;
+        let capturedMessage: string|null = null;
         try {
           tokenize(cssCode, false, CssLexerMode.STYLE_BLOCK);
         } catch (e) {
@@ -282,8 +282,8 @@ import {CssLexer, CssLexerMode, CssToken, CssTokenType, cssScannerError, getRawM
         }
 
         expect(capturedMessage).toMatch(/Unexpected character \[\>\] at column 0:7 in expression/g);
-        capturedMessage = null !;
 
+        capturedMessage = null;
         try {
           tokenize(cssCode, false, CssLexerMode.SELECTOR);
         } catch (e) {
diff --git a/packages/compiler/test/css_parser/css_visitor_spec.ts b/packages/compiler/test/css_parser/css_visitor_spec.ts
index 7f617ab053..5a36459264 100644
--- a/packages/compiler/test/css_parser/css_visitor_spec.ts
+++ b/packages/compiler/test/css_parser/css_visitor_spec.ts
@@ -170,21 +170,22 @@ function _getCaptureAst(capture: any[], index = 0): CssAst {
       expect(captures.length).toEqual(3);
 
       const rule1 = <CssSelectorRuleAst>_getCaptureAst(captures, 0);
-      expect(rule1).toEqual(ast.rules[0]);
+      expect(rule1).toEqual(ast.rules[0] as CssSelectorRuleAst);
 
       const firstSelector = rule1.selectors[0];
       const firstSimpleSelector = firstSelector.selectorParts[0];
       _assertTokens(firstSimpleSelector.tokens, ['.', 'rule1']);
 
       const rule2 = <CssSelectorRuleAst>_getCaptureAst(captures, 1);
-      expect(rule2).toEqual(ast.rules[1]);
+      expect(rule2).toEqual(ast.rules[1] as CssSelectorRuleAst);
 
       const secondSelector = rule2.selectors[0];
       const secondSimpleSelector = secondSelector.selectorParts[0];
       _assertTokens(secondSimpleSelector.tokens, ['.', 'rule2']);
 
       const rule3 = <CssSelectorRuleAst>_getCaptureAst(captures, 2);
-      expect(rule3).toEqual((<CssMediaQueryRuleAst>ast.rules[2]).block.entries[0]);
+      expect(rule3).toEqual(
+          (ast.rules[2] as CssSelectorRuleAst).block.entries[0] as CssSelectorRuleAst);
 
       const thirdSelector = rule3.selectors[0];
       const thirdSimpleSelector = thirdSelector.selectorParts[0];
diff --git a/packages/compiler/test/i18n/extractor_merger_spec.ts b/packages/compiler/test/i18n/extractor_merger_spec.ts
index 5b1a05b8c0..55f8c45225 100644
--- a/packages/compiler/test/i18n/extractor_merger_spec.ts
+++ b/packages/compiler/test/i18n/extractor_merger_spec.ts
@@ -547,7 +547,7 @@ function fakeNoTranslate(
 
 function extract(
     html: string, implicitTags: string[] = [],
-    implicitAttrs: {[k: string]: string[]} = {}): [string[], string, string][] {
+    implicitAttrs: {[k: string]: string[]} = {}): [string[], string, string, string][] {
   const result =
       extractMessages(parseHtml(html), DEFAULT_INTERPOLATION_CONFIG, implicitTags, implicitAttrs);
 
@@ -558,7 +558,7 @@ function extract(
   // clang-format off
   // https://github.com/angular/clang-format/issues/35
   return result.messages.map(
-    message => [serializeI18nNodes(message.nodes), message.meaning, message.description, message.id]) as [string[], string, string][];
+    message => [serializeI18nNodes(message.nodes), message.meaning, message.description, message.id]) as [string[], string, string, string][];
   // clang-format on
 }
 
diff --git a/packages/compiler/test/output/abstract_emitter_node_only_spec.ts b/packages/compiler/test/output/abstract_emitter_node_only_spec.ts
index affabdad26..d70410d491 100644
--- a/packages/compiler/test/output/abstract_emitter_node_only_spec.ts
+++ b/packages/compiler/test/output/abstract_emitter_node_only_spec.ts
@@ -116,9 +116,10 @@ function expectMap(
   const sm = ctx.toSourceMapGenerator('o.ts').toJSON() !;
   const genPosition = {line: genLine + 1, column: genCol};
   const origPosition = originalPositionFor(sm, genPosition);
-  expect(origPosition.source).toEqual(source);
-  expect(origPosition.line).toEqual(srcLine === null ? null : srcLine + 1);
-  expect(origPosition.column).toEqual(srcCol);
+  // TODO: Review use of `any` here (#19904)
+  expect(origPosition.source as any).toEqual(source);
+  expect(origPosition.line as any).toEqual(srcLine === null ? null : srcLine + 1);
+  expect(origPosition.column as any).toEqual(srcCol);
 }
 
 // returns the number of segments per line
diff --git a/packages/compiler/testing/src/output/source_map_util.ts b/packages/compiler/testing/src/output/source_map_util.ts
index 24abecbb2a..6280d0393a 100644
--- a/packages/compiler/testing/src/output/source_map_util.ts
+++ b/packages/compiler/testing/src/output/source_map_util.ts
@@ -36,4 +36,4 @@ export function extractSourceMap(source: string): SourceMap|null {
 
 function decodeB64String(s: string): string {
   return b64.toByteArray(s).reduce((s: string, c: number) => s + String.fromCharCode(c), '');
-}
\ No newline at end of file
+}
diff --git a/packages/core/test/linker/source_map_integration_node_only_spec.ts b/packages/core/test/linker/source_map_integration_node_only_spec.ts
index acacc11bca..e4dbf091d4 100644
--- a/packages/core/test/linker/source_map_integration_node_only_spec.ts
+++ b/packages/core/test/linker/source_map_integration_node_only_spec.ts
@@ -20,7 +20,13 @@ import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing'
     let resourceLoader: MockResourceLoader;
 
     beforeEach(() => {
+      // Jasmine relies on methods on `Function.prototype`, so restore the prototype on the spy.
+      // Work around for: https://github.com/jasmine/jasmine/issues/1573
+      // TODO: Figure out a better way to retrieve the JIT sources, without spying on `Function`.
+      const originalProto = ɵglobal.Function.prototype;
       jitSpy = spyOn(ɵglobal, 'Function').and.callThrough();
+      ɵglobal.Function.prototype = originalProto;
+
       resourceLoader = new MockResourceLoader();
       TestBed.configureCompiler({providers: [{provide: ResourceLoader, useValue: resourceLoader}]});
     });
diff --git a/packages/core/test/linker/system_ng_module_factory_loader_spec.ts b/packages/core/test/linker/system_ng_module_factory_loader_spec.ts
index d29f013436..fbbaa0f591 100644
--- a/packages/core/test/linker/system_ng_module_factory_loader_spec.ts
+++ b/packages/core/test/linker/system_ng_module_factory_loader_spec.ts
@@ -35,12 +35,13 @@ function mockSystem(modules: {[module: string]: any}) {
 
     it('loads a default factory by appending the factory suffix', async(() => {
          const loader = new SystemJsNgModuleLoader(new Compiler());
-         loader.load('test').then(contents => { expect(contents).toBe('test module factory'); });
+         loader.load('test').then(
+             contents => { expect(contents).toBe('test module factory' as any); });
        }));
     it('loads a named factory by appending the factory suffix', async(() => {
          const loader = new SystemJsNgModuleLoader(new Compiler());
          loader.load('test#Named').then(contents => {
-           expect(contents).toBe('test NamedNgFactory');
+           expect(contents).toBe('test NamedNgFactory' as any);
          });
        }));
     it('loads a named factory with a configured prefix and suffix', async(() => {
@@ -49,7 +50,7 @@ function mockSystem(modules: {[module: string]: any}) {
            factoryPathSuffix: '/suffixed',
          });
          loader.load('test#Named').then(contents => {
-           expect(contents).toBe('test module factory');
+           expect(contents).toBe('test module factory' as any);
          });
        }));
   });
diff --git a/packages/core/test/reflection/reflector_spec.ts b/packages/core/test/reflection/reflector_spec.ts
index a5f022cb24..d24ff79e92 100644
--- a/packages/core/test/reflection/reflector_spec.ts
+++ b/packages/core/test/reflection/reflector_spec.ts
@@ -315,7 +315,7 @@ class TestObj {
         // But we should still get an array of the right length based on function.length.
         expect(reflector.parameters(ChildWithCtorNoDecorator)).toEqual([
           undefined, undefined, undefined
-        ]);
+        ] as any[]);  // TODO: Review use of `any` here (#19904)
 
         expect(reflector.parameters(NoDecorators)).toEqual([]);
         expect(reflector.parameters(<any>{})).toEqual([]);
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 2db6233f48..540e34dbe4 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -1203,8 +1203,8 @@ describe('di', () => {
   describe('@Attribute', () => {
 
     it('should inject attribute', () => {
-      let exist: string|undefined = 'wrong';
-      let nonExist: string|undefined = 'wrong';
+      let exist = 'wrong' as string | undefined;
+      let nonExist = 'wrong' as string | undefined;
 
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
@@ -1221,8 +1221,8 @@ describe('di', () => {
 
     // https://stackblitz.com/edit/angular-8ytqkp?file=src%2Fapp%2Fapp.component.ts
     it('should not inject attributes representing bindings and outputs', () => {
-      let exist: string|undefined = 'wrong';
-      let nonExist: string|undefined = 'wrong';
+      let exist = 'wrong' as string | undefined;
+      let nonExist = 'wrong' as string | undefined;
 
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
@@ -1238,8 +1238,8 @@ describe('di', () => {
     });
 
     it('should not accidentally inject attributes representing bindings and outputs', () => {
-      let exist: string|undefined = 'wrong';
-      let nonExist: string|undefined = 'wrong';
+      let exist = 'wrong' as string | undefined;
+      let nonExist = 'wrong' as string | undefined;
 
       const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
@@ -1415,7 +1415,7 @@ describe('di', () => {
         // so that we have smaller HelloWorld.
         (parent.tNode as{parent: any}).parent = undefined;
 
-        const injector = getOrCreateNodeInjector();
+        const injector: any = getOrCreateNodeInjector();  // TODO: Review use of `any` here (#19904)
         expect(injector).not.toBe(null);
       } finally {
         leaveView(oldView);
diff --git a/packages/core/test/render3/ng_on_changes_feature_spec.ts b/packages/core/test/render3/ng_on_changes_feature_spec.ts
index 719a5dde5b..6ec86072c6 100644
--- a/packages/core/test/render3/ng_on_changes_feature_spec.ts
+++ b/packages/core/test/render3/ng_on_changes_feature_spec.ts
@@ -259,7 +259,7 @@ describe('NgOnChangesFeature', () => {
 
   it('correctly computes firstChange', () => {
     class MyDirective implements OnChanges {
-      public log: Array<string|SimpleChange> = [];
+      public log: Array<string|SimpleChange|undefined> = [];
       public valA: string = 'initValue';
       // TODO(issue/24571): remove '!'.
       public valB !: string;
diff --git a/packages/core/test/render3/properties_spec.ts b/packages/core/test/render3/properties_spec.ts
index e586dd49d7..36e9cc2ab3 100644
--- a/packages/core/test/render3/properties_spec.ts
+++ b/packages/core/test/render3/properties_spec.ts
@@ -112,7 +112,7 @@ describe('elementProperty', () => {
 
     class OtherDir {
       // TODO(issue/24571): remove '!'.
-      id !: boolean;
+      id !: number;
       clickStream = new EventEmitter();
 
       static ngDirectiveDef = defineDirective({
@@ -138,7 +138,7 @@ describe('elementProperty', () => {
 
     class IdDir {
       // TODO(issue/24571): remove '!'.
-      idNumber !: number;
+      idNumber !: string;
 
       static ngDirectiveDef = defineDirective({
         type: IdDir,
@@ -347,15 +347,14 @@ describe('elementProperty', () => {
         }
       }
 
-      expect(renderToHtml(Template, {condition: true, id1: 'one', id2: 'two', id3: 'three'}, deps))
+      expect(renderToHtml(Template, {condition: true, id1: 'one', id2: 'two', id3: 3}, deps))
           .toEqual(`<button iddir="">Click me</button><button id="two">Click me too</button>`);
       expect(idDir !.idNumber).toEqual('one');
 
-      expect(
-          renderToHtml(Template, {condition: false, id1: 'four', id2: 'two', id3: 'three'}, deps))
+      expect(renderToHtml(Template, {condition: false, id1: 'four', id2: 'two', id3: 3}, deps))
           .toEqual(`<button iddir="">Click me</button><button otherdir="">Click me too</button>`);
       expect(idDir !.idNumber).toEqual('four');
-      expect(otherDir !.id).toEqual('three');
+      expect(otherDir !.id).toEqual(3);
     });
 
   });
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index 32d31f1f68..6dfe18f79a 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -293,11 +293,11 @@ describe('array literals', () => {
     const e0_ff =
         (v0: any, v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any,
          v8: any) => ['start', v0, v1, v2, v3, v4, v5, v6, v7, v8, 'end'];
-    const e0_ff_1 = (v: any) => { return {name: v}; };
+    const e0_ff_1 = (v: any) => `modified_${v}`;
 
     renderToHtml(Template, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'], directives);
     /**
-     * <my-comp [names]="['start', v0, v1, v2, v3, {name: v4}, v5, v6, v7, v8, 'end']">
+     * <my-comp [names]="['start', v0, v1, v2, v3, `modified_${v4}`, v5, v6, v7, v8, 'end']">
      * </my-comp>
      */
     function Template(rf: RenderFlags, c: any) {
@@ -315,17 +315,17 @@ describe('array literals', () => {
     }
 
     expect(myComp !.names).toEqual([
-      'start', 'a', 'b', 'c', 'd', {name: 'e'}, 'f', 'g', 'h', 'i', 'end'
+      'start', 'a', 'b', 'c', 'd', 'modified_e', 'f', 'g', 'h', 'i', 'end'
     ]);
 
     renderToHtml(Template, ['a1', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'], directives);
     expect(myComp !.names).toEqual([
-      'start', 'a1', 'b', 'c', 'd', {name: 'e'}, 'f', 'g', 'h', 'i', 'end'
+      'start', 'a1', 'b', 'c', 'd', 'modified_e', 'f', 'g', 'h', 'i', 'end'
     ]);
 
     renderToHtml(Template, ['a1', 'b', 'c', 'd', 'e5', 'f', 'g', 'h', 'i'], directives);
     expect(myComp !.names).toEqual([
-      'start', 'a1', 'b', 'c', 'd', {name: 'e5'}, 'f', 'g', 'h', 'i', 'end'
+      'start', 'a1', 'b', 'c', 'd', 'modified_e5', 'f', 'g', 'h', 'i', 'end'
     ]);
   });
 
diff --git a/packages/core/test/view/component_view_spec.ts b/packages/core/test/view/component_view_spec.ts
index 04b30d681d..2c5aa1a0e1 100644
--- a/packages/core/test/view/component_view_spec.ts
+++ b/packages/core/test/view/component_view_spec.ts
@@ -18,7 +18,7 @@ import {callMostRecentEventListenerHandler, compViewDef, createAndGetRootNodes,
  * We map addEventListener to the Zones internal name. This is because we want to be fast
  * and bypass the zone bookkeeping. We know that we can do the bookkeeping faster.
  */
-const addEventListener = '__zone_symbol__addEventListener';
+const addEventListener = '__zone_symbol__addEventListener' as 'addEventListener';
 
 {
   describe(`Component Views`, () => {
diff --git a/packages/core/test/view/element_spec.ts b/packages/core/test/view/element_spec.ts
index 43d111a09e..5e9fe24afd 100644
--- a/packages/core/test/view/element_spec.ts
+++ b/packages/core/test/view/element_spec.ts
@@ -20,8 +20,8 @@ import {ARG_TYPE_VALUES, callMostRecentEventListenerHandler, checkNodeInlineOrDy
  * We map addEventListener to the Zones internal name. This is because we want to be fast
  * and bypass the zone bookkeeping. We know that we can do the bookkeeping faster.
  */
-const addEventListener = '__zone_symbol__addEventListener';
-const removeEventListener = '__zone_symbol__removeEventListener';
+const addEventListener = '__zone_symbol__addEventListener' as 'addEventListener';
+const removeEventListener = '__zone_symbol__removeEventListener' as 'removeEventListener';
 
 {
   describe(`View Elements`, () => {
diff --git a/packages/core/testing/src/testing_internal.ts b/packages/core/testing/src/testing_internal.ts
index 4caa21aeae..a83111fd40 100644
--- a/packages/core/testing/src/testing_internal.ts
+++ b/packages/core/testing/src/testing_internal.ts
@@ -23,7 +23,7 @@ export const proxy: ClassDecorator = (t: any) => t;
 const _global = <any>(typeof window === 'undefined' ? global : window);
 
 export const afterEach: Function = _global.afterEach;
-export const expect: (actual: any) => jasmine.Matchers = _global.expect;
+export const expect: <T>(actual: T) => jasmine.Matchers<T> = _global.expect;
 
 const jsmBeforeEach = _global.beforeEach;
 const jsmDescribe = _global.describe;
diff --git a/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts b/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts
index 94eaaca00f..83a28698a2 100644
--- a/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts
+++ b/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts
@@ -15,7 +15,7 @@ describe('testability example', () => {
   describe('using task tracking', () => {
     const URL = '/core/testability/ts/whenStable/';
 
-    it('times out with a list of tasks', (done) => {
+    it('times out with a list of tasks', (done: DoneFn) => {
       browser.get(URL);
       browser.ignoreSynchronization = true;
 
diff --git a/packages/examples/tsconfig-build.json b/packages/examples/tsconfig-build.json
index 5b95650c02..ac40446b1c 100644
--- a/packages/examples/tsconfig-build.json
+++ b/packages/examples/tsconfig-build.json
@@ -11,13 +11,13 @@
       "rxjs/*": ["../../node_modules/rxjs/*"]
     },
     "outDir": "../../dist/examples",
-    "types": ["jasmine", "node", "angular", "systemjs"]
+    "types": ["angular"]
   },
 
   "include": [
-    "./**/*.ts",
-    "../../node_modules/zone.js/dist/zone.js.d.ts",
-    // TODO(i): we can't use protractor's built-in typings because they contain lots of ambient definitions
-    "../../node_modules/@types/protractor/index.d.ts"
+    "../../node_modules/@types/jasminewd2/index.d.ts",
+    "../../tools/types-ext/jasminewd2.d.ts",
+    "../types.d.ts",
+    "**/*.ts"
   ]
 }
diff --git a/packages/examples/tsconfig.json b/packages/examples/tsconfig.json
new file mode 100644
index 0000000000..aa43ab7164
--- /dev/null
+++ b/packages/examples/tsconfig.json
@@ -0,0 +1,19 @@
+// WARNING:
+// This file is used to build the e2e tests only.
+// The rest of the files are included in `/packages/tsconfig.json`.
+{
+  "extends": "../tsconfig.json",
+
+  "compilerOptions": {
+    "types": []
+  },
+
+  "include": [
+    "../../node_modules/@types/jasminewd2/index.d.ts",
+    "../../tools/types-ext/jasminewd2.d.ts",
+    "../types.d.ts",
+    "**/e2e_test/*"
+  ],
+
+  "exclude": []
+}
diff --git a/packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts b/packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts
index 5558ffb5b4..d941609740 100644
--- a/packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts
+++ b/packages/examples/upgrade/static/ts/full/e2e_test/static_full_spec.ts
@@ -50,4 +50,4 @@ describe('upgrade/static (full)', () => {
     firstHero = element.all(by.css('ng1-hero')).get(0);
     expect(firstHero.element(by.css('h2')).getText()).toEqual('Wonder Woman');
   });
-});
\ No newline at end of file
+});
diff --git a/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts b/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts
index bc53502d01..c429b50000 100644
--- a/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts
+++ b/packages/examples/upgrade/static/ts/lite/e2e_test/e2e_util.ts
@@ -10,7 +10,7 @@ import {ElementFinder, by} from 'protractor';
 
 declare global {
   namespace jasmine {
-  interface Matchers {
+  interface Matchers<T> {
     toBeAHero(): Promise<void>;
     toHaveName(exectedName: string): Promise<void>;
   }
diff --git a/packages/forms/test/directives_spec.ts b/packages/forms/test/directives_spec.ts
index 5964b53e0f..0876818c2a 100644
--- a/packages/forms/test/directives_spec.ts
+++ b/packages/forms/test/directives_spec.ts
@@ -92,14 +92,14 @@ function asyncValidator(expected: any, timeout = 0) {
         });
 
         it('should return custom accessor when provided', () => {
-          const customAccessor = new SpyValueAccessor();
+          const customAccessor: ControlValueAccessor = new SpyValueAccessor() as any;
           const checkboxAccessor = new CheckboxControlValueAccessor(null !, null !);
           expect(selectValueAccessor(dir, <any>[defaultAccessor, customAccessor, checkboxAccessor]))
               .toEqual(customAccessor);
         });
 
         it('should return custom accessor when provided with select multiple', () => {
-          const customAccessor = new SpyValueAccessor();
+          const customAccessor: ControlValueAccessor = new SpyValueAccessor() as any;
           const selectMultipleAccessor = new SelectMultipleControlValueAccessor(null !, null !);
           expect(selectValueAccessor(
                      dir, <any>[defaultAccessor, customAccessor, selectMultipleAccessor]))
diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts
index 2068970d86..0e2a9cb32a 100644
--- a/packages/forms/test/reactive_integration_spec.ts
+++ b/packages/forms/test/reactive_integration_spec.ts
@@ -207,7 +207,7 @@ import {MyInput, MyInputForm} from './value_accessor_integration_spec';
         fixture.detectChanges();
 
         emailInput = fixture.debugElement.query(By.css('[formControlName="email"]'));
-        expect(emailInput).toBe(null);
+        expect(emailInput as any).toBe(null);  // TODO: Review use of `any` here (#19904)
       });
 
       it('should strip array controls that are not found', () => {
@@ -1393,7 +1393,7 @@ import {MyInput, MyInputForm} from './value_accessor_integration_spec';
           fixture.componentInstance.form = formGroup;
           fixture.detectChanges();
 
-          const values: string[] = [];
+          const values: any[] = [];
           const streams = merge(
               control.valueChanges, control.statusChanges, formGroup.valueChanges,
               formGroup.statusChanges);
@@ -1430,7 +1430,7 @@ import {MyInput, MyInputForm} from './value_accessor_integration_spec';
           fixture.componentInstance.form = formGroup;
           fixture.detectChanges();
 
-          const values: string[] = [];
+          const values: (string | {[key: string]: string})[] = [];
           const streams = merge(
               control.valueChanges, control.statusChanges, formGroup.valueChanges,
               formGroup.statusChanges);
diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts
index 8782a89966..c2caf9a067 100644
--- a/packages/forms/test/template_integration_spec.ts
+++ b/packages/forms/test/template_integration_spec.ts
@@ -460,7 +460,7 @@ import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integrat
              fixture.detectChanges();
              tick();
 
-             const values: string[] = [];
+             const values: any[] = [];
              const form = fixture.debugElement.children[0].injector.get(NgForm);
 
              const sub = merge(form.valueChanges !, form.statusChanges !)
@@ -748,7 +748,7 @@ import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integrat
 
         it('should reset properly', fakeAsync(() => {
              const fixture = initTest(NgModelForm);
-             fixture.componentInstance.name = 'Nancy';
+             fixture.componentInstance.name = 'Nancy' as string | null;
              fixture.componentInstance.options = {updateOn: 'submit'};
              fixture.detectChanges();
              tick();
@@ -792,7 +792,7 @@ import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integrat
              fixture.detectChanges();
              tick();
 
-             const values: string[] = [];
+             const values: any[] = [];
              const form = fixture.debugElement.children[0].injector.get(NgForm);
 
              const sub = merge(form.valueChanges !, form.statusChanges !)
@@ -1028,7 +1028,7 @@ import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integrat
 
       it('should reset the form to empty when reset event is fired', fakeAsync(() => {
            const fixture = initTest(NgModelForm);
-           fixture.componentInstance.name = 'should be cleared';
+           fixture.componentInstance.name = 'should be cleared' as string | null;
            fixture.detectChanges();
            tick();
 
@@ -1654,7 +1654,7 @@ class StandaloneNgModel {
 })
 class NgModelForm {
   // TODO(issue/24571): remove '!'.
-  name !: string;
+  name !: string | null;
   // TODO(issue/24571): remove '!'.
   event !: Event;
   options = {};
diff --git a/packages/forms/test/value_accessor_integration_spec.ts b/packages/forms/test/value_accessor_integration_spec.ts
index 609592b09e..3a9c8317cd 100644
--- a/packages/forms/test/value_accessor_integration_spec.ts
+++ b/packages/forms/test/value_accessor_integration_spec.ts
@@ -327,7 +327,7 @@ import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'
              const fixture = initTest(NgModelSelectWithNullForm);
              const comp = fixture.componentInstance;
              comp.cities = [{'name': 'SF'}, {'name': 'NYC'}];
-             comp.selectedCity = null !;
+             comp.selectedCity = null;
              fixture.detectChanges();
 
              const select = fixture.debugElement.query(By.css('select'));
@@ -336,7 +336,7 @@ import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'
              dispatchEvent(select.nativeElement, 'change');
              fixture.detectChanges();
              tick();
-             expect(comp.selectedCity['name']).toEqual('NYC');
+             expect(comp.selectedCity !['name']).toEqual('NYC');
 
              select.nativeElement.value = '0: null';
              dispatchEvent(select.nativeElement, 'change');
@@ -1231,7 +1231,7 @@ class NgModelSelectForm {
   `
 })
 class NgModelSelectWithNullForm {
-  selectedCity: {[k: string]: string} = {};
+  selectedCity: {[k: string]: string}|null = {};
   cities: any[] = [];
 }
 
diff --git a/packages/platform-browser/test/browser/transfer_state_spec.ts b/packages/platform-browser/test/browser/transfer_state_spec.ts
index d3418c518d..d7dae0b4ec 100644
--- a/packages/platform-browser/test/browser/transfer_state_spec.ts
+++ b/packages/platform-browser/test/browser/transfer_state_spec.ts
@@ -80,14 +80,14 @@ import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens';
     it('supports setting and accessing value \'false\' via get', () => {
       const transferState: TransferState = TestBed.get(TransferState);
       transferState.set(TEST_KEY, false);
-      expect(transferState.get(TEST_KEY, 20)).toBe(false);
+      expect(transferState.get(TEST_KEY, true)).toBe(false);
       expect(transferState.hasKey(TEST_KEY)).toBe(true);
     });
 
     it('supports setting and accessing value \'null\' via get', () => {
       const transferState: TransferState = TestBed.get(TransferState);
       transferState.set(TEST_KEY, null);
-      expect(transferState.get(TEST_KEY, 20)).toBe(null);
+      expect(transferState.get(TEST_KEY, 20 as any)).toBe(null);
       expect(transferState.hasKey(TEST_KEY)).toBe(true);
     });
 
@@ -130,4 +130,4 @@ import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens';
       expect(unescapedObj['testString']).toBe(testString);
     });
   });
-})();
\ No newline at end of file
+})();
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index c02f739f5e..d2f4031904 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -809,7 +809,7 @@ class CompWithUrlTemplate {
 
     describe('errors', () => {
       let originalJasmineIt: (description: string, func: () => void) => jasmine.Spec;
-      let originalJasmineBeforeEach: (beforeEachFunction: () => void) => void;
+      let originalJasmineBeforeEach: (beforeEachFunction: (done: DoneFn) => void) => void;
 
       const patchJasmineIt = () => {
         let resolve: (result: any) => void;
diff --git a/packages/platform-browser/testing/src/matchers.ts b/packages/platform-browser/testing/src/matchers.ts
index 45c51c53e4..cc1aae1bf3 100644
--- a/packages/platform-browser/testing/src/matchers.ts
+++ b/packages/platform-browser/testing/src/matchers.ts
@@ -15,7 +15,7 @@ import {ɵgetDOM as getDOM} from '@angular/platform-browser';
 /**
  * Jasmine matchers that check Angular specific conditions.
  */
-export interface NgMatchers extends jasmine.Matchers {
+export interface NgMatchers extends jasmine.Matchers<any> {
   /**
    * Expect the value to be a `Promise`.
    *
diff --git a/packages/router/src/url_tree.ts b/packages/router/src/url_tree.ts
index 3ba437ff68..958c3f32cb 100644
--- a/packages/router/src/url_tree.ts
+++ b/packages/router/src/url_tree.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PRIMARY_OUTLET, ParamMap, convertToParamMap} from './shared';
+import {PRIMARY_OUTLET, ParamMap, Params, convertToParamMap} from './shared';
 import {forEach, shallowEqual} from './utils/collection';
 
 export function createEmptyUrlTree() {
@@ -23,8 +23,8 @@ export function containsTree(container: UrlTree, containee: UrlTree, exact: bool
       containsSegmentGroup(container.root, containee.root);
 }
 
-function equalQueryParams(
-    container: {[k: string]: string}, containee: {[k: string]: string}): boolean {
+function equalQueryParams(container: Params, containee: Params): boolean {
+  // TODO: This does not handle array params correctly.
   return shallowEqual(container, containee);
 }
 
@@ -38,8 +38,8 @@ function equalSegmentGroups(container: UrlSegmentGroup, containee: UrlSegmentGro
   return true;
 }
 
-function containsQueryParams(
-    container: {[k: string]: string}, containee: {[k: string]: string}): boolean {
+function containsQueryParams(container: Params, containee: Params): boolean {
+  // TODO: This does not handle array params correctly.
   return Object.keys(containee).length <= Object.keys(container).length &&
       Object.keys(containee).every(key => containee[key] === container[key]);
 }
@@ -112,7 +112,7 @@ export class UrlTree {
       /** The root segment group of the URL tree */
       public root: UrlSegmentGroup,
       /** The query params of the URL */
-      public queryParams: {[key: string]: string},
+      public queryParams: Params,
       /** The fragment of the URL */
       public fragment: string|null) {}
 
@@ -446,8 +446,8 @@ class UrlParser {
     return new UrlSegmentGroup([], this.parseChildren());
   }
 
-  parseQueryParams(): {[key: string]: any} {
-    const params: {[key: string]: any} = {};
+  parseQueryParams(): Params {
+    const params: Params = {};
     if (this.consumeOptional('?')) {
       do {
         this.parseQueryParam(params);
@@ -534,7 +534,7 @@ class UrlParser {
   }
 
   // Parse a single query parameter `name[=value]`
-  private parseQueryParam(params: {[key: string]: any}): void {
+  private parseQueryParam(params: Params): void {
     const key = matchQueryParams(this.remaining);
     if (!key) {
       return;
diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts
index adf4c99e0c..634990a749 100644
--- a/packages/router/test/bootstrap.spec.ts
+++ b/packages/router/test/bootstrap.spec.ts
@@ -210,7 +210,7 @@ describe('bootstrap', () => {
 
        platformBrowserDynamic([]).bootstrapModule(TestModule).then(res => {
          const router = res.injector.get(Router);
-         spyOn(router, 'resetRootComponentType').and.callThrough();
+         spyOn(router as any, 'resetRootComponentType').and.callThrough();
 
          const appRef: ApplicationRef = res.injector.get(ApplicationRef);
          appRef.bootstrap(SecondRootCmp);
@@ -236,7 +236,7 @@ describe('bootstrap', () => {
 
        platformBrowserDynamic([]).bootstrapModule(TestModule).then(res => {
          const router = res.injector.get(Router);
-         spyOn(router, 'resetRootComponentType').and.callThrough();
+         spyOn(router as any, 'resetRootComponentType').and.callThrough();
 
          const appRef: ApplicationRef = res.injector.get(ApplicationRef);
          appRef.components[0].onDestroy(() => {
diff --git a/packages/router/test/create_router_state.spec.ts b/packages/router/test/create_router_state.spec.ts
index d69c2cc6e6..0a0c2889c5 100644
--- a/packages/router/test/create_router_state.spec.ts
+++ b/packages/router/test/create_router_state.spec.ts
@@ -131,7 +131,7 @@ function checkActivatedRoute(
   if (actual === null) {
     expect(actual).toBeDefined();
   } else {
-    expect(actual.component).toBe(cmp);
+    expect(actual.component as any).toBe(cmp);
     expect(actual.outlet).toEqual(outlet);
   }
 }
diff --git a/packages/router/test/recognize.spec.ts b/packages/router/test/recognize.spec.ts
index 1db36a1cd1..b2537d13c6 100644
--- a/packages/router/test/recognize.spec.ts
+++ b/packages/router/test/recognize.spec.ts
@@ -799,7 +799,7 @@ function checkActivatedRoute(
   } else {
     expect(actual.url.map(s => s.path).join('/')).toEqual(url);
     expect(actual.params).toEqual(params);
-    expect(actual.component).toBe(cmp);
+    expect(actual.component as any).toBe(cmp);
     expect(actual.outlet).toEqual(outlet);
   }
 }
diff --git a/packages/router/test/router.spec.ts b/packages/router/test/router.spec.ts
index 66b606d740..df6d5d0a80 100644
--- a/packages/router/test/router.spec.ts
+++ b/packages/router/test/router.spec.ts
@@ -9,12 +9,12 @@
 import {Location} from '@angular/common';
 import {TestBed, inject} from '@angular/core/testing';
 
-import {ResolveData} from '../src/config';
+import {Routes} from '../src/config';
 import {ChildActivationStart} from '../src/events';
 import {PreActivation} from '../src/pre_activation';
 import {Router} from '../src/router';
 import {ChildrenOutletContexts} from '../src/router_outlet_context';
-import {ActivatedRouteSnapshot, RouterStateSnapshot, createEmptyStateSnapshot} from '../src/router_state';
+import {RouterStateSnapshot, createEmptyStateSnapshot} from '../src/router_state';
 import {DefaultUrlSerializer} from '../src/url_tree';
 import {TreeNode} from '../src/utils/tree';
 import {RouterTestingModule} from '../testing/src/router_testing_module';
@@ -30,14 +30,17 @@ describe('Router', () => {
 
     it('should copy config to avoid mutations of user-provided objects', () => {
       const r: Router = TestBed.get(Router);
-      const configs = [{
+      const configs: Routes = [{
         path: 'a',
         component: TestComponent,
         children: [{path: 'b', component: TestComponent}, {path: 'c', component: TestComponent}]
       }];
+      const children = configs[0].children !;
+
       r.resetConfig(configs);
 
-      let rConfigs = r.config;
+      const rConfigs = r.config;
+      const rChildren = rConfigs[0].children !;
 
       // routes array and shallow copy
       expect(configs).not.toBe(rConfigs);
@@ -46,11 +49,11 @@ describe('Router', () => {
       expect(configs[0].component).toBe(rConfigs[0].component);
 
       // children should be new array and routes shallow copied
-      expect(configs[0].children).not.toBe(rConfigs[0].children);
-      expect(configs[0].children[0]).not.toBe(rConfigs[0].children ![0]);
-      expect(configs[0].children[0].path).toBe(rConfigs[0].children ![0].path);
-      expect(configs[0].children[1]).not.toBe(rConfigs[0].children ![1]);
-      expect(configs[0].children[1].path).toBe(rConfigs[0].children ![1].path);
+      expect(children).not.toBe(rChildren);
+      expect(children[0]).not.toBe(rChildren[0]);
+      expect(children[0].path).toBe(rChildren[0].path);
+      expect(children[1]).not.toBe(rChildren[1]);
+      expect(children[1].path).toBe(rChildren[1].path);
     });
   });
 
diff --git a/packages/router/test/router_state.spec.ts b/packages/router/test/router_state.spec.ts
index e964399af9..369d4ca26c 100644
--- a/packages/router/test/router_state.spec.ts
+++ b/packages/router/test/router_state.spec.ts
@@ -125,41 +125,41 @@ describe('RouterState & Snapshot', () => {
     }
 
     it('should return false when params are different', () => {
-      expect(equalParamsAndUrlSegments(createSnapshot({a: 1}, []), createSnapshot({a: 2}, [])))
+      expect(equalParamsAndUrlSegments(createSnapshot({a: '1'}, []), createSnapshot({a: '2'}, [])))
           .toEqual(false);
     });
 
     it('should return false when urls are different', () => {
       expect(equalParamsAndUrlSegments(
-                 createSnapshot({a: 1}, [new UrlSegment('a', {})]),
-                 createSnapshot({a: 1}, [new UrlSegment('b', {})])))
+                 createSnapshot({a: '1'}, [new UrlSegment('a', {})]),
+                 createSnapshot({a: '1'}, [new UrlSegment('b', {})])))
           .toEqual(false);
     });
 
     it('should return true othewise', () => {
       expect(equalParamsAndUrlSegments(
-                 createSnapshot({a: 1}, [new UrlSegment('a', {})]),
-                 createSnapshot({a: 1}, [new UrlSegment('a', {})])))
+                 createSnapshot({a: '1'}, [new UrlSegment('a', {})]),
+                 createSnapshot({a: '1'}, [new UrlSegment('a', {})])))
           .toEqual(true);
     });
 
     it('should return false when upstream params are different', () => {
       const [snapshot1, snapshot2] =
-          createSnapshotPairWithParent([{a: 1}, {a: 1}], [{b: 1}, {c: 1}], ['a', 'a']);
+          createSnapshotPairWithParent([{a: '1'}, {a: '1'}], [{b: '1'}, {c: '1'}], ['a', 'a']);
 
       expect(equalParamsAndUrlSegments(snapshot1, snapshot2)).toEqual(false);
     });
 
     it('should return false when upstream urls are different', () => {
       const [snapshot1, snapshot2] =
-          createSnapshotPairWithParent([{a: 1}, {a: 1}], [{b: 1}, {b: 1}], ['a', 'b']);
+          createSnapshotPairWithParent([{a: '1'}, {a: '1'}], [{b: '1'}, {b: '1'}], ['a', 'b']);
 
       expect(equalParamsAndUrlSegments(snapshot1, snapshot2)).toEqual(false);
     });
 
     it('should return true when upstream urls and params are equal', () => {
       const [snapshot1, snapshot2] =
-          createSnapshotPairWithParent([{a: 1}, {a: 1}], [{b: 1}, {b: 1}], ['a', 'a']);
+          createSnapshotPairWithParent([{a: '1'}, {a: '1'}], [{b: '1'}, {b: '1'}], ['a', 'a']);
 
       expect(equalParamsAndUrlSegments(snapshot1, snapshot2)).toEqual(true);
     });
@@ -184,8 +184,8 @@ describe('RouterState & Snapshot', () => {
     }
 
     it('should call change observers', () => {
-      const firstPlace = createSnapshot({a: 1}, []);
-      const secondPlace = createSnapshot({a: 2}, []);
+      const firstPlace = createSnapshot({a: '1'}, []);
+      const secondPlace = createSnapshot({a: '2'}, []);
       route.snapshot = firstPlace;
       (route as any)._futureSnapshot = secondPlace;
 
diff --git a/packages/router/test/spy_ng_module_factory_loader.spec.ts b/packages/router/test/spy_ng_module_factory_loader.spec.ts
index 70809a1cdf..076f5c2a9f 100644
--- a/packages/router/test/spy_ng_module_factory_loader.spec.ts
+++ b/packages/router/test/spy_ng_module_factory_loader.spec.ts
@@ -23,7 +23,7 @@ describe('SpyNgModuleFactoryLoader', () => {
   });
 
   it('should return the created promise', () => {
-    const expected = Promise.resolve('returned');
+    const expected: any = Promise.resolve('returned');
     const compiler: any = {compileModuleAsync: () => expected};
 
     const r = new SpyNgModuleFactoryLoader(<any>compiler);
diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts
index 7fcaf3c849..4a3388a317 100644
--- a/packages/service-worker/test/comm_spec.ts
+++ b/packages/service-worker/test/comm_spec.ts
@@ -387,35 +387,35 @@ import {async_fit, async_it} from './async';
       });
       it('processes update availability notifications when sent', (done: DoneFn) => {
         update.available.subscribe(event => {
-          expect(event.current).toEqual({version: 'A'});
-          expect(event.available).toEqual({version: 'B'});
+          expect(event.current).toEqual({hash: 'A'});
+          expect(event.available).toEqual({hash: 'B'});
           expect(event.type).toEqual('UPDATE_AVAILABLE');
           done();
         });
         mock.sendMessage({
           type: 'UPDATE_AVAILABLE',
           current: {
-            version: 'A',
+            hash: 'A',
           },
           available: {
-            version: 'B',
+            hash: 'B',
           },
         });
       });
       it('processes update activation notifications when sent', (done: DoneFn) => {
         update.activated.subscribe(event => {
-          expect(event.previous).toEqual({version: 'A'});
-          expect(event.current).toEqual({version: 'B'});
+          expect(event.previous).toEqual({hash: 'A'});
+          expect(event.current).toEqual({hash: 'B'});
           expect(event.type).toEqual('UPDATE_ACTIVATED');
           done();
         });
         mock.sendMessage({
           type: 'UPDATE_ACTIVATED',
           previous: {
-            version: 'A',
+            hash: 'A',
           },
           current: {
-            version: 'B',
+            hash: 'B',
           },
         });
       });
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index c7892b33e0..99c52620a9 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -30,10 +30,11 @@
   },
   "exclude": [
     "bazel",
-    "compiler-cli/integrationtest",
-    "platform-server/integrationtest",
     "common/locales",
-    "elements/schematics"
+    "compiler-cli/integrationtest",
+    "elements/schematics",
+    "examples/**/e2e_test/*",
+    "platform-server/integrationtest"
   ]
 
 }
diff --git a/packages/types.d.ts b/packages/types.d.ts
index 96996ea8e0..eb1d9387a5 100644
--- a/packages/types.d.ts
+++ b/packages/types.d.ts
@@ -8,20 +8,19 @@
 
 // This file contains all ambient imports needed to compile the modules/ source code
 
-/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
 /// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
 /// <reference path="../node_modules/@types/jasmine/index.d.ts" />
 /// <reference path="../node_modules/@types/node/index.d.ts" />
-/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
+/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
 /// <reference path="./es6-subset.d.ts" />
-/// <reference path="./system.d.ts" />
 /// <reference path="./goog.d.ts" />
+/// <reference path="./system.d.ts" />
 
 declare let isNode: boolean;
 declare let isBrowser: boolean;
 
 declare namespace jasmine {
-  interface Matchers {
+  interface Matchers<T> {
     toHaveProperties(obj: any): boolean;
   }
 }
diff --git a/packages/upgrade/test/static/integration/downgrade_component_spec.ts b/packages/upgrade/test/static/integration/downgrade_component_spec.ts
index cff3718529..3e9284bf4b 100644
--- a/packages/upgrade/test/static/integration/downgrade_component_spec.ts
+++ b/packages/upgrade/test/static/integration/downgrade_component_spec.ts
@@ -787,7 +787,7 @@ withEachNg1Version(() => {
                childMod.componentFactoryResolver.resolveComponentFactory(LazyLoadedComponent) !;
            const lazyCmp = cmpFactory.create(componentInjector);
 
-           expect(lazyCmp.instance.module).toBe(childMod.injector);
+           expect(lazyCmp.instance.module.injector).toBe(childMod.injector);
          });
 
        }));
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index b7583dd767..a14dab89ac 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -60,5 +60,6 @@ travisFoldEnd "tsc tools"
 travisFoldStart "tsc all"
   node dist/tools/@angular/compiler-cli/src/main -p packages/tsconfig-metadata.json
   $(npm bin)/tsc -p packages
+  $(npm bin)/tsc -p packages/examples
   $(npm bin)/tsc -p modules
 travisFoldEnd "tsc all"
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index 91b0190edd..aa15b85b3b 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -533,9 +533,7 @@ export declare abstract class UrlSerializer {
 export declare class UrlTree {
     fragment: string | null;
     readonly queryParamMap: ParamMap;
-    queryParams: {
-        [key: string]: string;
-    };
+    queryParams: Params;
     root: UrlSegmentGroup;
     toString(): string;
 }
diff --git a/tools/tsc-watch/index.ts b/tools/tsc-watch/index.ts
index 26080d13ab..cd3065ec1e 100644
--- a/tools/tsc-watch/index.ts
+++ b/tools/tsc-watch/index.ts
@@ -40,10 +40,7 @@ const BaseConfig = {
 };
 
 if (platform == 'node') {
-  const specFiles = [
-    '@angular/**/*_spec.js', '@angular/compiler-cli/test/**/*_spec.js',
-    '@angular/benchpress/test/**/*_spec.js'
-  ];
+  const specFiles = ['@angular/**/*_spec.js'];
   tscWatch = new TscWatch(Object.assign(
       {
         tsconfig: 'packages/tsconfig.json',
diff --git a/tools/types-ext/jasminewd2.d.ts b/tools/types-ext/jasminewd2.d.ts
new file mode 100644
index 0000000000..b02a501695
--- /dev/null
+++ b/tools/types-ext/jasminewd2.d.ts
@@ -0,0 +1,28 @@
+/**
+ * @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
+ */
+
+/**
+ * Extended typings for `jasminewd2`.
+ *
+ * The currently used `jasminewd2` version (v2.1.0), supports passing a `done` callback to a spec,
+ * but the latest typings on [DefinitelyTyped][1] do not reflect that.
+ * Overwrite the relevant function signatures to add a `done` callback.
+ *
+ * [1]:
+ * https://github.com/DefinitelyTyped/DefinitelyTyped/blob/566e0394859fdc1dc893658ccec6b06372d56a91/types/jasminewd2/index.d.ts#L9-L15
+ */
+declare function it(
+    expectation: string, assertion?: (done: DoneFn) => Promise<void>, timeout?: number): void;
+    declare function fit(
+        expectation: string, assertion?: (done: DoneFn) => Promise<void>, timeout?: number): void;
+    declare function xit(
+        expectation: string, assertion?: (done: DoneFn) => Promise<void>, timeout?: number): void;
+    declare function beforeEach(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
+    declare function afterEach(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
+    declare function beforeAll(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
+    declare function afterAll(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
diff --git a/yarn.lock b/yarn.lock
index 36ff64d652..66b1faeecd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -96,9 +96,15 @@
   version "2.0.35"
   resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.35.tgz#7b7c950c7d54593e23bffc8d2b4feba9866a7277"
 
-"@types/jasmine@2.2.22-alpha":
-  version "2.2.22-alpha"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.2.22-alpha.tgz#eecaee43fe42ef6b5cfefad1bcc370c433f485bf"
+"@types/jasmine@*", "@types/jasmine@^2.8.8":
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
+
+"@types/jasminewd2@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.3.tgz#0d2886b0cbdae4c0eeba55e30792f584bf040a95"
+  dependencies:
+    "@types/jasmine" "*"
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -2517,13 +2523,6 @@ glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
 glob@^4.3.1:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
@@ -3256,11 +3255,7 @@ isstream@~0.1.1, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-jasmine-core@2.4.1, jasmine-core@~2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.4.1.tgz#6f83ab3a0f16951722ce07d206c773d57cc838be"
-
-jasmine-core@~2.8.0:
+jasmine-core@2.8, jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
 
@@ -3270,15 +3265,7 @@ jasmine-diff@^0.1.3:
   dependencies:
     diff "^3.2.0"
 
-jasmine@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.4.1.tgz#9016dda453213d27ac6d43dc4ea97315a189085e"
-  dependencies:
-    exit "^0.1.2"
-    glob "^3.2.11"
-    jasmine-core "~2.4.0"
-
-jasmine@^2.5.3:
+jasmine@2.8, jasmine@^2.5.3:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
   dependencies:
@@ -3993,13 +3980,6 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"

From 809e8f742efacf9a773641955d351af59a77b486 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 5 Jul 2018 15:24:53 +0300
Subject: [PATCH 418/582] test: make `NgMatchers` type-aware (#19904)

PR Close #19904
---
 packages/core/test/di/static_injector_spec.ts | 11 +++----
 packages/core/test/linker/integration_spec.ts |  4 +--
 .../test/linker/ng_module_integration_spec.ts | 20 ++++---------
 .../linker/view_injector_integration_spec.ts  |  2 +-
 .../http/test/backends/jsonp_backend_spec.ts  | 14 ++-------
 .../test/browser/bootstrap_spec.ts            |  9 +++---
 .../platform-browser/testing/src/matchers.ts  |  6 ++--
 .../worker/renderer_v2_integration_spec.ts    |  2 +-
 packages/router/test/integration.spec.ts      | 30 ++++++++-----------
 9 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/packages/core/test/di/static_injector_spec.ts b/packages/core/test/di/static_injector_spec.ts
index 81d15a354b..c00c8fa97c 100644
--- a/packages/core/test/di/static_injector_spec.ts
+++ b/packages/core/test/di/static_injector_spec.ts
@@ -217,7 +217,7 @@ function factoryFn(a: any){}
       const injector = Injector.create([CarWithOptionalEngine.PROVIDER]);
 
       const car = injector.get<CarWithOptionalEngine>(CarWithOptionalEngine);
-      expect(car.engine).toEqual(null);
+      expect(car.engine).toBeNull();
     });
 
     it('should flatten passed-in providers', () => {
@@ -288,8 +288,8 @@ function factoryFn(a: any){}
           Injector.create([CarWithDashboard.PROVIDER, Engine.PROVIDER, Dashboard.PROVIDER]);
       expect(() => injector.get(CarWithDashboard))
           .toThrowError(
-              `StaticInjectorError[${stringify(CarWithDashboard)} -> ${stringify(Dashboard)} -> DashboardSoftware]: 
-  NullInjectorError: No provider for DashboardSoftware!`);
+              `StaticInjectorError[${stringify(CarWithDashboard)} -> ${stringify(Dashboard)} -> DashboardSoftware]: \n` +
+              '  NullInjectorError: No provider for DashboardSoftware!');
     });
 
     it('should throw when trying to instantiate a cyclic dependency', () => {
@@ -415,8 +415,9 @@ function factoryFn(a: any){}
             parent);
 
         expect(() => child.get(Car))
-            .toThrowError(`StaticInjectorError[${stringify(Car)} -> ${stringify(Engine)}]: 
-  NullInjectorError: No provider for Engine!`);
+            .toThrowError(
+                `StaticInjectorError[${stringify(Car)} -> ${stringify(Engine)}]: \n` +
+                '  NullInjectorError: No provider for Engine!');
       });
     });
 
diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts
index 7ceff4a8c0..9a9d27c53b 100644
--- a/packages/core/test/linker/integration_spec.ts
+++ b/packages/core/test/linker/integration_spec.ts
@@ -343,7 +343,7 @@ function declareTests({useJit}: {useJit: boolean}) {
         const fixture = TestBed.createComponent(MyComp);
 
         const tc = fixture.debugElement.children[0];
-        expect(tc.injector.get(EventDir)).not.toBe(null);
+        expect(tc.injector.get(EventDir)).not.toBeNull();
       });
 
       it('should read directives metadata from their binding token', () => {
@@ -1237,7 +1237,7 @@ function declareTests({useJit}: {useJit: boolean}) {
         const needsAttribute = tc.injector.get(NeedsAttribute);
         expect(needsAttribute.typeAttribute).toEqual('text');
         expect(needsAttribute.staticAttribute).toEqual('');
-        expect(needsAttribute.fooAttribute).toEqual(null);
+        expect(needsAttribute.fooAttribute).toBeNull();
       });
 
       it('should support custom interpolation', () => {
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 2f7665c320..45f530f76d 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -33,37 +33,27 @@ class TurboEngine extends Engine {}
 const CARS = new InjectionToken<Car[]>('Cars');
 @Injectable()
 class Car {
-  engine: Engine;
-  constructor(engine: Engine) { this.engine = engine; }
+  constructor(public engine: Engine) {}
 }
 
 @Injectable()
 class CarWithOptionalEngine {
-  engine: Engine;
-  constructor(@Optional() engine: Engine) { this.engine = engine; }
+  constructor(@Optional() public engine: Engine) {}
 }
 
 @Injectable()
 class CarWithDashboard {
-  engine: Engine;
-  dashboard: Dashboard;
-  constructor(engine: Engine, dashboard: Dashboard) {
-    this.engine = engine;
-    this.dashboard = dashboard;
-  }
+  constructor(public engine: Engine, public dashboard: Dashboard) {}
 }
 
 @Injectable()
 class SportsCar extends Car {
-  // TODO(issue/24571): remove '!'.
-  engine !: Engine;
   constructor(engine: Engine) { super(engine); }
 }
 
 @Injectable()
 class CarWithInject {
-  engine: Engine;
-  constructor(@Inject(TurboEngine) engine: Engine) { this.engine = engine; }
+  constructor(@Inject(TurboEngine) public engine: Engine) {}
 }
 
 @Injectable()
@@ -747,7 +737,7 @@ function declareTests({useJit}: {useJit: boolean}) {
         const injector = createInjector([CarWithOptionalEngine]);
 
         const car = injector.get(CarWithOptionalEngine);
-        expect(car.engine).toEqual(null);
+        expect(car.engine).toBeNull();
       });
 
       it('should flatten passed-in providers', () => {
diff --git a/packages/core/test/linker/view_injector_integration_spec.ts b/packages/core/test/linker/view_injector_integration_spec.ts
index dbab78ab74..f957b03656 100644
--- a/packages/core/test/linker/view_injector_integration_spec.ts
+++ b/packages/core/test/linker/view_injector_integration_spec.ts
@@ -659,7 +659,7 @@ class TestComp {
         TestBed.configureTestingModule({declarations: [OptionallyNeedsDirective]});
         const el = createComponent('<div optionallyNeedsDirective></div>');
         const d = el.children[0].injector.get(OptionallyNeedsDirective);
-        expect(d.dependency).toEqual(null);
+        expect(d.dependency).toBeNull();
       });
 
       it('should instantiate directives that depends on the host component', () => {
diff --git a/packages/http/test/backends/jsonp_backend_spec.ts b/packages/http/test/backends/jsonp_backend_spec.ts
index 9f2cacf37e..724cec7107 100644
--- a/packages/http/test/backends/jsonp_backend_spec.ts
+++ b/packages/http/test/backends/jsonp_backend_spec.ts
@@ -115,12 +115,8 @@ class MockBrowserJsonp extends BrowserJsonp {
          inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            const connection = new (JSONPConnection as any)(sampleRequest, new MockBrowserJsonp());
            connection.response.subscribe(
-               (res: Response) => {
-                 expect('response listener called').toBe(false);
-                 async.done();
-               },
-               (err: Response) => {
-                 expect(err.text()).toEqual('JSONP injected script did not invoke callback.');
+               () => async.fail('Response listener should not be called'), (err: Response) => {
+                 expect(err.text()).toBe('JSONP injected script did not invoke callback.');
                  async.done();
                });
 
@@ -132,11 +128,7 @@ class MockBrowserJsonp extends BrowserJsonp {
            const connection = new (JSONPConnection as any)(sampleRequest, new MockBrowserJsonp());
 
            connection.response.subscribe(
-               (res: Response) => {
-                 expect('response listener called').toBe(false);
-                 async.done();
-               },
-               (err: Response) => {
+               () => async.fail('Response listener should not be called'), (err: Response) => {
                  expect(err.text()).toBe('Oops!');
                  async.done();
                });
diff --git a/packages/platform-browser/test/browser/bootstrap_spec.ts b/packages/platform-browser/test/browser/bootstrap_spec.ts
index 778e695f72..5bc4b1eaf3 100644
--- a/packages/platform-browser/test/browser/bootstrap_spec.ts
+++ b/packages/platform-browser/test/browser/bootstrap_spec.ts
@@ -212,9 +212,10 @@ function bootstrap(
          bootstrap(RootCmp, [{provide: ErrorHandler, useValue: errorHandler}], [], [
            CustomModule
          ]).then(null, (e: Error) => {
-           expect(e.message).toContain(`StaticInjectorError(TestModule)[CustomCmp -> IDontExist]: 
-  StaticInjectorError(Platform: core)[CustomCmp -> IDontExist]: 
-    NullInjectorError: No provider for IDontExist!`);
+           expect(e.message).toContain(
+               'StaticInjectorError(TestModule)[CustomCmp -> IDontExist]: \n' +
+               '  StaticInjectorError(Platform: core)[CustomCmp -> IDontExist]: \n' +
+               '    NullInjectorError: No provider for IDontExist!');
            async.done();
            return null;
          });
@@ -255,7 +256,7 @@ function bootstrap(
 
     it('should create an injector promise', () => {
       const refPromise = bootstrap(HelloRootCmp, testProviders);
-      expect(refPromise).not.toBe(null);
+      expect(refPromise).toEqual(jasmine.any(Promise));
     });
 
     it('should set platform name to browser',
diff --git a/packages/platform-browser/testing/src/matchers.ts b/packages/platform-browser/testing/src/matchers.ts
index cc1aae1bf3..3c9ae4ba48 100644
--- a/packages/platform-browser/testing/src/matchers.ts
+++ b/packages/platform-browser/testing/src/matchers.ts
@@ -15,7 +15,7 @@ import {ɵgetDOM as getDOM} from '@angular/platform-browser';
 /**
  * Jasmine matchers that check Angular specific conditions.
  */
-export interface NgMatchers extends jasmine.Matchers<any> {
+export interface NgMatchers<T = any> extends jasmine.Matchers<T> {
   /**
    * Expect the value to be a `Promise`.
    *
@@ -82,7 +82,7 @@ export interface NgMatchers extends jasmine.Matchers<any> {
   /**
    * Invert the matchers.
    */
-  not: NgMatchers;
+  not: NgMatchers<T>;
 }
 
 const _global = <any>(typeof window === 'undefined' ? global : window);
@@ -94,7 +94,7 @@ const _global = <any>(typeof window === 'undefined' ? global : window);
  *
  * {@example testing/ts/matchers.ts region='toHaveText'}
  */
-export const expect: (actual: any) => NgMatchers = <any>_global.expect;
+export const expect: <T = any>(actual: T) => NgMatchers<T> = _global.expect;
 
 
 // Some Map polyfills don't polyfill Map.toString correctly, which
diff --git a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
index 0457218190..4b1320c72f 100644
--- a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
+++ b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
@@ -98,7 +98,7 @@ let lastCreatedRenderer: Renderer2;
                  .createComponent(MyComp2);
 
          const checkSetters = (componentRef: ComponentRef<any>, workerEl: any) => {
-           expect(lastCreatedRenderer).not.toEqual(null);
+           expect(lastCreatedRenderer).not.toBeNull();
 
            const el = getRenderElement(workerEl);
            lastCreatedRenderer.setProperty(workerEl, 'tabIndex', 1);
diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
index 80d4695ae1..4d16d5474f 100644
--- a/packages/router/test/integration.spec.ts
+++ b/packages/router/test/integration.spec.ts
@@ -187,8 +187,6 @@ describe('Integration', () => {
     });
 
     describe('should advance the parent route after deactivating its children', () => {
-      let log: string[] = [];
-
       @Component({template: '<router-outlet></router-outlet>'})
       class Parent {
         constructor(route: ActivatedRoute) {
@@ -214,10 +212,7 @@ describe('Integration', () => {
       class TestModule {
       }
 
-      beforeEach(() => {
-        log = [];
-        TestBed.configureTestingModule({imports: [TestModule]});
-      });
+      beforeEach(() => TestBed.configureTestingModule({imports: [TestModule]}));
 
       it('should work',
          fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
@@ -874,8 +869,8 @@ describe('Integration', () => {
      })));
 
   it('should dispatch NavigationError after the url has been reset back', fakeAsync(() => {
-       const router = TestBed.get(Router);
-       const location = TestBed.get(Location);
+       const router: Router = TestBed.get(Router);
+       const location: SpyLocation = TestBed.get(Location);
        const fixture = createRoot(router, RootCmp);
 
        router.resetConfig(
@@ -884,9 +879,9 @@ describe('Integration', () => {
        router.navigateByUrl('/simple');
        advance(fixture);
 
-       let routerUrlBeforeEmittingError;
-       let locationUrlBeforeEmittingError;
-       router.events.forEach((e: any) => {
+       let routerUrlBeforeEmittingError = '';
+       let locationUrlBeforeEmittingError = '';
+       router.events.forEach(e => {
          if (e instanceof NavigationError) {
            routerUrlBeforeEmittingError = router.url;
            locationUrlBeforeEmittingError = location.path();
@@ -965,8 +960,8 @@ describe('Integration', () => {
        TestBed.configureTestingModule(
            {providers: [{provide: 'returnsFalse', useValue: () => false}]});
 
-       const router = TestBed.get(Router);
-       const location = TestBed.get(Location);
+       const router: Router = TestBed.get(Router);
+       const location: SpyLocation = TestBed.get(Location);
 
        const fixture = createRoot(router, RootCmp);
 
@@ -978,18 +973,19 @@ describe('Integration', () => {
        router.navigateByUrl('/simple');
        advance(fixture);
 
-       let routerUrlBeforeEmittingError;
-       let locationUrlBeforeEmittingError;
-       router.events.forEach((e: any) => {
+       let routerUrlBeforeEmittingError = '';
+       let locationUrlBeforeEmittingError = '';
+       router.events.forEach(e => {
          if (e instanceof NavigationCancel) {
            routerUrlBeforeEmittingError = router.url;
            locationUrlBeforeEmittingError = location.path();
          }
        });
 
-       (<any>location).simulateHashChange('/throwing');
+       location.simulateHashChange('/throwing');
        advance(fixture);
 
+       expect(routerUrlBeforeEmittingError).toEqual('/simple');
        expect(locationUrlBeforeEmittingError).toEqual('/simple');
      }));
 

From e01b539ee5c18a2aaef782296d093c8a544e37fb Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 5 Jul 2018 18:10:09 +0300
Subject: [PATCH 419/582] refactor: infer type for `it()` assertion functions
 (#19904)

PR Close #19904
---
 .../doc-viewer/doc-viewer.component.spec.ts   |  2 +-
 .../webdriver/chrome_driver_extension_spec.ts |  2 +-
 packages/common/http/test/client_spec.ts      | 34 +++++++++----------
 packages/common/http/test/jsonp_spec.ts       |  6 ++--
 packages/common/http/test/module_spec.ts      | 23 ++++++-------
 packages/common/http/test/xhr_spec.ts         | 30 ++++++++--------
 .../common/http/testing/test/request_spec.ts  |  4 +--
 packages/core/testing/src/testing_internal.ts | 27 ++++++++-------
 .../e2e_test/testability_example_spec.ts      |  2 +-
 .../test/browser/bootstrap_spec.ts            |  2 +-
 .../config/test/generator_spec.ts             |  4 +--
 packages/service-worker/test/comm_spec.ts     | 12 +++----
 12 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts
index 1f1ae32a71..0f94629bf3 100644
--- a/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts
+++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts
@@ -595,7 +595,7 @@ describe('DocViewerComponent', () => {
           describe(`(.${NO_ANIMATIONS}: ${noAnimations})`, () => {
             beforeEach(() => docViewerEl.classList[noAnimations ? 'add' : 'remove'](NO_ANIMATIONS));
 
-            it('should return an observable', (done: DoneFn) => {
+            it('should return an observable', done => {
               docViewer.swapViews().subscribe(done, done.fail);
             });
 
diff --git a/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts
index e81e10481d..640143b541 100644
--- a/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts
+++ b/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, describe, expect, iit, inject, it} from '@angular/core/testing/src/testing_internal';
+import {AsyncTestCompleter, describe, expect, fit, inject, it} from '@angular/core/testing/src/testing_internal';
 
 import {ChromeDriverExtension, Injector, Options, WebDriverAdapter, WebDriverExtension} from '../../index';
 import {TraceEventFactory} from '../trace_event_factory';
diff --git a/packages/common/http/test/client_spec.ts b/packages/common/http/test/client_spec.ts
index 145d0cff9d..9c9942af7b 100644
--- a/packages/common/http/test/client_spec.ts
+++ b/packages/common/http/test/client_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ddescribe, describe, iit, it} from '@angular/core/testing/src/testing_internal';
+import {ddescribe, describe, fit, it} from '@angular/core/testing/src/testing_internal';
 import {toArray} from 'rxjs/operators';
 
 import {HttpClient} from '../src/client';
@@ -23,31 +23,31 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
     });
     afterEach(() => { backend.verify(); });
     describe('makes a basic request', () => {
-      it('for JSON data', (done: DoneFn) => {
+      it('for JSON data', done => {
         client.get('/test').subscribe(res => {
           expect((res as any)['data']).toEqual('hello world');
           done();
         });
         backend.expectOne('/test').flush({'data': 'hello world'});
       });
-      it('for text data', (done: DoneFn) => {
+      it('for text data', done => {
         client.get('/test', {responseType: 'text'}).subscribe(res => {
           expect(res).toEqual('hello world');
           done();
         });
         backend.expectOne('/test').flush('hello world');
       });
-      it('with headers', (done: DoneFn) => {
+      it('with headers', done => {
         client.get('/test', {headers: {'X-Option': 'true'}}).subscribe(() => done());
         const req = backend.expectOne('/test');
         expect(req.request.headers.get('X-Option')).toEqual('true');
         req.flush({});
       });
-      it('with params', (done: DoneFn) => {
+      it('with params', done => {
         client.get('/test', {params: {'test': 'true'}}).subscribe(() => done());
         backend.expectOne('/test?test=true').flush({});
       });
-      it('for an arraybuffer', (done: DoneFn) => {
+      it('for an arraybuffer', done => {
         const body = new ArrayBuffer(4);
         client.get('/test', {responseType: 'arraybuffer'}).subscribe(res => {
           expect(res).toBe(body);
@@ -56,7 +56,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
         backend.expectOne('/test').flush(body);
       });
       if (typeof Blob !== 'undefined') {
-        it('for a blob', (done: DoneFn) => {
+        it('for a blob', done => {
           const body = new Blob([new ArrayBuffer(4)]);
           client.get('/test', {responseType: 'blob'}).subscribe(res => {
             expect(res).toBe(body);
@@ -65,7 +65,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
           backend.expectOne('/test').flush(body);
         });
       }
-      it('that returns a response', (done: DoneFn) => {
+      it('that returns a response', done => {
         const body = {'data': 'hello world'};
         client.get('/test', {observe: 'response'}).subscribe(res => {
           expect(res instanceof HttpResponse).toBe(true);
@@ -74,7 +74,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
         });
         backend.expectOne('/test').flush(body);
       });
-      it('that returns a stream of events', (done: DoneFn) => {
+      it('that returns a stream of events', done => {
         client.get('/test', {observe: 'events'}).pipe(toArray()).toPromise().then(events => {
           expect(events.length).toBe(2);
           let x = HttpResponse;
@@ -85,7 +85,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
         });
         backend.expectOne('/test').flush({'data': 'hello world'});
       });
-      it('with progress events enabled', (done: DoneFn) => {
+      it('with progress events enabled', done => {
         client.get('/test', {reportProgress: true}).subscribe(() => done());
         const req = backend.expectOne('/test');
         expect(req.request.reportProgress).toEqual(true);
@@ -93,7 +93,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
       });
     });
     describe('makes a POST request', () => {
-      it('with text data', (done: DoneFn) => {
+      it('with text data', done => {
         client.post('/test', 'text body', {observe: 'response', responseType: 'text'})
             .subscribe(res => {
               expect(res.ok).toBeTruthy();
@@ -102,7 +102,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
             });
         backend.expectOne('/test').flush('hello world');
       });
-      it('with json data', (done: DoneFn) => {
+      it('with json data', done => {
         const body = {data: 'json body'};
         client.post('/test', body, {observe: 'response', responseType: 'text'}).subscribe(res => {
           expect(res.ok).toBeTruthy();
@@ -113,7 +113,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
         expect(testReq.request.body).toBe(body);
         testReq.flush('hello world');
       });
-      it('with a json body of false', (done: DoneFn) => {
+      it('with a json body of false', done => {
         client.post('/test', false, {observe: 'response', responseType: 'text'}).subscribe(res => {
           expect(res.ok).toBeTruthy();
           expect(res.status).toBe(200);
@@ -123,7 +123,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
         expect(testReq.request.body).toBe(false);
         testReq.flush('hello world');
       });
-      it('with a json body of 0', (done: DoneFn) => {
+      it('with a json body of 0', done => {
         client.post('/test', 0, {observe: 'response', responseType: 'text'}).subscribe(res => {
           expect(res.ok).toBeTruthy();
           expect(res.status).toBe(200);
@@ -133,7 +133,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
         expect(testReq.request.body).toBe(0);
         testReq.flush('hello world');
       });
-      it('with an arraybuffer', (done: DoneFn) => {
+      it('with an arraybuffer', done => {
         const body = new ArrayBuffer(4);
         client.post('/test', body, {observe: 'response', responseType: 'text'}).subscribe(res => {
           expect(res.ok).toBeTruthy();
@@ -146,14 +146,14 @@ import {HttpClientTestingBackend} from '../testing/src/backend';
       });
     });
     describe('makes a JSONP request', () => {
-      it('with properly set method and callback', (done: DoneFn) => {
+      it('with properly set method and callback', done => {
         client.jsonp('/test', 'myCallback').subscribe(() => done());
         backend.expectOne({method: 'JSONP', url: '/test?myCallback=JSONP_CALLBACK'})
             .flush('hello world');
       });
     });
     describe('makes a request for an error response', () => {
-      it('with a JSON body', (done: DoneFn) => {
+      it('with a JSON body', done => {
         client.get('/test').subscribe(() => {}, (res: HttpErrorResponse) => {
           expect(res.error.data).toEqual('hello world');
           done();
diff --git a/packages/common/http/test/jsonp_spec.ts b/packages/common/http/test/jsonp_spec.ts
index 7571f2c93d..2d0fef287d 100644
--- a/packages/common/http/test/jsonp_spec.ts
+++ b/packages/common/http/test/jsonp_spec.ts
@@ -35,7 +35,7 @@ const SAMPLE_REQ = new HttpRequest<never>('JSONP', '/test');
       document = new MockDocument();
       backend = new JsonpClientBackend(home, document);
     });
-    it('handles a basic request', (done: DoneFn) => {
+    it('handles a basic request', done => {
       backend.handle(SAMPLE_REQ).pipe(toArray()).subscribe(events => {
         expect(events.map(event => event.type)).toEqual([
           HttpEventType.Sent,
@@ -46,7 +46,7 @@ const SAMPLE_REQ = new HttpRequest<never>('JSONP', '/test');
       runOnlyCallback(home, {data: 'This is a test'});
       document.mockLoad();
     });
-    it('handles an error response properly', (done: DoneFn) => {
+    it('handles an error response properly', done => {
       const error = new Error('This is a test error');
       backend.handle(SAMPLE_REQ).pipe(toArray()).subscribe(undefined, (err: HttpErrorResponse) => {
         expect(err.status).toBe(0);
@@ -62,7 +62,7 @@ const SAMPLE_REQ = new HttpRequest<never>('JSONP', '/test');
       it('when response type is not json',
          () => expect(() => backend.handle(SAMPLE_REQ.clone<never>({responseType: 'text'})))
                    .toThrowError(JSONP_ERR_WRONG_RESPONSE_TYPE));
-      it('when callback is never called', (done: DoneFn) => {
+      it('when callback is never called', done => {
         backend.handle(SAMPLE_REQ).subscribe(undefined, (err: HttpErrorResponse) => {
           expect(err.status).toBe(0);
           expect(err.error instanceof Error).toEqual(true);
diff --git a/packages/common/http/test/module_spec.ts b/packages/common/http/test/module_spec.ts
index e556e7a34e..33dd1a47ed 100644
--- a/packages/common/http/test/module_spec.ts
+++ b/packages/common/http/test/module_spec.ts
@@ -67,23 +67,22 @@ class ReentrantInterceptor implements HttpInterceptor {
         ],
       });
     });
-    it('initializes HttpClient properly', (done: DoneFn) => {
+    it('initializes HttpClient properly', done => {
       injector.get(HttpClient).get('/test', {responseType: 'text'}).subscribe(value => {
         expect(value).toBe('ok!');
         done();
       });
       injector.get(HttpTestingController).expectOne('/test').flush('ok!');
     });
-    it('intercepts outbound responses in the order in which interceptors were bound',
-       (done: DoneFn) => {
-         injector.get(HttpClient)
-             .get('/test', {observe: 'response', responseType: 'text'})
-             .subscribe(value => done());
-         const req = injector.get(HttpTestingController).expectOne('/test') as TestRequest;
-         expect(req.request.headers.get('Intercepted')).toEqual('A,B');
-         req.flush('ok!');
-       });
-    it('intercepts inbound responses in the right (reverse binding) order', (done: DoneFn) => {
+    it('intercepts outbound responses in the order in which interceptors were bound', done => {
+      injector.get(HttpClient)
+          .get('/test', {observe: 'response', responseType: 'text'})
+          .subscribe(value => done());
+      const req = injector.get(HttpTestingController).expectOne('/test') as TestRequest;
+      expect(req.request.headers.get('Intercepted')).toEqual('A,B');
+      req.flush('ok!');
+    });
+    it('intercepts inbound responses in the right (reverse binding) order', done => {
       injector.get(HttpClient)
           .get('/test', {observe: 'response', responseType: 'text'})
           .subscribe(value => {
@@ -92,7 +91,7 @@ class ReentrantInterceptor implements HttpInterceptor {
           });
       injector.get(HttpTestingController).expectOne('/test').flush('ok!');
     });
-    it('allows interceptors to inject HttpClient', (done: DoneFn) => {
+    it('allows interceptors to inject HttpClient', done => {
       TestBed.resetTestingModule();
       injector = TestBed.configureTestingModule({
         imports: [HttpClientTestingModule],
diff --git a/packages/common/http/test/xhr_spec.ts b/packages/common/http/test/xhr_spec.ts
index 9ff3ccb979..4218532c88 100644
--- a/packages/common/http/test/xhr_spec.ts
+++ b/packages/common/http/test/xhr_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ddescribe, describe, iit, it} from '@angular/core/testing/src/testing_internal';
+import {ddescribe, describe, fit, it} from '@angular/core/testing/src/testing_internal';
 import {Observable} from 'rxjs';
 import {toArray} from 'rxjs/operators';
 
@@ -131,7 +131,7 @@ const XSSI_PREFIX = ')]}\'\n';
       const res = events[1] as HttpResponse<{data: string}>;
       expect(res.body !.data).toBe('some data');
     });
-    it('emits unsuccessful responses via the error path', (done: DoneFn) => {
+    it('emits unsuccessful responses via the error path', done => {
       backend.handle(TEST_POST).subscribe(undefined, (err: HttpErrorResponse) => {
         expect(err instanceof HttpErrorResponse).toBe(true);
         expect(err.error).toBe('this is the error');
@@ -139,7 +139,7 @@ const XSSI_PREFIX = ')]}\'\n';
       });
       factory.mock.mockFlush(400, 'Bad Request', 'this is the error');
     });
-    it('emits real errors via the error path', (done: DoneFn) => {
+    it('emits real errors via the error path', done => {
       backend.handle(TEST_POST).subscribe(undefined, (err: HttpErrorResponse) => {
         expect(err instanceof HttpErrorResponse).toBe(true);
         expect(err.error instanceof Error);
@@ -148,7 +148,7 @@ const XSSI_PREFIX = ')]}\'\n';
       factory.mock.mockErrorEvent(new Error('blah'));
     });
     describe('progress events', () => {
-      it('are emitted for download progress', (done: DoneFn) => {
+      it('are emitted for download progress', done => {
         backend.handle(TEST_POST.clone({reportProgress: true}))
             .pipe(toArray())
             .subscribe(events => {
@@ -178,7 +178,7 @@ const XSSI_PREFIX = ')]}\'\n';
         factory.mock.mockDownloadProgressEvent(200, 300);
         factory.mock.mockFlush(200, 'OK', 'downloaded');
       });
-      it('are emitted for upload progress', (done: DoneFn) => {
+      it('are emitted for upload progress', done => {
         backend.handle(TEST_POST.clone({reportProgress: true}))
             .pipe(toArray())
             .subscribe(events => {
@@ -202,7 +202,7 @@ const XSSI_PREFIX = ')]}\'\n';
         factory.mock.mockUploadProgressEvent(200, 300);
         factory.mock.mockFlush(200, 'OK', 'Done');
       });
-      it('are emitted when both upload and download progress are available', (done: DoneFn) => {
+      it('are emitted when both upload and download progress are available', done => {
         backend.handle(TEST_POST.clone({reportProgress: true}))
             .pipe(toArray())
             .subscribe(events => {
@@ -219,7 +219,7 @@ const XSSI_PREFIX = ')]}\'\n';
         factory.mock.mockDownloadProgressEvent(200, 300);
         factory.mock.mockFlush(200, 'OK', 'Done');
       });
-      it('are emitted even if length is not computable', (done: DoneFn) => {
+      it('are emitted even if length is not computable', done => {
         backend.handle(TEST_POST.clone({reportProgress: true}))
             .pipe(toArray())
             .subscribe(events => {
@@ -236,7 +236,7 @@ const XSSI_PREFIX = ')]}\'\n';
         factory.mock.mockDownloadProgressEvent(200);
         factory.mock.mockFlush(200, 'OK', 'Done');
       });
-      it('include ResponseHeader with headers and status', (done: DoneFn) => {
+      it('include ResponseHeader with headers and status', done => {
         backend.handle(TEST_POST.clone({reportProgress: true}))
             .pipe(toArray())
             .subscribe(events => {
@@ -261,7 +261,7 @@ const XSSI_PREFIX = ')]}\'\n';
         sub.unsubscribe();
         expect(factory.mock.listeners.progress).toBeUndefined();
       });
-      it('do not cause headers to be re-parsed on main response', (done: DoneFn) => {
+      it('do not cause headers to be re-parsed on main response', done => {
         backend.handle(TEST_POST.clone({reportProgress: true}))
             .pipe(toArray())
             .subscribe(events => {
@@ -284,7 +284,7 @@ const XSSI_PREFIX = ')]}\'\n';
       });
     });
     describe('gets response URL', () => {
-      it('from XHR.responsesURL', (done: DoneFn) => {
+      it('from XHR.responsesURL', done => {
         backend.handle(TEST_POST).pipe(toArray()).subscribe(events => {
           expect(events.length).toBe(2);
           expect(events[1].type).toBe(HttpEventType.Response);
@@ -295,7 +295,7 @@ const XSSI_PREFIX = ')]}\'\n';
         factory.mock.responseURL = '/response/url';
         factory.mock.mockFlush(200, 'OK', 'Test');
       });
-      it('from X-Request-URL header if XHR.responseURL is not present', (done: DoneFn) => {
+      it('from X-Request-URL header if XHR.responseURL is not present', done => {
         backend.handle(TEST_POST).pipe(toArray()).subscribe(events => {
           expect(events.length).toBe(2);
           expect(events[1].type).toBe(HttpEventType.Response);
@@ -306,7 +306,7 @@ const XSSI_PREFIX = ')]}\'\n';
         factory.mock.mockResponseHeaders = 'X-Request-URL: /response/url\n';
         factory.mock.mockFlush(200, 'OK', 'Test');
       });
-      it('falls back on Request.url if neither are available', (done: DoneFn) => {
+      it('falls back on Request.url if neither are available', done => {
         backend.handle(TEST_POST).pipe(toArray()).subscribe(events => {
           expect(events.length).toBe(2);
           expect(events[1].type).toBe(HttpEventType.Response);
@@ -318,7 +318,7 @@ const XSSI_PREFIX = ')]}\'\n';
       });
     });
     describe('corrects for quirks', () => {
-      it('by normalizing 1223 status to 204', (done: DoneFn) => {
+      it('by normalizing 1223 status to 204', done => {
         backend.handle(TEST_POST).pipe(toArray()).subscribe(events => {
           expect(events.length).toBe(2);
           expect(events[1].type).toBe(HttpEventType.Response);
@@ -328,7 +328,7 @@ const XSSI_PREFIX = ')]}\'\n';
         });
         factory.mock.mockFlush(1223, 'IE Special Status', 'Test');
       });
-      it('by normalizing 0 status to 200 if a body is present', (done: DoneFn) => {
+      it('by normalizing 0 status to 200 if a body is present', done => {
         backend.handle(TEST_POST).pipe(toArray()).subscribe(events => {
           expect(events.length).toBe(2);
           expect(events[1].type).toBe(HttpEventType.Response);
@@ -338,7 +338,7 @@ const XSSI_PREFIX = ')]}\'\n';
         });
         factory.mock.mockFlush(0, 'CORS 0 status', 'Test');
       });
-      it('by leaving 0 status as 0 if a body is not present', (done: DoneFn) => {
+      it('by leaving 0 status as 0 if a body is not present', done => {
         backend.handle(TEST_POST).pipe(toArray()).subscribe(
             undefined, (error: HttpErrorResponse) => {
               expect(error.status).toBe(0);
diff --git a/packages/common/http/testing/test/request_spec.ts b/packages/common/http/testing/test/request_spec.ts
index 111a4bfaad..777c18dfc0 100644
--- a/packages/common/http/testing/test/request_spec.ts
+++ b/packages/common/http/testing/test/request_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ddescribe, describe, iit, it} from '@angular/core/testing/src/testing_internal';
+import {ddescribe, describe, fit, it} from '@angular/core/testing/src/testing_internal';
 
 import {HttpClient} from '../../src/client';
 import {HttpClientTestingBackend} from '../src/backend';
@@ -24,4 +24,4 @@ describe('HttpClient TestRequest', () => {
 
     expect(resp).toBeNull();
   });
-});
\ No newline at end of file
+});
diff --git a/packages/core/testing/src/testing_internal.ts b/packages/core/testing/src/testing_internal.ts
index a83111fd40..2ee60282ed 100644
--- a/packages/core/testing/src/testing_internal.ts
+++ b/packages/core/testing/src/testing_internal.ts
@@ -30,7 +30,7 @@ const jsmDescribe = _global.describe;
 const jsmDDescribe = _global.fdescribe;
 const jsmXDescribe = _global.xdescribe;
 const jsmIt = _global.it;
-const jsmIIt = _global.fit;
+const jsmFIt = _global.fit;
 const jsmXIt = _global.xit;
 
 const runnerStack: BeforeEachRunner[] = [];
@@ -112,16 +112,17 @@ export function beforeEachProviders(fn: Function): void {
 }
 
 
-function _it(jsmFn: Function, name: string, testFn: Function, testTimeOut: number): void {
+function _it(
+    jsmFn: Function, testName: string, testFn: (done?: DoneFn) => any, testTimeout = 0): void {
   if (runnerStack.length == 0) {
     // This left here intentionally, as we should never get here, and it aids debugging.
     debugger;
     throw new Error('Empty Stack!');
   }
   const runner = runnerStack[runnerStack.length - 1];
-  const timeOut = Math.max(globalTimeOut, testTimeOut);
+  const timeout = Math.max(globalTimeOut, testTimeout);
 
-  jsmFn(name, (done: any) => {
+  jsmFn(testName, (done: DoneFn) => {
     const completerProvider = {
       provide: AsyncTestCompleter,
       useFactory: () => {
@@ -132,11 +133,11 @@ function _it(jsmFn: Function, name: string, testFn: Function, testTimeOut: numbe
     testBed.configureTestingModule({providers: [completerProvider]});
     runner.run();
 
-    if (testFn.length == 0) {
+    if (testFn.length === 0) {
       const retVal = testFn();
       if (isPromise(retVal)) {
         // Asynchronous test function that returns a Promise - wait for completion.
-        (<Promise<any>>retVal).then(done, done.fail);
+        retVal.then(done, done.fail);
       } else {
         // Synchronous test function - complete immediately.
         done();
@@ -145,19 +146,19 @@ function _it(jsmFn: Function, name: string, testFn: Function, testTimeOut: numbe
       // Asynchronous test function that takes in 'done' parameter.
       testFn(done);
     }
-  }, timeOut);
+  }, timeout);
 }
 
-export function it(name: any, fn: any, timeOut: any = null): void {
-  return _it(jsmIt, name, fn, timeOut);
+export function it(expectation: string, assertion: (done: DoneFn) => any, timeout?: number): void {
+  return _it(jsmIt, expectation, assertion, timeout);
 }
 
-export function xit(name: any, fn: any, timeOut: any = null): void {
-  return _it(jsmXIt, name, fn, timeOut);
+export function fit(expectation: string, assertion: (done: DoneFn) => any, timeout?: number): void {
+  return _it(jsmFIt, expectation, assertion, timeout);
 }
 
-export function iit(name: any, fn: any, timeOut: any = null): void {
-  return _it(jsmIIt, name, fn, timeOut);
+export function xit(expectation: string, assertion: (done: DoneFn) => any, timeout?: number): void {
+  return _it(jsmXIt, expectation, assertion, timeout);
 }
 
 export class SpyObject {
diff --git a/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts b/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts
index 83a28698a2..a913d8c75c 100644
--- a/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts
+++ b/packages/examples/core/testability/ts/whenStable/e2e_test/testability_example_spec.ts
@@ -15,7 +15,7 @@ describe('testability example', () => {
   describe('using task tracking', () => {
     const URL = '/core/testability/ts/whenStable/';
 
-    it('times out with a list of tasks', (done: DoneFn) => {
+    it('times out with a list of tasks', done => {
       browser.get(URL);
       browser.ignoreSynchronization = true;
 
diff --git a/packages/platform-browser/test/browser/bootstrap_spec.ts b/packages/platform-browser/test/browser/bootstrap_spec.ts
index 5bc4b1eaf3..a087d54f6c 100644
--- a/packages/platform-browser/test/browser/bootstrap_spec.ts
+++ b/packages/platform-browser/test/browser/bootstrap_spec.ts
@@ -12,7 +12,7 @@ import {ApplicationRef, destroyPlatform} from '@angular/core/src/application_ref
 import {Console} from '@angular/core/src/console';
 import {ComponentRef} from '@angular/core/src/linker/component_factory';
 import {Testability, TestabilityRegistry} from '@angular/core/src/testability/testability';
-import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, describe, iit, inject, it} from '@angular/core/testing/src/testing_internal';
+import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, describe, fit, inject, it} from '@angular/core/testing/src/testing_internal';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
diff --git a/packages/service-worker/config/test/generator_spec.ts b/packages/service-worker/config/test/generator_spec.ts
index d4fabf98f9..fd614d1215 100644
--- a/packages/service-worker/config/test/generator_spec.ts
+++ b/packages/service-worker/config/test/generator_spec.ts
@@ -11,7 +11,7 @@ import {MockFilesystem} from '../testing/mock';
 
 {
   describe('Generator', () => {
-    it('generates a correct config', (done: DoneFn) => {
+    it('generates a correct config', done => {
       const fs = new MockFilesystem({
         '/index.html': 'This is a test',
         '/test.txt': 'Another test',
@@ -112,7 +112,7 @@ import {MockFilesystem} from '../testing/mock';
           .catch(err => done.fail(err));
     });
 
-    it('uses default `navigationUrls` if not provided', (done: DoneFn) => {
+    it('uses default `navigationUrls` if not provided', done => {
       const fs = new MockFilesystem({
         '/index.html': 'This is a test',
       });
diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts
index 4a3388a317..74399689ce 100644
--- a/packages/service-worker/test/comm_spec.ts
+++ b/packages/service-worker/test/comm_spec.ts
@@ -27,7 +27,7 @@ import {async_fit, async_it} from './async';
     });
 
     describe('NgswCommsChannel', () => {
-      it('can access the registration when it comes before subscription', (done: DoneFn) => {
+      it('can access the registration when it comes before subscription', done => {
         const mock = new MockServiceWorkerContainer();
         const comm = new NgswCommChannel(mock as any);
         const regPromise = mock.getRegistration() as any as MockServiceWorkerRegistration;
@@ -36,7 +36,7 @@ import {async_fit, async_it} from './async';
 
         (comm as any).registration.subscribe((reg: any) => { done(); });
       });
-      it('can access the registration when it comes after subscription', (done: DoneFn) => {
+      it('can access the registration when it comes after subscription', done => {
         const mock = new MockServiceWorkerContainer();
         const comm = new NgswCommChannel(mock as any);
         const regPromise = mock.getRegistration() as any as MockServiceWorkerRegistration;
@@ -385,7 +385,7 @@ import {async_fit, async_it} from './async';
         update = new SwUpdate(comm);
         mock.setupSw();
       });
-      it('processes update availability notifications when sent', (done: DoneFn) => {
+      it('processes update availability notifications when sent', done => {
         update.available.subscribe(event => {
           expect(event.current).toEqual({hash: 'A'});
           expect(event.available).toEqual({hash: 'B'});
@@ -402,7 +402,7 @@ import {async_fit, async_it} from './async';
           },
         });
       });
-      it('processes update activation notifications when sent', (done: DoneFn) => {
+      it('processes update activation notifications when sent', done => {
         update.activated.subscribe(event => {
           expect(event.previous).toEqual({hash: 'A'});
           expect(event.current).toEqual({hash: 'B'});
@@ -419,7 +419,7 @@ import {async_fit, async_it} from './async';
           },
         });
       });
-      it('activates updates when requested', (done: DoneFn) => {
+      it('activates updates when requested', done => {
         mock.messages.subscribe((msg: {action: string, statusNonce: number}) => {
           expect(msg.action).toEqual('ACTIVATE_UPDATE');
           mock.sendMessage({
@@ -430,7 +430,7 @@ import {async_fit, async_it} from './async';
         });
         return update.activateUpdate().then(() => done()).catch(err => done.fail(err));
       });
-      it('reports activation failure when requested', (done: DoneFn) => {
+      it('reports activation failure when requested', done => {
         mock.messages.subscribe((msg: {action: string, statusNonce: number}) => {
           expect(msg.action).toEqual('ACTIVATE_UPDATE');
           mock.sendMessage({

From c0e2dba07bc43272f45537299f1a097b83bafb49 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 5 Jul 2018 01:53:51 +0300
Subject: [PATCH 420/582] build: upgrade jasmine to 2.99.x and fix tests
 (#19904)

PR Close #19904
---
 package.json                                 |  4 +-
 packages/upgrade/test/common/test_helpers.ts | 39 ++++++++++++++++++--
 yarn.lock                                    | 16 +++++++-
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 2d42212d1c..9c28cd9ad1 100644
--- a/package.json
+++ b/package.json
@@ -85,8 +85,8 @@
     "hammerjs": "2.0.8",
     "husky": "^0.14.3",
     "incremental-dom": "0.4.1",
-    "jasmine": "2.8",
-    "jasmine-core": "2.8",
+    "jasmine": "2",
+    "jasmine-core": "2",
     "jpm": "1.3.1",
     "karma": "0.13.20",
     "karma-browserstack-launcher": "0.1.9",
diff --git a/packages/upgrade/test/common/test_helpers.ts b/packages/upgrade/test/common/test_helpers.ts
index 1f5a27e979..c0f78a6b4f 100644
--- a/packages/upgrade/test/common/test_helpers.ts
+++ b/packages/upgrade/test/common/test_helpers.ts
@@ -22,22 +22,50 @@ const ng1Versions = [
 export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) {
   return (specSuite: () => void) => ng1Versions.forEach(({label, files}) => {
     describe(`[AngularJS v${label}]`, () => {
+      // Problem:
+      // As soon as `angular-mocks.js` is loaded, it runs `beforeEach` and `afterEach` to register
+      // setup/tear down callbacks. Jasmine 2.9+ does not allow `beforeEach`/`afterEach` to be
+      // nested inside a `beforeAll` call (only inside `describe`).
+      // Hacky work-around:
+      // Patch the affected jasmine methods while loading `angular-mocks.js` (inside `beforeAll`) to
+      // capture the registered callbacks. Also, inside the `describe` call register a callback with
+      // each affected method that runs all captured callbacks.
+      // (Note: Currently, async callbacks are not supported, but that should be OK, since
+      // `angular-mocks.js` does not use them.)
+      const methodsToPatch = ['beforeAll', 'beforeEach', 'afterEach', 'afterAll'];
+      const methodCallbacks = methodsToPatch.reduce<{[name: string]: any[]}>(
+          (aggr, method) => ({...aggr, [method]: []}), {});
+      const win = window as any;
+
+      function patchJasmineMethods(): () => void {
+        const originalMethods: {[name: string]: any} = {};
+
+        methodsToPatch.forEach(method => {
+          originalMethods[method] = win[method];
+          win[method] = (cb: any) => methodCallbacks[method].push(cb);
+        });
+
+        return () => methodsToPatch.forEach(method => win[method] = originalMethods[method]);
+      }
+
       beforeAll(done => {
         // Load AngularJS before running tests.
         files
             .reduce(
                 (prev, file) => prev.then(() => new Promise<void>((resolve, reject) => {
+                                            const restoreMethods = patchJasmineMethods();
                                             const script = document.createElement('script');
                                             script.src = `base/angular/node_modules/${file}`;
                                             script.onerror = reject;
                                             script.onload = () => {
                                               document.body.removeChild(script);
+                                              restoreMethods();
                                               resolve();
                                             };
                                             document.body.appendChild(script);
                                           })),
                 Promise.resolve())
-            .then(() => setNg1((window as any).angular))
+            .then(() => setNg1(win.angular))
             .then(done, done.fail);
       });
 
@@ -45,13 +73,18 @@ export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) {
         // In these tests we are loading different versions of AngularJS on the same window.
         // AngularJS leaves an "expandoId" property on `document`, which can trick subsequent
         // `window.angular` instances into believing an app is already bootstrapped.
-        (window as any).angular.element(document).removeData();
+        win.angular.element(document).removeData();
 
         // Remove AngularJS to leave a clean state for subsequent tests.
         setNg1(undefined);
-        delete (window as any).angular;
+        delete win.angular;
       });
 
+      methodsToPatch.forEach(method => win[method](function() {
+                               // Run the captured callbacks. (Async callbacks not supported.)
+                               methodCallbacks[method].forEach(cb => cb.call(this));
+                             }));
+
       specSuite();
     });
   });
diff --git a/yarn.lock b/yarn.lock
index 66b1faeecd..10327f33f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3255,7 +3255,11 @@ isstream@~0.1.1, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-jasmine-core@2.8, jasmine-core@~2.8.0:
+jasmine-core@2, jasmine-core@~2.99.0:
+  version "2.99.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+
+jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
 
@@ -3265,7 +3269,15 @@ jasmine-diff@^0.1.3:
   dependencies:
     diff "^3.2.0"
 
-jasmine@2.8, jasmine@^2.5.3:
+jasmine@2:
+  version "2.99.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
+  dependencies:
+    exit "^0.1.2"
+    glob "^7.0.6"
+    jasmine-core "~2.99.0"
+
+jasmine@^2.5.3:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
   dependencies:

From 19544060d35a5cb9d3f7f4d09205df800983c9e8 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 6 Jul 2018 09:10:16 +0300
Subject: [PATCH 421/582] refactor: re-organize and "modernize" cjs-jasmine
 scripts (#19904)

PR Close #19904
---
 tools/cjs-jasmine/index-tools.ts |  54 +++++++------
 tools/cjs-jasmine/index.ts       | 127 +++++++++++++++----------------
 2 files changed, 86 insertions(+), 95 deletions(-)

diff --git a/tools/cjs-jasmine/index-tools.ts b/tools/cjs-jasmine/index-tools.ts
index 4efdab932b..744d9c792b 100644
--- a/tools/cjs-jasmine/index-tools.ts
+++ b/tools/cjs-jasmine/index-tools.ts
@@ -6,14 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/* tslint:disable:no-var-keyword */
-
 'use strict';
 
-var glob = require('glob');
+const glob = require('glob');
 require('zone.js/dist/zone-node.js');
-var JasmineRunner = require('jasmine');
-var path = require('path');
+const JasmineRunner = require('jasmine');
+const path = require('path');
 require('zone.js/dist/long-stack-trace-zone.js');
 require('zone.js/dist/task-tracking.js');
 require('zone.js/dist/proxy.js');
@@ -21,34 +19,34 @@ require('zone.js/dist/sync-test.js');
 require('zone.js/dist/async-test.js');
 require('zone.js/dist/fake-async-test.js');
 
-var jrunner = new JasmineRunner();
+// Let TypeScript know this is a module
+export {};
+
+const jrunner = new JasmineRunner({projectBaseDir: path.resolve(__dirname, '../../')});
 (global as any)['jasmine'] = jrunner.jasmine;
 require('zone.js/dist/jasmine-patch.js');
-var rootDir = process.cwd();
-function rootDirRequire(moduleId: string) {
-  return require(path.join(rootDir, moduleId));
-}
 
-// Tun on full stack traces in errors to help debugging
+// Turn on full stack traces in errors to help debugging
 (<any>Error)['stackTraceLimit'] = Infinity;
 
-// Support passing multiple globs
-var globsIndex = process.argv.indexOf('--');
-var args: string[];
-if (globsIndex < 0) {
-  args = [process.argv[2]];
-} else {
-  args = process.argv.slice(globsIndex + 1);
-}
-
-var specFiles = args.map(function(globstr: string) { return glob.sync(globstr, {cwd: rootDir}); })
-                    .reduce((specFiles: string[], paths: string[]) => specFiles.concat(paths), []);
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
-
+// Config the test runner
+jrunner.jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
+jrunner.loadConfig({
+  spec_dir: '',
+});
 jrunner.configureDefaultReporter({showColors: process.argv.indexOf('--no-color') === -1});
+jrunner.onComplete((passed: boolean) => process.exit(passed ? 0 : 1));
 
-jrunner.onComplete(function(passed: boolean) { process.exit(passed ? 0 : 1); });
-jrunner.projectBaseDir = path.resolve(__dirname, '../../');
-jrunner.specDir = '';
-specFiles.forEach((file: string) => { rootDirRequire(file); });
+// Support passing multiple globs
+const rootDir = process.cwd();
+const globsIndex = process.argv.indexOf('--');
+const globs = (globsIndex === -1) ? [process.argv[2]] : process.argv.slice(globsIndex + 1);
+const specFiles = globs.map(globstr => glob.sync(globstr, {cwd: rootDir}) as string[])
+                      .reduce((allPaths, paths) => allPaths.concat(paths), []);
+
+// Load helpers and spec files
+const rootDirRequire = (relativePath: string) => require(path.join(rootDir, relativePath));
+specFiles.forEach(rootDirRequire);
+
+// Run the tests
 jrunner.execute();
diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts
index 4508806380..4798ff759f 100644
--- a/tools/cjs-jasmine/index.ts
+++ b/tools/cjs-jasmine/index.ts
@@ -6,14 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/* tslint:disable:no-var-keyword */
-
 'use strict';
 
-var glob = require('glob');
+const glob = require('glob');
 require('zone.js/dist/zone-node.js');
-var JasmineRunner = require('jasmine');
-var path = require('path');
+const JasmineRunner = require('jasmine');
+const path = require('path');
 require('source-map-support').install();
 require('zone.js/dist/long-stack-trace-zone.js');
 require('zone.js/dist/task-tracking.js');
@@ -22,83 +20,78 @@ require('zone.js/dist/sync-test.js');
 require('zone.js/dist/async-test.js');
 require('zone.js/dist/fake-async-test.js');
 require('reflect-metadata/Reflect');
-var jrunner = new JasmineRunner();
+
+// Let TypeScript know this is a module
+export {};
+
+const jrunner = new JasmineRunner({projectBaseDir: path.resolve(__dirname, '../../')});
 (global as any)['jasmine'] = jrunner.jasmine;
 require('zone.js/dist/jasmine-patch.js');
 
-var distAll: string = process.cwd() + '/dist/all';
-function distAllRequire(moduleId: string) {
-  return require(path.join(distAll, moduleId));
-}
+(global as any).isBrowser = false;
+(global as any).isNode = true;
 
-
-// Tun on full stack traces in errors to help debugging
+// Turn on full stack traces in errors to help debugging
 (<any>Error)['stackTraceLimit'] = Infinity;
 
+// Config the test runner
 jrunner.jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
+jrunner.loadConfig({
+  spec_dir: '',
+});
+jrunner.configureDefaultReporter({showColors: process.argv.indexOf('--no-color') === -1});
+jrunner.onComplete((passed: boolean) => process.exit(passed ? 0 : 1));
 
 // Support passing multiple globs
-var globsIndex = process.argv.indexOf('--');
-var args: string[];
-if (globsIndex < 0) {
-  args = [process.argv[2]];
-} else {
-  args = process.argv.slice(globsIndex + 1);
-}
-
-(global as any).isNode = true;
-(global as any).isBrowser = false;
-
-var specFiles: any =
-    args.map(function(globstr: string):
-                 string[] {
-                   return glob.sync(globstr, {
-                     cwd: distAll,
-                     ignore: [
-                       // the following code and tests are not compatible with CJS/node environment
-                       '@angular/_testing_init/**',
-                       '@angular/examples/**',
-                       '@angular/platform-browser/**',
-                       '@angular/platform-browser-dynamic/**',
-                       '@angular/compiler/test/aot/**',
-                       '@angular/compiler/test/render3/**',
-                       '@angular/core/test/bundling/**',
-                       '@angular/core/test/zone/**',
-                       '@angular/core/test/render3/**',
-                       '@angular/core/test/fake_async_spec.*',
-                       '@angular/forms/test/**',
-                       '@angular/router/test/route_config/route_config_spec.*',
-                       '@angular/router/test/integration/bootstrap_spec.*',
-                       '@angular/integration_test/symbol_inspector/**',
-                       '@angular/upgrade/**',
-                       '@angular/elements/**',
-                       '@angular/**/e2e_test/**',
-                       'angular1_router/**',
-                       'payload_tests/**',
-                     ]
-                   });
-                 })
+const distAll = process.cwd() + '/dist/all';
+const globsIndex = process.argv.indexOf('--');
+const globs = (globsIndex === -1) ? [process.argv[2]] : process.argv.slice(globsIndex + 1);
+const specFiles =
+    globs
+        .map(globstr => glob.sync(globstr, {
+          cwd: distAll,
+          ignore: [
+            // the following code and tests are not compatible with CJS/node environment
+            '@angular/_testing_init/**',
+            '@angular/compiler/test/aot/**',
+            '@angular/compiler/test/render3/**',
+            '@angular/core/test/bundling/**',
+            '@angular/core/test/fake_async_spec.*',
+            '@angular/core/test/render3/**',
+            '@angular/core/test/zone/**',
+            '@angular/elements/**',
+            '@angular/examples/**',
+            '@angular/forms/test/**',
+            '@angular/integration_test/symbol_inspector/**',
+            '@angular/platform-browser/**',
+            '@angular/platform-browser-dynamic/**',
+            '@angular/router/test/integration/bootstrap_spec.*',
+            '@angular/router/test/route_config/route_config_spec.*',
+            '@angular/upgrade/**',
+            '@angular/**/e2e_test/**',
+            'angular1_router/**',
+            'payload_tests/**',
+          ],
+        }) as string[])
         // Run relevant subset of browser tests for features reused on the server side.
         // Make sure the security spec works on the server side!
         .concat(glob.sync('@angular/platform-browser/test/security/**/*_spec.js', {cwd: distAll}))
         .concat(['/@angular/platform-browser/test/browser/meta_spec.js'])
         .concat(['/@angular/platform-browser/test/browser/title_spec.js'])
         .concat(['/@angular/platform-browser/test/browser/transfer_state_spec.js'])
-        .reduce((specFiles: string[], paths: string[]) => specFiles.concat(paths), <string[]>[]);
+        .reduce((allPaths, paths) => allPaths.concat(paths), []);
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
-
-jrunner.configureDefaultReporter({showColors: process.argv.indexOf('--no-color') === -1});
-
-jrunner.onComplete(function(passed: boolean) { process.exit(passed ? 0 : 1); });
-jrunner.projectBaseDir = path.resolve(__dirname, '../../');
-jrunner.specDir = '';
-require('./test-cjs-main.js');
-distAllRequire('@angular/platform-server/src/domino_adapter.js').DominoAdapter.makeCurrent();
-specFiles.forEach((file: string) => {
-  const r = distAllRequire(file);
-  if (r.main) {
-    r.main();
+// Load helpers and spec files
+const distAllRequire = (relativePath: string) => {
+  const mod = require(path.join(distAll, relativePath));
+  if (mod.main) {
+    mod.main();
   }
-});
+  return mod;
+};
+require('./test-cjs-main');
+distAllRequire('@angular/platform-server/src/domino_adapter').DominoAdapter.makeCurrent();
+specFiles.forEach(distAllRequire);
+
+// Run the tests
 jrunner.execute();

From 787c54736c663696257200081d236a44d5dfce82 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 6 Jul 2018 09:13:25 +0300
Subject: [PATCH 422/582] test: run unit tests in random order (#19904)

PR Close #19904
---
 karma-js.conf.js                              | 12 +++++-
 package.json                                  |  2 +-
 .../test/component-factory-strategy_spec.ts   |  4 +-
 .../forms/test/reactive_integration_spec.ts   | 17 +++++---
 .../language-service/test/diagnostics_spec.ts | 43 +++++++++++--------
 packages/router/karma.conf.js                 | 10 ++++-
 .../downgrade_component_adapter_spec.ts       | 17 ++++----
 tools/cjs-jasmine/index-tools.ts              |  3 ++
 tools/cjs-jasmine/index.ts                    |  3 ++
 tools/jasmine-seed-generator.js               | 19 ++++++++
 yarn.lock                                     |  6 +--
 11 files changed, 94 insertions(+), 42 deletions(-)
 create mode 100644 tools/jasmine-seed-generator.js

diff --git a/karma-js.conf.js b/karma-js.conf.js
index 4c63692ba0..a8ab18df3d 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-var browserProvidersConf = require('./browser-providers.conf.js');
-var internalAngularReporter = require('./tools/karma/reporter.js');
+const browserProvidersConf = require('./browser-providers.conf');
+const {generateSeed} = require('./tools/jasmine-seed-generator');
+const internalAngularReporter = require('./tools/karma/reporter');
 
 // Karma configuration
 // Generated on Thu Sep 25 2014 11:52:02 GMT-0700 (PDT)
@@ -16,6 +17,13 @@ module.exports = function(config) {
 
     frameworks: ['jasmine'],
 
+    client: {
+      jasmine: {
+        random: true,
+        seed: generateSeed('karma-js.conf'),
+      },
+    },
+
     files: [
       // Sources and specs.
       // Loaded through the System loader, in `test-main.js`.
diff --git a/package.json b/package.json
index 9c28cd9ad1..ca361ba594 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "karma": "0.13.20",
     "karma-browserstack-launcher": "0.1.9",
     "karma-chrome-launcher": "0.2.0",
-    "karma-jasmine": "0.3.6",
+    "karma-jasmine": "^1.1.2",
     "karma-sauce-launcher": "0.3.0",
     "karma-sourcemap-loader": "0.3.6",
     "madge": "0.5.0",
diff --git a/packages/elements/test/component-factory-strategy_spec.ts b/packages/elements/test/component-factory-strategy_spec.ts
index 7edfa1164f..dbf702b27f 100644
--- a/packages/elements/test/component-factory-strategy_spec.ts
+++ b/packages/elements/test/component-factory-strategy_spec.ts
@@ -26,6 +26,8 @@ describe('ComponentFactoryNgElementStrategy', () => {
     componentRef = factory.componentRef;
 
     applicationRef = jasmine.createSpyObj('applicationRef', ['attachView']);
+    injector = jasmine.createSpyObj('injector', ['get']);
+    injector.get.and.returnValue(applicationRef);
 
     strategy = new ComponentNgElementStrategy(factory, injector);
   });
@@ -33,7 +35,6 @@ describe('ComponentFactoryNgElementStrategy', () => {
   it('should create a new strategy from the factory', () => {
     const factoryResolver = jasmine.createSpyObj('factoryResolver', ['resolveComponentFactory']);
     factoryResolver.resolveComponentFactory.and.returnValue(factory);
-    injector = jasmine.createSpyObj('injector', ['get']);
     injector.get.and.returnValue(factoryResolver);
 
     const strategyFactory = new ComponentNgElementStrategyFactory(FakeComponent, injector);
@@ -44,7 +45,6 @@ describe('ComponentFactoryNgElementStrategy', () => {
     beforeEach(() => {
       // Set up an initial value to make sure it is passed to the component
       strategy.setInputValue('fooFoo', 'fooFoo-1');
-      injector.get.and.returnValue(applicationRef);
       strategy.connect(document.createElement('div'));
     });
 
diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts
index 0e2a9cb32a..22a1c16191 100644
--- a/packages/forms/test/reactive_integration_spec.ts
+++ b/packages/forms/test/reactive_integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {Component, Directive, Input, Type, forwardRef} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing';
-import {AbstractControl, AsyncValidator, AsyncValidatorFn, COMPOSITION_BUFFER_MODE, FormArray, FormControl, FormGroup, FormGroupDirective, FormsModule, NG_ASYNC_VALIDATORS, NG_VALIDATORS, ReactiveFormsModule, Validators} from '@angular/forms';
+import {AbstractControl, AsyncValidator, AsyncValidatorFn, COMPOSITION_BUFFER_MODE, FormArray, FormControl, FormControlDirective, FormControlName, FormGroup, FormGroupDirective, FormsModule, NG_ASYNC_VALIDATORS, NG_VALIDATORS, ReactiveFormsModule, Validators} from '@angular/forms';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
@@ -1625,14 +1625,17 @@ import {MyInput, MyInputForm} from './value_accessor_integration_spec';
     });
 
     describe('ngModel interactions', () => {
+      let warnSpy: jasmine.Spy;
+
+      beforeEach(() => {
+        // Reset `_ngModelWarningSentOnce` on `FormControlDirective` and `FormControlName` types.
+        (FormControlDirective as any)._ngModelWarningSentOnce = false;
+        (FormControlName as any)._ngModelWarningSentOnce = false;
+
+        warnSpy = spyOn(console, 'warn');
+      });
 
       describe('deprecation warnings', () => {
-        let warnSpy: any;
-
-        beforeEach(() => {
-          warnSpy = jasmine.createSpy('warn');
-          console.warn = warnSpy;
-        });
 
         it('should warn once by default when using ngModel with formControlName', fakeAsync(() => {
              const fixture = initTest(FormGroupNgModel);
diff --git a/packages/language-service/test/diagnostics_spec.ts b/packages/language-service/test/diagnostics_spec.ts
index 00c1dd1fa0..d8692fe35e 100644
--- a/packages/language-service/test/diagnostics_spec.ts
+++ b/packages/language-service/test/diagnostics_spec.ts
@@ -9,19 +9,25 @@
 import * as ts from 'typescript';
 
 import {createLanguageService} from '../src/language_service';
-import {Diagnostics} from '../src/types';
+import {Diagnostics, LanguageService} from '../src/types';
 import {TypeScriptServiceHost} from '../src/typescript_host';
 
 import {toh} from './test_data';
 import {MockTypescriptHost, diagnosticMessageContains, findDiagnostic, includeDiagnostic, noDiagnostics} from './test_utils';
 
 describe('diagnostics', () => {
-  let documentRegistry = ts.createDocumentRegistry();
-  let mockHost = new MockTypescriptHost(['/app/main.ts', '/app/parsing-cases.ts'], toh);
-  let service = ts.createLanguageService(mockHost, documentRegistry);
-  let ngHost = new TypeScriptServiceHost(mockHost, service);
-  let ngService = createLanguageService(ngHost);
-  ngHost.setSite(ngService);
+  let mockHost: MockTypescriptHost;
+  let ngHost: TypeScriptServiceHost;
+  let ngService: LanguageService;
+
+  beforeEach(() => {
+    mockHost = new MockTypescriptHost(['/app/main.ts', '/app/parsing-cases.ts'], toh);
+    const documentRegistry = ts.createDocumentRegistry();
+    const service = ts.createLanguageService(mockHost, documentRegistry);
+    ngHost = new TypeScriptServiceHost(mockHost, service);
+    ngService = createLanguageService(ngHost);
+    ngHost.setSite(ngService);
+  });
 
   it('should be no diagnostics for test.ng',
      () => { expect(ngService.getDiagnostics('/app/test.ng')).toEqual([]); });
@@ -99,7 +105,7 @@ describe('diagnostics', () => {
       const code = '\n@Component({template: \'<form></form>\'}) export class MyComponent {}';
       addCode(code, (fileName, content) => {
         const diagnostics = ngService.getDiagnostics(fileName);
-        expectOnlyModuleDiagnostics(diagnostics !);
+        expectOnlyModuleDiagnostics(diagnostics);
       });
     });
 
@@ -139,7 +145,7 @@ describe('diagnostics', () => {
           ` @Component({template: \`<div *ngIf="something === 'foo'"></div>\`}) export class MyComponent { something: 'foo' | 'bar'; }`;
       addCode(code, fileName => {
         const diagnostics = ngService.getDiagnostics(fileName);
-        expectOnlyModuleDiagnostics(diagnostics !);
+        expectOnlyModuleDiagnostics(diagnostics);
       });
     });
 
@@ -160,7 +166,7 @@ describe('diagnostics', () => {
           ` @Component({template: \`<div *ngIf="something === undefined"></div>\`}) export class MyComponent { something = 'foo'; }})`;
       addCode(code, fileName => {
         const diagnostics = ngService.getDiagnostics(fileName);
-        expectOnlyModuleDiagnostics(diagnostics !);
+        expectOnlyModuleDiagnostics(diagnostics);
       });
     });
 
@@ -253,7 +259,7 @@ describe('diagnostics', () => {
         })
         export class MyComponent {}
       `,
-          fileName => expectOnlyModuleDiagnostics(ngService.getDiagnostics(fileName) !));
+          fileName => expectOnlyModuleDiagnostics(ngService.getDiagnostics(fileName)));
     });
 
     // Issue #15625
@@ -273,7 +279,7 @@ describe('diagnostics', () => {
           }
       `,
           fileName => {
-            const diagnostics = ngService.getDiagnostics(fileName) !;
+            const diagnostics = ngService.getDiagnostics(fileName);
             expectOnlyModuleDiagnostics(diagnostics);
           });
     });
@@ -368,14 +374,17 @@ describe('diagnostics', () => {
     function expectOnlyModuleDiagnostics(diagnostics: Diagnostics | undefined) {
       // Expect only the 'MyComponent' diagnostic
       if (!diagnostics) throw new Error('Expecting Diagnostics');
-      expect(diagnostics.length).toBe(1);
       if (diagnostics.length > 1) {
-        for (const diagnostic of diagnostics) {
-          if (diagnosticMessageContains(diagnostic.message, 'MyComponent')) continue;
-          fail(`(${diagnostic.span.start}:${diagnostic.span.end}): ${diagnostic.message}`);
+        const unexpectedDiagnostics =
+            diagnostics.filter(diag => !diagnosticMessageContains(diag.message, 'MyComponent'))
+                .map(diag => `(${diag.span.start}:${diag.span.end}): ${diag.message}`);
+
+        if (unexpectedDiagnostics.length) {
+          fail(`Unexpected diagnostics:\n  ${unexpectedDiagnostics.join('\n  ')}`);
+          return;
         }
-        return;
       }
+      expect(diagnostics.length).toBe(1);
       expect(diagnosticMessageContains(diagnostics[0].message, 'MyComponent')).toBeTruthy();
     }
   });
diff --git a/packages/router/karma.conf.js b/packages/router/karma.conf.js
index b41ac62c52..05b0a737f6 100644
--- a/packages/router/karma.conf.js
+++ b/packages/router/karma.conf.js
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-var browserProvidersConf = require('../../browser-providers.conf.js');
+const browserProvidersConf = require('../../browser-providers.conf');
+const {generateSeed} = require('../../tools/jasmine-seed-generator');
 
 // Karma configuration
 module.exports = function(config) {
@@ -16,6 +17,13 @@ module.exports = function(config) {
 
     frameworks: ['jasmine'],
 
+    client: {
+      jasmine: {
+        random: true,
+        seed: generateSeed('router/karma.conf'),
+      },
+    },
+
     files: [
       // Polyfills.
       'node_modules/core-js/client/core.js',
diff --git a/packages/upgrade/test/common/downgrade_component_adapter_spec.ts b/packages/upgrade/test/common/downgrade_component_adapter_spec.ts
index eb3cc0683a..bf5d4cc471 100644
--- a/packages/upgrade/test/common/downgrade_component_adapter_spec.ts
+++ b/packages/upgrade/test/common/downgrade_component_adapter_spec.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {ApplicationRef, Compiler, Component, ComponentFactory, ComponentRef, Injector, NgModule, Testability, TestabilityRegistry} from '@angular/core';
-import {TestBed, getTestBed, inject} from '@angular/core/testing';
+import {Compiler, Component, ComponentFactory, Injector, NgModule, TestabilityRegistry} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
 import * as angular from '@angular/upgrade/src/common/angular1';
 import {DowngradeComponentAdapter, groupNodesBySelector} from '@angular/upgrade/src/common/downgrade_component_adapter';
 
@@ -82,6 +82,7 @@ withEachNg1Version(() => {
       let adapter: DowngradeComponentAdapter;
       let content: string;
       let compiler: Compiler;
+      let registry: TestabilityRegistry;
       let element: angular.IAugmentedJQuery;
 
       class mockScope implements angular.IScope {
@@ -168,15 +169,13 @@ withEachNg1Version(() => {
             componentFactory, wrapCallback);
       }
 
-      beforeEach((inject([Compiler], (inject_compiler: Compiler) => {
-        compiler = inject_compiler;
+      beforeEach(() => {
+        compiler = TestBed.get(Compiler);
+        registry = TestBed.get(TestabilityRegistry);
         adapter = getAdaptor();
-      })));
-
-      afterEach(() => {
-        let registry = TestBed.get(TestabilityRegistry);
-        registry.unregisterAllApplications();
       });
+      beforeEach(() => registry.unregisterAllApplications());
+      afterEach(() => registry.unregisterAllApplications());
 
       it('should add testabilities hook when creating components', () => {
 
diff --git a/tools/cjs-jasmine/index-tools.ts b/tools/cjs-jasmine/index-tools.ts
index 744d9c792b..08501f2922 100644
--- a/tools/cjs-jasmine/index-tools.ts
+++ b/tools/cjs-jasmine/index-tools.ts
@@ -18,6 +18,7 @@ require('zone.js/dist/proxy.js');
 require('zone.js/dist/sync-test.js');
 require('zone.js/dist/async-test.js');
 require('zone.js/dist/fake-async-test.js');
+const {generateSeed} = require('../../../tools/jasmine-seed-generator');
 
 // Let TypeScript know this is a module
 export {};
@@ -32,8 +33,10 @@ require('zone.js/dist/jasmine-patch.js');
 // Config the test runner
 jrunner.jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
 jrunner.loadConfig({
+  random: true,
   spec_dir: '',
 });
+jrunner.seed(generateSeed('cjs-jasmine/index-tools'));
 jrunner.configureDefaultReporter({showColors: process.argv.indexOf('--no-color') === -1});
 jrunner.onComplete((passed: boolean) => process.exit(passed ? 0 : 1));
 
diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts
index 4798ff759f..2527b28d3f 100644
--- a/tools/cjs-jasmine/index.ts
+++ b/tools/cjs-jasmine/index.ts
@@ -20,6 +20,7 @@ require('zone.js/dist/sync-test.js');
 require('zone.js/dist/async-test.js');
 require('zone.js/dist/fake-async-test.js');
 require('reflect-metadata/Reflect');
+const {generateSeed} = require('../../../tools/jasmine-seed-generator');
 
 // Let TypeScript know this is a module
 export {};
@@ -37,8 +38,10 @@ require('zone.js/dist/jasmine-patch.js');
 // Config the test runner
 jrunner.jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
 jrunner.loadConfig({
+  random: true,
   spec_dir: '',
 });
+jrunner.seed(generateSeed('cjs-jasmine/index'));
 jrunner.configureDefaultReporter({showColors: process.argv.indexOf('--no-color') === -1});
 jrunner.onComplete((passed: boolean) => process.exit(passed ? 0 : 1));
 
diff --git a/tools/jasmine-seed-generator.js b/tools/jasmine-seed-generator.js
new file mode 100644
index 0000000000..aefda38cf6
--- /dev/null
+++ b/tools/jasmine-seed-generator.js
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+'use strict';
+
+// Generate a "random" seed, suitable to be used for pseudo-randomizing jasmine tests.
+module.exports = {
+  generateSeed: caller => {
+    const seed = process.env.JASMINE_RANDOM_SEED || String(Math.random()).slice(-5);
+    // tslint:disable-next-line: no-console
+    console.log(`[${caller}] Jasmine random seed: ${seed}`);
+    return seed;
+  },
+};
diff --git a/yarn.lock b/yarn.lock
index 10327f33f9..963e37826b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3492,9 +3492,9 @@ karma-chrome-launcher@0.2.0:
     fs-access "^1.0.0"
     which "^1.0.9"
 
-karma-jasmine@0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-0.3.6.tgz#ddcc34413ac0405aa34ce29ff472e957420b857a"
+karma-jasmine@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
 
 karma-sauce-launcher@0.3.0:
   version "0.3.0"

From 86b1cc7313e0507648ffc5b51b47991c4306f76b Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 5 Jul 2018 21:18:38 +0300
Subject: [PATCH 423/582] build: upgrade jasmine to 3.1.0 (#19904)

PR Close #19904
---
 package.json |  4 ++--
 yarn.lock    | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index ca361ba594..35616f0212 100644
--- a/package.json
+++ b/package.json
@@ -85,8 +85,8 @@
     "hammerjs": "2.0.8",
     "husky": "^0.14.3",
     "incremental-dom": "0.4.1",
-    "jasmine": "2",
-    "jasmine-core": "2",
+    "jasmine": "^3.1.0",
+    "jasmine-core": "^3.1.0",
     "jpm": "1.3.1",
     "karma": "0.13.20",
     "karma-browserstack-launcher": "0.1.9",
diff --git a/yarn.lock b/yarn.lock
index 963e37826b..b9e8b7394a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3255,9 +3255,9 @@ isstream@~0.1.1, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-jasmine-core@2, jasmine-core@~2.99.0:
-  version "2.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+jasmine-core@^3.1.0, jasmine-core@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
 
 jasmine-core@~2.8.0:
   version "2.8.0"
@@ -3269,14 +3269,6 @@ jasmine-diff@^0.1.3:
   dependencies:
     diff "^3.2.0"
 
-jasmine@2:
-  version "2.99.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
-  dependencies:
-    exit "^0.1.2"
-    glob "^7.0.6"
-    jasmine-core "~2.99.0"
-
 jasmine@^2.5.3:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
@@ -3285,6 +3277,13 @@ jasmine@^2.5.3:
     glob "^7.0.6"
     jasmine-core "~2.8.0"
 
+jasmine@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.1.0.tgz#2bd59fd7ec6ec0e8acb64e09f45a68ed2ad1952a"
+  dependencies:
+    glob "^7.0.6"
+    jasmine-core "~3.1.0"
+
 jasminewd2@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.1.0.tgz#da595275d1ae631de736ac0a7c7d85c9f73ef652"

From d571a51739ce7641c62112ffdc9e478dc2115f04 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 5 Jul 2018 21:35:17 +0300
Subject: [PATCH 424/582] build: upgrade karma and related dependencies
 (#19904)

PR Close #19904
---
 package.json |   10 +-
 yarn.lock    | 1998 ++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 1540 insertions(+), 468 deletions(-)

diff --git a/package.json b/package.json
index 35616f0212..3514b57f76 100644
--- a/package.json
+++ b/package.json
@@ -88,12 +88,12 @@
     "jasmine": "^3.1.0",
     "jasmine-core": "^3.1.0",
     "jpm": "1.3.1",
-    "karma": "0.13.20",
-    "karma-browserstack-launcher": "0.1.9",
-    "karma-chrome-launcher": "0.2.0",
+    "karma": "^2.0.4",
+    "karma-browserstack-launcher": "^1.3.0",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.1.2",
-    "karma-sauce-launcher": "0.3.0",
-    "karma-sourcemap-loader": "0.3.6",
+    "karma-sauce-launcher": "^1.2.0",
+    "karma-sourcemap-loader": "^0.3.7",
     "madge": "0.5.0",
     "minimist": "1.2.0",
     "mutation-observer": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index b9e8b7394a..e4fa0830cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -168,13 +168,6 @@ abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
-accepts@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
-
 accepts@~1.2.12, accepts@~1.2.13:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.2.13.tgz#e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"
@@ -189,6 +182,13 @@ accepts@~1.3.0:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
+accepts@~1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
 acorn@^1.0.3:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014"
@@ -201,6 +201,10 @@ add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
 
+addressparser@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
+
 adm-zip@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
@@ -220,6 +224,12 @@ agent-base@2:
     extend "~3.0.0"
     semver "~5.0.1"
 
+agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce"
+  dependencies:
+    es6-promisify "^5.0.0"
+
 ajv@^5.1.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
@@ -256,6 +266,16 @@ amdetective@0.0.2:
   dependencies:
     esprima "~1.2.2"
 
+amqplib@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
+  dependencies:
+    bitsyntax "~0.0.4"
+    bluebird "^3.4.6"
+    buffer-more-ints "0.0.2"
+    readable-stream "1.x >=1.1.9"
+    safe-buffer "^5.0.1"
+
 "angular-1.5@npm:angular@1.5":
   version "1.5.11"
   resolved "https://registry.yarnpkg.com/angular/-/angular-1.5.11.tgz#8c5ba7386f15965c9acf3429f6881553aada30d6"
@@ -299,6 +319,13 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -314,18 +341,18 @@ archiver-utils@^1.0.0, archiver-utils@^1.3.0:
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
-archiver@~0.14.0:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-0.14.4.tgz#5b9ddb9f5ee1ceef21cb8f3b020e6240ecb4315c"
+archiver@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
   dependencies:
-    async "~0.9.0"
-    buffer-crc32 "~0.2.1"
-    glob "~4.3.0"
-    lazystream "~0.1.0"
-    lodash "~3.2.0"
-    readable-stream "~1.0.26"
-    tar-stream "~1.1.0"
-    zip-stream "~0.5.0"
+    archiver-utils "^1.3.0"
+    async "^2.0.0"
+    buffer-crc32 "^0.2.1"
+    glob "^7.0.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"
+    tar-stream "^1.5.0"
+    zip-stream "^1.2.0"
 
 archiver@~1.0.0:
   version "1.0.1"
@@ -371,10 +398,18 @@ arr-diff@^2.0.0:
   dependencies:
     arr-flatten "^1.0.1"
 
-arr-flatten@^1.0.1:
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
@@ -425,9 +460,13 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
-arraybuffer.slice@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
 
 arrify@^1.0.0:
   version "1.0.1"
@@ -440,10 +479,6 @@ ascli@~1:
     colour "~0.7.1"
     optjs "~3.2.2"
 
-asn1@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
-
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -452,10 +487,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-assert-plus@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
@@ -466,23 +497,37 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
 
+ast-types@0.x.x:
+  version "0.11.5"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.5.tgz#9890825d660c03c28339f315e9fa0a360e31ec28"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+
 async@1.2.x:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
 
-async@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.4.0.tgz#35f86f83c59e0421d099cd9a91d8278fb578c00d"
+async@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
+  dependencies:
+    lodash "^4.8.0"
 
-async@^0.9.0, async@~0.9.0:
+async@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
@@ -496,7 +541,7 @@ async@^2.0.0:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.0.1:
+async@^2.0.1, async@^2.1.2, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
@@ -506,10 +551,6 @@ async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
 
-async@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
-
 async@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
@@ -524,10 +565,6 @@ atob@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
-aws-sign2@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz#c57103f7a17fc037f02d7c2e64b602ea223f7d63"
-
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -540,6 +577,12 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+axios@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
+  dependencies:
+    follow-redirects "1.0.0"
+
 babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -595,6 +638,18 @@ base64url@2.0.0, base64url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 basic-auth-connect@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz#fdb0b43962ca7b40456a7c2bb48fe173da2d2122"
@@ -603,7 +658,7 @@ basic-auth@~1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.0.4.tgz#030935b01de7c9b94a824b29f3fccb750d3a5290"
 
-batch@0.5.3, batch@^0.5.3:
+batch@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
 
@@ -638,11 +693,11 @@ binary-extensions@^1.0.0:
     buffers "~0.1.1"
     chainsaw "~0.1.0"
 
-bl@^0.9.0, bl@~0.9.0:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz#c06b797af085ea00bc527afc8efcf11de2232054"
+bitsyntax@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
   dependencies:
-    readable-stream "~1.0.26"
+    buffer-more-ints "0.0.2"
 
 bl@^1.0.0:
   version "1.2.1"
@@ -672,24 +727,24 @@ blocking-proxy@0.0.5:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^2.9.27, bluebird@^2.9.30:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+bluebird@^3.3.0, bluebird@^3.4.6:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
-body-parser@^1.12.4:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.1.tgz#9c1629370bcfd42917f30641a2dcbe2ec50d4c26"
+body-parser@^1.16.1:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
-    debug "2.6.8"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "~1.6.3"
+    iconv-lite "0.4.23"
     on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+    qs "6.5.2"
+    raw-body "2.3.3"
+    type-is "~1.6.16"
 
 body-parser@~1.13.3:
   version "1.13.3"
@@ -764,6 +819,21 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 browser-resolve@^1.11.0:
   version "1.11.2"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
@@ -776,9 +846,11 @@ browserify-zlib@~0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserstack@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.2.0.tgz#22958ff5dc7c78946e667a166fb21e8cbf340866"
+browserstack@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.0.tgz#b565425ad62ed72c1082a1eb979d5313c7d4754f"
+  dependencies:
+    https-proxy-agent "1.0.0"
 
 browserstacktunnel-wrapper@2.0.1:
   version "2.0.1"
@@ -787,13 +859,14 @@ browserstacktunnel-wrapper@2.0.1:
     https-proxy-agent "^1.0.0"
     unzip "~0.1.9"
 
-browserstacktunnel-wrapper@~1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-1.4.2.tgz#6598fb7d784b6ff348e3df7c104b0d9c27ea5275"
+browserstacktunnel-wrapper@~2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.2.tgz#3d11159c18cd202b2920b09830fbe4bd90f079b5"
   dependencies:
+    https-proxy-agent "^1.0.0"
     unzip "~0.1.9"
 
-buffer-crc32@^0.2.1, buffer-crc32@~0.2.1:
+buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
@@ -801,6 +874,10 @@ buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
+buffer-more-ints@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
+
 buffer@^4.9.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
@@ -813,6 +890,18 @@ buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
 
+buildmail@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+  dependencies:
+    addressparser "1.0.1"
+    libbase64 "0.1.0"
+    libmime "3.0.0"
+    libqp "1.1.0"
+    nodemailer-fetch "1.6.0"
+    nodemailer-shared "1.1.0"
+    punycode "1.4.1"
+
 builtin-modules@^1.0.0, builtin-modules@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -839,6 +928,20 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
@@ -874,10 +977,6 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-caseless@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.9.0.tgz#b7b65ce6bf1413886539cfd533f0b30effa9cf88"
-
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -907,7 +1006,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.7.0:
+chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -922,10 +1021,37 @@ chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    lodash.debounce "^4.0.8"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.5"
+  optionalDependencies:
+    fsevents "^1.2.2"
+
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
 ci-info@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
+circular-json@^0.5.4:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.5.tgz#64182ef359042d37cd8e767fc9de878b1e9447d3"
+
 clang-format@1.0.41:
   version "1.0.41"
   resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.0.41.tgz#28552e50b0c9e44d23f85aebe3d2fbd06c93620c"
@@ -942,6 +1068,15 @@ clang-format@^1.0.32:
     glob "^7.0.0"
     resolve "^1.1.6"
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 cldr-data-downloader@0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cldr-data-downloader/-/cldr-data-downloader-0.3.2.tgz#8d0c98346d16486252fdc9afa36a46542fe4652f"
@@ -1024,6 +1159,13 @@ coffee-script@1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.3.3.tgz#150d6b4cb522894369efed6a2101c20bc7f4a4f4"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 colors@0.6.0-1:
   version "0.6.0-1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.0-1.tgz#6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"
@@ -1036,18 +1178,24 @@ colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
 
+combine-lists@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  dependencies:
+    lodash "^4.5.0"
+
+combined-stream@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@~0.0.4, combined-stream@~0.0.5:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"
-  dependencies:
-    delayed-stream "0.0.5"
-
 commander@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-1.0.0.tgz#5e6a88e7070ff5908836ead19169548c30f90bcd"
@@ -1058,7 +1206,7 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.5.0, commander@^2.8.1, commander@^2.9.0:
+commander@^2.5.0, commander@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
@@ -1095,11 +1243,7 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
-component-emitter@1.2.1:
+component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
@@ -1116,15 +1260,6 @@ compress-commons@^1.2.0:
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
-compress-commons@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-0.2.9.tgz#422d927430c01abd06cd455b6dfc04cb4cf8003c"
-  dependencies:
-    buffer-crc32 "~0.2.1"
-    crc32-stream "~0.3.1"
-    node-int64 "~0.3.0"
-    readable-stream "~1.0.26"
-
 compressible@~2.0.5:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
@@ -1210,12 +1345,12 @@ connect@^2.30.0:
     utils-merge "1.0.0"
     vhost "~3.0.1"
 
-connect@^3.3.5:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.4.tgz#52ea19c38607318784269297b0218ed074a01687"
+connect@^3.6.0:
+  version "3.6.6"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
   dependencies:
-    debug "2.6.8"
-    finalhandler "1.0.5"
+    debug "2.6.9"
+    finalhandler "1.1.0"
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
@@ -1419,7 +1554,15 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
-core-js@^2.1.0, core-js@^2.4.0, core-js@^2.4.1:
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
+core-js@^2.2.0:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+
+core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
 
@@ -1445,13 +1588,6 @@ crc32-stream@^2.0.0:
     crc "^3.4.4"
     readable-stream "^2.0.0"
 
-crc32-stream@~0.3.1:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-0.3.4.tgz#73bc25b45fac1db6632231a7bfce8927e9f06552"
-  dependencies:
-    buffer-crc32 "~0.2.1"
-    readable-stream "~1.0.24"
-
 crc@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.3.0.tgz#fa622e1bc388bf257309082d6b65200ce67090ba"
@@ -1505,10 +1641,6 @@ csurf@~1.8.3:
     csrf "~3.0.0"
     http-errors "~1.3.1"
 
-ctype@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -1537,6 +1669,14 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+
+date-format@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -1558,18 +1698,24 @@ debug@2, debug@2.6.8, debug@^2.2.0:
   dependencies:
     ms "2.0.0"
 
-debug@2.2.0, debug@~2.2.0:
+debug@2.6.9, debug@^2.1.2, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@3.1.0, debug@^3.1.0, debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
     ms "0.7.1"
 
-debug@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
-
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1590,10 +1736,18 @@ deep-equal@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
 deepcopy@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/deepcopy/-/deepcopy-0.6.3.tgz#634780f2f8656ab771af8fa8431ed1ccee55c7b0"
@@ -1611,10 +1765,37 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0, defined@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
+degenerator@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -1627,10 +1808,6 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-delayed-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1639,14 +1816,18 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
 depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
+depd@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
 deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
@@ -1661,6 +1842,10 @@ detect-file@^0.1.0:
   dependencies:
     fs-exists-sync "^0.1.0"
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 detective-es6@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/detective-es6/-/detective-es6-1.1.0.tgz#7c036e1f9469a848a527201edf6ec5a2eef3adab"
@@ -1726,6 +1911,10 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 duplexer2@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -1785,44 +1974,44 @@ end-of-stream@~1.1.0:
   dependencies:
     once "~1.3.0"
 
-engine.io-client@~1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.4.tgz#9fe85dee25853ca6babe25bd2ad68710863e91c2"
+engine.io-client@~3.1.0:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parsejson "0.0.3"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    ws "1.1.2"
-    xmlhttprequest-ssl "1.5.3"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.2.tgz#937b079f0007d0893ec56d46cb220b8cb435220a"
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
   dependencies:
     after "0.8.2"
-    arraybuffer.slice "0.0.6"
+    arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
     blob "0.0.4"
-    has-binary "0.1.7"
-    wtf-8 "1.0.0"
+    has-binary2 "~1.0.2"
 
-engine.io@~1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.4.tgz#77bce12b80e5d60429337fec3b0daf691ebc9003"
+engine.io@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
   dependencies:
-    accepts "1.3.3"
+    accepts "~1.3.4"
     base64id "1.0.0"
     cookie "0.3.1"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    ws "1.1.4"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+  optionalDependencies:
+    uws "~9.14.0"
 
 enhanced-resolve@~0.9.0:
   version "0.9.1"
@@ -1910,7 +2099,7 @@ es6-promise@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
 
-es6-promisify@5.0.0:
+es6-promisify@5.0.0, es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
   dependencies:
@@ -1944,10 +2133,25 @@ escape-string-regexp@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
+escodegen@1.x.x:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.10.0.tgz#f647395de22519fbd0d928ffcf1d17e0dec2603e"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 esprima-fb@8001.1001.0-dev-harmony-fb:
   version "8001.1001.0-dev-harmony-fb"
   resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz#c3190b05341d45643e093af70485ab4988e34d5e"
 
+esprima@3.x.x, esprima@^3.1.3, esprima@~3.1.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
 esprima@^2.5.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@@ -1956,9 +2160,9 @@ esprima@~1.2.2:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.5.tgz#0993502feaf668138325756f30f9a51feeec11e9"
 
-esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
 estree-walker@^0.3.0:
   version "0.3.1"
@@ -2033,6 +2237,18 @@ expand-brackets@^0.1.4:
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
@@ -2072,6 +2288,19 @@ express-session@~1.11.3:
     uid-safe "~2.0.0"
     utils-merge "1.0.0"
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -2082,6 +2311,19 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -2101,12 +2343,20 @@ fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
 faye-websocket@~0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
   dependencies:
     websocket-driver ">=0.5.1"
 
+file-uri-to-path@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -2121,6 +2371,15 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 finalhandler@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.4.0.tgz#965a52d9e8d05d2b857548541fb89b53a2497d9b"
@@ -2130,11 +2389,11 @@ finalhandler@0.4.0:
     on-finished "~2.3.0"
     unpipe "~1.0.0"
 
-finalhandler@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.5.tgz#a701303d257a1bc82fea547a33e5ae89531723df"
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
   dependencies:
-    debug "2.6.8"
+    debug "2.6.9"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
@@ -2224,13 +2483,19 @@ flagged-respawn@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
 
+follow-redirects@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
+  dependencies:
+    debug "^2.2.0"
+
 for-each@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.2.tgz#2c40450b9348e97f281322593ba96704b9abd4d4"
   dependencies:
     is-function "~1.0.0"
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -2250,18 +2515,10 @@ foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
 
-forever-agent@~0.6.0, forever-agent@~0.6.1:
+forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.2.0.tgz#26f8bc26da6440e299cbdcfb69035c4f77a6e466"
-  dependencies:
-    async "~0.9.0"
-    combined-stream "~0.0.4"
-    mime-types "~2.0.3"
-
 form-data@~1.0.0-rc4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
@@ -2278,6 +2535,14 @@ form-data@~2.0.0:
     combined-stream "^1.0.5"
     mime-types "^2.1.11"
 
+form-data@~2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
 form-data@~2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
@@ -2286,6 +2551,12 @@ form-data@~2.3.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
@@ -2329,6 +2600,12 @@ fs-extra@~2.1.2:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs-promise@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a"
@@ -2346,6 +2623,13 @@ fsevents@1.1.2, fsevents@^1.0.0:
     nan "^2.3.0"
     node-pre-gyp "^0.6.36"
 
+fsevents@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 fstream-ignore@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
@@ -2372,6 +2656,13 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2440,6 +2731,21 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-uri@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
+  dependencies:
+    data-uri-to-buffer "1"
+    debug "2"
+    extend "3"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "2"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2489,6 +2795,13 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob-stream@^3.1.5:
   version "3.1.18"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
@@ -2532,7 +2845,7 @@ glob@^4.3.1:
     minimatch "^2.0.1"
     once "^1.3.0"
 
-glob@^5.0.10, glob@^5.0.14, glob@^5.0.15, glob@~5.0.0:
+glob@^5.0.10, glob@^5.0.15, glob@~5.0.0:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
   dependencies:
@@ -2550,15 +2863,6 @@ glob@~3.1.21:
     inherits "1"
     minimatch "~0.2.11"
 
-glob@~4.3.0:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^2.0.1"
-    once "^1.3.0"
-
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
@@ -2740,15 +3044,6 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
-har-validator@^1.4.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-1.8.0.tgz#d83842b0eb4c435960aeb108a067a3aa94c0eeb2"
-  dependencies:
-    bluebird "^2.9.30"
-    chalk "^1.0.0"
-    commander "^2.8.1"
-    is-my-json-valid "^2.12.0"
-
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
@@ -2771,11 +3066,11 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
   dependencies:
-    isarray "0.0.1"
+    isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
@@ -2795,6 +3090,33 @@ has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.1, has@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
@@ -2807,15 +3129,6 @@ has@^1.0.1, has@~1.0.1:
   dependencies:
     traverse ">=0.2.4"
 
-hawk@~2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-2.3.1.tgz#1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -2834,6 +3147,13 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
+hipchat-notifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
+  dependencies:
+    lodash "^4.0.0"
+    request "^2.0.0"
+
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -2859,14 +3179,14 @@ http-browserify@^1.3.2:
     Base64 "~0.2.0"
     inherits "~2.0.1"
 
-http-errors@1.6.2, http-errors@~1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+http-errors@1.6.3, http-errors@~1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
   dependencies:
-    depd "1.1.1"
+    depd "~1.1.2"
     inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
 
 http-errors@~1.3.1:
   version "1.3.1"
@@ -2879,6 +3199,13 @@ http-parser-js@>=0.4.0:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.6.tgz#195273f58704c452d671076be201329dd341dc55"
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy@^1.13.0:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
@@ -2886,14 +3213,6 @@ http-proxy@^1.13.0:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-signature@~0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz#4fbdac132559aa8323121e540779c0a012b27e66"
-  dependencies:
-    asn1 "0.1.11"
-    assert-plus "^0.1.5"
-    ctype "0.5.3"
-
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -2910,11 +3229,22 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+httpntlm@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
+  dependencies:
+    httpreq ">=0.4.22"
+    underscore "~1.7.0"
+
+httpreq@>=0.4.22:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
+
 https-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.0.tgz#b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"
 
-https-proxy-agent@^1.0.0:
+https-proxy-agent@1.0.0, https-proxy-agent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
   dependencies:
@@ -2922,6 +3252,13 @@ https-proxy-agent@^1.0.0:
     debug "2"
     extend "3"
 
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
@@ -2938,7 +3275,17 @@ iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.5:
+iconv-lite@0.4.15:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+
+iconv-lite@0.4.23, iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.4.5:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
@@ -2946,6 +3293,12 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -2964,6 +3317,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
+inflection@~1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+
+inflection@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -3003,6 +3364,10 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+ip@^1.1.2, ip@^1.1.4, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
 is-absolute@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
@@ -3016,6 +3381,18 @@ is-absolute@^0.2.3:
     is-relative "^0.2.1"
     is-windows "^0.2.0"
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -3046,10 +3423,38 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.0.0"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -3060,14 +3465,24 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
-is-extendable@^0.1.1:
+is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@@ -3094,11 +3509,23 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
 
-is-my-json-valid@^2.12.0, is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.12.4:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
   dependencies:
@@ -3143,7 +3570,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-object@^2.0.3:
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   dependencies:
@@ -3217,6 +3644,10 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3225,6 +3656,10 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+
 isbinaryfile@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
@@ -3251,7 +3686,7 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
-isstream@~0.1.1, isstream@~0.1.2:
+isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
@@ -3370,14 +3805,10 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
+json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
 json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -3476,67 +3907,73 @@ jws@^3.1.3:
     jwa "^1.1.4"
     safe-buffer "^5.0.1"
 
-karma-browserstack-launcher@0.1.9:
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-0.1.9.tgz#b75ac716ece616376070d3958552f2db83cf404c"
+karma-browserstack-launcher@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.3.0.tgz#61fe3d36b1cf10681e40f9d874bf37271fb1c674"
   dependencies:
-    browserstack "1.2.0"
-    browserstacktunnel-wrapper "~1.4.2"
-    q "~1.4.1"
+    browserstack "1.5.0"
+    browserstacktunnel-wrapper "~2.0.1"
+    q "~1.5.0"
 
-karma-chrome-launcher@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-0.2.0.tgz#bab12f5f2f4b2f62914a677f29fceca99c090eba"
+karma-chrome-launcher@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
   dependencies:
     fs-access "^1.0.0"
-    which "^1.0.9"
+    which "^1.2.1"
 
 karma-jasmine@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
 
-karma-sauce-launcher@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-0.3.0.tgz#edb69a86a2010b61f406e850245b795e3646c0fd"
+karma-sauce-launcher@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"
   dependencies:
-    q "^1.4.1"
-    sauce-connect-launcher "^0.13.0"
-    saucelabs "^1.0.1"
-    wd "^0.3.4"
+    q "^1.5.0"
+    sauce-connect-launcher "^1.2.2"
+    saucelabs "^1.4.0"
+    wd "^1.4.0"
 
-karma-sourcemap-loader@0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.6.tgz#fb6fde794165fc7c44acf4d8d738dddd42825909"
-
-karma@0.13.20:
-  version "0.13.20"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-0.13.20.tgz#bb4ae8f7e60f4a28490b1ac16d6a00d12d6d4e53"
+karma-sourcemap-loader@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
   dependencies:
-    batch "^0.5.3"
-    bluebird "^2.9.27"
-    body-parser "^1.12.4"
-    chokidar "^1.4.1"
+    graceful-fs "^4.1.2"
+
+karma@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.4.tgz#b399785f57e9bab1d3c4384db33fef4dec8ae349"
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    chokidar "^2.0.3"
     colors "^1.1.0"
-    connect "^3.3.5"
-    core-js "^2.1.0"
+    combine-lists "^1.0.0"
+    connect "^3.6.0"
+    core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     expand-braces "^0.1.1"
-    glob "^7.0.0"
+    glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^3.8.0"
-    log4js "^0.6.31"
+    lodash "^4.17.4"
+    log4js "^2.5.3"
     mime "^1.3.4"
-    minimatch "^3.0.0"
+    minimatch "^3.0.2"
     optimist "^0.6.1"
-    rimraf "^2.3.3"
-    socket.io "^1.4.5"
-    source-map "^0.5.3"
-    useragent "^2.1.6"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.0.4"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "2.2.1"
 
-kind-of@^3.0.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -3548,6 +3985,14 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -3564,18 +4009,35 @@ lazystream@^1.0.0, lazystream@~1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lazystream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-0.1.0.tgz#1b25d63c772a4c20f0a5ed0a9d77f484b6e16920"
-  dependencies:
-    readable-stream "~1.0.2"
-
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
   dependencies:
     invert-kv "^1.0.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+libbase64@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+
+libmime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
+  dependencies:
+    iconv-lite "0.4.15"
+    libbase64 "0.1.0"
+    libqp "1.1.0"
+
+libqp@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+
 lie@~3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
@@ -3671,6 +4133,10 @@ lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -3747,7 +4213,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@3.10.1, lodash@^3.8.0:
+lodash@3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
@@ -3755,36 +4221,48 @@ lodash@4.11.1:
   version "4.11.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.11.1.tgz#a32106eb8e2ec8e82c241611414773c9df15f8bc"
 
+lodash@4.17.10, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.5.0:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.1, lodash@^4.8.0, lodash@~4.17.2:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
 
-lodash@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.2.0.tgz#4bf50a3243f9aeb0bac41a55d3d5990675a462fb"
-
-lodash@~3.9.3:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.9.3.tgz#0159e86832feffc6d61d852b12a953b99496bd32"
-
 lodash@~4.12.0:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.12.0.tgz#2bd6dc46a040f59e686c972ed21d93dc59053258"
 
-log4js@^0.6.31:
-  version "0.6.38"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
+log4js@^2.5.3:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.10.0.tgz#4980bd9148a030d69f9edde32a5b19c0a551e2c4"
   dependencies:
-    readable-stream "~1.0.2"
-    semver "~4.3.3"
+    circular-json "^0.5.4"
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    semver "^5.5.0"
+    streamroller "0.7.0"
+  optionalDependencies:
+    amqplib "^0.5.2"
+    axios "^0.15.3"
+    hipchat-notifier "^1.1.0"
+    loggly "^1.1.0"
+    mailgun-js "^0.18.0"
+    nodemailer "^2.5.0"
+    redis "^2.7.1"
+    slack-node "~0.2.0"
+
+loggly@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
+  dependencies:
+    json-stringify-safe "5.0.x"
+    request "2.75.x"
+    timespan "2.3.x"
 
 long@~3:
   version "3.2.0"
@@ -3820,6 +4298,13 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-queue@0.1:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -3849,7 +4334,28 @@ magic-string@^0.19.0:
   dependencies:
     vlq "^0.2.1"
 
-map-cache@^0.2.0:
+mailcomposer@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
+  dependencies:
+    buildmail "4.0.1"
+    libmime "3.0.0"
+
+mailgun-js@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.18.1.tgz#ee39aa18d7bb598a5ce9ede84afb681defc8a6b0"
+  dependencies:
+    async "~2.6.0"
+    debug "~3.1.0"
+    form-data "~2.3.0"
+    inflection "~1.12.0"
+    is-stream "^1.1.0"
+    path-proxy "~1.0.0"
+    promisify-call "^2.0.2"
+    proxy-agent "~3.0.0"
+    tsscmp "~1.0.0"
+
+map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
@@ -3865,6 +4371,12 @@ map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
 "match-stream@>= 0.0.2 < 1":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf"
@@ -3959,25 +4471,43 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 "mime-db@>= 1.29.0 < 2", mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-mime-db@~1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz#3d0c63180f458eb10d325aaa37d7c58ae312e9d7"
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
+mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
     mime-db "~1.30.0"
 
-mime-types@~2.0.1, mime-types@~2.0.3:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.0.14.tgz#310e159db23e077f8bb22b748dabfa4957140aa6"
+mime-types@~2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
-    mime-db "~1.12.0"
+    mime-db "~1.33.0"
 
 mime@1.3.4:
   version "1.3.4"
@@ -4028,6 +4558,26 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp@0.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -4119,10 +4669,38 @@ nan@^2.3.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 natives@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
 
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.5.3.tgz#269d5c476810ec92edbe7b6c2f28316384f9a7e8"
@@ -4131,14 +4709,14 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+netmask@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+
 next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
 
-node-int64@~0.3.0:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.3.3.tgz#2d6e6b2ece5de8588b43d88d1bc41b26cd1fa84d"
-
 "node-libs-browser@>= 0.4.0 <=0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-0.6.0.tgz#244806d44d319e048bc8607b5cc4eaf9a29d2e3c"
@@ -4167,6 +4745,21 @@ node-int64@~0.3.0:
     util "~0.10.3"
     vm-browserify "0.0.4"
 
+node-pre-gyp@^0.10.0:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-pre-gyp@^0.6.36:
   version "0.6.37"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz#3c872b236b2e266e4140578fe1ee88f693323a05"
@@ -4188,7 +4781,7 @@ node-source-walk@~1.4.0:
   dependencies:
     acorn "^1.0.3"
 
-node-uuid@1.4.8, node-uuid@~1.4.0, node-uuid@~1.4.7:
+node-uuid@1.4.8, node-uuid@~1.4.7:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
 
@@ -4196,6 +4789,55 @@ node-watch@0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.3.4.tgz#755f64ef5f8ad4acb5bafd2c4e7f4fb6a8db0214"
 
+nodemailer-direct-transport@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    smtp-connection "2.12.0"
+
+nodemailer-fetch@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
+
+nodemailer-shared@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
+  dependencies:
+    nodemailer-fetch "1.6.0"
+
+nodemailer-smtp-pool@2.8.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-smtp-transport@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-wellknown@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
+
+nodemailer@^2.5.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
+  dependencies:
+    libmime "3.0.0"
+    mailcomposer "4.0.1"
+    nodemailer-direct-transport "3.3.2"
+    nodemailer-shared "1.1.0"
+    nodemailer-smtp-pool "2.8.2"
+    nodemailer-smtp-transport "2.7.2"
+    socks "1.1.9"
+
 nopt@3.0.x, nopt@^3.0.1, nopt@~3.0.1:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -4228,12 +4870,23 @@ normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -4271,10 +4924,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.6.0.tgz#7dbeae44f6ca454e1f168451d630746735813ce3"
-
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
@@ -4295,6 +4944,14 @@ object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-inspect@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.3.0.tgz#5b1eb8e6742e2ee83342a637034d844928ba2f6d"
@@ -4303,6 +4960,12 @@ object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -4319,7 +4982,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.pick@^1.2.0:
+object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   dependencies:
@@ -4358,6 +5021,17 @@ optimist@^0.6.1, optimist@~0.6.0:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
 options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
@@ -4440,6 +5114,29 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+pac-proxy-agent@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896"
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    get-uri "^2.0.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    pac-resolver "^3.0.0"
+    raw-body "^2.2.0"
+    socks-proxy-agent "^3.0.0"
+
+pac-resolver@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  dependencies:
+    co "^4.6.0"
+    degenerator "^1.0.4"
+    ip "^1.1.5"
+    netmask "^1.0.6"
+    thunkify "^2.1.2"
+
 pako@~0.2.0, pako@~0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
@@ -4479,12 +5176,6 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-parsejson@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
-  dependencies:
-    better-assert "~1.0.0"
-
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -4501,6 +5192,10 @@ parseurl@~1.3.0, parseurl@~1.3.1, parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
 passerror@1.1.1, passerror@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/passerror/-/passerror-1.1.1.tgz#a25b88dbdd910a29603aec7dcb96e9a7a97687b4"
@@ -4509,6 +5204,10 @@ path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
@@ -4535,6 +5234,12 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-proxy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  dependencies:
+    inflection "~1.3.0"
+
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
@@ -4599,6 +5304,14 @@ pkginfo@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
@@ -4615,6 +5328,10 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
 process@^0.11.0, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -4623,6 +5340,12 @@ progress@1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
+promisify-call@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
+  dependencies:
+    with-callback "^1.0.2"
+
 promzard@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
@@ -4662,6 +5385,23 @@ protractor@5.1.2:
     webdriver-js-extender "^1.0.0"
     webdriver-manager "^12.0.6"
 
+proxy-agent@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.0.tgz#f6768e202889b2285d39906d3a94768416f8f713"
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    pac-proxy-agent "^2.0.1"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^3.0.0"
+
+proxy-from-env@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -4683,7 +5423,7 @@ punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
@@ -4691,7 +5431,7 @@ q@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.0.1.tgz#11872aeedee89268110b10a718448ffb10112a14"
 
-q@1.4.1, q@~1.4.1:
+q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
@@ -4699,6 +5439,14 @@ q@^1.1.2, q@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
+q@^1.5.0, q@~1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qjobs@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+
 qs@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-4.0.0.tgz#c31d9b74ec27df75e543a86c78728ed8d4623607"
@@ -4707,13 +5455,9 @@ qs@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.0.tgz#a9f31142af468cb72b25b30136ba2456834916be"
 
-qs@6.5.1, qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-qs@~2.4.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-2.4.2.tgz#f7ce788e5777df0b5010da7f7c4e73ba32470f5a"
+qs@6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
 qs@~5.1.0:
   version "5.1.0"
@@ -4723,6 +5467,10 @@ qs@~6.2.0:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
 
+qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
 querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -4742,17 +5490,21 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+range-parser@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+
 range-parser@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.0.3.tgz#6872823535c692e2c2a0103826afd82c2e0ff175"
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+raw-body@2.3.3, raw-body@^2.2.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
   dependencies:
     bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
+    http-errors "1.6.3"
+    iconv-lite "0.4.23"
     unpipe "1.0.0"
 
 raw-body@~2.1.2, raw-body@~2.1.5:
@@ -4772,6 +5524,15 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 react-tools@0.12.1:
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/react-tools/-/react-tools-0.12.1.tgz#cd016e2f1b80d35a6006100305c068925e25e3d2"
@@ -4815,18 +5576,30 @@ read@1, read@1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.0, readable-stream@~1.0.2, readable-stream@~1.0.24, readable-stream@~1.0.26, readable-stream@~1.0.31, readable-stream@~1.0.33:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+readable-stream@1.1.x, "readable-stream@1.x >=1.1.9", readable-stream@^1.0.27-1, readable-stream@^1.1.13, readable-stream@^1.1.8, readable-stream@~1.1.8, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^1.0.27-1, readable-stream@^1.1.13, readable-stream@^1.1.8, readable-stream@~1.1.8, readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+readable-stream@2, readable-stream@^2.3.0:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.0, readable-stream@~1.0.31:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -4887,6 +5660,22 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redis-commands@^1.2.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2"
+
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+
+redis@^2.7.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"
+
 reflect-metadata@^0.1.3:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
@@ -4905,6 +5694,13 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -4917,7 +5713,7 @@ repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
 
-repeat-string@^1.5.2:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -4937,7 +5733,7 @@ request-progress@0.3.1:
   dependencies:
     throttleit "~0.0.2"
 
-request@2.75.0:
+request@2.75.0, request@2.75.x:
   version "2.75.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
   dependencies:
@@ -4963,6 +5759,33 @@ request@2.75.0:
     tough-cookie "~2.3.0"
     tunnel-agent "~0.4.1"
 
+request@2.85.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 request@2.x, request@^2.78.0, request@^2.81.0:
   version "2.82.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.82.0.tgz#2ba8a92cd7ac45660ea2b10a53ae67cd247516ea"
@@ -4990,28 +5813,30 @@ request@2.x, request@^2.78.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@~2.55.0:
-  version "2.55.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.55.0.tgz#d75c1cdf679d76bb100f9bffe1fe551b5c24e93d"
+request@^2.0.0, request@^2.74.0:
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
-    aws-sign2 "~0.5.0"
-    bl "~0.9.0"
-    caseless "~0.9.0"
-    combined-stream "~0.0.5"
-    forever-agent "~0.6.0"
-    form-data "~0.2.0"
-    har-validator "^1.4.0"
-    hawk "~2.3.0"
-    http-signature "~0.10.0"
-    isstream "~0.1.1"
-    json-stringify-safe "~5.0.0"
-    mime-types "~2.0.1"
-    node-uuid "~1.4.0"
-    oauth-sign "~0.6.0"
-    qs "~2.4.0"
-    stringstream "~0.0.4"
-    tough-cookie ">=0.12.0"
-    tunnel-agent "~0.4.0"
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
 
 request@~2.74.0:
   version "2.74.0"
@@ -5039,6 +5864,15 @@ request@~2.74.0:
     tough-cookie "~2.3.0"
     tunnel-agent "~0.4.1"
 
+requestretry@^1.2.2:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
+  dependencies:
+    extend "^3.0.0"
+    lodash "^4.15.0"
+    request "^2.74.0"
+    when "^3.7.7"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5093,6 +5927,10 @@ resumer@~0.0.0:
   dependencies:
     through "~2.3.4"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 rewire@2.5.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/rewire/-/rewire-2.5.2.tgz#6427de7b7feefa7d36401507eb64a5385bc58dc7"
@@ -5103,18 +5941,12 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
-rimraf@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.3.tgz#e5b51c9437a4c582adb955e9f28cf8d945e272af"
-  dependencies:
-    glob "^5.0.14"
-
 ripemd160@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce"
@@ -5176,20 +6008,35 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-sauce-connect-launcher@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-0.13.0.tgz#25d7df9da16a5ed1caa13df424cb57cb0b6d5a22"
+safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+sauce-connect-launcher@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
   dependencies:
     adm-zip "~0.4.3"
-    async "1.4.0"
-    lodash "3.10.1"
-    rimraf "2.4.3"
+    async "^2.1.2"
+    https-proxy-agent "^2.2.1"
+    lodash "^4.16.6"
+    rimraf "^2.5.4"
 
-saucelabs@^1.0.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.4.0.tgz#b934a9af9da2874b3f40aae1fcde50a4466f5f38"
+saucelabs@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
   dependencies:
-    https-proxy-agent "^1.0.0"
+    https-proxy-agent "^2.2.1"
 
 saucelabs@~1.3.0:
   version "1.3.0"
@@ -5201,7 +6048,7 @@ sax@0.6.x:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
 
-sax@>=0.6.0:
+sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -5233,7 +6080,7 @@ selenium-webdriver@^2.53.2:
     ws "^1.0.1"
     xml2js "0.4.4"
 
-"semver@2 || 3 || 4", semver@^4.1.0, semver@~4.3.3:
+"semver@2 || 3 || 4", semver@^4.1.0:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
@@ -5245,6 +6092,10 @@ semver@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.0.tgz#85f2cf8550465c4df000cf7d86f6b054106ab9e5"
 
+semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
 semver@~5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
@@ -5314,13 +6165,31 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 "setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
 sha.js@2.2.6:
   version "2.2.6"
@@ -5376,12 +6245,56 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+slack-node@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
+  dependencies:
+    requestretry "^1.2.2"
+
 "slice-stream@>= 1.0.0 < 2":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz#5b33bd66f013b1a7f86460b03d463dec39ad3ea0"
   dependencies:
     readable-stream "~1.0.31"
 
+smart-buffer@^1.0.13, smart-buffer@^1.0.4:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
+
+smtp-connection@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
+  dependencies:
+    httpntlm "1.6.1"
+    nodemailer-shared "1.1.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -5394,49 +6307,67 @@ sntp@2.x.x:
   dependencies:
     hoek "4.x.x"
 
-socket.io-adapter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
-  dependencies:
-    debug "2.3.3"
-    socket.io-parser "2.3.1"
+socket.io-adapter@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
 
-socket.io-client@1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.4.tgz#ec9f820356ed99ef6d357f0756d648717bdd4281"
+socket.io-client@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
   dependencies:
     backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
     component-emitter "1.2.1"
-    debug "2.3.3"
-    engine.io-client "~1.8.4"
-    has-binary "0.1.7"
+    debug "~2.6.4"
+    engine.io-client "~3.1.0"
+    has-cors "1.1.0"
     indexof "0.0.1"
     object-component "0.0.3"
+    parseqs "0.0.5"
     parseuri "0.0.5"
-    socket.io-parser "2.3.1"
+    socket.io-parser "~3.1.1"
     to-array "0.1.4"
 
-socket.io-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
+socket.io-parser@~3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
   dependencies:
-    component-emitter "1.1.2"
-    debug "2.2.0"
-    isarray "0.0.1"
-    json3 "3.3.2"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    has-binary2 "~1.0.2"
+    isarray "2.0.1"
 
-socket.io@^1.4.5:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.4.tgz#2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"
+socket.io@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
   dependencies:
-    debug "2.3.3"
-    engine.io "~1.8.4"
-    has-binary "0.1.7"
-    object-assign "4.1.0"
-    socket.io-adapter "0.5.0"
-    socket.io-client "1.7.4"
-    socket.io-parser "2.3.1"
+    debug "~2.6.6"
+    engine.io "~3.1.0"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.0.4"
+    socket.io-parser "~3.1.1"
+
+socks-proxy-agent@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz#2eae7cf8e2a82d34565761539a7f9718c5617659"
+  dependencies:
+    agent-base "^4.1.0"
+    socks "^1.1.10"
+
+socks@1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+  dependencies:
+    ip "^1.1.2"
+    smart-buffer "^1.0.4"
+
+socks@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
+  dependencies:
+    ip "^1.1.4"
+    smart-buffer "^1.0.13"
 
 source-list-map@~0.1.7:
   version "0.1.8"
@@ -5489,7 +6420,7 @@ source-map@^0.4.4, source-map@~0.4.1:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
@@ -5518,6 +6449,12 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split2@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
@@ -5536,6 +6473,10 @@ split@^1.0.0:
   dependencies:
     through "2"
 
+sprintf-js@^1.0.3:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+
 sshpk@^1.7.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
@@ -5550,10 +6491,21 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
-statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.1:
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+statuses@1, statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+"statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+
 statuses@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28"
@@ -5606,6 +6558,15 @@ stream-to-promise@2.2.0:
     end-of-stream "~1.1.0"
     stream-to-array "~2.3.0"
 
+streamroller@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  dependencies:
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    mkdirp "^0.5.1"
+    readable-stream "^2.3.0"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -5639,6 +6600,12 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -5751,15 +6718,6 @@ tar-stream@^1.5.0:
     readable-stream "^2.0.0"
     xtend "^4.0.0"
 
-tar-stream@~1.1.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.1.5.tgz#be9218c130c20029e107b0f967fb23de0579d13c"
-  dependencies:
-    bl "^0.9.0"
-    end-of-stream "^1.0.0"
-    readable-stream "~1.0.33"
-    xtend "^4.0.0"
-
 tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@@ -5768,6 +6726,18 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 temp@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.4.0.tgz#671ad63d57be0fe9d7294664b3fc400636678a60"
@@ -5810,6 +6780,10 @@ through@2, "through@>=2.2.7 <3", through@~2.3, through@~2.3.1, through@~2.3.4, t
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
+thunkify@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+
 tildify@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
@@ -5833,6 +6807,10 @@ timers-ext@0.1, timers-ext@^0.1.2:
     es5-ext "~0.10.14"
     next-tick "1"
 
+timespan@2.3.x:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
+
 tiny-lr@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-0.2.1.tgz#b3fdba802e5d56a33c2f6f10794b32e477ac729d"
@@ -5860,7 +6838,7 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.x:
+tmp@0.0.33, tmp@0.0.x:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
@@ -5870,6 +6848,28 @@ to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
 
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 topo@1.x.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/topo/-/topo-1.1.0.tgz#e9d751615d1bb87dc865db182fa1ca0a5ef536d5"
@@ -5882,12 +6882,18 @@ touch@0.0.3:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@>=0.12.0, tough-cookie@~2.3.0, tough-cookie@~2.3.2:
+tough-cookie@~2.3.0, tough-cookie@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
     punycode "^1.4.1"
 
+tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
 traverse@>=0.2.4:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
@@ -5959,7 +6965,7 @@ tslint@~5.1.0:
     semver "^5.3.0"
     tsutils "^1.4.0"
 
-tsscmp@1.0.5:
+tsscmp@1.0.5, tsscmp@~1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
 
@@ -5989,7 +6995,7 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.0, tunnel-agent@~0.4.1:
+tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
 
@@ -5997,13 +7003,26 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-type-is@~1.6.10, type-is@~1.6.15, type-is@~1.6.6:
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-is@~1.6.10, type-is@~1.6.6:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -6077,22 +7096,42 @@ ultron@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
 
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+
 unc-path-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore.string@~3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.0.3.tgz#4617b8c1a250cf6e5064fbbb363d0fa96cf14552"
+underscore.string@3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db"
+  dependencies:
+    sprintf-js "^1.0.3"
+    util-deprecate "^1.0.2"
 
 underscore@1.x:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
 
+underscore@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
+
 unicoderegexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/unicoderegexp/-/unicoderegexp-0.4.1.tgz#afb10e4ef1eeddc711417bbb652bc885da9d4171"
 
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
 unique-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
@@ -6114,6 +7153,13 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
 unzip@~0.1.9:
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0"
@@ -6125,6 +7171,10 @@ unzip@~0.1.9:
     readable-stream "~1.0.31"
     setimmediate ">= 1.0.1 < 2"
 
+upath@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -6136,18 +7186,24 @@ url@~0.10.1:
     punycode "1.3.2"
     querystring "0.2.0"
 
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
+  dependencies:
+    kind-of "^6.0.2"
+
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
-useragent@^2.1.6:
+useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
@@ -6169,6 +7225,10 @@ uuid@^3.0.0, uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+uws@~9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
+
 v8flags@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -6182,7 +7242,7 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-vargs@~0.1.0:
+vargs@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
 
@@ -6270,17 +7330,18 @@ watchpack@^0.2.1:
     chokidar "^1.0.0"
     graceful-fs "^4.1.2"
 
-wd@^0.3.4:
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/wd/-/wd-0.3.12.tgz#3fb4f1d759f8c85dde5393d17334ffe03e9bb329"
+wd@^1.4.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/wd/-/wd-1.10.1.tgz#06cfe70a4903d7359f155866b8bafbe30aaccc3e"
   dependencies:
-    archiver "~0.14.0"
-    async "~1.0.0"
-    lodash "~3.9.3"
-    q "~1.4.1"
-    request "~2.55.0"
-    underscore.string "~3.0.3"
-    vargs "~0.1.0"
+    archiver "2.1.1"
+    async "2.0.1"
+    lodash "4.17.10"
+    mkdirp "^0.5.1"
+    q "1.4.1"
+    request "2.85.0"
+    underscore.string "3.3.4"
+    vargs "0.1.0"
 
 webdriver-js-extender@^1.0.0:
   version "1.0.0"
@@ -6351,7 +7412,7 @@ when@3.7.7:
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.7.tgz#aba03fc3bb736d6c88b091d013d8a8e590d84718"
 
-when@^3.7.2:
+when@^3.7.2, when@^3.7.7:
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
 
@@ -6366,7 +7427,13 @@ which@1.2.4:
     is-absolute "^0.1.7"
     isexe "^1.1.1"
 
-which@^1.0.9, which@^1.2.12, which@^1.2.9:
+which@^1.2.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.2.12, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -6390,6 +7457,10 @@ winreg@0.0.12:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/winreg/-/winreg-0.0.12.tgz#07105554ba1a9d08979251d129475bffae3006b7"
 
+with-callback@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -6398,6 +7469,10 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6409,23 +7484,20 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-ws@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
-ws@1.1.4, ws@^1.0.1:
+ws@^1.0.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
   dependencies:
     options ">=0.0.5"
     ultron "1.0.x"
 
-wtf-8@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
+ws@~3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
 
 xhr2@0.1.4:
   version "0.1.4"
@@ -6466,14 +7538,18 @@ xmldom@^0.1.27:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 
-xmlhttprequest-ssl@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
 xpath@^0.0.27:
   version "0.0.27"
   resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"
 
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -6486,6 +7562,10 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -6542,7 +7622,7 @@ zip-dir@1.0.2:
     async "^1.5.2"
     jszip "^2.4.0"
 
-zip-stream@^1.0.0, zip-stream@^1.1.0:
+zip-stream@^1.0.0, zip-stream@^1.1.0, zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
   dependencies:
@@ -6551,14 +7631,6 @@ zip-stream@^1.0.0, zip-stream@^1.1.0:
     lodash "^4.8.0"
     readable-stream "^2.0.0"
 
-zip-stream@~0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-0.5.2.tgz#32dcbc506d0dab4d21372625bd7ebaac3c2fff56"
-  dependencies:
-    compress-commons "~0.2.0"
-    lodash "~3.2.0"
-    readable-stream "~1.0.26"
-
 zone.js@^0.8.26:
   version "0.8.26"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"

From f936b8cbd2e230b651e3ed9bf4aa143b2ea240ec Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Tue, 13 Mar 2018 18:06:13 +0100
Subject: [PATCH 425/582] docs: refactored ng-container code (#22742)

PR Close #22742
---
 .../ngcontainer/src/app/app.component.css         | 13 +++++++++----
 .../ngcontainer/src/app/app.component.html        |  4 ++--
 .../examples/ngcontainer/src/app/app.component.ts |  5 +++--
 .../examples/ngcontainer/src/app/app.module.ts    |  6 +++---
 .../ngcontainer/src/app/hero.components.ts        | 15 ++++++++++-----
 aio/content/examples/ngcontainer/src/app/hero.ts  |  6 +++---
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/aio/content/examples/ngcontainer/src/app/app.component.css b/aio/content/examples/ngcontainer/src/app/app.component.css
index cdb6631713..a5c959f6f7 100644
--- a/aio/content/examples/ngcontainer/src/app/app.component.css
+++ b/aio/content/examples/ngcontainer/src/app/app.component.css
@@ -4,7 +4,8 @@ button {
   font-size: 100%;
 }
 
-code, .code {
+code,
+.code {
   background-color: #eee;
   color: black;
   font-family: Courier, sans-serif;
@@ -21,14 +22,18 @@ div.code {
 }
 
 hr {
-  margin: 40px 0
+  margin: 40px 0;
 }
 
-td, th {
+td,
+th {
   text-align: left;
   vertical-align: top;
 }
 
 /* #docregion p-span */
-p span { color: red; font-size: 70%; }
+p span {
+  color: red;
+  font-size: 70%;
+}
 /* #enddocregion p-span */
diff --git a/aio/content/examples/ngcontainer/src/app/app.component.html b/aio/content/examples/ngcontainer/src/app/app.component.html
index 33a68fecaf..0f1c2d3e89 100644
--- a/aio/content/examples/ngcontainer/src/app/app.component.html
+++ b/aio/content/examples/ngcontainer/src/app/app.component.html
@@ -132,7 +132,7 @@
 <!-- #docregion select-span -->
 <select [(ngModel)]="hero">
   <span *ngFor="let h of heroes">
-    <span *ngIf="showSad || h?.emotion != 'sad'">
+    <span *ngIf="showSad || h?.emotion !== 'sad'">
       <option [ngValue]="h">{{h.name}} ({{h?.emotion}})</option>
     </span>
   </span>
@@ -147,7 +147,7 @@
 <!-- #docregion select-ngcontainer -->
 <select [(ngModel)]="hero">
   <ng-container *ngFor="let h of heroes">
-    <ng-container *ngIf="showSad || h?.emotion != 'sad'">
+    <ng-container *ngIf="showSad || h?.emotion !== 'sad'">
       <option [ngValue]="h">{{h.name}} ({{h?.emotion}})</option>
     </ng-container>
   </ng-container>
diff --git a/aio/content/examples/ngcontainer/src/app/app.component.ts b/aio/content/examples/ngcontainer/src/app/app.component.ts
index 65c511acd2..068d1896d8 100644
--- a/aio/content/examples/ngcontainer/src/app/app.component.ts
+++ b/aio/content/examples/ngcontainer/src/app/app.component.ts
@@ -6,14 +6,15 @@ import { heroes } from './hero';
 @Component({
   selector: 'my-app',
   templateUrl: './app.component.html',
-  styleUrls: [ './app.component.css' ]
+  styleUrls: ['./app.component.css']
 })
 export class AppComponent {
   heroes = heroes;
   hero = this.heroes[0];
-  heroTraits = [ 'honest', 'brave', 'considerate' ];
+  heroTraits = ['honest', 'brave', 'considerate'];
 
   // flags for the table
+
   attrDirs = true;
   strucDirs = true;
   divNgIf = false;
diff --git a/aio/content/examples/ngcontainer/src/app/app.module.ts b/aio/content/examples/ngcontainer/src/app/app.module.ts
index 57ac92f518..f18ebb526e 100644
--- a/aio/content/examples/ngcontainer/src/app/app.module.ts
+++ b/aio/content/examples/ngcontainer/src/app/app.module.ts
@@ -1,9 +1,9 @@
 // #docregion
-import { NgModule }      from '@angular/core';
-import { FormsModule }   from '@angular/forms';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { AppComponent }     from './app.component';
+import { AppComponent } from './app.component';
 import { ContentComponent } from './content.component';
 import { heroComponents } from './hero.components';
 
diff --git a/aio/content/examples/ngcontainer/src/app/hero.components.ts b/aio/content/examples/ngcontainer/src/app/hero.components.ts
index 77920ebdf9..12706deda9 100644
--- a/aio/content/examples/ngcontainer/src/app/hero.components.ts
+++ b/aio/content/examples/ngcontainer/src/app/hero.components.ts
@@ -1,5 +1,6 @@
 // #docregion
 import { Component, Input } from '@angular/core';
+
 import { Hero } from './hero';
 
 @Component({
@@ -33,11 +34,15 @@ export class ConfusedHeroComponent {
 export class UnknownHeroComponent {
   @Input() hero: Hero;
   get message() {
-    return this.hero && this.hero.name ?
-      `${this.hero.name} is strange and mysterious.` :
-      'Are you feeling indecisive?';
+    return this.hero && this.hero.name
+      ? `${this.hero.name} is strange and mysterious.`
+      : 'Are you feeling indecisive?';
   }
 }
 
-export const heroComponents =
-  [ HappyHeroComponent, SadHeroComponent, ConfusedHeroComponent, UnknownHeroComponent ];
+export const heroComponents = [
+  HappyHeroComponent,
+  SadHeroComponent,
+  ConfusedHeroComponent,
+  UnknownHeroComponent
+];
diff --git a/aio/content/examples/ngcontainer/src/app/hero.ts b/aio/content/examples/ngcontainer/src/app/hero.ts
index 89f0cbfdf8..28b435252d 100644
--- a/aio/content/examples/ngcontainer/src/app/hero.ts
+++ b/aio/content/examples/ngcontainer/src/app/hero.ts
@@ -6,8 +6,8 @@ export class Hero {
 }
 
 export const heroes: Hero[] = [
-  { id: 1, name: 'Mr. Nice',  emotion: 'happy'},
-  { id: 2, name: 'Narco',     emotion: 'sad' },
+  { id: 1, name: 'Mr. Nice', emotion: 'happy' },
+  { id: 2, name: 'Narco', emotion: 'sad' },
   { id: 3, name: 'Windstorm', emotion: 'confused' },
-  { id: 4, name: 'Magneta'}
+  { id: 4, name: 'Magneta' }
 ];

From 94076c934c7c310f4e752482d8c96c4ed6b88253 Mon Sep 17 00:00:00 2001
From: Paul Spears <dpsthree@gmail.com>
Date: Wed, 2 May 2018 15:11:43 -0500
Subject: [PATCH 426/582] docs: update Angular Boot Camp description (#23653)

PR Close #23653
---
 aio/content/marketing/resources.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index da1097e96d..8e14beefd0 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -672,8 +672,8 @@
             "url": "http://ninja-squad.com/formations/formation-angular2"
           },
           "a2b": {
-            "desc": "Angular Boot Camp covers introductory and intermediate content. It includes extensive workshop session, with hands-on help from our experienced developer-trainers. At the end of this class, student are usually able to use AngularJS to make an end-to-end, working application.",
-            "logo": "",
+            "desc": "Angular Boot Camp covers introductory through advanced Angular topics. It includes extensive workshop sessions, with hands-on help from our experienced developer-trainers. We take developers or teams from the beginnings of Angular understanding through a working knowledge of all essential Angular features.",
+            "logo": "https://angularbootcamp.com/images/angular-boot-camp-logo.svg",
             "rev": true,
             "title": "Angular Boot Camp",
             "url": "https://angularbootcamp.com"

From 250527ca681046f5cd7679e06e0521a8b01b0fb6 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 24 May 2018 17:51:45 +0300
Subject: [PATCH 427/582] feat(service-worker): add support for `?` in SW
 config globbing (#24105)

The globbing is used in the following sections:
- `assetGroups` > `resources` > `files`/`versionedFiles`
- `assetGroups` > `resources` > `urls`
- `dataGroups` > `urls`
- `navigationUrls`

Query params are ignored for `files`/`versionedFiles` and
`navigationUrls`, but they are still taken into account for
`assetGroups`/`dataGroups` `urls`. To avoid a breaking change, `?` is
matched literally for these patterns.

PR Close #24105
---
 aio/content/guide/service-worker-config.md    |  5 +--
 .../service-worker/config/src/generator.ts    |  8 ++---
 packages/service-worker/config/src/glob.ts    | 19 +++++++---
 .../config/test/generator_spec.ts             | 35 +++++++++++++------
 4 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/aio/content/guide/service-worker-config.md b/aio/content/guide/service-worker-config.md
index d2293d0e48..e5ba6e3afe 100644
--- a/aio/content/guide/service-worker-config.md
+++ b/aio/content/guide/service-worker-config.md
@@ -23,6 +23,7 @@ Unless otherwise noted, patterns use a limited glob format:
 
 * `**` matches 0 or more path segments.
 * `*` matches 0 or more characters excluding `/`.
+* `?` matches exactly one character excluding `/`.
 * The `!` prefix marks the pattern as being negative, meaning that only files that don't match the pattern will be included.
 
 Example patterns:
@@ -106,7 +107,7 @@ This section describes the resources to cache, broken up into three groups.
 * `versionedFiles` has been deprecated. As of v6 `versionedFiles` and `files` options have the same behavior. Use `files` instead.
 
 * `urls` includes both URLs and URL patterns that will be matched at runtime. These resources are not fetched directly and do not have content hashes, but they will be cached according to their HTTP headers. This is most useful for CDNs such as the Google Fonts service.<br>
-  _(Negative glob patterns are not supported.)_
+  _(Negative glob patterns are not supported and `?` will be matched literally; i.e. it will not match any character other than `?`.)_
 
 ## `dataGroups`
 
@@ -133,7 +134,7 @@ Similar to `assetGroups`, every data group has a `name` which uniquely identifie
 
 ### `urls`
 A list of URL patterns. URLs that match these patterns will be cached according to this data group's policy.<br>
-  _(Negative glob patterns are not supported.)_
+  _(Negative glob patterns are not supported and `?` will be matched literally; i.e. it will not match any character other than `?`.)_
 
 ### `version`
 Occasionally APIs change formats in a way that is not backward-compatible. A new version of the app may not be compatible with the old API format and thus may not be compatible with existing cached resources from that API.
diff --git a/packages/service-worker/config/src/generator.ts b/packages/service-worker/config/src/generator.ts
index fc9dfb31a6..659e615afd 100644
--- a/packages/service-worker/config/src/generator.ts
+++ b/packages/service-worker/config/src/generator.ts
@@ -75,7 +75,7 @@ export class Generator {
         installMode: group.installMode || 'prefetch',
         updateMode: group.updateMode || group.installMode || 'prefetch',
         urls: matchedFiles.map(url => joinUrls(this.baseHref, url)),
-        patterns: (group.resources.urls || []).map(url => urlToRegex(url, this.baseHref)),
+        patterns: (group.resources.urls || []).map(url => urlToRegex(url, this.baseHref, true)),
       };
     }));
   }
@@ -84,7 +84,7 @@ export class Generator {
     return (config.dataGroups || []).map(group => {
       return {
         name: group.name,
-        patterns: group.urls.map(url => urlToRegex(url, this.baseHref)),
+        patterns: group.urls.map(url => urlToRegex(url, this.baseHref, true)),
         strategy: group.cacheConfig.strategy || 'performance',
         maxSize: group.cacheConfig.maxSize,
         maxAge: parseDurationToMs(group.cacheConfig.maxAge),
@@ -132,12 +132,12 @@ function matches(file: string, patterns: {positive: boolean, regex: RegExp}[]):
   return res;
 }
 
-function urlToRegex(url: string, baseHref: string): string {
+function urlToRegex(url: string, baseHref: string, literalQuestionMark?: boolean): string {
   if (!url.startsWith('/') && url.indexOf('://') === -1) {
     url = joinUrls(baseHref, url);
   }
 
-  return globToRegex(url);
+  return globToRegex(url, literalQuestionMark);
 }
 
 function joinUrls(a: string, b: string): string {
diff --git a/packages/service-worker/config/src/glob.ts b/packages/service-worker/config/src/glob.ts
index e886296cd2..bfd22236f1 100644
--- a/packages/service-worker/config/src/glob.ts
+++ b/packages/service-worker/config/src/glob.ts
@@ -6,17 +6,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-const WILD_SINGLE = '[^\\/]*';
+const QUESTION_MARK = '[^/]';
+const WILD_SINGLE = '[^/]*';
 const WILD_OPEN = '(?:.+\\/)?';
 
-const TO_ESCAPE = [
+const TO_ESCAPE_BASE = [
   {replace: /\./g, with: '\\.'},
-  {replace: /\?/g, with: '\\?'},
   {replace: /\+/g, with: '\\+'},
   {replace: /\*/g, with: WILD_SINGLE},
 ];
+const TO_ESCAPE_WILDCARD_QM = [
+  ...TO_ESCAPE_BASE,
+  {replace: /\?/g, with: QUESTION_MARK},
+];
+const TO_ESCAPE_LITERAL_QM = [
+  ...TO_ESCAPE_BASE,
+  {replace: /\?/g, with: '\\?'},
+];
 
-export function globToRegex(glob: string): string {
+export function globToRegex(glob: string, literalQuestionMark = false): string {
+  const toEscape = literalQuestionMark ? TO_ESCAPE_LITERAL_QM : TO_ESCAPE_WILDCARD_QM;
   const segments = glob.split('/').reverse();
   let regex: string = '';
   while (segments.length > 0) {
@@ -28,7 +37,7 @@ export function globToRegex(glob: string): string {
         regex += '.*';
       }
     } else {
-      const processed = TO_ESCAPE.reduce(
+      const processed = toEscape.reduce(
           (segment, escape) => segment.replace(escape.replace, escape.with), segment);
       regex += processed;
       if (segments.length > 0) {
diff --git a/packages/service-worker/config/test/generator_spec.ts b/packages/service-worker/config/test/generator_spec.ts
index fd614d1215..9932524654 100644
--- a/packages/service-worker/config/test/generator_spec.ts
+++ b/packages/service-worker/config/test/generator_spec.ts
@@ -14,6 +14,9 @@ import {MockFilesystem} from '../testing/mock';
     it('generates a correct config', done => {
       const fs = new MockFilesystem({
         '/index.html': 'This is a test',
+        '/main.css': 'This is a CSS file',
+        '/main.js': 'This is a JS file',
+        '/main.ts': 'This is a TS file',
         '/test.txt': 'Another test',
         '/foo/test.html': 'Another test',
         '/ignored/x.html': 'should be ignored',
@@ -28,8 +31,9 @@ import {MockFilesystem} from '../testing/mock';
           name: 'test',
           resources: {
             files: [
-              '/**/*.html', '!/ignored/**',
-              //                '/*.html',
+              '/**/*.html',
+              '/**/*.?s',
+              '!/ignored/**',
             ],
             versionedFiles: [
               '/**/*.txt',
@@ -46,6 +50,7 @@ import {MockFilesystem} from '../testing/mock';
           urls: [
             '/api/**',
             'relapi/**',
+            'https://example.com/**/*?with+escaped+chars',
           ],
           cacheConfig: {
             maxSize: 100,
@@ -56,8 +61,9 @@ import {MockFilesystem} from '../testing/mock';
         navigationUrls: [
           '/included/absolute/**',
           '!/excluded/absolute/**',
-          '/included/some/url?with+escaped+chars',
+          '/included/some/url/with+escaped+chars',
           '!excluded/relative/*.txt',
+          '!/api/?*',
           'http://example.com/included',
           '!http://example.com/excluded',
         ],
@@ -76,17 +82,23 @@ import {MockFilesystem} from '../testing/mock';
                urls: [
                  '/test/foo/test.html',
                  '/test/index.html',
+                 '/test/main.js',
+                 '/test/main.ts',
                  '/test/test.txt',
                ],
                patterns: [
                  '\\/absolute\\/.*',
                  '\\/some\\/url\\?with\\+escaped\\+chars',
-                 '\\/test\\/relative\\/[^\\/]*\\.txt',
+                 '\\/test\\/relative\\/[^/]*\\.txt',
                ]
              }],
              dataGroups: [{
                name: 'other',
-               patterns: ['\\/api\\/.*', '\\/test\\/relapi\\/.*'],
+               patterns: [
+                 '\\/api\\/.*',
+                 '\\/test\\/relapi\\/.*',
+                 'https:\\/\\/example\\.com\\/(?:.+\\/)?[^/]*\\?with\\+escaped\\+chars',
+               ],
                strategy: 'performance',
                maxSize: 100,
                maxAge: 259200000,
@@ -96,14 +108,17 @@ import {MockFilesystem} from '../testing/mock';
              navigationUrls: [
                {positive: true, regex: '^\\/included\\/absolute\\/.*$'},
                {positive: false, regex: '^\\/excluded\\/absolute\\/.*$'},
-               {positive: true, regex: '^\\/included\\/some\\/url\\?with\\+escaped\\+chars$'},
-               {positive: false, regex: '^\\/test\\/excluded\\/relative\\/[^\\/]*\\.txt$'},
+               {positive: true, regex: '^\\/included\\/some\\/url\\/with\\+escaped\\+chars$'},
+               {positive: false, regex: '^\\/test\\/excluded\\/relative\\/[^/]*\\.txt$'},
+               {positive: false, regex: '^\\/api\\/[^/][^/]*$'},
                {positive: true, regex: '^http:\\/\\/example\\.com\\/included$'},
                {positive: false, regex: '^http:\\/\\/example\\.com\\/excluded$'},
              ],
              hashTable: {
                '/test/foo/test.html': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643',
                '/test/index.html': 'a54d88e06612d820bc3be72877c74f257b561b19',
+               '/test/main.js': '41347a66676cdc0516934c76d9d13010df420f2c',
+               '/test/main.ts': '7d333e31f0bfc4f8152732bb211a93629484c035',
                '/test/test.txt': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643'
              }
            });
@@ -129,9 +144,9 @@ import {MockFilesystem} from '../testing/mock';
              dataGroups: [],
              navigationUrls: [
                {positive: true, regex: '^\\/.*$'},
-               {positive: false, regex: '^\\/(?:.+\\/)?[^\\/]*\\.[^\\/]*$'},
-               {positive: false, regex: '^\\/(?:.+\\/)?[^\\/]*__[^\\/]*$'},
-               {positive: false, regex: '^\\/(?:.+\\/)?[^\\/]*__[^\\/]*\\/.*$'},
+               {positive: false, regex: '^\\/(?:.+\\/)?[^/]*\\.[^/]*$'},
+               {positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*$'},
+               {positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*\\/.*$'},
              ],
              hashTable: {}
            });

From 45feb10c4640a7bacb031c70d68334a9ba315e7e Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 25 May 2018 14:37:46 +0300
Subject: [PATCH 428/582] refactor(service-worker): avoid unnecessary
 operations and remove unused code (#24127)

PR Close #24127
---
 packages/service-worker/worker/src/driver.ts | 33 +++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/service-worker/worker/src/driver.ts b/packages/service-worker/worker/src/driver.ts
index 6814053df9..1dc99259b3 100644
--- a/packages/service-worker/worker/src/driver.ts
+++ b/packages/service-worker/worker/src/driver.ts
@@ -225,16 +225,21 @@ export class Driver implements Debuggable, UpdateSource {
     // Initialization is the only event which is sent directly from the SW to itself,
     // and thus `event.source` is not a Client. Handle it here, before the check
     // for Client sources.
-    if (data.action === 'INITIALIZE' && this.initialized === null) {
-      // Initialize the SW.
-      this.initialized = this.initialize();
+    if (data.action === 'INITIALIZE') {
+      // Only initialize if not already initialized (or initializing).
+      if (this.initialized === null) {
+        // Initialize the SW.
+        this.initialized = this.initialize();
 
-      // Wait until initialization is properly scheduled, then trigger idle
-      // events to allow it to complete (assuming the SW is idle).
-      event.waitUntil((async() => {
-        await this.initialized;
-        await this.idle.trigger();
-      })());
+        // Wait until initialization is properly scheduled, then trigger idle
+        // events to allow it to complete (assuming the SW is idle).
+        event.waitUntil((async() => {
+          await this.initialized;
+          await this.idle.trigger();
+        })());
+      }
+
+      return;
     }
 
     // Only messages from true clients are accepted past this point (this is essentially
@@ -725,16 +730,6 @@ export class Driver implements Debuggable, UpdateSource {
   private async setupUpdate(manifest: Manifest, hash: string): Promise<void> {
     const newVersion = new AppVersion(this.scope, this.adapter, this.db, this.idle, manifest, hash);
 
-    // Try to determine a version that's safe to update from.
-    let updateFrom: AppVersion|undefined = undefined;
-
-    // It's always safe to update from a version, even a broken one, as it will still
-    // only have valid resources cached. If there is no latest version, though, this
-    // update will have to install as a fresh version.
-    if (this.latestHash !== null) {
-      updateFrom = this.versions.get(this.latestHash);
-    }
-
     // Firstly, check if the manifest version is correct.
     if (manifest.configVersion !== SUPPORTED_CONFIG_VERSION) {
       await this.deleteAllCaches();

From 52d43a99ef9384a970ae926aada80cc9788aca6d Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 25 May 2018 15:15:42 +0300
Subject: [PATCH 429/582] fix(service-worker): avoid network requests when
 looking up hashed resources in cache (#24127)

PR Close #24127
---
 .../service-worker/worker/src/app-version.ts  | 12 +---
 .../service-worker/worker/test/happy_spec.ts  | 57 +++++++++++++++++--
 2 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/packages/service-worker/worker/src/app-version.ts b/packages/service-worker/worker/src/app-version.ts
index e766dcc8e3..1329c9aaf4 100644
--- a/packages/service-worker/worker/src/app-version.ts
+++ b/packages/service-worker/worker/src/app-version.ts
@@ -198,8 +198,6 @@ export class AppVersion implements UpdateSource {
    * Check this version for a given resource with a particular hash.
    */
   async lookupResourceWithHash(url: string, hash: string): Promise<Response|null> {
-    const req = this.adapter.newRequest(url);
-
     // Verify that this version has the requested resource cached. If not,
     // there's no point in trying.
     if (!this.hashTable.has(url)) {
@@ -208,16 +206,12 @@ export class AppVersion implements UpdateSource {
 
     // Next, check whether the resource has the correct hash. If not, any cached
     // response isn't usable.
-    if (this.hashTable.get(url) ! !== hash) {
+    if (this.hashTable.get(url) !== hash) {
       return null;
     }
 
-    // TODO: no-op context and appropriate contract. Currently this is a violation
-    // of the typings and could cause issues if handleFetch() has side effects. A
-    // better strategy to deal with side effects is needed.
-    // TODO: this could result in network fetches if the response is lazy. Refactor
-    // to avoid them.
-    return this.handleFetch(req, null !);
+    const cacheState = await this.lookupResourceWithoutHash(url);
+    return cacheState && cacheState.response;
   }
 
   /**
diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts
index e444ca1502..1b558ef799 100644
--- a/packages/service-worker/worker/test/happy_spec.ts
+++ b/packages/service-worker/worker/test/happy_spec.ts
@@ -24,6 +24,9 @@ const dist =
         .addFile('/baz.txt', 'this is baz')
         .addFile('/qux.txt', 'this is qux')
         .addFile('/quux.txt', 'this is quux')
+        .addFile('/quuux.txt', 'this is quuux')
+        .addFile('/lazy/unchanged1.txt', 'this is unchanged (1)')
+        .addFile('/lazy/unchanged2.txt', 'this is unchanged (2)')
         .addUnhashedFile('/unhashed/a.txt', 'this is unhashed', {'Cache-Control': 'max-age=10'})
         .build();
 
@@ -34,6 +37,9 @@ const distUpdate =
         .addFile('/baz.txt', 'this is baz v2')
         .addFile('/qux.txt', 'this is qux v2')
         .addFile('/quux.txt', 'this is quux v2')
+        .addFile('/quuux.txt', 'this is quuux v2')
+        .addFile('/lazy/unchanged1.txt', 'this is unchanged (1)')
+        .addFile('/lazy/unchanged2.txt', 'this is unchanged (2)')
         .addUnhashedFile('/unhashed/a.txt', 'this is unhashed v2', {'Cache-Control': 'max-age=10'})
         .addUnhashedFile('/ignored/file1', 'this is not handled by the SW')
         .addUnhashedFile('/ignored/dir/file2', 'this is not handled by the SW either')
@@ -92,7 +98,12 @@ const manifest: Manifest = {
       name: 'lazy_prefetch',
       installMode: 'lazy',
       updateMode: 'prefetch',
-      urls: ['/quux.txt'],
+      urls: [
+        '/quux.txt',
+        '/quuux.txt',
+        '/lazy/unchanged1.txt',
+        '/lazy/unchanged2.txt',
+      ],
       patterns: [],
     }
   ],
@@ -134,7 +145,12 @@ const manifestUpdate: Manifest = {
       name: 'lazy_prefetch',
       installMode: 'lazy',
       updateMode: 'prefetch',
-      urls: ['/quux.txt'],
+      urls: [
+        '/quux.txt',
+        '/quuux.txt',
+        '/lazy/unchanged1.txt',
+        '/lazy/unchanged2.txt',
+      ],
       patterns: [],
     }
   ],
@@ -528,14 +544,45 @@ const manifestUpdateHash = sha1(JSON.stringify(manifestUpdate));
     async_it('prefetches updates to lazy cache when set', async() => {
       expect(await makeRequest(scope, '/foo.txt')).toEqual('this is foo');
       await driver.initialized;
-      expect(await makeRequest(scope, '/quux.txt')).toEqual('this is quux');
 
+      // Fetch some files from the `lazy_prefetch` asset group.
+      expect(await makeRequest(scope, '/quux.txt')).toEqual('this is quux');
+      expect(await makeRequest(scope, '/lazy/unchanged1.txt')).toEqual('this is unchanged (1)');
+
+      // Install update.
       scope.updateServerState(serverUpdate);
-      expect(await driver.checkForUpdate()).toEqual(true);
+      expect(await driver.checkForUpdate()).toBe(true);
+
+      // Previously requested and changed: Fetch from network.
       serverUpdate.assertSawRequestFor('/quux.txt');
+      // Never requested and changed: Don't fetch.
+      serverUpdate.assertNoRequestFor('/quuux.txt');
+      // Previously requested and unchanged: Fetch from cache.
+      serverUpdate.assertNoRequestFor('/lazy/unchanged1.txt');
+      // Never requested and unchanged: Don't fetch.
+      serverUpdate.assertNoRequestFor('/lazy/unchanged2.txt');
+
       serverUpdate.clearRequests();
+
+      // Update client.
       await driver.updateClient(await scope.clients.get('default'));
-      expect(await makeRequest(scope, '/quux.txt')).toEqual('this is quux v2');
+
+      // Already cached.
+      expect(await makeRequest(scope, '/quux.txt')).toBe('this is quux v2');
+      serverUpdate.assertNoOtherRequests();
+
+      // Not cached: Fetch from network.
+      expect(await makeRequest(scope, '/quuux.txt')).toBe('this is quuux v2');
+      serverUpdate.assertSawRequestFor('/quuux.txt');
+
+      // Already cached (copied from old cache).
+      expect(await makeRequest(scope, '/lazy/unchanged1.txt')).toBe('this is unchanged (1)');
+      serverUpdate.assertNoOtherRequests();
+
+      // Not cached: Fetch from network.
+      expect(await makeRequest(scope, '/lazy/unchanged2.txt')).toBe('this is unchanged (2)');
+      serverUpdate.assertSawRequestFor('/lazy/unchanged2.txt');
+
       serverUpdate.assertNoOtherRequests();
     });
 

From 3980640d53eb8bfdfd05d590addae77d09ebf379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Tue, 19 Jun 2018 12:45:00 -0700
Subject: [PATCH 430/582] feat(ivy): properly apply style="", [style],
 [style.foo] and [attr.style] bindings (#24602)

PR Close #24602
---
 .../src/largetable/render3/table.ts           |  10 +-
 modules/benchmarks/src/tree/render3/tree.ts   |  30 +-
 packages/compiler/src/core.ts                 |   6 +
 .../compiler/src/render3/r3_identifiers.ts    |   8 +-
 packages/compiler/src/render3/view/styling.ts | 111 +++
 .../compiler/src/render3/view/template.ts     | 128 +++-
 .../render3/r3_compiler_compliance_spec.ts    |  26 +-
 .../render3/r3_view_compiler_styling_spec.ts  |  68 +-
 .../compiler/test/render3/styling_spec.ts     |  93 +++
 .../core/src/core_render3_private_export.ts   |   4 +-
 packages/core/src/render3/index.ts            |   7 +-
 packages/core/src/render3/instructions.ts     | 174 +++--
 .../core/src/render3/interfaces/definition.ts |   6 +
 packages/core/src/render3/interfaces/node.ts  |   4 +
 packages/core/src/render3/jit/environment.ts  |   5 +-
 packages/core/src/render3/styling.ts          | 621 +++++++++++++++++
 .../compiler_canonical/elements_spec.ts       |  28 +-
 .../compiler_canonical/sanitize_spec.ts       |  13 +-
 .../core/test/render3/instructions_spec.ts    |  35 +-
 .../core/test/render3/integration_spec.ts     |  10 +-
 .../render3/node_selector_matcher_spec.ts     |   3 +-
 packages/core/test/render3/styling_spec.ts    | 657 ++++++++++++++++++
 22 files changed, 1904 insertions(+), 143 deletions(-)
 create mode 100644 packages/compiler/src/render3/view/styling.ts
 create mode 100644 packages/compiler/test/render3/styling_spec.ts
 create mode 100644 packages/core/src/render3/styling.ts
 create mode 100644 packages/core/test/render3/styling_spec.ts

diff --git a/modules/benchmarks/src/largetable/render3/table.ts b/modules/benchmarks/src/largetable/render3/table.ts
index 881f487525..bbd822dcc1 100644
--- a/modules/benchmarks/src/largetable/render3/table.ts
+++ b/modules/benchmarks/src/largetable/render3/table.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as detectChanges, ɵe as e, ɵsn as sn, ɵt as t, ɵv as v} from '@angular/core';
+import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as detectChanges, ɵe as e, ɵi1 as i1, ɵp as p, ɵs as s, ɵsa as sa, ɵsm as sm, ɵsp as sp, ɵt as t, ɵv as v} from '@angular/core';
 import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 import {TableCell, buildTable, emptyTable} from '../util';
 
+const c0 = ['background-color'];
 export class LargeTableComponent {
   data: TableCell[][] = emptyTable;
 
@@ -47,12 +48,13 @@ export class LargeTableComponent {
                     {
                       if (rf2 & RenderFlags.Create) {
                         E(0, 'td');
-                        { T(1); }
+                        s(1, c0);
+                        { T(2); }
                         e();
                       }
                       if (rf2 & RenderFlags.Update) {
-                        sn(0, 'background-color', b(cell.row % 2 ? '' : 'grey'));
-                        t(1, b(cell.value));
+                        sp(1, 0, cell.row % 2 ? '' : 'grey');
+                        t(2, b(cell.value));
                       }
                     }
                     v();
diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts
index e81f401b4f..17ef84672b 100644
--- a/modules/benchmarks/src/tree/render3/tree.ts
+++ b/modules/benchmarks/src/tree/render3/tree.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as _detectChanges, ɵe as e, ɵi1 as i1, ɵp as p, ɵsn as sn, ɵt as t, ɵv as v} from '@angular/core';
+import {ɵC as C, ɵE as E, ɵRenderFlags as RenderFlags, ɵT as T, ɵV as V, ɵb as b, ɵcR as cR, ɵcr as cr, ɵdefineComponent as defineComponent, ɵdetectChanges as _detectChanges, ɵe as e, ɵi1 as i1, ɵp as p, ɵs as s, ɵsa as sa, ɵsm as sm, ɵsp as sp, ɵt as t, ɵv as v} from '@angular/core';
 
 import {TreeNode, buildTree, emptyTree} from '../util';
 
@@ -30,6 +30,7 @@ export function detectChanges(component: TreeComponent) {
   numberOfChecksEl.textContent = `${detectChangesRuns}`;
 }
 
+const c0 = ['background-color'];
 export class TreeComponent {
   data: TreeNode = emptyTree;
 
@@ -40,15 +41,16 @@ export class TreeComponent {
     template: function(rf: RenderFlags, ctx: TreeComponent) {
       if (rf & RenderFlags.Create) {
         E(0, 'span');
-        { T(1); }
+        s(1, c0);
+        { T(2); }
         e();
-        C(2);
         C(3);
+        C(4);
       }
       if (rf & RenderFlags.Update) {
-        sn(0, 'background-color', b(ctx.data.depth % 2 ? '' : 'grey'));
-        t(1, i1(' ', ctx.data.value, ' '));
-        cR(2);
+        sp(1, 0, ctx.data.depth % 2 ? '' : 'grey');
+        t(2, i1(' ', ctx.data.value, ' '));
+        cR(3);
         {
           if (ctx.data.left != null) {
             let rf0 = V(0);
@@ -65,7 +67,7 @@ export class TreeComponent {
           }
         }
         cr();
-        cR(3);
+        cR(4);
         {
           if (ctx.data.right != null) {
             let rf0 = V(0);
@@ -106,22 +108,24 @@ export class TreeFunction {
   });
 }
 
+const c1 = ['background-color'];
 export function TreeTpl(rf: RenderFlags, ctx: TreeNode) {
   if (rf & RenderFlags.Create) {
     E(0, 'tree');
     {
       E(1, 'span');
-      { T(2); }
+      s(2, c1);
+      { T(3); }
       e();
-      C(3);
       C(4);
+      C(5);
     }
     e();
   }
   if (rf & RenderFlags.Update) {
-    sn(1, 'background-color', b(ctx.depth % 2 ? '' : 'grey'));
-    t(2, i1(' ', ctx.value, ' '));
-    cR(3);
+    sp(2, 0, ctx.depth % 2 ? '' : 'grey');
+    t(3, i1(' ', ctx.value, ' '));
+    cR(4);
     {
       if (ctx.left != null) {
         let rf0 = V(0);
@@ -130,7 +134,7 @@ export function TreeTpl(rf: RenderFlags, ctx: TreeNode) {
       }
     }
     cr();
-    cR(4);
+    cR(5);
     {
       if (ctx.right != null) {
         let rf0 = V(0);
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index 001db134b9..353645a8e6 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -379,3 +379,9 @@ export const enum RenderFlags {
   /* Whether to run the update block (e.g. refresh bindings) */
   Update = 0b10
 }
+
+// Note this will expand once `class` is introduced to styling
+export const enum InitialStylingFlags {
+  /** Mode for matching initial style values */
+  INITIAL_STYLES = 0b00,
+}
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index f5acfbca01..a2fb852395 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -37,9 +37,13 @@ export class Identifiers {
 
   static elementClassNamed: o.ExternalReference = {name: 'ɵkn', moduleName: CORE};
 
-  static elementStyle: o.ExternalReference = {name: 'ɵs', moduleName: CORE};
+  static elementStyling: o.ExternalReference = {name: 'ɵs', moduleName: CORE};
 
-  static elementStyleNamed: o.ExternalReference = {name: 'ɵsn', moduleName: CORE};
+  static elementStyle: o.ExternalReference = {name: 'ɵsm', moduleName: CORE};
+
+  static elementStyleProp: o.ExternalReference = {name: 'ɵsp', moduleName: CORE};
+
+  static elementStylingApply: o.ExternalReference = {name: 'ɵsa', moduleName: CORE};
 
   static containerCreate: o.ExternalReference = {name: 'ɵC', moduleName: CORE};
 
diff --git a/packages/compiler/src/render3/view/styling.ts b/packages/compiler/src/render3/view/styling.ts
new file mode 100644
index 0000000000..d9b02f4b8e
--- /dev/null
+++ b/packages/compiler/src/render3/view/styling.ts
@@ -0,0 +1,111 @@
+/**
+ * @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
+ */
+
+const enum Char {
+  OpenParen = 40,
+  CloseParen = 41,
+  Colon = 58,
+  Semicolon = 59,
+  BackSlash = 92,
+  QuoteNone = 0,  // indicating we are not inside a quote
+  QuoteDouble = 34,
+  QuoteSingle = 39,
+}
+
+
+/**
+ * Parses string representation of a style and converts it into object literal.
+ *
+ * @param value string representation of style as used in the `style` attribute in HTML.
+ *   Example: `color: red; height: auto`.
+ * @returns an object literal. `{ color: 'red', height: 'auto'}`.
+ */
+export function parseStyle(value: string): {[key: string]: any} {
+  const styles: {[key: string]: any} = {};
+
+  let i = 0;
+  let parenDepth = 0;
+  let quote: Char = Char.QuoteNone;
+  let valueStart = 0;
+  let propStart = 0;
+  let currentProp: string|null = null;
+  let valueHasQuotes = false;
+  while (i < value.length) {
+    const token = value.charCodeAt(i++) as Char;
+    switch (token) {
+      case Char.OpenParen:
+        parenDepth++;
+        break;
+      case Char.CloseParen:
+        parenDepth--;
+        break;
+      case Char.QuoteSingle:
+        // valueStart needs to be there since prop values don't
+        // have quotes in CSS
+        valueHasQuotes = valueHasQuotes || valueStart > 0;
+        if (quote === Char.QuoteNone) {
+          quote = Char.QuoteSingle;
+        } else if (quote === Char.QuoteSingle && value.charCodeAt(i - 1) !== Char.BackSlash) {
+          quote = Char.QuoteNone;
+        }
+        break;
+      case Char.QuoteDouble:
+        // same logic as above
+        valueHasQuotes = valueHasQuotes || valueStart > 0;
+        if (quote === Char.QuoteNone) {
+          quote = Char.QuoteDouble;
+        } else if (quote === Char.QuoteDouble && value.charCodeAt(i - 1) !== Char.BackSlash) {
+          quote = Char.QuoteNone;
+        }
+        break;
+      case Char.Colon:
+        if (!currentProp && parenDepth === 0 && quote === Char.QuoteNone) {
+          currentProp = hyphenate(value.substring(propStart, i - 1).trim());
+          valueStart = i;
+        }
+        break;
+      case Char.Semicolon:
+        if (currentProp && valueStart > 0 && parenDepth === 0 && quote === Char.QuoteNone) {
+          const styleVal = value.substring(valueStart, i - 1).trim();
+          styles[currentProp] = valueHasQuotes ? stripUnnecessaryQuotes(styleVal) : styleVal;
+          propStart = i;
+          valueStart = 0;
+          currentProp = null;
+          valueHasQuotes = false;
+        }
+        break;
+    }
+  }
+
+  if (currentProp && valueStart) {
+    const styleVal = value.substr(valueStart).trim();
+    styles[currentProp] = valueHasQuotes ? stripUnnecessaryQuotes(styleVal) : styleVal;
+  }
+
+  return styles;
+}
+
+export function stripUnnecessaryQuotes(value: string): string {
+  const qS = value.charCodeAt(0);
+  const qE = value.charCodeAt(value.length - 1);
+  if (qS == qE && (qS == Char.QuoteSingle || qS == Char.QuoteDouble)) {
+    const tempValue = value.substring(1, value.length - 1);
+    // special case to avoid using a multi-quoted string that was just chomped
+    // (e.g. `font-family: "Verdana", "sans-serif"`)
+    if (tempValue.indexOf('\'') == -1 && tempValue.indexOf('"') == -1) {
+      value = tempValue;
+    }
+  }
+  return value;
+}
+
+export function hyphenate(value: string): string {
+  return value.replace(/[a-z][A-Z]/g, v => {
+                return v.charAt(0) + '-' + v.charAt(1);
+              }).toLowerCase();
+}
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index e2b3bb064a..c8a9d0925d 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -30,6 +30,7 @@ import {Identifiers as R3} from '../r3_identifiers';
 import {htmlAstToRender3Ast} from '../r3_template_transform';
 
 import {R3QueryMetadata} from './api';
+import {parseStyle} from './styling';
 import {CONTEXT_NAME, I18N_ATTR, I18N_ATTR_PREFIX, ID_SEPARATOR, IMPLICIT_REFERENCE, MEANING_SEPARATOR, REFERENCE_PREFIX, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, getQueryPredicate, invalid, mapToExpression, noop, temporaryAllocator, trimTrailingNulls, unsupported} from './util';
 
 function mapBindingToInstruction(type: BindingType): o.ExternalReference|undefined {
@@ -40,8 +41,6 @@ function mapBindingToInstruction(type: BindingType): o.ExternalReference|undefin
       return R3.elementAttribute;
     case BindingType.Class:
       return R3.elementClassNamed;
-    case BindingType.Style:
-      return R3.elementStyleNamed;
     default:
       return undefined;
   }
@@ -51,8 +50,7 @@ function mapBindingToInstruction(type: BindingType): o.ExternalReference|undefin
 // code (where this map is used) deals with DOM element property values
 // (like elm.propName) and not component bindining properties (like [propName]).
 const SPECIAL_CASED_PROPERTIES_INSTRUCTION_MAP: {[index: string]: o.ExternalReference} = {
-  'className': R3.elementClass,
-  'style': R3.elementStyle
+  'className': R3.elementClass
 };
 
 export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
@@ -316,19 +314,70 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Add the attributes
     const i18nMessages: o.Statement[] = [];
     const attributes: o.Expression[] = [];
+    const initialStyleDeclarations: o.Expression[] = [];
 
-    Object.getOwnPropertyNames(outputAttrs).forEach(name => {
-      const value = outputAttrs[name];
-      attributes.push(o.literal(name));
-      if (attrI18nMetas.hasOwnProperty(name)) {
-        const meta = parseI18nMeta(attrI18nMetas[name]);
-        const variable = this.constantPool.getTranslation(value, meta);
-        attributes.push(variable);
+    const styleInputs: t.BoundAttribute[] = [];
+    const allOtherInputs: t.BoundAttribute[] = [];
+
+    element.inputs.forEach((input: t.BoundAttribute) => {
+      // [attr.style] should not be treated as a styling-based
+      // binding since it is intended to write directly to the attr
+      // and therefore will skip all style resolution that is present
+      // with style="", [style]="" and [style.prop]="" assignments
+      if (input.name == 'style' && input.type == BindingType.Property) {
+        // this should always go first in the compilation (for [style])
+        styleInputs.splice(0, 0, input);
+      } else if (input.type == BindingType.Style) {
+        styleInputs.push(input);
       } else {
-        attributes.push(o.literal(value));
+        allOtherInputs.push(input);
       }
     });
 
+    let currStyleIndex = 0;
+    let staticStylesMap: {[key: string]: any}|null = null;
+    const stylesIndexMap: {[key: string]: number} = {};
+    Object.getOwnPropertyNames(outputAttrs).forEach(name => {
+      const value = outputAttrs[name];
+      if (name == 'style') {
+        staticStylesMap = parseStyle(value);
+        Object.keys(staticStylesMap).forEach(prop => { stylesIndexMap[prop] = currStyleIndex++; });
+      } else {
+        attributes.push(o.literal(name));
+        if (attrI18nMetas.hasOwnProperty(name)) {
+          const meta = parseI18nMeta(attrI18nMetas[name]);
+          const variable = this.constantPool.getTranslation(value, meta);
+          attributes.push(variable);
+        } else {
+          attributes.push(o.literal(value));
+        }
+      }
+    });
+
+    for (let i = 0; i < styleInputs.length; i++) {
+      const input = styleInputs[i];
+      const isMapBasedStyleBinding = i === 0 && input.name === 'style';
+      if (!isMapBasedStyleBinding && !stylesIndexMap.hasOwnProperty(input.name)) {
+        stylesIndexMap[input.name] = currStyleIndex++;
+      }
+    }
+
+    // this will build the instructions so that they fall into the following syntax
+    // => [prop1, prop2, prop3, 0, prop1, value1, prop2, value2]
+    Object.keys(stylesIndexMap).forEach(prop => {
+      initialStyleDeclarations.push(o.literal(prop));
+    });
+
+    if (staticStylesMap) {
+      initialStyleDeclarations.push(o.literal(core.InitialStylingFlags.INITIAL_STYLES));
+
+      Object.keys(staticStylesMap).forEach(prop => {
+        initialStyleDeclarations.push(o.literal(prop));
+        const value = staticStylesMap ![prop];
+        initialStyleDeclarations.push(o.literal(value));
+      });
+    }
+
     const attrArg: o.Expression = attributes.length > 0 ?
         this.constantPool.getConstLiteral(o.literalArr(attributes), true) :
         o.TYPED_NULL_EXPR;
@@ -365,11 +414,14 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this.addNamespaceInstruction(currentNamespace, element);
     }
 
-    const isEmptyElement = element.children.length === 0 && element.outputs.length === 0;
-
     const implicit = o.variable(CONTEXT_NAME);
 
-    if (isEmptyElement) {
+    const elementStyleIndex =
+        (initialStyleDeclarations.length || styleInputs.length) ? this.allocateDataSlot() : 0;
+    const createSelfClosingInstruction =
+        elementStyleIndex === 0 && element.children.length === 0 && element.outputs.length === 0;
+
+    if (createSelfClosingInstruction) {
       this.instruction(
           this._creationCode, element.sourceSpan, R3.element, ...trimTrailingNulls(parameters));
     } else {
@@ -381,6 +433,20 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           this._creationCode, element.sourceSpan, R3.elementStart,
           ...trimTrailingNulls(parameters));
 
+      // initial styling for static style="..." attributes
+      if (elementStyleIndex > 0) {
+        let paramsList: (o.Expression)[] = [o.literal(elementStyleIndex)];
+        if (initialStyleDeclarations.length) {
+          // the template compiler handles initial styling (e.g. style="foo") values
+          // in a special command called `elementStyle` so that the initial styles
+          // can be processed during runtime. These initial styles values are bound to
+          // a constant because the inital style values do not change (since they're static).
+          paramsList.push(
+              this.constantPool.getConstLiteral(o.literalArr(initialStyleDeclarations), true));
+        }
+        this._creationCode.push(o.importExpr(R3.elementStyling).callFn(paramsList).toStmt());
+      }
+
       // Generate Listeners (outputs)
       element.outputs.forEach((outputAst: t.BoundEvent) => {
         const elName = sanitizeIdentifier(element.name);
@@ -404,11 +470,33 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       });
     }
 
+    if (styleInputs.length && elementStyleIndex > 0) {
+      const indexLiteral = o.literal(elementStyleIndex);
+      styleInputs.forEach((input, i) => {
+        const isMapBasedStyleBinding = i == 0 && input.name == 'style';
+        const convertedBinding = this.convertPropertyBinding(implicit, input.value, true);
+        if (isMapBasedStyleBinding) {
+          this.instruction(
+              this._bindingCode, input.sourceSpan, R3.elementStyle, indexLiteral, convertedBinding);
+        } else {
+          const key = input.name;
+          let styleIndex: number = stylesIndexMap[key] !;
+          this.instruction(
+              this._bindingCode, input.sourceSpan, R3.elementStyleProp, indexLiteral,
+              o.literal(styleIndex), convertedBinding);
+        }
+      });
+
+      const spanEnd = styleInputs[styleInputs.length - 1].sourceSpan;
+      this.instruction(this._bindingCode, spanEnd, R3.elementStylingApply, indexLiteral);
+    }
+
     // Generate element input bindings
-    element.inputs.forEach((input: t.BoundAttribute) => {
+    allOtherInputs.forEach((input: t.BoundAttribute) => {
       if (input.type === BindingType.Animation) {
         this._unsupported('animations');
       }
+
       const convertedBinding = this.convertPropertyBinding(implicit, input.value);
       const specialInstruction = SPECIAL_CASED_PROPERTIES_INSTRUCTION_MAP[input.name];
       if (specialInstruction) {
@@ -442,7 +530,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       t.visitAll(this, element.children);
     }
 
-    if (!isEmptyElement) {
+    if (!createSelfClosingInstruction) {
       // Finish element construction mode.
       this.instruction(
           this._creationCode, element.endSourceSpan || element.sourceSpan, R3.elementEnd);
@@ -568,7 +656,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     statements.push(o.importExpr(reference, null, span).callFn(params, span).toStmt());
   }
 
-  private convertPropertyBinding(implicit: o.Expression, value: AST): o.Expression {
+  private convertPropertyBinding(implicit: o.Expression, value: AST, skipBindFn?: boolean):
+      o.Expression {
     const pipesConvertedValue = value.visit(this._valueConverter);
     if (pipesConvertedValue instanceof Interpolation) {
       const convertedPropertyBinding = convertPropertyBinding(
@@ -581,7 +670,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           this, implicit, pipesConvertedValue, this.bindingContext(), BindingForm.TrySimple,
           () => error('Unexpected interpolation'));
       this._bindingCode.push(...convertedPropertyBinding.stmts);
-      return o.importExpr(R3.bind).callFn([convertedPropertyBinding.currValExpr]);
+      const valExpr = convertedPropertyBinding.currValExpr;
+      return skipBindFn ? valExpr : o.importExpr(R3.bind).callFn([valExpr]);
     }
   }
 }
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 332071aec4..df7d0fbca4 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -321,15 +321,23 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
-          if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
-          }
-          if (rf & 2) {
-            $r3$.ɵkn(0, 'error', $r3$.ɵb(ctx.error));
-            $r3$.ɵsn(0, 'background-color', $r3$.ɵb(ctx.color));
-          }
-        }
+        const _c0 = ['background-color'];
+        class MyComponent {
+          static ngComponentDef = i0.ɵdefineComponent({type:MyComponent,selectors:[['my-component']],
+              factory:function MyComponent_Factory(){
+                return new MyComponent();
+              },template:function MyComponent_Template(rf:number,ctx:any){
+                if (rf & 1) {
+                  $r3$.ɵE(0, 'div');
+                  $r3$.ɵs(1, _c0);
+                  $r3$.ɵe();
+                }
+                if (rf & 2) {
+                  $r3$.ɵsp(1, 0, ctx.color);
+                  $r3$.ɵsa(1);
+                  $r3$.ɵkn(0, 'error', $r3$.ɵb(ctx.error));
+                }
+              }
       `;
 
 
diff --git a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
index 05249bcd1e..eae327c642 100644
--- a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {InitialStylingFlags} from '../../src/core';
 import {MockDirectory, setup} from '../aot/test_util';
+
 import {compile, expectEmit} from './mock_compile';
 
 describe('compiler compliance: styling', () => {
@@ -16,7 +18,7 @@ describe('compiler compliance: styling', () => {
     compileCommon: true,
   });
 
-  describe('[style]', () => {
+  describe('[style] and [style.prop]', () => {
     it('should create style instructions on the element', () => {
       const files = {
         app: {
@@ -40,10 +42,13 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'div');
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵs(1);
+              $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵs(0,$r3$.ɵb($ctx$.myStyleExp));
+              $r3$.ɵsm(1, $ctx$.myStyleExp);
+              $r3$.ɵsa(1);
             }
           }
           `;
@@ -51,6 +56,63 @@ describe('compiler compliance: styling', () => {
       const result = compile(files, angularFiles);
       expectEmit(result.source, template, 'Incorrect template');
     });
+
+    it('should place initial, multi, singular and application followed by attribute styling instructions in the template code in that order',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div style="opacity:1"
+                                   [attr.style]="'border-width: 10px'"
+                                   [style.width]="myWidth"
+                                   [style]="myStyleExp"
+                                   [style.height]="myHeight"></div>\`
+                })
+                export class MyComponent {
+                  myStyleExp = [{color:'red'}, {color:'blue', duration:1000}]
+                  myWidth = '100px';
+                  myHeight = '100px';
+                }
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+           }
+         };
+
+         const template = `
+          const _c0 = ['opacity','width','height',${InitialStylingFlags.INITIAL_STYLES},'opacity','1'];
+          class MyComponent {
+            static ngComponentDef = i0.ɵdefineComponent({
+              type: MyComponent,
+              selectors:[['my-component']],
+              factory:function MyComponent_Factory(){
+                return new MyComponent();
+              },
+              template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+                if (rf & 1) {
+                  $r3$.ɵE(0, 'div');
+                  $r3$.ɵs(1, _c0);
+                  $r3$.ɵe();
+                }
+                if (rf & 2) {
+                  $r3$.ɵsm(1, $ctx$.myStyleExp);
+                  $r3$.ɵsp(1, 1, $ctx$.myWidth);
+                  $r3$.ɵsp(1, 2, $ctx$.myHeight);
+                  $r3$.ɵsa(1);
+                  $r3$.ɵa(0, 'style', $r3$.ɵb('border-width: 10px'));
+                }
+              }
+            });
+        `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
   });
 
   describe('[class]', () => {
diff --git a/packages/compiler/test/render3/styling_spec.ts b/packages/compiler/test/render3/styling_spec.ts
new file mode 100644
index 0000000000..82d7dc71ff
--- /dev/null
+++ b/packages/compiler/test/render3/styling_spec.ts
@@ -0,0 +1,93 @@
+/**
+ * @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 {hyphenate, parseStyle, stripUnnecessaryQuotes} from '../../src/render3/view/styling';
+
+describe('inline css style parsing', () => {
+  it('should parse empty or blank strings', () => {
+    const result1 = parseStyle('');
+    expect(result1).toEqual({});
+
+    const result2 = parseStyle('    ');
+    expect(result2).toEqual({});
+  });
+
+  it('should parse a string into a key/value map', () => {
+    const result = parseStyle('width:100px;height:200px;opacity:0');
+    expect(result).toEqual({width: '100px', height: '200px', opacity: '0'});
+  });
+
+  it('should trim values and properties', () => {
+    const result = parseStyle('width :333px ; height:666px    ; opacity: 0.5;');
+    expect(result).toEqual({width: '333px', height: '666px', opacity: '0.5'});
+  });
+
+  it('should chomp out start/end quotes', () => {
+    const result = parseStyle(
+        'content: "foo"; opacity: \'0.5\'; font-family: "Verdana", Helvetica, "sans-serif"');
+    expect(result).toEqual(
+        {content: 'foo', opacity: '0.5', 'font-family': '"Verdana", Helvetica, "sans-serif"'});
+  });
+
+  it('should not mess up with quoted strings that contain [:;] values', () => {
+    const result = parseStyle('content: "foo; man: guy"; width: 100px');
+    expect(result).toEqual({content: 'foo; man: guy', width: '100px'});
+  });
+
+  it('should not mess up with quoted strings that contain inner quote values', () => {
+    const quoteStr = '"one \'two\' three \"four\" five"';
+    const result = parseStyle(`content: ${quoteStr}; width: 123px`);
+    expect(result).toEqual({content: quoteStr, width: '123px'});
+  });
+
+  it('should respect parenthesis that are placed within a style', () => {
+    const result = parseStyle('background-image: url("foo.jpg")');
+    expect(result).toEqual({'background-image': 'url("foo.jpg")'});
+  });
+
+  it('should respect multi-level parenthesis that contain special [:;] characters', () => {
+    const result = parseStyle('color: rgba(calc(50 * 4), var(--cool), :5;); height: 100px;');
+    expect(result).toEqual({color: 'rgba(calc(50 * 4), var(--cool), :5;)', height: '100px'});
+  });
+
+  it('should hyphenate style properties from camel case', () => {
+    const result = parseStyle('borderWidth: 200px');
+    expect(result).toEqual({
+      'border-width': '200px',
+    });
+  });
+
+  describe('quote chomping', () => {
+    it('should remove the start and end quotes', () => {
+      expect(stripUnnecessaryQuotes('\'foo bar\'')).toEqual('foo bar');
+      expect(stripUnnecessaryQuotes('"foo bar"')).toEqual('foo bar');
+    });
+
+    it('should not remove quotes if the quotes are not at the start and end', () => {
+      expect(stripUnnecessaryQuotes('foo bar')).toEqual('foo bar');
+      expect(stripUnnecessaryQuotes('   foo bar   ')).toEqual('   foo bar   ');
+      expect(stripUnnecessaryQuotes('\'foo\' bar')).toEqual('\'foo\' bar');
+      expect(stripUnnecessaryQuotes('foo "bar"')).toEqual('foo "bar"');
+    });
+
+    it('should not remove quotes if there are inner quotes', () => {
+      const str = '"Verdana", "Helvetica"';
+      expect(stripUnnecessaryQuotes(str)).toEqual(str);
+    });
+  });
+
+  describe('camelCasing => hyphenation', () => {
+    it('should convert a camel-cased value to a hyphenated value', () => {
+      expect(hyphenate('fooBar')).toEqual('foo-bar');
+      expect(hyphenate('fooBarMan')).toEqual('foo-bar-man');
+      expect(hyphenate('-fooBar-man')).toEqual('-foo-bar-man');
+    });
+
+    it('should make everything lowercase',
+       () => { expect(hyphenate('-WebkitAnimation')).toEqual('-webkit-animation'); });
+  });
+});
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 333e3ab300..85485fbb7c 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -75,7 +75,9 @@ export {
   rS as ɵrS,
   a as ɵa,
   s as ɵs,
-  sn as ɵsn,
+  sm as ɵsm,
+  sp as ɵsp,
+  sa as ɵsa,
   k as ɵk,
   kn as ɵkn,
   t as ɵt,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index ba81cc9b2a..b503e7df4f 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -56,8 +56,11 @@ export {
   elementEnd as e,
   elementProperty as p,
   elementStart as E,
-  elementStyle as s,
-  elementStyleNamed as sn,
+
+  elementStyling as s,
+  elementStyle as sm,
+  elementStyleProp as sp,
+  elementStylingApply as sa,
 
   listener as L,
   store as st,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 938d97516f..185e651f32 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -27,6 +27,7 @@ import {ComponentDefInternal, ComponentTemplate, ComponentQuery, DirectiveDefInt
 import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
+import {StylingContext, allocStylingContext, createStylingContextTemplate, updateStyleMap as updateElementStyleMap, updateStyleProp as updateElementStyleProp, renderStyles as renderElementStyles} from './styling';
 
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
@@ -652,7 +653,9 @@ export function elementStart(
   const node: LElementNode =
       createLNode(index, TNodeType.Element, native !, name, attrs || null, null);
 
-  if (attrs) setUpAttributes(native, attrs);
+  if (attrs) {
+    setUpAttributes(native, attrs);
+  }
   appendChild(getParentLNode(node), native, viewData);
   createDirectivesAndLocals(localRefs);
   return native;
@@ -1185,7 +1188,8 @@ export function createTNode(
     child: null,
     parent: parent,
     dynamicContainerNode: null,
-    detached: null
+    detached: null,
+    stylingTemplate: null
   };
 }
 
@@ -1287,9 +1291,94 @@ export function elementClass<T>(index: number, value: T | NO_CHANGE): void {
 }
 
 /**
- * Update a given style on an Element.
+ * Assign any inline style values to the element during creation mode.
  *
- * @param index Index of the element to change in the data array
+ * This instruction is meant to be called during creation mode to apply all styling
+ * (e.g. `style="..."`) values to the element. This is also where the provided index
+ * value is allocated for the styling details for its corresponding element (the element
+ * index is the previous index value from this one).
+ *
+ * (Note this function calls `elementStylingApply` immediately when called.)
+ *
+ *
+ * @param index Index value which will be allocated to store styling data for the element.
+ *        (Note that this is not the element index, but rather an index value allocated
+ *        specifically for element styling--the index must be the next index after the element
+ *        index.)
+ * @param styles A key/value map of CSS styles that will be registered on the element.
+ *   Each individual style will be used on the element as long as it is not overridden
+ *   by any styles placed on the element by multiple (`[style]`) or singular (`[style.prop]`)
+ *   bindings. If a style binding changes its value to null then the initial styling
+ *   values that are passed in here will be applied to the element (if matched).
+ */
+export function elementStyling<T>(index: number, styles?: (string | number)[] | null): void {
+  const tNode = load<LElementNode>(index - 1).tNode;
+  if (!tNode.stylingTemplate) {
+    // initialize the styling template.
+    tNode.stylingTemplate = createStylingContextTemplate(styles);
+  }
+  // Allocate space but leave null for lazy creation.
+  viewData[index + HEADER_OFFSET] = null;
+  if (styles && styles.length) {
+    elementStylingApply(index);
+  }
+}
+
+/**
+ * Retrieve the `StylingContext` at a given index.
+ *
+ * This method lazily creates the `StylingContext`. This is because in most cases
+ * we have styling without any bindings. Creating `StylingContext` eagerly would mean that
+ * every style declaration such as `<div style="color: 'red' ">` would result `StyleContext`
+ * which would create unnecessary memory pressure.
+ *
+ * @param index Index of the style allocation. See: `elementStyling`.
+ */
+function getStylingContext(index: number): StylingContext {
+  let stylingContext = load<StylingContext>(index);
+  if (!stylingContext) {
+    const lElement: LElementNode = load(index - 1);
+    const tNode = lElement.tNode;
+    ngDevMode &&
+        assertDefined(tNode.stylingTemplate, 'getStylingContext() called before elementStyling()');
+    stylingContext = viewData[index + HEADER_OFFSET] = allocStylingContext(tNode.stylingTemplate !);
+  }
+  return stylingContext;
+}
+
+/**
+ * Apply all styling values to the element which have been queued by any styling instructions.
+ *
+ * This instruction is meant to be run once one or more `elementStyle` and/or `elementStyleProp`
+ * have been issued against the element. This function will also determine if any styles have
+ * changed and will then skip the operation if there is nothing new to render.
+ *
+ * Once called then all queued styles will be flushed.
+ *
+ * @param index Index of the element's styling storage that will be rendered.
+ *        (Note that this is not the element index, but rather an index value allocated
+ *        specifically for element styling--the index must be the next index after the element
+ *        index.)
+ */
+export function elementStylingApply<T>(index: number): void {
+  renderElementStyles(load<LElementNode>(index - 1), getStylingContext(index), renderer);
+}
+
+/**
+ * Queue a given style to be rendered on an Element.
+ *
+ * If the style value is `null` then it will be removed from the element
+ * (or assigned a different value depending if there are any styles placed
+ * on the element with `elementStyle` or any styles that are present
+ * from when the element was created (with `elementStyling`).
+ *
+ * (Note that the styling instruction will not be applied until `elementStylingApply` is called.)
+ *
+ * @param index Index of the element's styling storage to change in the data array.
+ *        (Note that this is not the element index, but rather an index value allocated
+ *        specifically for element styling--the index must be the next index after the element
+ *        index.)
+ * @param styleIndex Index of the style property on this element. (Monotonically increasing.)
  * @param styleName Name of property. Because it is going to DOM this is not subject to
  *        renaming as part of minification.
  * @param value New value to write (null to remove).
@@ -1297,69 +1386,44 @@ export function elementClass<T>(index: number, value: T | NO_CHANGE): void {
  * @param sanitizer An optional function used to transform the value typically used for
  *        sanitization.
  */
-export function elementStyleNamed<T>(
-    index: number, styleName: string, value: T | NO_CHANGE, suffix?: string): void;
-export function elementStyleNamed<T>(
-    index: number, styleName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn): void;
-export function elementStyleNamed<T>(
-    index: number, styleName: string, value: T | NO_CHANGE,
+export function elementStyleProp<T>(
+    index: number, styleIndex: number, value: T | null, suffix?: string): void;
+export function elementStyleProp<T>(
+    index: number, styleIndex: number, value: T | null, sanitizer?: SanitizerFn): void;
+export function elementStyleProp<T>(
+    index: number, styleIndex: number, value: T | null,
     suffixOrSanitizer?: string | SanitizerFn): void {
-  if (value !== NO_CHANGE) {
-    const lElement: LElementNode = load(index);
-    if (value == null) {
-      ngDevMode && ngDevMode.rendererRemoveStyle++;
-      isProceduralRenderer(renderer) ?
-          renderer.removeStyle(lElement.native, styleName, RendererStyleFlags3.DashCase) :
-          lElement.native['style'].removeProperty(styleName);
-    } else {
-      let strValue =
-          typeof suffixOrSanitizer == 'function' ? suffixOrSanitizer(value) : stringify(value);
-      if (typeof suffixOrSanitizer == 'string') strValue = strValue + suffixOrSanitizer;
-      ngDevMode && ngDevMode.rendererSetStyle++;
-      isProceduralRenderer(renderer) ?
-          renderer.setStyle(lElement.native, styleName, strValue, RendererStyleFlags3.DashCase) :
-          lElement.native['style'].setProperty(styleName, strValue);
+  let valueToAdd: string|null = null;
+  if (value) {
+    valueToAdd =
+        typeof suffixOrSanitizer == 'function' ? suffixOrSanitizer(value) : stringify(value);
+    if (typeof suffixOrSanitizer == 'string') {
+      valueToAdd = valueToAdd + suffixOrSanitizer;
     }
   }
+  updateElementStyleProp(getStylingContext(index), styleIndex, valueToAdd);
 }
 
 /**
- * Set the `style` property on a DOM element.
+ * Queue a key/value map of styles to be rendered on an Element.
  *
- * This instruction is meant to handle the `[style]="exp"` usage.
+ * This instruction is meant to handle the `[style]="exp"` usage. When styles are applied to
+ * the Element they will then be placed with respect to any styles set with `elementStyleProp`.
+ * If any styles are set to `null` then they will be removed from the element (unless the same
+ * style properties have been assigned to the element during creation using `elementStyling`).
  *
+ * (Note that the styling instruction will not be applied until `elementStylingApply` is called.)
  *
- * @param index The index of the element to update in the LViewData array
+ * @param index Index of the element's styling storage to change in the data array.
+ *        (Note that this is not the element index, but rather an index value allocated
+ *        specifically for element styling--the index must be the next index after the element
+ *        index.)
  * @param value A value indicating if a given style should be added or removed.
  *   The expected shape of `value` is an object where keys are style names and the values
- *   are their corresponding values to set. If value is falsy, then the style is removed. An absence
- *   of style does not cause that style to be removed. `NO_CHANGE` implies that no update should be
- *   performed.
+ *   are their corresponding values to set. If value is null, then the style is removed.
  */
-export function elementStyle<T>(
-    index: number, value: {[styleName: string]: any} | NO_CHANGE): void {
-  if (value !== NO_CHANGE) {
-    // TODO: This is a naive implementation which simply writes value to the `style`. In the future
-    // we will add logic here which would work with the animation code.
-    const lElement = load(index) as LElementNode;
-    if (isProceduralRenderer(renderer)) {
-      ngDevMode && ngDevMode.rendererSetStyle++;
-      renderer.setProperty(lElement.native, 'style', value);
-    } else {
-      const style = lElement.native['style'];
-      for (let i = 0, keys = Object.keys(value); i < keys.length; i++) {
-        const styleName: string = keys[i];
-        const styleValue: any = (value as any)[styleName];
-        if (styleValue == null) {
-          ngDevMode && ngDevMode.rendererRemoveStyle++;
-          style.removeProperty(styleName);
-        } else {
-          ngDevMode && ngDevMode.rendererSetStyle++;
-          style.setProperty(styleName, styleValue);
-        }
-      }
-    }
-  }
+export function elementStyle<T>(index: number, value: {[styleName: string]: any} | null): void {
+  updateElementStyleMap(getStylingContext(index), value);
 }
 
 //////////////////////////
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 232df396a9..460d33bad4 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -290,3 +290,9 @@ export type PipeTypeList =
 // Note: This hack is necessary so we don't erroneously get a circular dependency
 // failure based on types.
 export const unusedValueExportToPlacateAjd = 1;
+
+// Note this will expand once `class` is introduced to styling
+export const enum InitialStylingFlags {
+  /** Mode for matching initial style values */
+  INITIAL_STYLES = 0b00,
+}
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 9194bb547b..29893c73d9 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {StylingContext} from '../styling';
+
 import {LContainer} from './container';
 import {LInjector} from './injector';
 import {LProjection} from './projection';
@@ -341,6 +343,8 @@ export interface TNode {
    * If this node is not part of an i18n block, this field is null.
    */
   detached: boolean|null;
+
+  stylingTemplate: StylingContext|null;
 }
 
 /** Static data for an LElementNode  */
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index d1abad4ff3..b0d3f7b8ae 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -80,8 +80,9 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵqR': r3.qR,
   'ɵrS': r3.rS,
   'ɵs': r3.s,
-  'ɵsn': r3.sn,
-  'ɵst': r3.st,
+  'ɵsm': r3.sm,
+  'ɵsp': r3.sp,
+  'ɵsa': r3.sa,
   'ɵT': r3.T,
   'ɵt': r3.t,
   'ɵV': r3.V,
diff --git a/packages/core/src/render3/styling.ts b/packages/core/src/render3/styling.ts
new file mode 100644
index 0000000000..ddae3e798a
--- /dev/null
+++ b/packages/core/src/render3/styling.ts
@@ -0,0 +1,621 @@
+/**
+ * @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 {InitialStylingFlags} from './interfaces/definition';
+import {LElementNode} from './interfaces/node';
+import {Renderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
+
+/**
+ * The styling context acts as a styling manifest (shaped as an array) for determining which
+ * styling properties have been assigned via the provided `updateStyleMap` and `updateStyleProp`
+ * functions. There are also two initialization functions `allocStylingContext` and
+ * `createStylingContextTemplate` which are used to initialize and/or clone the context.
+ *
+ * The context is an array where the first two cells are used for static data (initial styling)
+ * and dirty flags / index offsets). The remaining set of cells is used for multi (map) and single
+ * (prop) style values.
+ *
+ * each value from here onwards is mapped as so:
+ * [i] = mutation/type flag for the style value
+ * [i + 1] = prop string (or null incase it has been removed)
+ * [i + 2] = value string (or null incase it has been removed)
+ *
+ * There are three types of styling types stored in this context:
+ *   initial: any styles that are passed in once the context is created
+ *            (these are stored in the first cell of the array and the first
+ *             value of this array is always `null` even if no initial styles exist.
+ *             the `null` value is there so that any new styles have a parent to point
+ *             to. This way we can always assume that there is a parent.)
+ *
+ *   single: any styles that are updated using `updateStyleProp` (fixed set)
+ *
+ *   multi: any styles that are updated using `updateStyleMap` (dynamic set)
+ *
+ * Note that context is only used to collect style information. Only when `renderStyles`
+ * is called is when the styling payload will be rendered (or built as a key/value map).
+ *
+ * When the context is created, depending on what initial styles are passed in, the context itself
+ * will be pre-filled with slots based on the initial style properties. Say for example we have a
+ * series of initial styles that look like so:
+ *
+ *   style="width:100px; height:200px;"
+ *
+ * Then the initial state of the context (once initialized) will look like so:
+ *
+ * ```
+ * context = [
+ *   [null, '100px', '200px'],  // property names are not needed since they have already been
+ * written to DOM.
+ *
+ *   configMasterVal,
+ *
+ *   // 2
+ *   'width',
+ *   pointers(1, 8);  // Point to static `width`: `100px` and multi `width`.
+ *   null,
+ *
+ *   // 5
+ *   'height',
+ *   pointers(2, 11); // Point to static `height`: `200px` and multi `height`.
+ *   null,
+ *
+ *   // 8
+ *   'width',
+ *   pointers(1, 2);  // Point to static `width`: `100px` and single `width`.
+ *   null,
+ *
+ *   // 11
+ *   'height',
+ *   pointers(2, 5);  // Point to static `height`: `200px` and single `height`.
+ *   null,
+ * ]
+ *
+ * function pointers(staticIndex: number, dynamicIndex: number) {
+ *   // combine the two indices into a single word.
+ *   return (staticIndex << StylingFlags.BitCountSize) |
+ *     (dynamicIndex << (StylingIndex.BitCountSize + StylingFlags.BitCountSize));
+ * }
+ * ```
+ *
+ * The values are duplicated so that space is set aside for both multi ([style])
+ * and single ([style.prop]) values. The respective config values (configValA, configValB, etc...)
+ * are a combination of the StylingFlags with two index values: the `initialIndex` (which points to
+ * the index location of the style value in the initial styles array in slot 0) and the
+ * `dynamicIndex` (which points to the matching single/multi index position in the context array
+ * for the same prop).
+ *
+ * This means that every time `updateStyleProp` is called it must be called using an index value
+ * (not a property string) which references the index value of the initial style when the context
+ * was created. This also means that `updateStyleProp` cannot be called with a new property
+ * (only `updateStyleMap` can include new CSS properties that will be added to the context).
+ */
+export interface StylingContext extends Array<InitialStyles|number|string|null> {
+  /**
+   * Location of initial data shared by all instances of this style.
+   */
+  [0]: InitialStyles;
+
+  /**
+   * A numeric value representing the configuration status (whether the context is dirty or not)
+   * mixed together (using bit shifting) with a index value which tells the starting index value
+   * of where the multi style entries begin.
+   */
+  [1]: number;
+}
+
+/**
+ * The initial styles is populated whether or not there are any initial styles passed into
+ * the context during allocation. The 0th value must be null so that index values of `0` within
+ * the context flags can always point to a null value safely when nothing is set.
+ *
+ * All other entries in this array are of `string` value and correspond to the values that
+ * were extracted from the `style=""` attribute in the HTML code for the provided template.
+ */
+export interface InitialStyles extends Array<string|null> { [0]: null; }
+
+/**
+ * Used to set the context to be dirty or not both on the master flag (position 1)
+ * or for each single/multi property that exists in the context.
+ */
+export const enum StylingFlags {
+  // Implies no configurations
+  None = 0b0,
+  // Whether or not the entry or context itself is dirty
+  Dirty = 0b1,
+  // The max amount of bits used to represent these configuration values
+  BitCountSize = 1,
+}
+
+/** Used as numeric pointer values to determine what cells to update in the `StylingContext` */
+export const enum StylingIndex {
+  // Position of where the initial styles are stored in the styling context
+  InitialStylesPosition = 0,
+  // Index of location where the start of single properties are stored. (`updateStyleProp`)
+  MasterFlagPosition = 1,
+  // Location of single (prop) value entries are stored within the context
+  SingleStylesStartPosition = 2,
+  // Multi and single entries are stored in `StylingContext` as: Flag; PropertyName;  PropertyValue
+  FlagsOffset = 0,
+  PropertyOffset = 1,
+  ValueOffset = 2,
+  // Size of each multi or single entry (flag + prop + value)
+  Size = 3,
+  // Each flag has a binary digit length of this value
+  BitCountSize = 15,  // (32 - 1) / 2 = ~15
+  // The binary digit value as a mask
+  BitMask = 0b111111111111111  // 15 bits
+}
+
+/**
+ * Used clone a copy of a pre-computed template of a styling context.
+ *
+ * A pre-computed template is designed to be computed once for a given element
+ * (instructions.ts has logic for caching this).
+ */
+export function allocStylingContext(templateStyleContext: StylingContext): StylingContext {
+  // each instance gets a copy
+  return templateStyleContext.slice() as any as StylingContext;
+}
+
+/**
+ * Creates a styling context template where styling information is stored.
+ * Any styles that are later referenced using `updateStyleProp` must be
+ * passed in within this function. Initial values for those styles are to
+ * be declared after all initial style properties are declared (this change in
+ * mode between declarations and initial styles is made possible using a special
+ * enum value found in `definition.ts`).
+ *
+ * @param initialStyleDeclarations a list of style declarations and initial style values
+ *    that are used later within the styling context.
+ *
+ *    -> ['width', 'height', SPECIAL_ENUM_VAL, 'width', '100px']
+ *       This implies that `width` and `height` will be later styled and that the `width`
+ *       property has an initial value of `100px`.
+ */
+export function createStylingContextTemplate(
+    initialStyleDeclarations?: (string | InitialStylingFlags)[] | null): StylingContext {
+  const initialStyles: InitialStyles = [null];
+  const context: StylingContext = [initialStyles, 0];
+
+  const indexLookup: {[key: string]: number} = {};
+  if (initialStyleDeclarations) {
+    let hasPassedDeclarations = false;
+    for (let i = 0; i < initialStyleDeclarations.length; i++) {
+      const v = initialStyleDeclarations[i] as string | InitialStylingFlags;
+
+      // this flag value marks where the declarations end the initial values begin
+      if (v === InitialStylingFlags.INITIAL_STYLES) {
+        hasPassedDeclarations = true;
+      } else {
+        const prop = v as string;
+        if (hasPassedDeclarations) {
+          const value = initialStyleDeclarations[++i] as string;
+          initialStyles.push(value);
+          indexLookup[prop] = initialStyles.length - 1;
+        } else {
+          // it's safe to use `0` since the default initial value for
+          // each property will always be null (which is at position 0)
+          indexLookup[prop] = 0;
+        }
+      }
+    }
+  }
+
+  const allProps = Object.keys(indexLookup);
+  const totalProps = allProps.length;
+
+  // *2 because we are filling for both single and multi style spaces
+  const maxLength = totalProps * StylingIndex.Size * 2 + StylingIndex.SingleStylesStartPosition;
+
+  // we need to fill the array from the start so that we can access
+  // both the multi and the single array positions in the same loop block
+  for (let i = StylingIndex.SingleStylesStartPosition; i < maxLength; i++) {
+    context.push(null);
+  }
+
+  const singleStart = StylingIndex.SingleStylesStartPosition;
+  const multiStart = totalProps * StylingIndex.Size + StylingIndex.SingleStylesStartPosition;
+
+  // fill single and multi-level styles
+  for (let i = 0; i < allProps.length; i++) {
+    const prop = allProps[i];
+
+    const indexForInitial = indexLookup[prop];
+    const indexForMulti = i * StylingIndex.Size + multiStart;
+    const indexForSingle = i * StylingIndex.Size + singleStart;
+
+    setFlag(context, indexForSingle, pointers(StylingFlags.None, indexForInitial, indexForMulti));
+    setProp(context, indexForSingle, prop);
+    setValue(context, indexForSingle, null);
+
+    setFlag(context, indexForMulti, pointers(StylingFlags.Dirty, indexForInitial, indexForSingle));
+    setProp(context, indexForMulti, prop);
+    setValue(context, indexForMulti, null);
+  }
+
+  // there is no initial value flag for the master index since it doesn't reference an initial style
+  // value
+  setFlag(context, StylingIndex.MasterFlagPosition, pointers(0, 0, multiStart));
+  setContextDirty(context, initialStyles.length > 1);
+
+  return context;
+}
+
+const EMPTY_ARR: any[] = [];
+/**
+ * Sets and resolves all `multi` styles on an `StylingContext` so that they can be
+ * applied to the element once `renderStyles` is called.
+ *
+ * All missing styles (any values that are not provided in the new `styles` param)
+ * will resolve to `null` within their respective positions in the context.
+ *
+ * @param context The styling context that will be updated with the
+ *    newly provided style values.
+ * @param styles The key/value map of CSS styles that will be used for the update.
+ */
+export function updateStyleMap(context: StylingContext, styles: {[key: string]: any} | null): void {
+  const propsToApply = styles ? Object.keys(styles) : EMPTY_ARR;
+  const multiStartIndex = getMultiStartIndex(context);
+
+  let dirty = false;
+  let ctxIndex = multiStartIndex;
+  let propIndex = 0;
+
+  // the main loop here will try and figure out how the shape of the provided
+  // styles differ with respect to the context. Later if the context/styles are
+  // off-balance then they will be dealt in another loop after this one
+  while (ctxIndex < context.length && propIndex < propsToApply.length) {
+    const flag = getPointers(context, ctxIndex);
+    const prop = getProp(context, ctxIndex);
+    const value = getValue(context, ctxIndex);
+
+    const newProp = propsToApply[propIndex];
+    const newValue = styles ![newProp];
+    if (prop === newProp) {
+      if (value !== newValue) {
+        setValue(context, ctxIndex, newValue);
+        const initialValue = getInitialValue(context, flag);
+
+        // there is no point in setting this to dirty if the previously
+        // rendered value was being referenced by the initial style (or null)
+        if (initialValue !== newValue) {
+          setDirty(context, ctxIndex, true);
+          dirty = true;
+        }
+      }
+    } else {
+      const indexOfEntry = findEntryPositionByProp(context, newProp, ctxIndex);
+      if (indexOfEntry > 0) {
+        // it was found at a later point ... just swap the values
+        swapMultiContextEntries(context, ctxIndex, indexOfEntry);
+        if (value !== newValue) {
+          setValue(context, ctxIndex, newValue);
+          dirty = true;
+        }
+      } else {
+        // we only care to do this if the insertion is in the middle
+        const doShift = ctxIndex < context.length;
+        insertNewMultiProperty(context, ctxIndex, newProp, newValue);
+        dirty = true;
+      }
+    }
+
+    ctxIndex += StylingIndex.Size;
+    propIndex++;
+  }
+
+  // this means that there are left-over values in the context that
+  // were not included in the provided styles and in this case the
+  // goal is to "remove" them from the context (by nullifying)
+  while (ctxIndex < context.length) {
+    const value = context[ctxIndex + StylingIndex.ValueOffset];
+    if (value !== null) {
+      setDirty(context, ctxIndex, true);
+      setValue(context, ctxIndex, null);
+      dirty = true;
+    }
+    ctxIndex += StylingIndex.Size;
+  }
+
+  // this means that there are left-over property in the context that
+  // were not detected in the context during the loop above. In that
+  // case we want to add the new entries into the list
+  while (propIndex < propsToApply.length) {
+    const prop = propsToApply[propIndex];
+    const value = styles ![prop];
+    context.push(StylingFlags.Dirty, prop, value);
+    propIndex++;
+    dirty = true;
+  }
+
+  if (dirty) {
+    setContextDirty(context, true);
+  }
+}
+
+/**
+ * Sets and resolves a single CSS style on a property on an `StylingContext` so that they
+ * can be applied to the element once `renderElementStyles` is called.
+ *
+ * Note that prop-level styles are considered higher priority than styles that are applied
+ * using `updateStyleMap`, therefore, when styles are rendered then any styles that
+ * have been applied using this function will be considered first (then multi values second
+ * and then initial values as a backup).
+ *
+ * @param context The styling context that will be updated with the
+ *    newly provided style value.
+ * @param index The index of the property which is being updated.
+ * @param value The CSS style value that will be assigned
+ */
+export function updateStyleProp(
+    context: StylingContext, index: number, value: string | null): void {
+  const singleIndex = StylingIndex.SingleStylesStartPosition + index * StylingIndex.Size;
+  const currValue = getValue(context, singleIndex);
+  const currFlag = getPointers(context, singleIndex);
+
+  // didn't change ... nothing to make a note of
+  if (currValue !== value) {
+    // the value will always get updated (even if the dirty flag is skipped)
+    setValue(context, singleIndex, value);
+    const indexForMulti = getMultiOrSingleIndex(currFlag);
+
+    // if the value is the same in the multi-area then there's no point in re-assembling
+    const valueForMulti = getValue(context, indexForMulti);
+    if (!valueForMulti || valueForMulti !== value) {
+      let multiDirty = false;
+      let singleDirty = true;
+
+      // only when the value is set to `null` should the multi-value get flagged
+      if (value == null && valueForMulti) {
+        multiDirty = true;
+        singleDirty = false;
+      }
+
+      setDirty(context, indexForMulti, multiDirty);
+      setDirty(context, singleIndex, singleDirty);
+      setContextDirty(context, true);
+    }
+  }
+}
+
+/**
+ * Renders all queued styles using a renderer onto the given element.
+ *
+ * This function works by rendering any styles (that have been applied
+ * using `updateStyleMap` and `updateStyleProp`) onto the
+ * provided element using the provided renderer. Just before the styles
+ * are rendered a final key/value style map will be assembled.
+ *
+ * @param lElement the element that the styles will be rendered on
+ * @param context The styling context that will be used to determine
+ *      what styles will be rendered
+ * @param renderer the renderer that will be used to apply the styling
+ * @param styleStore if provided, the updated style values will be applied
+ *    to this key/value map instead of being renderered via the renderer.
+ * @returns an object literal. `{ color: 'red', height: 'auto'}`.
+ */
+export function renderStyles(
+    lElement: LElementNode, context: StylingContext, renderer: Renderer3,
+    styleStore?: {[key: string]: any}) {
+  if (isContextDirty(context)) {
+    const native = lElement.native;
+    const multiStartIndex = getMultiStartIndex(context);
+    for (let i = StylingIndex.SingleStylesStartPosition; i < context.length;
+         i += StylingIndex.Size) {
+      // there is no point in rendering styles that have not changed on screen
+      if (isDirty(context, i)) {
+        const prop = getProp(context, i);
+        const value = getValue(context, i);
+        const flag = getPointers(context, i);
+        const isInSingleRegion = i < multiStartIndex;
+
+        let styleToApply: string|null = value;
+
+        // STYLE DEFER CASE 1: Use a multi value instead of a null single value
+        // this check implies that a single value was removed and we
+        // should now defer to a multi value and use that (if set).
+        if (isInSingleRegion && styleToApply == null) {
+          // single values ALWAYS have a reference to a multi index
+          const multiIndex = getMultiOrSingleIndex(flag);
+          styleToApply = getValue(context, multiIndex);
+        }
+
+        // STYLE DEFER CASE 2: Use the initial value if all else fails (is null)
+        // the initial value will always be a string or null,
+        // therefore we can safely adopt it incase there's nothing else
+        if (styleToApply == null) {
+          styleToApply = getInitialValue(context, flag);
+        }
+
+        setStyle(native, prop, styleToApply, renderer, styleStore);
+        setDirty(context, i, false);
+      }
+    }
+
+    setContextDirty(context, false);
+  }
+}
+
+/**
+ * This function renders a given CSS prop/value entry using the
+ * provided renderer. If a `styleStore` value is provided then
+ * that will be used a render context instead of the provided
+ * renderer.
+ *
+ * @param native the DOM Element
+ * @param prop the CSS style property that will be rendered
+ * @param value the CSS style value that will be rendered
+ * @param renderer
+ * @param styleStore an optional key/value map that will be used as a context to render styles on
+ */
+function setStyle(
+    native: any, prop: string, value: string | null, renderer: Renderer3,
+    styleStore?: {[key: string]: any}) {
+  if (styleStore) {
+    styleStore[prop] = value;
+  } else if (value == null) {
+    ngDevMode && ngDevMode.rendererRemoveStyle++;
+    isProceduralRenderer(renderer) ?
+        renderer.removeStyle(native, prop, RendererStyleFlags3.DashCase) :
+        native['style'].removeProperty(prop);
+  } else {
+    ngDevMode && ngDevMode.rendererSetStyle++;
+    isProceduralRenderer(renderer) ?
+        renderer.setStyle(native, prop, value, RendererStyleFlags3.DashCase) :
+        native['style'].setProperty(prop, value);
+  }
+}
+
+function setDirty(context: StylingContext, index: number, isDirtyYes: boolean) {
+  const adjustedIndex =
+      index >= StylingIndex.SingleStylesStartPosition ? (index + StylingIndex.FlagsOffset) : index;
+  if (isDirtyYes) {
+    (context[adjustedIndex] as number) |= StylingFlags.Dirty;
+  } else {
+    (context[adjustedIndex] as number) &= ~StylingFlags.Dirty;
+  }
+}
+
+function isDirty(context: StylingContext, index: number): boolean {
+  const adjustedIndex =
+      index >= StylingIndex.SingleStylesStartPosition ? (index + StylingIndex.FlagsOffset) : index;
+  return ((context[adjustedIndex] as number) & StylingFlags.Dirty) == StylingFlags.Dirty;
+}
+
+function pointers(configFlag: number, staticIndex: number, dynamicIndex: number) {
+  return (configFlag & StylingFlags.Dirty) | (staticIndex << StylingFlags.BitCountSize) |
+      (dynamicIndex << (StylingIndex.BitCountSize + StylingFlags.BitCountSize));
+}
+
+function getInitialValue(context: StylingContext, flag: number): string|null {
+  const index = getInitialIndex(flag);
+  return context[StylingIndex.InitialStylesPosition][index] as null | string;
+}
+
+function getInitialIndex(flag: number): number {
+  return (flag >> StylingFlags.BitCountSize) & StylingIndex.BitMask;
+}
+
+function getMultiOrSingleIndex(flag: number): number {
+  const index =
+      (flag >> (StylingIndex.BitCountSize + StylingFlags.BitCountSize)) & StylingIndex.BitMask;
+  return index >= StylingIndex.SingleStylesStartPosition ? index : -1;
+}
+
+function getMultiStartIndex(context: StylingContext): number {
+  return getMultiOrSingleIndex(context[StylingIndex.MasterFlagPosition]) as number;
+}
+
+function setProp(context: StylingContext, index: number, prop: string) {
+  context[index + StylingIndex.PropertyOffset] = prop;
+}
+
+function setValue(context: StylingContext, index: number, value: string | null) {
+  context[index + StylingIndex.ValueOffset] = value;
+}
+
+function setFlag(context: StylingContext, index: number, flag: number) {
+  const adjustedIndex =
+      index === StylingIndex.MasterFlagPosition ? index : (index + StylingIndex.FlagsOffset);
+  context[adjustedIndex] = flag;
+}
+
+function getPointers(context: StylingContext, index: number): number {
+  const adjustedIndex =
+      index === StylingIndex.MasterFlagPosition ? index : (index + StylingIndex.FlagsOffset);
+  return context[adjustedIndex] as number;
+}
+
+function getValue(context: StylingContext, index: number): string|null {
+  return context[index + StylingIndex.ValueOffset] as string | null;
+}
+
+function getProp(context: StylingContext, index: number): string {
+  return context[index + StylingIndex.PropertyOffset] as string;
+}
+
+export function isContextDirty(context: StylingContext): boolean {
+  return isDirty(context, StylingIndex.MasterFlagPosition);
+}
+
+export function setContextDirty(context: StylingContext, isDirtyYes: boolean): void {
+  setDirty(context, StylingIndex.MasterFlagPosition, isDirtyYes);
+}
+
+function findEntryPositionByProp(
+    context: StylingContext, prop: string, startIndex?: number): number {
+  for (let i = (startIndex || 0) + StylingIndex.PropertyOffset; i < context.length;
+       i += StylingIndex.Size) {
+    const thisProp = context[i];
+    if (thisProp == prop) {
+      return i - StylingIndex.PropertyOffset;
+    }
+  }
+  return -1;
+}
+
+function swapMultiContextEntries(context: StylingContext, indexA: number, indexB: number) {
+  const tmpValue = getValue(context, indexA);
+  const tmpProp = getProp(context, indexA);
+  const tmpFlag = getPointers(context, indexA);
+
+  let flagA = tmpFlag;
+  let flagB = getPointers(context, indexB);
+
+  const singleIndexA = getMultiOrSingleIndex(flagA);
+  if (singleIndexA >= 0) {
+    const _flag = getPointers(context, singleIndexA);
+    const _initial = getInitialIndex(_flag);
+    setFlag(context, singleIndexA, pointers(_flag, _initial, indexB));
+  }
+
+  const singleIndexB = getMultiOrSingleIndex(flagB);
+  if (singleIndexB >= 0) {
+    const _flag = getPointers(context, singleIndexB);
+    const _initial = getInitialIndex(_flag);
+    setFlag(context, singleIndexB, pointers(_flag, _initial, indexA));
+  }
+
+  setValue(context, indexA, getValue(context, indexB));
+  setProp(context, indexA, getProp(context, indexB));
+  setFlag(context, indexA, getPointers(context, indexB));
+
+  setValue(context, indexB, tmpValue);
+  setProp(context, indexB, tmpProp);
+  setFlag(context, indexB, tmpFlag);
+}
+
+function updateSinglePointerValues(context: StylingContext, indexStartPosition: number) {
+  for (let i = indexStartPosition; i < context.length; i += StylingIndex.Size) {
+    const multiFlag = getPointers(context, i);
+    const singleIndex = getMultiOrSingleIndex(multiFlag);
+    if (singleIndex > 0) {
+      const singleFlag = getPointers(context, singleIndex);
+      const initialIndexForSingle = getInitialIndex(singleFlag);
+      const updatedFlag = pointers(
+          isDirty(context, singleIndex) ? StylingFlags.Dirty : StylingFlags.None,
+          initialIndexForSingle, i);
+      setFlag(context, singleIndex, updatedFlag);
+    }
+  }
+}
+
+function insertNewMultiProperty(
+    context: StylingContext, index: number, name: string, value: string): void {
+  const doShift = index < context.length;
+
+  // prop does not exist in the list, add it in
+  context.splice(index, 0, StylingFlags.Dirty, name, value);
+
+  if (doShift) {
+    // because the value was inserted midway into the array then we
+    // need to update all the shifted multi values' single value
+    // pointers to point to the newly shifted location
+    updateSinglePointerValues(context, index + StylingIndex.Size);
+  }
+}
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index 536b2a92a7..06ee01368b 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -11,7 +11,7 @@ import {browserDetection} from '@angular/platform-browser/testing/src/browser_ut
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
 import * as $r3$ from '../../../src/core_render3_private_export';
 import {AttributeMarker} from '../../../src/render3';
-import {ComponentDefInternal} from '../../../src/render3/interfaces/definition';
+import {ComponentDefInternal, InitialStylingFlags} from '../../../src/render3/interfaces/definition';
 import {ComponentFixture, renderComponent, toHtml} from '../render_util';
 
 
@@ -304,6 +304,7 @@ describe('elements', () => {
     it('should bind to a specific style', () => {
       type $MyComponent$ = MyComponent;
 
+      const c0 = ['color', 'width'];
       @Component({
         selector: 'my-component',
         template: `<div [style.color]="someColor" [style.width.px]="someWidth"></div>`
@@ -318,11 +319,14 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'div');
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵs(1, c0);
+              $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsn(0, 'color', $r3$.ɵb(ctx.someColor));
-              $r3$.ɵsn(0, 'width', $r3$.ɵb(ctx.someWidth), 'px');
+              $r3$.ɵsp(1, 0, ctx.someColor);
+              $r3$.ɵsp(1, 1, ctx.someWidth, 'px');
+              $r3$.ɵsa(1);
             }
           }
         });
@@ -349,10 +353,7 @@ describe('elements', () => {
     it('should bind to many and keep order', () => {
       type $MyComponent$ = MyComponent;
 
-      // NORMATIVE
-      const $e0_attrs$ = ['style', 'color: red;'];
-      // /NORMATIVE
-
+      const c0 = ['color', InitialStylingFlags.INITIAL_STYLES, 'color', 'red'];
       @Component({
         selector: 'my-component',
         template:
@@ -367,7 +368,9 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'div', $e0_attrs$);
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵs(1, c0);
+              $r3$.ɵe();
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.someString + 1));
@@ -402,11 +405,14 @@ describe('elements', () => {
           factory: function StyleComponent_Factory() { return new StyleComponent(); },
           template: function StyleComponent_Template(rf: $RenderFlags$, ctx: $StyleComponent$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'div');
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵs(1);
+              $r3$.ɵe();
             }
             if (rf & 2) {
               $r3$.ɵk(0, $r3$.ɵb(ctx.classExp));
-              $r3$.ɵs(0, $r3$.ɵb(ctx.styleExp));
+              $r3$.ɵsm(1, ctx.styleExp);
+              $r3$.ɵsa(1);
             }
           }
         });
diff --git a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
index bc73d1e105..ea57ab7674 100644
--- a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
@@ -43,15 +43,18 @@ describe('compiler sanitization', () => {
         factory: function MyComponent_Factory() { return new MyComponent(); },
         template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
-            $r3$.ɵEe(1, 'img');
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵs(1, ['background-image']);
+            $r3$.ɵe();
+            $r3$.ɵEe(2, 'img');
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'innerHTML', $r3$.ɵb(ctx.innerHTML), $r3$.ɵsanitizeHtml);
             $r3$.ɵp(0, 'hidden', $r3$.ɵb(ctx.hidden));
-            $r3$.ɵsn(1, 'background-image', $r3$.ɵb(ctx.style), $r3$.ɵsanitizeStyle);
-            $r3$.ɵp(1, 'src', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
-            $r3$.ɵa(1, 'srcset', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
+            $r3$.ɵsp(1, 0, ctx.style, $r3$.ɵsanitizeStyle);
+            $r3$.ɵsa(1);
+            $r3$.ɵp(2, 'src', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
+            $r3$.ɵa(2, 'srcset', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
           }
         }
       });
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 48a6bcb652..e8a9339480 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,8 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleNamed, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleProp, elementStyling, elementStylingApply, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
+import {InitialStylingFlags} from '../../src/render3/interfaces/definition';
 import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
@@ -22,11 +23,13 @@ import {ComponentFixture, TemplateFixture} from './render_util';
 describe('instructions', () => {
   function createAnchor() {
     elementStart(0, 'a');
+    elementStyling(1);
     elementEnd();
   }
 
-  function createDiv() {
+  function createDiv(initialStyles?: (string | number)[]) {
     elementStart(0, 'div');
+    elementStyling(1, initialStyles && Array.isArray(initialStyles) ? initialStyles : null);
     elementEnd();
   }
 
@@ -186,32 +189,38 @@ describe('instructions', () => {
     });
   });
 
-  describe('elementStyleNamed', () => {
+  describe('elementStyleProp', () => {
     it('should use sanitizer function', () => {
-      const t = new TemplateFixture(createDiv);
-      t.update(
-          () => elementStyleNamed(0, 'background-image', 'url("http://server")', sanitizeStyle));
+      const t = new TemplateFixture(() => { return createDiv(['background-image']); });
+      t.update(() => {
+        elementStyleProp(1, 0, 'url("http://server")', sanitizeStyle);
+        elementStylingApply(1);
+      });
       // nothing is set because sanitizer suppresses it.
       expect(t.html).toEqual('<div></div>');
 
-      t.update(
-          () => elementStyleNamed(
-              0, 'background-image', bypassSanitizationTrustStyle('url("http://server")'),
-              sanitizeStyle));
+      t.update(() => {
+        elementStyleProp(1, 0, bypassSanitizationTrustStyle('url("http://server")'), sanitizeStyle);
+        elementStylingApply(1);
+      });
       expect((t.hostElement.firstChild as HTMLElement).style.getPropertyValue('background-image'))
           .toEqual('url("http://server")');
     });
   });
 
-  describe('elementStyle', () => {
+  describe('elementStyleMap', () => {
     function createDivWithStyle() {
-      elementStart(0, 'div', ['style', 'height: 10px']);
+      elementStart(0, 'div');
+      elementStyling(1, ['height', InitialStylingFlags.INITIAL_STYLES, 'height', '10px']);
       elementEnd();
     }
 
     it('should add style', () => {
       const fixture = new TemplateFixture(createDivWithStyle);
-      fixture.update(() => elementStyle(0, {'background-color': 'red'}));
+      fixture.update(() => {
+        elementStyle(1, {'background-color': 'red'});
+        elementStylingApply(1);
+      });
       expect(fixture.html).toEqual('<div style="height: 10px; background-color: red;"></div>');
     });
   });
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 7307ab49a7..3d883fe2fe 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -9,7 +9,7 @@
 import {RenderFlags} from '@angular/core/src/render3';
 
 import {defineComponent, defineDirective} from '../../src/render3/index';
-import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, elementStyleNamed, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding,} from '../../src/render3/instructions';
+import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, elementStyleProp, elementStyling, elementStylingApply, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {HEADER_OFFSET} from '../../src/render3/interfaces/view';
 import {sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -747,10 +747,12 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
+            elementStyling(1, ['border-color']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
-            elementStyleNamed(0, 'border-color', bind(ctx));
+            elementStyleProp(1, 0, ctx);
+            elementStylingApply(1);
           }
         }
 
@@ -764,10 +766,12 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
+            elementStyling(1, ['font-size']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
-            elementStyleNamed(0, 'font-size', bind(ctx), 'px');
+            elementStyleProp(1, 0, ctx, 'px');
+            elementStylingApply(1);
           }
         }
 
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index 8cfd3a10df..dec13b91d9 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -25,7 +25,8 @@ function testLStaticData(tagName: string, attrs: TAttributes | null): TNode {
     child: null,
     parent: null,
     dynamicContainerNode: null,
-    detached: null
+    detached: null,
+    stylingTemplate: null
   };
 }
 
diff --git a/packages/core/test/render3/styling_spec.ts b/packages/core/test/render3/styling_spec.ts
new file mode 100644
index 0000000000..0522d3a424
--- /dev/null
+++ b/packages/core/test/render3/styling_spec.ts
@@ -0,0 +1,657 @@
+/**
+ * @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 {elementEnd, elementStart, elementStyle, elementStyleProp, elementStyling, elementStylingApply} from '../../src/render3/instructions';
+import {InitialStylingFlags, RenderFlags} from '../../src/render3/interfaces/definition';
+import {LElementNode} from '../../src/render3/interfaces/node';
+import {Renderer3} from '../../src/render3/interfaces/renderer';
+import {StylingContext, StylingFlags, StylingIndex, allocStylingContext, createStylingContextTemplate, isContextDirty, renderStyles as _renderStyles, setContextDirty, updateStyleMap, updateStyleProp} from '../../src/render3/styling';
+
+import {renderToHtml} from './render_util';
+
+describe('styling', () => {
+  let lElement: LElementNode|null = null;
+  beforeEach(() => { lElement = { native: {} } as any; });
+
+  function initContext(styles?: (number | string)[]): StylingContext {
+    return allocStylingContext(createStylingContextTemplate(styles));
+  }
+
+  function renderStyles(context: StylingContext, renderer?: Renderer3) {
+    const styles: {[key: string]: any} = {};
+    _renderStyles(lElement !, context, (renderer || {}) as Renderer3, styles);
+    return styles;
+  }
+
+  function trackStylesFactory() {
+    const styles: {[key: string]: any} = {};
+    return function(context: StylingContext, renderer?: Renderer3): {[key: string]: any} {
+      _renderStyles(lElement !, context, (renderer || {}) as Renderer3, styles);
+      return styles;
+    };
+  }
+
+  function clean(a: number = 0, b: number = 0): number {
+    let num = 0;
+    if (a) {
+      num |= a << StylingFlags.BitCountSize;
+    }
+    if (b) {
+      num |= b << (StylingFlags.BitCountSize + StylingIndex.BitCountSize);
+    }
+    return num;
+  }
+
+  function dirty(a: number = 0, b: number = 0): number { return clean(a, b) | StylingFlags.Dirty; }
+
+  describe('createStylingContextTemplate', () => {
+    it('should initialize empty template', () => {
+      const template = createStylingContextTemplate();
+      expect(template).toEqual([
+        [null],
+        clean(0, 2),
+      ]);
+    });
+
+    it('should initialize static styles', () => {
+      debugger;
+      const template = createStylingContextTemplate(
+          [InitialStylingFlags.INITIAL_STYLES, 'color', 'red', 'width', '10px']);
+      expect(template).toEqual([
+        [null, 'red', '10px'],
+        dirty(0, 8),  //
+
+        // #2
+        clean(1, 8),
+        'color',
+        null,
+
+        // #5
+        clean(2, 11),
+        'width',
+        null,
+
+        // #8
+        dirty(1, 2),
+        'color',
+        null,
+
+        // #11
+        dirty(2, 5),
+        'width',
+        null,
+      ]);
+    });
+  });
+
+  describe('instructions', () => {
+    it('should handle a combination of initial, multi and singular style values (in that order)',
+       () => {
+         function Template(rf: RenderFlags, ctx: any) {
+           if (rf & RenderFlags.Create) {
+             elementStart(0, 'span');
+             elementStyling(1, [
+               'width', 'height', 'opacity',  //
+               0, 'width', '100px', 'height', '100px', 'opacity', '0.5'
+             ]);
+             elementEnd();
+           }
+           if (rf & RenderFlags.Update) {
+             elementStyle(1, ctx.myStyles);
+             elementStyleProp(1, 0, ctx.myWidth);
+             elementStylingApply(1);
+           }
+         }
+
+         expect(renderToHtml(Template, {
+           myStyles: {width: '200px', height: '200px'},
+           myWidth: '300px'
+         })).toEqual('<span style="width: 300px; height: 200px; opacity: 0.5;"></span>');
+
+         expect(renderToHtml(Template, {myStyles: {width: '200px', height: null}, myWidth: null}))
+             .toEqual('<span style="width: 200px; height: 100px; opacity: 0.5;"></span>');
+       });
+  });
+
+  describe('helper functions', () => {
+    it('should build a list of multiple styling values', () => {
+      const getStyles = trackStylesFactory();
+      const stylingContext = initContext();
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+      updateStyleMap(stylingContext, {height: '200px'});
+      expect(getStyles(stylingContext)).toEqual({width: null, height: '200px'});
+    });
+
+    it('should evaluate the delta between style changes when rendering occurs', () => {
+      const stylingContext = initContext(['width', 'height', 0, 'width', '100px']);
+      updateStyleMap(stylingContext, {
+        height: '200px',
+      });
+      expect(renderStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
+      expect(renderStyles(stylingContext)).toEqual({});
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+      expect(renderStyles(stylingContext)).toEqual({height: '100px'});
+      updateStyleProp(stylingContext, 1, '100px');
+      expect(renderStyles(stylingContext)).toEqual({});
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+      expect(renderStyles(stylingContext)).toEqual({});
+    });
+
+    it('should update individual values on a set of styles', () => {
+      const getStyles = trackStylesFactory();
+      const stylingContext = initContext(['width', 'height']);
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+      updateStyleProp(stylingContext, 1, '200px');
+      expect(getStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
+    });
+
+    it('should only mark itself as updated when one or more properties have been applied', () => {
+      const stylingContext = initContext();
+      expect(isContextDirty(stylingContext)).toBeFalsy();
+
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+      expect(isContextDirty(stylingContext)).toBeTruthy();
+
+      setContextDirty(stylingContext, false);
+
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+      expect(isContextDirty(stylingContext)).toBeFalsy();
+
+      updateStyleMap(stylingContext, {
+        width: '200px',
+        height: '100px',
+      });
+      expect(isContextDirty(stylingContext)).toBeTruthy();
+    });
+
+    it('should only mark itself as updated when any single properties have been applied', () => {
+      const stylingContext = initContext(['height']);
+      updateStyleMap(stylingContext, {
+        width: '100px',
+        height: '100px',
+      });
+
+      setContextDirty(stylingContext, false);
+
+      updateStyleProp(stylingContext, 0, '100px');
+      expect(isContextDirty(stylingContext)).toBeFalsy();
+
+      setContextDirty(stylingContext, false);
+
+      updateStyleProp(stylingContext, 0, '200px');
+      expect(isContextDirty(stylingContext)).toBeTruthy();
+    });
+
+    it('should prioritize multi and single styles over initial styles', () => {
+      const getStyles = trackStylesFactory();
+
+      const stylingContext = initContext(
+          ['width', 'height', 'opacity', 0, 'width', '100px', 'height', '100px', 'opacity', '0']);
+
+      expect(getStyles(stylingContext)).toEqual({
+        width: '100px',
+        height: '100px',
+        opacity: '0',
+      });
+
+      updateStyleMap(stylingContext, {width: '200px', height: '200px'});
+
+      expect(getStyles(stylingContext)).toEqual({
+        width: '200px',
+        height: '200px',
+        opacity: '0',
+      });
+
+      updateStyleProp(stylingContext, 0, '300px');
+
+      expect(getStyles(stylingContext)).toEqual({
+        width: '300px',
+        height: '200px',
+        opacity: '0',
+      });
+
+      updateStyleProp(stylingContext, 0, null);
+
+      expect(getStyles(stylingContext)).toEqual({
+        width: '200px',
+        height: '200px',
+        opacity: '0',
+      });
+
+      updateStyleMap(stylingContext, {});
+
+      expect(getStyles(stylingContext)).toEqual({
+        width: '100px',
+        height: '100px',
+        opacity: '0',
+      });
+    });
+
+    it('should cleanup removed styles from the context once the styles are built', () => {
+      const stylingContext = initContext(['width', 'height']);
+      const getStyles = trackStylesFactory();
+
+      updateStyleMap(stylingContext, {width: '100px', height: '100px'});
+
+      expect(stylingContext).toEqual([
+        [null],
+        dirty(0, 8),  //
+
+        // #2
+        clean(0, 8),
+        'width',
+        null,
+
+        // #5
+        clean(0, 11),
+        'height',
+        null,
+
+        // #8
+        dirty(0, 2),
+        'width',
+        '100px',
+
+        // #11
+        dirty(0, 5),
+        'height',
+        '100px',
+      ]);
+
+      getStyles(stylingContext);
+      updateStyleMap(stylingContext, {width: '200px', opacity: '0'});
+
+      expect(stylingContext).toEqual([
+        [null],
+        dirty(0, 8),  //
+
+        // #2
+        clean(0, 8),
+        'width',
+        null,
+
+        // #5
+        clean(0, 14),
+        'height',
+        null,
+
+        // #8
+        dirty(0, 2),
+        'width',
+        '200px',
+
+        // #11
+        dirty(),
+        'opacity',
+        '0',
+
+        // #14
+        dirty(0, 5),
+        'height',
+        null,
+      ]);
+
+      getStyles(stylingContext);
+      expect(stylingContext).toEqual([
+        [null],
+        clean(0, 8),  //
+
+        // #2
+        clean(0, 8),
+        'width',
+        null,
+
+        // #5
+        clean(0, 14),
+        'height',
+        null,
+
+        // #8
+        clean(0, 2),
+        'width',
+        '200px',
+
+        // #11
+        clean(),
+        'opacity',
+        '0',
+
+        // #14
+        clean(0, 5),
+        'height',
+        null,
+      ]);
+
+      updateStyleMap(stylingContext, {width: null});
+      updateStyleProp(stylingContext, 0, '300px');
+
+      expect(stylingContext).toEqual([
+        [null],
+        dirty(0, 8),  //
+
+        // #2
+        dirty(0, 8),
+        'width',
+        '300px',
+
+        // #5
+        clean(0, 14),
+        'height',
+        null,
+
+        // #8
+        clean(0, 2),
+        'width',
+        null,
+
+        // #11
+        dirty(),
+        'opacity',
+        null,
+
+        // #14
+        clean(0, 5),
+        'height',
+        null,
+      ]);
+
+      getStyles(stylingContext);
+
+      updateStyleProp(stylingContext, 0, null);
+      expect(stylingContext).toEqual([
+        [null],
+        dirty(0, 8),  //
+
+        // #2
+        dirty(0, 8),
+        'width',
+        null,
+
+        // #5
+        clean(0, 14),
+        'height',
+        null,
+
+        // #8
+        clean(0, 2),
+        'width',
+        null,
+
+        // #11
+        clean(),
+        'opacity',
+        null,
+
+        // #14
+        clean(0, 5),
+        'height',
+        null,
+      ]);
+    });
+
+    it('should find the next available space in the context when data is added after being removed before',
+       () => {
+         const stylingContext = initContext(['lineHeight']);
+         const getStyles = trackStylesFactory();
+
+         updateStyleMap(stylingContext, {width: '100px', height: '100px', opacity: '0.5'});
+
+         expect(stylingContext).toEqual([
+           [null],
+           dirty(0, 5),  //
+
+           // #2
+           clean(0, 14),
+           'lineHeight',
+           null,
+
+           // #5
+           dirty(),
+           'width',
+           '100px',
+
+           // #8
+           dirty(),
+           'height',
+           '100px',
+
+           // #11
+           dirty(),
+           'opacity',
+           '0.5',
+
+           // #14
+           dirty(0, 2),
+           'lineHeight',
+           null,
+         ]);
+
+         getStyles(stylingContext);
+
+         updateStyleMap(stylingContext, {});
+         expect(stylingContext).toEqual([
+           [null],
+           dirty(0, 5),  //
+
+           // #2
+           clean(0, 14),
+           'lineHeight',
+           null,
+
+           // #5
+           dirty(),
+           'width',
+           null,
+
+           // #8
+           dirty(),
+           'height',
+           null,
+
+           // #11
+           dirty(),
+           'opacity',
+           null,
+
+           // #14
+           clean(0, 2),
+           'lineHeight',
+           null,
+         ]);
+
+         getStyles(stylingContext);
+         updateStyleMap(stylingContext, {
+           borderWidth: '5px',
+         });
+
+         expect(stylingContext).toEqual([
+           [null],
+           dirty(0, 5),  //
+
+           // #2
+           clean(0, 17),
+           'lineHeight',
+           null,
+
+           // #5
+           dirty(),
+           'borderWidth',
+           '5px',
+
+           // #8
+           clean(),
+           'width',
+           null,
+
+           // #11
+           clean(),
+           'height',
+           null,
+
+           // #14
+           clean(),
+           'opacity',
+           null,
+
+           // #17
+           clean(0, 2),
+           'lineHeight',
+           null,
+         ]);
+
+         updateStyleProp(stylingContext, 0, '200px');
+
+         expect(stylingContext).toEqual([
+           [null],
+           dirty(0, 5),  //
+
+           // #2
+           dirty(0, 17),
+           'lineHeight',
+           '200px',
+
+           // #5
+           dirty(),
+           'borderWidth',
+           '5px',
+
+           // #8
+           clean(),
+           'width',
+           null,
+
+           // #11
+           clean(),
+           'height',
+           null,
+
+           // #14
+           clean(),
+           'opacity',
+           null,
+
+           // #17
+           clean(0, 2),
+           'lineHeight',
+           null,
+         ]);
+
+         updateStyleMap(stylingContext, {borderWidth: '15px', borderColor: 'red'});
+
+         expect(stylingContext).toEqual([
+           [null],
+           dirty(0, 5),  //
+
+           // #2
+           dirty(0, 20),
+           'lineHeight',
+           '200px',
+
+           // #5
+           dirty(),
+           'borderWidth',
+           '15px',
+
+           // #8
+           dirty(),
+           'borderColor',
+           'red',
+
+           // #11
+           clean(),
+           'width',
+           null,
+
+           // #14
+           clean(),
+           'height',
+           null,
+
+           // #17
+           clean(),
+           'opacity',
+           null,
+
+           // #20
+           clean(0, 2),
+           'lineHeight',
+           null,
+         ]);
+       });
+
+    it('should render all data as not being dirty after the styles are built', () => {
+      const getStyles = trackStylesFactory();
+      const stylingContext = initContext(['height']);
+
+      updateStyleMap(stylingContext, {
+        width: '100px',
+      });
+
+      updateStyleProp(stylingContext, 0, '200px');
+
+      expect(stylingContext).toEqual([
+        [null],
+        dirty(0, 5),  //
+
+        // #2
+        dirty(0, 8),
+        'height',
+        '200px',
+
+        // #2
+        dirty(),
+        'width',
+        '100px',
+
+        // #8
+        clean(0, 2),
+        'height',
+        null,
+      ]);
+
+      getStyles(stylingContext);
+
+      expect(stylingContext).toEqual([
+        [null],
+        clean(0, 5),  //
+
+        // #2
+        clean(0, 8),
+        'height',
+        '200px',
+
+        // #2
+        clean(),
+        'width',
+        '100px',
+
+        // #8
+        clean(0, 2),
+        'height',
+        null,
+      ]);
+    });
+  });
+});

From 68814040e3d7117518c2b9aefa8b4e1f99e3ee49 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 4 Jun 2018 22:38:08 +0300
Subject: [PATCH 431/582] fix(language-service): do not overwrite native
 `Reflect` (#24299)

Fixes #21420

PR Close #24299
---
 .../language-service/bundles/banner.js.txt     |  5 +++--
 packages/language-service/rollup.config.js     | 18 ++----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/packages/language-service/bundles/banner.js.txt b/packages/language-service/bundles/banner.js.txt
index 06ae8052bc..82e0ee92b0 100644
--- a/packages/language-service/bundles/banner.js.txt
+++ b/packages/language-service/bundles/banner.js.txt
@@ -4,8 +4,9 @@
  * License: MIT
  */
 
-var $reflect = {defineMetadata: function() {}, getOwnMetadata: function(){}};
-((typeof global !== 'undefined' && global)||{})['Reflect'] = $reflect;
+var $reflect = {defineMetadata: function() {}, getOwnMetadata: function() {}};
+var Reflect = (typeof global !== 'undefined' ? global : {})['Reflect'] || {};
+Object.keys($reflect).forEach(function(key) { Reflect[key] = Reflect[key] || $reflect[key]; });
 var $deferred, $resolved, $provided;
 function $getModule(name) { return $provided[name] || require(name); }
 function define(modules, cb) { $deferred = { modules: modules, cb: cb }; }
diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js
index fcf413351b..7404f938e4 100644
--- a/packages/language-service/rollup.config.js
+++ b/packages/language-service/rollup.config.js
@@ -9,12 +9,12 @@
 const commonjs = require('rollup-plugin-commonjs');
 const sourcemaps = require('rollup-plugin-sourcemaps');
 const path = require('path');
+const fs = require('fs');
 
 var m = /^\@angular\/((\w|\-)+)(\/(\w|\d|\/|\-)+)?$/;
 var location = normalize('../../dist/packages-dist') + '/';
 var rxjsLocation = normalize('../../node_modules/rxjs');
 var tslibLocation = normalize('../../node_modules/tslib');
-var esm = 'esm/';
 
 var locations = {'compiler-cli': normalize('../../dist/packages') + '/'};
 
@@ -43,21 +43,7 @@ function resolve(id, from) {
   }
 }
 
-var banner = `
-var $reflect = {defineMetadata: function() {}, getOwnMetadata: function(){}};
-((typeof global !== 'undefined' && global)||{})['Reflect'] = $reflect;
-var $deferred, $resolved, $provided;
-function $getModule(name) { return $provided[name] || require(name); }
-function define(modules, cb) { $deferred = { modules: modules, cb: cb }; }
-module.exports = function(provided) {
-  if ($resolved) return $resolved;
-  var result = {};
-  $provided = Object.assign({'reflect-metadata': $reflect}, provided || {}, { exports: result });
-  $deferred.cb.apply(this, $deferred.modules.map($getModule));
-  $resolved = result;
-  return result;
-}
-`;
+var banner = fs.readFileSync('bundles/banner.js.txt', 'utf8');
 
 module.exports = {
   entry: '../../dist/packages-dist/language-service/fesm5/language-service.js',

From dcabb051023e2cabba6258e94c9fa0e74939c916 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 25 Jun 2018 16:49:46 +0200
Subject: [PATCH 432/582] fix(common): use correct currency format for locale
 de-AT (#24658)

Fixes #24609
PR Close #24658
---
 packages/common/locales/closure-locale.ts      | 2 +-
 packages/common/locales/de-AT.ts               | 2 +-
 packages/common/test/pipes/number_pipe_spec.ts | 4 ++++
 tools/gulp-tasks/cldr/extract.js               | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/common/locales/closure-locale.ts b/packages/common/locales/closure-locale.ts
index ec757cb71c..183913a7c9 100644
--- a/packages/common/locales/closure-locale.ts
+++ b/packages/common/locales/closure-locale.ts
@@ -949,7 +949,7 @@ export const locale_de_AT = [
   [['v. Chr.', 'n. Chr.'], u, u], 1, [6, 0],
   ['dd.MM.yy', 'dd.MM.y', 'd. MMMM y', 'EEEE, d. MMMM y'],
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'], ['{1}, {0}', u, '{1} \'um\' {0}', u],
-  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', '.'],
+  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', u, '.'],
   ['#,##0.###', '#,##0 %', '¤ #,##0.00', '#E0'], '€', 'Euro', {
     'ATS': ['öS'],
     'AUD': ['AU$', '$'],
diff --git a/packages/common/locales/de-AT.ts b/packages/common/locales/de-AT.ts
index 2eff51c202..5898204bd6 100644
--- a/packages/common/locales/de-AT.ts
+++ b/packages/common/locales/de-AT.ts
@@ -51,7 +51,7 @@ export default [
   [['v. Chr.', 'n. Chr.'], u, u], 1, [6, 0],
   ['dd.MM.yy', 'dd.MM.y', 'd. MMMM y', 'EEEE, d. MMMM y'],
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'], ['{1}, {0}', u, '{1} \'um\' {0}', u],
-  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', '.'],
+  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', u, '.'],
   ['#,##0.###', '#,##0 %', '¤ #,##0.00', '#E0'], '€', 'Euro', {
     'ATS': ['öS'],
     'AUD': ['AU$', '$'],
diff --git a/packages/common/test/pipes/number_pipe_spec.ts b/packages/common/test/pipes/number_pipe_spec.ts
index adc9676f44..f72800f814 100644
--- a/packages/common/test/pipes/number_pipe_spec.ts
+++ b/packages/common/test/pipes/number_pipe_spec.ts
@@ -10,6 +10,7 @@ import localeEn from '@angular/common/locales/en';
 import localeEsUS from '@angular/common/locales/es-US';
 import localeFr from '@angular/common/locales/fr';
 import localeAr from '@angular/common/locales/ar';
+import localeDeAt from '@angular/common/locales/de-AT';
 import {registerLocaleData, CurrencyPipe, DecimalPipe, PercentPipe, formatNumber} from '@angular/common';
 import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal';
 
@@ -20,6 +21,7 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
       registerLocaleData(localeEsUS);
       registerLocaleData(localeFr);
       registerLocaleData(localeAr);
+      registerLocaleData(localeDeAt);
     });
 
     describe('DecimalPipe', () => {
@@ -95,6 +97,8 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
           expect(pipe.transform(5.1234, 'CAD', 'symbol-narrow', '5.2-2', 'fr'))
               .toEqual('00 005,12 $');
           expect(pipe.transform(5, 'USD', 'symbol', '', 'fr')).toEqual('5,00 $US');
+          expect(pipe.transform(123456789, 'EUR', 'symbol', '', 'de-at'))
+              .toEqual('€ 123.456.789,00');
         });
 
         it('should support any currency code name', () => {
diff --git a/tools/gulp-tasks/cldr/extract.js b/tools/gulp-tasks/cldr/extract.js
index e986b79b80..3c0e0ce16c 100644
--- a/tools/gulp-tasks/cldr/extract.js
+++ b/tools/gulp-tasks/cldr/extract.js
@@ -444,7 +444,7 @@ function getNumberSettings(localeData) {
     symbols.timeSeparator,
   ];
 
-  if (symbols.currencyDecimal) {
+  if (symbols.currencyDecimal || symbols.currencyGroup) {
     symbolValues.push(symbols.currencyDecimal);
   }
 

From 3d20c501564d0d10427d5dff5c2b1f8376a68697 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 25 Jun 2018 22:34:46 +0300
Subject: [PATCH 433/582] fix(ivy): correctly resolve Array  property access
 (#24664)

PR Close #24664
---
 packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts       | 2 +-
 packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index e84c84b52e..9740d4e222 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -460,7 +460,7 @@ class StaticInterpreter {
       }
     } else if (Array.isArray(lhs)) {
       if (rhs === 'length') {
-        return rhs.length;
+        return lhs.length;
       }
       if (typeof rhs !== 'number' || !Number.isInteger(rhs)) {
         return DYNAMIC_VALUE;
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
index 5498f4aa57..7a41ad3595 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
@@ -112,6 +112,9 @@ describe('ngtsc metadata', () => {
   it('array access works',
      () => { expect(evaluate(`const a = [1, 2, 3];`, 'a[1] + a[0]')).toEqual(3); });
 
+  it('array `length` property access works',
+     () => { expect(evaluate(`const a = [1, 2, 3];`, 'a[\'length\'] + 1')).toEqual(4); });
+
   it('negation works', () => {
     expect(evaluate(`const x = 3;`, '!x')).toEqual(false);
     expect(evaluate(`const x = 3;`, '!!x')).toEqual(true);

From 89203c96ad513cb8d40cc672b8860f5eaa004ac8 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 9 Jul 2018 14:04:45 +0300
Subject: [PATCH 434/582] build: make `internal-angular` karma reporter
 compatible with latest karma (#24803)

Due to changes in karma@1.0.0, `internal-angular` karma reporter stopped
showing browser logs (such as `console.log()` etc.).
Related to d571a5173.

PR Close #24803
---
 tools/karma/reporter.js      | 96 +++++++++++++++++++++++-------------
 tools/tsc-watch/index.ts     |  5 +-
 tools/tsc-watch/tsc_watch.ts |  1 -
 3 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/tools/karma/reporter.js b/tools/karma/reporter.js
index 4eae3083be..ca0693509a 100644
--- a/tools/karma/reporter.js
+++ b/tools/karma/reporter.js
@@ -6,62 +6,90 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-var SourceMapConsumer = require('source-map').SourceMapConsumer;
-var DotsReporter = require('karma/lib/reporters/dots_color');
+'use strict';
 
-var createErrorFormatter = function(basePath, emitter, SourceMapConsumer) {
-  var lastServedFiles = [];
-  emitter.on('file_list_modified', function(files) { lastServedFiles = files.served; });
-  function findFile(path) { return lastServedFiles.filter(_ => _.path === path)[0]; }
+const DotsColorReporter = require('karma/lib/reporters/dots_color');
+const {SourceMapConsumer} = require('source-map');
+const {resolve} = require('url');
 
-  var URL_REGEXP = new RegExp(
-      '(?:https?:\\/\\/[^\\/]*)?\\/?' +
-          '(base|absolute)' +               // prefix
+// Based on `karma/lib/reporter.js` (v2.0.4):
+// https://github.com/karma-runner/karma/blob/v2.0.4/lib/reporter.js
+function createErrorFormatter(config, emitter, SourceMapConsumer) {
+  const basePath = config.basePath;
+  const urlRoot = (config.urlRoot === '/') ? '' : (config.urlRoot || '');
+  const urlRegexp = new RegExp(
+      '(?:https?:\\/\\/' + config.hostname + '(?:\\:' + config.port + ')?' +
+          ')?\\/?' + urlRoot + '\\/?' +
+          '(base/|absolute)' +  // prefix, including slash for base/ to create relative paths.
           '((?:[A-z]\\:)?[^\\?\\s\\:]*)' +  // path
           '(\\?\\w*)?' +                    // sha
           '(\\:(\\d+))?' +                  // line
           '(\\:(\\d+))?' +                  // column
           '',
       'g');
+  const sourceMapConsumerCache = new WeakMap();
+  let lastServedFiles = [];
 
-  return function(msg, indentation) {
-    msg = (msg || '').replace(URL_REGEXP, function(_, prefix, path, __, ___, line, ____, column) {
-      if (prefix === 'base') {
-        path = basePath + path;
-      }
-      line = parseInt(line || '0', 10);
-      column = parseInt(column || '0', 10);
+  // Helpers
+  const findFile = path => lastServedFiles.find(f => f.path === path);
+  const formatPathMapping = (path, line, column) =>
+      path + (line ? `:${line}` : '') + (column ? `:${column}` : '');
+  const isString = input => typeof input === 'string';
+  const getSourceMapConsumer = sourceMap => {
+    if (!sourceMapConsumerCache.has(sourceMap)) {
+      sourceMapConsumerCache.set(sourceMap, new SourceMapConsumer(sourceMap));
+    }
+    return sourceMapConsumerCache.get(sourceMap);
+  };
+
+  emitter.on('file_list_modified', files => lastServedFiles = files.served);
+
+  return (input, indentation) => {
+    if (!isString(indentation)) indentation = '';
+    if (!input) input = '';
+    if (isString(input.message)) input = input.message;
+    if (!isString(input)) input = JSON.stringify(input, null, indentation);
+
+    let msg = input.replace(urlRegexp, (_, prefix, path, __, ___, line, ____, column) => {
+      const normalizedPath = (prefix === 'base/') ? `${basePath}/${path}` : path;
+      const file = findFile(normalizedPath);
+
+      if (file && file.sourceMap && line) {
+        line = +line;
+        column = +column || 0;
+        const bias =
+            column ? SourceMapConsumer.GREATEST_LOWER_BOUND : SourceMapConsumer.LEAST_UPPER_BOUND;
 
-      var file = findFile(path);
-      if (file && file.sourceMap) {
         try {
-          var original = new SourceMapConsumer(file.sourceMap)
-                             .originalPositionFor({line: line, column: column});
-          return process.cwd() + '/modules/' + original.source + ':' + original.line + ':' +
-              original.column;
+          const original =
+              getSourceMapConsumer(file.sourceMap).originalPositionFor({line, column, bias});
+          return formatPathMapping(
+              `${resolve(path, original.source)}`, original.line, original.column);
         } catch (e) {
-          console.warn('SourceMap position not found for trace: %s', msg);
+          console.warn(`SourceMap position not found for trace: ${input}`);
         }
       }
-      return path + ':' + line + ':' + column;
+
+      return formatPathMapping(path, line, column) || prefix;
     });
 
-    // indent every line
+    // Indent every line.
     if (indentation) {
-      msg = indentation + msg.replace(/\n/g, '\n' + indentation);
+      msg = indentation + msg.replace(/\n/g, `\n${indentation}`);
     }
-    return msg + '\n';
+
+    return config.formatError ? config.formatError(msg) : `${msg}\n`;
   };
-};
+}
 
 
-var InternalAngularReporter = function(config, emitter) {
-  var formatter = createErrorFormatter(config.basePath, emitter, SourceMapConsumer);
-  DotsReporter.call(this, formatter, false, config.colors);
-};
-
 InternalAngularReporter.$inject = ['config', 'emitter'];
+function InternalAngularReporter(config, emitter) {
+  var formatter = createErrorFormatter(config, emitter, SourceMapConsumer);
+  DotsColorReporter.call(this, formatter, false, config.colors, config.browserConsoleLogOptions);
+}
+
 
 module.exports = {
-  'reporter:internal-angular': ['type', InternalAngularReporter]
+  'reporter:internal-angular': ['type', InternalAngularReporter],
 };
diff --git a/tools/tsc-watch/index.ts b/tools/tsc-watch/index.ts
index cd3065ec1e..0400b3ce45 100644
--- a/tools/tsc-watch/index.ts
+++ b/tools/tsc-watch/index.ts
@@ -7,10 +7,9 @@
  */
 
 /* tslint:disable:no-console  */
-import {spawn} from 'child_process';
-import {existsSync, mkdirSync, writeFileSync} from 'fs';
+import {existsSync, mkdirSync} from 'fs';
 
-import {TSC, TscWatch, reportError} from './tsc_watch';
+import {TscWatch} from './tsc_watch';
 
 export * from './tsc_watch';
 import 'reflect-metadata';
diff --git a/tools/tsc-watch/tsc_watch.ts b/tools/tsc-watch/tsc_watch.ts
index 5143b6bd93..49367b3f55 100644
--- a/tools/tsc-watch/tsc_watch.ts
+++ b/tools/tsc-watch/tsc_watch.ts
@@ -10,7 +10,6 @@
 import {spawn} from 'child_process';
 import {platform} from 'os';
 import {normalize} from 'path';
-import {resolve} from 'url';
 
 enum State {
   idle,

From ddb792da281f8a3d893cac5bec28cd1ebf01d228 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 9 Jul 2018 17:44:55 +0300
Subject: [PATCH 435/582] build: remove unnecessary `internal-angular` karma
 reporter (#24803)

The reporter was added in 87d56acda, with the purpose of fixing
source-map paths (which was apparently needed back then). Things have
moved around a lot since then and the custom reporter doesn't seem to be
necessary any more. By removing the reporter, we have one less thing to
worry about while upgrading karma; plus we get improvements in built-in
reporters for free.

Output with the custom reporter:
```
at someMethod (packages/core/.../some-file.ts:13:37)
```

Output with the built-in reporter:
```
at someMethod (packages/core/.../some-file.ts:13.37 <- dist/all/@angular/core/.../some-file.js:1:337)
```

PR Close #24803
---
 karma-js.conf.js             |  4 +-
 scripts/ci/test-saucelabs.sh |  2 +-
 tools/karma/reporter.js      | 95 ------------------------------------
 3 files changed, 2 insertions(+), 99 deletions(-)
 delete mode 100644 tools/karma/reporter.js

diff --git a/karma-js.conf.js b/karma-js.conf.js
index a8ab18df3d..96f5642e8b 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -8,7 +8,6 @@
 
 const browserProvidersConf = require('./browser-providers.conf');
 const {generateSeed} = require('./tools/jasmine-seed-generator');
-const internalAngularReporter = require('./tools/karma/reporter');
 
 // Karma configuration
 // Generated on Thu Sep 25 2014 11:52:02 GMT-0700 (PDT)
@@ -96,7 +95,6 @@ module.exports = function(config) {
       'karma-sauce-launcher',
       'karma-chrome-launcher',
       'karma-sourcemap-loader',
-      internalAngularReporter,
     ],
 
     preprocessors: {
@@ -113,7 +111,7 @@ module.exports = function(config) {
       '/base/angular/': '/base/',
     },
 
-    reporters: ['internal-angular'],
+    reporters: ['dots'],
     sauceLabs: {
       testName: 'Angular2',
       retryLimit: 3,
diff --git a/scripts/ci/test-saucelabs.sh b/scripts/ci/test-saucelabs.sh
index f3e1b8bd41..e141d251e8 100755
--- a/scripts/ci/test-saucelabs.sh
+++ b/scripts/ci/test-saucelabs.sh
@@ -10,5 +10,5 @@ source ${thisDir}/_travis-fold.sh
 travisFoldStart "test.unit.saucelabs"
   ./scripts/sauce/sauce_connect_block.sh
   SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
-  $(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS} --reporters internal-angular,saucelabs
+  $(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS} --reporters dots,saucelabs
 travisFoldEnd "test.unit.saucelabs"
diff --git a/tools/karma/reporter.js b/tools/karma/reporter.js
deleted file mode 100644
index ca0693509a..0000000000
--- a/tools/karma/reporter.js
+++ /dev/null
@@ -1,95 +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
- */
-
-'use strict';
-
-const DotsColorReporter = require('karma/lib/reporters/dots_color');
-const {SourceMapConsumer} = require('source-map');
-const {resolve} = require('url');
-
-// Based on `karma/lib/reporter.js` (v2.0.4):
-// https://github.com/karma-runner/karma/blob/v2.0.4/lib/reporter.js
-function createErrorFormatter(config, emitter, SourceMapConsumer) {
-  const basePath = config.basePath;
-  const urlRoot = (config.urlRoot === '/') ? '' : (config.urlRoot || '');
-  const urlRegexp = new RegExp(
-      '(?:https?:\\/\\/' + config.hostname + '(?:\\:' + config.port + ')?' +
-          ')?\\/?' + urlRoot + '\\/?' +
-          '(base/|absolute)' +  // prefix, including slash for base/ to create relative paths.
-          '((?:[A-z]\\:)?[^\\?\\s\\:]*)' +  // path
-          '(\\?\\w*)?' +                    // sha
-          '(\\:(\\d+))?' +                  // line
-          '(\\:(\\d+))?' +                  // column
-          '',
-      'g');
-  const sourceMapConsumerCache = new WeakMap();
-  let lastServedFiles = [];
-
-  // Helpers
-  const findFile = path => lastServedFiles.find(f => f.path === path);
-  const formatPathMapping = (path, line, column) =>
-      path + (line ? `:${line}` : '') + (column ? `:${column}` : '');
-  const isString = input => typeof input === 'string';
-  const getSourceMapConsumer = sourceMap => {
-    if (!sourceMapConsumerCache.has(sourceMap)) {
-      sourceMapConsumerCache.set(sourceMap, new SourceMapConsumer(sourceMap));
-    }
-    return sourceMapConsumerCache.get(sourceMap);
-  };
-
-  emitter.on('file_list_modified', files => lastServedFiles = files.served);
-
-  return (input, indentation) => {
-    if (!isString(indentation)) indentation = '';
-    if (!input) input = '';
-    if (isString(input.message)) input = input.message;
-    if (!isString(input)) input = JSON.stringify(input, null, indentation);
-
-    let msg = input.replace(urlRegexp, (_, prefix, path, __, ___, line, ____, column) => {
-      const normalizedPath = (prefix === 'base/') ? `${basePath}/${path}` : path;
-      const file = findFile(normalizedPath);
-
-      if (file && file.sourceMap && line) {
-        line = +line;
-        column = +column || 0;
-        const bias =
-            column ? SourceMapConsumer.GREATEST_LOWER_BOUND : SourceMapConsumer.LEAST_UPPER_BOUND;
-
-        try {
-          const original =
-              getSourceMapConsumer(file.sourceMap).originalPositionFor({line, column, bias});
-          return formatPathMapping(
-              `${resolve(path, original.source)}`, original.line, original.column);
-        } catch (e) {
-          console.warn(`SourceMap position not found for trace: ${input}`);
-        }
-      }
-
-      return formatPathMapping(path, line, column) || prefix;
-    });
-
-    // Indent every line.
-    if (indentation) {
-      msg = indentation + msg.replace(/\n/g, `\n${indentation}`);
-    }
-
-    return config.formatError ? config.formatError(msg) : `${msg}\n`;
-  };
-}
-
-
-InternalAngularReporter.$inject = ['config', 'emitter'];
-function InternalAngularReporter(config, emitter) {
-  var formatter = createErrorFormatter(config, emitter, SourceMapConsumer);
-  DotsColorReporter.call(this, formatter, false, config.colors, config.browserConsoleLogOptions);
-}
-
-
-module.exports = {
-  'reporter:internal-angular': ['type', InternalAngularReporter],
-};

From 1089261717ed44bf9ce72b05986084bfb00fc2e8 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Tue, 10 Jul 2018 08:17:45 -0700
Subject: [PATCH 436/582] fix(core): mark NgModule as not the root if APP_ROOT
 is set to false (#24814)

Tree shakable providers use the APP_ROOT token to determine where to attach themselves. APP_ROOT gets set on NgModule with BrowserModule irrespective of whether it is actually the root(Ex. in case of SSR app where the shell app is first bootstrapped without BrowserModule being the root module).

This change allows a NgModule with BrowserModule to explicitly mark itself as not the root by setting APP_ROOT token to false. This allows tree shakable providers to be attached to the right rott module.

PR Close #24814
---
 packages/core/src/view/ng_module.ts       |  2 +-
 packages/core/test/view/ng_module_spec.ts | 26 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts
index 15496ce80f..bd660bf817 100644
--- a/packages/core/src/view/ng_module.ts
+++ b/packages/core/src/view/ng_module.ts
@@ -43,7 +43,7 @@ export function moduleDef(providers: NgModuleProviderDef[]): NgModuleDefinition
   let isRoot: boolean = false;
   for (let i = 0; i < providers.length; i++) {
     const provider = providers[i];
-    if (provider.token === APP_ROOT) {
+    if (provider.token === APP_ROOT && provider.value === true) {
       isRoot = true;
     }
     if (provider.flags & NodeFlags.TypeNgModule) {
diff --git a/packages/core/test/view/ng_module_spec.ts b/packages/core/test/view/ng_module_spec.ts
index 3d569c844b..34ce8fbeb9 100644
--- a/packages/core/test/view/ng_module_spec.ts
+++ b/packages/core/test/view/ng_module_spec.ts
@@ -14,6 +14,7 @@ import {NgModuleDefinition, NgModuleProviderDef, NodeFlags} from '@angular/core/
 import {moduleDef, moduleProvideDef, resolveNgModuleDep} from '@angular/core/src/view/ng_module';
 import {createNgModuleRef} from '@angular/core/src/view/refs';
 import {tokenKey} from '@angular/core/src/view/util';
+import {APP_ROOT} from '../../src/di/scope';
 
 class Foo {}
 
@@ -229,4 +230,29 @@ describe('NgModuleRef_ injector', () => {
     ref.destroy();
     expect(Service.destroyed).toBe(1);
   });
+
+  describe('moduleDef', () => {
+    function createProvider(token: any, value: any) {
+      return {
+        index: 0,
+        flags: NodeFlags.TypeValueProvider | NodeFlags.LazyProvider,
+        deps: [], token, value
+      };
+    }
+
+    it('sets isRoot to `true` when APP_ROOT is `true`', () => {
+      const def = moduleDef([createProvider(APP_ROOT, true)]);
+      expect(def.isRoot).toBe(true);
+    });
+
+    it('sets isRoot to `false` when APP_ROOT is absent', () => {
+      const def = moduleDef([]);
+      expect(def.isRoot).toBe(false);
+    });
+
+    it('sets isRoot to `false` when APP_ROOT is `false`', () => {
+      const def = moduleDef([createProvider(APP_ROOT, false)]);
+      expect(def.isRoot).toBe(false);
+    });
+  });
 });

From 197387d05e334199f643966401fd30428b6bd5bb Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Tue, 10 Jul 2018 08:26:48 -0700
Subject: [PATCH 437/582] fix(platform-browser): mark Meta and Title services
 as tree shakable providers (#24815)

This lets services that use Meta and Title services to be tree shakable and provided in root.

PR Close #24815
---
 packages/platform-browser/src/browser.ts       | 2 --
 packages/platform-browser/src/browser/meta.ts  | 2 +-
 packages/platform-browser/src/browser/title.ts | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index 8a73d64fa9..8123f422ee 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -89,8 +89,6 @@ export const BROWSER_MODULE_PROVIDERS: StaticProvider[] = [
   {provide: Testability, useClass: Testability, deps: [NgZone]},
   {provide: EventManager, useClass: EventManager, deps: [EVENT_MANAGER_PLUGINS, NgZone]},
   ELEMENT_PROBE_PROVIDERS,
-  {provide: Meta, useClass: Meta, deps: [DOCUMENT]},
-  {provide: Title, useClass: Title, deps: [DOCUMENT]},
 ];
 
 /**
diff --git a/packages/platform-browser/src/browser/meta.ts b/packages/platform-browser/src/browser/meta.ts
index 17edf2925d..bf29316e60 100644
--- a/packages/platform-browser/src/browser/meta.ts
+++ b/packages/platform-browser/src/browser/meta.ts
@@ -34,7 +34,7 @@ export type MetaDefinition = {
  *
  * @experimental
  */
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class Meta {
   private _dom: DomAdapter;
   constructor(@Inject(DOCUMENT) private _doc: any) { this._dom = getDOM(); }
diff --git a/packages/platform-browser/src/browser/title.ts b/packages/platform-browser/src/browser/title.ts
index 2ca7ba5302..04d3728555 100644
--- a/packages/platform-browser/src/browser/title.ts
+++ b/packages/platform-browser/src/browser/title.ts
@@ -22,7 +22,7 @@ import {DOCUMENT} from '../dom/dom_tokens';
  *
  * @experimental
  */
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class Title {
   constructor(@Inject(DOCUMENT) private _doc: any) {}
   /**

From e3709f5d48fdee424c73d2534dbec3a117caeebc Mon Sep 17 00:00:00 2001
From: Daniel Sogl <daniel@sogls.de>
Date: Tue, 13 Mar 2018 16:05:15 +0100
Subject: [PATCH 438/582] docs(aio): unified console.log single string style
 (#22737) PR Close #22737

---
 aio/content/examples/toh-pt6/src/app/hero.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/toh-pt6/src/app/hero.service.ts b/aio/content/examples/toh-pt6/src/app/hero.service.ts
index c98030c9d2..6fd1607217 100644
--- a/aio/content/examples/toh-pt6/src/app/hero.service.ts
+++ b/aio/content/examples/toh-pt6/src/app/hero.service.ts
@@ -40,7 +40,7 @@ export class HeroService {
   // #enddocregion getHeroes-1
       .pipe(
         // #enddocregion getHeroes-2
-        tap(heroes => this.log(`fetched heroes`)),
+        tap(heroes => this.log('fetched heroes')),
         // #docregion getHeroes-2
         catchError(this.handleError('getHeroes', []))
       );

From a167bca927edbf49a4eadfa243905fa7c288561f Mon Sep 17 00:00:00 2001
From: Daniel Sogl <daniel@sogls.de>
Date: Tue, 13 Mar 2018 16:06:03 +0100
Subject: [PATCH 439/582] docs: unified console.log single string style
 (#22737)

PR Close #22737
---
 aio/content/examples/universal/src/app/hero.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/universal/src/app/hero.service.ts b/aio/content/examples/universal/src/app/hero.service.ts
index 18f9b72d2d..5519f1c105 100644
--- a/aio/content/examples/universal/src/app/hero.service.ts
+++ b/aio/content/examples/universal/src/app/hero.service.ts
@@ -30,7 +30,7 @@ export class HeroService {
   getHeroes (): Observable<Hero[]> {
     return this.http.get<Hero[]>(this.heroesUrl)
       .pipe(
-        tap(heroes => this.log(`fetched heroes`)),
+        tap(heroes => this.log('fetched heroes')),
         catchError(this.handleError('getHeroes', []))
       );
   }

From 0d5f2d3c7e39c4e0b6d1fcf1d9b7eb5ac48cda2f Mon Sep 17 00:00:00 2001
From: Jeff Burn <jeffora@gmail.com>
Date: Sat, 7 Jul 2018 10:02:08 +1000
Subject: [PATCH 440/582] fix(compiler-cli): Use typescript to resolve modules
 for metadata (#22856)

The current module resolution simply attaches .ts to the import/export path, which does
not work if the path is using Node / CommonJS behavior to resolve to an index.ts file.
This patch uses typescript's module resolution logic, and will attempt to load the original
typescript file if this resolution returns a .js or .d.ts file

PR Close #22856
---
 .../src/metadata/bundle_index_host.ts         |   2 +-
 packages/compiler-cli/src/metadata/bundler.ts |  28 ++-
 .../compiler-cli/test/metadata/BUILD.bazel    |   1 +
 .../test/metadata/bundler_spec.ts             | 234 ++++++++++++++++--
 packages/compiler-cli/test/mocks.ts           |   4 +-
 5 files changed, 245 insertions(+), 24 deletions(-)

diff --git a/packages/compiler-cli/src/metadata/bundle_index_host.ts b/packages/compiler-cli/src/metadata/bundle_index_host.ts
index e98a821e6c..17c5bda206 100644
--- a/packages/compiler-cli/src/metadata/bundle_index_host.ts
+++ b/packages/compiler-cli/src/metadata/bundle_index_host.ts
@@ -103,7 +103,7 @@ export function createBundleIndexHost<H extends ts.CompilerHost>(
   // etc.
   const getMetadataBundle = (cache: MetadataCache | null) => {
     const bundler = new MetadataBundler(
-        indexModule, ngOptions.flatModuleId, new CompilerHostAdapter(host, cache),
+        indexModule, ngOptions.flatModuleId, new CompilerHostAdapter(host, cache, ngOptions),
         ngOptions.flatModulePrivateSymbolPrefix);
     return bundler.getMetadataBundle();
   };
diff --git a/packages/compiler-cli/src/metadata/bundler.ts b/packages/compiler-cli/src/metadata/bundler.ts
index e039167120..d071bc7768 100644
--- a/packages/compiler-cli/src/metadata/bundler.ts
+++ b/packages/compiler-cli/src/metadata/bundler.ts
@@ -72,7 +72,7 @@ export interface BundledModule {
 }
 
 export interface MetadataBundlerHost {
-  getMetadataFor(moduleName: string): ModuleMetadata|undefined;
+  getMetadataFor(moduleName: string, containingFile: string): ModuleMetadata|undefined;
 }
 
 type StaticsMetadata = {
@@ -136,7 +136,7 @@ export class MetadataBundler {
     if (!result) {
       if (moduleName.startsWith('.')) {
         const fullModuleName = resolveModule(moduleName, this.root);
-        result = this.host.getMetadataFor(fullModuleName);
+        result = this.host.getMetadataFor(fullModuleName, this.root);
       }
       this.metadataCache.set(moduleName, result);
     }
@@ -598,11 +598,27 @@ export class MetadataBundler {
 export class CompilerHostAdapter implements MetadataBundlerHost {
   private collector = new MetadataCollector();
 
-  constructor(private host: ts.CompilerHost, private cache: MetadataCache|null) {}
+  constructor(
+      private host: ts.CompilerHost, private cache: MetadataCache|null,
+      private options: ts.CompilerOptions) {}
+
+  getMetadataFor(fileName: string, containingFile: string): ModuleMetadata|undefined {
+    const {resolvedModule} =
+        ts.resolveModuleName(fileName, containingFile, this.options, this.host);
+
+    let sourceFile: ts.SourceFile|undefined;
+    if (resolvedModule) {
+      let {resolvedFileName} = resolvedModule;
+      if (resolvedModule.extension !== '.ts') {
+        resolvedFileName = resolvedFileName.replace(/(\.d\.ts|\.js)$/, '.ts');
+      }
+      sourceFile = this.host.getSourceFile(resolvedFileName, ts.ScriptTarget.Latest);
+    } else {
+      // If typescript is unable to resolve the file, fallback on old behavior
+      if (!this.host.fileExists(fileName + '.ts')) return undefined;
+      sourceFile = this.host.getSourceFile(fileName + '.ts', ts.ScriptTarget.Latest);
+    }
 
-  getMetadataFor(fileName: string): ModuleMetadata|undefined {
-    if (!this.host.fileExists(fileName + '.ts')) return undefined;
-    const sourceFile = this.host.getSourceFile(fileName + '.ts', ts.ScriptTarget.Latest);
     // If there is a metadata cache, use it to get the metadata for this source file. Otherwise,
     // fall back on the locally created MetadataCollector.
     if (!sourceFile) {
diff --git a/packages/compiler-cli/test/metadata/BUILD.bazel b/packages/compiler-cli/test/metadata/BUILD.bazel
index e118490d37..a54dd2c69d 100644
--- a/packages/compiler-cli/test/metadata/BUILD.bazel
+++ b/packages/compiler-cli/test/metadata/BUILD.bazel
@@ -9,6 +9,7 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli",
+        "//packages/compiler-cli/test:test_utils",
         "//packages/core",
     ],
 )
diff --git a/packages/compiler-cli/test/metadata/bundler_spec.ts b/packages/compiler-cli/test/metadata/bundler_spec.ts
index 629cdbb2d9..bf51f83706 100644
--- a/packages/compiler-cli/test/metadata/bundler_spec.ts
+++ b/packages/compiler-cli/test/metadata/bundler_spec.ts
@@ -9,11 +9,187 @@
 import * as path from 'path';
 import * as ts from 'typescript';
 
-import {MetadataBundler, MetadataBundlerHost} from '../../src/metadata/bundler';
+import {CompilerHostAdapter, MetadataBundler, MetadataBundlerHost} from '../../src/metadata/bundler';
 import {MetadataCollector} from '../../src/metadata/collector';
 import {ClassMetadata, MetadataGlobalReferenceExpression, ModuleMetadata} from '../../src/metadata/schema';
+import {Directory, MockAotContext, MockCompilerHost} from '../mocks';
 
-import {Directory, open} from './typescript.mocks';
+describe('compiler host adapter', () => {
+
+  it('should retrieve metadata for an explicit index relative path reference', () => {
+    const context = new MockAotContext('.', SIMPLE_LIBRARY);
+    const host = new MockCompilerHost(context);
+    const options: ts.CompilerOptions = {
+      moduleResolution: ts.ModuleResolutionKind.NodeJs,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES5,
+    };
+    const adapter = new CompilerHostAdapter(host, null, options);
+    const metadata = adapter.getMetadataFor('./lib/src/two/index', '.');
+
+    expect(metadata).toBeDefined();
+    expect(Object.keys(metadata !.metadata).sort()).toEqual([
+      'PrivateTwo',
+      'TWO_CLASSES',
+      'Two',
+      'TwoMore',
+    ]);
+  });
+
+  it('should retrieve metadata for an implied index relative path reference', () => {
+    const context = new MockAotContext('.', SIMPLE_LIBRARY_WITH_IMPLIED_INDEX);
+    const host = new MockCompilerHost(context);
+    const options: ts.CompilerOptions = {
+      moduleResolution: ts.ModuleResolutionKind.NodeJs,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES5,
+    };
+    const adapter = new CompilerHostAdapter(host, null, options);
+    const metadata = adapter.getMetadataFor('./lib/src/two', '.');
+
+    expect(metadata).toBeDefined();
+    expect(Object.keys(metadata !.metadata).sort()).toEqual([
+      'PrivateTwo',
+      'TWO_CLASSES',
+      'Two',
+      'TwoMore',
+    ]);
+  });
+
+  it('should fail to retrieve metadata for an implied index with classic module resolution', () => {
+    const context = new MockAotContext('.', SIMPLE_LIBRARY_WITH_IMPLIED_INDEX);
+    const host = new MockCompilerHost(context);
+    const options: ts.CompilerOptions = {
+      moduleResolution: ts.ModuleResolutionKind.Classic,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES5,
+    };
+    const adapter = new CompilerHostAdapter(host, null, options);
+    const metadata = adapter.getMetadataFor('./lib/src/two', '.');
+
+    expect(metadata).toBeUndefined();
+  });
+
+  it('should retrieve exports for an explicit index relative path reference', () => {
+    const context = new MockAotContext('.', SIMPLE_LIBRARY);
+    const host = new MockCompilerHost(context);
+    const options: ts.CompilerOptions = {
+      moduleResolution: ts.ModuleResolutionKind.NodeJs,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES5,
+    };
+    const adapter = new CompilerHostAdapter(host, null, options);
+    const metadata = adapter.getMetadataFor('./lib/src/index', '.');
+
+    expect(metadata).toBeDefined();
+    expect(metadata !.exports !.map(e => e.export !)
+               .reduce((prev, next) => prev.concat(next), [])
+               .sort())
+        .toEqual([
+          'ONE_CLASSES',
+          'One',
+          'OneMore',
+          'TWO_CLASSES',
+          'Two',
+          'TwoMore',
+        ]);
+  });
+
+  it('should look for .ts file when resolving metadata via a package.json "main" entry', () => {
+    const files = {
+      'lib': {
+        'one.ts': `
+          class One {}
+          class OneMore extends One {}
+          class PrivateOne {}
+          const ONE_CLASSES = [One, OneMore, PrivateOne];
+          export {One, OneMore, PrivateOne, ONE_CLASSES};
+        `,
+        'one.js': `
+          // This will throw an error if the metadata collector tries to load one.js
+        `,
+        'package.json': `
+        {
+          "main": "one"
+        }
+        `
+      }
+    };
+
+    const context = new MockAotContext('.', files);
+    const host = new MockCompilerHost(context);
+    const options: ts.CompilerOptions = {
+      moduleResolution: ts.ModuleResolutionKind.NodeJs,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES5,
+    };
+    const adapter = new CompilerHostAdapter(host, null, options);
+    const metadata = adapter.getMetadataFor('./lib', '.');
+
+    expect(metadata).toBeDefined();
+    expect(Object.keys(metadata !.metadata).sort()).toEqual([
+      'ONE_CLASSES',
+      'One',
+      'OneMore',
+      'PrivateOne',
+    ]);
+    expect(Array.isArray(metadata !.metadata !['ONE_CLASSES'])).toBeTruthy();
+  });
+
+  it('should look for non-declaration file when resolving metadata via a package.json "types" entry',
+     () => {
+       const files = {
+         'lib': {
+           'one.ts': `
+          class One {}
+          class OneMore extends One {}
+          class PrivateOne {}
+          const ONE_CLASSES = [One, OneMore, PrivateOne];
+          export {One, OneMore, PrivateOne, ONE_CLASSES};
+        `,
+           'one.d.ts': `
+          declare class One {
+          }
+          declare class OneMore extends One {
+          }
+          declare class PrivateOne {
+          }
+          declare const ONE_CLASSES: (typeof One)[];
+          export { One, OneMore, PrivateOne, ONE_CLASSES };
+        `,
+           'one.js': `
+          // This will throw an error if the metadata collector tries to load one.js
+        `,
+           'package.json': `
+        {
+          "main": "one",
+          "types": "one.d.ts"
+        }
+        `
+         }
+       };
+
+       const context = new MockAotContext('.', files);
+       const host = new MockCompilerHost(context);
+       const options: ts.CompilerOptions = {
+         moduleResolution: ts.ModuleResolutionKind.NodeJs,
+         module: ts.ModuleKind.CommonJS,
+         target: ts.ScriptTarget.ES5,
+       };
+       const adapter = new CompilerHostAdapter(host, null, options);
+       const metadata = adapter.getMetadataFor('./lib', '.');
+
+       expect(metadata).toBeDefined();
+       expect(Object.keys(metadata !.metadata).sort()).toEqual([
+         'ONE_CLASSES',
+         'One',
+         'OneMore',
+         'PrivateOne',
+       ]);
+       expect(Array.isArray(metadata !.metadata !['ONE_CLASSES'])).toBeTruthy();
+
+     });
+});
 
 describe('metadata bundler', () => {
 
@@ -231,26 +407,24 @@ describe('metadata bundler', () => {
 
 export class MockStringBundlerHost implements MetadataBundlerHost {
   collector = new MetadataCollector();
+  adapter: CompilerHostAdapter;
 
-  constructor(private dirName: string, private directory: Directory) {}
+  constructor(private dirName: string, directory: Directory) {
+    const context = new MockAotContext(dirName, directory);
+    const host = new MockCompilerHost(context);
+    const options = {
+      moduleResolution: ts.ModuleResolutionKind.NodeJs,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES5,
+    };
+    this.adapter = new CompilerHostAdapter(host, null, options);
+  }
 
   getMetadataFor(moduleName: string): ModuleMetadata|undefined {
-    const fileName = path.join(this.dirName, moduleName) + '.ts';
-    const text = open(this.directory, fileName);
-    if (typeof text == 'string') {
-      const sourceFile = ts.createSourceFile(
-          fileName, text, ts.ScriptTarget.Latest, /* setParent */ true, ts.ScriptKind.TS);
-      const diagnostics: ts.Diagnostic[] = (sourceFile as any).parseDiagnostics;
-      if (diagnostics && diagnostics.length) {
-        throw Error('Unexpected syntax error in test');
-      }
-      const result = this.collector.getMetadata(sourceFile);
-      return result;
-    }
+    return this.adapter.getMetadataFor(moduleName, this.dirName);
   }
 }
 
-
 export const SIMPLE_LIBRARY = {
   'lib': {
     'index.ts': `
@@ -278,3 +452,31 @@ export const SIMPLE_LIBRARY = {
     }
   }
 };
+
+export const SIMPLE_LIBRARY_WITH_IMPLIED_INDEX = {
+  'lib': {
+    'index.ts': `
+      export * from './src';
+    `,
+    'src': {
+      'index.ts': `
+        export {One, OneMore, ONE_CLASSES} from './one';
+        export {Two, TwoMore, TWO_CLASSES} from './two';
+      `,
+      'one.ts': `
+        export class One {}
+        export class OneMore extends One {}
+        export class PrivateOne {}
+        export const ONE_CLASSES = [One, OneMore, PrivateOne];
+      `,
+      'two': {
+        'index.ts': `
+          export class Two {}
+          export class TwoMore extends Two {}
+          export class PrivateTwo {}
+          export const TWO_CLASSES = [Two, TwoMore, PrivateTwo];
+        `
+      }
+    }
+  }
+};
diff --git a/packages/compiler-cli/test/mocks.ts b/packages/compiler-cli/test/mocks.ts
index 9183b5181d..a1ac68edd5 100644
--- a/packages/compiler-cli/test/mocks.ts
+++ b/packages/compiler-cli/test/mocks.ts
@@ -19,7 +19,9 @@ export class MockAotContext {
 
   fileExists(fileName: string): boolean { return typeof this.getEntry(fileName) === 'string'; }
 
-  directoryExists(path: string): boolean { return typeof this.getEntry(path) === 'object'; }
+  directoryExists(path: string): boolean {
+    return path === this.currentDirectory || typeof this.getEntry(path) === 'object';
+  }
 
   readFile(fileName: string): string {
     const data = this.getEntry(fileName);

From e1146f3d066e653b9b40799cc436034e44af9160 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 13 Jun 2018 09:28:12 -0700
Subject: [PATCH 441/582] docs: clarify wording in architecture overview
 (#24481)

Closes #23463
Closes #22158

PR Close #24481
---
 aio/content/guide/architecture-components.md | 8 ++++----
 aio/content/guide/architecture-modules.md    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/aio/content/guide/architecture-components.md b/aio/content/guide/architecture-components.md
index 4e9d61ac47..54b053ecf8 100644
--- a/aio/content/guide/architecture-components.md
+++ b/aio/content/guide/architecture-components.md
@@ -8,9 +8,10 @@ A _component_ controls a patch of screen called a *view*. For example, individua
 * The list of heroes.
 * The hero editor.
 
-You define a component's application logic&mdash;what it does to support the view&mdash;inside a class. The class interacts with the view through an API of properties and methods.
+You define a component's application logic&mdash;what it does to support the view&mdash;inside a class.
+The class interacts with the view through an API of properties and methods.
 
-For example, the `HeroListComponent` has a `heroes` property that returns an array of heroes that it acquires from a service. `HeroListComponent` also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list.
+For example, the `HeroListComponent` has a `heroes` property that holds an array of heroes. It also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list. The component acquires the heroes from a service, which is a TypeScript [parameter property[(http://www.typescriptlang.org/docs/handbook/classes.html#parameter-properties) on the constructor. The service is provided to the component through the dependency injection system.
 
 <code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (class)" region="class"></code-example>
 
@@ -39,8 +40,7 @@ Angular inserts an instance of the `HeroListComponent` view between those tags.
 
 * `templateUrl`: The module-relative address of this component's HTML template. Alternatively, you can provide the HTML template inline, as the value of the `template` property. This template defines the component's _host view_.
 
-* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular that the component's constructor requires a `HeroService` instance
-in order to get the list of heroes to display.
+* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular how provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.
 
 <hr/>
 
diff --git a/aio/content/guide/architecture-modules.md b/aio/content/guide/architecture-modules.md
index 5e0af13e81..055baae754 100644
--- a/aio/content/guide/architecture-modules.md
+++ b/aio/content/guide/architecture-modules.md
@@ -88,7 +88,8 @@ For example, import Angular's `Component` decorator from the `@angular/core` lib
 
 <code-example path="architecture/src/app/app.component.ts" region="import" linenums="false"></code-example>
 
-You also import NgModules from Angular _libraries_ using JavaScript import statements:
+You also import NgModules from Angular _libraries_ using JavaScript import statements. 
+For example, the following code imports the `BrowserModule` NgModule from the `platform-browser` library:
 
 <code-example path="architecture/src/app/mini-app.ts" region="import-browser-module" linenums="false"></code-example>
 

From 49df4ef454696a6b458a51bebbb2ee608cc72733 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 25 Jun 2018 09:56:49 -0700
Subject: [PATCH 442/582] docs: add tree-shakable providers (#24481)

PR Close #24481
---
 aio/content/guide/architecture-components.md |  2 +-
 aio/content/guide/architecture-services.md   | 24 +++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/architecture-components.md b/aio/content/guide/architecture-components.md
index 54b053ecf8..b13a696671 100644
--- a/aio/content/guide/architecture-components.md
+++ b/aio/content/guide/architecture-components.md
@@ -40,7 +40,7 @@ Angular inserts an instance of the `HeroListComponent` view between those tags.
 
 * `templateUrl`: The module-relative address of this component's HTML template. Alternatively, you can provide the HTML template inline, as the value of the `template` property. This template defines the component's _host view_.
 
-* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular how provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.
+* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular how provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.  
 
 <hr/>
 
diff --git a/aio/content/guide/architecture-services.md b/aio/content/guide/architecture-services.md
index 7e73d7b399..80ca961167 100644
--- a/aio/content/guide/architecture-services.md
+++ b/aio/content/guide/architecture-services.md
@@ -60,11 +60,29 @@ The process of `HeroService` injection looks something like this:
 
 ### Providing services
 
-You must register at least one *provider* of any service you are going to use. You can register providers in modules or in components.
+You must register at least one *provider* of any service you are going to use. A service can register providers itself, making it available everywhere, or you can register providers with specific modules or components. You register providers in the metadata of the service (in the `@Injectable` decorator), or in the `@NgModule` or `@Component` metadata 
 
-* When you add providers to the [root module](guide/architecture-modules), the same instance of a service is available to all components in your app.
+* By default, the Angular CLI command `ng generate service` registers a provider with the root injector for your service by including provider metadata in the `@Injectable` decorator. The tutorial uses this method to register the provider of  HeroService class definition:
 
-<code-example path="architecture/src/app/app.module.ts" linenums="false" title="src/app/app.module.ts (module providers)" region="providers"></code-example>
+``` 
+@Injectable({
+  providedIn: 'root',
+})
+``` 
+
+ When you provide the service at the root level, Angular creates a single, shared instance of HeroService and injects into any class that asks for it. Registering the provider in the `@Injectable` metadata also allows Angular to optimize an app by removing the service if it turns out not to be used after all. 
+
+* When you register a provider with a [specific NgModule](guide/architecture-modules), the same instance of a service is available to all components in that NgModule. To register at this level, use the `providers` property of the `@NgModule` decorator:
+
+``` 
+@NgModule({
+  providers: [
+   BackendService,
+   Logger
+ ],
+ ...
+})
+``` 
 
 * When you register a provider at the component level, you get a new instance of the
 service with each new instance of that component. At the component level, register a service provider in the `providers` property of the `@Component` metadata:

From dc1f1295ee8dc1cab7e823183dd967f941ef6a7a Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 3 Jul 2018 10:03:48 -0700
Subject: [PATCH 443/582] fix(ivy): support projecting into dynamic views
 (#24752)

PR Close #24752
---
 packages/core/src/render3/instructions.ts  |  13 +-
 packages/core/test/render3/content_spec.ts | 165 +++++++++++++++++++++
 2 files changed, 171 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 185e651f32..3725b08f7b 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1963,12 +1963,9 @@ export function projectionDef(
     // execute selector matching logic if and only if:
     // - there are selectors defined
     // - a node has a tag name / attributes that can be matched
-    if (selectors) {
-      const matchedIdx = matchingSelectorIndex(componentChild.tNode, selectors, textSelectors !);
-      distributedNodes[matchedIdx].push(componentChild);
-    } else {
-      distributedNodes[0].push(componentChild);
-    }
+    const bucketIndex =
+        selectors ? matchingSelectorIndex(componentChild.tNode, selectors, textSelectors !) : 0;
+    distributedNodes[bucketIndex].push(componentChild);
 
     componentChild = getNextLNode(componentChild);
   }
@@ -2031,8 +2028,10 @@ export function projection(
 
   const currentParent = getParentLNode(node);
   const canInsert = canInsertNativeNode(currentParent, viewData);
+  let grandparent: LContainerNode;
   const renderParent = currentParent.tNode.type === TNodeType.View ?
-      (getParentLNode(currentParent) as LContainerNode).data[RENDER_PARENT] ! :
+      (grandparent = getParentLNode(currentParent) as LContainerNode) &&
+          grandparent.data[RENDER_PARENT] ! :
       currentParent as LElementNode;
 
   for (let i = 0; i < nodesForSelector.length; i++) {
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 8f16a1fa00..2944e11d85 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -706,6 +706,171 @@ describe('content projection', () => {
        expect(toHtml(parent)).toEqual('<child><div></div></child>');
      });
 
+  it('should project into dynamic views (with createEmbeddedView)', () => {
+    class NgIf {
+      constructor(public vcr: ViewContainerRef, public template: TemplateRef<any>) {}
+
+      @Input()
+      set ngIf(value: boolean) {
+        value ? this.vcr.createEmbeddedView(this.template) : this.vcr.clear();
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: NgIf,
+        selectors: [['', 'ngIf', '']],
+        inputs: {'ngIf': 'ngIf'},
+        factory: () => new NgIf(injectViewContainerRef(), injectTemplateRef())
+      });
+    }
+
+    /**
+     * Before-
+     * <ng-template [ngIf]="showing">
+     *     <ng-content></ng-content>
+     * </ng-template>
+     * -After
+     */
+    const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        text(1, 'Before-');
+        container(2, IfTemplate, '', [AttributeMarker.SelectOnly, 'ngIf']);
+        text(3, '-After');
+      }
+      if (rf & RenderFlags.Update) {
+        elementProperty(2, 'ngIf', bind(ctx.showing));
+      }
+
+      function IfTemplate(rf1: RenderFlags, ctx1: any) {
+        if (rf1 & RenderFlags.Create) {
+          projectionDef(0);
+          projection(1, 0);
+        }
+      }
+    }, [NgIf]);
+
+    let child: {showing: boolean};
+    /**
+     * <child>
+     *     <div>A</div>
+     *     Some text
+     * </child>
+     */
+    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        {
+          elementStart(1, 'div');
+          { text(2, 'A'); }
+          elementEnd();
+          text(3, 'Some text');
+        }
+        elementEnd();
+
+        // testing
+        child = loadDirective(0);
+      }
+    }, [Child]);
+
+    const fixture = new ComponentFixture(App);
+    child !.showing = true;
+    fixture.update();
+    expect(fixture.html).toEqual('<child>Before-<div>A</div>Some text-After</child>');
+
+    child !.showing = false;
+    fixture.update();
+    expect(fixture.html).toEqual('<child>Before--After</child>');
+
+    child !.showing = true;
+    fixture.update();
+    expect(fixture.html).toEqual('<child>Before-<div>A</div>Some text-After</child>');
+  });
+
+  it('should project into dynamic views (with insertion)', () => {
+    class NgIf {
+      constructor(public vcr: ViewContainerRef, public template: TemplateRef<any>) {}
+
+      @Input()
+      set ngIf(value: boolean) {
+        if (value) {
+          const viewRef = this.template.createEmbeddedView({});
+          this.vcr.insert(viewRef);
+        } else {
+          this.vcr.clear();
+        }
+      }
+
+      static ngDirectiveDef = defineDirective({
+        type: NgIf,
+        selectors: [['', 'ngIf', '']],
+        inputs: {'ngIf': 'ngIf'},
+        factory: () => new NgIf(injectViewContainerRef(), injectTemplateRef())
+      });
+    }
+
+    /**
+     * Before-
+     * <ng-template [ngIf]="showing">
+     *     <ng-content></ng-content>
+     * </ng-template>
+     * -After
+     */
+    const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef(0);
+        text(1, 'Before-');
+        container(2, IfTemplate, '', [AttributeMarker.SelectOnly, 'ngIf']);
+        text(3, '-After');
+      }
+      if (rf & RenderFlags.Update) {
+        elementProperty(2, 'ngIf', bind(ctx.showing));
+      }
+
+      function IfTemplate(rf1: RenderFlags, ctx1: any) {
+        if (rf1 & RenderFlags.Create) {
+          projectionDef(0);
+          projection(1, 0);
+        }
+      }
+    }, [NgIf]);
+
+    let child: {showing: boolean};
+    /**
+     * <child>
+     *     <div>A</div>
+     *     Some text
+     * </child>
+     */
+    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        {
+          elementStart(1, 'div');
+          { text(2, 'A'); }
+          elementEnd();
+          text(3, 'Some text');
+        }
+        elementEnd();
+
+        // testing
+        child = loadDirective(0);
+      }
+    }, [Child]);
+
+    const fixture = new ComponentFixture(App);
+    child !.showing = true;
+    fixture.update();
+    expect(fixture.html).toEqual('<child>Before-<div>A</div>Some text-After</child>');
+
+    child !.showing = false;
+    fixture.update();
+    expect(fixture.html).toEqual('<child>Before--After</child>');
+
+    child !.showing = true;
+    fixture.update();
+    expect(fixture.html).toEqual('<child>Before-<div>A</div>Some text-After</child>');
+  });
+
   it('should project nodes into the last ng-content', () => {
     /**
      * <div><ng-content></ng-content></div>

From 3a19f70d1c694408023000434718e79e820007a1 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 3 Jul 2018 20:04:36 -0700
Subject: [PATCH 444/582] refactor(ivy): replace pNextOrParent with TNode props
 (#24752)

PR Close #24752
---
 .../compiler/src/render3/view/template.ts     |   9 +-
 .../render3/r3_compiler_compliance_spec.ts    |  22 +-
 packages/core/src/render3/i18n.ts             |   7 +-
 packages/core/src/render3/instructions.ts     | 195 +++----
 packages/core/src/render3/interfaces/node.ts  |  72 ++-
 .../core/src/render3/interfaces/projection.ts |  10 +-
 .../core/src/render3/node_manipulation.ts     | 112 ++--
 .../bundling/todo/bundle.golden_symbols.json  |   9 +-
 .../content_projection_spec.ts                |  16 +-
 .../render3/compiler_canonical/query_spec.ts  |   6 +-
 packages/core/test/render3/content_spec.ts    | 516 +++++++++++-------
 packages/core/test/render3/di_spec.ts         |   4 +-
 packages/core/test/render3/i18n_spec.ts       |  28 +-
 .../core/test/render3/integration_spec.ts     |  12 +-
 packages/core/test/render3/lifecycle_spec.ts  |  46 +-
 .../render3/node_selector_matcher_spec.ts     |  21 +-
 .../test/render3/view_container_ref_spec.ts   |  28 +-
 17 files changed, 618 insertions(+), 495 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index c8a9d0925d..3704c2b7f2 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -62,7 +62,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private _bindingCode: o.Statement[] = [];
   private _postfixCode: o.Statement[] = [];
   private _temporary = temporaryAllocator(this._prefixCode, TEMPORARY_NAME);
-  private _projectionDefinitionIndex = -1;
   private _valueConverter: ValueConverter;
   private _unsupported = unsupported;
   private _bindingScope: BindingScope;
@@ -121,8 +120,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     // Output a `ProjectionDef` instruction when some `<ng-content>` are present
     if (hasNgContent) {
-      this._projectionDefinitionIndex = this.allocateDataSlot();
-      const parameters: o.Expression[] = [o.literal(this._projectionDefinitionIndex)];
+      const parameters: o.Expression[] = [];
 
       // Only selectors with a non-default value are generated
       if (ngContentSelectors.length > 1) {
@@ -217,10 +215,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   visitContent(ngContent: t.Content) {
     const slot = this.allocateDataSlot();
     const selectorIndex = ngContent.selectorIndex;
-    const parameters: o.Expression[] = [
-      o.literal(slot),
-      o.literal(this._projectionDefinitionIndex),
-    ];
+    const parameters: o.Expression[] = [o.literal(slot)];
 
     const attributeAsList: string[] = [];
 
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index df7d0fbca4..47a041a224 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -871,9 +871,9 @@ describe('compiler compliance', () => {
           factory: function SimpleComponent_Factory() { return new SimpleComponent(); },
           template: function SimpleComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵpD(0);
-              $r3$.ɵE(1, 'div');
-              $r3$.ɵP(2, 0);
+              $r3$.ɵpD();
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵP(1);
               $r3$.ɵe();
             }
           }
@@ -891,12 +891,12 @@ describe('compiler compliance', () => {
           factory: function ComplexComponent_Factory() { return new ComplexComponent(); },
           template: function ComplexComponent_Template(rf: IDENT, ctx: IDENT) {
             if (rf & 1) {
-              $r3$.ɵpD(0, $c1$, $c2$);
-              $r3$.ɵE(1, 'div', $c3$);
-              $r3$.ɵP(2, 0, 1);
+              $r3$.ɵpD($c1$, $c2$);
+              $r3$.ɵE(0, 'div', $c3$);
+              $r3$.ɵP(1, 1);
               $r3$.ɵe();
-              $r3$.ɵE(3, 'div', $c4$);
-              $r3$.ɵP(4, 0, 2);
+              $r3$.ɵE(2, 'div', $c4$);
+              $r3$.ɵP(3, 2);
               $r3$.ɵe();
             }
           }
@@ -1022,9 +1022,9 @@ describe('compiler compliance', () => {
             template: function ContentQueryComponent_Template(
                 rf: $RenderFlags$, ctx: $ContentQueryComponent$) {
               if (rf & 1) {
-                $r3$.ɵpD(0);
-                $r3$.ɵE(1, 'div');
-                $r3$.ɵP(2, 0);
+                $r3$.ɵpD();
+                $r3$.ɵE(0, 'div');
+                $r3$.ɵP(1);
                 $r3$.ɵe();
               }
             }
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 4262df274a..fdcbee7dff 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -9,7 +9,7 @@
 import {assertEqual, assertLessThan} from './assert';
 import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load, resetApplicationState} from './instructions';
 import {RENDER_PARENT} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, TContainerNode, TNodeType} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, TContainerNode, TElementNode, TNodeType} from './interfaces/node';
 import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
 import {appendChild, createTextNode, getParentLNode, removeChild} from './node_manipulation';
 import {stringify} from './util';
@@ -243,14 +243,17 @@ function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
   // On first pass, re-organize node tree to put this node in the correct position.
   const firstTemplatePass = node.view[TVIEW].firstTemplatePass;
   if (firstTemplatePass) {
-    node.tNode.next = null;
     if (previousNode === parentNode && node.tNode !== parentNode.tNode.child) {
       node.tNode.next = parentNode.tNode.child;
       parentNode.tNode.child = node.tNode;
     } else if (previousNode !== parentNode && node.tNode !== previousNode.tNode.next) {
       node.tNode.next = previousNode.tNode.next;
       previousNode.tNode.next = node.tNode;
+    } else {
+      node.tNode.next = null;
     }
+
+    if (parentNode.view === node.view) node.tNode.parent = parentNode.tNode as TElementNode;
   }
 
   // Template containers also have a comment node for the `ViewContainerRef` that should be moved
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 3725b08f7b..ff42452007 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -14,20 +14,20 @@ import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotE
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
 import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {ACTIVE_INDEX, LContainer, RENDER_PARENT, VIEWS} from './interfaces/container';
+import {ComponentDefInternal, ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
-import {CssSelectorList, LProjection, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
+import {AttributeMarker, InitialInputData, InitialInputs, LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, PropertyAliasValue, PropertyAliases, TAttributes, TContainerNode, TElementNode, TNode, TNodeFlags, TNodeType} from './interfaces/node';
+import {CssSelectorList, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
+import {ProceduralRenderer3, RComment, RElement, RText, Renderer3, RendererFactory3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 import {BINDING_INDEX, CLEANUP, CONTAINER_INDEX, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView} from './interfaces/view';
-
-import {AttributeMarker, TAttributes, LContainerNode, LElementNode, LNode, TNodeType, TNodeFlags, LProjectionNode, LTextNode, LViewNode, TNode, TContainerNode, InitialInputData, InitialInputs, PropertyAliases, PropertyAliasValue, TElementNode,} from './interfaces/node';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
-import {appendChild, insertView, appendProjectedNode, removeView, canInsertNativeNode, createTextNode, getNextLNode, getChildLNode, getParentLNode, getLViewChild} from './node_manipulation';
+import {appendChild, appendProjectedNode, canInsertNativeNode, createTextNode, findComponentHost, getChildLNode, getLViewChild, getNextLNode, getParentLNode, insertView, removeView} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {ComponentDefInternal, ComponentTemplate, ComponentQuery, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
-import {RComment, RElement, RText, Renderer3, RendererFactory3, ProceduralRenderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
+import {StylingContext, allocStylingContext, createStylingContextTemplate, renderStyles as renderElementStyles, updateStyleMap as updateElementStyleMap, updateStyleProp as updateElementStyleProp} from './styling';
 import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
-import {StylingContext, allocStylingContext, createStylingContextTemplate, updateStyleMap as updateElementStyleMap, updateStyleProp as updateElementStyleProp, renderStyles as renderElementStyles} from './styling';
+
 
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
@@ -335,7 +335,6 @@ export function createLNodeObject(
     data: state,
     queries: queries,
     tNode: null !,
-    pNextOrParent: null,
     dynamicLContainerNode: null
   };
 }
@@ -363,11 +362,11 @@ export function createLNode(
     attrs: TAttributes | null, lContainer: LContainer): LContainerNode;
 export function createLNode(
     index: number, type: TNodeType.Projection, native: null, name: null, attrs: TAttributes | null,
-    lProjection: LProjection): LProjectionNode;
+    lProjection: null): LProjectionNode;
 export function createLNode(
     index: number, type: TNodeType, native: RText | RElement | RComment | null, name: string | null,
-    attrs: TAttributes | null, state?: null | LViewData | LContainer | LProjection): LElementNode&
-    LTextNode&LViewNode&LContainerNode&LProjectionNode {
+    attrs: TAttributes | null, state?: null | LViewData | LContainer): LElementNode&LTextNode&
+    LViewNode&LContainerNode&LProjectionNode {
   const parent = isParent ? previousOrParentNode :
                             previousOrParentNode && getParentLNode(previousOrParentNode) !as LNode;
   // Parents cannot cross component boundaries because components will be used in multiple places,
@@ -1189,7 +1188,8 @@ export function createTNode(
     parent: parent,
     dynamicContainerNode: null,
     detached: null,
-    stylingTemplate: null
+    stylingTemplate: null,
+    projection: null
   };
 }
 
@@ -1948,138 +1948,109 @@ export function viewAttached(view: LViewData): boolean {
  * @param selectors A collection of parsed CSS selectors
  * @param rawSelectors A collection of CSS selectors in the raw, un-parsed form
  */
-export function projectionDef(
-    index: number, selectors?: CssSelectorList[], textSelectors?: string[]): void {
-  const noOfNodeBuckets = selectors ? selectors.length + 1 : 1;
-  const distributedNodes = new Array<LNode[]>(noOfNodeBuckets);
-  for (let i = 0; i < noOfNodeBuckets; i++) {
-    distributedNodes[i] = [];
-  }
-
+export function projectionDef(selectors?: CssSelectorList[], textSelectors?: string[]): void {
   const componentNode: LElementNode = findComponentHost(viewData);
-  let componentChild = getChildLNode(componentNode);
 
-  while (componentChild !== null) {
-    // execute selector matching logic if and only if:
-    // - there are selectors defined
-    // - a node has a tag name / attributes that can be matched
-    const bucketIndex =
-        selectors ? matchingSelectorIndex(componentChild.tNode, selectors, textSelectors !) : 0;
-    distributedNodes[bucketIndex].push(componentChild);
+  if (!componentNode.tNode.projection) {
+    const noOfNodeBuckets = selectors ? selectors.length + 1 : 1;
+    const pData: (TNode | null)[] = componentNode.tNode.projection =
+        new Array(noOfNodeBuckets).fill(null);
+    const tails: (TNode | null)[] = pData.slice();
 
-    componentChild = getNextLNode(componentChild);
+    let componentChild = componentNode.tNode.child;
+
+    while (componentChild !== null) {
+      const bucketIndex =
+          selectors ? matchingSelectorIndex(componentChild, selectors, textSelectors !) : 0;
+      const nextNode = componentChild.next;
+
+      if (tails[bucketIndex]) {
+        tails[bucketIndex] !.next = componentChild;
+      } else {
+        pData[bucketIndex] = componentChild;
+        componentChild.next = null;
+      }
+      tails[bucketIndex] = componentChild;
+
+      componentChild = nextNode;
+    }
   }
-
-  ngDevMode && assertDataNext(index + HEADER_OFFSET);
-  store(index, distributedNodes);
 }
 
 /**
- * Updates the linked list of a projection node, by appending another linked list.
+ * Stack used to keep track of projection nodes in projection() instruction.
  *
- * @param projectionNode Projection node whose projected nodes linked list has to be updated
- * @param appendedFirst First node of the linked list to append.
- * @param appendedLast Last node of the linked list to append.
+ * This is deliberately created outside of projection() to avoid allocating
+ * a new array each time the function is called. Instead the array will be
+ * re-used by each invocation. This works because the function is not reentrant.
  */
-function addToProjectionList(
-    projectionNode: LProjectionNode,
-    appendedFirst: LElementNode | LTextNode | LContainerNode | null,
-    appendedLast: LElementNode | LTextNode | LContainerNode | null) {
-  ngDevMode && assertEqual(
-                   !!appendedFirst, !!appendedLast,
-                   'appendedFirst can be null if and only if appendedLast is also null');
-  if (!appendedLast) {
-    // nothing to append
-    return;
-  }
-  const projectionNodeData = projectionNode.data;
-  if (projectionNodeData.tail) {
-    projectionNodeData.tail.pNextOrParent = appendedFirst;
-  } else {
-    projectionNodeData.head = appendedFirst;
-  }
-  projectionNodeData.tail = appendedLast;
-  appendedLast.pNextOrParent = projectionNode;
-}
+const projectionNodeStack: LProjectionNode[] = [];
 
 /**
  * Inserts previously re-distributed projected nodes. This instruction must be preceded by a call
  * to the projectionDef instruction.
  *
  * @param nodeIndex
- * @param localIndex - index under which distribution of projected nodes was memorized
  * @param selectorIndex:
  *        - 0 when the selector is `*` (or unspecified as this is the default value),
  *        - 1 based index of the selector from the {@link projectionDef}
  */
-export function projection(
-    nodeIndex: number, localIndex: number, selectorIndex: number = 0, attrs?: string[]): void {
-  const node = createLNode(
-      nodeIndex, TNodeType.Projection, null, null, attrs || null, {head: null, tail: null});
+export function projection(nodeIndex: number, selectorIndex: number = 0, attrs?: string[]): void {
+  const node = createLNode(nodeIndex, TNodeType.Projection, null, null, attrs || null, null);
+
+  // We can't use viewData[HOST_NODE] because projection nodes can be nested in embedded views.
+  if (node.tNode.projection === null) node.tNode.projection = selectorIndex;
 
   // `<ng-content>` has no content
   isParent = false;
 
-  // re-distribution of projectable nodes is memorized on a component's view level
-  const componentNode = findComponentHost(viewData);
-  const componentLView = componentNode.data as LViewData;
-  const distributedNodes = loadInternal(localIndex, componentLView) as Array<LNode[]>;
-  const nodesForSelector = distributedNodes[selectorIndex];
+  // re-distribution of projectable nodes is stored on a component's view level
+  const parent = getParentLNode(node);
 
-  const currentParent = getParentLNode(node);
-  const canInsert = canInsertNativeNode(currentParent, viewData);
-  let grandparent: LContainerNode;
-  const renderParent = currentParent.tNode.type === TNodeType.View ?
-      (grandparent = getParentLNode(currentParent) as LContainerNode) &&
-          grandparent.data[RENDER_PARENT] ! :
-      currentParent as LElementNode;
+  if (canInsertNativeNode(parent, viewData)) {
+    const componentNode = findComponentHost(viewData);
+    let nodeToProject = (componentNode.tNode.projection as(TNode | null)[])[selectorIndex];
+    let projectedView = componentNode.view;
+    let projectionNodeIndex = -1;
+    let grandparent: LContainerNode;
+    const renderParent = parent.tNode.type === TNodeType.View ?
+        (grandparent = getParentLNode(parent) as LContainerNode) &&
+            grandparent.data[RENDER_PARENT] ! :
+        parent as LElementNode;
 
-  for (let i = 0; i < nodesForSelector.length; i++) {
-    const nodeToProject = nodesForSelector[i];
-    let head = nodeToProject as LTextNode | LElementNode | LContainerNode | null;
-    let tail = nodeToProject as LTextNode | LElementNode | LContainerNode | null;
+    while (nodeToProject) {
+      if (nodeToProject.type === TNodeType.Projection) {
+        // This node is re-projected, so we must go up the tree to get its projected nodes.
+        const currentComponentHost = findComponentHost(projectedView);
+        const firstProjectedNode = (currentComponentHost.tNode.projection as(
+            TNode | null)[])[nodeToProject.projection as number];
 
-    if (nodeToProject.tNode.type === TNodeType.Projection) {
-      const previouslyProjected = (nodeToProject as LProjectionNode).data;
-      head = previouslyProjected.head;
-      tail = previouslyProjected.tail;
-    }
-
-    addToProjectionList(node, head, tail);
-
-    if (canInsert) {
-      let currentNode: LNode|null = head;
-      while (currentNode) {
+        if (firstProjectedNode) {
+          projectionNodeStack[++projectionNodeIndex] = projectedView[nodeToProject.index];
+          nodeToProject = firstProjectedNode;
+          projectedView = currentComponentHost.view;
+          continue;
+        }
+      } else {
+        const lNode = projectedView[nodeToProject.index];
+        lNode.tNode.flags |= TNodeFlags.isProjected;
         appendProjectedNode(
-            currentNode as LTextNode | LElementNode | LContainerNode, currentParent, viewData,
-            renderParent);
-        currentNode = currentNode === tail ? null : currentNode.pNextOrParent;
+            lNode as LTextNode | LElementNode | LContainerNode, parent, viewData, renderParent);
       }
+
+      // If we are finished with a list of re-projected nodes, we need to get
+      // back to the root projection node that was re-projected.
+      if (nodeToProject.next === null && projectedView !== componentNode.view) {
+        // move down into the view of the component we're projecting right now
+        const lNode = projectionNodeStack[projectionNodeIndex--];
+        nodeToProject = lNode.tNode;
+        projectedView = lNode.view;
+      }
+      nodeToProject = nodeToProject.next;
     }
   }
 }
 
-/**
- * Given a current view, finds the nearest component's host (LElement).
- *
- * @param lViewData LViewData for which we want a host element node
- * @returns The host node
- */
-function findComponentHost(lViewData: LViewData): LElementNode {
-  let viewRootLNode = lViewData[HOST_NODE];
-
-  while (viewRootLNode.tNode.type === TNodeType.View) {
-    ngDevMode && assertDefined(lViewData[PARENT], 'lViewData.parent');
-    lViewData = lViewData[PARENT] !;
-    viewRootLNode = lViewData[HOST_NODE];
-  }
-
-  ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
-  ngDevMode && assertDefined(viewRootLNode.data, 'node.data');
-
-  return viewRootLNode as LElementNode;
-}
-
 /**
  * Adds LViewData or LContainer to the end of the current view tree.
  *
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 29893c73d9..817c970d13 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -10,7 +10,6 @@ import {StylingContext} from '../styling';
 
 import {LContainer} from './container';
 import {LInjector} from './injector';
-import {LProjection} from './projection';
 import {LQueries} from './query';
 import {RComment, RElement, RText} from './renderer';
 import {LViewData, TView} from './view';
@@ -36,11 +35,14 @@ export const enum TNodeFlags {
   /** The number of directives on this node is encoded on the least significant bits */
   DirectiveCountMask = 0b00000000000000000000111111111111,
 
-  /** Then this bit is set when the node is a component */
-  isComponent = 0b1000000000000,
+  /** This bit is set if the node is a component */
+  isComponent = 0b00000000000000000001000000000000,
+
+  /** This bit is set if the node has been projected */
+  isProjected = 0b00000000000000000010000000000000,
 
   /** The index of the first directive on this node is encoded on the most significant bits  */
-  DirectiveStartingIndexShift = 13,
+  DirectiveStartingIndexShift = 14,
 }
 
 /**
@@ -74,7 +76,7 @@ export interface LNode {
    * If LContainerNode, then `data` contains LContainer.
    * If LProjectionNode, then `data` contains LProjection.
    */
-  readonly data: LViewData|LContainer|LProjection|null;
+  readonly data: LViewData|LContainer|null;
 
 
   /**
@@ -94,14 +96,6 @@ export interface LNode {
    */
   queries: LQueries|null;
 
-  /**
-   * If this node is projected, pointer to the next node in the same projection parent
-   * (which is a container, an element, or a text node), or to the parent projection node
-   * if this is the last node in the projection.
-   * If this node is not projected, this field is null.
-   */
-  pNextOrParent: LNode|null;
-
   /**
    * Pointer to the corresponding TNode object, which stores static
    * data about this node.
@@ -156,7 +150,7 @@ export interface LContainerNode extends LNode {
 
 export interface LProjectionNode extends LNode {
   readonly native: null;
-  readonly data: LProjection;
+  readonly data: null;
   dynamicLContainerNode: null;
 }
 
@@ -345,6 +339,43 @@ export interface TNode {
   detached: boolean|null;
 
   stylingTemplate: StylingContext|null;
+  /**
+   * List of projected TNodes for a given component host element OR index into the said nodes.
+   *
+   * For easier discussion assume this example:
+   * `<parent>`'s view definition:
+   * ```
+   * <child id="c1">content1</child>
+   * <child id="c2"><span>content2</span></child>
+   * ```
+   * `<child>`'s view definition:
+   * ```
+   * <ng-content id="cont1"></ng-content>
+   * ```
+   *
+   * If `Array.isArray(projection)` then `TNode` is a host element:
+   * - `projection` stores the content nodes which are to be projected.
+   *    - The nodes represent categories defined by the selector: For example:
+   *      `<ng-content/><ng-content select="abc"/>` would represent the heads for `<ng-content/>`
+   *      and `<ng-content select="abc"/>` respectively.
+   *    - The nodes we store in `projection` are heads only, we used `.next` to get their
+   *      siblings.
+   *    - The nodes `.next` is sorted/rewritten as part of the projection setup.
+   *    - `projection` size is equal to the number of projections `<ng-content>`. The size of
+   *      `c1` will be `1` because `<child>` has only one `<ng-content>`.
+   * - we store `projection` with the host (`c1`, `c2`) rather than the `<ng-content>` (`cont1`)
+   *   because the same component (`<child>`) can be used in multiple locations (`c1`, `c2`) and as
+   *   a result have different set of nodes to project.
+   * - without `projection` it would be difficult to efficiently traverse nodes to be projected.
+   *
+   * If `typeof projection == 'number'` then `TNode` is a `<ng-content>` element:
+   * - `projection` is an index of the host's `projection`Nodes.
+   *   - This would return the first head node to project:
+   *     `getHost(currentTNode).projection[currentTNode.projection]`.
+   * - When projecting nodes the parent node retrieved may be a `<ng-content>` node, in which case
+   *   the process is recursive in nature (not implementation).
+   */
+  projection: (TNode|null)[]|number|null;
 }
 
 /** Static data for an LElementNode  */
@@ -359,6 +390,13 @@ export interface TElementNode extends TNode {
    */
   parent: TElementNode|null;
   tViews: null;
+
+  /**
+   * If this is a component TNode with projection, this will be an array of projected
+   * TNodes (see TNode.projection for more info). If it's a regular element node or a
+   * component without projection, it will be null.
+   */
+  projection: (TNode|null)[]|null;
 }
 
 /** Static data for an LTextNode  */
@@ -373,6 +411,7 @@ export interface TTextNode extends TNode {
    */
   parent: TElementNode|null;
   tViews: null;
+  projection: null;
 }
 
 /** Static data for an LContainerNode */
@@ -394,6 +433,7 @@ export interface TContainerNode extends TNode {
    */
   parent: TElementNode|null;
   tViews: TView|TView[]|null;
+  projection: null;
 }
 
 /** Static data for an LViewNode  */
@@ -403,6 +443,7 @@ export interface TViewNode extends TNode {
   child: TElementNode|TTextNode|TContainerNode|TProjectionNode|null;
   parent: TContainerNode|null;
   tViews: null;
+  projection: null;
 }
 
 /** Static data for an LProjectionNode  */
@@ -416,6 +457,9 @@ export interface TProjectionNode extends TNode {
    */
   parent: TElementNode|null;
   tViews: null;
+
+  /** Index of the projection node. (See TNode.projection for more info.) */
+  projection: number;
 }
 
 /**
diff --git a/packages/core/src/render3/interfaces/projection.ts b/packages/core/src/render3/interfaces/projection.ts
index dce0453813..beffaa06db 100644
--- a/packages/core/src/render3/interfaces/projection.ts
+++ b/packages/core/src/render3/interfaces/projection.ts
@@ -1,3 +1,4 @@
+
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -6,15 +7,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LContainerNode, LElementNode, LTextNode} from './node';
-
-/**
- * Linked list of projected nodes (using the pNextOrParent property).
- */
-export interface LProjection {
-  head: LElementNode|LTextNode|LContainerNode|null;
-  tail: LElementNode|LTextNode|LContainerNode|null;
-}
 
 /**
  * Expresses a single CSS Selector.
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 95a4a35715..41c9f14cc5 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {assertDefined} from './assert';
 import {callHooks} from './hooks';
 import {LContainer, RENDER_PARENT, VIEWS, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
+import {LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, TNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {CLEANUP, CONTAINER_INDEX, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
@@ -24,7 +25,7 @@ export function getNextLNode(node: LNode): LNode|null {
     const viewData = node.data as LViewData;
     return viewData[NEXT] ? (viewData[NEXT] as LViewData)[HOST_NODE] : null;
   }
-  return node.tNode.next ? node.view[node.tNode.next !.index] : null;
+  return node.tNode.next ? node.view[node.tNode.next.index] : null;
 }
 
 /** Retrieves the first child of a given node */
@@ -52,27 +53,6 @@ export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNo
   return parent ? node.view[parent.index] : node.view[HOST_NODE];
 }
 
-/**
- * Get the next node in the LNode tree, taking into account the place where a node is
- * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
- *
- * @param node The node whose next node in the LNode tree must be found.
- * @return LNode|null The next sibling in the LNode tree.
- */
-function getNextLNodeWithProjection(node: LNode): LNode|null {
-  const pNextOrParent = node.pNextOrParent;
-
-  if (pNextOrParent) {
-    // The node is projected
-    const isLastProjectedNode = pNextOrParent.tNode.type === TNodeType.Projection;
-    // returns pNextOrParent if we are not at the end of the list, null otherwise
-    return isLastProjectedNode ? null : pNextOrParent;
-  }
-
-  // returns node.next because the the node is not projected
-  return getNextLNode(node);
-}
-
 const enum WalkLNodeTreeAction {
   /** node insert in the native environment */
   Insert = 0,
@@ -84,12 +64,22 @@ const enum WalkLNodeTreeAction {
   Destroy = 2,
 }
 
+
+/**
+ * Stack used to keep track of projection nodes in walkLNodeTree.
+ *
+ * This is deliberately created outside of walkLNodeTree to avoid allocating
+ * a new array each time the function is called. Instead the array will be
+ * re-used by each invocation. This works because the function is not reentrant.
+ */
+const projectionNodeStack: LProjectionNode[] = [];
+
 /**
  * Walks a tree of LNodes, applying a transformation on the LElement nodes, either only on the first
  * one found, or on all of them.
  *
  * @param startingNode the node from which the walk is started.
- * @param rootNode the root node considered.
+ * @param rootNode the root node considered. This prevents walking past that node.
  * @param action identifies the action to be performed on the LElement nodes.
  * @param renderer the current renderer.
  * @param renderParentNode Optional the render parent node to be set in all LContainerNodes found,
@@ -101,18 +91,19 @@ function walkLNodeTree(
     startingNode: LNode | null, rootNode: LNode, action: WalkLNodeTreeAction, renderer: Renderer3,
     renderParentNode?: LElementNode | null, beforeNode?: RNode | null) {
   let node: LNode|null = startingNode;
+  let projectionNodeIndex = -1;
   while (node) {
     let nextNode: LNode|null = null;
     const parent = renderParentNode ? renderParentNode.native : null;
-    if (node.tNode.type === TNodeType.Element) {
+    const nodeType = node.tNode.type;
+    if (nodeType === TNodeType.Element) {
       // Execute the action
       executeNodeAction(action, renderer, parent, node.native !, beforeNode);
       if (node.dynamicLContainerNode) {
         executeNodeAction(
             action, renderer, parent, node.dynamicLContainerNode.native !, beforeNode);
       }
-      nextNode = getNextLNode(node);
-    } else if (node.tNode.type === TNodeType.Container) {
+    } else if (nodeType === TNodeType.Container) {
       executeNodeAction(action, renderer, parent, node.native !, beforeNode);
       const lContainerNode: LContainerNode = (node as LContainerNode);
       const childContainerData: LContainer = lContainerNode.dynamicLContainerNode ?
@@ -130,15 +121,26 @@ function walkLNodeTree(
             lContainerNode.dynamicLContainerNode.native :
             lContainerNode.native;
       }
-    } else if (node.tNode.type === TNodeType.Projection) {
-      // For Projection look at the first projected node
-      nextNode = (node as LProjectionNode).data.head;
+    } else if (nodeType === TNodeType.Projection) {
+      const componentHost = findComponentHost(node.view);
+      const head =
+          (componentHost.tNode.projection as(TNode | null)[])[node.tNode.projection as number];
+
+      projectionNodeStack[++projectionNodeIndex] = node as LProjectionNode;
+
+      nextNode = head ? (componentHost.data as LViewData)[PARENT] ![head.index] : null;
     } else {
       // Otherwise look at the first child
       nextNode = getChildLNode(node as LViewNode);
     }
 
-    if (nextNode == null) {
+    if (nextNode === null) {
+      nextNode = getNextLNode(node);
+
+      // this last node was projected, we need to get back down to its projection node
+      if (nextNode === null && (node.tNode.flags & TNodeFlags.isProjected)) {
+        nextNode = getNextLNode(projectionNodeStack[projectionNodeIndex--] as LNode);
+      }
       /**
        * Find the next node in the LNode tree, taking into account the place where a node is
        * projected (in the shadow DOM) rather than where it comes from (in the light DOM).
@@ -146,29 +148,43 @@ function walkLNodeTree(
        * If there is no sibling node, then it goes to the next sibling of the parent node...
        * until it reaches rootNode (at which point null is returned).
        */
-      let currentNode: LNode|null = node;
-      node = getNextLNodeWithProjection(currentNode);
-      while (currentNode && !node) {
-        // if node.pNextOrParent is not null here, it is not the next node
-        // (because, at this point, nextNode is null, so it is the parent)
-        currentNode = currentNode.pNextOrParent || getParentLNode(currentNode);
-        if (currentNode === rootNode) {
-          return null;
+      while (node && !nextNode) {
+        node = getParentLNode(node);
+        if (node === null || node === rootNode) return null;
+
+        // When exiting a container, the beforeNode must be restored to the previous value
+        if (!node.tNode.next && nodeType === TNodeType.Container) {
+          beforeNode = node.native;
         }
-        // When the walker exits a container, the beforeNode has to be restored to the previous
-        // value.
-        if (currentNode && !currentNode.pNextOrParent &&
-            currentNode.tNode.type === TNodeType.Container) {
-          beforeNode = currentNode.native;
-        }
-        node = currentNode && getNextLNodeWithProjection(currentNode);
+        nextNode = getNextLNode(node);
       }
-    } else {
-      node = nextNode;
     }
+    node = nextNode;
   }
 }
 
+
+/**
+ * Given a current view, finds the nearest component's host (LElement).
+ *
+ * @param lViewData LViewData for which we want a host element node
+ * @returns The host node
+ */
+export function findComponentHost(lViewData: LViewData): LElementNode {
+  let viewRootLNode = lViewData[HOST_NODE];
+
+  while (viewRootLNode.tNode.type === TNodeType.View) {
+    ngDevMode && assertDefined(lViewData[PARENT], 'lViewData.parent');
+    lViewData = lViewData[PARENT] !;
+    viewRootLNode = lViewData[HOST_NODE];
+  }
+
+  ngDevMode && assertNodeType(viewRootLNode, TNodeType.Element);
+  ngDevMode && assertDefined(viewRootLNode.data, 'node.data');
+
+  return viewRootLNode as LElementNode;
+}
+
 /**
  * NOTE: for performance reasons, the possible actions are inlined within the function instead of
  * being passed as an argument.
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 890b47afb7..07a77163ed 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -422,6 +422,9 @@
   {
     "name": "findAttrIndexInNode"
   },
+  {
+    "name": "findComponentHost"
+  },
   {
     "name": "findDirectiveMatches"
   },
@@ -452,9 +455,6 @@
   {
     "name": "getNextLNode"
   },
-  {
-    "name": "getNextLNodeWithProjection"
-  },
   {
     "name": "getOrCreateContainerRef"
   },
@@ -605,6 +605,9 @@
   {
     "name": "notImplemented"
   },
+  {
+    "name": "projectionNodeStack"
+  },
   {
     "name": "queueComponentIndexForCheck"
   },
diff --git a/packages/core/test/render3/compiler_canonical/content_projection_spec.ts b/packages/core/test/render3/compiler_canonical/content_projection_spec.ts
index c7a35758c0..328c32996c 100644
--- a/packages/core/test/render3/compiler_canonical/content_projection_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/content_projection_spec.ts
@@ -27,9 +27,9 @@ describe('content projection', () => {
         factory: () => new SimpleComponent(),
         template: function(rf: $RenderFlags$, ctx: $SimpleComponent$) {
           if (rf & 1) {
-            $r3$.ɵpD(0);
-            $r3$.ɵEe(1, 'div');
-            $r3$.ɵP(2, 0);
+            $r3$.ɵpD();
+            $r3$.ɵEe(0, 'div');
+            $r3$.ɵP(1);
           }
         }
       });
@@ -56,11 +56,11 @@ describe('content projection', () => {
         factory: () => new ComplexComponent(),
         template: function(rf: $RenderFlags$, ctx: $ComplexComponent$) {
           if (rf & 1) {
-            $r3$.ɵpD(0, $pD_0P$, $pD_0R$);
-            $r3$.ɵEe(1, 'div', ['id', 'first']);
-            $r3$.ɵP(2, 0, 1);
-            $r3$.ɵEe(3, 'div', ['id', 'second']);
-            $r3$.ɵP(4, 0, 2);
+            $r3$.ɵpD($pD_0P$, $pD_0R$);
+            $r3$.ɵEe(0, 'div', ['id', 'first']);
+            $r3$.ɵP(1, 1);
+            $r3$.ɵEe(2, 'div', ['id', 'second']);
+            $r3$.ɵP(3, 2);
           }
         }
       });
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index 3946badeb4..d8fafb9b72 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -124,9 +124,9 @@ describe('queries', () => {
         template: function ContentQueryComponent_Template(
             rf: $number$, ctx: $ContentQueryComponent$) {
           if (rf & 1) {
-            $r3$.ɵpD(0);
-            $r3$.ɵE(1, 'div');
-            $r3$.ɵP(2, 0);
+            $r3$.ɵpD();
+            $r3$.ɵE(0, 'div');
+            $r3$.ɵP(1);
             $r3$.ɵe();
           }
         }
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 2944e11d85..e1b58224b8 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -8,6 +8,9 @@
 
 import {SelectorFlags} from '@angular/core/src/render3/interfaces/projection';
 
+import {Input, TemplateRef, ViewContainerRef, ViewRef} from '../../src/core';
+import {defineDirective} from '../../src/render3/definition';
+import {injectTemplateRef, injectViewContainerRef} from '../../src/render3/di';
 import {AttributeMarker, detectChanges} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, loadDirective, projection, projectionDef, text} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
@@ -22,9 +25,9 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -48,8 +51,8 @@ describe('content projection', () => {
     /** <ng-content></ng-content> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        projection(1, 0);
+        projectionDef();
+        projection(0);
       }
     });
 
@@ -66,13 +69,47 @@ describe('content projection', () => {
     expect(toHtml(parent)).toEqual('<child>content</child>');
   });
 
+  it('should project content with siblings', () => {
+    /** <ng-content></ng-content> */
+    const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef();
+        projection(0);
+      }
+    });
+
+    /**
+     * <child>
+     *  before
+     *  <div>content</div>
+     *  after
+     * </child>
+     */
+    const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        {
+          text(1, 'before');
+          elementStart(2, 'div');
+          { text(3, 'content'); }
+          elementEnd();
+          text(4, 'after');
+        }
+        elementEnd();
+      }
+    }, [Child]);
+
+    const parent = renderComponent(Parent);
+    expect(toHtml(parent)).toEqual('<child>before<div>content</div>after</child>');
+  });
+
   it('should re-project content when root.', () => {
     /** <div><ng-content></ng-content></div> */
     const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -80,9 +117,9 @@ describe('content projection', () => {
     /** <grand-child><ng-content></ng-content></grand-child> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'grand-child');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'grand-child');
+        { projection(1); }
         elementEnd();
       }
     }, [GrandChild]);
@@ -111,9 +148,9 @@ describe('content projection', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -149,9 +186,9 @@ describe('content projection', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -159,9 +196,9 @@ describe('content projection', () => {
     /** <p><ng-content></ng-content></p> */
     const ProjectedComp = createComponent('projected-comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'p');
-        projection(2, 0);
+        projectionDef();
+        elementStart(0, 'p');
+        projection(1);
         elementEnd();
       }
     });
@@ -198,13 +235,13 @@ describe('content projection', () => {
             '<child><div><projected-comp><p><div>Some content</div>Other content</p></projected-comp></div></child>');
   });
 
-  it('should project content with container.', () => {
+  it('should project containers', () => {
     /** <div> <ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -247,18 +284,20 @@ describe('content projection', () => {
     expect(toHtml(parent)).toEqual('<child><div>()</div></child>');
     parent.value = true;
     detectChanges(parent);
+
     expect(toHtml(parent)).toEqual('<child><div>(content)</div></child>');
     parent.value = false;
     detectChanges(parent);
+
     expect(toHtml(parent)).toEqual('<child><div>()</div></child>');
   });
 
-  it('should project content with container into root', () => {
+  it('should project containers into root', () => {
     /** <ng-content></ng-content> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        projection(1, 0);
+        projectionDef();
+        projection(0);
       }
     });
 
@@ -302,13 +341,13 @@ describe('content projection', () => {
     expect(toHtml(parent)).toEqual('<child></child>');
   });
 
-  it('should project content with container and if-else.', () => {
+  it('should project containers with if-else.', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -378,19 +417,19 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { container(2); }
+        projectionDef();
+        elementStart(0, 'div');
+        { container(1); }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        containerRefreshStart(2);
+        containerRefreshStart(1);
         {
           if (!ctx.skipContent) {
             let rf0 = embeddedViewStart(0);
             if (rf0 & RenderFlags.Create) {
               elementStart(0, 'span');
-              projection(1, 0);
+              projection(1);
               elementEnd();
             }
             embeddedViewEnd();
@@ -400,27 +439,90 @@ describe('content projection', () => {
       }
     });
 
-    /** <child>content</child> */
+    /**
+     * <child>
+     *   <div>text</div>
+     *   content
+     * </child>
+     */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'child');
         {
-          childCmptInstance = loadDirective(0);
-          text(1, 'content');
+          elementStart(1, 'div');
+          { text(2, 'text'); }
+          elementEnd();
+          text(3, 'content');
         }
         elementEnd();
+
+        // testing
+        childCmptInstance = loadDirective(0);
       }
     }, [Child]);
 
     const parent = renderComponent(Parent);
-    expect(toHtml(parent)).toEqual('<child><div><span>content</span></div></child>');
+    expect(toHtml(parent)).toEqual('<child><div><span><div>text</div>content</span></div></child>');
 
     childCmptInstance.skipContent = true;
     detectChanges(parent);
     expect(toHtml(parent)).toEqual('<child><div></div></child>');
   });
 
-  it('should support projection in embedded views when ng-content is a root node of an embedded view',
+  it('should support projection into embedded views when no projected nodes', () => {
+    let childCmptInstance: any;
+
+    /**
+     * <div>
+     *  % if (!skipContent) {
+     *      <ng-content></ng-content>
+     *      text
+     *  % }
+     * </div>
+     */
+    const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        projectionDef();
+        elementStart(0, 'div');
+        { container(1); }
+        elementEnd();
+      }
+      if (rf & RenderFlags.Update) {
+        containerRefreshStart(1);
+        {
+          if (!ctx.skipContent) {
+            let rf0 = embeddedViewStart(0);
+            if (rf0 & RenderFlags.Create) {
+              projection(0);
+              text(1, 'text');
+            }
+            embeddedViewEnd();
+          }
+        }
+        containerRefreshEnd();
+      }
+    });
+
+    /** <child></child> */
+    const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
+      if (rf & RenderFlags.Create) {
+        elementStart(0, 'child');
+        elementEnd();
+
+        // testing
+        childCmptInstance = loadDirective(0);
+      }
+    }, [Child]);
+
+    const parent = renderComponent(Parent);
+    expect(toHtml(parent)).toEqual('<child><div>text</div></child>');
+
+    childCmptInstance.skipContent = true;
+    detectChanges(parent);
+    expect(toHtml(parent)).toEqual('<child><div></div></child>');
+  });
+
+  it('should support projection into embedded views when ng-content is a root node of an embedded view',
      () => {
        let childCmptInstance: any;
 
@@ -433,18 +535,18 @@ describe('content projection', () => {
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           projectionDef(0);
-           elementStart(1, 'div');
-           { container(2); }
+           projectionDef();
+           elementStart(0, 'div');
+           { container(1); }
            elementEnd();
          }
          if (rf & RenderFlags.Update) {
-           containerRefreshStart(2);
+           containerRefreshStart(1);
            {
              if (!ctx.skipContent) {
                let rf0 = embeddedViewStart(0);
                if (rf0 & RenderFlags.Create) {
-                 projection(0, 0);
+                 projection(0);
                }
                embeddedViewEnd();
              }
@@ -487,22 +589,22 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
+        projectionDef();
+        elementStart(0, 'div');
         {
-          text(2, 'Before (inside)-');
-          container(3);
-          text(4, '-After (inside)');
+          text(1, 'Before (inside)-');
+          container(2);
+          text(3, '-After (inside)');
         }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        containerRefreshStart(3);
+        containerRefreshStart(2);
         {
           if (!ctx.skipContent) {
             let rf0 = embeddedViewStart(0);
             if (rf0 & RenderFlags.Create) {
-              projection(0, 0);
+              projection(0);
             }
             embeddedViewEnd();
           }
@@ -567,18 +669,18 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { container(2); }
+        projectionDef();
+        elementStart(0, 'div');
+        { container(1); }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        containerRefreshStart(2);
+        containerRefreshStart(1);
         {
           if (!ctx.skipContent) {
             let rf0 = embeddedViewStart(0);
             if (rf0 & RenderFlags.Create) {
-              projection(0, 0);
+              projection(0);
             }
             embeddedViewEnd();
           }
@@ -598,22 +700,22 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'child');
+        projectionDef();
+        elementStart(0, 'child');
         {
-          text(2, 'Before text');
-          container(3);
-          text(4, '-After text');
+          text(1, 'Before text');
+          container(2);
+          text(3, '-After text');
         }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        containerRefreshStart(3);
+        containerRefreshStart(2);
         {
           if (!ctx.skipContent) {
             let rf0 = embeddedViewStart(0);
             if (rf0 & RenderFlags.Create) {
-              projection(0, 0);
+              projection(0);
             }
             embeddedViewEnd();
           }
@@ -648,8 +750,7 @@ describe('content projection', () => {
         .toEqual('<parent><child><div>Before text-After text</div></child></parent>');
   });
 
-
-  it('should support projection in embedded views when ng-content is a root node of an embedded view, with other nodes after',
+  it('should support projection into embedded views when ng-content is a root node of an embedded view, with other nodes after',
      () => {
        let childCmptInstance: any;
 
@@ -662,19 +763,19 @@ describe('content projection', () => {
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           projectionDef(0);
-           elementStart(1, 'div');
-           { container(2); }
+           projectionDef();
+           elementStart(0, 'div');
+           { container(1); }
            elementEnd();
          }
          if (rf & RenderFlags.Update) {
-           containerRefreshStart(2);
+           containerRefreshStart(1);
            {
              if (!ctx.skipContent) {
                let rf0 = embeddedViewStart(0);
                if (rf0 & RenderFlags.Create) {
                  text(0, 'before-');
-                 projection(1, 0);
+                 projection(1);
                  text(2, '-after');
                }
                embeddedViewEnd();
@@ -732,19 +833,19 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        text(1, 'Before-');
-        container(2, IfTemplate, '', [AttributeMarker.SelectOnly, 'ngIf']);
-        text(3, '-After');
+        projectionDef();
+        text(0, 'Before-');
+        container(1, IfTemplate, '', [AttributeMarker.SelectOnly, 'ngIf']);
+        text(2, '-After');
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(2, 'ngIf', bind(ctx.showing));
+        elementProperty(1, 'ngIf', bind(ctx.showing));
       }
 
       function IfTemplate(rf1: RenderFlags, ctx1: any) {
         if (rf1 & RenderFlags.Create) {
-          projectionDef(0);
-          projection(1, 0);
+          projectionDef();
+          projection(0);
         }
       }
     }, [NgIf]);
@@ -817,19 +918,19 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        text(1, 'Before-');
-        container(2, IfTemplate, '', [AttributeMarker.SelectOnly, 'ngIf']);
-        text(3, '-After');
+        projectionDef();
+        text(0, 'Before-');
+        container(1, IfTemplate, '', [AttributeMarker.SelectOnly, 'ngIf']);
+        text(2, '-After');
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(2, 'ngIf', bind(ctx.showing));
+        elementProperty(1, 'ngIf', bind(ctx.showing));
       }
 
       function IfTemplate(rf1: RenderFlags, ctx1: any) {
         if (rf1 & RenderFlags.Create) {
-          projectionDef(0);
-          projection(1, 0);
+          projectionDef();
+          projection(0);
         }
       }
     }, [NgIf]);
@@ -878,12 +979,12 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
-        elementStart(3, 'span');
-        { projection(4, 0); }
+        elementStart(2, 'span');
+        { projection(3); }
         elementEnd();
       }
     });
@@ -924,19 +1025,19 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        projection(1, 0);
-        elementStart(2, 'div');
-        { container(3); }
+        projectionDef();
+        projection(0);
+        elementStart(1, 'div');
+        { container(2); }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        containerRefreshStart(3);
+        containerRefreshStart(2);
         {
           if (ctx.show) {
             let rf0 = embeddedViewStart(0);
             if (rf0 & RenderFlags.Create) {
-              projection(0, 0);
+              projection(0);
             }
             embeddedViewEnd();
           }
@@ -970,10 +1071,10 @@ describe('content projection', () => {
   it('should project with multiple instances of a component with projection', () => {
     const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        text(1, 'Before');
-        projection(2, 0);
-        text(3, 'After');
+        projectionDef();
+        text(0, 'Before');
+        projection(1);
+        text(2, 'After');
       }
     });
 
@@ -990,20 +1091,24 @@ describe('content projection', () => {
     const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'projection-comp');
-        elementStart(1, 'div');
-        text(2, 'A');
-        elementEnd();
-        elementStart(3, 'p');
-        text(4, '123');
-        elementEnd();
+        {
+          elementStart(1, 'div');
+          { text(2, 'A'); }
+          elementEnd();
+          elementStart(3, 'p');
+          { text(4, '123'); }
+          elementEnd();
+        }
         elementEnd();
         elementStart(5, 'projection-comp');
-        elementStart(6, 'div');
-        text(7, 'B');
-        elementEnd();
-        elementStart(8, 'p');
-        text(9, '456');
-        elementEnd();
+        {
+          elementStart(6, 'div');
+          { text(7, 'B'); }
+          elementEnd();
+          elementStart(8, 'p');
+          { text(9, '456'); }
+          elementEnd();
+        }
         elementEnd();
       }
     }, [ProjectionComp]);
@@ -1012,7 +1117,8 @@ describe('content projection', () => {
     fixture.update();
     expect(fixture.html)
         .toEqual(
-            '<projection-comp>Before<div>A</div><p>123</p>After</projection-comp><projection-comp>Before<div>B</div><p>456</p>After</projection-comp>');
+            '<projection-comp>Before<div>A</div><p>123</p>After</projection-comp>' +
+            '<projection-comp>Before<div>B</div><p>456</p>After</projection-comp>');
   });
 
   it('should re-project with multiple instances of a component with projection', () => {
@@ -1023,10 +1129,10 @@ describe('content projection', () => {
      */
     const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        text(1, 'Before');
-        projection(2, 0);
-        text(3, 'After');
+        projectionDef();
+        text(0, 'Before');
+        projection(1);
+        text(2, 'After');
       }
     });
 
@@ -1043,23 +1149,27 @@ describe('content projection', () => {
      */
     const ProjectionParent = createComponent('parent-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'projection-comp');
-        elementStart(2, 'div');
-        text(3, 'A');
-        elementEnd();
-        projection(4, 0);
-        elementStart(5, 'p');
-        text(6, '123');
-        elementEnd();
-        elementEnd();
-        elementStart(7, 'projection-comp');
-        elementStart(8, 'div');
-        text(9, 'B');
-        elementEnd();
-        elementStart(10, 'p');
-        text(11, '456');
+        projectionDef();
+        elementStart(0, 'projection-comp');
+        {
+          elementStart(1, 'div');
+          { text(2, 'A'); }
+          elementEnd();
+          projection(3, 0);
+          elementStart(4, 'p');
+          { text(5, '123'); }
+          elementEnd();
+        }
         elementEnd();
+        elementStart(6, 'projection-comp');
+        {
+          elementStart(7, 'div');
+          { text(8, 'B'); }
+          elementEnd();
+          elementStart(9, 'p');
+          { text(10, '456'); }
+          elementEnd();
+        }
         elementEnd();
       }
     }, [ProjectionComp]);
@@ -1075,10 +1185,10 @@ describe('content projection', () => {
     const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
         elementStart(0, 'parent-comp');
-        text(1, '**ABC**');
+        { text(1, '**ABC**'); }
         elementEnd();
         elementStart(2, 'parent-comp');
-        text(3, '**DEF**');
+        { text(3, '**DEF**'); }
         elementEnd();
       }
     }, [ProjectionParent]);
@@ -1087,7 +1197,12 @@ describe('content projection', () => {
     fixture.update();
     expect(fixture.html)
         .toEqual(
-            '<parent-comp><projection-comp>Before<div>A</div>**ABC**<p>123</p>After</projection-comp><projection-comp>Before<div>B</div><p>456</p>After</projection-comp></parent-comp><parent-comp><projection-comp>Before<div>A</div>**DEF**<p>123</p>After</projection-comp><projection-comp>Before<div>B</div><p>456</p>After</projection-comp></parent-comp>');
+            '<parent-comp>' +
+            '<projection-comp>Before<div>A</div>**ABC**<p>123</p>After</projection-comp>' +
+            '<projection-comp>Before<div>B</div><p>456</p>After</projection-comp></parent-comp>' +
+            '<parent-comp>' +
+            '<projection-comp>Before<div>A</div>**DEF**<p>123</p>After</projection-comp>' +
+            '<projection-comp>Before<div>B</div><p>456</p>After</projection-comp></parent-comp>');
   });
 
   describe('with selectors', () => {
@@ -1100,13 +1215,13 @@ describe('content projection', () => {
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           projectionDef(
-              0, [[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]],
+              [[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]],
               ['span[title=toFirst]', 'span[title=toSecond]']);
-          elementStart(1, 'div', ['id', 'first']);
-          { projection(2, 0, 1); }
+          elementStart(0, 'div', ['id', 'first']);
+          { projection(1, 1); }
           elementEnd();
-          elementStart(3, 'div', ['id', 'second']);
-          { projection(4, 0, 2); }
+          elementStart(2, 'div', ['id', 'second']);
+          { projection(3, 2); }
           elementEnd();
         }
       });
@@ -1145,8 +1260,8 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0, [[['', 'title', '']]], ['[title]']);
-          { projection(1, 0, 1); }
+          projectionDef([[['', 'title', '']]], ['[title]']);
+          { projection(0, 1); }
         }
       });
 
@@ -1183,17 +1298,16 @@ describe('content projection', () => {
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           projectionDef(
-              0,
               [
                 [['span', SelectorFlags.CLASS, 'toFirst']],
                 [['span', SelectorFlags.CLASS, 'toSecond']]
               ],
               ['span.toFirst', 'span.toSecond']);
-          elementStart(1, 'div', ['id', 'first']);
-          { projection(2, 0, 1); }
+          elementStart(0, 'div', ['id', 'first']);
+          { projection(1, 1); }
           elementEnd();
-          elementStart(3, 'div', ['id', 'second']);
-          { projection(4, 0, 2); }
+          elementStart(2, 'div', ['id', 'second']);
+          { projection(3, 2); }
           elementEnd();
         }
       });
@@ -1233,17 +1347,16 @@ describe('content projection', () => {
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           projectionDef(
-              0,
               [
                 [['span', SelectorFlags.CLASS, 'toFirst']],
                 [['span', SelectorFlags.CLASS, 'toSecond']]
               ],
               ['span.toFirst', 'span.toSecond']);
-          elementStart(1, 'div', ['id', 'first']);
-          { projection(2, 0, 1); }
+          elementStart(0, 'div', ['id', 'first']);
+          { projection(1, 1); }
           elementEnd();
-          elementStart(3, 'div', ['id', 'second']);
-          { projection(4, 0, 2); }
+          elementStart(2, 'div', ['id', 'second']);
+          { projection(3, 2); }
           elementEnd();
         }
       });
@@ -1283,13 +1396,12 @@ describe('content projection', () => {
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           projectionDef(
-              0, [[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]],
-              ['span', 'span.toSecond']);
-          elementStart(1, 'div', ['id', 'first']);
-          { projection(2, 0, 1); }
+              [[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]], ['span', 'span.toSecond']);
+          elementStart(0, 'div', ['id', 'first']);
+          { projection(1, 1); }
           elementEnd();
-          elementStart(3, 'div', ['id', 'second']);
-          { projection(4, 0, 2); }
+          elementStart(2, 'div', ['id', 'second']);
+          { projection(3, 2); }
           elementEnd();
         }
       });
@@ -1328,12 +1440,12 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0, [[['span', SelectorFlags.CLASS, 'toFirst']]], ['span.toFirst']);
-          elementStart(1, 'div', ['id', 'first']);
-          { projection(2, 0, 1); }
+          projectionDef([[['span', SelectorFlags.CLASS, 'toFirst']]], ['span.toFirst']);
+          elementStart(0, 'div', ['id', 'first']);
+          { projection(1, 1); }
           elementEnd();
-          elementStart(3, 'div', ['id', 'second']);
-          { projection(4, 0); }
+          elementStart(2, 'div', ['id', 'second']);
+          { projection(3); }
           elementEnd();
         }
       });
@@ -1373,12 +1485,12 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0, [[['span', SelectorFlags.CLASS, 'toSecond']]], ['span.toSecond']);
-          elementStart(1, 'div', ['id', 'first']);
-          { projection(2, 0); }
+          projectionDef([[['span', SelectorFlags.CLASS, 'toSecond']]], ['span.toSecond']);
+          elementStart(0, 'div', ['id', 'first']);
+          { projection(1); }
           elementEnd();
-          elementStart(3, 'div', ['id', 'second']);
-          { projection(4, 0, 1); }
+          elementStart(2, 'div', ['id', 'second']);
+          { projection(3, 1); }
           elementEnd();
         }
       });
@@ -1425,11 +1537,11 @@ describe('content projection', () => {
        */
       const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0, [[['span']]], ['span']);
-          projection(1, 0, 1);
-          elementStart(2, 'hr');
+          projectionDef([[['span']]], ['span']);
+          projection(0, 1);
+          elementStart(1, 'hr');
           elementEnd();
-          projection(3, 0, 0);
+          projection(2);
         }
       });
 
@@ -1441,12 +1553,12 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0);
-          elementStart(1, 'grand-child');
+          projectionDef();
+          elementStart(0, 'grand-child');
           {
-            projection(2, 0);
-            elementStart(3, 'span');
-            { text(4, 'in child template'); }
+            projection(1);
+            elementStart(2, 'span');
+            { text(3, 'in child template'); }
             elementEnd();
           }
           elementEnd();
@@ -1488,12 +1600,12 @@ describe('content projection', () => {
       const Card = createComponent('card', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           projectionDef(
-              0, [[['', 'card-title', '']], [['', 'card-content', '']]],
+              [[['', 'card-title', '']], [['', 'card-content', '']]],
               ['[card-title]', '[card-content]']);
-          projection(1, 0, 1);
-          elementStart(2, 'hr');
+          projection(0, 1);
+          elementStart(1, 'hr');
           elementEnd();
-          projection(3, 0, 2);
+          projection(2, 2);
         }
       });
 
@@ -1505,13 +1617,13 @@ describe('content projection', () => {
        */
       const CardWithTitle = createComponent('card-with-title', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0);
-          elementStart(1, 'card');
+          projectionDef();
+          elementStart(0, 'card');
           {
-            elementStart(2, 'h1', ['card-title', '']);
-            { text(3, 'Title'); }
+            elementStart(1, 'h1', ['card-title', '']);
+            { text(2, 'Title'); }
             elementEnd();
-            projection(4, 0, 0, ['card-content', '']);
+            projection(3, 0, ['card-content', '']);
           }
           elementEnd();
         }
@@ -1547,12 +1659,12 @@ describe('content projection', () => {
       const Card = createComponent('card', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           projectionDef(
-              0, [[['', 'card-title', '']], [['', 'card-content', '']]],
+              [[['', 'card-title', '']], [['', 'card-content', '']]],
               ['[card-title]', '[card-content]']);
-          projection(1, 0, 1);
-          elementStart(2, 'hr');
+          projection(0, 1);
+          elementStart(1, 'hr');
           elementEnd();
-          projection(3, 0, 2);
+          projection(2, 2);
         }
       });
 
@@ -1564,13 +1676,13 @@ describe('content projection', () => {
        */
       const CardWithTitle = createComponent('card-with-title', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0);
-          elementStart(1, 'card');
+          projectionDef();
+          elementStart(0, 'card');
           {
-            elementStart(2, 'h1', ['ngProjectAs', '[card-title]']);
-            { text(3, 'Title'); }
+            elementStart(1, 'h1', ['ngProjectAs', '[card-title]']);
+            { text(2, 'Title'); }
             elementEnd();
-            projection(4, 0, 0, ['ngProjectAs', '[card-content]']);
+            projection(3, 0, ['ngProjectAs', '[card-content]']);
           }
           elementEnd();
         }
@@ -1602,8 +1714,8 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0, [[['div']]], ['div']);
-          projection(1, 0, 1);
+          projectionDef([[['div']]], ['div']);
+          projection(0, 1);
         }
       });
 
@@ -1641,9 +1753,9 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          projectionDef(0, [[['div']]], ['div']);
-          elementStart(1, 'span');
-          { projection(2, 0, 1); }
+          projectionDef([[['div']]], ['div']);
+          elementStart(0, 'span');
+          { projection(1, 1); }
           elementEnd();
         }
       });
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 540e34dbe4..e65ff383b7 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -947,8 +947,8 @@ describe('di', () => {
         factory: () => comp = new MyComp(injectChangeDetectorRef()),
         template: function(rf: RenderFlags, ctx: MyComp) {
           if (rf & RenderFlags.Create) {
-            projectionDef(0);
-            projection(1, 0);
+            projectionDef();
+            projection(0);
           }
         }
       });
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index 98cbf07b3c..b3cc3a957f 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -971,9 +971,9 @@ describe('Runtime i18n', () => {
           factory: () => new Child(),
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0);
-              elementStart(1, 'p');
-              { projection(2, 0); }
+              projectionDef();
+              elementStart(0, 'p');
+              { projection(1); }
               elementEnd();
             }
           }
@@ -1063,9 +1063,9 @@ describe('Runtime i18n', () => {
           factory: () => new Child(),
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0);
-              elementStart(1, 'p');
-              { projection(2, 0); }
+              projectionDef();
+              elementStart(0, 'p');
+              { projection(1); }
               elementEnd();
             }
           }
@@ -1145,9 +1145,9 @@ describe('Runtime i18n', () => {
           factory: () => new GrandChild(),
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0);
-              elementStart(1, 'div');
-              { projection(2, 0); }
+              projectionDef();
+              elementStart(0, 'div');
+              { projection(1); }
               elementEnd();
             }
           }
@@ -1164,9 +1164,9 @@ describe('Runtime i18n', () => {
           factory: () => new Child(),
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0);
-              elementStart(1, 'grand-child');
-              { projection(2, 0); }
+              projectionDef();
+              elementStart(0, 'grand-child');
+              { projection(1); }
               elementEnd();
             }
           }
@@ -1224,8 +1224,8 @@ describe('Runtime i18n', () => {
           factory: () => new Child(),
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0, [[['span']]], ['span']);
-              projection(1, 0, 1);
+              projectionDef([[['span']]], ['span']);
+              projection(0, 1);
             }
           }
         });
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 3d883fe2fe..e334b2a96c 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -502,19 +502,19 @@ describe('render3 integration test', () => {
         template: function ChildComponentTemplate(
             rf: RenderFlags, ctx: {beforeTree: Tree, afterTree: Tree}) {
           if (rf & RenderFlags.Create) {
-            projectionDef(0);
-            container(1);
-            projection(2, 0);
-            container(3);
+            projectionDef();
+            container(0);
+            projection(1);
+            container(2);
           }
-          containerRefreshStart(1);
+          containerRefreshStart(0);
           {
             const rf0 = embeddedViewStart(0);
             { showTree(rf0, {tree: ctx.beforeTree}); }
             embeddedViewEnd();
           }
           containerRefreshEnd();
-          containerRefreshStart(3);
+          containerRefreshStart(2);
           {
             const rf0 = embeddedViewStart(0);
             { showTree(rf0, {tree: ctx.afterTree}); }
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index bec48f81db..4bb3656fb2 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -33,9 +33,9 @@ describe('lifecycles', () => {
 
     let Comp = createOnInitComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -500,27 +500,27 @@ describe('lifecycles', () => {
 
     let Comp = createAfterContentInitComp('comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        projection(1, 0);
+        projectionDef();
+        projection(0);
       }
     });
 
     let Parent = createAfterContentInitComp('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'comp');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'comp');
+        { projection(1); }
         elementEnd();
       }
       if (rf & RenderFlags.Update) {
-        elementProperty(1, 'val', bind(ctx.val));
+        elementProperty(0, 'val', bind(ctx.val));
       }
     }, [Comp]);
 
     let ProjectedComp = createAfterContentInitComp('projected', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        projection(1, 0);
+        projectionDef();
+        projection(0);
       }
     });
 
@@ -893,9 +893,9 @@ describe('lifecycles', () => {
 
     let Comp = createAfterViewInitComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -1356,8 +1356,8 @@ describe('lifecycles', () => {
 
     let Comp = createOnDestroyComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        projection(1, 0);
+        projectionDef();
+        projection(0);
       }
     });
     let Parent = createOnDestroyComponent('parent', getParentTemplate('comp'), [Comp]);
@@ -1893,9 +1893,9 @@ describe('lifecycles', () => {
 
     const Comp = createOnChangesComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        projectionDef(0);
-        elementStart(1, 'div');
-        { projection(2, 0); }
+        projectionDef();
+        elementStart(0, 'div');
+        { projection(1); }
         elementEnd();
       }
     });
@@ -2444,13 +2444,13 @@ describe('lifecycles', () => {
       /** <ng-content></ng-content><view [val]="val"></view> */
       const Parent = createAllHooksComponent('parent', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          projectionDef(0);
-          projection(1, 0);
-          elementStart(2, 'view');
+          projectionDef();
+          projection(0);
+          elementStart(1, 'view');
           elementEnd();
         }
         if (rf & RenderFlags.Update) {
-          elementProperty(2, 'val', bind(ctx.val));
+          elementProperty(1, 'val', bind(ctx.val));
         }
       }, [View]);
 
diff --git a/packages/core/test/render3/node_selector_matcher_spec.ts b/packages/core/test/render3/node_selector_matcher_spec.ts
index dec13b91d9..f742aacaca 100644
--- a/packages/core/test/render3/node_selector_matcher_spec.ts
+++ b/packages/core/test/render3/node_selector_matcher_spec.ts
@@ -10,29 +10,16 @@ import {AttributeMarker, TAttributes, TNode, TNodeType} from '../../src/render3/
 
 import {CssSelector, CssSelectorList, NG_PROJECT_AS_ATTR_NAME, SelectorFlags,} from '../../src/render3/interfaces/projection';
 import {getProjectAsAttrValue, isNodeMatchingSelectorList, isNodeMatchingSelector} from '../../src/render3/node_selector_matcher';
+import {createTNode} from '@angular/core/src/render3/instructions';
 
 function testLStaticData(tagName: string, attrs: TAttributes | null): TNode {
-  return {
-    type: TNodeType.Element,
-    index: 0,
-    flags: 0, tagName, attrs,
-    localNames: null,
-    initialInputs: undefined,
-    inputs: undefined,
-    outputs: undefined,
-    tViews: null,
-    next: null,
-    child: null,
-    parent: null,
-    dynamicContainerNode: null,
-    detached: null,
-    stylingTemplate: null
-  };
+  return createTNode(TNodeType.Element, 0, tagName, attrs, null, null);
 }
 
 describe('css selector matching', () => {
   function isMatching(tagName: string, attrs: TAttributes | null, selector: CssSelector): boolean {
-    return isNodeMatchingSelector(testLStaticData(tagName, attrs), selector);
+    return isNodeMatchingSelector(
+        createTNode(TNodeType.Element, 0, tagName, attrs, null, null), selector);
   }
 
   describe('isNodeMatchingSimpleSelector', () => {
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 75ed3c4502..894b1bc552 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -671,9 +671,9 @@ describe('ViewContainerRef', () => {
           factory: () => new Child(),
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0);
-              elementStart(1, 'div');
-              { projection(2, 0); }
+              projectionDef();
+              elementStart(0, 'div');
+              { projection(1); }
               elementEnd();
             }
           }
@@ -742,17 +742,17 @@ describe('ViewContainerRef', () => {
           factory: () => new ChildWithView(),
           template: (rf: RenderFlags, cmp: ChildWithView) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0);
-              text(1, 'Before (inside)-');
-              container(2);
-              text(3, 'After (inside)');
+              projectionDef();
+              text(0, 'Before (inside)-');
+              container(1);
+              text(2, 'After (inside)');
             }
             if (rf & RenderFlags.Update) {
-              containerRefreshStart(2);
+              containerRefreshStart(1);
               if (cmp.show) {
                 let rf0 = embeddedViewStart(0);
                 if (rf0 & RenderFlags.Create) {
-                  projection(0, 0);
+                  projection(0);
                 }
                 embeddedViewEnd();
               }
@@ -827,12 +827,12 @@ describe('ViewContainerRef', () => {
           factory: () => new ChildWithSelector(),
           template: (rf: RenderFlags, cmp: ChildWithSelector) => {
             if (rf & RenderFlags.Create) {
-              projectionDef(0, [[['header']]], ['header']);
-              elementStart(1, 'first');
-              { projection(2, 0, 1); }
+              projectionDef([[['header']]], ['header']);
+              elementStart(0, 'first');
+              { projection(1, 1); }
               elementEnd();
-              elementStart(3, 'second');
-              { projection(4, 0); }
+              elementStart(2, 'second');
+              { projection(3); }
               elementEnd();
             }
           },

From 03616bcb430c027cf64120182be13ec3dc4dce15 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 10 Jul 2018 16:29:10 +0300
Subject: [PATCH 445/582] docs: fix typo in Universal guide (#24812)

PR Close #24812
---
 aio/content/guide/universal.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aio/content/guide/universal.md b/aio/content/guide/universal.md
index f4653ba73d..aa1897edc2 100644
--- a/aio/content/guide/universal.md
+++ b/aio/content/guide/universal.md
@@ -212,7 +212,7 @@ You can get runtime information about the current platform and the `appId` by in
 
 ### Build Destination
 
-A Universal app is distributed in two parts: the server-side code that serves up the initial application, and the client-side code that's loaded in dynamically. 
+A Universal app is distributed in two parts: the server-side code that serves up the initial application, and the client-side code that's loaded in dynamically.
 
 The Angular CLI outputs the client-side code in the `dist` directory by default, so you modify the `outputPath` for the __build__ target in the `angular.json` to keep the client-side build outputs separate from the server-side code. The client-side build output will be served by the Express server.
 
@@ -223,7 +223,7 @@ The Angular CLI outputs the client-side code in the `dist` directory by default,
   "options": {
     "outputPath": "dist/browser",
     ...
-  } 
+  }
 }
 ...
 ```
@@ -235,13 +235,13 @@ The Angular CLI outputs the client-side code in the `dist` directory by default,
 The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
 These services send requests to _relative_ URLs such as `api/heroes`.
 
-In a Universal app, HTTP URLs must be _absolute_, for example, `https://my-server.com/api/heroes` 
+In a Universal app, HTTP URLs must be _absolute_, for example, `https://my-server.com/api/heroes`
 even when the Universal web server is capable of handling those requests.
 
 You'll have to change the services to make requests with absolute URLs when running on the server
 and with relative URLs when running in the browser.
 
-One solution is to provide the server's runtime origin under the Angular [`APP_BASE_REF` token](api/common/APP_BASE_HREF),
+One solution is to provide the server's runtime origin under the Angular [`APP_BASE_HREF` token](api/common/APP_BASE_HREF),
 inject it into the service, and prepend the origin to the request URL.
 
 Start by changing the `HeroService` constructor to take a second `origin` parameter that is optionally injected via the `APP_BASE_HREF` token.
@@ -288,7 +288,7 @@ This is also the place to register providers that are specific to running your a
 
 ### App server entry point
 
-The `Angular CLI` uses the `AppServerModule` to build the server-side bundle. 
+The `Angular CLI` uses the `AppServerModule` to build the server-side bundle.
 
 Create a `main.server.ts` file in the `src/` directory that exports the `AppServerModule`:
 

From 7d27ecc3199a062c1d04a7712e1408ca6777890c Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Tue, 10 Jul 2018 17:09:29 -0700
Subject: [PATCH 446/582] fix(platform-browser): workaround wrong import path
 generated by ngc for DOCUMENT (#24830)

---
 packages/platform-browser/src/browser/meta.ts  | 12 ++++++++++--
 packages/platform-browser/src/browser/title.ts | 10 ++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/platform-browser/src/browser/meta.ts b/packages/platform-browser/src/browser/meta.ts
index bf29316e60..aacb965498 100644
--- a/packages/platform-browser/src/browser/meta.ts
+++ b/packages/platform-browser/src/browser/meta.ts
@@ -6,12 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable} from '@angular/core';
+import {Inject, Injectable, inject} from '@angular/core';
 
 import {DomAdapter, getDOM} from '../dom/dom_adapter';
 import {DOCUMENT} from '../dom/dom_tokens';
 
 
+
 /**
  * Represents a meta element.
  *
@@ -29,12 +30,19 @@ export type MetaDefinition = {
   [prop: string]: string;
 };
 
+/**
+ * Factory to create Meta service.
+ */
+export function createMeta() {
+  return new Meta(inject(DOCUMENT));
+}
+
 /**
  * A service that can be used to get and add meta tags.
  *
  * @experimental
  */
-@Injectable({providedIn: 'root'})
+@Injectable({providedIn: 'root', useFactory: createMeta, deps: []})
 export class Meta {
   private _dom: DomAdapter;
   constructor(@Inject(DOCUMENT) private _doc: any) { this._dom = getDOM(); }
diff --git a/packages/platform-browser/src/browser/title.ts b/packages/platform-browser/src/browser/title.ts
index 04d3728555..be4fe547a0 100644
--- a/packages/platform-browser/src/browser/title.ts
+++ b/packages/platform-browser/src/browser/title.ts
@@ -6,11 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable} from '@angular/core';
+import {Inject, Injectable, inject} from '@angular/core';
 
 import {getDOM} from '../dom/dom_adapter';
 import {DOCUMENT} from '../dom/dom_tokens';
 
+/**
+ * Factory to create Title service.
+ */
+export function createTitle() {
+  return new Title(inject(DOCUMENT));
+}
 
 /**
  * A service that can be used to get and set the title of a current HTML document.
@@ -22,7 +28,7 @@ import {DOCUMENT} from '../dom/dom_tokens';
  *
  * @experimental
  */
-@Injectable({providedIn: 'root'})
+@Injectable({providedIn: 'root', useFactory: createTitle, deps: []})
 export class Title {
   constructor(@Inject(DOCUMENT) private _doc: any) {}
   /**

From 50fbed8e5f8e7f5ce2171b28543cc594feb31013 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 9 Jul 2018 13:11:02 -0700
Subject: [PATCH 447/582] docs: correct project definition (#24807)

PR Close #24807
---
 aio/content/guide/glossary.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 7284498984..5a93329d23 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -502,7 +502,7 @@ An [npm package](guide/npm-packages) that plugs gaps in a browser's JavaScript i
 
 ## Project
 
-In Angular, a folder within a [workspace](guide/glossary#workspace) that contains one or more Angular apps or [libraries](guide/glossary#library). 
+In Angular, a folder within a [workspace](guide/glossary#workspace) that contains an Angular app or [library](guide/glossary#library). A workspace can contain multiple projects. All apps in a workspace can use libraries in the same workspace.
 
 ## Provider
 
@@ -727,8 +727,8 @@ See [Custom element](guide/glossary#custom-element)
 
 ## Workspace
 
-In Angular, a folder that contains a [project](guide/glossary#project).
-The [CLI](guide/glossary#cli) `new` command creates a workspace to contain apps and libraries, and other commands must be executed from within a workspace folder. 
+In Angular, a folder that contains [projects](guide/glossary#project) (that is, apps and libraries).
+The [CLI](guide/glossary#cli) `new` command creates a workspace to contain projects. Commands such as `add` and `generate`, that create or operate on apps and libraries, must be executed from within a workspace folder. 
 
 {@a X}
 

From 80576641a8f302f12e1127bb4c2424b281544dc5 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Tue, 10 Jul 2018 09:42:27 -0700
Subject: [PATCH 448/582] build: update to latest nodejs bazel rules (#24817)

PR Close #24817
---
 WORKSPACE                   | 6 +++---
 integration/bazel/WORKSPACE | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 87bfdb923a..48dc7cad02 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -6,9 +6,9 @@ workspace(name = "angular")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.10.0.zip",
-    strip_prefix = "rules_nodejs-0.10.0",
-    sha256 = "2f77623311da8b5009b1c7eade12de8e15fa3cd2adf9dfcc9f87cb2082b2211f",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.10.1.zip",
+    strip_prefix = "rules_nodejs-0.10.1",
+    sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
 )
 
 http_archive(
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index ac95a4132e..946cd14f12 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -6,9 +6,9 @@ workspace(name = "bazel_integration_test")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
-    strip_prefix = "rules_nodejs-0.9.1",
-    sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.10.1.zip",
+    strip_prefix = "rules_nodejs-0.10.1",
+    sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
 )
 
 http_archive(

From a527c695aa0ad433797e488d3cf74cd8c590d8ca Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 10 Jul 2018 16:46:54 -0700
Subject: [PATCH 449/582] fix(common): do not round factional seconds (#24831)

fixes #24384

PR Close #24831
---
 packages/common/src/i18n/format_date.ts       | 56 ++++++++++++-------
 packages/common/test/i18n/format_date_spec.ts | 21 +++++--
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/packages/common/src/i18n/format_date.ts b/packages/common/src/i18n/format_date.ts
index df8841957c..48fb90838b 100644
--- a/packages/common/src/i18n/format_date.ts
+++ b/packages/common/src/i18n/format_date.ts
@@ -29,7 +29,7 @@ enum DateType {
   Hours,
   Minutes,
   Seconds,
-  Milliseconds,
+  FractionalSeconds,
   Day
 }
 
@@ -57,8 +57,6 @@ enum TranslationType {
  *   If not specified, host system settings are used.
  *
  * See {@link DatePipe} for more details.
- *
- *
  */
 export function formatDate(
     value: string | number | Date, format: string, locale: string, timezone?: string): string {
@@ -195,6 +193,22 @@ function padNumber(
   return neg + strNum;
 }
 
+/**
+ * Trim a fractional part to `digits` number of digits.
+ * Right pads with "0" to fit the requested number of digits if needed.
+ *
+ * @param num The fractional part value
+ * @param digits The width of the output
+ */
+function trimRPadFractional(num: number, digits: number): string {
+  let strNum = String(num);
+  // Add padding at the end
+  while (strNum.length < digits) {
+    strNum = strNum + 0;
+  }
+  return strNum.substr(0, digits);
+}
+
 /**
  * Returns a date formatter that transforms a date into its locale digit representation
  */
@@ -202,20 +216,26 @@ function dateGetter(
     name: DateType, size: number, offset: number = 0, trim = false,
     negWrap = false): DateFormatter {
   return function(date: Date, locale: string): string {
-    let part = getDatePart(name, date, size);
+    let part = getDatePart(name, date);
     if (offset > 0 || part > -offset) {
       part += offset;
     }
-    if (name === DateType.Hours && part === 0 && offset === -12) {
-      part = 12;
+
+    if (name === DateType.Hours) {
+      if (part === 0 && offset === -12) {
+        part = 12;
+      }
+    } else if (name === DateType.FractionalSeconds) {
+      return trimRPadFractional(part, size);
     }
-    return padNumber(
-        part, size, getLocaleNumberSymbol(locale, NumberSymbol.MinusSign), trim, negWrap);
+
+    const localeMinus = getLocaleNumberSymbol(locale, NumberSymbol.MinusSign);
+    return padNumber(part, size, localeMinus, trim, negWrap);
   };
 }
 
-function getDatePart(name: DateType, date: Date, size: number): number {
-  switch (name) {
+function getDatePart(part: DateType, date: Date): number {
+  switch (part) {
     case DateType.FullYear:
       return date.getFullYear();
     case DateType.Month:
@@ -228,13 +248,12 @@ function getDatePart(name: DateType, date: Date, size: number): number {
       return date.getMinutes();
     case DateType.Seconds:
       return date.getSeconds();
-    case DateType.Milliseconds:
-      const div = size === 1 ? 100 : (size === 2 ? 10 : 1);
-      return Math.round(date.getMilliseconds() / div);
+    case DateType.FractionalSeconds:
+      return date.getMilliseconds();
     case DateType.Day:
       return date.getDay();
     default:
-      throw new Error(`Unknown DateType value "${name}".`);
+      throw new Error(`Unknown DateType value "${part}".`);
   }
 }
 
@@ -561,16 +580,15 @@ function getDateFormatter(format: string): DateFormatter|null {
       formatter = dateGetter(DateType.Seconds, 2);
       break;
 
-    // Fractional second padded (0-9)
+    // Fractional second
     case 'S':
-      formatter = dateGetter(DateType.Milliseconds, 1);
+      formatter = dateGetter(DateType.FractionalSeconds, 1);
       break;
     case 'SS':
-      formatter = dateGetter(DateType.Milliseconds, 2);
+      formatter = dateGetter(DateType.FractionalSeconds, 2);
       break;
-    // = millisecond
     case 'SSS':
-      formatter = dateGetter(DateType.Milliseconds, 3);
+      formatter = dateGetter(DateType.FractionalSeconds, 3);
       break;
 
 
diff --git a/packages/common/test/i18n/format_date_spec.ts b/packages/common/test/i18n/format_date_spec.ts
index a57e3929ca..dbac3fdd7d 100644
--- a/packages/common/test/i18n/format_date_spec.ts
+++ b/packages/common/test/i18n/format_date_spec.ts
@@ -52,7 +52,7 @@ describe('Format date', () => {
 
     // Check the transformation of a date into a pattern
     function expectDateFormatAs(date: Date | string, pattern: any, output: string): void {
-      expect(formatDate(date, pattern, defaultLocale)).toEqual(output);
+      expect(formatDate(date, pattern, defaultLocale)).toEqual(output, `pattern: "${pattern}"`);
     }
 
     beforeAll(() => {
@@ -105,7 +105,7 @@ describe('Format date', () => {
         mm: '03',
         s: '1',
         ss: '01',
-        S: '6',
+        S: '5',
         SS: '55',
         SSS: '550',
         a: 'AM',
@@ -233,7 +233,6 @@ describe('Format date', () => {
       Object.keys(dateFixtures).forEach((pattern: string) => {
         expectDateFormatAs(date, pattern, dateFixtures[pattern]);
       });
-
     });
 
     it('should format with pattern aliases', () => {
@@ -266,14 +265,13 @@ describe('Format date', () => {
        () => expect(formatDate('2017-01-20T12:00:00+0000', defaultFormat, defaultLocale))
                  .toEqual('Jan 20, 2017'));
 
-    // test for the following bugs:
     // https://github.com/angular/angular/issues/9524
     // https://github.com/angular/angular/issues/9524
     it('should format correctly with iso strings that contain time',
        () => expect(formatDate('2017-05-07T22:14:39', 'dd-MM-yyyy HH:mm', defaultLocale))
                  .toMatch(/07-05-2017 \d{2}:\d{2}/));
 
-    // test for issue https://github.com/angular/angular/issues/21491
+    // https://github.com/angular/angular/issues/21491
     it('should not assume UTC for iso strings in Safari if the timezone is not defined', () => {
       // this test only works if the timezone is not in UTC
       // which is the case for BrowserStack when we test Safari
@@ -283,7 +281,6 @@ describe('Format date', () => {
       }
     });
 
-    // test for the following bugs:
     // https://github.com/angular/angular/issues/16624
     // https://github.com/angular/angular/issues/17478
     it('should show the correct time when the timezone is fixed', () => {
@@ -311,5 +308,17 @@ describe('Format date', () => {
       expect(() => formatDate(date, 'b', 'de'))
           .toThrowError(/Missing extra locale data for the locale "de"/);
     });
+
+    // https://github.com/angular/angular/issues/24384
+    it('should not round fractional seconds', () => {
+      expect(formatDate(3999, 'm:ss', 'en')).toEqual('0:03');
+      expect(formatDate(3999, 'm:ss.S', 'en')).toEqual('0:03.9');
+      expect(formatDate(3999, 'm:ss.SS', 'en')).toEqual('0:03.99');
+      expect(formatDate(3999, 'm:ss.SSS', 'en')).toEqual('0:03.999');
+      expect(formatDate(3000, 'm:ss', 'en')).toEqual('0:03');
+      expect(formatDate(3000, 'm:ss.S', 'en')).toEqual('0:03.0');
+      expect(formatDate(3000, 'm:ss.SS', 'en')).toEqual('0:03.00');
+      expect(formatDate(3000, 'm:ss.SSS', 'en')).toEqual('0:03.000');
+    });
   });
 });

From 505b54b86b034c798ae0f7a69f945681691ff61d Mon Sep 17 00:00:00 2001
From: Jamie Krug <jamiekrug@gmail.com>
Date: Fri, 2 Mar 2018 12:41:03 -0500
Subject: [PATCH 450/582] docs: fix typos referencing inline component styles
 (#22557)

PR Close #22557
---
 aio/content/guide/component-styles.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/component-styles.md b/aio/content/guide/component-styles.md
index f7d564fca1..444da23b60 100644
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@@ -164,7 +164,7 @@ They are _not inherited_ by any components nested within the template nor by any
 
 </div>
 
-The CLI defines an empty `styles` array when you create the component with the `--inline-styles` flag.
+The CLI defines an empty `styles` array when you create the component with the `--inline-style` flag.
 
 <code-example language="sh" class="code-shell">
 ng generate component hero-app --inline-style
@@ -189,7 +189,7 @@ They are _not inherited_ by any components nested within the template nor by any
 
 <div class="l-sub-section">
 
-  You can specify more than one styles file or even a combination of `style` and `styleUrls`.
+  You can specify more than one styles file or even a combination of `styles` and `styleUrls`.
 
 </div>
 

From 86d254d3866fee4271c2e643c385dbaa8970b7b5 Mon Sep 17 00:00:00 2001
From: sergeome <sergeome@gmail.com>
Date: Tue, 10 Apr 2018 05:01:07 -0500
Subject: [PATCH 451/582] fix(router): add ability to recover from malformed
 url (#23283)

Fixes #21468

PR Close #23283
---
 packages/router/src/router.ts                 | 28 +++++++++++--
 packages/router/src/router_module.ts          | 18 +++++++-
 packages/router/test/integration.spec.ts      | 42 ++++++++++++++++++-
 .../testing/src/router_testing_module.ts      | 14 +++++--
 tools/public_api_guard/router/router.d.ts     |  2 +
 5 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index bbdd53a315..962ffab889 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -160,6 +160,11 @@ function defaultErrorHandler(error: any): any {
   throw error;
 }
 
+function defaultMalformedUriErrorHandler(
+    error: URIError, urlSerializer: UrlSerializer, url: string): UrlTree {
+  return urlSerializer.parse('/');
+}
+
 type NavStreamValue =
     boolean | {appliedUrl: UrlTree, snapshot: RouterStateSnapshot, shouldActivate?: boolean};
 
@@ -230,7 +235,14 @@ export class Router {
    */
   errorHandler: ErrorHandler = defaultErrorHandler;
 
-
+  /**
+   * Malformed uri error handler is invoked when `Router.parseUrl(url)` throws an
+   * error due to containing an invalid character. The most common case would be a `%` sign
+   * that's not encoded and is not part of a percent encoded sequence.
+   */
+  malformedUriErrorHandler:
+      (error: URIError, urlSerializer: UrlSerializer,
+       url: string) => UrlTree = defaultMalformedUriErrorHandler;
 
   /**
    * Indicates if at least one navigation happened.
@@ -325,7 +337,7 @@ export class Router {
     // run into ngZone
     if (!this.locationSubscription) {
       this.locationSubscription = <any>this.location.subscribe((change: any) => {
-        const rawUrlTree = this.urlSerializer.parse(change['url']);
+        let rawUrlTree = this.parseUrl(change['url']);
         const source: NavigationTrigger = change['type'] === 'popstate' ? 'popstate' : 'hashchange';
         const state = change.state && change.state.navigationId ?
             {navigationId: change.state.navigationId} :
@@ -503,7 +515,15 @@ export class Router {
   serializeUrl(url: UrlTree): string { return this.urlSerializer.serialize(url); }
 
   /** Parses a string into a `UrlTree` */
-  parseUrl(url: string): UrlTree { return this.urlSerializer.parse(url); }
+  parseUrl(url: string): UrlTree {
+    let urlTree: UrlTree;
+    try {
+      urlTree = this.urlSerializer.parse(url);
+    } catch (e) {
+      urlTree = this.malformedUriErrorHandler(e, this.urlSerializer, url);
+    }
+    return urlTree;
+  }
 
   /** Returns whether the url is activated */
   isActive(url: string|UrlTree, exact: boolean): boolean {
@@ -511,7 +531,7 @@ export class Router {
       return containsTree(this.currentUrlTree, url, exact);
     }
 
-    const urlTree = this.urlSerializer.parse(url);
+    const urlTree = this.parseUrl(url);
     return containsTree(this.currentUrlTree, urlTree, exact);
   }
 
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index 22ed2210a3..e1ea750a94 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -25,7 +25,7 @@ import {NoPreloading, PreloadAllModules, PreloadingStrategy, RouterPreloader} fr
 import {RouterScroller} from './router_scroller';
 import {ActivatedRoute} from './router_state';
 import {UrlHandlingStrategy} from './url_handling_strategy';
-import {DefaultUrlSerializer, UrlSerializer} from './url_tree';
+import {DefaultUrlSerializer, UrlSerializer, UrlTree} from './url_tree';
 import {flatten} from './utils/collection';
 
 
@@ -393,6 +393,18 @@ export interface ExtraOptions {
    * - `'always'`, enables unconditional inheritance of parent params.
    */
   paramsInheritanceStrategy?: 'emptyOnly'|'always';
+
+  /**
+   * A custom malformed uri error handler function. This handler is invoked when encodedURI contains
+   * invalid character sequences. The default implementation is to redirect to the root url dropping
+   * any path or param info. This function passes three parameters:
+   *
+   * - `'URIError'` - Error thrown when parsing a bad URL
+   * - `'UrlSerializer'` - UrlSerializer that’s configured with the router.
+   * - `'url'` -  The malformed URL that caused the URIError
+   * */
+  malformedUriErrorHandler?:
+      (error: URIError, urlSerializer: UrlSerializer, url: string) => UrlTree;
 }
 
 export function setupRouter(
@@ -415,6 +427,10 @@ export function setupRouter(
     router.errorHandler = opts.errorHandler;
   }
 
+  if (opts.malformedUriErrorHandler) {
+    router.malformedUriErrorHandler = opts.malformedUriErrorHandler;
+  }
+
   if (opts.enableTracing) {
     const dom = getDOM();
     router.events.subscribe((e: RouterEvent) => {
diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
index 4d16d5474f..6797458a45 100644
--- a/packages/router/test/integration.spec.ts
+++ b/packages/router/test/integration.spec.ts
@@ -12,7 +12,7 @@ import {ChangeDetectionStrategy, Component, Injectable, NgModule, NgModuleFactor
 import {ComponentFixture, TestBed, fakeAsync, inject, tick} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, CanActivate, CanDeactivate, ChildActivationEnd, ChildActivationStart, DetachedRouteHandle, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, PRIMARY_OUTLET, ParamMap, Params, PreloadAllModules, PreloadingStrategy, Resolve, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterEvent, RouterModule, RouterPreloader, RouterStateSnapshot, RoutesRecognized, RunGuardsAndResolvers, UrlHandlingStrategy, UrlSegmentGroup, UrlTree} from '@angular/router';
+import {ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, CanActivate, CanDeactivate, ChildActivationEnd, ChildActivationStart, DetachedRouteHandle, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, PRIMARY_OUTLET, ParamMap, Params, PreloadAllModules, PreloadingStrategy, Resolve, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterEvent, RouterModule, RouterPreloader, RouterStateSnapshot, RoutesRecognized, RunGuardsAndResolvers, UrlHandlingStrategy, UrlSegmentGroup, UrlSerializer, UrlTree} from '@angular/router';
 import {Observable, Observer, of } from 'rxjs';
 import {map} from 'rxjs/operators';
 
@@ -1006,6 +1006,30 @@ describe('Integration', () => {
        expectEvents(recordedEvents, [[NavigationStart, '/invalid'], [NavigationError, '/invalid']]);
      })));
 
+  it('should recover from malformed uri errors',
+     fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
+       router.resetConfig([{path: 'simple', component: SimpleCmp}]);
+       const fixture = createRoot(router, RootCmp);
+       router.navigateByUrl('/invalid/url%with%percent');
+       advance(fixture);
+       expect(location.path()).toEqual('/');
+     })));
+
+  it('should support custom malformed uri error handler',
+     fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
+       const customMalformedUriErrorHandler =
+           (e: URIError, urlSerializer: UrlSerializer, url: string):
+               UrlTree => { return urlSerializer.parse('/?error=The-URL-you-went-to-is-invalid'); };
+       router.malformedUriErrorHandler = customMalformedUriErrorHandler;
+
+       router.resetConfig([{path: 'simple', component: SimpleCmp}]);
+
+       const fixture = createRoot(router, RootCmp);
+       router.navigateByUrl('/invalid/url%with%percent');
+       advance(fixture);
+       expect(location.path()).toEqual('/?error=The-URL-you-went-to-is-invalid');
+     })));
+
   it('should not swallow errors', fakeAsync(inject([Router], (router: Router) => {
        const fixture = createRoot(router, RootCmp);
 
@@ -3934,6 +3958,22 @@ describe('Testing router options', () => {
          expect(router.paramsInheritanceStrategy).toEqual('always');
        })));
   });
+
+  describe('malformedUriErrorHandler', () => {
+
+    function malformedUriErrorHandler(e: URIError, urlSerializer: UrlSerializer, url: string) {
+      return urlSerializer.parse('/error');
+    }
+
+    beforeEach(() => {
+      TestBed.configureTestingModule(
+          {imports: [RouterTestingModule.withRoutes([], {malformedUriErrorHandler})]});
+    });
+
+    it('should configure the router', fakeAsync(inject([Router], (router: Router) => {
+         expect(router.malformedUriErrorHandler).toBe(malformedUriErrorHandler);
+       })));
+  });
 });
 
 function expectEvents(events: Event[], pairs: any[]) {
diff --git a/packages/router/testing/src/router_testing_module.ts b/packages/router/testing/src/router_testing_module.ts
index 3ec89852f7..ef4c5ab387 100644
--- a/packages/router/testing/src/router_testing_module.ts
+++ b/packages/router/testing/src/router_testing_module.ts
@@ -115,12 +115,20 @@ export function setupTestingRouter(
     opts?: ExtraOptions | UrlHandlingStrategy, urlHandlingStrategy?: UrlHandlingStrategy) {
   const router = new Router(
       null !, urlSerializer, contexts, location, injector, loader, compiler, flatten(routes));
-  // Handle deprecated argument ordering.
   if (opts) {
+    // Handle deprecated argument ordering.
     if (isUrlHandlingStrategy(opts)) {
       router.urlHandlingStrategy = opts;
-    } else if (opts.paramsInheritanceStrategy) {
-      router.paramsInheritanceStrategy = opts.paramsInheritanceStrategy;
+    } else {
+      // Handle ExtraOptions
+
+      if (opts.malformedUriErrorHandler) {
+        router.malformedUriErrorHandler = opts.malformedUriErrorHandler;
+      }
+
+      if (opts.paramsInheritanceStrategy) {
+        router.paramsInheritanceStrategy = opts.paramsInheritanceStrategy;
+      }
     }
   }
 
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index aa15b85b3b..1236127df2 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -115,6 +115,7 @@ export interface ExtraOptions {
     enableTracing?: boolean;
     errorHandler?: ErrorHandler;
     initialNavigation?: InitialNavigation;
+    malformedUriErrorHandler?: (error: URIError, urlSerializer: UrlSerializer, url: string) => UrlTree;
     onSameUrlNavigation?: 'reload' | 'ignore';
     paramsInheritanceStrategy?: 'emptyOnly' | 'always';
     preloadingStrategy?: any;
@@ -314,6 +315,7 @@ export declare class Router {
     config: Routes;
     errorHandler: ErrorHandler;
     readonly events: Observable<Event>;
+    malformedUriErrorHandler: (error: URIError, urlSerializer: UrlSerializer, url: string) => UrlTree;
     navigated: boolean;
     onSameUrlNavigation: 'reload' | 'ignore';
     paramsInheritanceStrategy: 'emptyOnly' | 'always';

From ffb9dc6cf95ebd2b3f051eae4981ec52852b6b9f Mon Sep 17 00:00:00 2001
From: Jamie Krug <jamiekrug@gmail.com>
Date: Wed, 7 Mar 2018 13:37:28 -0500
Subject: [PATCH 452/582] docs: fix incorrect forms selector references
 (#22631)

PR Close #22631
---
 aio/content/guide/forms.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aio/content/guide/forms.md b/aio/content/guide/forms.md
index 7dc58f3ca3..66a1e36f10 100644
--- a/aio/content/guide/forms.md
+++ b/aio/content/guide/forms.md
@@ -152,7 +152,8 @@ nothing to distinguish it from any component you've written before.
 Understanding this component requires only the Angular concepts covered in previous pages.
 
 * The code imports the Angular core library and the `Hero` model you just created.
-* The `@Component` selector value of "hero-form" means you can drop this form in a parent template with a `<hero-form>` tag.
+* The `@Component` selector value of "app-hero-form" means you can drop this form in a parent
+template with a `<app-hero-form>` tag.
 * The `templateUrl` property points to a separate file for the template HTML.
 * You defined dummy data for `model` and `powers`, as befits a demo.
 

From 3f8ab80583593d3e8f0bfa1f80d7fbf8d669cf09 Mon Sep 17 00:00:00 2001
From: Daniel Sogl <daniel@sogls.de>
Date: Tue, 13 Mar 2018 15:54:33 +0100
Subject: [PATCH 453/582] docs(aio): unified string chaining (#22735) PR Close
 #22735

---
 aio/content/examples/universal/src/app/hero.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/universal/src/app/hero.service.ts b/aio/content/examples/universal/src/app/hero.service.ts
index 5519f1c105..5762d04f09 100644
--- a/aio/content/examples/universal/src/app/hero.service.ts
+++ b/aio/content/examples/universal/src/app/hero.service.ts
@@ -123,6 +123,6 @@ export class HeroService {
 
   /** Log a HeroService message with the MessageService */
   private log(message: string) {
-    this.messageService.add('HeroService: ' + message);
+    this.messageService.add(`HeroService: ${message}`);
   }
 }

From b7823e70871183fc9cab706b7a5a0c5ed01ade1b Mon Sep 17 00:00:00 2001
From: Daniel Sogl <daniel@sogls.de>
Date: Tue, 13 Mar 2018 15:55:41 +0100
Subject: [PATCH 454/582] docs: unified string chaining (#22735)

PR Close #22735
---
 aio/content/examples/toh-pt6/src/app/hero.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/toh-pt6/src/app/hero.service.ts b/aio/content/examples/toh-pt6/src/app/hero.service.ts
index 6fd1607217..80d511c776 100644
--- a/aio/content/examples/toh-pt6/src/app/hero.service.ts
+++ b/aio/content/examples/toh-pt6/src/app/hero.service.ts
@@ -151,7 +151,7 @@ export class HeroService {
   // #docregion log
   /** Log a HeroService message with the MessageService */
   private log(message: string) {
-    this.messageService.add('HeroService: ' + message);
+    this.messageService.add(`HeroService: ${message}`);
   }
   // #enddocregion log
 }

From 81a9db2b0a2f62874bba92fd7dddb0bca00d1488 Mon Sep 17 00:00:00 2001
From: Tyler Akins <fidian@rumkin.com>
Date: Tue, 12 Jun 2018 15:11:13 -0500
Subject: [PATCH 455/582] docs(forms): added missing backtick (#24451)

Fixed trivial markdown problem with a missing backtick.

PR Close #24451
---
 packages/forms/src/directives/validators.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/forms/src/directives/validators.ts b/packages/forms/src/directives/validators.ts
index 74bd818b55..2297c42b58 100644
--- a/packages/forms/src/directives/validators.ts
+++ b/packages/forms/src/directives/validators.ts
@@ -242,9 +242,8 @@ export const MAX_LENGTH_VALIDATOR: any = {
 };
 
 /**
- * A directive which installs the `MaxLengthValidator` for any `formControlName,
- * `formControl`,
- * or control with `ngModel` that also has a `maxlength` attribute.
+ * A directive which installs the `MaxLengthValidator` for any `formControlName`,
+ * `formControl`, or control with `ngModel` that also has a `maxlength` attribute.
  *
  *
  */

From 05e3e4d71eb84617a7d3191b0ed90c65307423ba Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 28 Jun 2018 15:34:58 -0500
Subject: [PATCH 456/582] docs(forms): update API reference for form validators
 (#24734)

PR Close #24734
---
 packages/forms/src/validators.ts | 218 +++++++++++++++++++++++++------
 1 file changed, 181 insertions(+), 37 deletions(-)

diff --git a/packages/forms/src/validators.ts b/packages/forms/src/validators.ts
index bf432271a2..d871f0daa7 100644
--- a/packages/forms/src/validators.ts
+++ b/packages/forms/src/validators.ts
@@ -18,37 +18,39 @@ function isEmptyInputValue(value: any): boolean {
 }
 
 /**
- * Providers for validators to be used for `FormControl`s in a form.
+ * @description
+ * An `InjectionToken` for registering additional synchronous validators used with `AbstractControl`s.
  *
- * Provide this using `multi: true` to add validators.
- *
- * ### Example
+ * @see `NG_ASYNC_VALIDATORS`
+ * 
+ * @usageNotes
+ * 
+ * ### Providing a custom validator
+ * 
+ * The following example registers a custom validator directive. Adding the validator to the 
+ * existing collection of validators requires the `multi: true` option.
  *
  * ```typescript
  * @Directive({
- *   selector: '[custom-validator]',
+ *   selector: '[customValidator]',
  *   providers: [{provide: NG_VALIDATORS, useExisting: CustomValidatorDirective, multi: true}]
  * })
  * class CustomValidatorDirective implements Validator {
  *   validate(control: AbstractControl): ValidationErrors | null {
- *     return {"custom": true};
+ *     return { 'custom': true };
  *   }
  * }
  * ```
  *
- *
  */
 export const NG_VALIDATORS = new InjectionToken<Array<Validator|Function>>('NgValidators');
 
 /**
- * Providers for asynchronous validators to be used for `FormControl`s
- * in a form.
- *
- * Provide this using `multi: true` to add validators.
- *
- * See `NG_VALIDATORS` for more details.
- *
+ * @description
+ * An `InjectionToken` for registering additional asynchronous validators used with `AbstractControl`s.
  *
+ * @see `NG_VALIDATORS`
+ * 
  */
 export const NG_ASYNC_VALIDATORS =
     new InjectionToken<Array<Validator|Function>>('NgAsyncValidators');
@@ -57,24 +59,34 @@ const EMAIL_REGEXP =
     /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
 
 /**
- * Provides a set of validators used by form controls.
+ * @description
+ * Provides a set of built-in validators that can be used by form controls.
  *
  * A validator is a function that processes a `FormControl` or collection of
- * controls and returns a map of errors. A null map means that validation has passed.
- *
- * ### Example
- *
- * ```typescript
- * var loginControl = new FormControl("", Validators.required)
- * ```
- *
+ * controls and returns an error map or null. A null map means that validation has passed.
+ * 
+ * @see [Form Validation](/guide/form-validation)
  *
  */
 export class Validators {
   /**
-   * Validator that requires controls to have a value greater than a number.
-   *`min()` exists only as a function, not as a directive. For example,
-   * `control = new FormControl('', Validators.min(3));`.
+   * @description
+   * Validator that requires the control's value to be greater than or equal to the provided number.
+   * The validator exists only as a function and not as a directive.
+   *
+   * @usageNotes
+   *
+   * ### Validate against a minimum of 3
+   *
+   * ```typescript
+   * const control = new FormControl(2, Validators.min(3));
+   *
+   * console.log(control.errors); // {min: {min: 3, actual: 2}}
+   * ```
+   *
+   * @returns A validator function that returns an error map with the
+   * `min` property if the validation check fails, otherwise `null`.
+   *
    */
   static min(min: number): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
@@ -89,9 +101,23 @@ export class Validators {
   }
 
   /**
-   * Validator that requires controls to have a value less than a number.
-   * `max()` exists only as a function, not as a directive. For example,
-   * `control = new FormControl('', Validators.max(15));`.
+   * @description
+   * Validator that requires the control's value to be less than or equal to the provided number.
+   * The validator exists only as a function and not as a directive.
+   *
+   * @usageNotes
+   *
+   * ### Validate against a maximum of 15
+   *
+   * ```typescript
+   * const control = new FormControl(16, Validators.max(15));
+   *
+   * console.log(control.errors); // {max: {max: 15, actual: 16}}
+   * ```
+   *
+   * @returns A validator function that returns an error map with the
+   * `max` property if the validation check fails, otherwise `null`.
+   *
    */
   static max(max: number): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
@@ -106,21 +132,66 @@ export class Validators {
   }
 
   /**
-   * Validator that requires controls to have a non-empty value.
+   * @description
+   * Validator that requires the control have a non-empty value.
+   *
+   * @usageNotes
+   *
+   * ### Validate that the field is non-empty
+   *
+   * ```typescript
+   * const control = new FormControl('', Validators.required);
+   *
+   * console.log(control.errors); // {required: true}
+   * ```
+   *
+   * @returns An error map with the `required` property
+   * if the validation check fails, otherwise `null`.
+   *
    */
   static required(control: AbstractControl): ValidationErrors|null {
     return isEmptyInputValue(control.value) ? {'required': true} : null;
   }
 
   /**
-   * Validator that requires control value to be true.
+   * @description
+   * Validator that requires the control's value be true. This validator is commonly
+   * used for required checkboxes.
+   *
+   * @usageNotes
+   *
+   * ### Validate that the field value is true
+   *
+   * ```typescript
+   * const control = new FormControl('', Validators.requiredTrue);
+   *
+   * console.log(control.errors); // {required: true}
+   * ```
+   *
+   * @returns An error map that contains the `required` property
+   * set to `true` if the validation check fails, otherwise `null`.
    */
   static requiredTrue(control: AbstractControl): ValidationErrors|null {
     return control.value === true ? null : {'required': true};
   }
 
   /**
-   * Validator that performs email validation.
+   * @description
+   * Validator that requires the control's value pass an email validation test.
+   *
+   * @usageNotes
+   *
+   * ### Validate that the field matches a valid email pattern
+   *
+   * ```typescript
+   * const control = new FormControl('bad@', Validators.email);
+   *
+   * console.log(control.errors); // {email: true}
+   * ```
+   *
+   * @returns An error map with the `email` property
+   * if the validation check fails, otherwise `null`.
+   *
    */
   static email(control: AbstractControl): ValidationErrors|null {
     if (isEmptyInputValue(control.value)) {
@@ -130,7 +201,27 @@ export class Validators {
   }
 
   /**
-   * Validator that requires controls to have a value of a minimum length.
+   * @description
+   * Validator that requires the length of the control's value to be greater than or equal
+   * to the provided minimum length. This validator is also provided by default if you use the
+   * the HTML5 `minlength` attribute.
+   *
+   * @usageNotes
+   *
+   * ### Validate that the field has a minimum of 3 characters
+   *
+   * ```typescript
+   * const control = new FormControl('ng', Validators.minLength(3));
+   *
+   * console.log(control.errors); // {minlength: {requiredLength: 3, actualLength: 2}}
+   * ```
+   *
+   * ```html
+   * <input minlength="5">
+   * ```
+   *
+   * @returns A validator function that returns an error map with the
+   * `minlength` if the validation check fails, otherwise `null`.
    */
   static minLength(minLength: number): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
@@ -145,7 +236,27 @@ export class Validators {
   }
 
   /**
-   * Validator that requires controls to have a value of a maximum length.
+   * @description
+   * Validator that requires the length of the control's value to be less than or equal
+   * to the provided maximum length. This validator is also provided by default if you use the
+   * the HTML5 `maxlength` attribute.
+   *
+   * @usageNotes
+   *
+   * ### Validate that the field has maximum of 5 characters
+   *
+   * ```typescript
+   * const control = new FormControl('Angular', Validators.maxLength(5));
+   *
+   * console.log(control.errors); // {maxlength: {requiredLength: 5, actualLength: 7}}
+   * ```
+   *
+   * ```html
+   * <input maxlength="5">
+   * ```
+   *
+   * @returns A validator function that returns an error map with the
+   * `maxlength` property if the validation check fails, otherwise `null`.
    */
   static maxLength(maxLength: number): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
@@ -157,7 +268,27 @@ export class Validators {
   }
 
   /**
-   * Validator that requires a control to match a regex to its value.
+   * @description
+   * Validator that requires the control's value to match a regex pattern. This validator is also
+   * provided
+   * by default if you use the HTML5 `pattern` attribute.
+   *
+   * @usageNotes
+   *
+   * ### Validate that the field only contains letters or spaces
+   *
+   * ```typescript
+   * const control = new FormControl('1', Validators.pattern('[a-zA-Z ]*'));
+   *
+   * console.log(control.errors); // {pattern: {requiredPattern: '^[a-zA-Z ]*$', actualValue: '1'}}
+   * ```
+   *
+   * ```html
+   * <input pattern="[a-zA-Z ]*">
+   * ```
+   *
+   * @returns A validator function that returns an error map with the
+   * `pattern` property if the validation check fails, otherwise `null`.
    */
   static pattern(pattern: string|RegExp): ValidatorFn {
     if (!pattern) return Validators.nullValidator;
@@ -188,13 +319,18 @@ export class Validators {
   }
 
   /**
-   * No-op validator.
+   * @description
+   * Validator that performs no operation.
    */
   static nullValidator(c: AbstractControl): ValidationErrors|null { return null; }
 
   /**
+   * @description
    * Compose multiple validators into a single function that returns the union
-   * of the individual error maps.
+   * of the individual error maps for the provided control.
+   *
+   * @returns A validator function that returns an error map with the
+   * merged error maps of the validators if the validation check fails, otherwise `null`.
    */
   static compose(validators: null): null;
   static compose(validators: (ValidatorFn|null|undefined)[]): ValidatorFn|null;
@@ -208,6 +344,14 @@ export class Validators {
     };
   }
 
+  /**
+   * @description
+   * Compose multiple async validators into a single function that returns the union
+   * of the individual error objects for the provided control.
+   *
+   * @returns A validator function that returns an error map with the
+   * merged error objects of the async validators if the validation check fails, otherwise `null`.
+  */
   static composeAsync(validators: (AsyncValidatorFn|null)[]): AsyncValidatorFn|null {
     if (!validators) return null;
     const presentValidators: AsyncValidatorFn[] = validators.filter(isPresent) as any;

From b9e095aa31f0706307fb4633ccd02b645b915d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 11 Jul 2018 13:43:59 -0700
Subject: [PATCH 457/582] release: cut the v6.0.8 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3389c97134..e25ac6d4a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+<a name="6.0.8"></a>
+## [6.0.8](https://github.com/angular/angular/compare/6.0.7...6.0.8) (2018-07-11)
+
+
+### Bug Fixes
+
+* **common:** do not round factional seconds ([#24831](https://github.com/angular/angular/issues/24831)) ([0746485](https://github.com/angular/angular/commit/0746485)), closes [#24384](https://github.com/angular/angular/issues/24384)
+* **common:** properly update collection reference in NgForOf ([#24684](https://github.com/angular/angular/issues/24684)) ([9a98de9](https://github.com/angular/angular/commit/9a98de9)), closes [#24155](https://github.com/angular/angular/issues/24155)
+* **common:** use correct currency format for locale de-AT ([#24658](https://github.com/angular/angular/issues/24658)) ([a92f111](https://github.com/angular/angular/commit/a92f111)), closes [#24609](https://github.com/angular/angular/issues/24609)
+* **compiler-cli:** Use typescript to resolve modules for metadata ([#22856](https://github.com/angular/angular/issues/22856)) ([7717ff1](https://github.com/angular/angular/commit/7717ff1))
+* **core:** use addCustomEqualityTester instead of overriding toEqual ([#22983](https://github.com/angular/angular/issues/22983)) ([b8975a9](https://github.com/angular/angular/commit/b8975a9)), closes [#22939](https://github.com/angular/angular/issues/22939)
+* **language-service:** do not overwrite native `Reflect` ([#24299](https://github.com/angular/angular/issues/24299)) ([de1c44f](https://github.com/angular/angular/commit/de1c44f)), closes [#21420](https://github.com/angular/angular/issues/21420)
+* **router:** add ability to recover from malformed url ([#23283](https://github.com/angular/angular/issues/23283)) ([2d4f4b5](https://github.com/angular/angular/commit/2d4f4b5)), closes [#21468](https://github.com/angular/angular/issues/21468)
+* **service-worker:** avoid network requests when looking up hashed resources in cache ([#24127](https://github.com/angular/angular/issues/24127)) ([183b079](https://github.com/angular/angular/commit/183b079))
+
+
+### Features
+
+* **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([6c55a13](https://github.com/angular/angular/commit/6c55a13))
+
+
 <a name="6.1.0-beta.3"></a>
 # [6.1.0-beta.3](https://github.com/angular/angular/compare/6.1.0-beta.2...6.1.0-beta.3) (2018-06-28)
 

From 0b4d85e9f19246af68a75140afc4db3d97f9ddfd Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 11 Jul 2018 08:58:30 -0700
Subject: [PATCH 458/582] fix(common): format fractional seconds (#24844)

fix a bug introduced in #24831

PR Close #24844
---
 packages/common/src/i18n/format_date.ts       | 19 ++++---------------
 packages/common/test/i18n/format_date_spec.ts |  4 ++++
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/common/src/i18n/format_date.ts b/packages/common/src/i18n/format_date.ts
index 48fb90838b..54c41ecf0e 100644
--- a/packages/common/src/i18n/format_date.ts
+++ b/packages/common/src/i18n/format_date.ts
@@ -193,20 +193,9 @@ function padNumber(
   return neg + strNum;
 }
 
-/**
- * Trim a fractional part to `digits` number of digits.
- * Right pads with "0" to fit the requested number of digits if needed.
- *
- * @param num The fractional part value
- * @param digits The width of the output
- */
-function trimRPadFractional(num: number, digits: number): string {
-  let strNum = String(num);
-  // Add padding at the end
-  while (strNum.length < digits) {
-    strNum = strNum + 0;
-  }
-  return strNum.substr(0, digits);
+function formatFractionalSeconds(milliseconds: number, digits: number): string {
+  const strMs = padNumber(milliseconds, 3);
+  return strMs.substr(0, digits);
 }
 
 /**
@@ -226,7 +215,7 @@ function dateGetter(
         part = 12;
       }
     } else if (name === DateType.FractionalSeconds) {
-      return trimRPadFractional(part, size);
+      return formatFractionalSeconds(part, size);
     }
 
     const localeMinus = getLocaleNumberSymbol(locale, NumberSymbol.MinusSign);
diff --git a/packages/common/test/i18n/format_date_spec.ts b/packages/common/test/i18n/format_date_spec.ts
index dbac3fdd7d..02219f5751 100644
--- a/packages/common/test/i18n/format_date_spec.ts
+++ b/packages/common/test/i18n/format_date_spec.ts
@@ -319,6 +319,10 @@ describe('Format date', () => {
       expect(formatDate(3000, 'm:ss.S', 'en')).toEqual('0:03.0');
       expect(formatDate(3000, 'm:ss.SS', 'en')).toEqual('0:03.00');
       expect(formatDate(3000, 'm:ss.SSS', 'en')).toEqual('0:03.000');
+      expect(formatDate(3001, 'm:ss', 'en')).toEqual('0:03');
+      expect(formatDate(3001, 'm:ss.S', 'en')).toEqual('0:03.0');
+      expect(formatDate(3001, 'm:ss.SS', 'en')).toEqual('0:03.00');
+      expect(formatDate(3001, 'm:ss.SSS', 'en')).toEqual('0:03.001');
     });
   });
 });

From a14f25c33880739a722ba1d188f83ab783aa2051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 11 Jul 2018 14:20:42 -0700
Subject: [PATCH 459/582] release: cut the v6.1.0-rc.0 release

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 package.json |  4 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e25ac6d4a2..8cab15b56c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+<a name="6.1.0-rc.0"></a>
+# [6.1.0-rc.0](https://github.com/angular/angular/compare/6.1.0-beta.3...6.1.0-rc.0) (2018-07-11)
+
+
+### Bug Fixes
+
+* **common:** do not round factional seconds ([#24831](https://github.com/angular/angular/issues/24831)) ([a527c69](https://github.com/angular/angular/commit/a527c69)), closes [#24384](https://github.com/angular/angular/issues/24384)
+* **common:** properly update collection reference in NgForOf ([#24684](https://github.com/angular/angular/issues/24684)) ([ff84c5c](https://github.com/angular/angular/commit/ff84c5c)), closes [#24155](https://github.com/angular/angular/issues/24155)
+* **common:** use correct currency format for locale de-AT ([#24658](https://github.com/angular/angular/issues/24658)) ([dcabb05](https://github.com/angular/angular/commit/dcabb05)), closes [#24609](https://github.com/angular/angular/issues/24609)
+* **compiler:** fix a few non-tree-shakeable code patterns ([#24677](https://github.com/angular/angular/issues/24677)) ([50d4a4f](https://github.com/angular/angular/commit/50d4a4f))
+* **compiler-cli:** Use typescript to resolve modules for metadata ([#22856](https://github.com/angular/angular/issues/22856)) ([0d5f2d3](https://github.com/angular/angular/commit/0d5f2d3))
+* **core:** mark NgModule as not the root if APP_ROOT is set to false ([#24814](https://github.com/angular/angular/issues/24814)) ([1089261](https://github.com/angular/angular/commit/1089261))
+* **core:** use addCustomEqualityTester instead of overriding toEqual ([#22983](https://github.com/angular/angular/issues/22983)) ([0922228](https://github.com/angular/angular/commit/0922228)), closes [#22939](https://github.com/angular/angular/issues/22939)
+* **language-service:** do not overwrite native `Reflect` ([#24299](https://github.com/angular/angular/issues/24299)) ([6881404](https://github.com/angular/angular/commit/6881404)), closes [#21420](https://github.com/angular/angular/issues/21420)
+* **platform-browser:** add missing deps for HammerGesturesPlugin ([#24682](https://github.com/angular/angular/issues/24682)) ([13d60ea](https://github.com/angular/angular/commit/13d60ea))
+* **platform-browser:** mark Meta and Title services as tree shakable providers ([#24815](https://github.com/angular/angular/issues/24815)) ([197387d](https://github.com/angular/angular/commit/197387d))
+* **platform-browser:** workaround wrong import path generated by ngc for DOCUMENT ([#24830](https://github.com/angular/angular/issues/24830)) ([7d27ecc](https://github.com/angular/angular/commit/7d27ecc))
+* **router:** add ability to recover from malformed url ([#23283](https://github.com/angular/angular/issues/23283)) ([86d254d](https://github.com/angular/angular/commit/86d254d)), closes [#21468](https://github.com/angular/angular/issues/21468)
+* **service-worker:** avoid network requests when looking up hashed resources in cache ([#24127](https://github.com/angular/angular/issues/24127)) ([52d43a9](https://github.com/angular/angular/commit/52d43a9))
+
+
+### Features
+
+* **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([3553977](https://github.com/angular/angular/commit/3553977))
+* **core:** add support for using async/await with Jasmine ([#24637](https://github.com/angular/angular/issues/24637)) ([71100e6](https://github.com/angular/angular/commit/71100e6))
+* typescript 2.9 support ([#24652](https://github.com/angular/angular/issues/24652)) ([e3064d5](https://github.com/angular/angular/commit/e3064d5))
+* **service-worker:** add support for `?` in SW config globbing ([#24105](https://github.com/angular/angular/issues/24105)) ([250527c](https://github.com/angular/angular/commit/250527c))
+
+
+
 <a name="6.0.8"></a>
 ## [6.0.8](https://github.com/angular/angular/compare/6.0.7...6.0.8) (2018-07-11)
 
diff --git a/package.json b/package.json
index 3514b57f76..e9d9072de4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.1.0-beta.3",
+  "version": "6.1.0-rc.0",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -124,4 +124,4 @@
     "xhr2": "0.1.4",
     "yargs": "9.0.1"
   }
-}
+}
\ No newline at end of file

From 52d11f63cf18596d9fb7900de1f589ad77bd18ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 11 Jul 2018 14:34:14 -0700
Subject: [PATCH 460/582] release: cut the v6.0.9 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cab15b56c..df46098787 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="6.0.9"></a>
+## [6.0.9](https://github.com/angular/angular/compare/6.0.8...6.0.9) (2018-07-11)
+
+
+### Bug Fixes
+* **common:** format fractional seconds ([#24844](https://github.com/angular/angular/issues/24844)) ([3c93d07](https://github.com/angular/angular/commit/3c93d07)), closes [#24831](https://github.com/angular/angular/issues/24831)
+
+
+
 <a name="6.1.0-rc.0"></a>
 # [6.1.0-rc.0](https://github.com/angular/angular/compare/6.1.0-beta.3...6.1.0-rc.0) (2018-07-11)
 

From 0d6b74dd87414ca69e7f45925c76fa1359dfc460 Mon Sep 17 00:00:00 2001
From: Arun Kumar <palerdot@users.noreply.github.com>
Date: Wed, 11 Jul 2018 11:41:18 +0530
Subject: [PATCH 461/582] docs: fix typo in component architecture guide
 (#24832)

Change the sentence from 'this tells Angular how provide ...' to 'this tells Angular how to provide ...'. The current sentence does not make grammatical sense.

PR Close #24832
---
 aio/content/guide/architecture-components.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/architecture-components.md b/aio/content/guide/architecture-components.md
index b13a696671..7b8e808f35 100644
--- a/aio/content/guide/architecture-components.md
+++ b/aio/content/guide/architecture-components.md
@@ -40,7 +40,7 @@ Angular inserts an instance of the `HeroListComponent` view between those tags.
 
 * `templateUrl`: The module-relative address of this component's HTML template. Alternatively, you can provide the HTML template inline, as the value of the `template` property. This template defines the component's _host view_.
 
-* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular how provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.  
+* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular how to provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.  
 
 <hr/>
 
@@ -177,4 +177,4 @@ or modify aspects of DOM elements and components
 
 You can also write your own directives. Components such as `HeroListComponent` are one kind of custom directive. You can also create custom structural and attribute directives.
 
-<!-- PENDING: link to where to learn more about other kinds! -->
\ No newline at end of file
+<!-- PENDING: link to where to learn more about other kinds! -->

From 4d8b8ad37291aa1c747054c8bb49477e3af6beec Mon Sep 17 00:00:00 2001
From: Rado Kirov <rkirov@gmail.com>
Date: Tue, 10 Jul 2018 14:21:00 -0700
Subject: [PATCH 462/582] build(bazel): Undo temporary dependency on unleased
 TS bazel rules (#24826)

Point to a proper new release version 0.15.1.

PR Close #24826
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 48dc7cad02..ef86aed344 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/rkirov/rules_typescript/archive/v0.16.0.zip",
-    strip_prefix = "rules_typescript-0.16.0",
-    sha256 = "f5aedd3a792e5af19cd0c0f0318cb692e2989e816e896e794152d07808fccacd",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.1.zip",
+    strip_prefix = "rules_typescript-0.15.1",
+    sha256 = "3792cc20ef13bb1d1d8b1760894c3320f02a87843e3a04fed7e8e454a75328b6",
 )
 
 http_archive(

From 328971ffcc6f327a9dfa74f215df4fdefd8d85ee Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Tue, 10 Jul 2018 09:44:15 -0700
Subject: [PATCH 463/582] feat(router): add urlUpdateStrategy allow updating
 the browser URL at the beginning of navigation (#24820)

Fixes #24616

PR Close #24820
---
 packages/router/src/router.ts             |  33 ++++-
 packages/router/src/router_module.ts      |  16 +++
 packages/router/test/integration.spec.ts  | 163 +++++++++++++---------
 tools/public_api_guard/router/router.d.ts |   2 +
 4 files changed, 141 insertions(+), 73 deletions(-)

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index 962ffab889..cd8fb98aa4 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -285,6 +285,18 @@ export class Router {
    */
   paramsInheritanceStrategy: 'emptyOnly'|'always' = 'emptyOnly';
 
+  /**
+   * Defines when the router updates the browser URL. The default behavior is to update after
+   * successful navigation. However, some applications may prefer a mode where the URL gets
+   * updated at the beginning of navigation. The most common use case would be updating the
+   * URL early so if navigation fails, you can show an error message with the URL that failed.
+   * Available options are:
+   *
+   * - `'deferred'`, the default, updates the browser URL after navigation has finished.
+   * - `'eager'`, updates browser URL at the beginning of navigation.
+   */
+  urlUpdateStrategy: 'deferred'|'eager' = 'deferred';
+
   /**
    * Creates the router service.
    */
@@ -610,6 +622,9 @@ export class Router {
 
     if ((this.onSameUrlNavigation === 'reload' ? true : urlTransition) &&
         this.urlHandlingStrategy.shouldProcessUrl(rawUrl)) {
+      if (this.urlUpdateStrategy === 'eager' && !extras.skipLocationChange) {
+        this.setBrowserUrl(rawUrl, !!extras.replaceUrl, id);
+      }
       (this.events as Subject<Event>)
           .next(new NavigationStart(id, this.serializeUrl(url), source, state));
       Promise.resolve()
@@ -791,13 +806,8 @@ export class Router {
 
           (this as{routerState: RouterState}).routerState = state;
 
-          if (!skipLocationChange) {
-            const path = this.urlSerializer.serialize(this.rawUrlTree);
-            if (this.location.isCurrentPathEqualTo(path) || replaceUrl) {
-              this.location.replaceState(path, '', {navigationId: id});
-            } else {
-              this.location.go(path, '', {navigationId: id});
-            }
+          if (this.urlUpdateStrategy === 'deferred' && !skipLocationChange) {
+            this.setBrowserUrl(this.rawUrlTree, replaceUrl, id);
           }
 
           new ActivateRoutes(
@@ -843,6 +853,15 @@ export class Router {
             });
   }
 
+  private setBrowserUrl(url: UrlTree, replaceUrl: boolean, id: number) {
+    const path = this.urlSerializer.serialize(url);
+    if (this.location.isCurrentPathEqualTo(path) || replaceUrl) {
+      this.location.replaceState(path, '', {navigationId: id});
+    } else {
+      this.location.go(path, '', {navigationId: id});
+    }
+  }
+
   private resetStateAndUrl(storedState: RouterState, storedUrl: UrlTree, rawUrl: UrlTree): void {
     (this as{routerState: RouterState}).routerState = storedState;
     this.currentUrlTree = storedUrl;
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index e1ea750a94..73995ef7d3 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -405,6 +405,18 @@ export interface ExtraOptions {
    * */
   malformedUriErrorHandler?:
       (error: URIError, urlSerializer: UrlSerializer, url: string) => UrlTree;
+
+  /**
+   * Defines when the router updates the browser URL. The default behavior is to update after
+   * successful navigation. However, some applications may prefer a mode where the URL gets
+   * updated at the beginning of navigation. The most common use case would be updating the
+   * URL early so if navigation fails, you can show an error message with the URL that failed.
+   * Available options are:
+   *
+   * - `'deferred'`, the default, updates the browser URL after navigation has finished.
+   * - `'eager'`, updates browser URL at the beginning of navigation.
+   */
+  urlUpdateStrategy?: 'deferred'|'eager';
 }
 
 export function setupRouter(
@@ -449,6 +461,10 @@ export function setupRouter(
     router.paramsInheritanceStrategy = opts.paramsInheritanceStrategy;
   }
 
+  if (opts.urlUpdateStrategy) {
+    router.urlUpdateStrategy = opts.urlUpdateStrategy;
+  }
+
   return router;
 }
 
diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
index 6797458a45..f4977e38db 100644
--- a/packages/router/test/integration.spec.ts
+++ b/packages/router/test/integration.spec.ts
@@ -469,6 +469,31 @@ describe('Integration', () => {
        expect(fixture.nativeElement).toHaveText('team 33 [ , right:  ]');
      })));
 
+  it('should eagerly update the URL with urlUpdateStrategy="eagar"',
+     fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
+       const fixture = TestBed.createComponent(RootCmp);
+       advance(fixture);
+
+       router.resetConfig([{path: 'team/:id', component: TeamCmp}]);
+
+       router.navigateByUrl('/team/22');
+       advance(fixture);
+       expect(location.path()).toEqual('/team/22');
+
+       expect(fixture.nativeElement).toHaveText('team 22 [ , right:  ]');
+
+       router.urlUpdateStrategy = 'eager';
+       (router as any).hooks.beforePreactivation = () => {
+         expect(location.path()).toEqual('/team/33');
+         expect(fixture.nativeElement).toHaveText('team 22 [ , right:  ]');
+         return of (null);
+       };
+       router.navigateByUrl('/team/33');
+
+       advance(fixture);
+       expect(fixture.nativeElement).toHaveText('team 33 [ , right:  ]');
+     })));
+
   it('should navigate back and forward',
      fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
        const fixture = createRoot(router, RootCmp);
@@ -868,93 +893,99 @@ describe('Integration', () => {
        ]);
      })));
 
-  it('should dispatch NavigationError after the url has been reset back', fakeAsync(() => {
-       const router: Router = TestBed.get(Router);
-       const location: SpyLocation = TestBed.get(Location);
-       const fixture = createRoot(router, RootCmp);
+  // Errors should behave the same for both deferred and eager URL update strategies
+  ['deferred', 'eager'].forEach((strat: any) => {
+    it('should dispatch NavigationError after the url has been reset back', fakeAsync(() => {
+         const router: Router = TestBed.get(Router);
+         const location: SpyLocation = TestBed.get(Location);
+         const fixture = createRoot(router, RootCmp);
 
-       router.resetConfig(
-           [{path: 'simple', component: SimpleCmp}, {path: 'throwing', component: ThrowingCmp}]);
+         router.resetConfig(
+             [{path: 'simple', component: SimpleCmp}, {path: 'throwing', component: ThrowingCmp}]);
+         router.urlUpdateStrategy = strat;
 
-       router.navigateByUrl('/simple');
-       advance(fixture);
+         router.navigateByUrl('/simple');
+         advance(fixture);
 
-       let routerUrlBeforeEmittingError = '';
-       let locationUrlBeforeEmittingError = '';
-       router.events.forEach(e => {
-         if (e instanceof NavigationError) {
-           routerUrlBeforeEmittingError = router.url;
-           locationUrlBeforeEmittingError = location.path();
-         }
-       });
+         let routerUrlBeforeEmittingError = '';
+         let locationUrlBeforeEmittingError = '';
+         router.events.forEach(e => {
+           if (e instanceof NavigationError) {
+             routerUrlBeforeEmittingError = router.url;
+             locationUrlBeforeEmittingError = location.path();
+           }
+         });
 
-       router.navigateByUrl('/throwing').catch(() => null);
-       advance(fixture);
+         router.navigateByUrl('/throwing').catch(() => null);
+         advance(fixture);
 
-       expect(routerUrlBeforeEmittingError).toEqual('/simple');
-       expect(locationUrlBeforeEmittingError).toEqual('/simple');
-     }));
+         expect(routerUrlBeforeEmittingError).toEqual('/simple');
+         expect(locationUrlBeforeEmittingError).toEqual('/simple');
+       }));
 
-  it('should reset the url with the right state when navigation errors', fakeAsync(() => {
-       const router: Router = TestBed.get(Router);
-       const location: SpyLocation = TestBed.get(Location);
-       const fixture = createRoot(router, RootCmp);
+    it('should reset the url with the right state when navigation errors', fakeAsync(() => {
+         const router: Router = TestBed.get(Router);
+         const location: SpyLocation = TestBed.get(Location);
+         const fixture = createRoot(router, RootCmp);
 
-       router.resetConfig([
-         {path: 'simple1', component: SimpleCmp}, {path: 'simple2', component: SimpleCmp},
-         {path: 'throwing', component: ThrowingCmp}
-       ]);
+         router.resetConfig([
+           {path: 'simple1', component: SimpleCmp}, {path: 'simple2', component: SimpleCmp},
+           {path: 'throwing', component: ThrowingCmp}
+         ]);
+         router.urlUpdateStrategy = strat;
 
+         let event: NavigationStart;
+         router.events.subscribe(e => {
+           if (e instanceof NavigationStart) {
+             event = e;
+           }
+         });
 
-       let event: NavigationStart;
-       router.events.subscribe(e => {
-         if (e instanceof NavigationStart) {
-           event = e;
-         }
-       });
+         router.navigateByUrl('/simple1');
+         advance(fixture);
+         const simple1NavStart = event !;
 
-       router.navigateByUrl('/simple1');
-       advance(fixture);
-       const simple1NavStart = event !;
+         router.navigateByUrl('/throwing').catch(() => null);
+         advance(fixture);
 
-       router.navigateByUrl('/throwing').catch(() => null);
-       advance(fixture);
+         router.navigateByUrl('/simple2');
+         advance(fixture);
 
-       router.navigateByUrl('/simple2');
-       advance(fixture);
+         location.back();
+         tick();
 
-       location.back();
-       tick();
+         expect(event !.restoredState !.navigationId).toEqual(simple1NavStart.id);
+       }));
 
-       expect(event !.restoredState !.navigationId).toEqual(simple1NavStart.id);
-     }));
+    it('should not trigger another navigation when resetting the url back due to a NavigationError',
+       fakeAsync(() => {
+         const router = TestBed.get(Router);
+         router.onSameUrlNavigation = 'reload';
 
-  it('should not trigger another navigation when resetting the url back due to a NavigationError',
-     fakeAsync(() => {
-       const router = TestBed.get(Router);
-       router.onSameUrlNavigation = 'reload';
+         const fixture = createRoot(router, RootCmp);
 
-       const fixture = createRoot(router, RootCmp);
+         router.resetConfig(
+             [{path: 'simple', component: SimpleCmp}, {path: 'throwing', component: ThrowingCmp}]);
+         router.urlUpdateStrategy = strat;
 
-       router.resetConfig(
-           [{path: 'simple', component: SimpleCmp}, {path: 'throwing', component: ThrowingCmp}]);
+         const events: any[] = [];
+         router.events.forEach((e: any) => {
+           if (e instanceof NavigationStart) {
+             events.push(e.url);
+           }
+         });
 
-       const events: any[] = [];
-       router.events.forEach((e: any) => {
-         if (e instanceof NavigationStart) {
-           events.push(e.url);
-         }
-       });
+         router.navigateByUrl('/simple');
+         advance(fixture);
 
-       router.navigateByUrl('/simple');
-       advance(fixture);
+         router.navigateByUrl('/throwing').catch(() => null);
+         advance(fixture);
 
-       router.navigateByUrl('/throwing').catch(() => null);
-       advance(fixture);
+         // we do not trigger another navigation to /simple
+         expect(events).toEqual(['/simple', '/throwing']);
+       }));
 
-       // we do not trigger another navigation to /simple
-       expect(events).toEqual(['/simple', '/throwing']);
-     }));
+  });
 
   it('should dispatch NavigationCancel after the url has been reset back', fakeAsync(() => {
        TestBed.configureTestingModule(
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index 1236127df2..8965f82018 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -121,6 +121,7 @@ export interface ExtraOptions {
     preloadingStrategy?: any;
     scrollOffset?: [number, number] | (() => [number, number]);
     scrollPositionRestoration?: 'disabled' | 'enabled' | 'top';
+    urlUpdateStrategy?: 'deferred' | 'eager';
     useHash?: boolean;
 }
 
@@ -323,6 +324,7 @@ export declare class Router {
     readonly routerState: RouterState;
     readonly url: string;
     urlHandlingStrategy: UrlHandlingStrategy;
+    urlUpdateStrategy: 'deferred' | 'eager';
     constructor(rootComponentType: Type<any> | null, urlSerializer: UrlSerializer, rootContexts: ChildrenOutletContexts, location: Location, injector: Injector, loader: NgModuleFactoryLoader, compiler: Compiler, config: Routes);
     createUrlTree(commands: any[], navigationExtras?: NavigationExtras): UrlTree;
     dispose(): void;

From 0399c6972aed9e3d6198aa997c0a934be1fc9262 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 10 Jul 2018 10:43:07 +0200
Subject: [PATCH 464/582] refactor(ivy): remove content query creation from
 directive factories (#24811)

PR Close #24811
---
 .../core/src/core_render3_private_export.ts   |   2 +
 packages/core/src/render3/definition.ts       |  20 ++-
 packages/core/src/render3/di.ts               |   4 +-
 packages/core/src/render3/index.ts            |   5 +
 packages/core/src/render3/instructions.ts     |  71 ++++++++---
 .../core/src/render3/interfaces/definition.ts |   8 ++
 packages/core/src/render3/interfaces/view.ts  |  20 ++-
 .../hello_world/bundle.golden_symbols.json    |   6 +-
 .../bundling/todo/bundle.golden_symbols.json  |   6 +-
 .../render3/compiler_canonical/query_spec.ts  |  21 ++--
 packages/core/test/render3/query_spec.ts      | 117 ++++++++++++------
 11 files changed, 205 insertions(+), 75 deletions(-)

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 85485fbb7c..a6853410d9 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -39,6 +39,7 @@ export {
   T as ɵT,
   V as ɵV,
   Q as ɵQ,
+  Qr as ɵQr,
   d as ɵd,
   P as ɵP,
   b as ɵb,
@@ -69,6 +70,7 @@ export {
   cR as ɵcR,
   cr as ɵcr,
   qR as ɵqR,
+  ql as ɵql,
   e as ɵe,
   p as ɵp,
   pD as ɵpD,
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index bcdce3f532..0de1e46439 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -48,7 +48,7 @@ export function defineComponent<T>(componentDefinition: {
   /**
    * Factory method used to create an instance of directive.
    */
-  factory: () => T | ({0: T} & any[]); /* trying to say T | [T, ...any] */
+  factory: () => T;
 
   /**
    * Static attributes to set on host element.
@@ -120,6 +120,14 @@ export function defineComponent<T>(componentDefinition: {
    */
   hostBindings?: (directiveIndex: number, elementIndex: number) => void;
 
+  /**
+   * Function to create instances of content queries associated with a given directive.
+   */
+  contentQueries?: (() => void);
+
+  /** Refreshes content queries associated with directives in a given view */
+  contentQueriesRefresh?: ((directiveIndex: number, queryIndex: number) => void);
+
   /**
    * Defines the name that can be used in the template to assign this directive to a variable.
    *
@@ -216,6 +224,8 @@ export function defineComponent<T>(componentDefinition: {
     factory: componentDefinition.factory,
     template: componentDefinition.template || null !,
     hostBindings: componentDefinition.hostBindings || null,
+    contentQueries: componentDefinition.contentQueries || null,
+    contentQueriesRefresh: componentDefinition.contentQueriesRefresh || null,
     attributes: componentDefinition.attributes || null,
     inputs: invertObject(componentDefinition.inputs, declaredInputs),
     declaredInputs: declaredInputs,
@@ -448,6 +458,14 @@ export const defineDirective = defineComponent as any as<T>(directiveDefinition:
    */
   hostBindings?: (directiveIndex: number, elementIndex: number) => void;
 
+  /**
+   * Function to create instances of content queries associated with a given directive.
+   */
+  contentQueries?: (() => void);
+
+  /** Refreshes content queries associated with directives in a given view */
+  contentQueriesRefresh?: ((directiveIndex: number, queryIndex: number) => void);
+
   /**
    * Defines the name that can be used in the template to assign this directive to a variable.
    *
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 63a28cddd8..e6eb323f8b 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -19,7 +19,7 @@ import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_Vie
 import {Type} from '../type';
 
 import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
-import {addToViewTree, assertPreviousIsParent, createEmbeddedViewNode, createLContainer, createLNodeObject, createTNode, getDirectiveInstance, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
+import {addToViewTree, assertPreviousIsParent, createEmbeddedViewNode, createLContainer, createLNodeObject, createTNode, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {VIEWS} from './interfaces/container';
 import {ComponentTemplate, DirectiveDefInternal, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
@@ -378,7 +378,7 @@ export function getOrCreateInjectable<T>(
           // and matches the given token, return the directive instance.
           const directiveDef = defs[i] as DirectiveDefInternal<any>;
           if (directiveDef.type === token && directiveDef.diPublic) {
-            return getDirectiveInstance(node.view[DIRECTIVES] ![i]);
+            return node.view[DIRECTIVES] ![i];
           }
         }
       }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index b503e7df4f..5734e884ed 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -116,6 +116,11 @@ export {
   query as Q,
   queryRefresh as qR,
 } from './query';
+export  {
+  registerContentQuery as Qr,
+  loadQueryList as ql,
+} from './instructions';
+
 export {
   pureFunction0 as f0,
   pureFunction1 as f1,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index ff42452007..d5f0e2c4f4 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -8,6 +8,7 @@
 
 import './ng_dev_mode';
 
+import {QueryList} from '../linker';
 import {Sanitizer} from '../sanitization/security';
 
 import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual} from './assert';
@@ -20,7 +21,7 @@ import {AttributeMarker, InitialInputData, InitialInputs, LContainerNode, LEleme
 import {CssSelectorList, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
 import {LQueries} from './interfaces/query';
 import {ProceduralRenderer3, RComment, RElement, RText, Renderer3, RendererFactory3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
-import {BINDING_INDEX, CLEANUP, CONTAINER_INDEX, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView} from './interfaces/view';
+import {BINDING_INDEX, CLEANUP, CONTAINER_INDEX, CONTENT_QUERIES, CONTEXT, CurrentMatchesList, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, INJECTOR, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RootContext, SANITIZER, TAIL, TData, TVIEW, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {appendChild, appendProjectedNode, canInsertNativeNode, createTextNode, findComponentHost, getChildLNode, getLViewChild, getNextLNode, getParentLNode, insertView, removeView} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
@@ -29,6 +30,7 @@ import {isDifferent, stringify} from './util';
 import {ViewRef} from './view_ref';
 
 
+
 /**
  * Directive (D) sets a property on all component instances using this constant as a key and the
  * component's host node (LElement) as the value. This is used in methods like detectChanges to
@@ -266,9 +268,11 @@ function refreshView() {
   tView.firstTemplatePass = firstTemplatePass = false;
 
   setHostBindings(tView.hostBindings);
+  refreshContentQueries(tView);
   refreshChildComponents(tView.components);
 }
 
+
 /** Sets the host bindings for the current view. */
 export function setHostBindings(bindings: number[] | null): void {
   if (bindings != null) {
@@ -281,6 +285,18 @@ export function setHostBindings(bindings: number[] | null): void {
   }
 }
 
+/** Refreshes content queries for all directives in the given view. */
+function refreshContentQueries(tView: TView): void {
+  if (tView.contentQueries != null) {
+    for (let i = 0; i < tView.contentQueries.length; i += 2) {
+      const directiveDefIdx = tView.contentQueries[i];
+      const directiveDef = tView.directives ![directiveDefIdx];
+
+      directiveDef.contentQueriesRefresh !(directiveDefIdx, tView.contentQueries[i + 1]);
+    }
+  }
+}
+
 /** Refreshes child components in the current view. */
 function refreshChildComponents(components: number[] | null): void {
   if (components != null) {
@@ -315,7 +331,8 @@ export function createLViewData<T>(
     renderer,                                                                    // renderer
     sanitizer || null,                                                           // sanitizer
     null,                                                                        // tail
-    -1                                                                           // containerIndex
+    -1,                                                                          // containerIndex
+    null,                                                                        // contentQueries
   ];
 }
 
@@ -882,6 +899,7 @@ export function createTView(
     pipeDestroyHooks: null,
     cleanup: null,
     hostBindings: null,
+    contentQueries: null,
     components: null,
     directiveRegistry: typeof directives === 'function' ? directives() : directives,
     pipeRegistry: typeof pipes === 'function' ? pipes() : pipes,
@@ -1472,7 +1490,7 @@ export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
 //////////////////////////
 
 /**
- * Create a directive.
+ * Create a directive and their associated content queries.
  *
  * NOTE: directives can be created in order other than the index order. They can also
  *       be retrieved before they are created in which case the value will be null.
@@ -1481,28 +1499,32 @@ export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
  * @param directiveDef DirectiveDef object which contains information about the template.
  */
 export function directiveCreate<T>(
-    index: number, directive: T,
+    directiveDefIdx: number, directive: T,
     directiveDef: DirectiveDefInternal<T>| ComponentDefInternal<T>): T {
-  const instance = baseDirectiveCreate(index, directive, directiveDef);
+  const instance = baseDirectiveCreate(directiveDefIdx, directive, directiveDef);
 
   ngDevMode && assertDefined(previousOrParentNode.tNode, 'previousOrParentNode.tNode');
   const tNode = previousOrParentNode.tNode;
 
   const isComponent = (directiveDef as ComponentDefInternal<T>).template;
   if (isComponent) {
-    addComponentLogic(index, directive, directiveDef as ComponentDefInternal<T>);
+    addComponentLogic(directiveDefIdx, directive, directiveDef as ComponentDefInternal<T>);
   }
 
   if (firstTemplatePass) {
     // Init hooks are queued now so ngOnInit is called in host components before
     // any projected components.
-    queueInitHooks(index, directiveDef.onInit, directiveDef.doCheck, tView);
+    queueInitHooks(directiveDefIdx, directiveDef.onInit, directiveDef.doCheck, tView);
 
-    if (directiveDef.hostBindings) queueHostBindingForCheck(index);
+    if (directiveDef.hostBindings) queueHostBindingForCheck(directiveDefIdx);
   }
 
   if (tNode && tNode.attrs) {
-    setInputsFromAttrs(index, instance, directiveDef.inputs, tNode);
+    setInputsFromAttrs(directiveDefIdx, instance, directiveDef.inputs, tNode);
+  }
+
+  if (directiveDef.contentQueries) {
+    directiveDef.contentQueries();
   }
 
   return instance;
@@ -1918,7 +1940,7 @@ export function componentRefresh<T>(directiveIndex: number, adjustedElementIndex
   // Only attached CheckAlways components or attached, dirty OnPush components should be checked
   if (viewAttached(hostView) && hostView[FLAGS] & (LViewFlags.CheckAlways | LViewFlags.Dirty)) {
     ngDevMode && assertDataInRange(directiveIndex, directives !);
-    detectChangesInternal(hostView, element, getDirectiveInstance(directives ![directiveIndex]));
+    detectChangesInternal(hostView, element, directives ![directiveIndex]);
   }
 }
 
@@ -2537,6 +2559,15 @@ export function loadDirective<T>(index: number): T {
   return directives ![index];
 }
 
+export function loadQueryList<T>(queryListIdx: number): QueryList<T> {
+  ngDevMode && assertDefined(
+                   viewData[CONTENT_QUERIES],
+                   'Content QueryList array should be defined if reading a query.');
+  ngDevMode && assertDataInRange(queryListIdx, viewData[CONTENT_QUERIES] !);
+
+  return viewData[CONTENT_QUERIES] ![queryListIdx];
+}
+
 /** Gets the current binding value and increments the binding index. */
 export function consumeBinding(): any {
   ngDevMode && assertDataInRange(viewData[BINDING_INDEX]);
@@ -2586,10 +2617,22 @@ export function getTView(): TView {
   return tView;
 }
 
-export function getDirectiveInstance<T>(instanceOrArray: T | [T]): T {
-  // Directives with content queries store an array in directives[directiveIndex]
-  // with the instance as the first index
-  return Array.isArray(instanceOrArray) ? instanceOrArray[0] : instanceOrArray;
+/**
+ * Registers a QueryList, associated with a content query, for later refresh (part of a view
+ * refresh).
+ */
+export function registerContentQuery<Q>(queryList: QueryList<Q>): void {
+  const savedContentQueriesLength =
+      (viewData[CONTENT_QUERIES] || (viewData[CONTENT_QUERIES] = [])).push(queryList);
+  if (firstTemplatePass) {
+    const currentDirectiveIndex = directives !.length - 1;
+    const tViewContentQueries = tView.contentQueries || (tView.contentQueries = []);
+    const lastSavedDirectiveIndex =
+        tView.contentQueries.length ? tView.contentQueries[tView.contentQueries.length - 2] : -1;
+    if (currentDirectiveIndex !== lastSavedDirectiveIndex) {
+      tViewContentQueries.push(currentDirectiveIndex, savedContentQueriesLength - 1);
+    }
+  }
 }
 
 export function assertPreviousIsParent() {
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 460d33bad4..20ddafad12 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -122,6 +122,14 @@ export interface DirectiveDef<T, Selector extends string> {
    */
   factory(): T|[T];
 
+  /**
+   * Function to create instances of content queries associated with a given directive.
+   */
+  contentQueries: (() => void)|null;
+
+  /** Refreshes content queries associated with directives in a given view */
+  contentQueriesRefresh: ((directiveIndex: number, queryIndex: number) => void)|null;
+
   /** Refreshes host bindings on the associated directive. */
   hostBindings: ((directiveIndex: number, elementIndex: number) => void)|null;
 
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 1548b16dd8..3ee8b338b9 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -7,6 +7,7 @@
  */
 
 import {Injector} from '../../di/injector';
+import {QueryList} from '../../linker';
 import {Sanitizer} from '../../sanitization/security';
 
 import {LContainer} from './container';
@@ -16,7 +17,7 @@ import {LQueries} from './query';
 import {Renderer3} from './renderer';
 
 /** Size of LViewData's header. Necessary to adjust for it when setting slots.  */
-export const HEADER_OFFSET = 15;
+export const HEADER_OFFSET = 16;
 
 // Below are constants for LViewData indices to help us look up LViewData members
 // without having to remember the specific indices.
@@ -36,6 +37,7 @@ export const RENDERER = 11;
 export const SANITIZER = 12;
 export const TAIL = 13;
 export const CONTAINER_INDEX = 14;
+export const CONTENT_QUERIES = 15;
 
 /**
  * `LViewData` stores all of the information needed to process the instructions as
@@ -153,6 +155,13 @@ export interface LViewData extends Array<any> {
    * in multiple containers, so the parent cannot be shared between view instances).
    */
   [CONTAINER_INDEX]: number;
+
+  /**
+   * Stores QueryLists associated with content queries of a directive. This data structure is
+   * filled-in as part of a directive creation process and is later used to retrieve a QueryList to
+   * be refreshed.
+   */
+  [CONTENT_QUERIES]: QueryList<any>[]|null;
 }
 
 /** Flags associated with an LView (saved in LViewData[FLAGS]) */
@@ -413,6 +422,15 @@ export interface TView {
    * they will be fed into instructions that expect the raw index (e.g. elementProperty)
    */
   hostBindings: number[]|null;
+
+
+  /**
+   * A list of indices for child directives that have content queries.
+   *
+   * Even indices: Directive indices
+   * Odd indices: Starting index of content queries (stored in CONTENT_QUERIES) for this directive
+   */
+  contentQueries: number[]|null;
 }
 
 /**
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 23c9cce6c6..f2c007b7b3 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -158,9 +158,6 @@
   {
     "name": "getChildLNode"
   },
-  {
-    "name": "getDirectiveInstance"
-  },
   {
     "name": "getLViewChild"
   },
@@ -197,6 +194,9 @@
   {
     "name": "refreshChildComponents"
   },
+  {
+    "name": "refreshContentQueries"
+  },
   {
     "name": "refreshDynamicEmbeddedViews"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 07a77163ed..ba013de043 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -446,9 +446,6 @@
   {
     "name": "getCurrentSanitizer"
   },
-  {
-    "name": "getDirectiveInstance"
-  },
   {
     "name": "getLViewChild"
   },
@@ -632,6 +629,9 @@
   {
     "name": "refreshChildComponents"
   },
+  {
+    "name": "refreshContentQueries"
+  },
   {
     "name": "refreshDynamicEmbeddedViews"
   },
diff --git a/packages/core/test/render3/compiler_canonical/query_spec.ts b/packages/core/test/render3/compiler_canonical/query_spec.ts
index d8fafb9b72..a3e85d4459 100644
--- a/packages/core/test/render3/compiler_canonical/query_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/query_spec.ts
@@ -108,18 +108,17 @@ describe('queries', () => {
       static ngComponentDef = $r3$.ɵdefineComponent({
         type: ContentQueryComponent,
         selectors: [['content-query-component']],
-        factory: function ContentQueryComponent_Factory() {
-          return [
-            new ContentQueryComponent(), $r3$.ɵQ(null, SomeDirective, false),
-            $r3$.ɵQ(null, SomeDirective, false)
-          ];
+        factory: function ContentQueryComponent_Factory() { return new ContentQueryComponent(); },
+        contentQueries: function ContentQueryComponent_ContentQueries() {
+          $r3$.ɵQr($r3$.ɵQ(null, SomeDirective, false));
+          $r3$.ɵQr($r3$.ɵQ(null, SomeDirective, false));
         },
-        hostBindings: function ContentQueryComponent_HostBindings(
-            dirIndex: $number$, elIndex: $number$) {
+        contentQueriesRefresh: function ContentQueryComponent_ContentQueriesRefresh(
+            dirIndex: $number$, queryStartIndex: $number$) {
           let $tmp$: any;
-          const $instance$ = $r3$.ɵd<any[]>(dirIndex)[0];
-          $r3$.ɵqR($tmp$ = $r3$.ɵd<any[]>(dirIndex)[1]) && ($instance$.someDir = $tmp$.first);
-          $r3$.ɵqR($tmp$ = $r3$.ɵd<any[]>(dirIndex)[2]) && ($instance$.someDirList = $tmp$);
+          const $instance$ = $r3$.ɵd<ContentQueryComponent>(dirIndex);
+          $r3$.ɵqR($tmp$ = $r3$.ɵql<any>(queryStartIndex)) && ($instance$.someDir = $tmp$.first);
+          $r3$.ɵqR($tmp$ = $r3$.ɵql<any>(queryStartIndex + 1)) && ($instance$.someDirList = $tmp$);
         },
         template: function ContentQueryComponent_Template(
             rf: $number$, ctx: $ContentQueryComponent$) {
@@ -153,7 +152,7 @@ describe('queries', () => {
         template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
           if (rf & 1) {
             $r3$.ɵE(0, 'content-query-component');
-            contentQueryComp = $r3$.ɵd<any[]>(0)[0];
+            contentQueryComp = $r3$.ɵd<ContentQueryComponent>(0);
             $r3$.ɵEe(1, 'div', $e2_attrs$);
             $r3$.ɵe();
           }
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 1a98c2f9a4..e86ce71409 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -12,7 +12,7 @@ import {ElementRef, TemplateRef, ViewContainerRef} from '@angular/core';
 import {EventEmitter} from '../..';
 import {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
 import {AttributeMarker, QueryList, defineComponent, defineDirective, detectChanges, injectViewContainerRef} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective} from '../../src/render3/instructions';
+import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, loadDirective, loadQueryList, registerContentQuery} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, queryRefresh} from '../../src/render3/query';
 
@@ -1684,6 +1684,48 @@ describe('query', () => {
 
   describe('content', () => {
 
+    it('should support content queries for directives', () => {
+      let withContentInstance: WithContentDirective;
+
+      class WithContentDirective {
+        // @ContentChildren('foo') foos;
+        // TODO(issue/24571): remove '!'.
+        foos !: QueryList<ElementRef>;
+
+        static ngComponentDef = defineDirective({
+          type: WithContentDirective,
+          selectors: [['', 'with-content', '']],
+          factory: () => new WithContentDirective(),
+          contentQueries:
+              () => { registerContentQuery(query(null, ['foo'], true, QUERY_READ_FROM_NODE)); },
+          contentQueriesRefresh: (dirIndex: number, queryStartIdx: number) => {
+            let tmp: any;
+            withContentInstance = loadDirective<WithContentDirective>(dirIndex);
+            queryRefresh(tmp = loadQueryList<ElementRef>(queryStartIdx)) &&
+                (withContentInstance.foos = tmp);
+          }
+        });
+      }
+
+      /**
+       * <div with-content>
+       *   <span #foo></span>
+       * </div>
+       * class Cmpt {
+       * }
+       */
+      const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
+        if (rf & RenderFlags.Create) {
+          elementStart(0, 'div', [AttributeMarker.SelectOnly, 'with-content']);
+          { element(1, 'span', null, ['foo', '']); }
+          elementEnd();
+        }
+      }, [WithContentDirective]);
+
+      const fixture = new ComponentFixture(AppComponent);
+      expect(withContentInstance !.foos.length).toBe(1);
+    });
+
     // https://stackblitz.com/edit/angular-wlenwd?file=src%2Fapp%2Fapp.component.ts
     it('should support view and content queries matching the same element', () => {
       let withContentComponentInstance: WithContentComponent;
@@ -1696,18 +1738,17 @@ describe('query', () => {
         static ngComponentDef = defineComponent({
           type: WithContentComponent,
           selectors: [['with-content']],
-          factory: () => {
-            return [new WithContentComponent(), query(null, ['foo'], true, QUERY_READ_FROM_NODE)];
-          },
+          factory: () => new WithContentComponent(),
+          contentQueries:
+              () => { registerContentQuery(query(null, ['foo'], true, QUERY_READ_FROM_NODE)); },
           template: (rf: RenderFlags, ctx: WithContentComponent) => {
             // intentionally left empty, don't need anything for this test
           },
-          hostBindings: function ContentQueryComponent_HostBindings(
-              dirIndex: number, elIndex: number) {
+          contentQueriesRefresh: (dirIndex: number, queryStartIdx: number) => {
             let tmp: any;
-            withContentComponentInstance = loadDirective<any[]>(dirIndex)[0];
-            queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
-                (withContentComponentInstance.foos = tmp as QueryList<any>);
+            withContentComponentInstance = loadDirective<WithContentComponent>(dirIndex);
+            queryRefresh(tmp = loadQueryList<ElementRef>(queryStartIdx)) &&
+                (withContentComponentInstance.foos = tmp);
           },
         });
       }
@@ -1760,19 +1801,17 @@ describe('query', () => {
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: 'query',
-          factory: () => {
+          factory: () => new QueryDirective(),
+          contentQueries: () => {
             // @ContentChildren('foo, bar, baz', {descendants: true}) fooBars:
             // QueryList<ElementRef>;
-            return [
-              new QueryDirective(), query(null, ['foo', 'bar', 'baz'], true, QUERY_READ_FROM_NODE)
-            ];
+            registerContentQuery(query(null, ['foo', 'bar', 'baz'], true, QUERY_READ_FROM_NODE));
           },
-          hostBindings: function ContentQueryComponent_HostBindings(
-              dirIndex: number, elIndex: number) {
+          contentQueriesRefresh: (dirIndex: number, queryStartIdx: number) => {
             let tmp: any;
-            const instance = loadDirective<any[]>(dirIndex)[0];
-            queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
-                (instance.fooBars = tmp as QueryList<any>);
+            const instance = loadDirective<QueryDirective>(dirIndex);
+            queryRefresh(tmp = loadQueryList<ElementRef>(queryStartIdx)) &&
+                (instance.fooBars = tmp);
           },
         });
       }
@@ -1804,8 +1843,8 @@ describe('query', () => {
               elementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = (<any>load(1))[0] as QueryDirective;
-              inInstance = (<any>load(5))[0] as QueryDirective;
+              outInstance = load<QueryDirective>(1);
+              inInstance = load<QueryDirective>(5);
             }
           },
           [QueryDirective]);
@@ -1823,18 +1862,16 @@ describe('query', () => {
              type: ShallowQueryDirective,
              selectors: [['', 'shallow-query', '']],
              exportAs: 'shallow-query',
-             factory: () => {
-               // @ContentChildren('foo', {descendants: false}) fooBars: QueryList<ElementRef>;
-               return [
-                 new ShallowQueryDirective(), query(null, ['foo'], false, QUERY_READ_FROM_NODE)
-               ];
+             factory: () => new ShallowQueryDirective(),
+             contentQueries: () => {
+               // @ContentChildren('foo', {descendants: false}) foos: QueryList<ElementRef>;
+               registerContentQuery(query(null, ['foo'], false, QUERY_READ_FROM_NODE));
              },
-             hostBindings: function ContentQueryComponent_HostBindings(
-                 dirIndex: number, elIndex: number) {
+             contentQueriesRefresh: (dirIndex: number, queryStartIdx: number) => {
                let tmp: any;
-               const instance = loadDirective<any[]>(dirIndex)[0];
-               queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
-                   (instance.foos = tmp as QueryList<any>);
+               const instance = loadDirective<ShallowQueryDirective>(dirIndex);
+               queryRefresh(tmp = loadQueryList<ElementRef>(queryStartIdx)) &&
+                   (instance.foos = tmp);
              },
            });
          }
@@ -1845,16 +1882,16 @@ describe('query', () => {
              type: DeepQueryDirective,
              selectors: [['', 'deep-query', '']],
              exportAs: 'deep-query',
-             factory: () => {
-               // @ContentChildren('foo', {descendants: true}) fooBars: QueryList<ElementRef>;
-               return [new DeepQueryDirective(), query(null, ['foo'], true, QUERY_READ_FROM_NODE)];
+             factory: () => new DeepQueryDirective(),
+             contentQueries: () => {
+               // @ContentChildren('foo', {descendants: false}) foos: QueryList<ElementRef>;
+               registerContentQuery(query(null, ['foo'], true, QUERY_READ_FROM_NODE));
              },
-             hostBindings: function ContentQueryComponent_HostBindings(
-                 dirIndex: number, elIndex: number) {
+             contentQueriesRefresh: (dirIndex: number, queryStartIdx: number) => {
                let tmp: any;
-               const instance = loadDirective<any[]>(dirIndex)[0];
-               queryRefresh(tmp = loadDirective<any[]>(dirIndex)[1]) &&
-                   (instance.foos = tmp as QueryList<any>);
+               const instance = loadDirective<DeepQueryDirective>(dirIndex);
+               queryRefresh(tmp = loadQueryList<ElementRef>(queryStartIdx)) &&
+                   (instance.foos = tmp);
              },
            });
          }
@@ -1878,8 +1915,8 @@ describe('query', () => {
                  elementEnd();
                }
                if (rf & RenderFlags.Update) {
-                 shallowInstance = (<any>load(1))[0] as ShallowQueryDirective;
-                 deepInstance = (<any>load(2))[0] as DeepQueryDirective;
+                 shallowInstance = load<ShallowQueryDirective>(1);
+                 deepInstance = load<DeepQueryDirective>(2);
                }
              },
              [ShallowQueryDirective, DeepQueryDirective]);

From 71e0df039c60a76ac6a27108fb879cb7c4d91954 Mon Sep 17 00:00:00 2001
From: mrmeku <mrmeku@gmail.com>
Date: Mon, 9 Apr 2018 00:53:31 -0600
Subject: [PATCH 465/582] feat(bazel): Initial commit of
 protractor_web_test_suite (#24787)

Co-authored-by: Andrew Z Allen <me@andrewzallen.com>

PR Close #24787
---
 BUILD.bazel                                   |   1 +
 WORKSPACE                                     |  10 ++
 packages/bazel/index.bzl                      |   2 +
 packages/bazel/src/protractor/BUILD.bazel     |   4 +
 packages/bazel/src/protractor/conf.js.tmpl    |  14 +++
 .../bazel/src/protractor/protractor_runner.js |  23 ++++
 .../protractor/protractor_web_test_suite.bzl  | 107 ++++++++++++++++++
 packages/bazel/test/protractor/BUILD.bazel    |  14 +++
 packages/bazel/test/protractor/conf.js        |  29 +++++
 packages/bazel/test/protractor/test.spec.ts   |  20 ++++
 10 files changed, 224 insertions(+)
 create mode 100644 packages/bazel/src/protractor/BUILD.bazel
 create mode 100644 packages/bazel/src/protractor/conf.js.tmpl
 create mode 100644 packages/bazel/src/protractor/protractor_runner.js
 create mode 100644 packages/bazel/src/protractor/protractor_web_test_suite.bzl
 create mode 100644 packages/bazel/test/protractor/BUILD.bazel
 create mode 100644 packages/bazel/test/protractor/conf.js
 create mode 100644 packages/bazel/test/protractor/test.spec.ts

diff --git a/BUILD.bazel b/BUILD.bazel
index 1c040afea2..e1bbba720c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -22,6 +22,7 @@ node_modules_filegroup(
         "jasmine",
         "minimist",
         "protobufjs",
+        "protractor",
         "reflect-metadata",
         "source-map-support",
         "tsickle",
diff --git a/WORKSPACE b/WORKSPACE
index ef86aed344..ccd1b3d331 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -11,6 +11,12 @@ http_archive(
     sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
 )
 
+http_archive(
+    name = "bazel_gazelle",
+    sha256 = "d03625db67e9fb0905bbd206fa97e32ae9da894fe234a493e7517fd25faec914",
+    url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.10.1/bazel-gazelle-0.10.1.tar.gz",
+)
+
 http_archive(
     name = "io_bazel_rules_webtesting",
     url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
@@ -85,6 +91,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_too
 go_rules_dependencies()
 go_register_toolchains()
 
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+
+gazelle_dependencies()
+
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
 
 web_test_repositories()
diff --git a/packages/bazel/index.bzl b/packages/bazel/index.bzl
index 33cefabcda..247618070e 100644
--- a/packages/bazel/index.bzl
+++ b/packages/bazel/index.bzl
@@ -9,6 +9,8 @@ Users should not load files under "/src"
 
 load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module")
 load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package")
+load("//packages/bazel/src/protractor:protractor_web_test_suite.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
 
 ng_module = _ng_module
 ng_package = _ng_package
+protractor_web_test_suite = _protractor_web_test_suite
diff --git a/packages/bazel/src/protractor/BUILD.bazel b/packages/bazel/src/protractor/BUILD.bazel
new file mode 100644
index 0000000000..e3be3b819b
--- /dev/null
+++ b/packages/bazel/src/protractor/BUILD.bazel
@@ -0,0 +1,4 @@
+exports_files([
+    "conf.js.tmpl",
+    "protractor_runner.js",
+])
diff --git a/packages/bazel/src/protractor/conf.js.tmpl b/packages/bazel/src/protractor/conf.js.tmpl
new file mode 100644
index 0000000000..76dc1574db
--- /dev/null
+++ b/packages/bazel/src/protractor/conf.js.tmpl
@@ -0,0 +1,14 @@
+const baseConf = require("BASE_CONF_IMPORT_PATH");
+
+exports.config = {
+  ...baseConf.config,
+  framework: "jasmine2",
+  seleniumAddress: process.env.WEB_TEST_HTTP_SERVER.trim() + "/wd/hub",
+  specs: [
+    SPEC_FILE_IMPORT_PATHS
+  ].map(specPath => require.resolve(specPath)),
+  // TODO: Allow users to specifify other browsers.
+  capabilities: {
+    browserName: "chrome"
+  },
+};
diff --git a/packages/bazel/src/protractor/protractor_runner.js b/packages/bazel/src/protractor/protractor_runner.js
new file mode 100644
index 0000000000..095373953f
--- /dev/null
+++ b/packages/bazel/src/protractor/protractor_runner.js
@@ -0,0 +1,23 @@
+/**
+ * @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
+ *
+ * @fileoverview A wrapper around the protractor cli for bazel compatibility.
+ */
+
+const launcher = require('protractor/built/launcher');
+
+function main(args) {
+  if (!args.length) {
+    throw new Error('Config file argument missing');
+  }
+  const config = require.resolve(args[0]);
+  launcher.init(config);
+}
+
+if (require.main === module) {
+  process.exitCode = main(process.argv.slice(2));
+}
diff --git a/packages/bazel/src/protractor/protractor_web_test_suite.bzl b/packages/bazel/src/protractor/protractor_web_test_suite.bzl
new file mode 100644
index 0000000000..8b8de712c7
--- /dev/null
+++ b/packages/bazel/src/protractor/protractor_web_test_suite.bzl
@@ -0,0 +1,107 @@
+# 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
+"""Implementation of the protractor_web_test_suite rule.
+"""
+
+load("@io_bazel_rules_webtesting//web:web.bzl", "web_test_suite")
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//internal/common:sources_aspect.bzl", "sources_aspect")
+load("@build_bazel_rules_nodejs//internal/common:module_mappings.bzl", "module_mappings_runtime_aspect")
+
+def _modify_tsconfig_impl(ctx):
+  spec_file_import_paths = []
+  for dep in ctx.attr.deps:
+    # For each transitive ES5 dependency, grab the short path
+    for f in dep.node_sources.to_list():
+      spec_file_import_paths.append("\"{workspace}/{path}\"".format(workspace=ctx.workspace_name, path=f.short_path))
+
+  ctx.actions.expand_template(
+    template = ctx.file._conf_templ,
+    output = ctx.outputs._modified_conf,
+    substitutions = {
+      "BASE_CONF_IMPORT_PATH": "{workspace}/{path}".format(workspace=ctx.workspace_name, path=ctx.file.base_conf.short_path),
+      "SPEC_FILE_IMPORT_PATHS": ',\n    '.join(spec_file_import_paths),
+    })
+
+_modify_conf = rule(
+  attrs = {
+    "base_conf": attr.label(
+      doc = """conf.js file used to configure protractor.""",
+      allow_single_file = True,
+      cfg = "data",
+      aspects = [
+        sources_aspect,
+        module_mappings_runtime_aspect,
+      ],
+    ),
+    "deps": attr.label_list(
+      doc = """Spec and page files used for testing.""",
+      allow_files = True,
+      cfg = "data",
+      aspects = [
+        sources_aspect,
+        module_mappings_runtime_aspect,
+      ],
+    ),
+    "_conf_templ": attr.label(
+      allow_files = True,
+      single_file = True,
+      default = Label("@angular//packages/bazel/src/protractor:conf.js.tmpl"),
+    ),
+  },
+  outputs = {
+    "_modified_conf": "%{name}.conf.js",
+  },
+  implementation = _modify_tsconfig_impl,
+)
+
+def protractor_web_test_suite(name, conf, deps, data = [], **kwargs):
+  """Runs protractor using the passed conf.js file and tests listed within deps.
+
+  Args:
+    name: The name of the web_test_suite rule the macro expands into.
+    conf: A conf.js file to be used as a base template. The following fields of the base
+      config are overridden:
+        framework
+        seleniumAddress
+        specs
+        capabilities
+    deps: A list of dependencies containing the test files to run within protractor.
+    data: Any runtime files which are needed to run the test suite.
+    **kwargs: Any other arguements are passed directory to the expanded web_test_suite rule.
+
+  Returns:
+    This macro expands into a web_test_suite rule which runs the protractor tests.
+  """
+
+  _modify_conf_name = "%s_modify_conf" % name
+  _modify_conf(
+    name = _modify_conf_name,
+    base_conf = conf,
+    deps = deps,
+    testonly = True,
+  )
+
+  _modified_conf = "%s.conf.js" % _modify_conf_name
+
+  _protractor_runner_name = name + "_protractor_runner"
+  nodejs_binary(
+    name = _protractor_runner_name,
+    entry_point = "angular/packages/bazel/src/protractor/protractor_runner.js",
+    data = data + deps + [_modified_conf, "@angular//packages/bazel/src/protractor:protractor_runner.js"],
+    templated_args = ["$(location :%s)" % _modified_conf],
+    tags = ["manual"],
+    testonly = True,
+  )
+
+  web_test_suite(
+    name = name,
+    # TODO: Allow users to specify more browsers. Currently conf.js is hardcoded for chrome.
+    browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"],
+    data = data + deps + [conf, _modified_conf],
+    test = ":%s_bin" % _protractor_runner_name,
+    testonly = True,
+    **kwargs
+  )
diff --git a/packages/bazel/test/protractor/BUILD.bazel b/packages/bazel/test/protractor/BUILD.bazel
new file mode 100644
index 0000000000..fe9ef9e9ec
--- /dev/null
+++ b/packages/bazel/test/protractor/BUILD.bazel
@@ -0,0 +1,14 @@
+load("//packages/bazel:index.bzl", "protractor_web_test_suite")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+ts_library(
+    name = "ts_spec",
+    testonly = True,
+    srcs = ["test.spec.ts"],
+)
+
+protractor_web_test_suite(
+    name = "demo",
+    conf = "conf.js",
+    deps = [":ts_spec"],
+)
diff --git a/packages/bazel/test/protractor/conf.js b/packages/bazel/test/protractor/conf.js
new file mode 100644
index 0000000000..2ac5a3ce80
--- /dev/null
+++ b/packages/bazel/test/protractor/conf.js
@@ -0,0 +1,29 @@
+/**
+ * @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
+ */
+
+/**
+ * @fileoverview A demo of what a user's conf.js file might look like.
+ */
+const http = require('http');
+
+const PORT = 3000;
+
+exports.config = {
+  baseUrl: `http://localhost:${PORT}`,
+  onPrepare() {
+    const app = new http.Server();
+
+    app.on('request', (req, res) => {
+      res.writeHead(200, {'Content-Type': 'text/plain'});
+      res.write('Hello World');
+      res.end('\n');
+    });
+
+    return new Promise(resolve => { app.listen(PORT, () => { resolve(); }); });
+  }
+};
diff --git a/packages/bazel/test/protractor/test.spec.ts b/packages/bazel/test/protractor/test.spec.ts
new file mode 100644
index 0000000000..139fd3c98d
--- /dev/null
+++ b/packages/bazel/test/protractor/test.spec.ts
@@ -0,0 +1,20 @@
+/**
+ * @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
+ *
+ * @fileoverview A small demo of how to run a protractor test.
+ */
+
+import {$, browser} from 'protractor';
+
+describe('Basic test', () => {
+  it('should say hello world', () => {
+    browser.waitForAngularEnabled(false);
+    browser.get('/');
+
+    expect($('body').getText()).toContain('Hello World');
+  });
+});

From 161ff5c79d0d3bfe9a5c79a2a1412cd06109c276 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 6 Jul 2018 14:51:37 -0700
Subject: [PATCH 466/582] feat(bazel): protractor_web_test_suite for release
 (#24787)

PR Close #24787
---
 BUILD.bazel                                   |   3 +
 WORKSPACE                                     |  13 +-
 integration/bazel/BUILD.bazel                 |   4 +
 integration/bazel/WORKSPACE                   |  15 +-
 integration/bazel/package.json                |  12 +-
 integration/bazel/protractor.conf.js          |   5 -
 integration/bazel/src/BUILD.bazel             |   8 +-
 integration/bazel/test/e2e/BUILD.bazel        |  29 +-
 integration/bazel/test/e2e/app.spec.ts        |   2 +-
 integration/bazel/test/e2e/on-prepare.ts      |  12 +
 integration/bazel/test/e2e/tsconfig.json      |   5 +
 integration/bazel/yarn.lock                   | 127 ++-----
 packages/bazel/index.bzl                      |   5 +-
 packages/bazel/src/BUILD.bazel                |   1 +
 packages/bazel/src/protractor/BUILD.bazel     |  13 +-
 packages/bazel/src/protractor/conf.js.tmpl    |  14 -
 .../bazel/src/protractor/protractor.conf.js   | 154 ++++++++
 .../bazel/src/protractor/protractor_runner.js |  23 --
 .../src/protractor/protractor_web_test.bzl    | 341 ++++++++++++++++++
 .../protractor/protractor_web_test_suite.bzl  | 107 ------
 .../bazel/src/protractor/utils/BUILD.bazel    |  16 +
 packages/bazel/src/protractor/utils/index.ts  |  94 +++++
 .../bazel/src/protractor/utils/tsconfig.json  |   6 +
 packages/bazel/test/protractor-2/BUILD.bazel  |  54 +++
 packages/bazel/test/protractor-2/app.ts       |  12 +
 packages/bazel/test/protractor-2/conf.js      |  11 +
 packages/bazel/test/protractor-2/index.html   |   9 +
 .../bazel/test/protractor-2/on-prepare.js     |  22 ++
 packages/bazel/test/protractor-2/test.spec.ts |  28 ++
 .../bazel/test/protractor-2/tsconfig.json     |   5 +
 packages/bazel/test/protractor/BUILD.bazel    |  13 +-
 packages/bazel/test/protractor/conf.js        |  29 --
 packages/bazel/test/protractor/conf.ts        |  30 ++
 packages/bazel/test/protractor/tsconfig.json  |   5 +
 tools/http-server/http_server.bzl             |   8 +-
 35 files changed, 924 insertions(+), 311 deletions(-)
 create mode 100644 integration/bazel/test/e2e/on-prepare.ts
 create mode 100644 integration/bazel/test/e2e/tsconfig.json
 delete mode 100644 packages/bazel/src/protractor/conf.js.tmpl
 create mode 100644 packages/bazel/src/protractor/protractor.conf.js
 delete mode 100644 packages/bazel/src/protractor/protractor_runner.js
 create mode 100644 packages/bazel/src/protractor/protractor_web_test.bzl
 delete mode 100644 packages/bazel/src/protractor/protractor_web_test_suite.bzl
 create mode 100644 packages/bazel/src/protractor/utils/BUILD.bazel
 create mode 100644 packages/bazel/src/protractor/utils/index.ts
 create mode 100644 packages/bazel/src/protractor/utils/tsconfig.json
 create mode 100644 packages/bazel/test/protractor-2/BUILD.bazel
 create mode 100644 packages/bazel/test/protractor-2/app.ts
 create mode 100644 packages/bazel/test/protractor-2/conf.js
 create mode 100644 packages/bazel/test/protractor-2/index.html
 create mode 100644 packages/bazel/test/protractor-2/on-prepare.js
 create mode 100644 packages/bazel/test/protractor-2/test.spec.ts
 create mode 100644 packages/bazel/test/protractor-2/tsconfig.json
 delete mode 100644 packages/bazel/test/protractor/conf.js
 create mode 100644 packages/bazel/test/protractor/conf.ts
 create mode 100644 packages/bazel/test/protractor/tsconfig.json

diff --git a/BUILD.bazel b/BUILD.bazel
index e1bbba720c..42cbb6a5a2 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -35,6 +35,9 @@ node_modules_filegroup(
         "@types",
         "@webcomponents/custom-elements",
     ],
+    patterns = [
+        "node_modules/protractor/**",
+    ],
 )
 
 filegroup(
diff --git a/WORKSPACE b/WORKSPACE
index ccd1b3d331..a6c5b1ecf2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -13,15 +13,18 @@ http_archive(
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "d03625db67e9fb0905bbd206fa97e32ae9da894fe234a493e7517fd25faec914",
-    url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.10.1/bazel-gazelle-0.10.1.tar.gz",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
+    ],
+    sha256 = "ddedc7aaeb61f2654d7d7d4fd7940052ea992ccdb031b8f9797ed143ac7e8d43",
 )
 
 http_archive(
     name = "io_bazel_rules_webtesting",
-    url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
-    strip_prefix = "rules_webtesting-0.2.0",
-    sha256 = "cecc12f07e95740750a40d38e8b14b76fefa1551bef9332cb432d564d693723c",
+    url = "https://github.com/bazelbuild/rules_webtesting/archive/7ffe970bbf380891754487f66c3d680c087d67f2.zip",
+    strip_prefix = "rules_webtesting-7ffe970bbf380891754487f66c3d680c087d67f2",
+    sha256 = "4fb0dca8c9a90547891b7ef486592775a523330fc4555c88cd8f09270055c2ce",
 )
 
 http_archive(
diff --git a/integration/bazel/BUILD.bazel b/integration/bazel/BUILD.bazel
index 356533e8bb..3307866a21 100644
--- a/integration/bazel/BUILD.bazel
+++ b/integration/bazel/BUILD.bazel
@@ -1,5 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
+exports_files([
+    "protractor.conf.js",
+])
+
 filegroup(
     name = "node_modules",
     srcs = glob(
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 946cd14f12..3f872be725 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -11,11 +11,20 @@ http_archive(
     sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
 )
 
+http_archive(
+    name = "bazel_gazelle",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
+    ],
+    sha256 = "ddedc7aaeb61f2654d7d7d4fd7940052ea992ccdb031b8f9797ed143ac7e8d43",
+)
+
 http_archive(
     name = "io_bazel_rules_webtesting",
-    url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
-    strip_prefix = "rules_webtesting-0.2.0",
-    sha256 = "cecc12f07e95740750a40d38e8b14b76fefa1551bef9332cb432d564d693723c",
+    url = "https://github.com/bazelbuild/rules_webtesting/archive/8fd9ce0fd9254bde251da0bc373d6cd08e811434.zip",
+    strip_prefix = "rules_webtesting-8fd9ce0fd9254bde251da0bc373d6cd08e811434",
+    sha256 = "4baee95fcfadfbaf868707af8accfd1cb98c5d13f808908e0152468bfb47f0f7",
 )
 
 http_archive(
diff --git a/integration/bazel/package.json b/integration/bazel/package.json
index 5c2bb294f2..3730e3fdb9 100644
--- a/integration/bazel/package.json
+++ b/integration/bazel/package.json
@@ -18,17 +18,13 @@
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@types/jasmine": "2.8.7",
     "@types/source-map": "0.5.1",
-    "concurrently": "3.5.1",
     "http-server": "0.11.1",
     "protractor": "file:../../node_modules/protractor",
+    "tsutils": "file:../../node_modules/tsutils",
     "typescript": "file:../../node_modules/typescript"
   },
   "scripts": {
-    "postinstall": "concurrently \"webdriver-manager update $CHROMEDRIVER_VERSION_ARG\" \"ngc -p angular.tsconfig.json\"",
-    "test": "bazel build //... --noshow_progress && yarn e2e",
-    "pree2e": "bazel build test/...",
-    "e2e": "yarn e2e-prodserver && yarn e2e-devserver",
-    "e2e-prodserver": "concurrently \"bazel run //src:prodserver\" \"while ! nc -z 127.0.0.1 5432; do sleep 1; done && protractor\" --kill-others --success first",
-    "e2e-devserver": "concurrently \"bazel run //src:devserver\" \"while ! nc -z 127.0.0.1 5432; do sleep 1; done && protractor\" --kill-others --success first"
+    "postinstall": "ngc -p angular.tsconfig.json",
+    "test": "bazel build ... --noshow_progress && bazel test ..."
   }
-}
\ No newline at end of file
+}
diff --git a/integration/bazel/protractor.conf.js b/integration/bazel/protractor.conf.js
index 5ca2ef42d2..6d86d03a38 100644
--- a/integration/bazel/protractor.conf.js
+++ b/integration/bazel/protractor.conf.js
@@ -1,9 +1,4 @@
 exports.config = {
-  specs: ['bazel-bin/test/e2e/*.spec.js'],
-  capabilities: {browserName: 'chrome', chromeOptions: {args: ['--no-sandbox']}},
-  directConnect: true,
-  baseUrl: 'http://localhost:5432/',
-  framework: 'jasmine',
   getPageTimeout: 60 * 1000,
   allScriptsTimeout: 60 * 1000,
 };
diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index c7a0f0249b..11933be462 100644
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
 load("@angular//:index.bzl", "ng_module")
 
 # Allow targets under sub-packages to reference the tsconfig.json file
@@ -46,15 +48,11 @@ genrule(
 
 nodejs_binary(
     name = "prodserver",
-    args = [
-        "./src",
-        "-p",
-        "5432",
-    ],
     data = [
         "index.html",
         ":bundle",
         ":zone.js",
     ],
     entry_point = "http-server/bin/http-server",
+    templated_args = ["src"],
 )
diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel
index f023d58b55..c4b5c4000b 100644
--- a/integration/bazel/test/e2e/BUILD.bazel
+++ b/integration/bazel/test/e2e/BUILD.bazel
@@ -1,7 +1,34 @@
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@angular//:index.bzl", "protractor_web_test_suite")
 
 ts_library(
     name = "e2e",
     testonly = 1,
-    srcs = glob(["*.ts"]),
+    srcs = ["app.spec.ts"],
+)
+
+ts_library(
+    name = "ts_on_prepare",
+    testonly = 1,
+    srcs = ["on-prepare.ts"],
+    tsconfig = ":tsconfig.json",
+    deps = ["@angular//src/protractor/utils"],
+)
+
+protractor_web_test_suite(
+    name = "devserver_test",
+    configuration = "//:protractor.conf.js",
+    data = ["@angular//src/protractor/utils"],
+    on_prepare = ":ts_on_prepare",
+    server = "//src:devserver",
+    deps = [":e2e"],
+)
+
+protractor_web_test_suite(
+    name = "prodserver_test",
+    configuration = "//:protractor.conf.js",
+    data = ["@angular//src/protractor/utils"],
+    on_prepare = ":ts_on_prepare",
+    server = "//src:prodserver",
+    deps = [":e2e"],
 )
diff --git a/integration/bazel/test/e2e/app.spec.ts b/integration/bazel/test/e2e/app.spec.ts
index 69e93ccd8d..276d099a51 100644
--- a/integration/bazel/test/e2e/app.spec.ts
+++ b/integration/bazel/test/e2e/app.spec.ts
@@ -1,4 +1,4 @@
-import {browser, by, element, ExpectedConditions} from 'protractor';
+import {browser, by, element} from 'protractor';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;
 
diff --git a/integration/bazel/test/e2e/on-prepare.ts b/integration/bazel/test/e2e/on-prepare.ts
new file mode 100644
index 0000000000..83c96a4ab6
--- /dev/null
+++ b/integration/bazel/test/e2e/on-prepare.ts
@@ -0,0 +1,12 @@
+import { browser } from 'protractor';
+import {OnPrepareConfig, runServer} from '@angular/bazel/protractor-utils';
+
+export = function(config: OnPrepareConfig) {
+  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  return runServer(config.workspace, config.server, portFlag, [])
+    .then(serverSpec => {
+      const serverUrl = `http://localhost:${serverSpec.port}`;
+      console.log(`Server has been started, starting tests against ${serverUrl}`);
+      browser.baseUrl = serverUrl;
+    });
+}
diff --git a/integration/bazel/test/e2e/tsconfig.json b/integration/bazel/test/e2e/tsconfig.json
new file mode 100644
index 0000000000..8f3c656796
--- /dev/null
+++ b/integration/bazel/test/e2e/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "lib": ["es2015"]
+  }
+}
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index 2612d49100..474faef7fb 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -3,12 +3,12 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/bazel@file:../../dist/packages-dist/bazel":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     "@bazel/typescript" "^0.15.0"
     "@types/node" "6.0.84"
@@ -17,12 +17,12 @@
     shelljs "0.7.8"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
@@ -30,22 +30,22 @@
     tsickle "^0.29.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "6.0.0-rc.5"
+  version "6.1.0-beta.1"
   dependencies:
     tslib "^1.9.0"
 
@@ -74,16 +74,16 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
 
 "@types/node@*":
-  version "10.1.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.4.tgz#606651d3f8a8bec08b8cb262161aab9209f4a29d"
+  version "10.3.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.4.tgz#c74e8aec19e555df44609b8057311052a2c84d9e"
 
 "@types/node@6.0.84":
   version "6.0.84"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
 
 "@types/node@^6.0.46":
-  version "6.0.111"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.111.tgz#85f880a1bab78d395a5de9bcb5319e73a0c31400"
+  version "6.0.113"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.113.tgz#4b41f38ad03e4b41f9dc259b3b58aecb22c9aebc"
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -132,10 +132,6 @@ ajv@^5.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ansi-regex@^0.2.0, ansi-regex@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -144,10 +140,6 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
-ansi-styles@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
-
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -286,16 +278,6 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-chalk@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
-  dependencies:
-    ansi-styles "^1.1.0"
-    escape-string-regexp "^1.0.0"
-    has-ansi "^0.1.0"
-    strip-ansi "^0.3.0"
-    supports-color "^0.2.0"
-
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -355,27 +337,10 @@ combined-stream@1.0.6, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concurrently@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.1.tgz#ee8b60018bbe86b02df13e5249453c6ececd2521"
-  dependencies:
-    chalk "0.5.1"
-    commander "2.6.0"
-    date-fns "^1.23.0"
-    lodash "^4.5.1"
-    rx "2.3.24"
-    spawn-command "^0.0.2-1"
-    supports-color "^3.2.3"
-    tree-kill "^1.1.0"
-
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -394,10 +359,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@^1.23.0:
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
-
 debug@2, debug@^2.1.2, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -457,7 +418,7 @@ ecstatic@^3.0.0:
     minimist "^1.1.0"
     url-join "^2.0.2"
 
-escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2:
+escape-string-regexp@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -645,22 +606,12 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
-has-ansi@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
-  dependencies:
-    ansi-regex "^0.2.0"
-
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   dependencies:
     ansi-regex "^2.0.0"
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -894,10 +845,6 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lodash@^4.5.1:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -1303,8 +1250,8 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
 resolve@^1.1.6:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
     path-parse "^1.0.5"
 
@@ -1314,10 +1261,6 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
-rx@2.3.24:
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
-
 "rxjs@file:../../node_modules/rxjs":
   version "6.0.0"
   dependencies:
@@ -1327,7 +1270,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0,
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
@@ -1413,18 +1356,15 @@ source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-
 sshpk@^1.7.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
     dashdash "^1.12.0"
     getpass "^0.1.1"
+    safer-buffer "^2.0.2"
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
@@ -1452,12 +1392,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
-  dependencies:
-    ansi-regex "^0.2.1"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -1474,20 +1408,10 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-supports-color@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  dependencies:
-    has-flag "^1.0.0"
-
 tar@^4:
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
@@ -1516,10 +1440,6 @@ tough-cookie@~2.3.3:
   dependencies:
     punycode "^1.4.1"
 
-tree-kill@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-
 tsickle@^0.29.0:
   version "0.29.0"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
@@ -1529,10 +1449,15 @@ tsickle@^0.29.0:
     source-map "^0.6.0"
     source-map-support "^0.5.0"
 
-tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
 
+"tsutils@file:../../node_modules/tsutils":
+  version "2.20.0"
+  dependencies:
+    tslib "^1.8.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -1544,7 +1469,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 "typescript@file:../../node_modules/typescript":
-  version "2.7.2"
+  version "2.8.3"
 
 ultron@1.0.x:
   version "1.0.2"
diff --git a/packages/bazel/index.bzl b/packages/bazel/index.bzl
index 247618070e..1cb77d4e52 100644
--- a/packages/bazel/index.bzl
+++ b/packages/bazel/index.bzl
@@ -9,8 +9,11 @@ Users should not load files under "/src"
 
 load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module")
 load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package")
-load("//packages/bazel/src/protractor:protractor_web_test_suite.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
+load("//packages/bazel/src/protractor:protractor_web_test.bzl",
+     _protractor_web_test = "protractor_web_test",
+     _protractor_web_test_suite = "protractor_web_test_suite")
 
 ng_module = _ng_module
 ng_package = _ng_package
+protractor_web_test = _protractor_web_test
 protractor_web_test_suite = _protractor_web_test_suite
diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel
index fbe921dbec..0f01be9729 100644
--- a/packages/bazel/src/BUILD.bazel
+++ b/packages/bazel/src/BUILD.bazel
@@ -5,6 +5,7 @@ filegroup(
     srcs = glob(["*"]) + [
         "//packages/bazel/src/ng_package:package_assets",
         "//packages/bazel/src/ngc-wrapped:package_assets",
+        "//packages/bazel/src/protractor:package_assets",
     ],
     visibility = ["//packages/bazel:__subpackages__"],
 )
diff --git a/packages/bazel/src/protractor/BUILD.bazel b/packages/bazel/src/protractor/BUILD.bazel
index e3be3b819b..98d1e3ffbc 100644
--- a/packages/bazel/src/protractor/BUILD.bazel
+++ b/packages/bazel/src/protractor/BUILD.bazel
@@ -1,4 +1,13 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "package_assets",
+    srcs = glob(["*"]) + [
+        "//packages/bazel/src/protractor/utils:package_assets",
+    ],
+    visibility = ["//packages/bazel:__subpackages__"],
+)
+
 exports_files([
-    "conf.js.tmpl",
-    "protractor_runner.js",
+    "protractor.conf.js",
 ])
diff --git a/packages/bazel/src/protractor/conf.js.tmpl b/packages/bazel/src/protractor/conf.js.tmpl
deleted file mode 100644
index 76dc1574db..0000000000
--- a/packages/bazel/src/protractor/conf.js.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-const baseConf = require("BASE_CONF_IMPORT_PATH");
-
-exports.config = {
-  ...baseConf.config,
-  framework: "jasmine2",
-  seleniumAddress: process.env.WEB_TEST_HTTP_SERVER.trim() + "/wd/hub",
-  specs: [
-    SPEC_FILE_IMPORT_PATHS
-  ].map(specPath => require.resolve(specPath)),
-  // TODO: Allow users to specifify other browsers.
-  capabilities: {
-    browserName: "chrome"
-  },
-};
diff --git a/packages/bazel/src/protractor/protractor.conf.js b/packages/bazel/src/protractor/protractor.conf.js
new file mode 100644
index 0000000000..70ee78a475
--- /dev/null
+++ b/packages/bazel/src/protractor/protractor.conf.js
@@ -0,0 +1,154 @@
+/**
+ * @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
+ */
+
+const path = require('path');
+
+const DEBUG = false;
+
+const configPath = 'TMPL_config';
+const onPreparePath = 'TMPL_on_prepare';
+const workspace = 'TMPL_workspace';
+const server = 'TMPL_server';
+
+if (DEBUG)
+  console.info(`Protractor test starting with:
+  cwd: ${process.cwd()}
+  configPath: ${configPath}
+  onPreparePath: ${onPreparePath}
+  workspace: ${workspace}
+  server: ${server}`);
+
+// Helper function to warn when a user specified value is being overwritten
+function setConf(conf, name, value, msg) {
+  if (conf[name] && conf[name] !== value) {
+    console.warn(
+        `Your protractor configuration specifies an option which is overwritten by Bazel: '${name}' ${msg}`);
+  }
+  conf[name] = value;
+}
+
+let conf = {};
+
+// Import the user's base protractor configuration if specified
+if (configPath) {
+  const baseConf = require(configPath);
+  if (!baseConf.config) {
+    throw new Error('Invalid base protractor configration. Expected config to be exported.');
+  }
+  conf = baseConf.config;
+}
+
+// Import the user's on prepare function if specified
+if (onPreparePath) {
+  const onPrepare = require(onPreparePath);
+  if (typeof onPrepare === 'function') {
+    const original = conf.onPrepare;
+    conf.onPrepare = function() {
+      return Promise.resolve(original ? original() : null)
+          .then(() => Promise.resolve(onPrepare({workspace, server})));
+    };
+  } else {
+    throw new Error(
+        'Invalid protractor on_prepare script. Expected a function as the default export.');
+  }
+}
+
+// Override the user's base protractor configuration as appropriate based on the
+// ts_web_test_suite & rules_webtesting WEB_TEST_METADATA attributes
+setConf(conf, 'framework', 'jasmine2', 'is set to jasmine2');
+
+const specs = [TMPL_specs]
+                  .map(s => require.resolve(s))
+                  .filter(s => s.endsWith('.spec.js') || s.endsWith('.test.js'));
+
+setConf(conf, 'specs', specs, 'are determined by the srcs and deps attribute');
+
+// WEB_TEST_METADATA is configured in rules_webtesting based on value
+// of the browsers attribute passed to ts_web_test_suite
+// We setup the protractor configuration based on the values in this object
+if (process.env['WEB_TEST_METADATA']) {
+  const webTestMetadata = require(process.env['WEB_TEST_METADATA']);
+  if (DEBUG) console.info(`WEB_TEST_METADATA: ${JSON.stringify(webTestMetadata, null, 2)}`);
+  if (webTestMetadata['environment'] === 'sauce') {
+    // If a sauce labs browser is chosen for the test such as
+    // "@io_bazel_rules_webtesting//browsers/sauce:chrome-win10"
+    // than the 'environment' will equal 'sauce'.
+    // We expect that a SAUCE_USERNAME and SAUCE_ACCESS_KEY is available
+    // from the environment for this test to run
+
+    // TODO(gmagolan): implement sauce labs support for protractor
+    throw new Error('Saucelabs not yet support by protractor_web_test_suite.');
+
+    // if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) {
+    //   console.error('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are
+    //   set.');
+    //   process.exit(1);
+    // }
+    // setConf(conf, 'sauceUser', process.env.SAUCE_USERNAME, 'is determined by the SAUCE_USERNAME
+    // environment variable');
+    // setConf(conf, 'sauceKey', process.env.SAUCE_ACCESS_KEY, 'is determined by the
+    // SAUCE_ACCESS_KEY environment variable');
+  } else if (webTestMetadata['environment'] === 'local') {
+    // When a local chrome or firefox browser is chosen such as
+    // "@io_bazel_rules_webtesting//browsers:chromium-local" or
+    // "@io_bazel_rules_webtesting//browsers:firefox-local"
+    // then the 'environment' will equal 'local' and
+    // 'webTestFiles' will contain the path to the binary to use
+    const webTestNamedFiles = webTestMetadata['webTestFiles'][0]['namedFiles'];
+    const headless = !process.env['DISPLAY'];
+    if (webTestNamedFiles['CHROMIUM']) {
+      const chromeBin = path.join(process.cwd(), 'external', webTestNamedFiles['CHROMIUM']);
+      const args = [];
+      if (headless) {
+        args.push('--headless');
+        args.push('--disable-gpu');
+      }
+      setConf(conf, 'directConnect', true, 'is set to true for chrome');
+      setConf(
+          conf, 'chromeDriver',
+          path.join(process.cwd(), 'external', webTestNamedFiles['CHROMEDRIVER']),
+          'is determined by the browsers attribute');
+      setConf(
+          conf, 'capabilities', {
+            browserName: 'chrome',
+            chromeOptions: {
+              binary: chromeBin,
+              args: args,
+            }
+          },
+          'is determined by the browsers attribute');
+    }
+    if (webTestNamedFiles['FIREFOX']) {
+      // TODO(gmagolan): implement firefox support for protractor
+      throw new Error('Firefox not yet support by protractor_web_test_suite');
+
+      // const firefoxBin = path.join('external', webTestNamedFiles['FIREFOX']);
+      // const args = [];
+      // if (headless) {
+      //   args.push("--headless")
+      //   args.push("--marionette")
+      // }
+      // setConf(conf, 'seleniumAddress', process.env.WEB_TEST_HTTP_SERVER.trim() + "/wd/hub", 'is
+      // configured by Bazel for firefox browser')
+      // setConf(conf, 'capabilities', {
+      //   browserName: "firefox",
+      //   'moz:firefoxOptions': {
+      //     binary: firefoxBin,
+      //     args: args,
+      //   }
+      // }, 'is determined by the browsers attribute');
+    }
+  } else {
+    console.warn(`Unknown WEB_TEST_METADATA environment '${webTestMetadata['environment']}'`);
+  }
+}
+
+// Export the complete protractor configuration
+if (DEBUG) console.info(`Protractor configuration: ${JSON.stringify(conf, null, 2)}`);
+
+exports.config = conf;
diff --git a/packages/bazel/src/protractor/protractor_runner.js b/packages/bazel/src/protractor/protractor_runner.js
deleted file mode 100644
index 095373953f..0000000000
--- a/packages/bazel/src/protractor/protractor_runner.js
+++ /dev/null
@@ -1,23 +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
- *
- * @fileoverview A wrapper around the protractor cli for bazel compatibility.
- */
-
-const launcher = require('protractor/built/launcher');
-
-function main(args) {
-  if (!args.length) {
-    throw new Error('Config file argument missing');
-  }
-  const config = require.resolve(args[0]);
-  launcher.init(config);
-}
-
-if (require.main === module) {
-  process.exitCode = main(process.argv.slice(2));
-}
diff --git a/packages/bazel/src/protractor/protractor_web_test.bzl b/packages/bazel/src/protractor/protractor_web_test.bzl
new file mode 100644
index 0000000000..3b66c4ee32
--- /dev/null
+++ b/packages/bazel/src/protractor/protractor_web_test.bzl
@@ -0,0 +1,341 @@
+# 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
+"""Implementation of the protractor_web_test and protractor_web_test_suite rules.
+"""
+
+load("@build_bazel_rules_nodejs//internal:node.bzl",
+    "sources_aspect",
+    "expand_path_into_runfiles",
+)
+load("@io_bazel_rules_webtesting//web:web.bzl", "web_test_suite")
+load("@io_bazel_rules_webtesting//web/internal:constants.bzl", "DEFAULT_WRAPPED_TEST_TAGS")
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+_CONF_TMPL = "//packages/bazel/src/protractor:protractor.conf.js"
+
+def _protractor_web_test_impl(ctx):
+  configuration = ctx.actions.declare_file(
+      "%s.conf.js" % ctx.label.name,
+      sibling=ctx.outputs.executable)
+
+  files = depset(ctx.files.srcs)
+  for d in ctx.attr.deps:
+    if hasattr(d, "node_sources"):
+      files = depset(transitive = [files, d.node_sources])
+    elif hasattr(d, "files"):
+      files = depset(transitive = [files, d.files])
+
+  specs = [
+      expand_path_into_runfiles(ctx, f.short_path)
+      for f in files
+  ]
+
+  configuration_sources = []
+  if ctx.file.configuration:
+    configuration_sources = [ctx.file.configuration]
+  if hasattr(ctx.attr.configuration, "node_sources"):
+    configuration_sources = ctx.attr.configuration.node_sources.to_list()
+
+  configuration_file = ctx.file.configuration
+  if hasattr(ctx.attr.configuration, "typescript"):
+    configuration_file = ctx.attr.configuration.typescript.es5_sources.to_list()[0]
+
+  on_prepare_sources = []
+  if ctx.file.on_prepare:
+    on_prepare_sources = [ctx.file.on_prepare]
+  if hasattr(ctx.attr.on_prepare, "node_sources"):
+    on_prepare_sources = ctx.attr.on_prepare.node_sources.to_list()
+
+  on_prepare_file = ctx.file.on_prepare
+  if hasattr(ctx.attr.on_prepare, "typescript"):
+    on_prepare_file = ctx.attr.on_prepare.typescript.es5_sources.to_list()[0]
+
+  protractor_executable_path = ctx.executable.protractor.short_path
+  if protractor_executable_path.startswith('..'):
+    protractor_executable_path = "external" + protractor_executable_path[2:]
+
+  server_executable_path = ''
+  if ctx.executable.server:
+    server_executable_path = ctx.executable.server.short_path
+    if server_executable_path.startswith('..'):
+      server_executable_path = "external" + protractor_executable_path[2:]
+
+  ctx.actions.expand_template(
+      output = configuration,
+      template =  ctx.file._conf_tmpl,
+      substitutions = {
+          "TMPL_config": expand_path_into_runfiles(ctx, configuration_file.short_path) if configuration_file else "",
+          "TMPL_on_prepare": expand_path_into_runfiles(ctx, on_prepare_file.short_path) if on_prepare_file else "",
+          "TMPL_workspace": ctx.workspace_name,
+          "TMPL_server": server_executable_path,
+          "TMPL_specs": "\n".join(["      '%s'," % e for e in specs]),
+      })
+
+  runfiles = [configuration] + configuration_sources + on_prepare_sources
+
+  ctx.actions.write(
+      output = ctx.outputs.executable,
+      is_executable = True,
+      content = """#!/usr/bin/env bash
+if [ -e "$RUNFILE_MANIFEST_FILE" ]; then
+  while read line; do
+    declare -a PARTS=($line)
+    if [ "${{PARTS[0]}}" == "angular/{TMPL_protractor}" ]; then
+      readonly PROTRACTOR=${{PARTS[1]}}
+    elif [ "${{PARTS[0]}}" == "angular/{TMPL_conf}" ]; then
+      readonly CONF=${{PARTS[1]}}
+    fi
+  done < $RUNFILE_MANIFEST_FILE
+else
+  readonly PROTRACTOR={TMPL_protractor}
+  readonly CONF={TMPL_conf}
+fi
+
+export HOME=$(mktemp -d)
+
+# Print the protractor version in the test log
+PROTRACTOR_VERSION=$($PROTRACTOR --version)
+echo "Protractor $PROTRACTOR_VERSION"
+
+# Run the protractor binary
+$PROTRACTOR $CONF
+""".format(TMPL_protractor = protractor_executable_path,
+           TMPL_conf = configuration.short_path))
+  return [DefaultInfo(
+      files = depset([ctx.outputs.executable]),
+      runfiles = ctx.runfiles(
+          files = runfiles,
+          transitive_files = files,
+          # Propagate protractor_bin and its runfiles
+          collect_data = True,
+          collect_default = True,
+      ),
+      executable = ctx.outputs.executable,
+  )]
+
+_protractor_web_test = rule(
+    implementation = _protractor_web_test_impl,
+    test = True,
+    executable = True,
+    attrs = {
+        "configuration": attr.label(
+            doc = "Protractor configuration file",
+            allow_single_file = True,
+            cfg = "data",
+            aspects = [sources_aspect]),
+        "srcs": attr.label_list(
+            doc = "A list of JavaScript test files",
+            allow_files = [".js"]),
+        "on_prepare": attr.label(
+            doc = """A file with a node.js script to run once before all tests run.
+            If the script exports a function which returns a promise, protractor
+            will wait for the promise to resolve before beginning tests.""",
+            allow_single_file = True,
+            cfg = "data",
+            aspects = [sources_aspect]),
+        "deps": attr.label_list(
+            doc = "Other targets which produce JavaScript such as `ts_library`",
+            allow_files = True,
+            aspects = [sources_aspect]),
+        "data": attr.label_list(
+            doc = "Runtime dependencies",
+            cfg = "data"),
+        "server": attr.label(
+            doc = "Optional server executable target",
+            executable = True,
+            cfg = "data",
+            single_file = False,
+            allow_files = True),
+        "protractor": attr.label(
+            doc = "Protractor executable target (set by protractor_web_test macro)",
+            executable = True,
+            cfg = "data",
+            single_file = False,
+            allow_files = True),
+        "_conf_tmpl": attr.label(
+            default = Label(_CONF_TMPL),
+            allow_single_file = True,
+        ),
+    },
+)
+
+def protractor_web_test(
+  name,
+  configuration = None,
+  on_prepare = None,
+  srcs = [],
+  deps = [],
+  data = [],
+  server = None,
+  tags = [],
+  **kwargs):
+  """Runs a protractor test in a browser.
+
+  Args:
+    name: The name of the test
+    configuration: Protractor configuration file.
+    on_prepare: A file with a node.js script to run once before all tests run.
+        If the script exports a function which returns a promise, protractor
+        will wait for the promise to resolve before beginning tests.
+    srcs: JavaScript source files
+    deps: Other targets which produce JavaScript such as `ts_library`
+    data: Runtime dependencies
+    server: Optional server executable target
+    tags: Standard Bazel tags, this macro adds one for ibazel
+    **kwargs: passed through to `_protractor_web_test`
+  """
+
+  protractor_bin_name = name + "_protractor_bin"
+
+  nodejs_binary(
+      name = protractor_bin_name,
+      entry_point = "protractor/bin/protractor",
+      data = srcs + deps + data,
+      node_modules = "@//:node_modules",
+      testonly = 1,
+      visibility = ["//visibility:private"],
+  )
+
+  # Our binary dependency must be in data[] for collect_data to pick it up
+  # FIXME: maybe we can just ask :protractor_bin_name for its runfiles attr
+  web_test_data = data + [":" + protractor_bin_name]
+  if server:
+    web_test_data += [server]
+
+  _protractor_web_test(
+      name = name,
+      configuration = configuration,
+      on_prepare=on_prepare,
+      srcs = srcs,
+      deps = deps,
+      data = web_test_data,
+      server = server,
+      protractor = protractor_bin_name,
+      tags = tags + [
+          # Users don't need to know that this tag is required to run under ibazel
+          "ibazel_notify_changes",
+      ],
+      **kwargs)
+
+def protractor_web_test_suite(
+  name,
+  configuration = None,
+  on_prepare = None,
+  srcs = [],
+  deps = [],
+  data = [],
+  server = None,
+  browsers=["@io_bazel_rules_webtesting//browsers:chromium-local"],
+  args=None,
+  browser_overrides=None,
+  config=None,
+  flaky=None,
+  local=None,
+  shard_count=None,
+  size=None,
+  tags = [],
+  test_suite_tags=None,
+  timeout=None,
+  visibility=None,
+  web_test_data=[],
+  wrapped_test_tags=None,
+  **remaining_keyword_args):
+  """Defines a test_suite of web_test targets that wrap a protractor_web_test target.
+
+  Args:
+    name: The base name of the test.
+    configuration: Protractor configuration file.
+    on_prepare: A file with a node.js script to run once before all tests run.
+        If the script exports a function which returns a promise, protractor
+        will wait for the promise to resolve before beginning tests.
+    srcs: JavaScript source files
+    deps: Other targets which produce JavaScript such as `ts_library`
+    data: Runtime dependencies
+    server: Optional server executable target
+    browsers: A sequence of labels specifying the browsers to use.
+    args: Args for web_test targets generated by this extension.
+    browser_overrides: Dictionary; optional; default is an empty dictionary. A
+      dictionary mapping from browser names to browser-specific web_test
+      attributes, such as shard_count, flakiness, timeout, etc. For example:
+      {'//browsers:chrome-native': {'shard_count': 3, 'flaky': 1}
+       '//browsers:firefox-native': {'shard_count': 1, 'timeout': 100}}.
+    config: Label; optional; Configuration of web test features.
+    flaky: A boolean specifying that the test is flaky. If set, the test will
+      be retried up to 3 times (default: 0)
+    local: boolean; optional.
+    shard_count: The number of test shards to use per browser. (default: 1)
+    size: A string specifying the test size. (default: 'large')
+    tags: A list of test tag strings to apply to each generated web_test target.
+      This macro adds a couple for ibazel.
+    test_suite_tags: A list of tag strings for the generated test_suite.
+    timeout: A string specifying the test timeout (default: computed from size)
+    visibility: List of labels; optional.
+    web_test_data: Data dependencies for the web_test.
+    wrapped_test_tags: A list of test tag strings to use for the wrapped test
+    **remaining_keyword_args: Arguments for the wrapped test target.
+  """
+  # Check explicitly for None so that users can set this to the empty list
+  if wrapped_test_tags == None:
+    wrapped_test_tags = DEFAULT_WRAPPED_TEST_TAGS
+
+  size = size or "large"
+
+  wrapped_test_name = name + "_wrapped_test"
+  protractor_bin_name = name + "_protractor_bin"
+
+  # Users don't need to know that this tag is required to run under ibazel
+  tags = tags + ["ibazel_notify_changes"]
+
+  nodejs_binary(
+      name = protractor_bin_name,
+      entry_point = "protractor/bin/protractor",
+      data = srcs + deps + data,
+      node_modules = "@//:node_modules",
+      testonly = 1,
+      visibility = ["//visibility:private"],
+  )
+
+  # Our binary dependency must be in data[] for collect_data to pick it up
+  # FIXME: maybe we can just ask the :protractor_bin_name for its runfiles attr
+  web_test_data = web_test_data + [":" + protractor_bin_name]
+  if server:
+    web_test_data += [server]
+
+  _protractor_web_test(
+      name=wrapped_test_name,
+      configuration=configuration,
+      on_prepare=on_prepare,
+      srcs=srcs,
+      deps=deps,
+      data=web_test_data,
+      server=server,
+      protractor=protractor_bin_name,
+      args=args,
+      flaky=flaky,
+      local=local,
+      shard_count=shard_count,
+      size=size,
+      tags=wrapped_test_tags,
+      timeout=timeout,
+      visibility=["//visibility:private"],
+      **remaining_keyword_args)
+
+  web_test_suite(
+      name=name,
+      launcher=":"+wrapped_test_name,
+      args=args,
+      browsers=browsers,
+      browser_overrides=browser_overrides,
+      config=config,
+      data=web_test_data,
+      flaky=flaky,
+      local=local,
+      shard_count=shard_count,
+      size=size,
+      tags=tags,
+      test=wrapped_test_name,
+      test_suite_tags=test_suite_tags,
+      timeout=timeout,
+      visibility=visibility)
diff --git a/packages/bazel/src/protractor/protractor_web_test_suite.bzl b/packages/bazel/src/protractor/protractor_web_test_suite.bzl
deleted file mode 100644
index 8b8de712c7..0000000000
--- a/packages/bazel/src/protractor/protractor_web_test_suite.bzl
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
-"""Implementation of the protractor_web_test_suite rule.
-"""
-
-load("@io_bazel_rules_webtesting//web:web.bzl", "web_test_suite")
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-load("@build_bazel_rules_nodejs//internal/common:sources_aspect.bzl", "sources_aspect")
-load("@build_bazel_rules_nodejs//internal/common:module_mappings.bzl", "module_mappings_runtime_aspect")
-
-def _modify_tsconfig_impl(ctx):
-  spec_file_import_paths = []
-  for dep in ctx.attr.deps:
-    # For each transitive ES5 dependency, grab the short path
-    for f in dep.node_sources.to_list():
-      spec_file_import_paths.append("\"{workspace}/{path}\"".format(workspace=ctx.workspace_name, path=f.short_path))
-
-  ctx.actions.expand_template(
-    template = ctx.file._conf_templ,
-    output = ctx.outputs._modified_conf,
-    substitutions = {
-      "BASE_CONF_IMPORT_PATH": "{workspace}/{path}".format(workspace=ctx.workspace_name, path=ctx.file.base_conf.short_path),
-      "SPEC_FILE_IMPORT_PATHS": ',\n    '.join(spec_file_import_paths),
-    })
-
-_modify_conf = rule(
-  attrs = {
-    "base_conf": attr.label(
-      doc = """conf.js file used to configure protractor.""",
-      allow_single_file = True,
-      cfg = "data",
-      aspects = [
-        sources_aspect,
-        module_mappings_runtime_aspect,
-      ],
-    ),
-    "deps": attr.label_list(
-      doc = """Spec and page files used for testing.""",
-      allow_files = True,
-      cfg = "data",
-      aspects = [
-        sources_aspect,
-        module_mappings_runtime_aspect,
-      ],
-    ),
-    "_conf_templ": attr.label(
-      allow_files = True,
-      single_file = True,
-      default = Label("@angular//packages/bazel/src/protractor:conf.js.tmpl"),
-    ),
-  },
-  outputs = {
-    "_modified_conf": "%{name}.conf.js",
-  },
-  implementation = _modify_tsconfig_impl,
-)
-
-def protractor_web_test_suite(name, conf, deps, data = [], **kwargs):
-  """Runs protractor using the passed conf.js file and tests listed within deps.
-
-  Args:
-    name: The name of the web_test_suite rule the macro expands into.
-    conf: A conf.js file to be used as a base template. The following fields of the base
-      config are overridden:
-        framework
-        seleniumAddress
-        specs
-        capabilities
-    deps: A list of dependencies containing the test files to run within protractor.
-    data: Any runtime files which are needed to run the test suite.
-    **kwargs: Any other arguements are passed directory to the expanded web_test_suite rule.
-
-  Returns:
-    This macro expands into a web_test_suite rule which runs the protractor tests.
-  """
-
-  _modify_conf_name = "%s_modify_conf" % name
-  _modify_conf(
-    name = _modify_conf_name,
-    base_conf = conf,
-    deps = deps,
-    testonly = True,
-  )
-
-  _modified_conf = "%s.conf.js" % _modify_conf_name
-
-  _protractor_runner_name = name + "_protractor_runner"
-  nodejs_binary(
-    name = _protractor_runner_name,
-    entry_point = "angular/packages/bazel/src/protractor/protractor_runner.js",
-    data = data + deps + [_modified_conf, "@angular//packages/bazel/src/protractor:protractor_runner.js"],
-    templated_args = ["$(location :%s)" % _modified_conf],
-    tags = ["manual"],
-    testonly = True,
-  )
-
-  web_test_suite(
-    name = name,
-    # TODO: Allow users to specify more browsers. Currently conf.js is hardcoded for chrome.
-    browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"],
-    data = data + deps + [conf, _modified_conf],
-    test = ":%s_bin" % _protractor_runner_name,
-    testonly = True,
-    **kwargs
-  )
diff --git a/packages/bazel/src/protractor/utils/BUILD.bazel b/packages/bazel/src/protractor/utils/BUILD.bazel
new file mode 100644
index 0000000000..437e9b327e
--- /dev/null
+++ b/packages/bazel/src/protractor/utils/BUILD.bazel
@@ -0,0 +1,16 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "package_assets",
+    srcs = glob(["*"]),
+    visibility = ["//packages/bazel:__subpackages__"],
+)
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+ts_library(
+    name = "utils",
+    srcs = ["index.ts"],
+    module_name = "@angular/bazel/protractor-utils",
+    tsconfig = ":tsconfig.json",
+)
diff --git a/packages/bazel/src/protractor/utils/index.ts b/packages/bazel/src/protractor/utils/index.ts
new file mode 100644
index 0000000000..666119d516
--- /dev/null
+++ b/packages/bazel/src/protractor/utils/index.ts
@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as child_process from 'child_process';
+import * as net from 'net';
+import * as path from 'path';
+
+export function isTcpPortFree(port: number): Promise<boolean> {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.on('error', (e) => { resolve(false); });
+    server.on('close', () => { resolve(true); });
+    server.listen(port, () => { server.close(); });
+  });
+}
+
+export function isTcpPortBound(port: number): Promise<boolean> {
+  return new Promise((resolve, reject) => {
+    const client = new net.Socket();
+    client.once('connect', () => { resolve(true); });
+    client.once('error', (e) => { resolve(false); });
+    client.connect(port);
+  });
+}
+
+export async function findFreeTcpPort(): Promise<number> {
+  const range = {
+    min: 32768,
+    max: 60000,
+  };
+  for (let i = 0; i < 100; i++) {
+    let port = Math.floor(Math.random() * (range.max - range.min) + range.min);
+    if (await isTcpPortFree(port)) {
+      return port;
+    }
+  }
+  throw new Error('Unable to find a free port');
+}
+
+// Interface for config parameter of the protractor_web_test_suite onPrepare function
+export interface OnPrepareConfig {
+  // The workspace name
+  workspace: string;
+
+  // The server binary to run
+  server: string;
+}
+
+export function waitForServer(port: number, timeout: number): Promise<boolean> {
+  return isTcpPortBound(port).then(isBound => {
+    if (!isBound) {
+      if (timeout <= 0) {
+        throw new Error('Timeout waiting for server to start');
+      }
+      const wait = Math.min(timeout, 500);
+      return new Promise((res, rej) => setTimeout(res, wait))
+          .then(() => waitForServer(port, timeout - wait));
+    }
+    return true;
+  });
+}
+
+// Return type from runServer function
+export interface ServerSpec {
+  // Port number that the server is running on
+  port: number;
+}
+
+export function runServer(
+    workspace: string, binary: string, portFlag: string, args: string[],
+    timeout = 5000): Promise<ServerSpec> {
+  return findFreeTcpPort().then(function(port) {
+    const runfiles_path = process.env.TEST_SRCDIR;
+    const cmd = path.join(runfiles_path, workspace, binary);
+
+    args = args.concat([portFlag, port.toString()]);
+
+    const child = child_process.spawn(
+        cmd, args, {cwd: path.join(runfiles_path, workspace), stdio: 'inherit'});
+
+    child.on('exit', function(code) {
+      if (code != 0) {
+        throw new Error(`non-zero exit code ${code} from server`);
+      }
+    });
+
+    return waitForServer(port, timeout).then(() => { return {port}; });
+  });
+}
diff --git a/packages/bazel/src/protractor/utils/tsconfig.json b/packages/bazel/src/protractor/utils/tsconfig.json
new file mode 100644
index 0000000000..e9b6c07f85
--- /dev/null
+++ b/packages/bazel/src/protractor/utils/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "noImplicitAny": true,
+    "lib": ["es2015"]
+  }
+}
diff --git a/packages/bazel/test/protractor-2/BUILD.bazel b/packages/bazel/test/protractor-2/BUILD.bazel
new file mode 100644
index 0000000000..696763d4c1
--- /dev/null
+++ b/packages/bazel/test/protractor-2/BUILD.bazel
@@ -0,0 +1,54 @@
+load("//packages/bazel:index.bzl", "protractor_web_test_suite")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "rollup_bundle")
+load("//tools/http-server:http_server.bzl", "http_server")
+
+ts_library(
+    name = "app",
+    srcs = ["app.ts"],
+)
+
+ts_devserver(
+    name = "devserver",
+    serving_path = "/bundle.min.js",
+    static_files = ["index.html"],
+    deps = [":app"],
+)
+
+rollup_bundle(
+    name = "bundle",
+    entry_point = "packages/bazel/test/protractor-2/app",
+    deps = [":app"],
+)
+
+http_server(
+    name = "prodserver",
+    data = [
+        "index.html",
+        ":bundle",
+    ],
+)
+
+ts_library(
+    name = "ts_spec",
+    testonly = True,
+    srcs = ["test.spec.ts"],
+)
+
+protractor_web_test_suite(
+    name = "prodserver_test",
+    configuration = ":conf.js",
+    data = ["//packages/bazel/src/protractor/utils"],
+    on_prepare = ":on-prepare.js",
+    server = ":prodserver",
+    deps = [":ts_spec"],
+)
+
+protractor_web_test_suite(
+    name = "devserver_test",
+    configuration = ":conf.js",
+    data = ["//packages/bazel/src/protractor/utils"],
+    on_prepare = ":on-prepare.js",
+    server = ":prodserver",
+    deps = [":ts_spec"],
+)
diff --git a/packages/bazel/test/protractor-2/app.ts b/packages/bazel/test/protractor-2/app.ts
new file mode 100644
index 0000000000..2008d9798a
--- /dev/null
+++ b/packages/bazel/test/protractor-2/app.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+const el: HTMLDivElement = document.createElement('div');
+el.innerText = 'Hello, Protractor';
+el.className = 'ts1';
+document.body.appendChild(el);
diff --git a/packages/bazel/test/protractor-2/conf.js b/packages/bazel/test/protractor-2/conf.js
new file mode 100644
index 0000000000..5d142953a9
--- /dev/null
+++ b/packages/bazel/test/protractor-2/conf.js
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+exports.config = {
+  onPrepare: function() { global.userOnPrepareGotCalled = true; }
+};
diff --git a/packages/bazel/test/protractor-2/index.html b/packages/bazel/test/protractor-2/index.html
new file mode 100644
index 0000000000..256a75f74f
--- /dev/null
+++ b/packages/bazel/test/protractor-2/index.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+  <head>
+    <title>protractor test</title>
+  </head>
+  <body>
+    <script src="/bundle.min.js"></script>
+  </body>
+</html>
diff --git a/packages/bazel/test/protractor-2/on-prepare.js b/packages/bazel/test/protractor-2/on-prepare.js
new file mode 100644
index 0000000000..1ce5b2d426
--- /dev/null
+++ b/packages/bazel/test/protractor-2/on-prepare.js
@@ -0,0 +1,22 @@
+/**
+ * @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
+ */
+
+const protractorUtils = require('@angular/bazel/protractor-utils');
+const protractor = require('protractor');
+
+module.exports = function(config) {
+  if (!global.userOnPrepareGotCalled) {
+    throw new Error('Expecting user configuration onPrepare to have been called');
+  }
+  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  return protractorUtils.runServer(config.workspace, config.server, portFlag, [])
+      .then(serverSpec => {
+        const serverUrl = `http://localhost:${serverSpec.port}`;
+        protractor.browser.baseUrl = serverUrl;
+      });
+};
diff --git a/packages/bazel/test/protractor-2/test.spec.ts b/packages/bazel/test/protractor-2/test.spec.ts
new file mode 100644
index 0000000000..cf8b5e9564
--- /dev/null
+++ b/packages/bazel/test/protractor-2/test.spec.ts
@@ -0,0 +1,28 @@
+/**
+ * @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
+ *
+ * @fileoverview A small demo of how to run a protractor test.
+ */
+
+import {ExpectedConditions, browser, by, element} from 'protractor';
+
+
+// This test uses Protractor without Angular, so disable Angular features
+browser.waitForAngularEnabled(false);
+
+describe('app', () => {
+  beforeAll(() => {
+    browser.get('');
+    browser.wait(ExpectedConditions.presenceOf(element(by.css('div.ts1'))), 100000);
+  });
+
+  it('should display: Hello, Protractor', (done) => {
+    const div = element(by.css('div.ts1'));
+    div.getText().then(t => expect(t).toEqual(`Hello, Protractor`));
+    done();
+  });
+});
diff --git a/packages/bazel/test/protractor-2/tsconfig.json b/packages/bazel/test/protractor-2/tsconfig.json
new file mode 100644
index 0000000000..8f3c656796
--- /dev/null
+++ b/packages/bazel/test/protractor-2/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "lib": ["es2015"]
+  }
+}
diff --git a/packages/bazel/test/protractor/BUILD.bazel b/packages/bazel/test/protractor/BUILD.bazel
index fe9ef9e9ec..ffd48d6ccb 100644
--- a/packages/bazel/test/protractor/BUILD.bazel
+++ b/packages/bazel/test/protractor/BUILD.bazel
@@ -7,8 +7,17 @@ ts_library(
     srcs = ["test.spec.ts"],
 )
 
+ts_library(
+    name = "ts_conf",
+    testonly = True,
+    srcs = ["conf.ts"],
+    tsconfig = ":tsconfig.json",
+    deps = ["//packages/bazel/src/protractor/utils"],
+)
+
 protractor_web_test_suite(
-    name = "demo",
-    conf = "conf.js",
+    name = "test",
+    configuration = ":ts_conf",
+    data = ["//packages/bazel/src/protractor/utils"],
     deps = [":ts_spec"],
 )
diff --git a/packages/bazel/test/protractor/conf.js b/packages/bazel/test/protractor/conf.js
deleted file mode 100644
index 2ac5a3ce80..0000000000
--- a/packages/bazel/test/protractor/conf.js
+++ /dev/null
@@ -1,29 +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
- */
-
-/**
- * @fileoverview A demo of what a user's conf.js file might look like.
- */
-const http = require('http');
-
-const PORT = 3000;
-
-exports.config = {
-  baseUrl: `http://localhost:${PORT}`,
-  onPrepare() {
-    const app = new http.Server();
-
-    app.on('request', (req, res) => {
-      res.writeHead(200, {'Content-Type': 'text/plain'});
-      res.write('Hello World');
-      res.end('\n');
-    });
-
-    return new Promise(resolve => { app.listen(PORT, () => { resolve(); }); });
-  }
-};
diff --git a/packages/bazel/test/protractor/conf.ts b/packages/bazel/test/protractor/conf.ts
new file mode 100644
index 0000000000..2a3e21f4be
--- /dev/null
+++ b/packages/bazel/test/protractor/conf.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as protractorUtils from '@angular/bazel/protractor-utils';
+import {browser} from 'protractor';
+
+const http = require('http');
+
+exports.config = {
+  onPrepare() {
+    return protractorUtils.findFreeTcpPort().then(port => {
+      const app = new http.Server();
+
+      app.on('request', (req, res) => {
+        res.writeHead(200, {'Content-Type': 'text/plain'});
+        res.write('Hello World');
+        res.end('\n');
+      });
+
+      browser.baseUrl = `http://localhost:${port}`;
+
+      return new Promise(resolve => { app.listen(port, () => { resolve(); }); });
+    });
+  }
+};
diff --git a/packages/bazel/test/protractor/tsconfig.json b/packages/bazel/test/protractor/tsconfig.json
new file mode 100644
index 0000000000..8f3c656796
--- /dev/null
+++ b/packages/bazel/test/protractor/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "lib": ["es2015"]
+  }
+}
diff --git a/tools/http-server/http_server.bzl b/tools/http-server/http_server.bzl
index e835fd5ffc..a8ef4422ef 100644
--- a/tools/http-server/http_server.bzl
+++ b/tools/http-server/http_server.bzl
@@ -4,15 +4,15 @@ See https://www.npmjs.com/package/http-server
 """
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
-def http_server(args = [], **kwargs):
+def http_server(templated_args = [], **kwargs):
   # By default, we pass an argument pointing the http server to the
   # package of the caller.
   # This assumes there is an index.html in the package directory.
-  if not args:
-    args = [native.package_name()]
+  if not templated_args:
+    templated_args = [native.package_name()]
 
   nodejs_binary(
       node_modules = "@http-server_runtime_deps//:node_modules",
       entry_point = "http-server/bin/http-server",
-      args = args,
+      templated_args = templated_args,
       **kwargs)

From ee50ee493d11d4810aa9d3ab2a778a3d469a3461 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 11 Jul 2018 10:34:24 -0700
Subject: [PATCH 467/582] build(bazel): try removing gazelle (#24787)

PR Close #24787
---
 WORKSPACE                   | 13 -------------
 integration/bazel/WORKSPACE |  9 ---------
 2 files changed, 22 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index a6c5b1ecf2..290420c7f5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -11,15 +11,6 @@ http_archive(
     sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
 )
 
-http_archive(
-    name = "bazel_gazelle",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
-    ],
-    sha256 = "ddedc7aaeb61f2654d7d7d4fd7940052ea992ccdb031b8f9797ed143ac7e8d43",
-)
-
 http_archive(
     name = "io_bazel_rules_webtesting",
     url = "https://github.com/bazelbuild/rules_webtesting/archive/7ffe970bbf380891754487f66c3d680c087d67f2.zip",
@@ -94,10 +85,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_too
 go_rules_dependencies()
 go_register_toolchains()
 
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
-
-gazelle_dependencies()
-
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
 
 web_test_repositories()
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 3f872be725..9c8f1e4c14 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -11,15 +11,6 @@ http_archive(
     sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
 )
 
-http_archive(
-    name = "bazel_gazelle",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz",
-    ],
-    sha256 = "ddedc7aaeb61f2654d7d7d4fd7940052ea992ccdb031b8f9797ed143ac7e8d43",
-)
-
 http_archive(
     name = "io_bazel_rules_webtesting",
     url = "https://github.com/bazelbuild/rules_webtesting/archive/8fd9ce0fd9254bde251da0bc373d6cd08e811434.zip",

From d05d28629df95c583fd2a93e2836e002d0998f9c Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 29 Jun 2018 11:55:55 -0700
Subject: [PATCH 468/582] test(common): run common/http tests with Bazel
 (#24738)

@angular/common/http had tests which were not executed in Bazel. This
commit adds a BUILD.bazel file and ensures the tests pass.

PR Close #24738
---
 packages/common/http/test/BUILD.bazel  | 35 ++++++++++++++++++++++++++
 packages/common/http/test/xsrf_spec.ts |  8 ++++--
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 packages/common/http/test/BUILD.bazel

diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel
new file mode 100644
index 0000000000..3f01fc2c37
--- /dev/null
+++ b/packages/common/http/test/BUILD.bazel
@@ -0,0 +1,35 @@
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "test_lib",
+    testonly = 1,
+    srcs = glob(
+        ["**/*.ts"],
+        exclude = ["**/*_node_only_spec.ts"],
+    ),
+    deps = [
+        "//packages/common/http",
+        "//packages/common/http/testing",
+        "//packages/core",
+        "//packages/core/testing",
+        "@rxjs",
+        "@rxjs//operators",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    bootstrap = ["angular/tools/testing/init_node_spec.js"],
+    deps = [
+        ":test_lib",
+        "//tools/testing:node",
+    ],
+)
+
+ts_web_test_suite(
+    name = "test_web",
+    deps = [
+        ":test_lib",
+    ],
+)
diff --git a/packages/common/http/test/xsrf_spec.ts b/packages/common/http/test/xsrf_spec.ts
index 20a3ac8250..c6ee4b10a7 100644
--- a/packages/common/http/test/xsrf_spec.ts
+++ b/packages/common/http/test/xsrf_spec.ts
@@ -76,13 +76,17 @@ class SampleTokenExtractor {
     it('does not re-parse if document.cookie has not changed', () => {
       expect(extractor.getToken()).toEqual('test');
       expect(extractor.getToken()).toEqual('test');
-      expect(extractor.parseCount).toEqual(1);
+      expect(getParseCount(extractor)).toEqual(1);
     });
     it('re-parses if document.cookie changes', () => {
       expect(extractor.getToken()).toEqual('test');
       document['cookie'] = 'XSRF-TOKEN=blah';
       expect(extractor.getToken()).toEqual('blah');
-      expect(extractor.parseCount).toEqual(2);
+      expect(getParseCount(extractor)).toEqual(2);
     });
   });
 }
+
+function getParseCount(extractor: HttpXsrfCookieExtractor): number {
+  return (extractor as any).parseCount;
+}
\ No newline at end of file

From a1b630ee8ffca94cffea1c091122e692a19f87f6 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 29 Jun 2018 14:03:18 -0700
Subject: [PATCH 469/582] fix(ivy): generate a type parameter for InjectorDef
 (#24738)

InjectorDef is parameterized on the type of the injector
configuration class (e.g. the @NgModule decorated type). Previously
this parameter was not included when generating .d.ts files that
contained InjectorDefs.

PR Close #24738
---
 packages/compiler/src/render3/r3_module_compiler.ts | 3 ++-
 tools/public_api_guard/core/core.d.ts               | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index 8b83f25931..921bae7ecf 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -107,7 +107,8 @@ export function compileInjector(meta: R3InjectorMetadata): R3InjectorDef {
     providers: meta.providers,
     imports: meta.imports,
   })]);
-  const type = new o.ExpressionType(o.importExpr(R3.InjectorDef));
+  const type =
+      new o.ExpressionType(o.importExpr(R3.InjectorDef, [new o.ExpressionType(meta.type)]));
   return {expression, type};
 }
 
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 04893d869f..09052c005c 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -408,6 +408,12 @@ export declare abstract class Injector {
 /** @experimental */
 export declare const INJECTOR: InjectionToken<Injector>;
 
+export interface InjectorDef<T> {
+    factory: () => T;
+    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
+    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
+}
+
 /** @experimental */
 export interface InjectorType<T> extends Type<T> {
     ngInjectorDef: never;

From 9f20dd937aa1a1a8fe3a3eace4238f9783db6395 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 29 Jun 2018 14:03:46 -0700
Subject: [PATCH 470/582] feat(ivy): give ngtsc a basic understanding of
 ModuleWithProviders (#24738)

This commit changes the @NgModule provider to understand that sometimes
an import will resolve to an object instead of a type, and that object
could be of the ModuleWithProviders type. In that case, the 'ngModule'
property is read, and its value used instead.

This still will not handle ModuleWithProviders references across
compilation units; that work is coming in a future PR.

PR Close #24738
---
 .../compiler-cli/src/ngtsc/annotations/src/ng_module.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index dd5c304194..5a7df1c339 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -132,6 +132,12 @@ function resolveTypeList(resolvedList: ResolvedValue, name: string): Reference[]
   }
 
   resolvedList.forEach((entry, idx) => {
+    // Unwrap ModuleWithProviders for modules that are locally declared (and thus static resolution
+    // was able to descend into the function and return an object literal, a Map).
+    if (entry instanceof Map && entry.has('ngModule')) {
+      entry = entry.get('ngModule') !;
+    }
+
     if (Array.isArray(entry)) {
       // Recurse into nested arrays.
       refList.push(...resolveTypeList(entry, name));
@@ -144,7 +150,7 @@ function resolveTypeList(resolvedList: ResolvedValue, name: string): Reference[]
       refList.push(entry);
     } else {
       // TODO(alxhub): expand ModuleWithProviders.
-      throw new Error(`Value at position ${idx} in ${name} array is not a reference`);
+      throw new Error(`Value at position ${idx} in ${name} array is not a reference: ${entry}`);
     }
   });
 

From cde0b4b3614656ef619be54e95a9c654dd588d51 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 29 Jun 2018 14:17:42 -0700
Subject: [PATCH 471/582] =?UTF-8?q?fix(ivy):=20*Def=20types=20are=20privat?=
 =?UTF-8?q?e=20(=C9=B5)=20symbols=20(#24738)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On accident a few of the definition types were emitted as public API
symbols. Much of the Ivy API surface is still prefixed with ɵ,
indicating it's a private API. The definition types should be private
for now.

PR Close #24738
---
 .../src/ngtsc/transform/src/translator.ts            |  4 ++--
 packages/compiler-cli/test/ngtsc/ngtsc_spec.ts       | 12 ++++++------
 packages/compiler/src/render3/r3_identifiers.ts      |  8 ++++----
 packages/core/src/di.ts                              |  2 +-
 packages/core/src/r3_symbols.ts                      |  4 ++--
 packages/core/test/render3/jit_environment_spec.ts   |  8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index b6b3122bad..c5e8f967cd 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -35,8 +35,8 @@ const CORE_SUPPORTED_SYMBOLS = new Set<string>([
   'ɵdefineNgModule',
   'inject',
   'InjectableDef',
-  'InjectorDef',
-  'NgModuleDef',
+  'ɵInjectorDef',
+  'ɵNgModuleDef',
 ]);
 
 export class ImportManager {
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 1ea38268bc..e690129325 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -144,7 +144,7 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngComponentDef: i0.ComponentDef<TestCmp, \'test-cmp\'>');
+    expect(dtsContents).toContain('static ngComponentDef: i0.ɵComponentDef<TestCmp, \'test-cmp\'>');
   });
 
   it('should compile Components without errors', () => {
@@ -196,9 +196,9 @@ describe('ngtsc behavioral tests', () => {
             'declarations: [TestCmp], imports: [], exports: [] })');
 
     const dtsContents = getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngComponentDef: i0.ComponentDef<TestCmp, \'test-cmp\'>');
+    expect(dtsContents).toContain('static ngComponentDef: i0.ɵComponentDef<TestCmp, \'test-cmp\'>');
     expect(dtsContents)
-        .toContain('static ngModuleDef: i0.NgModuleDef<TestModule, [TestCmp], [], []>');
+        .toContain('static ngModuleDef: i0.ɵNgModuleDef<TestModule, [TestCmp], [], []>');
     expect(dtsContents).not.toContain('__decorate');
   });
 
@@ -240,8 +240,8 @@ describe('ngtsc behavioral tests', () => {
 
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents)
-        .toContain('static ngModuleDef: i0.NgModuleDef<TestModule, [TestCmp], [OtherModule], []>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.InjectorDef');
+        .toContain('static ngModuleDef: i0.ɵNgModuleDef<TestModule, [TestCmp], [OtherModule], []>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ɵInjectorDef');
   });
 
   it('should compile Pipes without errors', () => {
@@ -342,6 +342,6 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('pipes: [TestPipe]');
 
     const dtsContents = getContents('test.d.ts');
-    expect(dtsContents).toContain('i0.NgModuleDef<TestModule, [TestPipe,TestCmp], [], []>');
+    expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [TestPipe,TestCmp], [], []>');
   });
 });
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index a2fb852395..12f6375229 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -104,7 +104,7 @@ export class Identifiers {
   static defineComponent: o.ExternalReference = {name: 'ɵdefineComponent', moduleName: CORE};
 
   static ComponentDef: o.ExternalReference = {
-    name: 'ComponentDef',
+    name: 'ɵComponentDef',
     moduleName: CORE,
   };
 
@@ -114,12 +114,12 @@ export class Identifiers {
   };
 
   static DirectiveDef: o.ExternalReference = {
-    name: 'DirectiveDef',
+    name: 'ɵDirectiveDef',
     moduleName: CORE,
   };
 
   static InjectorDef: o.ExternalReference = {
-    name: 'InjectorDef',
+    name: 'ɵInjectorDef',
     moduleName: CORE,
   };
 
@@ -129,7 +129,7 @@ export class Identifiers {
   };
 
   static NgModuleDef: o.ExternalReference = {
-    name: 'NgModuleDef',
+    name: 'ɵNgModuleDef',
     moduleName: CORE,
   };
 
diff --git a/packages/core/src/di.ts b/packages/core/src/di.ts
index 1e6b201b84..0a776ced01 100644
--- a/packages/core/src/di.ts
+++ b/packages/core/src/di.ts
@@ -13,7 +13,7 @@
  */
 
 export * from './di/metadata';
-export {InjectableType, InjectorType, defineInjectable, defineInjector} from './di/defs';
+export {InjectableType, InjectorDef, InjectorType, defineInjectable, defineInjector} from './di/defs';
 export {forwardRef, resolveForwardRef, ForwardRefFn} from './di/forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './di/injectable';
 export {inject, InjectFlags, INJECTOR, Injector} from './di/injector';
diff --git a/packages/core/src/r3_symbols.ts b/packages/core/src/r3_symbols.ts
index e76e2d02e9..ab344a1f06 100644
--- a/packages/core/src/r3_symbols.ts
+++ b/packages/core/src/r3_symbols.ts
@@ -19,9 +19,9 @@
  * The below symbols are used for @Injectable and @NgModule compilation.
  */
 
-export {InjectableDef, InjectorDef, defineInjectable, defineInjector} from './di/defs';
+export {InjectableDef, InjectorDef as ɵInjectorDef, defineInjectable, defineInjector} from './di/defs';
 export {inject} from './di/injector';
-export {NgModuleDef} from './metadata/ng_module';
+export {NgModuleDef as ɵNgModuleDef} from './metadata/ng_module';
 export {defineNgModule as ɵdefineNgModule} from './render3/definition';
 
 
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
index ea7e22b898..134970bdd6 100644
--- a/packages/core/test/render3/jit_environment_spec.ts
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -12,10 +12,10 @@ import {Identifiers} from '@angular/compiler/src/render3/r3_identifiers';
 import {angularCoreEnv} from '../../src/render3/jit/environment';
 
 const INTERFACE_EXCEPTIONS = new Set<string>([
-  'ComponentDef',
-  'DirectiveDef',
-  'InjectorDef',
-  'NgModuleDef',
+  'ɵComponentDef',
+  'ɵDirectiveDef',
+  'ɵInjectorDef',
+  'ɵNgModuleDef',
   'ɵPipeDef',
 ]);
 

From 48394c64aea83eb0cfad131873d3e032d504ec5f Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 29 Jun 2018 14:25:46 -0700
Subject: [PATCH 472/582] fix(ivy): remove spurious comma in ngtsc-built .d.ts
 files (#24738)

On accident a comma was emitted between imports when generating .d.ts
files. This commit removes it.

PR Close #24738
---
 packages/compiler-cli/src/ngtsc/transform/src/declaration.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
index 3c24a6be95..fbb4cee703 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
@@ -59,7 +59,7 @@ export class DtsFileTransformer {
 
     const imports = this.imports.getAllImports(tsPath, this.coreImportsFrom);
     if (imports.length !== 0) {
-      dts = imports.map(i => `import * as ${i.as} from '${i.name}';\n`).join() + dts;
+      dts = imports.map(i => `import * as ${i.as} from '${i.name}';\n`).join('') + dts;
     }
 
     return dts;

From 02b50876858964de7b7f9560c92fa17825ad4926 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 29 Jun 2018 14:34:26 -0700
Subject: [PATCH 473/582] build(ivy): enable ngtsc AOT builds for a few
 packages (#24738)

Turn on AOT builds using ngtsc for:

* animations
* common
* compiler
* compiler-cli
* forms
* platform-browser

PR Close #24738
---
 packages/animations/BUILD.bazel       | 1 +
 packages/common/BUILD.bazel           | 1 +
 packages/compiler-cli/BUILD.bazel     | 1 +
 packages/compiler/BUILD.bazel         | 1 +
 packages/forms/BUILD.bazel            | 1 +
 packages/platform-browser/BUILD.bazel | 1 +
 6 files changed, 6 insertions(+)

diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel
index 8cf0a12c17..d32879fa70 100644
--- a/packages/animations/BUILD.bazel
+++ b/packages/animations/BUILD.bazel
@@ -26,6 +26,7 @@ ng_package(
     entry_point = "packages/animations/index.js",
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
index bcf015c9d5..0b06fa465f 100644
--- a/packages/common/BUILD.bazel
+++ b/packages/common/BUILD.bazel
@@ -29,6 +29,7 @@ ng_package(
     packages = ["//packages/common/locales:package"],
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index cd99c5f7df..4cf8888f12 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -38,6 +38,7 @@ npm_package(
     ],
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [":compiler-cli"],
diff --git a/packages/compiler/BUILD.bazel b/packages/compiler/BUILD.bazel
index db8920628e..08269e2b51 100644
--- a/packages/compiler/BUILD.bazel
+++ b/packages/compiler/BUILD.bazel
@@ -23,6 +23,7 @@ ng_package(
     include_devmode_srcs = True,
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel
index 24f377d99e..668f0b47eb 100644
--- a/packages/forms/BUILD.bazel
+++ b/packages/forms/BUILD.bazel
@@ -24,6 +24,7 @@ ng_package(
     entry_point = "packages/forms/index.js",
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
index b9ad4a7331..e1c7384f9b 100644
--- a/packages/platform-browser/BUILD.bazel
+++ b/packages/platform-browser/BUILD.bazel
@@ -28,6 +28,7 @@ ng_package(
     entry_point = "packages/platform-browser/index.js",
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [

From d98b1c3bc49eaa0fcc800b572fb210a164bfdc84 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 2 Jul 2018 11:24:58 -0700
Subject: [PATCH 474/582] fix(ivy): strip newlines from selectors in .d.ts
 files (#24738)

When writing selectors as string literal types in .d.ts files,
strip newlines to avoid generating invalid code. Newlines carry
no meaning in selectors anyway.

PR Close #24738
---
 packages/compiler/src/render3/view/compiler.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 375c9e134b..96d7167adc 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -88,9 +88,14 @@ export function compileDirectiveFromMetadata(
     bindingParser: BindingParser): R3DirectiveDef {
   const definitionMap = baseDirectiveFields(meta, constantPool, bindingParser);
   const expression = o.importExpr(R3.defineDirective).callFn([definitionMap.toLiteralMap()]);
+
+  // On the type side, remove newlines from the selector as it will need to fit into a TypeScript
+  // string literal, which must be on one line.
+  const selectorForType = (meta.selector || '').replace(/\n/g, '');
+
   const type = new o.ExpressionType(o.importExpr(
       R3.DirectiveDef,
-      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(meta.selector || ''))]));
+      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(selectorForType))]));
   return {expression, type};
 }
 
@@ -157,10 +162,14 @@ export function compileComponentFromMetadata(
     definitionMap.set('pipes', o.literalArr(Array.from(pipesUsed)));
   }
 
+  // On the type side, remove newlines from the selector as it will need to fit into a TypeScript
+  // string literal, which must be on one line.
+  const selectorForType = (meta.selector || '').replace(/\n/g, '');
+
   const expression = o.importExpr(R3.defineComponent).callFn([definitionMap.toLiteralMap()]);
   const type = new o.ExpressionType(o.importExpr(
       R3.ComponentDef,
-      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(meta.selector || ''))]));
+      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(selectorForType))]));
 
   return {expression, type};
 }

From d723a69b31554db4f5fc48c5ae48e52bd3f4f6c9 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 2 Jul 2018 11:26:16 -0700
Subject: [PATCH 475/582] fix(ivy): animations should not be a hard error yet
 (#24738)

Previously the Ivy template compiler would throw on encountering
an animation binding (e.g. [@anim]). This is unneccessary and
precludes testing existing code. This commit changes the error to a
warning.

PR Close #24738
---
 packages/compiler/src/render3/view/template.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 3704c2b7f2..ed55319205 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -489,7 +489,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // Generate element input bindings
     allOtherInputs.forEach((input: t.BoundAttribute) => {
       if (input.type === BindingType.Animation) {
-        this._unsupported('animations');
+        console.error('warning: animation bindings not yet supported');
+        return;
       }
 
       const convertedBinding = this.convertPropertyBinding(implicit, input.value);

From 9a6f27c34ce32af346e20f9cae8ebaacff89cd56 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 2 Jul 2018 14:23:46 -0700
Subject: [PATCH 476/582] fix(ivy): support zero-argument @NgModule()
 invocations (#24738)

It's possible to declare an argument-less NgModule:

@NgModule() export class Foo {}

Update the @NgModule compiler to support this usage.

PR Close #24738
---
 .../compiler-cli/src/ngtsc/annotations/src/ng_module.ts    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index 5a7df1c339..1a91a0e238 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -37,10 +37,13 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<NgModuleAnalysis> {
-    if (decorator.args === null || decorator.args.length !== 1) {
+    if (decorator.args === null || decorator.args.length > 1) {
       throw new Error(`Incorrect number of arguments to @NgModule decorator`);
     }
-    const meta = decorator.args[0];
+
+    // @NgModule can be invoked without arguments. In case it is, pretend as if a blank object
+    // literal was specified. This simplifies the code below.
+    const meta = decorator.args.length === 1 ? decorator.args[0] : ts.createObjectLiteral([]);
     if (!ts.isObjectLiteralExpression(meta)) {
       throw new Error(`Decorator argument must be literal.`);
     }

From 80a74b450a5954bb5e3fbf32449fc475b95804a2 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Wed, 27 Jun 2018 14:33:16 -0500
Subject: [PATCH 477/582] docs(forms): update form builder API reference
 (#24693)

PR Close #24693
---
 .../ts/formBuilder/form_builder_example.ts    | 21 ++++++-
 packages/forms/src/form_builder.ts            | 63 ++++++++++++-------
 packages/forms/src/model.ts                   | 15 ++---
 3 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/packages/examples/forms/ts/formBuilder/form_builder_example.ts b/packages/examples/forms/ts/formBuilder/form_builder_example.ts
index 01a9690977..e6fbd9c3eb 100644
--- a/packages/examples/forms/ts/formBuilder/form_builder_example.ts
+++ b/packages/examples/forms/ts/formBuilder/form_builder_example.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// #docregion Component
+// #docregion Component, disabled-control
 import {Component, Inject} from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
+// #enddocregion disabled-control
 
 @Component({
   selector: 'example-app',
@@ -40,3 +41,19 @@ export class FormBuilderComp {
   }
 }
 // #enddocregion
+
+// #docregion disabled-control
+@Component({
+  selector: 'app-disabled-form-control',
+  template: `
+    <input [formControl]="control" placeholder="First">
+  `
+})
+export class DisabledFormControlComponent {
+  control: FormControl;
+
+  constructor(private fb: FormBuilder) {
+    this.control = fb.control({value: 'my val', disabled: true});
+  }
+}
+// #enddocregion disabled-control
\ No newline at end of file
diff --git a/packages/forms/src/form_builder.ts b/packages/forms/src/form_builder.ts
index ccb1fd9563..9b3c4570ec 100644
--- a/packages/forms/src/form_builder.ts
+++ b/packages/forms/src/form_builder.ts
@@ -13,31 +13,28 @@ import {AbstractControl, FormArray, FormControl, FormGroup} from './model';
 
 /**
  * @description
- *
  * Creates an `AbstractControl` from a user-specified configuration.
  *
- * This is essentially syntactic sugar that shortens the `new FormGroup()`,
- * `new FormControl()`, and `new FormArray()` boilerplate that can build up in larger
+ * The `FormBuilder` provides syntactic sugar that shortens creating instances of a `FormControl`,
+ * `FormGroup`, or `FormArray`. It reduces the amount of boilerplate needed to build complex
  * forms.
  *
- * To use, inject `FormBuilder` into your component class. You can then call its methods
- * directly.
- *
- * {@example forms/ts/formBuilder/form_builder_example.ts region='Component'}
- *
- *  * **npm package**: `@angular/forms`
- *
- *  * **NgModule**: `ReactiveFormsModule`
- *
+ * @see [Reactive Forms Guide](/guide/reactive-forms)
  *
  */
 @Injectable()
 export class FormBuilder {
   /**
-   * Construct a new `FormGroup` with the given map of configuration.
-   * Valid keys for the `extra` parameter map are `validator` and `asyncValidator`.
+   * @description
+   * Construct a new `FormGroup` instance.
+   *
+   * @param controlsConfig A collection of child controls. The key for each child is the name
+   * under which it is registered.
+   *
+   * @param extra An object of configuration options for the `FormGroup`.
+   * * `validator`: A synchronous validator function, or an array of validator functions
+   * * `asyncValidator`: A single async validator or array of async validator functions
    *
-   * See the `FormGroup` constructor for more details.
    */
   group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any}|null = null): FormGroup {
     const controls = this._reduceControls(controlsConfig);
@@ -45,12 +42,28 @@ export class FormBuilder {
     const asyncValidator: AsyncValidatorFn = extra != null ? extra['asyncValidator'] : null;
     return new FormGroup(controls, validator, asyncValidator);
   }
+
   /**
-   * Construct a new `FormControl` with the given `formState`,`validator`, and
-   * `asyncValidator`.
+   * @description
+   * Construct a new `FormControl` instance.
    *
-   * `formState` can either be a standalone value for the form control or an object
-   * that contains both a value and a disabled status.
+   * @param formState Initializes the control with an initial value,
+   * or an object that defines the initial value and disabled state.
+   *
+   * @param validator A synchronous validator function, or an array of synchronous validator
+   * functions.
+   *
+   * @param asyncValidator A single async validator or array of async validator functions
+   *
+   * @usageNotes
+   *
+   * ### Initialize a control as disabled
+   *
+   * The following example returns a control with an initial value in a disabled state.
+   *
+   * <code-example path="forms/ts/formBuilder/form_builder_example.ts"
+   *   linenums="false" region="disabled-control">
+   * </code-example>
    *
    */
   control(
@@ -60,8 +73,16 @@ export class FormBuilder {
   }
 
   /**
-   * Construct a `FormArray` from the given `controlsConfig` array of
-   * configuration, with the given optional `validator` and `asyncValidator`.
+   * @description
+   * Construct a new `FormArray` instance.
+   *
+   * @param controlsConfig An array of child controls. The key for each child control is its index
+   * in the array.
+   *
+   * @param validator A synchronous validator function, or an array of synchronous validator
+   * functions.
+   *
+   * @param asyncValidator A single async validator or array of async validator functions
    */
   array(
       controlsConfig: any[], validator?: ValidatorFn|ValidatorFn[]|null,
diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index af833c8e39..834b48c64a 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -880,9 +880,8 @@ export class FormControl extends AbstractControl {
   /**
   * Creates a new `FormControl` instance.
   *
-  * @param formState Initializes the control with an initial state value,
-  * or with an object that defines the initial value, status, and options
-  * for handling updates and validation.
+  * @param formState Initializes the control with an initial value,
+  * or an object that defines the initial value and disabled state.
   *
   * @param validatorOrOpts A synchronous validator function, or an array of
   * such functions, or an `AbstractControlOptions` object that contains validation functions
@@ -963,9 +962,8 @@ export class FormControl extends AbstractControl {
    * Resets the form control, marking it `pristine` and `untouched`, and setting
    * the value to null.
    *
-   * @param formState Initializes the control with an initial state value,
-   * or with an object that defines the initial value, status, and options
-   * for handling updates and validation.
+   * @param formState Resets the control with an initial value,
+   * or an object that defines the initial value and disabled state.
    *
    * @param options Configuration options that determine how the control propagates changes
    * and emits events after the value changes.
@@ -1319,9 +1317,8 @@ export class FormGroup extends AbstractControl {
    * is a standalone value or a form state object with both a value and a disabled
    * status.
    *
-   * @param value Initializes the control with an initial state value,
-   * or with an object that defines the initial value, status,
-   * and options for handling updates and validation.
+   * @param formState Resets the control with an initial value,
+   * or an object that defines the initial value and disabled state.
    *
    * @param options Configuration options that determine how the control propagates changes
    * and emits events when the group is reset.

From 85d9c20b1d10019750b87074c3e9dffc9bc4b286 Mon Sep 17 00:00:00 2001
From: Alain Chautard <alain@interstate21.com>
Date: Mon, 14 May 2018 19:04:45 -0700
Subject: [PATCH 478/582] docs(aio): Add Angular Training to list of training
 companies (#23907) PR Close #23907

---
 aio/content/marketing/resources.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 8e14beefd0..4e704c349c 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -641,6 +641,12 @@
             "title": "Angular Academy (Canada)",
             "url": "http://www.angularacademy.ca"
           },
+          "at": {
+            "desc": "Angular Training teaches Angular on-site all over the world. Also provides consulting and mentoring.",
+            "rev": true,
+            "title": "Angular Training",
+            "url": "http://www.angulartraining.com"
+          },
           "-KLIBo_lm-WrK1Sjtt-2": {
             "desc": "Basic and Advanced training across Europe in German",
             "rev": true,

From a663565403559731344e8a55fa06f4633465942b Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 2 Apr 2018 10:57:38 +0300
Subject: [PATCH 479/582] build: fix windows scripts (#23121)

The `packages/core/src/animation/dsl.ts` symlink ws removed in #22692,
so `create-/remove-symlinks.sh` scripts for Windows should not try to
"fix" it.

PR Close #23121
---
 scripts/windows/create-symlinks.sh | 3 ---
 scripts/windows/remove-symlinks.sh | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/scripts/windows/create-symlinks.sh b/scripts/windows/create-symlinks.sh
index ef2ca70f5a..09b2b7015c 100644
--- a/scripts/windows/create-symlinks.sh
+++ b/scripts/windows/create-symlinks.sh
@@ -2,9 +2,6 @@
 
 cd `dirname $0`
 
-CORE_SRC_ANIMATION_DIR=./../../packages/core/src/animation
 UPGRADE_STATIC_DIR=./../../packages/upgrade/static
-mv ${CORE_SRC_ANIMATION_DIR}/dsl.ts ${CORE_SRC_ANIMATION_DIR}/dsl.ts.old
 mv ${UPGRADE_STATIC_DIR}/src ${UPGRADE_STATIC_DIR}/src.old
-cmd <<< "mklink \"..\\..\\packages\\core\\src\\animation\\dsl.ts\" \"..\\..\\..\\animations\\src\\animation_metadata.ts\""
 cmd <<< "mklink /d \"..\\..\\packages\\upgrade\\static\\src\" \"..\\src\""
diff --git a/scripts/windows/remove-symlinks.sh b/scripts/windows/remove-symlinks.sh
index 93ae4ea3dd..4d8f3d025e 100644
--- a/scripts/windows/remove-symlinks.sh
+++ b/scripts/windows/remove-symlinks.sh
@@ -2,9 +2,6 @@
 
 cd `dirname $0`
 
-CORE_SRC_ANIMATION_DIR=./../../packages/core/src/animation
 UPGRADE_STATIC_DIR=./../../packages/upgrade/static
-rm ${CORE_SRC_ANIMATION_DIR}/dsl.ts
 rm ${UPGRADE_STATIC_DIR}/src
-mv ${CORE_SRC_ANIMATION_DIR}/dsl.ts.old ${CORE_SRC_ANIMATION_DIR}/dsl.ts
 mv ${UPGRADE_STATIC_DIR}/src.old ${UPGRADE_STATIC_DIR}/src

From 82004c76ac46c5c03a4462ebddd739be8f56f73c Mon Sep 17 00:00:00 2001
From: Dario Braun <dario.braun@adesso.de>
Date: Thu, 12 Jul 2018 10:00:17 +0200
Subject: [PATCH 480/582] docs: update component styles doc regarding relative
 URL (#24471)

Update the documentation to match the CLI mechanics regarding relative URL in link tags.
docs: update info on stylesheet location for CLI


PR Close #24471
---
 aio/content/guide/component-styles.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/aio/content/guide/component-styles.md b/aio/content/guide/component-styles.md
index 444da23b60..1d4eaca201 100644
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@@ -216,11 +216,10 @@ You can also write `<link>` tags into the component's HTML template.
 
 <div class="alert is-critical">
 
-The link tag's `href` URL must be relative to the
-_**application root**_, not relative to the component file.
-
 When building with the CLI, be sure to include the linked style file among the assets to be copied to the server as described in the [CLI documentation](https://github.com/angular/angular-cli/wiki/stories-asset-configuration).
 
+Once included, the CLI will include the stylesheet, whether the link tag's href URL is relative to the application root or the component file.
+
 </div>
 
 ### CSS @imports

From 1821b7553038ed8059bade676d30ca45358cbed7 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Fri, 13 Jul 2018 10:51:54 +0200
Subject: [PATCH 481/582] test(ivy): run render3 tests with test.sh (#24866) PR
 Close #24866

---
 karma-js.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/karma-js.conf.js b/karma-js.conf.js
index 96f5642e8b..48b8a555fd 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -77,7 +77,7 @@ module.exports = function(config) {
       'dist/all/@angular/compiler/test/aot/**',
       'dist/all/@angular/compiler/test/render3/**',
       'dist/all/@angular/core/test/bundling/**',
-      'dist/all/@angular/core/test/render3/**',
+      'dist/all/@angular/core/test/render3/ivy/**',
       'dist/all/@angular/elements/schematics/**',
       'dist/all/@angular/examples/**/e2e_test/*',
       'dist/all/@angular/language-service/**',

From 97277bc9fb429a7122ffa2a1507418c9b76cc5f8 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 11 Jul 2018 07:39:41 -0700
Subject: [PATCH 482/582] build: update to Bazel 0.15 (#24841)

PR Close #24841
---
 .circleci/config.yml         | 4 ++--
 WORKSPACE                    | 2 +-
 integration/bazel/WORKSPACE  | 2 +-
 tools/ngcontainer/Dockerfile | 2 +-
 tools/ngcontainer/README.md  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef587e0d90..4ad0d76d94 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.3.2
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.2
+var_1: &docker_image angular/ngcontainer:0.3.3
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.3
 
 # Define common ENV vars
 var_3: &define_env_vars
diff --git a/WORKSPACE b/WORKSPACE
index 290420c7f5..8b909046f9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -77,7 +77,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.14.0")
+check_bazel_version("0.15.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 9c8f1e4c14..1eb968725c 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -44,7 +44,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
 
-check_bazel_version("0.14.0")
+check_bazel_version("0.15.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/tools/ngcontainer/Dockerfile b/tools/ngcontainer/Dockerfile
index eec67f69be..273d28f485 100644
--- a/tools/ngcontainer/Dockerfile
+++ b/tools/ngcontainer/Dockerfile
@@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
 ###
 # Bazel install
 # See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
-RUN BAZEL_VERSION="0.14.1" \
+RUN BAZEL_VERSION="0.15.0" \
  && wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
  && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
  && apt-get update \
diff --git a/tools/ngcontainer/README.md b/tools/ngcontainer/README.md
index 105900a86c..1fef76f256 100644
--- a/tools/ngcontainer/README.md
+++ b/tools/ngcontainer/README.md
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
 - npm 5.5.1
 - yarn 1.3.2
 - Java 8 (for Closure Compiler and Bazel)
-- Bazel build tool v0.14.1 - http://bazel.build
+- Bazel build tool v0.15.0 - http://bazel.build
 - Google Chrome 63.0.3239.84
 - Mozilla Firefox 47.0.1
 - xvfb (virtual framebuffer) for headless testing

From d8c828c9b1b671a2e9a90145d53f5a230afc6a08 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 22 Jun 2018 16:58:29 +0100
Subject: [PATCH 483/582] build(docs-infra): implement the 'package' API
 template (#24631)

PR Close #24631
---
 .../api/api-list.component.html               |   2 +-
 .../api/api-list.component.spec.ts            |   2 +
 .../custom-elements/api/api.service.spec.ts   |   8 +-
 .../app/custom-elements/api/api.service.ts    |   1 +
 aio/src/styles/0-base/_typography.scss        |   8 +-
 aio/src/styles/1-layouts/_api-pages.scss      |   1 +
 aio/src/styles/2-modules/_api-pages.scss      |   2 +-
 aio/src/styles/_constants.scss                |   2 +-
 .../transforms/angular-api-package/index.js   |  18 +-
 .../processors/addMetadataAliases.spec.js     |   2 +-
 .../processors/computeApiBreadCrumbs.spec.js  |   4 +-
 .../processors/computeSearchTitle.js          |   2 +-
 .../processors/computeSearchTitle.spec.js     |   4 +-
 .../processors/generateApiListDoc.js          |  15 +-
 .../processors/generateApiListDoc.spec.js     |  26 +--
 .../processors/processPackages.js             |  63 ++++++
 .../processors/processPackages.spec.js        | 180 ++++++++++++++++++
 .../readers/package-content.js                |  25 +++
 .../processors/createOverviewDump.js          |   2 +-
 .../templates/api/lib/githubLinks.html        |   6 +-
 .../templates/api/module.template.html        |  16 --
 .../templates/api/package.template.html       |  40 ++++
 packages/animations/PACKAGE.md                |  29 +++
 23 files changed, 399 insertions(+), 59 deletions(-)
 create mode 100644 aio/tools/transforms/angular-api-package/processors/processPackages.js
 create mode 100644 aio/tools/transforms/angular-api-package/processors/processPackages.spec.js
 create mode 100644 aio/tools/transforms/angular-api-package/readers/package-content.js
 delete mode 100644 aio/tools/transforms/templates/api/module.template.html
 create mode 100644 aio/tools/transforms/templates/api/package.template.html
 create mode 100644 packages/animations/PACKAGE.md

diff --git a/aio/src/app/custom-elements/api/api-list.component.html b/aio/src/app/custom-elements/api/api-list.component.html
index 893947fcaf..aa65d70291 100644
--- a/aio/src/app/custom-elements/api/api-list.component.html
+++ b/aio/src/app/custom-elements/api/api-list.component.html
@@ -21,7 +21,7 @@
 
 <article class="api-list-container l-content-small docs-content">
   <div *ngFor="let section of filteredSections | async" >
-    <h2>{{section.title}}</h2>
+    <h2><a [href]="section.path">{{section.title}}</a></h2>
     <ul class="api-list">
       <ng-container *ngFor="let item of section.items">
         <li *ngIf="item.show" class="api-item">
diff --git a/aio/src/app/custom-elements/api/api-list.component.spec.ts b/aio/src/app/custom-elements/api/api-list.component.spec.ts
index 9c4c3d2ad4..035a07f134 100644
--- a/aio/src/app/custom-elements/api/api-list.component.spec.ts
+++ b/aio/src/app/custom-elements/api/api-list.component.spec.ts
@@ -218,6 +218,7 @@ const apiSections: ApiSection[] = [
   {
     "name": "common",
     "title": "common",
+    "path": "api/common",
     "items": [
       {
         "name": "class_1",
@@ -256,6 +257,7 @@ const apiSections: ApiSection[] = [
   {
     "name": "core",
     "title": "core",
+    "path": "api/core",
     "items": [
       {
         "name": "class_3",
diff --git a/aio/src/app/custom-elements/api/api.service.spec.ts b/aio/src/app/custom-elements/api/api.service.spec.ts
index c5ae75c6a8..253acd57de 100644
--- a/aio/src/app/custom-elements/api/api.service.spec.ts
+++ b/aio/src/app/custom-elements/api/api.service.spec.ts
@@ -50,7 +50,7 @@ describe('ApiService', () => {
   describe('#sections', () => {
 
     it('first subscriber should fetch sections', done => {
-      const data = [{name: 'a', title: 'A', items: []}, {name: 'b', title: 'B', items: []}];
+      const data = [{name: 'a', title: 'A', path: '', items: []}, {name: 'b', title: 'B', path: '', items: []}];
 
       service.sections.subscribe(sections => {
         expect(sections).toEqual(data);
@@ -61,7 +61,7 @@ describe('ApiService', () => {
     });
 
     it('second subscriber should get previous sections and NOT trigger refetch', done => {
-      const data = [{name: 'a', title: 'A', items: []}, {name: 'b', title: 'B', items: []}];
+      const data = [{name: 'a', title: 'A', path: '', items: []}, {name: 'b', title: 'B', path: '', items: []}];
       let subscriptions = 0;
 
       service.sections.subscribe(sections => {
@@ -91,7 +91,7 @@ describe('ApiService', () => {
 
       let call = 0;
 
-      let data = [{name: 'a', title: 'A', items: []}, {name: 'b', title: 'B', items: []}];
+      let data = [{name: 'a', title: 'A', path: '', items: []}, {name: 'b', title: 'B', path: '', items: []}];
 
       service.sections.subscribe(sections => {
         // called twice during this test
@@ -103,7 +103,7 @@ describe('ApiService', () => {
       httpMock.expectOne({}).flush(data);
 
       // refresh/refetch
-      data = [{name: 'c', title: 'C', items: []}];
+      data = [{name: 'c', title: 'C', path: '', items: []}];
       service.fetchSections();
       httpMock.expectOne({}).flush(data);
 
diff --git a/aio/src/app/custom-elements/api/api.service.ts b/aio/src/app/custom-elements/api/api.service.ts
index 9d42350b2e..c2398e7d91 100644
--- a/aio/src/app/custom-elements/api/api.service.ts
+++ b/aio/src/app/custom-elements/api/api.service.ts
@@ -19,6 +19,7 @@ export interface ApiItem {
 }
 
 export interface ApiSection {
+  path: string;
   name: string;
   title: string;
   items: ApiItem[];
diff --git a/aio/src/styles/0-base/_typography.scss b/aio/src/styles/0-base/_typography.scss
index 8d0f38f361..b83a0604b0 100755
--- a/aio/src/styles/0-base/_typography.scss
+++ b/aio/src/styles/0-base/_typography.scss
@@ -28,7 +28,7 @@ h2 {
 h3 {
   font-size: 20px;
   font-weight: 400;
-  margin: 24px 0px;
+  margin: 24px 0px 12px;
   clear: both;
 }
 
@@ -55,6 +55,10 @@ h6 {
 }
 
 h2, h3, h4, h5, h6 {
+  a {
+    font-size: inherit;
+  }
+
   @media screen and (max-width: 600px) {
     margin: 8px 0;
   }
@@ -105,7 +109,7 @@ table {
   border-collapse: collapse;
   border-radius: 2px;
   border-spacing: 0;
-  margin: 0 0 32px 0;
+  margin: 12px 0 32px;
 }
 
 table tbody th {
diff --git a/aio/src/styles/1-layouts/_api-pages.scss b/aio/src/styles/1-layouts/_api-pages.scss
index 81e2f548a0..a819b1192f 100644
--- a/aio/src/styles/1-layouts/_api-pages.scss
+++ b/aio/src/styles/1-layouts/_api-pages.scss
@@ -3,6 +3,7 @@
     max-width: 1200px;
 
     table {
+        margin: 12px 0 24px;
 
         th {
             text-transform: none;
diff --git a/aio/src/styles/2-modules/_api-pages.scss b/aio/src/styles/2-modules/_api-pages.scss
index dcd25bab04..41768a0bd9 100644
--- a/aio/src/styles/2-modules/_api-pages.scss
+++ b/aio/src/styles/2-modules/_api-pages.scss
@@ -30,7 +30,7 @@
     }
   }
 
-  .method-table, .option-table {
+  .method-table, .option-table, .list-table {
     th {
       display: flex;
       align-items: center;
diff --git a/aio/src/styles/_constants.scss b/aio/src/styles/_constants.scss
index b46e0815b8..c719602f65 100755
--- a/aio/src/styles/_constants.scss
+++ b/aio/src/styles/_constants.scss
@@ -105,7 +105,7 @@ $api-symbols: (
     content: 'T',
     background: $light-green-600
   ),
-  module: (
+  package: (
     content: 'Pk',
     background: $purple-600
   )
diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index d6838c892f..a40e3f7ed1 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -33,6 +33,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
   .processor(require('./processors/simplifyMemberAnchors'))
   .processor(require('./processors/computeStability'))
   .processor(require('./processors/removeInjectableConstructors'))
+  .processor(require('./processors/processPackages'))
 
   /**
    * These are the API doc types that will be rendered to actual files.
@@ -40,7 +41,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
    * more Angular specific API types, such as decorators and directives.
    */
   .factory(function API_DOC_TYPES_TO_RENDER(EXPORT_DOC_TYPES) {
-    return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'pipe', 'module']);
+    return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'pipe', 'package']);
   })
 
   /**
@@ -58,8 +59,10 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     return API_DOC_TYPES_TO_RENDER.concat(API_CONTAINED_DOC_TYPES);
   })
 
+  .factory(require('./readers/package-content'))
+
   // Where do we get the source files?
-  .config(function(readTypeScriptModules, readFilesProcessor, collectExamples, tsParser) {
+  .config(function(readTypeScriptModules, readFilesProcessor, collectExamples, tsParser, packageContentFileReader) {
 
     // Tell TypeScript how to load modules that start with with `@angular`
     tsParser.options.paths = { '@angular/*': [API_SOURCE_PATH + '/*'] };
@@ -102,12 +105,19 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
       'upgrade/static/index.ts',
     ];
 
+    readFilesProcessor.fileReaders.push(packageContentFileReader);
+
     // API Examples
     readFilesProcessor.sourceFiles = [
       {
         basePath: API_SOURCE_PATH,
         include: API_SOURCE_PATH + '/examples/**/*',
         fileReader: 'exampleFileReader'
+      },
+      {
+        basePath: API_SOURCE_PATH,
+        include: API_SOURCE_PATH + '/**/PACKAGE.md',
+        fileReader: 'packageContentFileReader'
       }
     ];
     collectExamples.exampleFolders.push('examples');
@@ -123,7 +133,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
   .config(function(computeStability, splitDescription, addNotYetDocumentedProperty, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES) {
     computeStability.docTypes = API_DOC_TYPES_TO_RENDER;
     // Only split the description on the API docs
-    splitDescription.docTypes = API_DOC_TYPES;
+    splitDescription.docTypes = API_DOC_TYPES.concat(['package-content']);
     addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
   })
 
@@ -180,7 +190,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
     generateApiListDoc.outputFolder = API_SEGMENT;
 
     computePathsProcessor.pathTemplates.push({
-      docTypes: ['module'],
+      docTypes: ['package'],
       getPath: function computeModulePath(doc) {
         doc.moduleFolder = `${API_SEGMENT}/${doc.id.replace(/\/index$/, '')}`;
         return doc.moduleFolder;
diff --git a/aio/tools/transforms/angular-api-package/processors/addMetadataAliases.spec.js b/aio/tools/transforms/angular-api-package/processors/addMetadataAliases.spec.js
index 154f935fe7..33faa8ae73 100644
--- a/aio/tools/transforms/angular-api-package/processors/addMetadataAliases.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/addMetadataAliases.spec.js
@@ -33,7 +33,7 @@ describe('addSelectorsAsAliases processor', () => {
       { docType: 'directive', name: 'NgModel', aliases: ['NgModel'], directiveOptions: { selector: '\'[ngModel]:not([formControlName]):not([formControl])\'' } },
       { docType: 'component', name: 'MyComponent', aliases: ['MyComponent'], componentOptions: { selector: '\'my-component\'' } },
       { docType: 'decorator', name: 'MyDecorator', aliases: ['MyDecorator'] },
-      { docType: 'module', name: 'myModule', aliases: ['myModule'], id: 'some/myModule' },
+      { docType: 'package', name: 'myPackage', aliases: ['myPackage'], id: 'some/myPackage' },
       { docType: 'var', name: 'myVar', aliases: ['myVar'] },
       { docType: 'let', name: 'myLet', aliases: ['myLet'] },
       { docType: 'const', name: 'myConst', aliases: ['myConst'] },
diff --git a/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js b/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js
index 03bc24e426..256d7c44d2 100644
--- a/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/computeApiBreadCrumbs.spec.js
@@ -14,14 +14,14 @@ describe('angular-api-package: computeApiBreadCrumbs processor', () => {
   });
 
   it('should attach a breadCrumbs property to each of the API_DOC_TYPES_TO_RENDER docs', () => {
-    const API_DOC_TYPES_TO_RENDER = ['class', 'interface', 'module'];
+    const API_DOC_TYPES_TO_RENDER = ['class', 'interface', 'package'];
     const processor = processorFactory(API_DOC_TYPES_TO_RENDER);
 
     const docs = [
       { docType: 'class', name: 'ClassA', path: 'module-1/class-a', moduleDoc: { id: 'moduleOne', path: 'module-1' } },
       { docType: 'interface', name: 'InterfaceB', path: 'module-2/interface-b', moduleDoc: { id: 'moduleTwo', path: 'module-2' } },
       { docType: 'guide', name: 'Guide One', path: 'guide/guide-1' },
-      { docType: 'module', name: 'testing', id: 'http/testing', path: 'http/testing' },
+      { docType: 'package', name: 'testing', id: 'http/testing', path: 'http/testing' },
     ];
     processor.$process(docs);
 
diff --git a/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.js b/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.js
index 6ea06a0229..295a2839fa 100644
--- a/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.js
+++ b/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.js
@@ -8,7 +8,7 @@ module.exports = function computeSearchTitleProcessor() {
         case 'function':
           doc.searchTitle = `${doc.name}()`;
           break;
-        case 'module':
+        case 'package':
           doc.searchTitle = `${doc.id} package`;
           break;
         }
diff --git a/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.spec.js b/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.spec.js
index d90b707b50..61b205d956 100644
--- a/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/computeSearchTitle.spec.js
@@ -31,7 +31,7 @@ describe('computeSearchTitle processor', () => {
       { docType: 'pipe', name: 'MyPipe', pipeOptions: { name: 'myPipe' } },
       { docType: 'directive', name: 'MyDirective', directiveOptions: {} },
       { docType: 'decorator', name: 'MyDecorator' },
-      { docType: 'module', name: 'myModule', id: 'some/myModule' },
+      { docType: 'package', name: 'myPackage', id: 'some/myPackage' },
       { docType: 'var', name: 'myVar' },
       { docType: 'let', name: 'myLet' },
       { docType: 'const', name: 'myConst' },
@@ -45,7 +45,7 @@ describe('computeSearchTitle processor', () => {
     expect(docs[4].searchTitle).toBeUndefined();
     expect(docs[5].searchTitle).toBeUndefined();
     expect(docs[6].searchTitle).toBeUndefined();
-    expect(docs[7].searchTitle).toEqual('some/myModule package');
+    expect(docs[7].searchTitle).toEqual('some/myPackage package');
     expect(docs[8].searchTitle).toBeUndefined();
     expect(docs[9].searchTitle).toBeUndefined();
     expect(docs[10].searchTitle).toBeUndefined();
diff --git a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js
index b36b446904..4a8fd31a11 100644
--- a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js
+++ b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.js
@@ -12,19 +12,20 @@ module.exports = function generateApiListDoc() {
         path: this.outputFolder + '/api-list.json',
         outputPath: this.outputFolder + '/api-list.json',
         data: docs
-          .filter(doc => doc.docType === 'module')
-          .map(getModuleInfo)
+          .filter(doc => doc.docType === 'package')
+          .map(getPackageInfo)
       });
     }
   };
 };
 
-function getModuleInfo(moduleDoc) {
-  const moduleName = moduleDoc.id.replace(/\/index$/, '');
+function getPackageInfo(packageDoc) {
+  const packageName = packageDoc.id.replace(/\/index$/, '');
   return {
-    name: moduleName.toLowerCase(),
-    title: moduleName,
-    items: moduleDoc.exports
+    name: packageName.toLowerCase(),
+    title: packageName,
+    path: packageDoc.path,
+    items: packageDoc.exports
                   // Ignore internals and private exports (indicated by the ɵ prefix)
                   .filter(doc => !doc.internal && !doc.privateExport)
                   .map(getExportInfo)
diff --git a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js
index 35d9ad000c..14eda0482f 100644
--- a/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js
+++ b/aio/tools/transforms/angular-api-package/processors/generateApiListDoc.spec.js
@@ -38,28 +38,28 @@ describe('generateApiListDoc processor', () => {
   it('should add an info object to the doc for each module doc', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [] },
-      { docType: 'module', id: '@angular/core/index', exports: [] },
-      { docType: 'module', id: '@angular/http/index', exports: [] },
+      { docType: 'package', id: '@angular/common/index', exports: [], path: 'common' },
+      { docType: 'package', id: '@angular/core/index', exports: [], path: 'core' },
+      { docType: 'package', id: '@angular/http/index', exports: [], path: 'http' },
     ];
     processor.$process(docs);
     expect(docs[3].data).toEqual([
-      { name: '@angular/common', title: '@angular/common', items: [] },
-      { name: '@angular/core', title: '@angular/core', items: [] },
-      { name: '@angular/http', title: '@angular/http', items: [] },
+      { name: '@angular/common', title: '@angular/common', items: [], path: 'common' },
+      { name: '@angular/core', title: '@angular/core', items: [], path: 'core' },
+      { name: '@angular/http', title: '@angular/http', items: [], path: 'http' },
     ]);
   });
 
   it('should add info about each export on each module', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [
+      { docType: 'package', id: '@angular/common/index', exports: [
         { docType: 'directive', name: 'AaaAaa', path: 'aaa' },
         { docType: 'pipe', name: 'BbbBbb', path: 'bbb' },
         { docType: 'decorator', name: 'CccCcc', path: 'ccc' },
         { docType: 'class', name: 'DddDdd', path: 'ddd' }
       ] },
-      { docType: 'module', id: '@angular/core/index', exports: [
+      { docType: 'package', id: '@angular/core/index', exports: [
         { docType: 'interface', name: 'EeeEee', path: 'eee' },
         { docType: 'function', name: 'FffFff', path: 'fff' },
         { docType: 'enum', name: 'GggGgg', path: 'ggg' },
@@ -86,7 +86,7 @@ describe('generateApiListDoc processor', () => {
   it('should ignore internal and private exports', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [
+      { docType: 'package', id: '@angular/common/index', exports: [
         { docType: 'directive', name: 'AaaAaa', path: 'aaa', internal: true },
         { docType: 'class', name: 'XxxXxx', path: 'xxx', privateExport: true },
         { docType: 'pipe', name: 'BbbBbb', path: 'bbb' }
@@ -101,7 +101,7 @@ describe('generateApiListDoc processor', () => {
   it('should convert `let` and `var` docTypes to `const`', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [
+      { docType: 'package', id: '@angular/common/index', exports: [
         { docType: 'var', name: 'AaaAaa', path: 'aaa' },
         { docType: 'let', name: 'BbbBbb', path: 'bbb' },
       ]}
@@ -116,7 +116,7 @@ describe('generateApiListDoc processor', () => {
   it('should convert security to a boolean securityRisk', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [
+      { docType: 'package', id: '@angular/common/index', exports: [
         { docType: 'class', name: 'AaaAaa', path: 'aaa', security: 'This is a security risk' },
         { docType: 'class', name: 'BbbBbb', path: 'bbb', security: '' },
       ]}
@@ -131,7 +131,7 @@ describe('generateApiListDoc processor', () => {
   it('should convert stability tags to the stable string property', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [
+      { docType: 'package', id: '@angular/common/index', exports: [
         { docType: 'class', name: 'AaaAaa', path: 'aaa', stable: undefined },
         { docType: 'class', name: 'BbbBbb', path: 'bbb', experimental: 'Some message' },
         { docType: 'class', name: 'CccCcc', path: 'ccc', deprecated: null },
@@ -150,7 +150,7 @@ describe('generateApiListDoc processor', () => {
   it('should sort items in each group alphabetically', () => {
     const processor = processorFactory();
     const docs = [
-      { docType: 'module', id: '@angular/common/index', exports: [
+      { docType: 'package', id: '@angular/common/index', exports: [
         { docType: 'class', name: 'DddDdd', path: 'uuu' },
         { docType: 'class', name: 'BbbBbb', path: 'vvv' },
         { docType: 'class', name: 'AaaAaa', path: 'xxx' },
diff --git a/aio/tools/transforms/angular-api-package/processors/processPackages.js b/aio/tools/transforms/angular-api-package/processors/processPackages.js
new file mode 100644
index 0000000000..3d9fc3f202
--- /dev/null
+++ b/aio/tools/transforms/angular-api-package/processors/processPackages.js
@@ -0,0 +1,63 @@
+const { dirname } = require('canonical-path');
+
+module.exports = function processPackages() {
+  return {
+    $runAfter: ['extractDecoratedClassesProcessor'],
+    $runBefore: ['computing-ids'],
+    $process(docs) {
+      const packageContentFiles = {};
+      const packageMap = {};
+
+      docs = docs.filter(doc => {
+        if (doc.docType === 'package-content') {
+          packageContentFiles[dirname(doc.fileInfo.filePath)] = doc;
+          return false;
+        } else {
+          return true;
+        }
+      });
+
+      docs.forEach(doc => {
+        if (doc.docType === 'module') {
+          // Convert the doc type from "module" to "package"
+          doc.docType = 'package';
+          // The name is actually the full id
+          doc.name = `@angular/${doc.id}`;
+
+          // Partition the exports into groups by type
+          if (doc.exports) {
+            doc.classes = doc.exports.filter(doc => doc.docType === 'class');
+            doc.decorators = doc.exports.filter(doc => doc.docType === 'decorator');
+            doc.functions = doc.exports.filter(doc => doc.docType === 'function');
+            doc.structures = doc.exports.filter(doc => doc.docType === 'enum' || doc.docType === 'interface');
+            doc.directives = doc.exports.filter(doc => doc.docType === 'directive');
+            doc.pipes = doc.exports.filter(doc => doc.docType === 'pipe');
+            doc.types = doc.exports.filter(doc => doc.docType === 'type-alias' || doc.docType === 'const');
+          }
+
+          // Copy over docs from the PACKAGE.md file that is used to document packages
+          const readmeDoc = packageContentFiles[dirname(doc.fileInfo.filePath)];
+          if (readmeDoc) {
+            doc.shortDescription = readmeDoc.shortDescription;
+            doc.description = readmeDoc.description;
+            doc.see = readmeDoc.see;
+            doc.fileInfo = readmeDoc.fileInfo;
+          }
+
+          // Compute the primary/secondary entry point relationships
+          const packageParts = doc.id.split('/');
+          const primaryPackageName = packageParts[0];
+          doc.isPrimaryPackage = packageParts.length === 1;
+          doc.packageInfo = packageMap[primaryPackageName] = packageMap[primaryPackageName] || { primary: undefined, secondary: [] };
+          if (doc.isPrimaryPackage) {
+            doc.packageInfo.primary = doc;
+          } else {
+            doc.packageInfo.secondary.push(doc);
+          }
+        }
+      });
+
+      return docs;
+    }
+  };
+};
diff --git a/aio/tools/transforms/angular-api-package/processors/processPackages.spec.js b/aio/tools/transforms/angular-api-package/processors/processPackages.spec.js
new file mode 100644
index 0000000000..3692ab1b4c
--- /dev/null
+++ b/aio/tools/transforms/angular-api-package/processors/processPackages.spec.js
@@ -0,0 +1,180 @@
+const testPackage = require('../../helpers/test-package');
+const processorFactory = require('./processPackages');
+const Dgeni = require('dgeni');
+
+describe('processPackages processor', () => {
+
+  it('should be available on the injector', () => {
+    const dgeni = new Dgeni([testPackage('angular-api-package')]);
+    const injector = dgeni.configureInjector();
+    const processor = injector.get('processPackages');
+    expect(processor.$process).toBeDefined();
+    expect(processor.$runAfter).toEqual(['extractDecoratedClassesProcessor']);
+    expect(processor.$runBefore).toEqual(['computing-ids']);
+  });
+
+  it('should filter out any `package-content` docs from the collection', () => {
+    const docs = [
+      { fileInfo: { filePath: 'some/a' }, docType: 'a', id: 'a' },
+      { fileInfo: { filePath: 'some/x' }, docType: 'package-content', id: 'x' },
+      { fileInfo: { filePath: 'some/b' }, docType: 'b', id: 'b' },
+      { fileInfo: { filePath: 'some/y' }, docType: 'package-content', id: 'y' },
+      { fileInfo: { filePath: 'some/z' }, docType: 'package-content', id: 'z' },
+    ];
+    const processor = processorFactory();
+    const newDocs = processor.$process(docs);
+    expect(newDocs).toEqual([
+      { fileInfo: { filePath: 'some/a' }, docType: 'a', id: 'a' },
+      { fileInfo: { filePath: 'some/b' }, docType: 'b', id: 'b' },
+    ]);
+  });
+
+
+  it('should change `module` docs to `package` docs', () => {
+    const processor = processorFactory();
+    const docs = [
+      { fileInfo: { filePath: 'some/a' }, docType: 'module', id: 'a' },
+      { fileInfo: { filePath: 'some/b' }, docType: 'module', id: 'b' },
+      { docType: 'other', id: 'c' },
+    ];
+    const newDocs = processor.$process(docs);
+    expect(newDocs).toEqual([
+      jasmine.objectContaining({ docType: 'package', id: 'a' }),
+      jasmine.objectContaining({ docType: 'package', id: 'b' }),
+      jasmine.objectContaining({ docType: 'other', id: 'c' }),
+    ]);
+  });
+
+  it('should attach the relevant package contents to the package doc', () => {
+    const docs = [
+      {
+        fileInfo: { filePath: 'some/package-1/index' },
+        docType: 'module',
+        id: 'package-1',
+        someProp: 'foo',
+      },
+      {
+        fileInfo: { filePath: 'some/package-1/PACKAGE.md' },
+        docType: 'package-content',
+        id: 'package-1/PACKAGE.md',
+        shortDescription: 'some short description',
+        description: 'some description',
+        see: [ 'a', 'b' ],
+      },
+      {
+        fileInfo: { filePath: 'some/package-2/index' },
+        docType: 'module',
+        id: 'package-2',
+      },
+    ];
+    const processor = processorFactory();
+    const newDocs = processor.$process(docs);
+
+    const package1 = jasmine.objectContaining({
+      fileInfo: { filePath: 'some/package-1/PACKAGE.md' },
+      docType: 'package',
+      name: '@angular/package-1',
+      id: 'package-1',
+      someProp: 'foo',
+      shortDescription: 'some short description',
+      description: 'some description',
+      see: [ 'a', 'b' ],
+      isPrimaryPackage: true,
+    });
+
+    const package2 = jasmine.objectContaining({
+      fileInfo: { filePath: 'some/package-2/index' },
+      docType: 'package',
+      name: '@angular/package-2',
+      id: 'package-2',
+      isPrimaryPackage: true,
+    });
+
+    expect(newDocs).toEqual([package1, package2]);
+  });
+
+  it('should compute primary and second package info', () => {
+    const docs = [
+      {
+        fileInfo: { filePath: 'some/package-1/index' },
+        docType: 'module',
+        id: 'package-1',
+      },
+      {
+        fileInfo: { filePath: 'some/package-1/sub-1index' },
+        docType: 'module',
+        id: 'package-1/sub-1',
+      },
+      {
+        fileInfo: { filePath: 'some/package-1/sub-2index' },
+        docType: 'module',
+        id: 'package-1/sub-2',
+      },
+    ];
+    const processor = processorFactory();
+    const newDocs = processor.$process(docs);
+
+    expect(newDocs[0].isPrimaryPackage).toBe(true);
+    expect(newDocs[1].isPrimaryPackage).toBe(false);
+    expect(newDocs[2].isPrimaryPackage).toBe(false);
+
+    expect(newDocs[0].packageInfo.primary).toBe(newDocs[0]);
+    expect(newDocs[1].packageInfo.primary).toBe(newDocs[0]);
+    expect(newDocs[2].packageInfo.primary).toBe(newDocs[0]);
+
+    expect(newDocs[0].packageInfo.secondary).toEqual([newDocs[1], newDocs[2]]);
+    expect(newDocs[1].packageInfo.secondary).toEqual([newDocs[1], newDocs[2]]);
+    expect(newDocs[2].packageInfo.secondary).toEqual([newDocs[1], newDocs[2]]);
+  });
+
+  it('should partition the exports of packages into groups', () => {
+    const docs = [
+      {
+        fileInfo: { filePath: 'some/x' },
+        docType: 'module',
+        id: 'x',
+        exports: [
+          { docType: 'directive', id: 'directive-1' },
+          { docType: 'function', id: 'function-1' },
+          { docType: 'directive', id: 'directive-2' },
+          { docType: 'decorator', id: 'decorator-1' },
+          { docType: 'class', id: 'class-1' },
+          { docType: 'type-alias', id: 'type-alias-1' },
+          { docType: 'class', id: 'class-2' },
+          { docType: 'pipe', id: 'pipe-1' },
+          { docType: 'const', id: 'const-1' },
+          { docType: 'const', id: 'const-2' },
+          { docType: 'enum', id: 'enum-1' },
+          { docType: 'interface', id: 'interface-1' },
+          { docType: 'interface', id: 'interface-2' },
+        ]
+      },
+    ];
+    const processor = processorFactory();
+    const newDocs = processor.$process(docs);
+
+    expect(newDocs[0].decorators).toEqual([
+      { docType: 'decorator', id: 'decorator-1' },
+    ]);
+    expect(newDocs[0].functions).toEqual([
+      { docType: 'function', id: 'function-1' },
+    ]);
+    expect(newDocs[0].structures).toEqual([
+      { docType: 'enum', id: 'enum-1' },
+      { docType: 'interface', id: 'interface-1' },
+      { docType: 'interface', id: 'interface-2' },
+    ]);
+    expect(newDocs[0].directives).toEqual([
+      { docType: 'directive', id: 'directive-1' },
+      { docType: 'directive', id: 'directive-2' },
+    ]);
+    expect(newDocs[0].pipes).toEqual([
+      { docType: 'pipe', id: 'pipe-1' },
+    ]);
+    expect(newDocs[0].types).toEqual([
+      { docType: 'type-alias', id: 'type-alias-1' },
+      { docType: 'const', id: 'const-1' },
+      { docType: 'const', id: 'const-2' },
+    ]);
+  });
+});
diff --git a/aio/tools/transforms/angular-api-package/readers/package-content.js b/aio/tools/transforms/angular-api-package/readers/package-content.js
new file mode 100644
index 0000000000..941b9c74e7
--- /dev/null
+++ b/aio/tools/transforms/angular-api-package/readers/package-content.js
@@ -0,0 +1,25 @@
+/**
+ * @dgService
+ * @description
+ * This file reader will pull the contents from a text file that will be used
+ * as the description of a package.
+ *
+ * The doc will initially have the form:
+ * ```
+ * {
+ *   content: 'the content of the file',
+ *   startingLine: 1
+ * }
+ * ```
+ */
+module.exports = function packageContentFileReader() {
+  return {
+    name: 'packageContentFileReader',
+    defaultPattern: /PACKAGE\.md$/,
+    getDocs: function(fileInfo) {
+
+      // We return a single element array because content files only contain one document
+      return [{docType: 'package-content', content: fileInfo.content, startingLine: 1}];
+    }
+  };
+};
\ No newline at end of file
diff --git a/aio/tools/transforms/angular.io-package/processors/createOverviewDump.js b/aio/tools/transforms/angular.io-package/processors/createOverviewDump.js
index 6032e94f64..ab590315b0 100644
--- a/aio/tools/transforms/angular.io-package/processors/createOverviewDump.js
+++ b/aio/tools/transforms/angular.io-package/processors/createOverviewDump.js
@@ -14,7 +14,7 @@ module.exports = function createOverviewDump() {
         modules: []
       };
       _.forEach(docs, function(doc) {
-        if (doc.docType === 'module') {
+        if (doc.docType === 'package') {
           overviewDoc.modules.push(doc);
         }
       });
diff --git a/aio/tools/transforms/templates/api/lib/githubLinks.html b/aio/tools/transforms/templates/api/lib/githubLinks.html
index 349e135b45..f99b37543b 100644
--- a/aio/tools/transforms/templates/api/lib/githubLinks.html
+++ b/aio/tools/transforms/templates/api/lib/githubLinks.html
@@ -1,12 +1,12 @@
 {% macro githubViewHref(doc, versionInfo) -%}
-https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/tree/{$ versionInfo.currentVersion.isSnapshot and versionInfo.currentVersion.SHA or versionInfo.currentVersion.raw $}/packages/{$ doc.fileInfo.realProjectRelativePath $}#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}
+https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/tree/{$ versionInfo.currentVersion.isSnapshot and versionInfo.currentVersion.SHA or versionInfo.currentVersion.raw $}/packages/{$ doc.fileInfo.realProjectRelativePath or doc.fileInfo.relativePath $}#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}
 {%- endmacro -%}
 
 
 {% macro githubEditHref(doc, versionInfo) -%}
-https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/edit/master/packages/{$ doc.fileInfo.realProjectRelativePath $}?message=docs(
+https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/edit/master/packages/{$ doc.fileInfo.realProjectRelativePath or doc.fileInfo.relativePath $}?message=docs(
   {%- if doc.moduleDoc %}{$ doc.moduleDoc.id.split('/')[0] $}
-  {%- elseif doc.docType === 'module' %}{$ doc.id.split('/')[0] $}
+  {%- elseif doc.docType === 'package' %}{$ doc.id.split('/')[0] $}
   {%- else %}...{%- endif -%}
 )%3A%20describe%20your%20change...#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}
 {%- endmacro -%}
diff --git a/aio/tools/transforms/templates/api/module.template.html b/aio/tools/transforms/templates/api/module.template.html
deleted file mode 100644
index 0704998b13..0000000000
--- a/aio/tools/transforms/templates/api/module.template.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'base.template.html' -%}
-
-{% block body -%}
-
-{% include "includes/deprecation.html" %}
-{% include "includes/description.html" %}
-
-<section class="export-list">
-  <ul>
-    {% for export in doc.exports -%}
-    <li><a href="{$ export.path $}">{$ export.name $}</a></li>
-    {%- endfor %}
-  </ul>
-</section>
-
-{%- endblock %}
diff --git a/aio/tools/transforms/templates/api/package.template.html b/aio/tools/transforms/templates/api/package.template.html
new file mode 100644
index 0000000000..3583ee6a0b
--- /dev/null
+++ b/aio/tools/transforms/templates/api/package.template.html
@@ -0,0 +1,40 @@
+{% extends 'base.template.html' -%}
+
+{% macro listItems(items, title) %}
+  {% if items.length %}
+  <section class="export-list">
+    <h3>{$ title $}</h3>
+    <table class="is-full-width list-table">
+      {% for item in items %}
+      <tr>
+        <td><code class="code-anchor">
+          <a href="{$ item.path $}">{$ item.name $}</a></code></td>
+        <td>{% if item.shortDescription %}{$ item.shortDescription | marked $}{% endif %}</td>
+      </tr>
+      {% endfor %}
+    </table>
+  </section>
+  {% endif %}
+{% endmacro %}
+
+{% block body -%}
+  {% include "includes/deprecation.html" %}
+  {$ doc.shortDescription | marked $}
+  {% if doc.description %}{$ doc.description | marked $}{% endif %}
+
+  {% include "includes/see-also.html" %}
+
+  <h2>Entry points</h2>
+  {$ listItems([doc.packageInfo.primary], 'Primary') $}
+  {$ listItems(doc.packageInfo.secondary, 'Secondary') $}
+
+
+  <h2>Exports</h2>
+  {$ listItems(doc.classes, 'Classes') $}
+  {$ listItems(doc.decorators, 'Decorators') $}
+  {$ listItems(doc.functions, 'Functions') $}
+  {$ listItems(doc.structures, 'Structures') $}
+  {$ listItems(doc.directives, 'Directives') $}
+  {$ listItems(doc.pipes, 'Pipes') $}
+  {$ listItems(doc.types, 'Types') $}
+{%- endblock %}
diff --git a/packages/animations/PACKAGE.md b/packages/animations/PACKAGE.md
new file mode 100644
index 0000000000..412b03243b
--- /dev/null
+++ b/packages/animations/PACKAGE.md
@@ -0,0 +1,29 @@
+Implements a domain-specific language (DSL) for defining web animation sequences for HTML elements as
+multiple transformations over time.
+
+Use this API to define how an HTML element can move, change color, grow or shrink, fade, or slide off
+the page. These changes can occur simultaneously or sequentially. You can control the timing of each
+of these transformations. The function calls generate the data structures and metadata that enable Angular
+to integrate animations into templates and run them based on application states.
+
+Animation definitions are linked to components through the `{@link Component.animations animations}`
+property in the `@Component` metadata, typically in the component file of the HTML element to be animated.
+The `trigger()` function encapsulates a named animation, with all other function calls nested within. Use
+the trigger name to bind the named animation to a specific triggering element in the HTML template.
+
+Angular animations are based on CSS web transition functionality, so anything that can be styled or
+transformed in CSS can be animated the same way in Angular. Angular animations allow you to:
+
+* Set animation timings, styles, keyframes, and transitions.
+* Animate HTML elements in complex sequences and choreographies.
+* Animate HTML elements as they are inserted and removed from the DOM, including responsive real-time
+  filtering.
+* Create reusable animations.
+* Animate parent and child elements.
+
+Additional animation functionality is provided in other Angular modules for animation testing, for
+route-based animations, and for programmatic animation controls that allow an end user to fast forward
+and reverse an animation sequence.
+
+@see Find out more in the [animations guide](guide/animations).
+@see See what polyfills you might need in the [browser support guide](guide/browser-support).

From 74b250b1465661292dfcdd67444261cacb78bf3f Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 1 Jul 2018 21:23:45 +0100
Subject: [PATCH 484/582] feat(docs-infra): enable filtering by package on API
 list page (#24631)

PR Close #24631
---
 .../api/api-list.component.html               |  6 +-
 .../api/api-list.component.spec.ts            | 60 +++++++++++--------
 .../custom-elements/api/api-list.component.ts | 19 +++---
 .../app/custom-elements/api/api.service.ts    |  4 +-
 4 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/aio/src/app/custom-elements/api/api-list.component.html b/aio/src/app/custom-elements/api/api-list.component.html
index aa65d70291..3011853b14 100644
--- a/aio/src/app/custom-elements/api/api-list.component.html
+++ b/aio/src/app/custom-elements/api/api-list.component.html
@@ -21,10 +21,10 @@
 
 <article class="api-list-container l-content-small docs-content">
   <div *ngFor="let section of filteredSections | async" >
-    <h2><a [href]="section.path">{{section.title}}</a></h2>
-    <ul class="api-list">
+    <h2 *ngIf="section.items"><a [href]="section.path">{{section.title}}</a></h2>
+    <ul class="api-list" *ngIf="section.items?.length">
       <ng-container *ngFor="let item of section.items">
-        <li *ngIf="item.show" class="api-item">
+        <li class="api-item">
           <a [href]="item.path"><span class="symbol {{item.docType}}"></span> {{item.title}}</a>
         </li>
       </ng-container>
diff --git a/aio/src/app/custom-elements/api/api-list.component.spec.ts b/aio/src/app/custom-elements/api/api-list.component.spec.ts
index 035a07f134..ac10868bf5 100644
--- a/aio/src/app/custom-elements/api/api-list.component.spec.ts
+++ b/aio/src/app/custom-elements/api/api-list.component.spec.ts
@@ -36,18 +36,13 @@ describe('ApiListComponent', () => {
    */
   function expectFilteredResult(label: string, itemTest: (item: ApiItem) => boolean) {
     component.filteredSections.subscribe(filtered => {
-      let badItem: ApiItem|undefined;
+      filtered = filtered.filter(section => section.items);
       expect(filtered.length).toBeGreaterThan(0, 'expected something');
-      expect(filtered.every(section => section.items.every(
-          item => {
-            const ok = item.show === itemTest(item);
-            if (!ok) { badItem = item; }
-            return ok;
-          }
-      ))).toBe(true, `${label} fail: ${JSON.stringify(badItem, null, 2)}`);
+      expect(filtered.every(section => section.items!.every(itemTest))).toBe(true, label);
     });
   }
 
+
   describe('#filteredSections', () => {
 
     beforeEach(() => {
@@ -65,34 +60,45 @@ describe('ApiListComponent', () => {
       expectFilteredResult('query: class', item => /class/.test(item.name));
     });
 
-    it('item.show should be true for every item in section when query matches section name', () => {
+    it('items should be an array for every item in section when query matches section name', () => {
       component.setQuery('core');
       component.filteredSections.subscribe(filtered => {
+        filtered = filtered.filter(section => Array.isArray(section.items));
         expect(filtered.length).toBe(1, 'only one section');
         expect(filtered[0].name).toBe('core');
-        expect(filtered[0].items.every(item => !!item.show)).toBe(true, 'all core items shown');
+        expect(filtered[0].items).toEqual(sections.find(section => section.name === 'core')!.items);
       });
     });
 
-    it('item.show should be true for items with selected status', () => {
-      component.setStatus({value: 'stable', title: 'Stable'});
-      expectFilteredResult('status: stable', item => item.stability === 'stable');
+    describe('section.items', () => {
+      it('should null if there are no matching items and the section itself does not match', () => {
+        component.setQuery('core');
+        component.filteredSections.subscribe(filtered => {
+          const commonSection = filtered.find(section => section.name === 'common')!;
+          expect(commonSection.items).toBe(null);
+        });
+      });
+
+      it('should be visible if they have the selected stability status', () => {
+        component.setStatus({value: 'stable', title: 'Stable'});
+        expectFilteredResult('status: stable', item => item.stability === 'stable');
+      });
+
+      it('should be visible if they have the selected security status', () => {
+        component.setStatus({value: 'security-risk', title: 'Security Risk'});
+        expectFilteredResult('status: security-risk', item => item.securityRisk);
+      });
+
+      it('should be visible if they match the selected API type', () => {
+        component.setType({value: 'class', title: 'Class'});
+        expectFilteredResult('type: class', item => item.docType === 'class');
+      });
     });
 
-    it('item.show should be true for items with "security-risk" status when selected', () => {
-      component.setStatus({value: 'security-risk', title: 'Security Risk'});
-      expectFilteredResult('status: security-risk', item => item.securityRisk);
-    });
-
-    it('item.show should be true for items of selected type', () => {
-      component.setType({value: 'class', title: 'Class'});
-      expectFilteredResult('type: class', item => item.docType === 'class');
-    });
-
-    it('should have no sections and no items when no match', () => {
+    it('should have no sections and no items visible when there is no match', () => {
       component.setQuery('fizbuzz');
       component.filteredSections.subscribe(filtered => {
-        expect(filtered.length).toBe(0, 'expected no sections');
+        expect(filtered.some(section => !!section.items)).toBeFalsy();
       });
     });
   });
@@ -108,9 +114,11 @@ describe('ApiListComponent', () => {
       fixture.detectChanges();
 
       component.filteredSections.subscribe(filtered => {
+        filtered = filtered.filter(s => s.items);
+        console.log(filtered);
         expect(filtered.length).toBe(1, 'sections');
         expect(filtered[0].name).toBe(section, 'section name');
-        const items = filtered[0].items.filter(i => i.show);
+        const items = filtered[0].items!;
         expect(items.length).toBe(1, 'items');
 
         const item = items[0];
diff --git a/aio/src/app/custom-elements/api/api-list.component.ts b/aio/src/app/custom-elements/api/api-list.component.ts
index a343bfb949..666b05aa49 100644
--- a/aio/src/app/custom-elements/api/api-list.component.ts
+++ b/aio/src/app/custom-elements/api/api-list.component.ts
@@ -49,7 +49,8 @@ export class ApiListComponent implements OnInit {
     { value: 'function', title: 'Function' },
     { value: 'interface', title: 'Interface' },
     { value: 'pipe', title: 'Pipe'},
-    { value: 'type-alias', title: 'Type Alias' }
+    { value: 'type-alias', title: 'Type alias' },
+    { value: 'package', title: 'Package'}
   ];
 
   statuses: Option[] = [
@@ -71,7 +72,8 @@ export class ApiListComponent implements OnInit {
       this.apiService.sections,
       this.criteriaSubject,
       (sections, criteria) => {
-        return sections.filter(section => this.filterSection(section, criteria));
+        return sections
+          .map(section => ({ ...section, items: this.filterSection(section, criteria) }));
       }
     );
 
@@ -107,13 +109,8 @@ export class ApiListComponent implements OnInit {
   //////// Private //////////
 
   private filterSection(section: ApiSection, { query, status, type }: SearchCriteria) {
-    let showSection = false;
-
-    section.items.forEach(item => {
-      item.show =  matchesType() && matchesStatus() && matchesQuery();
-
-      // show section if any of its items will be shown
-      showSection = showSection || item.show;
+    const items = section.items!.filter(item => {
+      return matchesType() && matchesStatus() && matchesQuery();
 
       function matchesQuery() {
         return !query ||
@@ -132,8 +129,8 @@ export class ApiListComponent implements OnInit {
       }
     });
 
-    return showSection;
-
+    // If there are no items we still return an empty array if the section name matches and the type is 'package'
+    return items.length ? items : (type === 'package' && (!query || section.name.indexOf(query) !== -1)) ? [] : null;
   }
 
   // Get initial search criteria from URL search params
diff --git a/aio/src/app/custom-elements/api/api.service.ts b/aio/src/app/custom-elements/api/api.service.ts
index c2398e7d91..f90599c8af 100644
--- a/aio/src/app/custom-elements/api/api.service.ts
+++ b/aio/src/app/custom-elements/api/api.service.ts
@@ -14,15 +14,13 @@ export interface ApiItem {
   docType: string;
   stability: string;
   securityRisk: boolean;
-
-  show?: boolean;
 }
 
 export interface ApiSection {
   path: string;
   name: string;
   title: string;
-  items: ApiItem[];
+  items: ApiItem[]|null;
 }
 
 @Injectable()

From 9be8abd0126b76a13d511eb393257e4c5c665d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Mon, 16 Jul 2018 11:41:02 -0700
Subject: [PATCH 485/582] build: disable IE web worker tests (#24908)

Travis (saucelabs) has been super flaky when running IE
web worker tests lately. This patch temporarily disables
these tests on IE (not edge) until things get more stable.

PR Close #24908
---
 .../worker/renderer_v2_integration_spec.ts    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
index 4b1320c72f..3a3b5e209f 100644
--- a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
+++ b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
@@ -81,6 +81,10 @@ let lastCreatedRenderer: Renderer2;
     }
 
     it('should update text nodes', () => {
+      // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
+      // TODO (matsko): revisit this once things become more stable in the saucelabs world
+      if (isOldIE()) return;
+
       const fixture =
           TestBed.overrideTemplate(MyComp2, '<div>{{ctxProp}}</div>').createComponent(MyComp2);
       const renderEl = getRenderElement(fixture.nativeElement);
@@ -93,6 +97,10 @@ let lastCreatedRenderer: Renderer2;
 
     it('should update any element property/attributes/class/style(s) independent of the compilation on the root element and other elements',
        () => {
+         // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
+         // TODO (matsko): revisit this once things become more stable in the saucelabs world
+         if (isOldIE()) return;
+
          const fixture =
              TestBed.overrideTemplate(MyComp2, '<input [title]="y" style="position:absolute">')
                  .createComponent(MyComp2);
@@ -127,6 +135,10 @@ let lastCreatedRenderer: Renderer2;
        });
 
     it('should update any template comment property/attributes', () => {
+      // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
+      // TODO (matsko): revisit this once things become more stable in the saucelabs world
+      if (isOldIE()) return;
+
       const fixture =
           TestBed.overrideTemplate(MyComp2, '<ng-container *ngIf="ctxBoolProp"></ng-container>')
               .createComponent(MyComp2);
@@ -137,6 +149,10 @@ let lastCreatedRenderer: Renderer2;
     });
 
     it('should add and remove fragments', () => {
+      // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
+      // TODO (matsko): revisit this once things become more stable in the saucelabs world
+      if (isOldIE()) return;
+
       const fixture =
           TestBed
               .overrideTemplate(MyComp2, '<ng-container *ngIf="ctxBoolProp">hello</ng-container>')
@@ -156,6 +172,10 @@ let lastCreatedRenderer: Renderer2;
 
     if (getDOM().supportsDOMEvents()) {
       it('should listen to events', () => {
+        // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
+        // TODO (matsko): revisit this once things become more stable in the saucelabs world
+        if (isOldIE()) return;
+
         const fixture = TestBed.overrideTemplate(MyComp2, '<input (change)="ctxNumProp = 1">')
                             .createComponent(MyComp2);
 
@@ -214,3 +234,8 @@ class RenderFactory extends WebWorkerRendererFactory2 {
     return lastCreatedRenderer;
   }
 }
+
+function isOldIE() {
+  // note that this only applies to older IEs (not edge)
+  return (window as any).document['documentMode'] ? true : false;
+}

From c8ad9657c9423cc2d07d6cc6a230ef28e2b60f3c Mon Sep 17 00:00:00 2001
From: Carlos Ortiz Garcia <goodwine@google.com>
Date: Fri, 13 Jul 2018 16:14:08 -0700
Subject: [PATCH 486/582] fix(compiler): i18n_extractor now outputs the correct
 source file name (#24885) for non-inline templates

- Non-inline templates used to ouput the path to the component TS file
instead of the path to the original HTML file.
- Inline templates keep the same behavior.

Fixes #24884

PR Close #24885
---
 .../compiler-cli/test/extract_i18n_spec.ts    | 97 +++++++++++++++----
 packages/compiler/src/aot/compiler.ts         |  6 +-
 packages/compiler/src/i18n/extractor.ts       |  6 +-
 3 files changed, 88 insertions(+), 21 deletions(-)

diff --git a/packages/compiler-cli/test/extract_i18n_spec.ts b/packages/compiler-cli/test/extract_i18n_spec.ts
index 4373fef338..8e44da3e22 100644
--- a/packages/compiler-cli/test/extract_i18n_spec.ts
+++ b/packages/compiler-cli/test/extract_i18n_spec.ts
@@ -43,8 +43,9 @@ const EXPECTED_XMB = `<?xml version="1.0" encoding="UTF-8" ?>
 <!ELEMENT ex (#PCDATA)>
 ]>
 <messagebundle>
-  <msg id="8136548302122759730" desc="desc" meaning="meaning"><source>src/module.ts:1</source>translate me</msg>
-  <msg id="3492007542396725315"><source>src/module.ts:2</source>Welcome</msg>
+  <msg id="8136548302122759730" desc="desc" meaning="meaning"><source>src/basic.html:1</source><source>src/comp2.ts:1</source><source>src/basic.html:1</source>translate me</msg>
+  <msg id="9038505069473852515"><source>src/basic.html:3,4</source><source>src/comp2.ts:3,4</source><source>src/comp2.ts:2,3</source><source>src/basic.html:3,4</source>
+    Welcome</msg>
 </messagebundle>
 `;
 
@@ -55,18 +56,39 @@ const EXPECTED_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
       <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
         <source>translate me</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/module.ts</context>
+          <context context-type="sourcefile">src/basic.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/comp2.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/basic.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <note priority="1" from="description">desc</note>
         <note priority="1" from="meaning">meaning</note>
       </trans-unit>
-      <trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html">
-        <source>Welcome</source>
+      <trans-unit id="085a5ecc40cc87451d216725b2befd50866de18a" datatype="html">
+        <source>
+    Welcome</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/module.ts</context>
+          <context context-type="sourcefile">src/basic.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/comp2.ts</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/comp2.ts</context>
           <context context-type="linenumber">2</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/basic.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
       </trans-unit>
     </body>
   </file>
@@ -80,18 +102,24 @@ const EXPECTED_XLIFF2 = `<?xml version="1.0" encoding="UTF-8" ?>
       <notes>
         <note category="description">desc</note>
         <note category="meaning">meaning</note>
-        <note category="location">src/module.ts:1</note>
+        <note category="location">src/basic.html:1</note>
+        <note category="location">src/comp2.ts:1</note>
+        <note category="location">src/basic.html:1</note>
       </notes>
       <segment>
         <source>translate me</source>
       </segment>
     </unit>
-    <unit id="3492007542396725315">
+    <unit id="9038505069473852515">
       <notes>
-        <note category="location">src/module.ts:2</note>
+        <note category="location">src/basic.html:3,4</note>
+        <note category="location">src/comp2.ts:3,4</note>
+        <note category="location">src/comp2.ts:2,3</note>
+        <note category="location">src/basic.html:3,4</note>
       </notes>
       <segment>
-        <source>Welcome</source>
+        <source>
+    Welcome</source>
       </segment>
     </unit>
   </file>
@@ -155,21 +183,54 @@ describe('extract_i18n command line', () => {
   });
 
   function writeSources() {
-    write('src/basic.html', [
-      `<div title="translate me" i18n-title="meaning|desc"></div>`,
-      `<p id="welcomeMessage"><!--i18n-->Welcome<!--/i18n--></p>`,
-    ].join('\n'));
-    write('src/module.ts', `
-    import {Component, NgModule} from '@angular/core';
+    const welcomeMessage = `
+    <!--i18n-->
+    Welcome<!--/i18n-->
+    `;
+    write('src/basic.html', `<div title="translate me" i18n-title="meaning|desc"></div>
+         <p id="welcomeMessage">${welcomeMessage}</p>`);
+
+    write('src/comp1.ts', `
+    import {Component} from '@angular/core';
 
     @Component({
       selector: 'basic',
       templateUrl: './basic.html',
     })
-    export class BasicCmp {}
+    export class BasicCmp1 {}`);
+
+    write('src/comp2.ts', `
+    import {Component} from '@angular/core';
+
+    @Component({
+      selector: 'basic2',
+      template: \`<div title="translate me" i18n-title="meaning|desc"></div>
+      <p id="welcomeMessage">${welcomeMessage}</p>\`,
+    })
+    export class BasicCmp2 {}
+    @Component({
+      selector: 'basic4',
+      template: \`<p id="welcomeMessage">${welcomeMessage}</p>\`,
+    })
+    export class BasicCmp4 {}`);
+
+    write('src/comp3.ts', `
+    import {Component} from '@angular/core';
+
+    @Component({
+      selector: 'basic3',
+      templateUrl: './basic.html',
+    })
+    export class BasicCmp3 {}`);
+
+    write('src/module.ts', `
+    import {NgModule} from '@angular/core';
+    import {BasicCmp1} from './comp1';
+    import {BasicCmp2, BasicCmp4} from './comp2';
+    import {BasicCmp3} from './comp3';
 
     @NgModule({
-      declarations: [BasicCmp]
+      declarations: [BasicCmp1, BasicCmp2, BasicCmp3, BasicCmp4]
     })
     export class I18nModule {}
     `);
diff --git a/packages/compiler/src/aot/compiler.ts b/packages/compiler/src/aot/compiler.ts
index 660c1eeb26..f76e0fe06c 100644
--- a/packages/compiler/src/aot/compiler.ts
+++ b/packages/compiler/src/aot/compiler.ts
@@ -318,10 +318,12 @@ export class AotCompiler {
       });
       compMetas.forEach(compMeta => {
         const html = compMeta.template !.template !;
+        // Template URL points to either an HTML or TS file depending on whether
+        // the file is used with `templateUrl:` or `template:`, respectively.
+        const templateUrl = compMeta.template !.templateUrl !;
         const interpolationConfig =
             InterpolationConfig.fromArray(compMeta.template !.interpolation);
-        errors.push(
-            ...messageBundle.updateFromTemplate(html, file.fileName, interpolationConfig) !);
+        errors.push(...messageBundle.updateFromTemplate(html, templateUrl, interpolationConfig) !);
       });
     });
 
diff --git a/packages/compiler/src/i18n/extractor.ts b/packages/compiler/src/i18n/extractor.ts
index 80015d3fa0..8b950feb6d 100644
--- a/packages/compiler/src/i18n/extractor.ts
+++ b/packages/compiler/src/i18n/extractor.ts
@@ -75,10 +75,14 @@ export class Extractor {
             });
             compMetas.forEach(compMeta => {
               const html = compMeta.template !.template !;
+              // Template URL points to either an HTML or TS file depending on
+              // whether the file is used with `templateUrl:` or `template:`,
+              // respectively.
+              const templateUrl = compMeta.template !.templateUrl !;
               const interpolationConfig =
                   InterpolationConfig.fromArray(compMeta.template !.interpolation);
               errors.push(...this.messageBundle.updateFromTemplate(
-                  html, file.fileName, interpolationConfig) !);
+                  html, templateUrl, interpolationConfig) !);
             });
           });
 

From ba3eb8b654d77b504988f8f98eaa9e4b7c256b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Wed, 11 Jul 2018 09:56:47 -0700
Subject: [PATCH 487/582] feat(ivy): properly apply class="", [class],
 [class.foo] and [attr.class] bindings (#24822)

PR Close #24822
---
 .../src/largetable/render3/table.ts           |    8 +-
 modules/benchmarks/src/tree/render3/tree.ts   |   28 +-
 packages/compiler/src/core.ts                 |    4 +-
 .../compiler/src/render3/r3_identifiers.ts    |    6 +-
 .../compiler/src/render3/view/template.ts     |  188 ++-
 .../render3/r3_compiler_compliance_spec.ts    |   28 +-
 .../render3/r3_view_compiler_styling_spec.ts  |  136 +-
 .../core/src/core_render3_private_export.ts   |    3 +-
 packages/core/src/render3/assert.ts           |    3 +-
 packages/core/src/render3/index.ts            |    5 +-
 packages/core/src/render3/instructions.ts     |  127 +-
 .../core/src/render3/interfaces/definition.ts |    4 +-
 packages/core/src/render3/jit/environment.ts  |    3 +-
 .../core/src/render3/node_manipulation.ts     |    8 +-
 packages/core/src/render3/styling.ts          |  522 ++++--
 packages/core/src/render3/util.ts             |   28 +
 .../hello_world/bundle.golden_symbols.json    |    3 +
 .../bundling/todo/bundle.golden_symbols.json  |  104 +-
 .../compiler_canonical/elements_spec.ts       |   33 +-
 .../compiler_canonical/sanitize_spec.ts       |   12 +-
 packages/core/test/render3/exports_spec.ts    |    9 +-
 .../core/test/render3/instructions_spec.ts    |   32 +-
 .../core/test/render3/integration_spec.ts     |   26 +-
 packages/core/test/render3/styling_spec.ts    | 1414 ++++++++++-------
 24 files changed, 1806 insertions(+), 928 deletions(-)

diff --git a/modules/benchmarks/src/largetable/render3/table.ts b/modules/benchmarks/src/largetable/render3/table.ts
index bbd822dcc1..852538c4b2 100644
--- a/modules/benchmarks/src/largetable/render3/table.ts
+++ b/modules/benchmarks/src/largetable/render3/table.ts
@@ -48,13 +48,13 @@ export class LargeTableComponent {
                     {
                       if (rf2 & RenderFlags.Create) {
                         E(0, 'td');
-                        s(1, c0);
-                        { T(2); }
+                        s(c0);
+                        { T(1); }
                         e();
                       }
                       if (rf2 & RenderFlags.Update) {
-                        sp(1, 0, cell.row % 2 ? '' : 'grey');
-                        t(2, b(cell.value));
+                        sp(0, 0, cell.row % 2 ? '' : 'grey');
+                        t(1, b(cell.value));
                       }
                     }
                     v();
diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts
index 17ef84672b..3fc03b2f81 100644
--- a/modules/benchmarks/src/tree/render3/tree.ts
+++ b/modules/benchmarks/src/tree/render3/tree.ts
@@ -41,16 +41,16 @@ export class TreeComponent {
     template: function(rf: RenderFlags, ctx: TreeComponent) {
       if (rf & RenderFlags.Create) {
         E(0, 'span');
-        s(1, c0);
-        { T(2); }
+        s(c0);
+        { T(1); }
         e();
+        C(2);
         C(3);
-        C(4);
       }
       if (rf & RenderFlags.Update) {
-        sp(1, 0, ctx.data.depth % 2 ? '' : 'grey');
-        t(2, i1(' ', ctx.data.value, ' '));
-        cR(3);
+        sp(0, 0, ctx.data.depth % 2 ? '' : 'grey');
+        t(1, i1(' ', ctx.data.value, ' '));
+        cR(2);
         {
           if (ctx.data.left != null) {
             let rf0 = V(0);
@@ -67,7 +67,7 @@ export class TreeComponent {
           }
         }
         cr();
-        cR(4);
+        cR(3);
         {
           if (ctx.data.right != null) {
             let rf0 = V(0);
@@ -114,18 +114,18 @@ export function TreeTpl(rf: RenderFlags, ctx: TreeNode) {
     E(0, 'tree');
     {
       E(1, 'span');
-      s(2, c1);
-      { T(3); }
+      s(c1);
+      { T(2); }
       e();
+      C(3);
       C(4);
-      C(5);
     }
     e();
   }
   if (rf & RenderFlags.Update) {
-    sp(2, 0, ctx.depth % 2 ? '' : 'grey');
-    t(3, i1(' ', ctx.value, ' '));
-    cR(4);
+    sp(1, 0, ctx.depth % 2 ? '' : 'grey');
+    t(2, i1(' ', ctx.value, ' '));
+    cR(3);
     {
       if (ctx.left != null) {
         let rf0 = V(0);
@@ -134,7 +134,7 @@ export function TreeTpl(rf: RenderFlags, ctx: TreeNode) {
       }
     }
     cr();
-    cR(5);
+    cR(4);
     {
       if (ctx.right != null) {
         let rf0 = V(0);
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index 353645a8e6..e34aa4c1c0 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -380,8 +380,6 @@ export const enum RenderFlags {
   Update = 0b10
 }
 
-// Note this will expand once `class` is introduced to styling
 export const enum InitialStylingFlags {
-  /** Mode for matching initial style values */
-  INITIAL_STYLES = 0b00,
+  VALUES_MODE = 0b1,
 }
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 12f6375229..698326b6a8 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -33,13 +33,11 @@ export class Identifiers {
 
   static elementAttribute: o.ExternalReference = {name: 'ɵa', moduleName: CORE};
 
-  static elementClass: o.ExternalReference = {name: 'ɵk', moduleName: CORE};
-
-  static elementClassNamed: o.ExternalReference = {name: 'ɵkn', moduleName: CORE};
+  static elementClassProp: o.ExternalReference = {name: 'ɵcp', moduleName: CORE};
 
   static elementStyling: o.ExternalReference = {name: 'ɵs', moduleName: CORE};
 
-  static elementStyle: o.ExternalReference = {name: 'ɵsm', moduleName: CORE};
+  static elementStylingMap: o.ExternalReference = {name: 'ɵsm', moduleName: CORE};
 
   static elementStyleProp: o.ExternalReference = {name: 'ɵsp', moduleName: CORE};
 
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index ed55319205..e50f2a5ce9 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -40,19 +40,12 @@ function mapBindingToInstruction(type: BindingType): o.ExternalReference|undefin
     case BindingType.Attribute:
       return R3.elementAttribute;
     case BindingType.Class:
-      return R3.elementClassNamed;
+      return R3.elementClassProp;
     default:
       return undefined;
   }
 }
 
-// `className` is used below instead of `class` because the interception
-// code (where this map is used) deals with DOM element property values
-// (like elm.propName) and not component bindining properties (like [propName]).
-const SPECIAL_CASED_PROPERTIES_INSTRUCTION_MAP: {[index: string]: o.ExternalReference} = {
-  'className': R3.elementClass
-};
-
 export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   private _dataIndex = 0;
   private _bindingContext = 0;
@@ -310,33 +303,59 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     const i18nMessages: o.Statement[] = [];
     const attributes: o.Expression[] = [];
     const initialStyleDeclarations: o.Expression[] = [];
+    const initialClassDeclarations: o.Expression[] = [];
 
     const styleInputs: t.BoundAttribute[] = [];
+    const classInputs: t.BoundAttribute[] = [];
     const allOtherInputs: t.BoundAttribute[] = [];
 
     element.inputs.forEach((input: t.BoundAttribute) => {
-      // [attr.style] should not be treated as a styling-based
-      // binding since it is intended to write directly to the attr
-      // and therefore will skip all style resolution that is present
-      // with style="", [style]="" and [style.prop]="" assignments
-      if (input.name == 'style' && input.type == BindingType.Property) {
-        // this should always go first in the compilation (for [style])
-        styleInputs.splice(0, 0, input);
-      } else if (input.type == BindingType.Style) {
-        styleInputs.push(input);
-      } else {
-        allOtherInputs.push(input);
+      switch (input.type) {
+        // [attr.style] or [attr.class] should not be treated as styling-based
+        // bindings since they are intended to be written directly to the attr
+        // and therefore will skip all style/class resolution that is present
+        // with style="", [style]="" and [style.prop]="", class="",
+        // [class.prop]="". [class]="" assignments
+        case BindingType.Property:
+          if (input.name == 'style') {
+            // this should always go first in the compilation (for [style])
+            styleInputs.splice(0, 0, input);
+          } else if (isClassBinding(input)) {
+            // this should always go first in the compilation (for [class])
+            classInputs.splice(0, 0, input);
+          } else {
+            allOtherInputs.push(input);
+          }
+          break;
+        case BindingType.Style:
+          styleInputs.push(input);
+          break;
+        case BindingType.Class:
+          classInputs.push(input);
+          break;
+        default:
+          allOtherInputs.push(input);
+          break;
       }
     });
 
     let currStyleIndex = 0;
+    let currClassIndex = 0;
     let staticStylesMap: {[key: string]: any}|null = null;
+    let staticClassesMap: {[key: string]: boolean}|null = null;
     const stylesIndexMap: {[key: string]: number} = {};
+    const classesIndexMap: {[key: string]: number} = {};
     Object.getOwnPropertyNames(outputAttrs).forEach(name => {
       const value = outputAttrs[name];
       if (name == 'style') {
         staticStylesMap = parseStyle(value);
         Object.keys(staticStylesMap).forEach(prop => { stylesIndexMap[prop] = currStyleIndex++; });
+      } else if (name == 'class') {
+        staticClassesMap = {};
+        value.split(/\s+/g).forEach(className => {
+          classesIndexMap[className] = currClassIndex++;
+          staticClassesMap ![className] = true;
+        });
       } else {
         attributes.push(o.literal(name));
         if (attrI18nMetas.hasOwnProperty(name)) {
@@ -357,6 +376,14 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       }
     }
 
+    for (let i = 0; i < classInputs.length; i++) {
+      const input = classInputs[i];
+      const isMapBasedClassBinding = i === 0 && isClassBinding(input);
+      if (!isMapBasedClassBinding && !stylesIndexMap.hasOwnProperty(input.name)) {
+        classesIndexMap[input.name] = currClassIndex++;
+      }
+    }
+
     // this will build the instructions so that they fall into the following syntax
     // => [prop1, prop2, prop3, 0, prop1, value1, prop2, value2]
     Object.keys(stylesIndexMap).forEach(prop => {
@@ -364,7 +391,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     });
 
     if (staticStylesMap) {
-      initialStyleDeclarations.push(o.literal(core.InitialStylingFlags.INITIAL_STYLES));
+      initialStyleDeclarations.push(o.literal(core.InitialStylingFlags.VALUES_MODE));
 
       Object.keys(staticStylesMap).forEach(prop => {
         initialStyleDeclarations.push(o.literal(prop));
@@ -373,6 +400,22 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       });
     }
 
+    Object.keys(classesIndexMap).forEach(prop => {
+      initialClassDeclarations.push(o.literal(prop));
+    });
+
+    if (staticClassesMap) {
+      initialClassDeclarations.push(o.literal(core.InitialStylingFlags.VALUES_MODE));
+
+      Object.keys(staticClassesMap).forEach(className => {
+        initialClassDeclarations.push(o.literal(className));
+        initialClassDeclarations.push(o.literal(true));
+      });
+    }
+
+    const hasStylingInstructions = initialStyleDeclarations.length || styleInputs.length ||
+        initialClassDeclarations.length || classInputs.length;
+
     const attrArg: o.Expression = attributes.length > 0 ?
         this.constantPool.getConstLiteral(o.literalArr(attributes), true) :
         o.TYPED_NULL_EXPR;
@@ -411,10 +454,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const implicit = o.variable(CONTEXT_NAME);
 
-    const elementStyleIndex =
-        (initialStyleDeclarations.length || styleInputs.length) ? this.allocateDataSlot() : 0;
     const createSelfClosingInstruction =
-        elementStyleIndex === 0 && element.children.length === 0 && element.outputs.length === 0;
+        !hasStylingInstructions && element.children.length === 0 && element.outputs.length === 0;
 
     if (createSelfClosingInstruction) {
       this.instruction(
@@ -429,16 +470,30 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           ...trimTrailingNulls(parameters));
 
       // initial styling for static style="..." attributes
-      if (elementStyleIndex > 0) {
-        let paramsList: (o.Expression)[] = [o.literal(elementStyleIndex)];
+      if (hasStylingInstructions) {
+        const paramsList: (o.Expression)[] = [];
+
         if (initialStyleDeclarations.length) {
-          // the template compiler handles initial styling (e.g. style="foo") values
+          // the template compiler handles initial style (e.g. style="foo") values
           // in a special command called `elementStyle` so that the initial styles
           // can be processed during runtime. These initial styles values are bound to
           // a constant because the inital style values do not change (since they're static).
           paramsList.push(
               this.constantPool.getConstLiteral(o.literalArr(initialStyleDeclarations), true));
+        } else if (initialClassDeclarations.length) {
+          // no point in having an extra `null` value unless there are follow-up params
+          paramsList.push(o.NULL_EXPR);
         }
+
+        if (initialClassDeclarations.length) {
+          // the template compiler handles initial class styling (e.g. class="foo") values
+          // in a special command called `elementClass` so that the initial class
+          // can be processed during runtime. These initial class values are bound to
+          // a constant because the inital class values do not change (since they're static).
+          paramsList.push(
+              this.constantPool.getConstLiteral(o.literalArr(initialClassDeclarations), true));
+        }
+
         this._creationCode.push(o.importExpr(R3.elementStyling).callFn(paramsList).toStmt());
       }
 
@@ -465,25 +520,64 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       });
     }
 
-    if (styleInputs.length && elementStyleIndex > 0) {
-      const indexLiteral = o.literal(elementStyleIndex);
-      styleInputs.forEach((input, i) => {
-        const isMapBasedStyleBinding = i == 0 && input.name == 'style';
-        const convertedBinding = this.convertPropertyBinding(implicit, input.value, true);
-        if (isMapBasedStyleBinding) {
-          this.instruction(
-              this._bindingCode, input.sourceSpan, R3.elementStyle, indexLiteral, convertedBinding);
-        } else {
+    if ((styleInputs.length || classInputs.length) && hasStylingInstructions) {
+      const indexLiteral = o.literal(elementIndex);
+
+      const firstStyle = styleInputs[0];
+      const mapBasedStyleInput = firstStyle && firstStyle.name == 'style' ? firstStyle : null;
+
+      const firstClass = classInputs[0];
+      const mapBasedClassInput = firstClass && isClassBinding(firstClass) ? firstClass : null;
+
+      const stylingInput = mapBasedStyleInput || mapBasedClassInput;
+      if (stylingInput) {
+        const params: o.Expression[] = [];
+        if (mapBasedStyleInput) {
+          params.push(this.convertPropertyBinding(implicit, mapBasedStyleInput.value, true));
+        } else if (mapBasedClassInput) {
+          params.push(o.NULL_EXPR);
+        }
+        if (mapBasedClassInput) {
+          params.push(this.convertPropertyBinding(implicit, mapBasedClassInput.value, true));
+        }
+        this.instruction(
+            this._bindingCode, stylingInput.sourceSpan, R3.elementStylingMap, indexLiteral,
+            ...params);
+      }
+
+      let lastInputCommand: t.BoundAttribute|null = null;
+      if (styleInputs.length) {
+        let i = mapBasedStyleInput ? 1 : 0;
+        for (i; i < styleInputs.length; i++) {
+          const input = styleInputs[i];
+          const convertedBinding = this.convertPropertyBinding(implicit, input.value, true);
           const key = input.name;
-          let styleIndex: number = stylesIndexMap[key] !;
+          const styleIndex: number = stylesIndexMap[key] !;
           this.instruction(
               this._bindingCode, input.sourceSpan, R3.elementStyleProp, indexLiteral,
               o.literal(styleIndex), convertedBinding);
         }
-      });
 
-      const spanEnd = styleInputs[styleInputs.length - 1].sourceSpan;
-      this.instruction(this._bindingCode, spanEnd, R3.elementStylingApply, indexLiteral);
+        lastInputCommand = styleInputs[styleInputs.length - 1];
+      }
+
+      if (classInputs.length) {
+        let i = mapBasedClassInput ? 1 : 0;
+        for (i; i < classInputs.length; i++) {
+          const input = classInputs[i];
+          const convertedBinding = this.convertPropertyBinding(implicit, input.value, true);
+          const key = input.name;
+          const classIndex: number = classesIndexMap[key] !;
+          this.instruction(
+              this._bindingCode, input.sourceSpan, R3.elementClassProp, indexLiteral,
+              o.literal(classIndex), convertedBinding);
+        }
+
+        lastInputCommand = classInputs[classInputs.length - 1];
+      }
+
+      this.instruction(
+          this._bindingCode, lastInputCommand !.sourceSpan, R3.elementStylingApply, indexLiteral);
     }
 
     // Generate element input bindings
@@ -494,18 +588,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       }
 
       const convertedBinding = this.convertPropertyBinding(implicit, input.value);
-      const specialInstruction = SPECIAL_CASED_PROPERTIES_INSTRUCTION_MAP[input.name];
-      if (specialInstruction) {
-        // special case for [style] and [class] bindings since they are not handled as
-        // standard properties within this implementation. Instead they are
-        // handed off to special cased instruction handlers which will then
-        // delegate them as animation sequences (or input bindings for dirs/cmps)
-        this.instruction(
-            this._bindingCode, input.sourceSpan, specialInstruction, o.literal(elementIndex),
-            convertedBinding);
-        return;
-      }
-
       const instruction = mapBindingToInstruction(input.type);
       if (instruction) {
         // TODO(chuckj): runtime: security context?
@@ -975,3 +1057,7 @@ export function makeBindingParser(): BindingParser {
       new Parser(new Lexer()), DEFAULT_INTERPOLATION_CONFIG, new DomElementSchemaRegistry(), null,
       []);
 }
+
+function isClassBinding(input: t.BoundAttribute): boolean {
+  return input.name == 'className' || input.name == 'class';
+}
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
index 47a041a224..007c103bc4 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
@@ -6,9 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {InitialStylingFlags} from '../../src/core';
 import {MockDirectory, setup} from '../aot/test_util';
+
 import {compile, expectEmit} from './mock_compile';
 
+
 /* These tests are codified version of the tests in compiler_canonical_spec.ts. Every
   * test in compiler_canonical_spec.ts should have a corresponding test here.
   */
@@ -44,15 +47,17 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
-        const $c2$ = ['cx', '20', 'cy', '30', 'r', '50'];
+        const $c1$ = ['title', 'Hello'];
+        const $c2$ = ['my-app', ${InitialStylingFlags.VALUES_MODE}, 'my-app', true];
+        const $c3$ = ['cx', '20', 'cy', '30', 'r', '50'];
         …
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div', $c1$);
+            $r3$.ɵs((null as any), $c2$);
             $r3$.ɵNS();
             $r3$.ɵE(1, 'svg');
-            $r3$.ɵEe(2, 'circle', $c2$);
+            $r3$.ɵEe(2, 'circle', $c3$);
             $r3$.ɵe();
             $r3$.ɵNH();
             $r3$.ɵE(3, 'p');
@@ -93,11 +98,13 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
+        const $c1$ = ['title', 'Hello'];
+        const $c2$ = ['my-app', ${InitialStylingFlags.VALUES_MODE}, 'my-app', true];
         …
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div', $c1$);
+            $r3$.ɵs((null as any), $c2$);
             $r3$.ɵNM();
             $r3$.ɵE(1, 'math');
             $r3$.ɵEe(2, 'infinity');
@@ -141,11 +148,13 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-        const $c1$ = ['class', 'my-app', 'title', 'Hello'];
+        const $c1$ = ['title', 'Hello'];
+        const $c2$ = ['my-app', ${InitialStylingFlags.VALUES_MODE}, 'my-app', true];
         …
         template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div', $c1$);
+            $r3$.ɵs((null as any), $c2$);
             $r3$.ɵT(1, 'Hello ');
             $r3$.ɵE(2, 'b');
             $r3$.ɵT(3, 'World');
@@ -322,6 +331,7 @@ describe('compiler compliance', () => {
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
         const _c0 = ['background-color'];
+        const _c1 = ['error'];
         class MyComponent {
           static ngComponentDef = i0.ɵdefineComponent({type:MyComponent,selectors:[['my-component']],
               factory:function MyComponent_Factory(){
@@ -329,13 +339,13 @@ describe('compiler compliance', () => {
               },template:function MyComponent_Template(rf:number,ctx:any){
                 if (rf & 1) {
                   $r3$.ɵE(0, 'div');
-                  $r3$.ɵs(1, _c0);
+                  $r3$.ɵs(_c0, _c1);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
-                  $r3$.ɵsp(1, 0, ctx.color);
-                  $r3$.ɵsa(1);
-                  $r3$.ɵkn(0, 'error', $r3$.ɵb(ctx.error));
+                  $r3$.ɵsp(0, 0, ctx.color);
+                  $r3$.ɵcp(0, 0, ctx.error);
+                  $r3$.ɵsa(0);
                 }
               }
       `;
diff --git a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
index eae327c642..63b29ae47a 100644
--- a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
@@ -43,12 +43,12 @@ describe('compiler compliance: styling', () => {
           template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
             if (rf & 1) {
               $r3$.ɵE(0, 'div');
-              $r3$.ɵs(1);
+              $r3$.ɵs();
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsm(1, $ctx$.myStyleExp);
-              $r3$.ɵsa(1);
+              $r3$.ɵsm(0, $ctx$.myStyleExp);
+              $r3$.ɵsa(0);
             }
           }
           `;
@@ -57,7 +57,7 @@ describe('compiler compliance: styling', () => {
       expectEmit(result.source, template, 'Incorrect template');
     });
 
-    it('should place initial, multi, singular and application followed by attribute styling instructions in the template code in that order',
+    it('should place initial, multi, singular and application followed by attribute style instructions in the template code in that order',
        () => {
          const files = {
            app: {
@@ -85,7 +85,7 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-          const _c0 = ['opacity','width','height',${InitialStylingFlags.INITIAL_STYLES},'opacity','1'];
+          const _c0 = ['opacity','width','height',${InitialStylingFlags.VALUES_MODE},'opacity','1'];
           class MyComponent {
             static ngComponentDef = i0.ɵdefineComponent({
               type: MyComponent,
@@ -96,14 +96,14 @@ describe('compiler compliance: styling', () => {
               template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
                 if (rf & 1) {
                   $r3$.ɵE(0, 'div');
-                  $r3$.ɵs(1, _c0);
+                  $r3$.ɵs(_c0);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
-                  $r3$.ɵsm(1, $ctx$.myStyleExp);
-                  $r3$.ɵsp(1, 1, $ctx$.myWidth);
-                  $r3$.ɵsp(1, 2, $ctx$.myHeight);
-                  $r3$.ɵsa(1);
+                  $r3$.ɵsm(0, $ctx$.myStyleExp);
+                  $r3$.ɵsp(0, 1, $ctx$.myWidth);
+                  $r3$.ɵsp(0, 2, $ctx$.myHeight);
+                  $r3$.ɵsa(0);
                   $r3$.ɵa(0, 'style', $r3$.ɵb('border-width: 10px'));
                 }
               }
@@ -127,7 +127,7 @@ describe('compiler compliance: styling', () => {
                   template: \`<div [class]="myClassExp"></div>\`
                 })
                 export class MyComponent {
-                  myClassExp = [{color:'orange'}, {color:'green', duration:1000}]
+                  myClassExp = {'foo':true}
                 }
 
                 @NgModule({declarations: [MyComponent]})
@@ -139,10 +139,13 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'div');
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵs();
+              $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵk(0,$r3$.ɵb($ctx$.myClassExp));
+              $r3$.ɵsm(0,(null as any),$ctx$.myClassExp);
+              $r3$.ɵsa(0);
             }
           }
           `;
@@ -150,5 +153,112 @@ describe('compiler compliance: styling', () => {
       const result = compile(files, angularFiles);
       expectEmit(result.source, template, 'Incorrect template');
     });
+
+    it('should place initial, multi, singular and application followed by attribute class instructions in the template code in that order',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div class="grape"
+                                   [attr.class]="'banana'"
+                                   [class.apple]="yesToApple"
+                                   [class]="myClassExp"
+                                   [class.orange]="yesToOrange"></div>\`
+                })
+                export class MyComponent {
+                  myClassExp = {a:true, b:true};
+                  yesToApple = true;
+                  yesToOrange = true;
+                }
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+           }
+         };
+
+         const template = `
+          const _c0 = ['grape','apple','orange',${InitialStylingFlags.VALUES_MODE},'grape',true];
+          class MyComponent {
+            static ngComponentDef = i0.ɵdefineComponent({
+              type: MyComponent,
+              selectors:[['my-component']],
+              factory:function MyComponent_Factory(){
+                return new MyComponent();
+              },
+              template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+                if (rf & 1) {
+                  $r3$.ɵE(0, 'div');
+                  $r3$.ɵs((null as any), _c0);
+                  $r3$.ɵe();
+                }
+                if (rf & 2) {
+                  $r3$.ɵsm(0, (null as any), $ctx$.myClassExp);
+                  $r3$.ɵcp(0, 1, $ctx$.yesToApple);
+                  $r3$.ɵcp(0, 2, $ctx$.yesToOrange);
+                  $r3$.ɵsa(0);
+                  $r3$.ɵa(0, 'class', $r3$.ɵb('banana'));
+                }
+              }
+            });
+        `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
+
+    it('should not generate the styling apply instruction if there are only static style/class attributes',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div class="foo"
+                                   style="width:100px"
+                                   [attr.class]="'round'"
+                                   [attr.style]="'height:100px'"></div>\`
+                })
+                export class MyComponent {}
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+           }
+         };
+
+         const template = `
+          const _c0 = ['width',${InitialStylingFlags.VALUES_MODE},'width','100px'];
+          const _c1 = ['foo',${InitialStylingFlags.VALUES_MODE},'foo',true];
+          class MyComponent {
+            static ngComponentDef = i0.ɵdefineComponent({
+              type: MyComponent,
+              selectors:[['my-component']],
+              factory:function MyComponent_Factory(){
+                return new MyComponent();
+              },
+              template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+                if (rf & 1) {
+                  $r3$.ɵE(0, 'div');
+                  $r3$.ɵs(_c0, _c1);
+                  $r3$.ɵe();
+                }
+                if (rf & 2) {
+                  $r3$.ɵa(0, 'class', $r3$.ɵb('round'));
+                  $r3$.ɵa(0, 'style', $r3$.ɵb('height:100px'));
+                }
+              }
+            });
+        `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
   });
 });
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index a6853410d9..ee98d506bd 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -80,8 +80,7 @@ export {
   sm as ɵsm,
   sp as ɵsp,
   sa as ɵsa,
-  k as ɵk,
-  kn as ɵkn,
+  cp as ɵcp,
   t as ɵt,
   v as ɵv,
   st as ɵst,
diff --git a/packages/core/src/render3/assert.ts b/packages/core/src/render3/assert.ts
index 121217cb58..dc3d97311d 100644
--- a/packages/core/src/render3/assert.ts
+++ b/packages/core/src/render3/assert.ts
@@ -63,6 +63,7 @@ export function assertComponentType(
     msg: string =
         'Type passed in is not ComponentType, it does not have \'ngComponentDef\' property.') {
   if (!actual.ngComponentDef) {
+    debugger;
     throwError(msg);
   }
 }
@@ -70,4 +71,4 @@ export function assertComponentType(
 function throwError(msg: string): never {
   debugger;  // Left intentionally for better debugger experience.
   throw new Error(`ASSERTION ERROR: ${msg}`);
-}
\ No newline at end of file
+}
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 5734e884ed..e022bc4144 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -51,14 +51,13 @@ export {
 
   element as Ee,
   elementAttribute as a,
-  elementClass as k,
-  elementClassNamed as kn,
+  elementClassProp as cp,
   elementEnd as e,
   elementProperty as p,
   elementStart as E,
 
   elementStyling as s,
-  elementStyle as sm,
+  elementStylingMap as sm,
   elementStyleProp as sp,
   elementStylingApply as sa,
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index d5f0e2c4f4..a226cbb499 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -15,7 +15,7 @@ import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotE
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
 import {executeHooks, executeInitHooks, queueInitHooks, queueLifecycleHooks} from './hooks';
 import {ACTIVE_INDEX, LContainer, RENDER_PARENT, VIEWS} from './interfaces/container';
-import {ComponentDefInternal, ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
+import {ComponentDefInternal, ComponentQuery, ComponentTemplate, DirectiveDefInternal, DirectiveDefListOrFactory, InitialStylingFlags, PipeDefListOrFactory, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, InitialInputData, InitialInputs, LContainerNode, LElementNode, LNode, LProjectionNode, LTextNode, LViewNode, PropertyAliasValue, PropertyAliases, TAttributes, TContainerNode, TElementNode, TNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {CssSelectorList, NG_PROJECT_AS_ATTR_NAME} from './interfaces/projection';
@@ -25,8 +25,8 @@ import {BINDING_INDEX, CLEANUP, CONTAINER_INDEX, CONTENT_QUERIES, CONTEXT, Curre
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {appendChild, appendProjectedNode, canInsertNativeNode, createTextNode, findComponentHost, getChildLNode, getLViewChild, getNextLNode, getParentLNode, insertView, removeView} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {StylingContext, allocStylingContext, createStylingContextTemplate, renderStyles as renderElementStyles, updateStyleMap as updateElementStyleMap, updateStyleProp as updateElementStyleProp} from './styling';
-import {isDifferent, stringify} from './util';
+import {StylingContext, StylingIndex, allocStylingContext, createStylingContextTemplate, renderStyling as renderElementStyles, updateClassProp as updateElementClassProp, updateStyleProp as updateElementStyleProp, updateStylingMap} from './styling';
+import {assertDataInRangeInternal, isDifferent, loadElementInternal, loadInternal, stringify} from './util';
 import {ViewRef} from './view_ref';
 
 
@@ -96,6 +96,7 @@ export const CIRCULAR = '__CIRCULAR__';
  */
 let renderer: Renderer3;
 let rendererFactory: RendererFactory3;
+let currentElementNode: LElementNode|null = null;
 
 export function getRenderer(): Renderer3 {
   // top level variables should not be exported for performance reasons (PERF_NOTES.md)
@@ -668,6 +669,7 @@ export function elementStart(
 
   const node: LElementNode =
       createLNode(index, TNodeType.Element, native !, name, attrs || null, null);
+  currentElementNode = node;
 
   if (attrs) {
     setUpAttributes(native, attrs);
@@ -1104,6 +1106,7 @@ export function elementEnd() {
   const queries = previousOrParentNode.queries;
   queries && queries.addNode(previousOrParentNode);
   queueLifecycleHooks(previousOrParentNode.tNode.flags, tView);
+  currentElementNode = null;
 }
 
 /**
@@ -1118,7 +1121,7 @@ export function elementEnd() {
 export function elementAttribute(
     index: number, name: string, value: any, sanitizer?: SanitizerFn): void {
   if (value !== NO_CHANGE) {
-    const element: LElementNode = load(index);
+    const element = loadElement(index);
     if (value == null) {
       ngDevMode && ngDevMode.rendererRemoveAttribute++;
       isProceduralRenderer(renderer) ? renderer.removeAttribute(element.native, name) :
@@ -1149,7 +1152,7 @@ export function elementAttribute(
 export function elementProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn): void {
   if (value === NO_CHANGE) return;
-  const node = load(index) as LElementNode;
+  const node = loadElement(index) as LElementNode;
   const tNode = node.tNode;
   // if tNode.inputs is undefined, a listener has created outputs, but inputs haven't
   // yet been checked
@@ -1268,44 +1271,9 @@ function generatePropertyAliases(
  *        renaming as part of minification.
  * @param value A value indicating if a given class should be added or removed.
  */
-export function elementClassNamed<T>(index: number, className: string, value: T | NO_CHANGE): void {
-  if (value !== NO_CHANGE) {
-    const lElement = load(index) as LElementNode;
-    if (value) {
-      ngDevMode && ngDevMode.rendererAddClass++;
-      isProceduralRenderer(renderer) ? renderer.addClass(lElement.native, className) :
-                                       lElement.native.classList.add(className);
-
-    } else {
-      ngDevMode && ngDevMode.rendererRemoveClass++;
-      isProceduralRenderer(renderer) ? renderer.removeClass(lElement.native, className) :
-                                       lElement.native.classList.remove(className);
-    }
-  }
-}
-
-/**
- * Set the `className` property on a DOM element.
- *
- * This instruction is meant to handle the `[class]="exp"` usage.
- *
- * `elementClass` instruction writes the value to the "element's" `className` property.
- *
- * @param index The index of the element to update in the data array
- * @param value A value indicating a set of classes which should be applied. The method overrides
- *   any existing classes. The value is stringified (`toString`) before it is applied to the
- *   element.
- */
-export function elementClass<T>(index: number, value: T | NO_CHANGE): void {
-  if (value !== NO_CHANGE) {
-    // TODO: This is a naive implementation which simply writes value to the `className`. In the
-    // future
-    // we will add logic here which would work with the animation code.
-    const lElement: LElementNode = load(index);
-    ngDevMode && ngDevMode.rendererSetClassName++;
-    isProceduralRenderer(renderer) ? renderer.setProperty(lElement.native, 'className', value) :
-                                     lElement.native['className'] = stringify(value);
-  }
+export function elementClassProp<T>(
+    index: number, stylingIndex: number, value: T | NO_CHANGE): void {
+  updateElementClassProp(getStylingContext(index), stylingIndex, value ? true : false);
 }
 
 /**
@@ -1323,22 +1291,29 @@ export function elementClass<T>(index: number, value: T | NO_CHANGE): void {
  *        (Note that this is not the element index, but rather an index value allocated
  *        specifically for element styling--the index must be the next index after the element
  *        index.)
- * @param styles A key/value map of CSS styles that will be registered on the element.
+ * @param styleDeclarations A key/value array of CSS styles that will be registered on the element.
  *   Each individual style will be used on the element as long as it is not overridden
  *   by any styles placed on the element by multiple (`[style]`) or singular (`[style.prop]`)
  *   bindings. If a style binding changes its value to null then the initial styling
  *   values that are passed in here will be applied to the element (if matched).
+ * @param classDeclarations A key/value array of CSS classes that will be registered on the element.
+ *   Each individual style will be used on the element as long as it is not overridden
+ *   by any classes placed on the element by multiple (`[class]`) or singular (`[class.named]`)
+ *   bindings. If a class binding changes its value to a falsy value then the matching initial
+ *   class value that are passed in here will be applied to the element (if matched).
  */
-export function elementStyling<T>(index: number, styles?: (string | number)[] | null): void {
-  const tNode = load<LElementNode>(index - 1).tNode;
+export function elementStyling<T>(
+    styleDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
+    classDeclarations?: (string | boolean | InitialStylingFlags)[] | null): void {
+  const lElement = currentElementNode !;
+  const tNode = lElement.tNode;
   if (!tNode.stylingTemplate) {
     // initialize the styling template.
-    tNode.stylingTemplate = createStylingContextTemplate(styles);
+    tNode.stylingTemplate = createStylingContextTemplate(styleDeclarations, classDeclarations);
   }
-  // Allocate space but leave null for lazy creation.
-  viewData[index + HEADER_OFFSET] = null;
-  if (styles && styles.length) {
-    elementStylingApply(index);
+  if (styleDeclarations && styleDeclarations.length ||
+      classDeclarations && classDeclarations.length) {
+    elementStylingApply(tNode.index - HEADER_OFFSET);
   }
 }
 
@@ -1354,12 +1329,13 @@ export function elementStyling<T>(index: number, styles?: (string | number)[] |
  */
 function getStylingContext(index: number): StylingContext {
   let stylingContext = load<StylingContext>(index);
-  if (!stylingContext) {
-    const lElement: LElementNode = load(index - 1);
+  if (!Array.isArray(stylingContext)) {
+    const lElement = stylingContext as any as LElementNode;
     const tNode = lElement.tNode;
     ngDevMode &&
         assertDefined(tNode.stylingTemplate, 'getStylingContext() called before elementStyling()');
-    stylingContext = viewData[index + HEADER_OFFSET] = allocStylingContext(tNode.stylingTemplate !);
+    stylingContext = viewData[index + HEADER_OFFSET] =
+        allocStylingContext(lElement, tNode.stylingTemplate !);
   }
   return stylingContext;
 }
@@ -1379,7 +1355,7 @@ function getStylingContext(index: number): StylingContext {
  *        index.)
  */
 export function elementStylingApply<T>(index: number): void {
-  renderElementStyles(load<LElementNode>(index - 1), getStylingContext(index), renderer);
+  renderElementStyles(getStylingContext(index), renderer);
 }
 
 /**
@@ -1436,12 +1412,17 @@ export function elementStyleProp<T>(
  *        (Note that this is not the element index, but rather an index value allocated
  *        specifically for element styling--the index must be the next index after the element
  *        index.)
- * @param value A value indicating if a given style should be added or removed.
- *   The expected shape of `value` is an object where keys are style names and the values
- *   are their corresponding values to set. If value is null, then the style is removed.
+ * @param styles A key/value style map of the styles that will be applied to the given element.
+ *        Any missing styles (that have already been applied to the element beforehand) will be
+ *        removed (unset) from the element's styling.
+ * @param classes A key/value style map of CSS classes that will be added to the given element.
+ *        Any missing classes (that have already been applied to the element beforehand) will be
+ *        removed (unset) from the element's list of CSS classes.
  */
-export function elementStyle<T>(index: number, value: {[styleName: string]: any} | null): void {
-  updateElementStyleMap(getStylingContext(index), value);
+export function elementStylingMap<T>(
+    index: number, styles: {[styleName: string]: any} | null,
+    classes?: {[key: string]: any} | string | null): void {
+  updateStylingMap(getStylingContext(index), styles, classes);
 }
 
 //////////////////////////
@@ -1476,7 +1457,7 @@ export function text(index: number, value?: any): void {
 export function textBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
     ngDevMode && assertDataInRange(index + HEADER_OFFSET);
-    const existingNode = load(index) as LTextNode;
+    const existingNode = loadElement(index) as any as LTextNode;
     ngDevMode && assertDefined(existingNode, 'LNode should exist');
     ngDevMode && assertDefined(existingNode.native, 'native element should exist');
     ngDevMode && ngDevMode.rendererSetText++;
@@ -1758,7 +1739,7 @@ export function container(
  * @param index The index of the container in the data array
  */
 export function containerRefreshStart(index: number): void {
-  previousOrParentNode = load(index) as LNode;
+  previousOrParentNode = loadElement(index) as LNode;
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
   isParent = true;
   (previousOrParentNode as LContainerNode).data[ACTIVE_INDEX] = 0;
@@ -2541,17 +2522,6 @@ export function store<T>(index: number, value: T): void {
   viewData[adjustedIndex] = value;
 }
 
-/** Retrieves a value from current `viewData`. */
-export function load<T>(index: number): T {
-  return loadInternal<T>(index, viewData);
-}
-
-/** Retrieves a value from any `LViewData`. */
-export function loadInternal<T>(index: number, arr: LViewData): T {
-  ngDevMode && assertDataInRange(index + HEADER_OFFSET, arr);
-  return arr[index + HEADER_OFFSET];
-}
-
 /** Retrieves a value from the `directives` array. */
 export function loadDirective<T>(index: number): T {
   ngDevMode && assertDefined(directives, 'Directives array should be defined if reading a dir.');
@@ -2568,6 +2538,15 @@ export function loadQueryList<T>(queryListIdx: number): QueryList<T> {
   return viewData[CONTENT_QUERIES] ![queryListIdx];
 }
 
+/** Retrieves a value from current `viewData`. */
+export function load<T>(index: number): T {
+  return loadInternal<T>(index, viewData);
+}
+
+export function loadElement(index: number): LElementNode {
+  return loadElementInternal(index, viewData);
+}
+
 /** Gets the current binding value and increments the binding index. */
 export function consumeBinding(): any {
   ngDevMode && assertDataInRange(viewData[BINDING_INDEX]);
@@ -2645,7 +2624,7 @@ function assertHasParent() {
 
 function assertDataInRange(index: number, arr?: any[]) {
   if (arr == null) arr = viewData;
-  assertLessThan(index, arr ? arr.length : 0, 'index expected to be a valid data index');
+  assertDataInRangeInternal(index, arr || viewData);
 }
 
 function assertDataNext(index: number, arr?: any[]) {
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 20ddafad12..27cedbdefb 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -299,8 +299,6 @@ export type PipeTypeList =
 // failure based on types.
 export const unusedValueExportToPlacateAjd = 1;
 
-// Note this will expand once `class` is introduced to styling
 export const enum InitialStylingFlags {
-  /** Mode for matching initial style values */
-  INITIAL_STYLES = 0b00,
+  VALUES_MODE = 0b1,
 }
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index b0d3f7b8ae..b5808dd6ad 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -63,8 +63,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵi7': r3.i7,
   'ɵi8': r3.i8,
   'ɵiV': r3.iV,
-  'ɵk': r3.k,
-  'ɵkn': r3.kn,
+  'ɵcp': r3.cp,
   'ɵL': r3.L,
   'ɵld': r3.ld,
   'ɵP': r3.P,
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 41c9f14cc5..56f99d8e78 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -14,7 +14,7 @@ import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection'
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {CLEANUP, CONTAINER_INDEX, DIRECTIVES, FLAGS, HEADER_OFFSET, HOST_NODE, HookData, LViewData, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
-import {stringify} from './util';
+import {readElementValue, stringify} from './util';
 
 const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4 + unused5;
 
@@ -32,7 +32,7 @@ export function getNextLNode(node: LNode): LNode|null {
 export function getChildLNode(node: LNode): LNode|null {
   if (node.tNode.child) {
     const viewData = node.tNode.type === TNodeType.View ? node.data as LViewData : node.view;
-    return viewData[node.tNode.child.index];
+    return readElementValue(viewData[node.tNode.child.index]);
   }
   return null;
 }
@@ -50,7 +50,7 @@ export function getParentLNode(node: LNode): LElementNode|LContainerNode|LViewNo
     return containerHostIndex === -1 ? null : node.view[containerHostIndex].dynamicLContainerNode;
   }
   const parent = node.tNode.parent;
-  return parent ? node.view[parent.index] : node.view[HOST_NODE];
+  return readElementValue(parent ? node.view[parent.index] : node.view[HOST_NODE]);
 }
 
 const enum WalkLNodeTreeAction {
@@ -463,7 +463,7 @@ function removeListeners(viewData: LViewData): void {
     for (let i = 0; i < cleanup.length - 1; i += 2) {
       if (typeof cleanup[i] === 'string') {
         // This is a listener with the native renderer
-        const native = viewData[cleanup[i + 1]].native;
+        const native = readElementValue(viewData[cleanup[i + 1]]).native;
         const listener = viewData[CLEANUP] ![cleanup[i + 2]];
         native.removeEventListener(cleanup[i], listener, cleanup[i + 3]);
         i += 2;
diff --git a/packages/core/src/render3/styling.ts b/packages/core/src/render3/styling.ts
index ddae3e798a..d4e2d049da 100644
--- a/packages/core/src/render3/styling.ts
+++ b/packages/core/src/render3/styling.ts
@@ -12,66 +12,81 @@ import {Renderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces
 
 /**
  * The styling context acts as a styling manifest (shaped as an array) for determining which
- * styling properties have been assigned via the provided `updateStyleMap` and `updateStyleProp`
- * functions. There are also two initialization functions `allocStylingContext` and
- * `createStylingContextTemplate` which are used to initialize and/or clone the context.
+ * styling properties have been assigned via the provided `updateStylingMap`, `updateStyleProp`
+ * and `updateClassProp` functions. There are also two initialization functions
+ * `allocStylingContext` and `createStylingContextTemplate` which are used to initialize
+ * and/or clone the context.
  *
  * The context is an array where the first two cells are used for static data (initial styling)
  * and dirty flags / index offsets). The remaining set of cells is used for multi (map) and single
  * (prop) style values.
  *
  * each value from here onwards is mapped as so:
- * [i] = mutation/type flag for the style value
+ * [i] = mutation/type flag for the style/class value
  * [i + 1] = prop string (or null incase it has been removed)
  * [i + 2] = value string (or null incase it has been removed)
  *
  * There are three types of styling types stored in this context:
  *   initial: any styles that are passed in once the context is created
  *            (these are stored in the first cell of the array and the first
- *             value of this array is always `null` even if no initial styles exist.
+ *             value of this array is always `null` even if no initial styling exists.
  *             the `null` value is there so that any new styles have a parent to point
  *             to. This way we can always assume that there is a parent.)
  *
- *   single: any styles that are updated using `updateStyleProp` (fixed set)
+ *   single: any styles that are updated using `updateStyleProp` or `updateClassProp` (fixed set)
  *
- *   multi: any styles that are updated using `updateStyleMap` (dynamic set)
+ *   multi: any styles that are updated using `updateStylingMap` (dynamic set)
  *
- * Note that context is only used to collect style information. Only when `renderStyles`
+ * Note that context is only used to collect style information. Only when `renderStyling`
  * is called is when the styling payload will be rendered (or built as a key/value map).
  *
- * When the context is created, depending on what initial styles are passed in, the context itself
- * will be pre-filled with slots based on the initial style properties. Say for example we have a
- * series of initial styles that look like so:
+ * When the context is created, depending on what initial styling values are passed in, the
+ * context itself will be pre-filled with slots based on the initial style properties. Say
+ * for example we have a series of initial styles that look like so:
  *
  *   style="width:100px; height:200px;"
+ *   class="foo"
  *
  * Then the initial state of the context (once initialized) will look like so:
  *
  * ```
  * context = [
- *   [null, '100px', '200px'],  // property names are not needed since they have already been
+ *   [null, '100px', '200px', true],  // property names are not needed since they have already been
  * written to DOM.
  *
+ *   1, // this instructs how many `style` values there are so that class index values can be
+ * offsetted
+ *
  *   configMasterVal,
  *
- *   // 2
+ *   // 3
  *   'width',
- *   pointers(1, 8);  // Point to static `width`: `100px` and multi `width`.
+ *   pointers(1, 12);  // Point to static `width`: `100px` and multi `width`.
  *   null,
  *
- *   // 5
+ *   // 6
  *   'height',
- *   pointers(2, 11); // Point to static `height`: `200px` and multi `height`.
+ *   pointers(2, 15); // Point to static `height`: `200px` and multi `height`.
  *   null,
  *
- *   // 8
+ *   // 9
+ *   'foo',
+ *   pointers(1, 18);  // Point to static `foo`: `true` and multi `foo`.
+ *   null,
+ *
+ *   // 12
  *   'width',
- *   pointers(1, 2);  // Point to static `width`: `100px` and single `width`.
+ *   pointers(1, 3);  // Point to static `width`: `100px` and single `width`.
  *   null,
  *
- *   // 11
+ *   // 15
  *   'height',
- *   pointers(2, 5);  // Point to static `height`: `200px` and single `height`.
+ *   pointers(2, 6);  // Point to static `height`: `200px` and single `height`.
+ *   null,
+ *
+ *   // 18
+ *   'foo',
+ *   pointers(3, 9);  // Point to static `foo`: `true` and single `foo`.
  *   null,
  * ]
  *
@@ -82,30 +97,50 @@ import {Renderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces
  * }
  * ```
  *
- * The values are duplicated so that space is set aside for both multi ([style])
- * and single ([style.prop]) values. The respective config values (configValA, configValB, etc...)
- * are a combination of the StylingFlags with two index values: the `initialIndex` (which points to
- * the index location of the style value in the initial styles array in slot 0) and the
- * `dynamicIndex` (which points to the matching single/multi index position in the context array
- * for the same prop).
+ * The values are duplicated so that space is set aside for both multi ([style] and [class])
+ * and single ([style.prop] or [class.named]) values. The respective config values
+ * (configValA, configValB, etc...) are a combination of the StylingFlags with two index
+ * values: the `initialIndex` (which points to the index location of the style value in
+ * the initial styles array in slot 0) and the `dynamicIndex` (which points to the
+ * matching single/multi index position in the context array for the same prop).
  *
- * This means that every time `updateStyleProp` is called it must be called using an index value
- * (not a property string) which references the index value of the initial style when the context
- * was created. This also means that `updateStyleProp` cannot be called with a new property
- * (only `updateStyleMap` can include new CSS properties that will be added to the context).
+ * This means that every time `updateStyleProp` or `updateClassProp` are called then they
+ * must be called using an index value (not a property string) which references the index
+ * value of the initial style prop/class when the context was created. This also means that
+ * `updateStyleProp` or `updateClassProp` cannot be called with a new property (only
+ * `updateStylingMap` can include new CSS properties that will be added to the context).
  */
-export interface StylingContext extends Array<InitialStyles|number|string|null> {
+export interface StylingContext extends
+    Array<InitialStyles|number|string|boolean|LElementNode|null> {
+  /**
+   * Location of element that is used as a target for this context.
+   */
+  [0]: LElementNode|null;
+
   /**
    * Location of initial data shared by all instances of this style.
    */
-  [0]: InitialStyles;
+  [1]: InitialStyles;
 
   /**
    * A numeric value representing the configuration status (whether the context is dirty or not)
    * mixed together (using bit shifting) with a index value which tells the starting index value
    * of where the multi style entries begin.
    */
-  [1]: number;
+  [2]: number;
+
+  /**
+   * A numeric value representing the class index offset value. Whenever a single class is
+   * applied (using `elementClassProp`) it should have an styling index value that doesn't
+   * need to take into account any style values that exist in the context.
+   */
+  [3]: number;
+
+  /**
+   * The last CLASS STRING VALUE that was interpreted by elementStylingMap. This is cached
+   * So that the algorithm can exit early incase the string has not changed.
+   */
+  [4]: string|null;
 }
 
 /**
@@ -116,7 +151,7 @@ export interface StylingContext extends Array<InitialStyles|number|string|null>
  * All other entries in this array are of `string` value and correspond to the values that
  * were extracted from the `style=""` attribute in the HTML code for the provided template.
  */
-export interface InitialStyles extends Array<string|null> { [0]: null; }
+export interface InitialStyles extends Array<string|null|boolean> { [0]: null; }
 
 /**
  * Used to set the context to be dirty or not both on the master flag (position 1)
@@ -124,21 +159,31 @@ export interface InitialStyles extends Array<string|null> { [0]: null; }
  */
 export const enum StylingFlags {
   // Implies no configurations
-  None = 0b0,
+  None = 0b00,
   // Whether or not the entry or context itself is dirty
-  Dirty = 0b1,
+  Dirty = 0b01,
+  // Whether or not this is a class-based assignment
+  Class = 0b10,
   // The max amount of bits used to represent these configuration values
-  BitCountSize = 1,
+  BitCountSize = 2,
+  // There are only two bits here
+  BitMask = 0b11
 }
 
 /** Used as numeric pointer values to determine what cells to update in the `StylingContext` */
 export const enum StylingIndex {
   // Position of where the initial styles are stored in the styling context
-  InitialStylesPosition = 0,
+  ElementPosition = 0,
+  // Position of where the initial styles are stored in the styling context
+  InitialStylesPosition = 1,
   // Index of location where the start of single properties are stored. (`updateStyleProp`)
-  MasterFlagPosition = 1,
+  MasterFlagPosition = 2,
+  // Index of location where the class index offset value is located
+  ClassOffsetPosition = 3,
+  // Position of where the last string-based CSS class value was stored
+  CachedCssClassString = 4,
   // Location of single (prop) value entries are stored within the context
-  SingleStylesStartPosition = 2,
+  SingleStylesStartPosition = 5,
   // Multi and single entries are stored in `StylingContext` as: Flag; PropertyName;  PropertyValue
   FlagsOffset = 0,
   PropertyOffset = 1,
@@ -157,9 +202,12 @@ export const enum StylingIndex {
  * A pre-computed template is designed to be computed once for a given element
  * (instructions.ts has logic for caching this).
  */
-export function allocStylingContext(templateStyleContext: StylingContext): StylingContext {
+export function allocStylingContext(
+    lElement: LElementNode | null, templateStyleContext: StylingContext): StylingContext {
   // each instance gets a copy
-  return templateStyleContext.slice() as any as StylingContext;
+  const context = templateStyleContext.slice() as any as StylingContext;
+  context[StylingIndex.ElementPosition] = lElement;
+  return context;
 }
 
 /**
@@ -176,38 +224,74 @@ export function allocStylingContext(templateStyleContext: StylingContext): Styli
  *    -> ['width', 'height', SPECIAL_ENUM_VAL, 'width', '100px']
  *       This implies that `width` and `height` will be later styled and that the `width`
  *       property has an initial value of `100px`.
+ *
+ * @param initialClassDeclarations a list of class declarations and initial class values
+ *    that are used later within the styling context.
+ *
+ *    -> ['foo', 'bar', SPECIAL_ENUM_VAL, 'foo', true]
+ *       This implies that `foo` and `bar` will be later styled and that the `foo`
+ *       class will be applied to the element as an initial class since it's true
  */
 export function createStylingContextTemplate(
-    initialStyleDeclarations?: (string | InitialStylingFlags)[] | null): StylingContext {
-  const initialStyles: InitialStyles = [null];
-  const context: StylingContext = [initialStyles, 0];
+    initialStyleDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
+    initialClassDeclarations?: (string | boolean | InitialStylingFlags)[] | null): StylingContext {
+  const initialStylingValues: InitialStyles = [null];
+  const context: StylingContext = [null, initialStylingValues, 0, 0, null];
 
-  const indexLookup: {[key: string]: number} = {};
+  // we use two maps since a class name might collide with a CSS style prop
+  const stylesLookup: {[key: string]: number} = {};
+  const classesLookup: {[key: string]: number} = {};
+
+  let totalStyleDeclarations = 0;
   if (initialStyleDeclarations) {
     let hasPassedDeclarations = false;
     for (let i = 0; i < initialStyleDeclarations.length; i++) {
       const v = initialStyleDeclarations[i] as string | InitialStylingFlags;
 
       // this flag value marks where the declarations end the initial values begin
-      if (v === InitialStylingFlags.INITIAL_STYLES) {
+      if (v === InitialStylingFlags.VALUES_MODE) {
         hasPassedDeclarations = true;
       } else {
         const prop = v as string;
         if (hasPassedDeclarations) {
           const value = initialStyleDeclarations[++i] as string;
-          initialStyles.push(value);
-          indexLookup[prop] = initialStyles.length - 1;
+          initialStylingValues.push(value);
+          stylesLookup[prop] = initialStylingValues.length - 1;
         } else {
-          // it's safe to use `0` since the default initial value for
-          // each property will always be null (which is at position 0)
-          indexLookup[prop] = 0;
+          totalStyleDeclarations++;
+          stylesLookup[prop] = 0;
         }
       }
     }
   }
 
-  const allProps = Object.keys(indexLookup);
-  const totalProps = allProps.length;
+  // make where the class offsets begin
+  context[StylingIndex.ClassOffsetPosition] = totalStyleDeclarations;
+
+  if (initialClassDeclarations) {
+    let hasPassedDeclarations = false;
+    for (let i = 0; i < initialClassDeclarations.length; i++) {
+      const v = initialClassDeclarations[i] as string | boolean | InitialStylingFlags;
+      // this flag value marks where the declarations end the initial values begin
+      if (v === InitialStylingFlags.VALUES_MODE) {
+        hasPassedDeclarations = true;
+      } else {
+        const className = v as string;
+        if (hasPassedDeclarations) {
+          const value = initialClassDeclarations[++i] as boolean;
+          initialStylingValues.push(value);
+          classesLookup[className] = initialStylingValues.length - 1;
+        } else {
+          classesLookup[className] = 0;
+        }
+      }
+    }
+  }
+
+  const styleProps = Object.keys(stylesLookup);
+  const classNames = Object.keys(classesLookup);
+  const classNamesIndexStart = styleProps.length;
+  const totalProps = styleProps.length + classNames.length;
 
   // *2 because we are filling for both single and multi style spaces
   const maxLength = totalProps * StylingIndex.Size * 2 + StylingIndex.SingleStylesStartPosition;
@@ -222,86 +306,140 @@ export function createStylingContextTemplate(
   const multiStart = totalProps * StylingIndex.Size + StylingIndex.SingleStylesStartPosition;
 
   // fill single and multi-level styles
-  for (let i = 0; i < allProps.length; i++) {
-    const prop = allProps[i];
+  for (let i = 0; i < totalProps; i++) {
+    const isClassBased = i >= classNamesIndexStart;
+    const prop = isClassBased ? classNames[i - classNamesIndexStart] : styleProps[i];
+    const indexForInitial = isClassBased ? classesLookup[prop] : stylesLookup[prop];
+    const initialValue = initialStylingValues[indexForInitial];
 
-    const indexForInitial = indexLookup[prop];
     const indexForMulti = i * StylingIndex.Size + multiStart;
     const indexForSingle = i * StylingIndex.Size + singleStart;
+    const initialFlag = isClassBased ? StylingFlags.Class : StylingFlags.None;
 
-    setFlag(context, indexForSingle, pointers(StylingFlags.None, indexForInitial, indexForMulti));
+    setFlag(context, indexForSingle, pointers(initialFlag, indexForInitial, indexForMulti));
     setProp(context, indexForSingle, prop);
     setValue(context, indexForSingle, null);
 
-    setFlag(context, indexForMulti, pointers(StylingFlags.Dirty, indexForInitial, indexForSingle));
+    const flagForMulti =
+        initialFlag | (initialValue !== null ? StylingFlags.Dirty : StylingFlags.None);
+    setFlag(context, indexForMulti, pointers(flagForMulti, indexForInitial, indexForSingle));
     setProp(context, indexForMulti, prop);
     setValue(context, indexForMulti, null);
   }
 
-  // there is no initial value flag for the master index since it doesn't reference an initial style
-  // value
+  // there is no initial value flag for the master index since it doesn't
+  // reference an initial style value
   setFlag(context, StylingIndex.MasterFlagPosition, pointers(0, 0, multiStart));
-  setContextDirty(context, initialStyles.length > 1);
+  setContextDirty(context, initialStylingValues.length > 1);
 
   return context;
 }
 
 const EMPTY_ARR: any[] = [];
+const EMPTY_OBJ: {[key: string]: any} = {};
 /**
- * Sets and resolves all `multi` styles on an `StylingContext` so that they can be
- * applied to the element once `renderStyles` is called.
+ * Sets and resolves all `multi` styling on an `StylingContext` so that they can be
+ * applied to the element once `renderStyling` is called.
  *
- * All missing styles (any values that are not provided in the new `styles` param)
- * will resolve to `null` within their respective positions in the context.
+ * All missing styles/class (any values that are not provided in the new `styles`
+ * or `classes` params) will resolve to `null` within their respective positions
+ * in the context.
  *
  * @param context The styling context that will be updated with the
  *    newly provided style values.
  * @param styles The key/value map of CSS styles that will be used for the update.
+ * @param classes The key/value map of CSS class names that will be used for the update.
  */
-export function updateStyleMap(context: StylingContext, styles: {[key: string]: any} | null): void {
-  const propsToApply = styles ? Object.keys(styles) : EMPTY_ARR;
+export function updateStylingMap(
+    context: StylingContext, styles: {[key: string]: any} | null,
+    classes?: {[key: string]: any} | string | null): void {
+  let classNames: string[] = EMPTY_ARR;
+  let applyAllClasses = false;
+  let ignoreAllClassUpdates = false;
+
+  // each time a string-based value pops up then it shouldn't require a deep
+  // check of what's changed.
+  if (typeof classes == 'string') {
+    const cachedClassString = context[StylingIndex.CachedCssClassString] as string | null;
+    if (cachedClassString && cachedClassString === classes) {
+      ignoreAllClassUpdates = true;
+    } else {
+      context[StylingIndex.CachedCssClassString] = classes;
+      classNames = classes.split(/\s+/);
+      // this boolean is used to avoid having to create a key/value map of `true` values
+      // since a classname string implies that all those classes are added
+      applyAllClasses = true;
+    }
+  } else {
+    classNames = classes ? Object.keys(classes) : EMPTY_ARR;
+    context[StylingIndex.CachedCssClassString] = null;
+  }
+
+  classes = (classes || EMPTY_OBJ) as{[key: string]: any};
+
+  const styleProps = styles ? Object.keys(styles) : EMPTY_ARR;
+  styles = styles || EMPTY_OBJ;
+
+  const classesStartIndex = styleProps.length;
   const multiStartIndex = getMultiStartIndex(context);
 
   let dirty = false;
   let ctxIndex = multiStartIndex;
+
   let propIndex = 0;
+  const propLimit = styleProps.length + classNames.length;
 
   // the main loop here will try and figure out how the shape of the provided
-  // styles differ with respect to the context. Later if the context/styles are
-  // off-balance then they will be dealt in another loop after this one
-  while (ctxIndex < context.length && propIndex < propsToApply.length) {
-    const flag = getPointers(context, ctxIndex);
-    const prop = getProp(context, ctxIndex);
-    const value = getValue(context, ctxIndex);
+  // styles differ with respect to the context. Later if the context/styles/classes
+  // are off-balance then they will be dealt in another loop after this one
+  while (ctxIndex < context.length && propIndex < propLimit) {
+    const isClassBased = propIndex >= classesStartIndex;
 
-    const newProp = propsToApply[propIndex];
-    const newValue = styles ![newProp];
-    if (prop === newProp) {
-      if (value !== newValue) {
-        setValue(context, ctxIndex, newValue);
-        const initialValue = getInitialValue(context, flag);
+    // when there is a cache-hit for a string-based class then we should
+    // avoid doing any work diffing any of the changes
+    if (!ignoreAllClassUpdates || !isClassBased) {
+      const adjustedPropIndex = isClassBased ? propIndex - classesStartIndex : propIndex;
+      const newProp: string =
+          isClassBased ? classNames[adjustedPropIndex] : styleProps[adjustedPropIndex];
+      const newValue: string|boolean =
+          isClassBased ? (applyAllClasses ? true : classes[newProp]) : styles[newProp];
 
-        // there is no point in setting this to dirty if the previously
-        // rendered value was being referenced by the initial style (or null)
-        if (initialValue !== newValue) {
-          setDirty(context, ctxIndex, true);
-          dirty = true;
-        }
-      }
-    } else {
-      const indexOfEntry = findEntryPositionByProp(context, newProp, ctxIndex);
-      if (indexOfEntry > 0) {
-        // it was found at a later point ... just swap the values
-        swapMultiContextEntries(context, ctxIndex, indexOfEntry);
+      const prop = getProp(context, ctxIndex);
+      if (prop === newProp) {
+        const value = getValue(context, ctxIndex);
         if (value !== newValue) {
           setValue(context, ctxIndex, newValue);
-          dirty = true;
+
+          const flag = getPointers(context, ctxIndex);
+          const initialValue = getInitialValue(context, flag);
+
+          // there is no point in setting this to dirty if the previously
+          // rendered value was being referenced by the initial style (or null)
+          if (initialValue !== newValue) {
+            setDirty(context, ctxIndex, true);
+            dirty = true;
+          }
         }
       } else {
-        // we only care to do this if the insertion is in the middle
-        const doShift = ctxIndex < context.length;
-        insertNewMultiProperty(context, ctxIndex, newProp, newValue);
-        dirty = true;
+        const indexOfEntry = findEntryPositionByProp(context, newProp, ctxIndex);
+        if (indexOfEntry > 0) {
+          // it was found at a later point ... just swap the values
+          const valueToCompare = getValue(context, indexOfEntry);
+          const flagToCompare = getPointers(context, indexOfEntry);
+          swapMultiContextEntries(context, ctxIndex, indexOfEntry);
+          if (valueToCompare !== newValue) {
+            const initialValue = getInitialValue(context, flagToCompare);
+            setValue(context, ctxIndex, newValue);
+            if (initialValue !== newValue) {
+              setDirty(context, ctxIndex, true);
+              dirty = true;
+            }
+          }
+        } else {
+          // we only care to do this if the insertion is in the middle
+          insertNewMultiProperty(context, ctxIndex, isClassBased, newProp, newValue);
+          dirty = true;
+        }
       }
     }
 
@@ -310,11 +448,16 @@ export function updateStyleMap(context: StylingContext, styles: {[key: string]:
   }
 
   // this means that there are left-over values in the context that
-  // were not included in the provided styles and in this case the
-  // goal is to "remove" them from the context (by nullifying)
+  // were not included in the provided styles/classes and in this
+  // case the  goal is to "remove" them from the context (by nullifying)
   while (ctxIndex < context.length) {
-    const value = context[ctxIndex + StylingIndex.ValueOffset];
-    if (value !== null) {
+    const flag = getPointers(context, ctxIndex);
+    const isClassBased = (flag & StylingFlags.Class) === StylingFlags.Class;
+    if (ignoreAllClassUpdates && isClassBased) break;
+
+    const value = getValue(context, ctxIndex);
+    const doRemoveValue = valueExists(value, isClassBased);
+    if (doRemoveValue) {
       setDirty(context, ctxIndex, true);
       setValue(context, ctxIndex, null);
       dirty = true;
@@ -322,13 +465,19 @@ export function updateStyleMap(context: StylingContext, styles: {[key: string]:
     ctxIndex += StylingIndex.Size;
   }
 
-  // this means that there are left-over property in the context that
+  // this means that there are left-over properties in the context that
   // were not detected in the context during the loop above. In that
   // case we want to add the new entries into the list
-  while (propIndex < propsToApply.length) {
-    const prop = propsToApply[propIndex];
-    const value = styles ![prop];
-    context.push(StylingFlags.Dirty, prop, value);
+  while (propIndex < propLimit) {
+    const isClassBased = propIndex >= classesStartIndex;
+    if (ignoreAllClassUpdates && isClassBased) break;
+
+    const adjustedPropIndex = isClassBased ? propIndex - classesStartIndex : propIndex;
+    const prop = isClassBased ? classNames[adjustedPropIndex] : styleProps[adjustedPropIndex];
+    const value: string|boolean =
+        isClassBased ? (applyAllClasses ? true : classes[prop]) : styles[prop];
+    const flag = StylingFlags.Dirty | (isClassBased ? StylingFlags.Class : StylingFlags.None);
+    context.push(flag, prop, value);
     propIndex++;
     dirty = true;
   }
@@ -339,13 +488,13 @@ export function updateStyleMap(context: StylingContext, styles: {[key: string]:
 }
 
 /**
- * Sets and resolves a single CSS style on a property on an `StylingContext` so that they
- * can be applied to the element once `renderElementStyles` is called.
+ * Sets and resolves a single styling property/value on the provided `StylingContext` so
+ * that they can be applied to the element once `renderStyling` is called.
  *
- * Note that prop-level styles are considered higher priority than styles that are applied
- * using `updateStyleMap`, therefore, when styles are rendered then any styles that
- * have been applied using this function will be considered first (then multi values second
- * and then initial values as a backup).
+ * Note that prop-level styling values are considered higher priority than any styling that
+ * has been applied using `updateStylingMap`, therefore, when styling values are rendered
+ * then any styles/classes that have been applied using this function will be considered first
+ * (then multi values second and then initial values as a backup).
  *
  * @param context The styling context that will be updated with the
  *    newly provided style value.
@@ -353,7 +502,7 @@ export function updateStyleMap(context: StylingContext, styles: {[key: string]:
  * @param value The CSS style value that will be assigned
  */
 export function updateStyleProp(
-    context: StylingContext, index: number, value: string | null): void {
+    context: StylingContext, index: number, value: string | boolean | null): void {
   const singleIndex = StylingIndex.SingleStylesStartPosition + index * StylingIndex.Size;
   const currValue = getValue(context, singleIndex);
   const currFlag = getPointers(context, singleIndex);
@@ -370,8 +519,10 @@ export function updateStyleProp(
       let multiDirty = false;
       let singleDirty = true;
 
+      const isClassBased = (currFlag & StylingFlags.Class) === StylingFlags.Class;
+
       // only when the value is set to `null` should the multi-value get flagged
-      if (value == null && valueForMulti) {
+      if (!valueExists(value, isClassBased) && valueExists(valueForMulti, isClassBased)) {
         multiDirty = true;
         singleDirty = false;
       }
@@ -384,12 +535,28 @@ export function updateStyleProp(
 }
 
 /**
- * Renders all queued styles using a renderer onto the given element.
+ * This method will toggle the referenced CSS class (by the provided index)
+ * within the given context.
+ *
+ * @param context The styling context that will be updated with the
+ *    newly provided class value.
+ * @param index The index of the CSS class which is being updated.
+ * @param addOrRemove Whether or not to add or remove the CSS class
+ */
+export function updateClassProp(
+    context: StylingContext, index: number, addOrRemove: boolean): void {
+  const adjustedIndex = index + context[StylingIndex.ClassOffsetPosition];
+  updateStyleProp(context, adjustedIndex, addOrRemove);
+}
+
+/**
+ * Renders all queued styling using a renderer onto the given element.
  *
  * This function works by rendering any styles (that have been applied
- * using `updateStyleMap` and `updateStyleProp`) onto the
- * provided element using the provided renderer. Just before the styles
- * are rendered a final key/value style map will be assembled.
+ * using `updateStylingMap`) and any classes (that have been applied using
+ * `updateStyleProp`) onto the provided element using the provided renderer.
+ * Just before the styles/classes are rendered a final key/value style map
+ * will be assembled (if `styleStore` or `classStore` are provided).
  *
  * @param lElement the element that the styles will be rendered on
  * @param context The styling context that will be used to determine
@@ -397,13 +564,14 @@ export function updateStyleProp(
  * @param renderer the renderer that will be used to apply the styling
  * @param styleStore if provided, the updated style values will be applied
  *    to this key/value map instead of being renderered via the renderer.
- * @returns an object literal. `{ color: 'red', height: 'auto'}`.
+ * @param classStore if provided, the updated class values will be applied
+ *    to this key/value map instead of being renderered via the renderer.
  */
-export function renderStyles(
-    lElement: LElementNode, context: StylingContext, renderer: Renderer3,
-    styleStore?: {[key: string]: any}) {
+export function renderStyling(
+    context: StylingContext, renderer: Renderer3, styleStore?: {[key: string]: any},
+    classStore?: {[key: string]: boolean}) {
   if (isContextDirty(context)) {
-    const native = lElement.native;
+    const native = context[StylingIndex.ElementPosition] !.native;
     const multiStartIndex = getMultiStartIndex(context);
     for (let i = StylingIndex.SingleStylesStartPosition; i < context.length;
          i += StylingIndex.Size) {
@@ -412,27 +580,35 @@ export function renderStyles(
         const prop = getProp(context, i);
         const value = getValue(context, i);
         const flag = getPointers(context, i);
+        const isClassBased = flag & StylingFlags.Class ? true : false;
         const isInSingleRegion = i < multiStartIndex;
 
-        let styleToApply: string|null = value;
+        let valueToApply: string|boolean|null = value;
 
-        // STYLE DEFER CASE 1: Use a multi value instead of a null single value
+        // VALUE DEFER CASE 1: Use a multi value instead of a null single value
         // this check implies that a single value was removed and we
         // should now defer to a multi value and use that (if set).
-        if (isInSingleRegion && styleToApply == null) {
+        if (isInSingleRegion && !valueExists(valueToApply, isClassBased)) {
           // single values ALWAYS have a reference to a multi index
           const multiIndex = getMultiOrSingleIndex(flag);
-          styleToApply = getValue(context, multiIndex);
+          valueToApply = getValue(context, multiIndex);
         }
 
-        // STYLE DEFER CASE 2: Use the initial value if all else fails (is null)
+        // VALUE DEFER CASE 2: Use the initial value if all else fails (is falsy)
         // the initial value will always be a string or null,
         // therefore we can safely adopt it incase there's nothing else
-        if (styleToApply == null) {
-          styleToApply = getInitialValue(context, flag);
+        // note that this should always be a falsy check since `false` is used
+        // for both class and style comparisons (styles can't be false and false
+        // classes are turned off and should therefore defer to their initial values)
+        if (!valueExists(valueToApply, isClassBased)) {
+          valueToApply = getInitialValue(context, flag);
         }
 
-        setStyle(native, prop, styleToApply, renderer, styleStore);
+        if (isClassBased) {
+          setClass(native, prop, valueToApply ? true : false, renderer, classStore);
+        } else {
+          setStyle(native, prop, valueToApply as string | null, renderer, styleStore);
+        }
         setDirty(context, i, false);
       }
     }
@@ -443,7 +619,7 @@ export function renderStyles(
 
 /**
  * This function renders a given CSS prop/value entry using the
- * provided renderer. If a `styleStore` value is provided then
+ * provided renderer. If a `store` value is provided then
  * that will be used a render context instead of the provided
  * renderer.
  *
@@ -451,23 +627,51 @@ export function renderStyles(
  * @param prop the CSS style property that will be rendered
  * @param value the CSS style value that will be rendered
  * @param renderer
- * @param styleStore an optional key/value map that will be used as a context to render styles on
+ * @param store an optional key/value map that will be used as a context to render styles on
  */
 function setStyle(
     native: any, prop: string, value: string | null, renderer: Renderer3,
-    styleStore?: {[key: string]: any}) {
-  if (styleStore) {
-    styleStore[prop] = value;
-  } else if (value == null) {
-    ngDevMode && ngDevMode.rendererRemoveStyle++;
-    isProceduralRenderer(renderer) ?
-        renderer.removeStyle(native, prop, RendererStyleFlags3.DashCase) :
-        native['style'].removeProperty(prop);
-  } else {
+    store?: {[key: string]: any}) {
+  if (store) {
+    store[prop] = value;
+  } else if (value) {
     ngDevMode && ngDevMode.rendererSetStyle++;
     isProceduralRenderer(renderer) ?
         renderer.setStyle(native, prop, value, RendererStyleFlags3.DashCase) :
         native['style'].setProperty(prop, value);
+  } else {
+    ngDevMode && ngDevMode.rendererRemoveStyle++;
+    isProceduralRenderer(renderer) ?
+        renderer.removeStyle(native, prop, RendererStyleFlags3.DashCase) :
+        native['style'].removeProperty(prop);
+  }
+}
+
+/**
+ * This function renders a given CSS class value using the provided
+ * renderer (by adding or removing it from the provided element).
+ * If a `store` value is provided then that will be used a render
+ * context instead of the provided renderer.
+ *
+ * @param native the DOM Element
+ * @param prop the CSS style property that will be rendered
+ * @param value the CSS style value that will be rendered
+ * @param renderer
+ * @param store an optional key/value map that will be used as a context to render styles on
+ */
+function setClass(
+    native: any, className: string, add: boolean, renderer: Renderer3,
+    store?: {[key: string]: boolean}) {
+  if (store) {
+    store[className] = add;
+  } else if (add) {
+    ngDevMode && ngDevMode.rendererAddClass++;
+    isProceduralRenderer(renderer) ? renderer.addClass(native, className) :
+                                     native['classList'].add(className);
+  } else {
+    ngDevMode && ngDevMode.rendererRemoveClass++;
+    isProceduralRenderer(renderer) ? renderer.removeClass(native, className) :
+                                     native['classList'].remove(className);
   }
 }
 
@@ -487,8 +691,14 @@ function isDirty(context: StylingContext, index: number): boolean {
   return ((context[adjustedIndex] as number) & StylingFlags.Dirty) == StylingFlags.Dirty;
 }
 
+function isClassBased(context: StylingContext, index: number): boolean {
+  const adjustedIndex =
+      index >= StylingIndex.SingleStylesStartPosition ? (index + StylingIndex.FlagsOffset) : index;
+  return ((context[adjustedIndex] as number) & StylingFlags.Class) == StylingFlags.Class;
+}
+
 function pointers(configFlag: number, staticIndex: number, dynamicIndex: number) {
-  return (configFlag & StylingFlags.Dirty) | (staticIndex << StylingFlags.BitCountSize) |
+  return (configFlag & StylingFlags.BitMask) | (staticIndex << StylingFlags.BitCountSize) |
       (dynamicIndex << (StylingIndex.BitCountSize + StylingFlags.BitCountSize));
 }
 
@@ -515,7 +725,7 @@ function setProp(context: StylingContext, index: number, prop: string) {
   context[index + StylingIndex.PropertyOffset] = prop;
 }
 
-function setValue(context: StylingContext, index: number, value: string | null) {
+function setValue(context: StylingContext, index: number, value: string | null | boolean) {
   context[index + StylingIndex.ValueOffset] = value;
 }
 
@@ -531,8 +741,8 @@ function getPointers(context: StylingContext, index: number): number {
   return context[adjustedIndex] as number;
 }
 
-function getValue(context: StylingContext, index: number): string|null {
-  return context[index + StylingIndex.ValueOffset] as string | null;
+function getValue(context: StylingContext, index: number): string|boolean|null {
+  return context[index + StylingIndex.ValueOffset] as string | boolean | null;
 }
 
 function getProp(context: StylingContext, index: number): string {
@@ -597,20 +807,23 @@ function updateSinglePointerValues(context: StylingContext, indexStartPosition:
     if (singleIndex > 0) {
       const singleFlag = getPointers(context, singleIndex);
       const initialIndexForSingle = getInitialIndex(singleFlag);
-      const updatedFlag = pointers(
-          isDirty(context, singleIndex) ? StylingFlags.Dirty : StylingFlags.None,
-          initialIndexForSingle, i);
+      const flagValue = (isDirty(context, singleIndex) ? StylingFlags.Dirty : StylingFlags.None) |
+          (isClassBased(context, singleIndex) ? StylingFlags.Class : StylingFlags.None);
+      const updatedFlag = pointers(flagValue, initialIndexForSingle, i);
       setFlag(context, singleIndex, updatedFlag);
     }
   }
 }
 
 function insertNewMultiProperty(
-    context: StylingContext, index: number, name: string, value: string): void {
+    context: StylingContext, index: number, classBased: boolean, name: string,
+    value: string | boolean): void {
   const doShift = index < context.length;
 
   // prop does not exist in the list, add it in
-  context.splice(index, 0, StylingFlags.Dirty, name, value);
+  context.splice(
+      index, 0, StylingFlags.Dirty | (classBased ? StylingFlags.Class : StylingFlags.None), name,
+      value);
 
   if (doShift) {
     // because the value was inserted midway into the array then we
@@ -619,3 +832,10 @@ function insertNewMultiProperty(
     updateSinglePointerValues(context, index + StylingIndex.Size);
   }
 }
+
+function valueExists(value: string | null | boolean, isClassBased?: boolean) {
+  if (isClassBased) {
+    return value ? true : false;
+  }
+  return value !== null;
+}
diff --git a/packages/core/src/render3/util.ts b/packages/core/src/render3/util.ts
index 3688f68c89..22e73caeb2 100644
--- a/packages/core/src/render3/util.ts
+++ b/packages/core/src/render3/util.ts
@@ -5,6 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import {assertLessThan} from './assert';
+import {LElementNode} from './interfaces/node';
+import {HEADER_OFFSET, LViewData} from './interfaces/view';
+
 
 /**
 * Must use this method for CD (instead of === ) since NaN !== NaN
@@ -56,3 +60,27 @@ export function flatten(list: any[]): any[] {
 
   return result;
 }
+
+/** Retrieves a value from any `LViewData`. */
+export function loadInternal<T>(index: number, arr: LViewData): T {
+  ngDevMode && assertDataInRangeInternal(index + HEADER_OFFSET, arr);
+  return arr[index + HEADER_OFFSET];
+}
+
+export function assertDataInRangeInternal(index: number, arr: any[]) {
+  assertLessThan(index, arr ? arr.length : 0, 'index expected to be a valid data index');
+}
+
+/** Retrieves an element value from the provided `viewData`.
+  *
+  * Elements that are read may be wrapped in a style context,
+  * therefore reading the value may involve unwrapping that.
+  */
+export function loadElementInternal(index: number, arr: LViewData): LElementNode {
+  const value = loadInternal<LElementNode>(index, arr);
+  return readElementValue(value);
+}
+
+export function readElementValue(value: LElementNode | any[]): LElementNode {
+  return (Array.isArray(value) ? (value as any as any[])[0] : value) as LElementNode;
+}
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index f2c007b7b3..5914081fe2 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -191,6 +191,9 @@
   {
     "name": "namespaceHTML"
   },
+  {
+    "name": "readElementValue"
+  },
   {
     "name": "refreshChildComponents"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index ba013de043..86469d9074 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -119,6 +119,9 @@
   {
     "name": "RecordViewTuple"
   },
+  {
+    "name": "RendererStyleFlags3"
+  },
   {
     "name": "SANITIZER"
   },
@@ -206,6 +209,15 @@
   {
     "name": "_c16"
   },
+  {
+    "name": "_c17"
+  },
+  {
+    "name": "_c18"
+  },
+  {
+    "name": "_c19"
+  },
   {
     "name": "_c2"
   },
@@ -260,6 +272,9 @@
   {
     "name": "addToViewTree"
   },
+  {
+    "name": "allocStylingContext"
+  },
   {
     "name": "appendChild"
   },
@@ -332,6 +347,9 @@
   {
     "name": "createRootContext"
   },
+  {
+    "name": "createStylingContextTemplate"
+  },
   {
     "name": "createTNode"
   },
@@ -344,6 +362,9 @@
   {
     "name": "createViewQuery"
   },
+  {
+    "name": "currentElementNode"
+  },
   {
     "name": "defineComponent"
   },
@@ -378,7 +399,7 @@
     "name": "domRendererFactory3"
   },
   {
-    "name": "elementClassNamed"
+    "name": "elementClassProp"
   },
   {
     "name": "elementEnd"
@@ -389,6 +410,12 @@
   {
     "name": "elementStart"
   },
+  {
+    "name": "elementStyling"
+  },
+  {
+    "name": "elementStylingApply"
+  },
   {
     "name": "enterView"
   },
@@ -446,9 +473,21 @@
   {
     "name": "getCurrentSanitizer"
   },
+  {
+    "name": "getInitialIndex"
+  },
+  {
+    "name": "getInitialValue"
+  },
   {
     "name": "getLViewChild"
   },
+  {
+    "name": "getMultiOrSingleIndex"
+  },
+  {
+    "name": "getMultiStartIndex"
+  },
   {
     "name": "getNextLNode"
   },
@@ -479,12 +518,18 @@
   {
     "name": "getParentState"
   },
+  {
+    "name": "getPointers"
+  },
   {
     "name": "getPreviousIndex"
   },
   {
     "name": "getPreviousOrParentNode"
   },
+  {
+    "name": "getProp"
+  },
   {
     "name": "getRenderFlags"
   },
@@ -494,6 +539,9 @@
   {
     "name": "getRootView"
   },
+  {
+    "name": "getStylingContext"
+  },
   {
     "name": "getSymbolIterator"
   },
@@ -506,6 +554,9 @@
   {
     "name": "getTypeNameForDebugging$1"
   },
+  {
+    "name": "getValue"
+  },
   {
     "name": "hostElement"
   },
@@ -536,6 +587,9 @@
   {
     "name": "invertObject"
   },
+  {
+    "name": "isContextDirty"
+  },
   {
     "name": "isCssClassMatching"
   },
@@ -545,6 +599,9 @@
   {
     "name": "isDifferent"
   },
+  {
+    "name": "isDirty"
+  },
   {
     "name": "isJsObject"
   },
@@ -575,6 +632,12 @@
   {
     "name": "load"
   },
+  {
+    "name": "loadElement"
+  },
+  {
+    "name": "loadElementInternal"
+  },
   {
     "name": "loadInternal"
   },
@@ -602,6 +665,9 @@
   {
     "name": "notImplemented"
   },
+  {
+    "name": "pointers"
+  },
   {
     "name": "projectionNodeStack"
   },
@@ -626,6 +692,9 @@
   {
     "name": "queueViewHooks"
   },
+  {
+    "name": "readElementValue"
+  },
   {
     "name": "refreshChildComponents"
   },
@@ -653,6 +722,9 @@
   {
     "name": "renderEmbeddedTemplate"
   },
+  {
+    "name": "renderStyling"
+  },
   {
     "name": "resetApplicationState"
   },
@@ -677,9 +749,21 @@
   {
     "name": "searchMatchesQueuedForCreation"
   },
+  {
+    "name": "setClass"
+  },
+  {
+    "name": "setContextDirty"
+  },
   {
     "name": "setCurrentInjector"
   },
+  {
+    "name": "setDirty"
+  },
+  {
+    "name": "setFlag"
+  },
   {
     "name": "setHostBindings"
   },
@@ -689,9 +773,18 @@
   {
     "name": "setInputsFromAttrs"
   },
+  {
+    "name": "setProp"
+  },
+  {
+    "name": "setStyle"
+  },
   {
     "name": "setUpAttributes"
   },
+  {
+    "name": "setValue"
+  },
   {
     "name": "storeCleanupFn"
   },
@@ -725,9 +818,18 @@
   {
     "name": "trackByIdentity"
   },
+  {
+    "name": "updateClassProp"
+  },
+  {
+    "name": "updateStyleProp"
+  },
   {
     "name": "updateViewQuery"
   },
+  {
+    "name": "valueExists"
+  },
   {
     "name": "viewAttached"
   },
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index 06ee01368b..1d1c8dd41a 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -15,7 +15,6 @@ import {ComponentDefInternal, InitialStylingFlags} from '../../../src/render3/in
 import {ComponentFixture, renderComponent, toHtml} from '../render_util';
 
 
-
 /// See: `normative.md`
 describe('elements', () => {
   // Saving type as $any$, etc to simplify testing for compiler, as types aren't saved
@@ -271,6 +270,7 @@ describe('elements', () => {
     });
 
     it('should bind to a specific class', () => {
+      const c1: (string | InitialStylingFlags | boolean)[] = ['foo'];
       type $MyComponent$ = MyComponent;
 
       @Component({selector: 'my-component', template: `<div [class.foo]="someFlag"></div>`})
@@ -283,10 +283,13 @@ describe('elements', () => {
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'div');
+              $r3$.ɵE(0, 'div');
+              $r3$.ɵs(null, c1);
+              $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵkn(0, 'foo', $r3$.ɵb(ctx.someFlag));
+              $r3$.ɵcp(0, 0, ctx.someFlag);
+              $r3$.ɵsa(0);
             }
           }
         });
@@ -320,13 +323,13 @@ describe('elements', () => {
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
               $r3$.ɵE(0, 'div');
-              $r3$.ɵs(1, c0);
+              $r3$.ɵs(c0);
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsp(1, 0, ctx.someColor);
-              $r3$.ɵsp(1, 1, ctx.someWidth, 'px');
-              $r3$.ɵsa(1);
+              $r3$.ɵsp(0, 0, ctx.someColor);
+              $r3$.ɵsp(0, 1, ctx.someWidth, 'px');
+              $r3$.ɵsa(0);
             }
           }
         });
@@ -353,7 +356,9 @@ describe('elements', () => {
     it('should bind to many and keep order', () => {
       type $MyComponent$ = MyComponent;
 
-      const c0 = ['color', InitialStylingFlags.INITIAL_STYLES, 'color', 'red'];
+      const c0 = ['color', InitialStylingFlags.VALUES_MODE, 'color', 'red'];
+      const c1 = ['foo'];
+
       @Component({
         selector: 'my-component',
         template:
@@ -369,12 +374,13 @@ describe('elements', () => {
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
               $r3$.ɵE(0, 'div');
-              $r3$.ɵs(1, c0);
+              $r3$.ɵs(c0, c1);
               $r3$.ɵe();
             }
             if (rf & 2) {
               $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.someString + 1));
-              $r3$.ɵkn(0, 'foo', $r3$.ɵb(ctx.someString == 'initial'));
+              $r3$.ɵcp(0, 0, ctx.someString == 'initial');
+              $r3$.ɵsa(0);
             }
           }
         });
@@ -406,13 +412,12 @@ describe('elements', () => {
           template: function StyleComponent_Template(rf: $RenderFlags$, ctx: $StyleComponent$) {
             if (rf & 1) {
               $r3$.ɵE(0, 'div');
-              $r3$.ɵs(1);
+              $r3$.ɵs();
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵk(0, $r3$.ɵb(ctx.classExp));
-              $r3$.ɵsm(1, ctx.styleExp);
-              $r3$.ɵsa(1);
+              $r3$.ɵsm(0, ctx.styleExp, ctx.classExp);
+              $r3$.ɵsa(0);
             }
           }
         });
diff --git a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
index ea57ab7674..43fea1b77b 100644
--- a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
@@ -44,17 +44,17 @@ describe('compiler sanitization', () => {
         template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
           if (rf & 1) {
             $r3$.ɵE(0, 'div');
-            $r3$.ɵs(1, ['background-image']);
+            $r3$.ɵs(['background-image']);
             $r3$.ɵe();
-            $r3$.ɵEe(2, 'img');
+            $r3$.ɵEe(1, 'img');
           }
           if (rf & 2) {
             $r3$.ɵp(0, 'innerHTML', $r3$.ɵb(ctx.innerHTML), $r3$.ɵsanitizeHtml);
             $r3$.ɵp(0, 'hidden', $r3$.ɵb(ctx.hidden));
-            $r3$.ɵsp(1, 0, ctx.style, $r3$.ɵsanitizeStyle);
-            $r3$.ɵsa(1);
-            $r3$.ɵp(2, 'src', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
-            $r3$.ɵa(2, 'srcset', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
+            $r3$.ɵsp(0, 0, ctx.style, $r3$.ɵsanitizeStyle);
+            $r3$.ɵsa(0);
+            $r3$.ɵp(1, 'src', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
+            $r3$.ɵa(1, 'srcset', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
           }
         }
       });
diff --git a/packages/core/test/render3/exports_spec.ts b/packages/core/test/render3/exports_spec.ts
index 824b76e6c6..8db0c81559 100644
--- a/packages/core/test/render3/exports_spec.ts
+++ b/packages/core/test/render3/exports_spec.ts
@@ -7,8 +7,9 @@
  */
 
 import {defineComponent, defineDirective} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, load, text, textBinding} from '../../src/render3/instructions';
-import {RenderFlags} from '../../src/render3/interfaces/definition';
+import {bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassProp, elementEnd, elementProperty, elementStart, elementStyling, elementStylingApply, embeddedViewEnd, embeddedViewStart, load, text, textBinding} from '../../src/render3/instructions';
+import {InitialStylingFlags, RenderFlags} from '../../src/render3/interfaces/definition';
+
 import {ComponentFixture, createComponent, renderToHtml} from './render_util';
 
 describe('exports', () => {
@@ -212,13 +213,15 @@ describe('exports', () => {
       function Template(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'div');
+          elementStyling(null, [InitialStylingFlags.VALUES_MODE, 'red', true]);
           elementEnd();
           elementStart(1, 'input', ['type', 'checkbox', 'checked', 'true'], ['myInput', '']);
           elementEnd();
         }
         const tmp = load(2) as any;
         if (rf & RenderFlags.Update) {
-          elementClassNamed(0, 'red', bind(tmp.checked));
+          elementClassProp(0, 0, tmp.checked);
+          elementStylingApply(0);
         }
       }
 
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index e8a9339480..2e3f74a812 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
 
 import {RenderFlags, directiveInject} from '../../src/render3';
 import {defineComponent} from '../../src/render3/definition';
-import {bind, container, element, elementAttribute, elementClass, elementEnd, elementProperty, elementStart, elementStyle, elementStyleProp, elementStyling, elementStylingApply, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
+import {bind, container, element, elementAttribute, elementEnd, elementProperty, elementStart, elementStyleProp, elementStyling, elementStylingApply, elementStylingMap, interpolation1, renderTemplate, text, textBinding} from '../../src/render3/instructions';
 import {InitialStylingFlags} from '../../src/render3/interfaces/definition';
 import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
@@ -23,13 +23,13 @@ import {ComponentFixture, TemplateFixture} from './render_util';
 describe('instructions', () => {
   function createAnchor() {
     elementStart(0, 'a');
-    elementStyling(1);
+    elementStyling();
     elementEnd();
   }
 
   function createDiv(initialStyles?: (string | number)[]) {
     elementStart(0, 'div');
-    elementStyling(1, initialStyles && Array.isArray(initialStyles) ? initialStyles : null);
+    elementStyling(initialStyles && Array.isArray(initialStyles) ? initialStyles : null);
     elementEnd();
   }
 
@@ -193,15 +193,15 @@ describe('instructions', () => {
     it('should use sanitizer function', () => {
       const t = new TemplateFixture(() => { return createDiv(['background-image']); });
       t.update(() => {
-        elementStyleProp(1, 0, 'url("http://server")', sanitizeStyle);
-        elementStylingApply(1);
+        elementStyleProp(0, 0, 'url("http://server")', sanitizeStyle);
+        elementStylingApply(0);
       });
       // nothing is set because sanitizer suppresses it.
       expect(t.html).toEqual('<div></div>');
 
       t.update(() => {
-        elementStyleProp(1, 0, bypassSanitizationTrustStyle('url("http://server")'), sanitizeStyle);
-        elementStylingApply(1);
+        elementStyleProp(0, 0, bypassSanitizationTrustStyle('url("http://server")'), sanitizeStyle);
+        elementStylingApply(0);
       });
       expect((t.hostElement.firstChild as HTMLElement).style.getPropertyValue('background-image'))
           .toEqual('url("http://server")');
@@ -211,25 +211,33 @@ describe('instructions', () => {
   describe('elementStyleMap', () => {
     function createDivWithStyle() {
       elementStart(0, 'div');
-      elementStyling(1, ['height', InitialStylingFlags.INITIAL_STYLES, 'height', '10px']);
+      elementStyling(['height', InitialStylingFlags.VALUES_MODE, 'height', '10px']);
       elementEnd();
     }
 
     it('should add style', () => {
       const fixture = new TemplateFixture(createDivWithStyle);
       fixture.update(() => {
-        elementStyle(1, {'background-color': 'red'});
-        elementStylingApply(1);
+        elementStylingMap(0, {'background-color': 'red'});
+        elementStylingApply(0);
       });
       expect(fixture.html).toEqual('<div style="height: 10px; background-color: red;"></div>');
     });
   });
 
   describe('elementClass', () => {
+    function createDivWithStyling() {
+      elementStart(0, 'div');
+      elementStyling();
+      elementEnd();
+    }
 
     it('should add class', () => {
-      const fixture = new TemplateFixture(createDiv);
-      fixture.update(() => elementClass(0, 'multiple classes'));
+      const fixture = new TemplateFixture(createDivWithStyling);
+      fixture.update(() => {
+        elementStylingMap(0, null, 'multiple classes');
+        elementStylingApply(0);
+      });
       expect(fixture.html).toEqual('<div class="multiple classes"></div>');
     });
   });
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index e334b2a96c..1f1182e012 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -9,7 +9,8 @@
 import {RenderFlags} from '@angular/core/src/render3';
 
 import {defineComponent, defineDirective} from '../../src/render3/index';
-import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassNamed, elementEnd, elementProperty, elementStart, elementStyleProp, elementStyling, elementStylingApply, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {NO_CHANGE, bind, container, containerRefreshEnd, containerRefreshStart, elementAttribute, elementClassProp, elementEnd, elementProperty, elementStart, elementStyleProp, elementStyling, elementStylingApply, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV, load, loadDirective, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {InitialStylingFlags} from '../../src/render3/interfaces/definition';
 import {HEADER_OFFSET} from '../../src/render3/interfaces/view';
 import {sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
@@ -747,12 +748,12 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
-            elementStyling(1, ['border-color']);
+            elementStyling(['border-color']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
-            elementStyleProp(1, 0, ctx);
-            elementStylingApply(1);
+            elementStyleProp(0, 0, ctx);
+            elementStylingApply(0);
           }
         }
 
@@ -766,12 +767,12 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
-            elementStyling(1, ['font-size']);
+            elementStyling(['font-size']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
-            elementStyleProp(1, 0, ctx, 'px');
-            elementStylingApply(1);
+            elementStyleProp(0, 0, ctx, 'px');
+            elementStylingApply(0);
           }
         }
 
@@ -787,10 +788,12 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
+            elementStyling(null, ['active']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
-            elementClassNamed(0, 'active', bind(ctx));
+            elementClassProp(0, 0, ctx);
+            elementStylingApply(0);
           }
         }
 
@@ -809,11 +812,14 @@ describe('render3 integration test', () => {
       it('should work correctly with existing static classes', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            elementStart(0, 'span', ['class', 'existing']);
+            elementStart(0, 'span');
+            elementStyling(
+                null, ['existing', 'active', InitialStylingFlags.VALUES_MODE, 'existing', true]);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
-            elementClassNamed(0, 'active', bind(ctx));
+            elementClassProp(0, 1, ctx);
+            elementStylingApply(0);
           }
         }
 
diff --git a/packages/core/test/render3/styling_spec.ts b/packages/core/test/render3/styling_spec.ts
index 0522d3a424..c7c558d6f1 100644
--- a/packages/core/test/render3/styling_spec.ts
+++ b/packages/core/test/render3/styling_spec.ts
@@ -5,37 +5,64 @@
  * 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 {elementEnd, elementStart, elementStyle, elementStyleProp, elementStyling, elementStylingApply} from '../../src/render3/instructions';
+import {elementEnd, elementStart, elementStyleProp, elementStyling, elementStylingApply, elementStylingMap} from '../../src/render3/instructions';
 import {InitialStylingFlags, RenderFlags} from '../../src/render3/interfaces/definition';
 import {LElementNode} from '../../src/render3/interfaces/node';
 import {Renderer3} from '../../src/render3/interfaces/renderer';
-import {StylingContext, StylingFlags, StylingIndex, allocStylingContext, createStylingContextTemplate, isContextDirty, renderStyles as _renderStyles, setContextDirty, updateStyleMap, updateStyleProp} from '../../src/render3/styling';
+import {StylingContext, StylingFlags, StylingIndex, allocStylingContext, createStylingContextTemplate, isContextDirty, renderStyling as _renderStyling, setContextDirty, updateClassProp, updateStyleProp, updateStylingMap} from '../../src/render3/styling';
 
 import {renderToHtml} from './render_util';
 
 describe('styling', () => {
-  let lElement: LElementNode|null = null;
-  beforeEach(() => { lElement = { native: {} } as any; });
+  let element: LElementNode|null = null;
+  beforeEach(() => { element = {} as any; });
 
-  function initContext(styles?: (number | string)[]): StylingContext {
-    return allocStylingContext(createStylingContextTemplate(styles));
+  function initContext(
+      styles?: (number | string)[] | null,
+      classes?: (string | number | boolean)[] | null): StylingContext {
+    return allocStylingContext(element, createStylingContextTemplate(styles, classes));
   }
 
   function renderStyles(context: StylingContext, renderer?: Renderer3) {
     const styles: {[key: string]: any} = {};
-    _renderStyles(lElement !, context, (renderer || {}) as Renderer3, styles);
+    _renderStyling(context, (renderer || {}) as Renderer3, styles);
     return styles;
   }
 
   function trackStylesFactory() {
     const styles: {[key: string]: any} = {};
     return function(context: StylingContext, renderer?: Renderer3): {[key: string]: any} {
-      _renderStyles(lElement !, context, (renderer || {}) as Renderer3, styles);
+      _renderStyling(context, (renderer || {}) as Renderer3, styles);
       return styles;
     };
   }
 
-  function clean(a: number = 0, b: number = 0): number {
+  function trackClassesFactory() {
+    const classes: {[className: string]: boolean} = {};
+    return function(context: StylingContext, renderer?: Renderer3): {[key: string]: any} {
+      _renderStyling(context, (renderer || {}) as Renderer3, {}, classes);
+      return classes;
+    };
+  }
+
+  function trackStylesAndClasses() {
+    const classes: {[className: string]: boolean} = {};
+    const styles: {[prop: string]: any} = {};
+    return function(context: StylingContext, renderer?: Renderer3): {[key: string]: any} {
+      _renderStyling(context, (renderer || {}) as Renderer3, styles, classes);
+      return [styles, classes];
+    };
+  }
+
+  function updateClasses(context: StylingContext, classes: string | {[key: string]: any} | null) {
+    updateStylingMap(context, null, classes);
+  }
+
+  function cleanStyle(a: number = 0, b: number = 0): number { return _clean(a, b, false); }
+
+  function cleanClass(a: number, b: number) { return _clean(a, b, true); }
+
+  function _clean(a: number = 0, b: number = 0, isClassBased: boolean): number {
     let num = 0;
     if (a) {
       num |= a << StylingFlags.BitCountSize;
@@ -43,614 +70,913 @@ describe('styling', () => {
     if (b) {
       num |= b << (StylingFlags.BitCountSize + StylingIndex.BitCountSize);
     }
+    if (isClassBased) {
+      num |= StylingFlags.Class;
+    }
     return num;
   }
 
-  function dirty(a: number = 0, b: number = 0): number { return clean(a, b) | StylingFlags.Dirty; }
+  function _dirty(a: number = 0, b: number = 0, isClassBased: boolean): number {
+    return _clean(a, b, isClassBased) | StylingFlags.Dirty;
+  }
 
-  describe('createStylingContextTemplate', () => {
-    it('should initialize empty template', () => {
-      const template = createStylingContextTemplate();
-      expect(template).toEqual([
-        [null],
-        clean(0, 2),
-      ]);
+  function dirtyStyle(a: number = 0, b: number = 0): number {
+    return _dirty(a, b, false) | StylingFlags.Dirty;
+  }
+
+  function dirtyClass(a: number, b: number) { return _dirty(a, b, true); }
+
+  describe('styles', () => {
+    describe('createStylingContextTemplate', () => {
+      it('should initialize empty template', () => {
+        const template = initContext();
+        expect(template).toEqual([element, [null], cleanStyle(0, 5), 0, null]);
+      });
+
+      it('should initialize static styles', () => {
+        const template =
+            initContext([InitialStylingFlags.VALUES_MODE, 'color', 'red', 'width', '10px']);
+        expect(template).toEqual([
+          element,
+          [null, 'red', '10px'],
+          dirtyStyle(0, 11),  //
+          0,
+          null,
+
+          // #5
+          cleanStyle(1, 11),
+          'color',
+          null,
+
+          // #8
+          cleanStyle(2, 14),
+          'width',
+          null,
+
+          // #11
+          dirtyStyle(1, 5),
+          'color',
+          null,
+
+          // #14
+          dirtyStyle(2, 8),
+          'width',
+          null,
+        ]);
+      });
     });
 
-    it('should initialize static styles', () => {
-      debugger;
-      const template = createStylingContextTemplate(
-          [InitialStylingFlags.INITIAL_STYLES, 'color', 'red', 'width', '10px']);
-      expect(template).toEqual([
-        [null, 'red', '10px'],
-        dirty(0, 8),  //
+    describe('instructions', () => {
+      it('should handle a combination of initial, multi and singular style values (in that order)',
+         () => {
+           function Template(rf: RenderFlags, ctx: any) {
+             if (rf & RenderFlags.Create) {
+               elementStart(0, 'span');
+               elementStyling([
+                 'width', 'height', 'opacity',  //
+                 InitialStylingFlags.VALUES_MODE, 'width', '100px', 'height', '100px', 'opacity',
+                 '0.5'
+               ]);
+               elementEnd();
+             }
+             if (rf & RenderFlags.Update) {
+               elementStylingMap(0, ctx.myStyles);
+               elementStyleProp(0, 0, ctx.myWidth);
+               elementStylingApply(0);
+             }
+           }
 
-        // #2
-        clean(1, 8),
-        'color',
-        null,
+           expect(renderToHtml(Template, {
+             myStyles: {width: '200px', height: '200px'},
+             myWidth: '300px'
+           })).toEqual('<span style="width: 300px; height: 200px; opacity: 0.5;"></span>');
 
-        // #5
-        clean(2, 11),
-        'width',
-        null,
+           expect(renderToHtml(Template, {myStyles: {width: '200px', height: null}, myWidth: null}))
+               .toEqual('<span style="width: 200px; height: 100px; opacity: 0.5;"></span>');
+         });
+    });
 
-        // #8
-        dirty(1, 2),
-        'color',
-        null,
+    describe('helper functions', () => {
+      it('should build a list of multiple styling values', () => {
+        const getStyles = trackStylesFactory();
+        const stylingContext = initContext();
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+        updateStylingMap(stylingContext, {height: '200px'});
+        expect(getStyles(stylingContext)).toEqual({width: null, height: '200px'});
+      });
 
-        // #11
-        dirty(2, 5),
-        'width',
-        null,
-      ]);
+      it('should evaluate the delta between style changes when rendering occurs', () => {
+        const stylingContext =
+            initContext(['width', 'height', InitialStylingFlags.VALUES_MODE, 'width', '100px']);
+        updateStylingMap(stylingContext, {
+          height: '200px',
+        });
+        expect(renderStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
+        expect(renderStyles(stylingContext)).toEqual({});
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+        expect(renderStyles(stylingContext)).toEqual({height: '100px'});
+        updateStyleProp(stylingContext, 1, '100px');
+        expect(renderStyles(stylingContext)).toEqual({});
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+        expect(renderStyles(stylingContext)).toEqual({});
+      });
+
+      it('should update individual values on a set of styles', () => {
+        const getStyles = trackStylesFactory();
+        const stylingContext = initContext(['width', 'height']);
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+        updateStyleProp(stylingContext, 1, '200px');
+        expect(getStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
+      });
+
+      it('should only mark itself as updated when one or more properties have been applied', () => {
+        const stylingContext = initContext();
+        expect(isContextDirty(stylingContext)).toBeFalsy();
+
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+        expect(isContextDirty(stylingContext)).toBeTruthy();
+
+        setContextDirty(stylingContext, false);
+
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+        expect(isContextDirty(stylingContext)).toBeFalsy();
+
+        updateStylingMap(stylingContext, {
+          width: '200px',
+          height: '100px',
+        });
+        expect(isContextDirty(stylingContext)).toBeTruthy();
+      });
+
+      it('should only mark itself as updated when any single properties have been applied', () => {
+        const stylingContext = initContext(['height']);
+        updateStylingMap(stylingContext, {
+          width: '100px',
+          height: '100px',
+        });
+
+        setContextDirty(stylingContext, false);
+
+        updateStyleProp(stylingContext, 0, '100px');
+        expect(isContextDirty(stylingContext)).toBeFalsy();
+
+        setContextDirty(stylingContext, false);
+
+        updateStyleProp(stylingContext, 0, '200px');
+        expect(isContextDirty(stylingContext)).toBeTruthy();
+      });
+
+      it('should prioritize multi and single styles over initial styles', () => {
+        const getStyles = trackStylesFactory();
+
+        const stylingContext = initContext([
+          'width', 'height', 'opacity', InitialStylingFlags.VALUES_MODE, 'width', '100px', 'height',
+          '100px', 'opacity', '0'
+        ]);
+
+        expect(getStyles(stylingContext)).toEqual({
+          width: '100px',
+          height: '100px',
+          opacity: '0',
+        });
+
+        updateStylingMap(stylingContext, {width: '200px', height: '200px'});
+
+        expect(getStyles(stylingContext)).toEqual({
+          width: '200px',
+          height: '200px',
+          opacity: '0',
+        });
+
+        updateStyleProp(stylingContext, 0, '300px');
+
+        expect(getStyles(stylingContext)).toEqual({
+          width: '300px',
+          height: '200px',
+          opacity: '0',
+        });
+
+        updateStyleProp(stylingContext, 0, null);
+
+        expect(getStyles(stylingContext)).toEqual({
+          width: '200px',
+          height: '200px',
+          opacity: '0',
+        });
+
+        updateStylingMap(stylingContext, {});
+
+        expect(getStyles(stylingContext)).toEqual({
+          width: '100px',
+          height: '100px',
+          opacity: '0',
+        });
+      });
+
+      it('should cleanup removed styles from the context once the styles are built', () => {
+        const stylingContext = initContext(['width', 'height']);
+        const getStyles = trackStylesFactory();
+
+        updateStylingMap(stylingContext, {width: '100px', height: '100px'});
+
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          dirtyStyle(0, 11),  //
+          2,
+          null,
+
+          // #5
+          cleanStyle(0, 11),
+          'width',
+          null,
+
+          // #8
+          cleanStyle(0, 14),
+          'height',
+          null,
+
+          // #11
+          dirtyStyle(0, 5),
+          'width',
+          '100px',
+
+          // #14
+          dirtyStyle(0, 8),
+          'height',
+          '100px',
+        ]);
+
+        getStyles(stylingContext);
+        updateStylingMap(stylingContext, {width: '200px', opacity: '0'});
+
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          dirtyStyle(0, 11),  //
+          2,
+          null,
+
+          // #5
+          cleanStyle(0, 11),
+          'width',
+          null,
+
+          // #8
+          cleanStyle(0, 17),
+          'height',
+          null,
+
+          // #11
+          dirtyStyle(0, 5),
+          'width',
+          '200px',
+
+          // #14
+          dirtyStyle(),
+          'opacity',
+          '0',
+
+          // #17
+          dirtyStyle(0, 8),
+          'height',
+          null,
+        ]);
+
+        getStyles(stylingContext);
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          cleanStyle(0, 11),  //
+          2,
+          null,
+
+          // #5
+          cleanStyle(0, 11),
+          'width',
+          null,
+
+          // #8
+          cleanStyle(0, 17),
+          'height',
+          null,
+
+          // #11
+          cleanStyle(0, 5),
+          'width',
+          '200px',
+
+          // #14
+          cleanStyle(),
+          'opacity',
+          '0',
+
+          // #17
+          cleanStyle(0, 8),
+          'height',
+          null,
+        ]);
+
+        updateStylingMap(stylingContext, {width: null});
+        updateStyleProp(stylingContext, 0, '300px');
+
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          dirtyStyle(0, 11),  //
+          2,
+          null,
+
+          // #5
+          dirtyStyle(0, 11),
+          'width',
+          '300px',
+
+          // #8
+          cleanStyle(0, 17),
+          'height',
+          null,
+
+          // #11
+          cleanStyle(0, 5),
+          'width',
+          null,
+
+          // #14
+          dirtyStyle(),
+          'opacity',
+          null,
+
+          // #17
+          cleanStyle(0, 8),
+          'height',
+          null,
+        ]);
+
+        getStyles(stylingContext);
+
+        updateStyleProp(stylingContext, 0, null);
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          dirtyStyle(0, 11),  //
+          2,
+          null,
+
+          // #5
+          dirtyStyle(0, 11),
+          'width',
+          null,
+
+          // #8
+          cleanStyle(0, 17),
+          'height',
+          null,
+
+          // #11
+          cleanStyle(0, 5),
+          'width',
+          null,
+
+          // #14
+          cleanStyle(),
+          'opacity',
+          null,
+
+          // #17
+          cleanStyle(0, 8),
+          'height',
+          null,
+        ]);
+      });
+
+      it('should find the next available space in the context when data is added after being removed before',
+         () => {
+           const stylingContext = initContext(['lineHeight']);
+           const getStyles = trackStylesFactory();
+
+           updateStylingMap(stylingContext, {width: '100px', height: '100px', opacity: '0.5'});
+
+           expect(stylingContext).toEqual([
+             element,
+             [null],
+             dirtyStyle(0, 8),  //
+             1,
+             null,
+
+             // #5
+             cleanStyle(0, 17),
+             'lineHeight',
+             null,
+
+             // #8
+             dirtyStyle(),
+             'width',
+             '100px',
+
+             // #11
+             dirtyStyle(),
+             'height',
+             '100px',
+
+             // #14
+             dirtyStyle(),
+             'opacity',
+             '0.5',
+
+             // #17
+             cleanStyle(0, 5),
+             'lineHeight',
+             null,
+           ]);
+
+           getStyles(stylingContext);
+
+           updateStylingMap(stylingContext, {});
+           expect(stylingContext).toEqual([
+             element,
+             [null],
+             dirtyStyle(0, 8),  //
+             1,
+             null,
+
+             // #5
+             cleanStyle(0, 17),
+             'lineHeight',
+             null,
+
+             // #8
+             dirtyStyle(),
+             'width',
+             null,
+
+             // #11
+             dirtyStyle(),
+             'height',
+             null,
+
+             // #14
+             dirtyStyle(),
+             'opacity',
+             null,
+
+             // #17
+             cleanStyle(0, 5),
+             'lineHeight',
+             null,
+           ]);
+
+           getStyles(stylingContext);
+           updateStylingMap(stylingContext, {
+             borderWidth: '5px',
+           });
+
+           expect(stylingContext).toEqual([
+             element,
+             [null],
+             dirtyStyle(0, 8),  //
+             1,
+             null,
+
+             // #5
+             cleanStyle(0, 20),
+             'lineHeight',
+             null,
+
+             // #8
+             dirtyStyle(),
+             'borderWidth',
+             '5px',
+
+             // #11
+             cleanStyle(),
+             'width',
+             null,
+
+             // #14
+             cleanStyle(),
+             'height',
+             null,
+
+             // #17
+             cleanStyle(),
+             'opacity',
+             null,
+
+             // #20
+             cleanStyle(0, 5),
+             'lineHeight',
+             null,
+           ]);
+
+           updateStyleProp(stylingContext, 0, '200px');
+
+           expect(stylingContext).toEqual([
+             element,
+             [null],
+             dirtyStyle(0, 8),  //
+             1,
+             null,
+
+             // #5
+             dirtyStyle(0, 20),
+             'lineHeight',
+             '200px',
+
+             // #8
+             dirtyStyle(),
+             'borderWidth',
+             '5px',
+
+             // #11
+             cleanStyle(),
+             'width',
+             null,
+
+             // #14
+             cleanStyle(),
+             'height',
+             null,
+
+             // #17
+             cleanStyle(),
+             'opacity',
+             null,
+
+             // #20
+             cleanStyle(0, 5),
+             'lineHeight',
+             null,
+           ]);
+
+           updateStylingMap(stylingContext, {borderWidth: '15px', borderColor: 'red'});
+
+           expect(stylingContext).toEqual([
+             element,
+             [null],
+             dirtyStyle(0, 8),  //
+             1,
+             null,
+
+             // #5
+             dirtyStyle(0, 23),
+             'lineHeight',
+             '200px',
+
+             // #8
+             dirtyStyle(),
+             'borderWidth',
+             '15px',
+
+             // #11
+             dirtyStyle(),
+             'borderColor',
+             'red',
+
+             // #14
+             cleanStyle(),
+             'width',
+             null,
+
+             // #17
+             cleanStyle(),
+             'height',
+             null,
+
+             // #20
+             cleanStyle(),
+             'opacity',
+             null,
+
+             // #23
+             cleanStyle(0, 5),
+             'lineHeight',
+             null,
+           ]);
+         });
+
+      it('should render all data as not being dirty after the styles are built', () => {
+        const getStyles = trackStylesFactory();
+        const stylingContext = initContext(['height']);
+
+        updateStylingMap(stylingContext, {
+          width: '100px',
+        });
+
+        updateStyleProp(stylingContext, 0, '200px');
+
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          dirtyStyle(0, 8),  //
+          1,
+          null,
+
+          // #5
+          dirtyStyle(0, 11),
+          'height',
+          '200px',
+
+          // #5
+          dirtyStyle(),
+          'width',
+          '100px',
+
+          // #11
+          cleanStyle(0, 5),
+          'height',
+          null,
+        ]);
+
+        getStyles(stylingContext);
+
+        expect(stylingContext).toEqual([
+          element,
+          [null],
+          cleanStyle(0, 8),  //
+          1,
+          null,
+
+          // #5
+          cleanStyle(0, 11),
+          'height',
+          '200px',
+
+          // #5
+          cleanStyle(),
+          'width',
+          '100px',
+
+          // #11
+          cleanStyle(0, 5),
+          'height',
+          null,
+        ]);
+      });
     });
   });
 
-  describe('instructions', () => {
-    it('should handle a combination of initial, multi and singular style values (in that order)',
+  describe('classes', () => {
+    it('should initialize with the provided classes', () => {
+      const template =
+          initContext(null, [InitialStylingFlags.VALUES_MODE, 'one', true, 'two', true]);
+      expect(template).toEqual([
+        element, [null, true, true], dirtyStyle(0, 11),  //
+        0, null,
+
+        // #5
+        cleanClass(1, 11), 'one', null,
+
+        // #8
+        cleanClass(2, 14), 'two', null,
+
+        // #11
+        dirtyClass(1, 5), 'one', null,
+
+        // #14
+        dirtyClass(2, 8), 'two', null
+      ]);
+    });
+
+    it('should update multi class properties against the static classes', () => {
+      const getClasses = trackClassesFactory();
+      const stylingContext = initContext(null, ['bar']);
+      expect(getClasses(stylingContext)).toEqual({});
+      updateClasses(stylingContext, {foo: true, bar: false});
+      expect(getClasses(stylingContext)).toEqual({'foo': true, 'bar': false});
+      updateClasses(stylingContext, 'bar');
+      expect(getClasses(stylingContext)).toEqual({'foo': false, 'bar': true});
+    });
+
+    it('should update single class properties against the static classes', () => {
+      const getClasses = trackClassesFactory();
+      const stylingContext =
+          initContext(null, ['bar', 'foo', InitialStylingFlags.VALUES_MODE, 'bar', true]);
+      expect(getClasses(stylingContext)).toEqual({'bar': true});
+
+      updateClassProp(stylingContext, 0, true);
+      updateClassProp(stylingContext, 1, true);
+      expect(getClasses(stylingContext)).toEqual({'bar': true, 'foo': true});
+
+      updateClassProp(stylingContext, 0, false);
+      updateClassProp(stylingContext, 1, false);
+      expect(getClasses(stylingContext)).toEqual({'bar': true, 'foo': false});
+    });
+
+    it('should understand updating multi-classes using a string-based value while respecting single class-based props',
        () => {
-         function Template(rf: RenderFlags, ctx: any) {
-           if (rf & RenderFlags.Create) {
-             elementStart(0, 'span');
-             elementStyling(1, [
-               'width', 'height', 'opacity',  //
-               0, 'width', '100px', 'height', '100px', 'opacity', '0.5'
-             ]);
-             elementEnd();
-           }
-           if (rf & RenderFlags.Update) {
-             elementStyle(1, ctx.myStyles);
-             elementStyleProp(1, 0, ctx.myWidth);
-             elementStylingApply(1);
-           }
-         }
+         const getClasses = trackClassesFactory();
+         const stylingContext = initContext(null, ['guy']);
+         expect(getClasses(stylingContext)).toEqual({});
 
-         expect(renderToHtml(Template, {
-           myStyles: {width: '200px', height: '200px'},
-           myWidth: '300px'
-         })).toEqual('<span style="width: 300px; height: 200px; opacity: 0.5;"></span>');
+         updateStylingMap(stylingContext, null, 'foo bar guy');
+         expect(getClasses(stylingContext)).toEqual({'foo': true, 'bar': true, 'guy': true});
 
-         expect(renderToHtml(Template, {myStyles: {width: '200px', height: null}, myWidth: null}))
-             .toEqual('<span style="width: 200px; height: 100px; opacity: 0.5;"></span>');
+         updateStylingMap(stylingContext, null, 'foo man');
+         updateClassProp(stylingContext, 0, true);
+         expect(getClasses(stylingContext))
+             .toEqual({'foo': true, 'man': true, 'bar': false, 'guy': true});
        });
-  });
-
-  describe('helper functions', () => {
-    it('should build a list of multiple styling values', () => {
-      const getStyles = trackStylesFactory();
-      const stylingContext = initContext();
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-      updateStyleMap(stylingContext, {height: '200px'});
-      expect(getStyles(stylingContext)).toEqual({width: null, height: '200px'});
-    });
-
-    it('should evaluate the delta between style changes when rendering occurs', () => {
-      const stylingContext = initContext(['width', 'height', 0, 'width', '100px']);
-      updateStyleMap(stylingContext, {
-        height: '200px',
-      });
-      expect(renderStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
-      expect(renderStyles(stylingContext)).toEqual({});
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-      expect(renderStyles(stylingContext)).toEqual({height: '100px'});
-      updateStyleProp(stylingContext, 1, '100px');
-      expect(renderStyles(stylingContext)).toEqual({});
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-      expect(renderStyles(stylingContext)).toEqual({});
-    });
-
-    it('should update individual values on a set of styles', () => {
-      const getStyles = trackStylesFactory();
-      const stylingContext = initContext(['width', 'height']);
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-      updateStyleProp(stylingContext, 1, '200px');
-      expect(getStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
-    });
-
-    it('should only mark itself as updated when one or more properties have been applied', () => {
-      const stylingContext = initContext();
-      expect(isContextDirty(stylingContext)).toBeFalsy();
-
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-      expect(isContextDirty(stylingContext)).toBeTruthy();
-
-      setContextDirty(stylingContext, false);
-
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-      expect(isContextDirty(stylingContext)).toBeFalsy();
-
-      updateStyleMap(stylingContext, {
-        width: '200px',
-        height: '100px',
-      });
-      expect(isContextDirty(stylingContext)).toBeTruthy();
-    });
-
-    it('should only mark itself as updated when any single properties have been applied', () => {
-      const stylingContext = initContext(['height']);
-      updateStyleMap(stylingContext, {
-        width: '100px',
-        height: '100px',
-      });
-
-      setContextDirty(stylingContext, false);
-
-      updateStyleProp(stylingContext, 0, '100px');
-      expect(isContextDirty(stylingContext)).toBeFalsy();
-
-      setContextDirty(stylingContext, false);
-
-      updateStyleProp(stylingContext, 0, '200px');
-      expect(isContextDirty(stylingContext)).toBeTruthy();
-    });
-
-    it('should prioritize multi and single styles over initial styles', () => {
-      const getStyles = trackStylesFactory();
-
-      const stylingContext = initContext(
-          ['width', 'height', 'opacity', 0, 'width', '100px', 'height', '100px', 'opacity', '0']);
-
-      expect(getStyles(stylingContext)).toEqual({
-        width: '100px',
-        height: '100px',
-        opacity: '0',
-      });
-
-      updateStyleMap(stylingContext, {width: '200px', height: '200px'});
-
-      expect(getStyles(stylingContext)).toEqual({
-        width: '200px',
-        height: '200px',
-        opacity: '0',
-      });
-
-      updateStyleProp(stylingContext, 0, '300px');
-
-      expect(getStyles(stylingContext)).toEqual({
-        width: '300px',
-        height: '200px',
-        opacity: '0',
-      });
-
-      updateStyleProp(stylingContext, 0, null);
-
-      expect(getStyles(stylingContext)).toEqual({
-        width: '200px',
-        height: '200px',
-        opacity: '0',
-      });
-
-      updateStyleMap(stylingContext, {});
-
-      expect(getStyles(stylingContext)).toEqual({
-        width: '100px',
-        height: '100px',
-        opacity: '0',
-      });
-    });
-
-    it('should cleanup removed styles from the context once the styles are built', () => {
-      const stylingContext = initContext(['width', 'height']);
-      const getStyles = trackStylesFactory();
-
-      updateStyleMap(stylingContext, {width: '100px', height: '100px'});
 
+    it('should house itself inside the context alongside styling in harmony', () => {
+      const getStylesAndClasses = trackStylesAndClasses();
+      const initialStyles = ['width', 'height', InitialStylingFlags.VALUES_MODE, 'width', '100px'];
+      const initialClasses = ['wide', 'tall', InitialStylingFlags.VALUES_MODE, 'wide', true];
+      const stylingContext = initContext(initialStyles, initialClasses);
       expect(stylingContext).toEqual([
-        [null],
-        dirty(0, 8),  //
-
-        // #2
-        clean(0, 8),
-        'width',
+        element,
+        [null, '100px', true],
+        dirtyStyle(0, 17),  //
+        2,
         null,
 
         // #5
-        clean(0, 11),
-        'height',
+        cleanStyle(1, 17),
+        'width',
         null,
 
         // #8
-        dirty(0, 2),
-        'width',
-        '100px',
+        cleanStyle(0, 20),
+        'height',
+        null,
 
         // #11
-        dirty(0, 5),
-        'height',
-        '100px',
-      ]);
+        cleanClass(2, 23),
+        'wide',
+        null,
 
-      getStyles(stylingContext);
-      updateStyleMap(stylingContext, {width: '200px', opacity: '0'});
+        // #14
+        cleanClass(0, 26),
+        'tall',
+        null,
 
-      expect(stylingContext).toEqual([
-        [null],
-        dirty(0, 8),  //
-
-        // #2
-        clean(0, 8),
+        // #17
+        dirtyStyle(1, 5),
         'width',
         null,
 
-        // #5
-        clean(0, 14),
+        // #20
+        cleanStyle(0, 8),
         'height',
         null,
 
+        // #23
+        dirtyClass(2, 11),
+        'wide',
+        null,
+
+        // #26
+        cleanClass(0, 14),
+        'tall',
+        null,
+      ]);
+
+      expect(getStylesAndClasses(stylingContext)).toEqual([{width: '100px'}, {wide: true}]);
+
+      updateStylingMap(stylingContext, {width: '200px', opacity: '0.5'}, 'tall round');
+      expect(stylingContext).toEqual([
+        element,
+        [null, '100px', true],
+        dirtyStyle(0, 17),  //
+        2,
+        'tall round',
+
+        // #5
+        cleanStyle(1, 17),
+        'width',
+        null,
+
         // #8
-        dirty(0, 2),
+        cleanStyle(0, 32),
+        'height',
+        null,
+
+        // #11
+        cleanClass(2, 29),
+        'wide',
+        null,
+
+        // #14
+        cleanClass(0, 23),
+        'tall',
+        null,
+
+        // #17
+        dirtyStyle(1, 5),
         'width',
         '200px',
 
-        // #11
-        dirty(),
+        // #20
+        dirtyStyle(0, 0),
         'opacity',
-        '0',
+        '0.5',
 
-        // #14
-        dirty(0, 5),
+        // #23
+        dirtyClass(0, 14),
+        'tall',
+        true,
+
+        // #26
+        dirtyClass(0, 0),
+        'round',
+        true,
+
+        // #29
+        cleanClass(2, 11),
+        'wide',
+        null,
+
+        // #32
+        cleanStyle(0, 8),
         'height',
         null,
       ]);
 
-      getStyles(stylingContext);
-      expect(stylingContext).toEqual([
-        [null],
-        clean(0, 8),  //
-
-        // #2
-        clean(0, 8),
-        'width',
-        null,
-
-        // #5
-        clean(0, 14),
-        'height',
-        null,
-
-        // #8
-        clean(0, 2),
-        'width',
-        '200px',
-
-        // #11
-        clean(),
-        'opacity',
-        '0',
-
-        // #14
-        clean(0, 5),
-        'height',
-        null,
+      expect(getStylesAndClasses(stylingContext)).toEqual([
+        {width: '200px', opacity: '0.5'}, {tall: true, round: true, wide: true}
       ]);
 
-      updateStyleMap(stylingContext, {width: null});
+      updateStylingMap(stylingContext, {width: '500px'}, {tall: true, wide: true});
       updateStyleProp(stylingContext, 0, '300px');
 
       expect(stylingContext).toEqual([
-        [null],
-        dirty(0, 8),  //
+        element,
+        [null, '100px', true],
+        dirtyStyle(0, 17),  //
+        2,
+        null,
 
-        // #2
-        dirty(0, 8),
+        // #5
+        dirtyStyle(1, 17),
         'width',
         '300px',
 
-        // #5
-        clean(0, 14),
-        'height',
-        null,
-
         // #8
-        clean(0, 2),
-        'width',
+        cleanStyle(0, 32),
+        'height',
         null,
 
         // #11
-        dirty(),
-        'opacity',
+        cleanClass(2, 23),
+        'wide',
         null,
 
         // #14
-        clean(0, 5),
-        'height',
+        cleanClass(0, 20),
+        'tall',
         null,
-      ]);
 
-      getStyles(stylingContext);
-
-      updateStyleProp(stylingContext, 0, null);
-      expect(stylingContext).toEqual([
-        [null],
-        dirty(0, 8),  //
-
-        // #2
-        dirty(0, 8),
+        // #17
+        cleanStyle(1, 5),
         'width',
+        '500px',
+
+        // #20
+        cleanClass(0, 14),
+        'tall',
+        true,
+
+        // #23
+        cleanClass(2, 11),
+        'wide',
+        true,
+
+        // #26
+        dirtyClass(0, 0),
+        'round',
         null,
 
-        // #5
-        clean(0, 14),
-        'height',
-        null,
-
-        // #8
-        clean(0, 2),
-        'width',
-        null,
-
-        // #11
-        clean(),
+        // #29
+        dirtyStyle(0, 0),
         'opacity',
         null,
 
-        // #14
-        clean(0, 5),
-        'height',
-        null,
-      ]);
-    });
-
-    it('should find the next available space in the context when data is added after being removed before',
-       () => {
-         const stylingContext = initContext(['lineHeight']);
-         const getStyles = trackStylesFactory();
-
-         updateStyleMap(stylingContext, {width: '100px', height: '100px', opacity: '0.5'});
-
-         expect(stylingContext).toEqual([
-           [null],
-           dirty(0, 5),  //
-
-           // #2
-           clean(0, 14),
-           'lineHeight',
-           null,
-
-           // #5
-           dirty(),
-           'width',
-           '100px',
-
-           // #8
-           dirty(),
-           'height',
-           '100px',
-
-           // #11
-           dirty(),
-           'opacity',
-           '0.5',
-
-           // #14
-           dirty(0, 2),
-           'lineHeight',
-           null,
-         ]);
-
-         getStyles(stylingContext);
-
-         updateStyleMap(stylingContext, {});
-         expect(stylingContext).toEqual([
-           [null],
-           dirty(0, 5),  //
-
-           // #2
-           clean(0, 14),
-           'lineHeight',
-           null,
-
-           // #5
-           dirty(),
-           'width',
-           null,
-
-           // #8
-           dirty(),
-           'height',
-           null,
-
-           // #11
-           dirty(),
-           'opacity',
-           null,
-
-           // #14
-           clean(0, 2),
-           'lineHeight',
-           null,
-         ]);
-
-         getStyles(stylingContext);
-         updateStyleMap(stylingContext, {
-           borderWidth: '5px',
-         });
-
-         expect(stylingContext).toEqual([
-           [null],
-           dirty(0, 5),  //
-
-           // #2
-           clean(0, 17),
-           'lineHeight',
-           null,
-
-           // #5
-           dirty(),
-           'borderWidth',
-           '5px',
-
-           // #8
-           clean(),
-           'width',
-           null,
-
-           // #11
-           clean(),
-           'height',
-           null,
-
-           // #14
-           clean(),
-           'opacity',
-           null,
-
-           // #17
-           clean(0, 2),
-           'lineHeight',
-           null,
-         ]);
-
-         updateStyleProp(stylingContext, 0, '200px');
-
-         expect(stylingContext).toEqual([
-           [null],
-           dirty(0, 5),  //
-
-           // #2
-           dirty(0, 17),
-           'lineHeight',
-           '200px',
-
-           // #5
-           dirty(),
-           'borderWidth',
-           '5px',
-
-           // #8
-           clean(),
-           'width',
-           null,
-
-           // #11
-           clean(),
-           'height',
-           null,
-
-           // #14
-           clean(),
-           'opacity',
-           null,
-
-           // #17
-           clean(0, 2),
-           'lineHeight',
-           null,
-         ]);
-
-         updateStyleMap(stylingContext, {borderWidth: '15px', borderColor: 'red'});
-
-         expect(stylingContext).toEqual([
-           [null],
-           dirty(0, 5),  //
-
-           // #2
-           dirty(0, 20),
-           'lineHeight',
-           '200px',
-
-           // #5
-           dirty(),
-           'borderWidth',
-           '15px',
-
-           // #8
-           dirty(),
-           'borderColor',
-           'red',
-
-           // #11
-           clean(),
-           'width',
-           null,
-
-           // #14
-           clean(),
-           'height',
-           null,
-
-           // #17
-           clean(),
-           'opacity',
-           null,
-
-           // #20
-           clean(0, 2),
-           'lineHeight',
-           null,
-         ]);
-       });
-
-    it('should render all data as not being dirty after the styles are built', () => {
-      const getStyles = trackStylesFactory();
-      const stylingContext = initContext(['height']);
-
-      updateStyleMap(stylingContext, {
-        width: '100px',
-      });
-
-      updateStyleProp(stylingContext, 0, '200px');
-
-      expect(stylingContext).toEqual([
-        [null],
-        dirty(0, 5),  //
-
-        // #2
-        dirty(0, 8),
-        'height',
-        '200px',
-
-        // #2
-        dirty(),
-        'width',
-        '100px',
-
-        // #8
-        clean(0, 2),
+        // #32
+        cleanStyle(0, 8),
         'height',
         null,
       ]);
 
-      getStyles(stylingContext);
-
-      expect(stylingContext).toEqual([
-        [null],
-        clean(0, 5),  //
-
-        // #2
-        clean(0, 8),
-        'height',
-        '200px',
-
-        // #2
-        clean(),
-        'width',
-        '100px',
-
-        // #8
-        clean(0, 2),
-        'height',
-        null,
+      expect(getStylesAndClasses(stylingContext)).toEqual([
+        {width: '300px', opacity: null}, {tall: true, round: false, wide: true}
       ]);
     });
   });

From 06a33984af3f875f7434375592e6fc3f6fff95bc Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 11 Jul 2018 07:46:38 -0700
Subject: [PATCH 488/582] build: rename angular_devkit dependency to
 angular_cli (#24842)

PR Close #24842
---
 WORKSPACE                               | 2 +-
 packages/bazel/src/BUILD.bazel          | 2 +-
 packages/bazel/src/ng_rollup_bundle.bzl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 8b909046f9..05919663e4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -58,7 +58,7 @@ http_archive(
 # Even better, things like aspects will visit the entire graph including
 # ts_library rules in the devkit repository.
 http_archive(
-    name = "angular_devkit",
+    name = "angular_cli",
     url = "https://github.com/angular/angular-cli/archive/v6.1.0-rc.0.zip",
     strip_prefix = "angular-cli-6.1.0-rc.0",
     sha256 = "8cf320ea58c321e103f39087376feea502f20eaf79c61a4fdb05c7286c8684fd",
diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel
index 0f01be9729..b7f54bad54 100644
--- a/packages/bazel/src/BUILD.bazel
+++ b/packages/bazel/src/BUILD.bazel
@@ -14,7 +14,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 nodejs_binary(
     name = "rollup_with_build_optimizer",
-    data = ["@angular_devkit//packages/angular_devkit/build_optimizer:lib"],
+    data = ["@angular_cli//packages/angular_devkit/build_optimizer:lib"],
     # Since our rule extends the one in rules_nodejs, we use the same runtime
     # dependency @build_bazel_rules_nodejs_rollup_deps. We don't need any
     # additional npm dependencies when we run rollup or uglify.
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index 49d8b330f0..b90c7e5942 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -24,7 +24,7 @@ load(":esm5.bzl", "esm5_outputs_aspect", "flatten_esm5", "esm5_root_dir")
 PACKAGES=["packages/core/src", "packages/common/src", "packages/compiler/src", "external/rxjs"]
 PLUGIN_CONFIG="{sideEffectFreeModules: [\n%s]}" % ",\n".join(
     ["        '.esm5/{0}'".format(p) for p in PACKAGES])
-BO_ROLLUP="angular_devkit/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.js"
+BO_ROLLUP="angular_cli/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.js"
 BO_PLUGIN="require('%s').default(%s)" % (BO_ROLLUP, PLUGIN_CONFIG)
 
 def _use_plain_rollup(ctx):

From 0b28732d779f86f05b4152e77a1cd0f198ce74fe Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Mon, 25 Jun 2018 22:37:19 +0200
Subject: [PATCH 489/582] docs: typos in directives docs (#24665)

Fixes some typos introduced by #23902

PR Close #24665
---
 packages/core/src/metadata/directives.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 4c5a08f544..0784cef48b 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -342,9 +342,12 @@ export interface Directive {
    * View queries are set before the `ngAfterViewInit` callback is called.
    *
    * @usageNotes
+   *
    * ### Example
    *
-   * The followoing example (shows what??)
+   * The following example shows how queries are defined
+   * and when their results are available in lifecycle hooks:
+   *
    * ```
    * @Component({
    *   selector: 'someDir',
@@ -475,7 +478,7 @@ export interface Directive {
 }
 
 /**
- * Type of the Component metadata.
+ * Type of the Directive metadata.
  */
 export const Directive: DirectiveDecorator = makeDecorator(
     'Directive', (dir: Directive = {}) => dir, undefined, undefined,

From 23dc9a90b0c7e82b23aabb7bf10aea11a14ffcd2 Mon Sep 17 00:00:00 2001
From: Jamie Krug <jamiekrug@gmail.com>
Date: Wed, 7 Mar 2018 13:23:30 -0500
Subject: [PATCH 490/582] docs: fix typo in user input guide (#22630)

PR Close #22630
---
 aio/content/guide/user-input.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/user-input.md b/aio/content/guide/user-input.md
index 7838c9f82c..6f519bcc3c 100644
--- a/aio/content/guide/user-input.md
+++ b/aio/content/guide/user-input.md
@@ -69,7 +69,7 @@ DOM event object in the `$event` variable which this code passes as a parameter
 
 
 The properties of an `$event` object vary depending on the type of DOM event. For example,
-a mouse event includes different information than a input box editing event.
+a mouse event includes different information than an input box editing event.
 
 All [standard DOM event objects](https://developer.mozilla.org/en-US/docs/Web/API/Event)
 have a `target` property, a reference to the element that raised the event.

From d76531d16eb57391a8ee4cf3375a550e72307b67 Mon Sep 17 00:00:00 2001
From: Martin Probst <martin@probst.io>
Date: Tue, 17 Jul 2018 15:49:06 +0200
Subject: [PATCH 491/582] fix(animations): @internal must use JSDoc tags.
 (#24928)

This change fixes up several comments that accidentally used the JSDoc
tag @internal in regular block comments (`/*` instead of `/**`).

This prevents a problem with Closure Compiler that balks at `@` tags
occuring in regular block comments, because it assumes they were
intended to be tags for the compiler.

When occuring in `/**` JSDoc, tsickle escapes the tags, so they do not
cause problems.

PR Close #24928
---
 .../src/render/css_keyframes/css_keyframes_player.ts      | 2 +-
 .../browser/src/render/transition_animation_engine.ts     | 2 +-
 .../src/render/web_animations/web_animations_player.ts    | 2 +-
 packages/animations/src/players/animation_group_player.ts | 2 +-
 packages/animations/src/players/animation_player.ts       | 8 ++++----
 .../platform-browser/animations/src/animation_renderer.ts | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts b/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts
index 8369201a36..88c1a2e07d 100644
--- a/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts
+++ b/packages/animations/browser/src/render/css_keyframes/css_keyframes_player.ts
@@ -124,7 +124,7 @@ export class CssKeyframesPlayer implements AnimationPlayer {
         DEFAULT_FILL_MODE, () => this.finish());
   }
 
-  /* @internal */
+  /** @internal */
   triggerCallback(phaseName: string): void {
     const methods = phaseName == 'start' ? this._onStartFns : this._onDoneFns;
     methods.forEach(fn => fn());
diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index 700c34b15e..2d1222936a 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -1514,7 +1514,7 @@ export class TransitionAnimationPlayer implements AnimationPlayer {
 
   getPosition(): number { return this.queued ? 0 : this._player.getPosition(); }
 
-  /* @internal */
+  /** @internal */
   triggerCallback(phaseName: string): void {
     const p = this._player as any;
     if (p.triggerCallback) {
diff --git a/packages/animations/browser/src/render/web_animations/web_animations_player.ts b/packages/animations/browser/src/render/web_animations/web_animations_player.ts
index 8db8088fe3..441a6b244b 100644
--- a/packages/animations/browser/src/render/web_animations/web_animations_player.ts
+++ b/packages/animations/browser/src/render/web_animations/web_animations_player.ts
@@ -155,7 +155,7 @@ export class WebAnimationsPlayer implements AnimationPlayer {
     this.currentSnapshot = styles;
   }
 
-  /* @internal */
+  /** @internal */
   triggerCallback(phaseName: string): void {
     const methods = phaseName == 'start' ? this._onStartFns : this._onDoneFns;
     methods.forEach(fn => fn());
diff --git a/packages/animations/src/players/animation_group_player.ts b/packages/animations/src/players/animation_group_player.ts
index 07b600cbdf..ba65d89639 100644
--- a/packages/animations/src/players/animation_group_player.ts
+++ b/packages/animations/src/players/animation_group_player.ts
@@ -140,7 +140,7 @@ export class AnimationGroupPlayer implements AnimationPlayer {
     });
   }
 
-  /* @internal */
+  /** @internal */
   triggerCallback(phaseName: string): void {
     const methods = phaseName == 'start' ? this._onStartFns : this._onDoneFns;
     methods.forEach(fn => fn());
diff --git a/packages/animations/src/players/animation_player.ts b/packages/animations/src/players/animation_player.ts
index de3dfb4ffa..32f5526b56 100644
--- a/packages/animations/src/players/animation_player.ts
+++ b/packages/animations/src/players/animation_player.ts
@@ -31,9 +31,9 @@ export interface AnimationPlayer {
   parentPlayer: AnimationPlayer|null;
   readonly totalTime: number;
   beforeDestroy?: () => any;
-  /* @internal */
+  /** @internal */
   triggerCallback?: (phaseName: string) => void;
-  /* @internal */
+  /** @internal */
   disabled?: boolean;
 }
 
@@ -70,7 +70,7 @@ export class NoopAnimationPlayer implements AnimationPlayer {
     this._started = true;
   }
 
-  /* @internal */
+  /** @internal */
   triggerMicrotask() { scheduleMicroTask(() => this._onFinish()); }
 
   private _onStart() {
@@ -96,7 +96,7 @@ export class NoopAnimationPlayer implements AnimationPlayer {
   setPosition(p: number): void {}
   getPosition(): number { return 0; }
 
-  /* @internal */
+  /** @internal */
   triggerCallback(phaseName: string): void {
     const methods = phaseName == 'start' ? this._onStartFns : this._onDoneFns;
     methods.forEach(fn => fn());
diff --git a/packages/platform-browser/animations/src/animation_renderer.ts b/packages/platform-browser/animations/src/animation_renderer.ts
index b7cf1cc2f0..bdaee22f97 100644
--- a/packages/platform-browser/animations/src/animation_renderer.ts
+++ b/packages/platform-browser/animations/src/animation_renderer.ts
@@ -74,7 +74,7 @@ export class AnimationRendererFactory implements RendererFactory2 {
     this.promise.then(() => { this._microtaskId++; });
   }
 
-  /* @internal */
+  /** @internal */
   scheduleListenerCallback(count: number, fn: (e: any) => any, data: any) {
     if (count >= 0 && count < this._microtaskId) {
       this._zone.run(() => fn(data));

From 99a393e84fef1390a5e24e23633802f4c2518134 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Tue, 19 Jun 2018 12:56:58 -0500
Subject: [PATCH 492/582] docs: add new Reactive Forms guide (#24578)

PR Close #24578
---
 aio/content/examples/reactive-forms/debug.log |    3 -
 .../reactive-forms/e2e/src/app.e2e-spec.ts    | 1091 ++---------
 .../reactive-forms/final.stackblitz.json      |   24 -
 .../src/app/app.component.1.html              |   14 +-
 .../reactive-forms/src/app/app.component.html |   21 +-
 .../src/app/app.component.spec.ts             |   27 +
 .../reactive-forms/src/app/app.component.ts   |   19 +-
 .../reactive-forms/src/app/app.module.ts      |   55 +-
 .../reactive-forms/src/app/data-model.ts      |   40 -
 .../src/app/demo.component.html               |   40 -
 .../reactive-forms/src/app/demo.component.ts  |   49 -
 .../reactive-forms/src/app/demo.module.ts     |   33 -
 .../hero-detail/hero-detail-1.component.html  |    8 -
 .../hero-detail/hero-detail-1.component.ts    |   15 -
 .../hero-detail/hero-detail-2.component.html  |   18 -
 .../hero-detail/hero-detail-2.component.ts    |   17 -
 .../hero-detail/hero-detail-3.component.html  |   16 -
 .../hero-detail/hero-detail-3.component.ts    |   27 -
 .../hero-detail/hero-detail-3a.component.ts   |   25 -
 .../hero-detail/hero-detail-4.component.html  |   46 -
 .../hero-detail/hero-detail-4.component.ts    |   34 -
 .../hero-detail/hero-detail-5.component.html  |   56 -
 .../hero-detail/hero-detail-5.component.ts    |   35 -
 .../hero-detail/hero-detail-6.component.html  |   46 -
 .../hero-detail/hero-detail-6.component.ts    |   66 -
 .../hero-detail/hero-detail-7.component.html  |   46 -
 .../hero-detail/hero-detail-7.component.ts    |   68 -
 .../hero-detail/hero-detail-8.component.html  |   72 -
 .../hero-detail/hero-detail-8.component.ts    |   74 -
 .../app/hero-detail/hero-detail.component.css |    0
 .../hero-detail/hero-detail.component.html    |   73 -
 .../app/hero-detail/hero-detail.component.ts  |  113 --
 .../app/hero-list/hero-list.component.1.html  |    8 -
 .../src/app/hero-list/hero-list.component.css |    0
 .../app/hero-list/hero-list.component.html    |   17 -
 .../src/app/hero-list/hero-list.component.ts  |   32 -
 .../reactive-forms/src/app/hero.service.ts    |   25 -
 .../app/name-editor/name-editor.component.css |   19 +
 .../name-editor/name-editor.component.html    |   21 +
 .../app/name-editor/name-editor.component.ts  |   22 +
 .../profile-editor.component.1.html           |   67 +
 .../profile-editor.component.1.ts             |   40 +
 .../profile-editor.component.2.ts             |   58 +
 .../profile-editor.component.css              |   39 +
 .../profile-editor.component.html             |   80 +
 .../profile-editor.component.ts               |   73 +
 .../reactive-forms/src/index-final.html       |   17 -
 .../examples/reactive-forms/src/index.html    |    3 +-
 .../examples/reactive-forms/src/main-final.ts |   13 -
 .../examples/reactive-forms/src/main.ts       |    5 +-
 .../examples/reactive-forms/src/styles.1.css  |    1 -
 .../examples/reactive-forms/stackblitz.json   |    1 +
 aio/content/guide/reactive-forms.md           | 1657 +++++------------
 .../guide/reactive-forms/address-group.png    |  Bin 6022 -> 0 bytes
 .../guide/reactive-forms/addresses-array.png  |  Bin 4692 -> 0 bytes
 .../guide/reactive-forms/hero-detail.png      |  Bin 4608 -> 0 bytes
 .../images/guide/reactive-forms/hero-list.png |  Bin 5950 -> 0 bytes
 .../guide/reactive-forms/json-output.png      |  Bin 14427 -> 0 bytes
 .../guide/reactive-forms/just-formcontrol.png |  Bin 8732 -> 0 bytes
 .../guide/reactive-forms/name-editor-1.png    |  Bin 0 -> 8582 bytes
 .../guide/reactive-forms/name-editor-2.png    |  Bin 0 -> 22715 bytes
 .../guide/reactive-forms/profile-editor-1.png |  Bin 0 -> 18881 bytes
 .../guide/reactive-forms/profile-editor-2.png |  Bin 0 -> 17538 bytes
 .../guide/reactive-forms/profile-editor-3.png |  Bin 0 -> 34124 bytes
 .../guide/reactive-forms/profile-editor-4.png |  Bin 0 -> 42477 bytes
 .../reactive-forms/save-revert-buttons.png    |  Bin 7023 -> 0 bytes
 .../reactive-forms/validators-json-output.png |  Bin 24228 -> 0 bytes
 67 files changed, 1101 insertions(+), 3368 deletions(-)
 delete mode 100644 aio/content/examples/reactive-forms/debug.log
 delete mode 100644 aio/content/examples/reactive-forms/final.stackblitz.json
 create mode 100644 aio/content/examples/reactive-forms/src/app/app.component.spec.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/data-model.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/demo.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/demo.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/demo.module.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3a.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.css
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.1.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.css
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.html
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/app/hero.service.ts
 create mode 100644 aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.css
 create mode 100644 aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.html
 create mode 100644 aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.ts
 create mode 100644 aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.html
 create mode 100644 aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.ts
 create mode 100644 aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.2.ts
 create mode 100644 aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.css
 create mode 100644 aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.html
 create mode 100644 aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/index-final.html
 delete mode 100644 aio/content/examples/reactive-forms/src/main-final.ts
 delete mode 100644 aio/content/examples/reactive-forms/src/styles.1.css
 delete mode 100644 aio/content/images/guide/reactive-forms/address-group.png
 delete mode 100644 aio/content/images/guide/reactive-forms/addresses-array.png
 delete mode 100644 aio/content/images/guide/reactive-forms/hero-detail.png
 delete mode 100644 aio/content/images/guide/reactive-forms/hero-list.png
 delete mode 100644 aio/content/images/guide/reactive-forms/json-output.png
 delete mode 100644 aio/content/images/guide/reactive-forms/just-formcontrol.png
 create mode 100644 aio/content/images/guide/reactive-forms/name-editor-1.png
 create mode 100644 aio/content/images/guide/reactive-forms/name-editor-2.png
 create mode 100644 aio/content/images/guide/reactive-forms/profile-editor-1.png
 create mode 100644 aio/content/images/guide/reactive-forms/profile-editor-2.png
 create mode 100644 aio/content/images/guide/reactive-forms/profile-editor-3.png
 create mode 100644 aio/content/images/guide/reactive-forms/profile-editor-4.png
 delete mode 100644 aio/content/images/guide/reactive-forms/save-revert-buttons.png
 delete mode 100644 aio/content/images/guide/reactive-forms/validators-json-output.png

diff --git a/aio/content/examples/reactive-forms/debug.log b/aio/content/examples/reactive-forms/debug.log
deleted file mode 100644
index 9c0793f598..0000000000
--- a/aio/content/examples/reactive-forms/debug.log
+++ /dev/null
@@ -1,3 +0,0 @@
-[1030/162525.401:ERROR:process_reader_win.cc(123)] NtOpenThread: {Acceso denegado} Un proceso ha solicitado acceso a un objeto, pero no se le han concedido esos derechos de acceso.  (0xc0000022)
-[1030/162525.402:ERROR:exception_snapshot_win.cc(87)] thread ID 26896 not found in process
-[1030/162525.402:WARNING:crash_report_exception_handler.cc(62)] ProcessSnapshotWin::Initialize failed
diff --git a/aio/content/examples/reactive-forms/e2e/src/app.e2e-spec.ts b/aio/content/examples/reactive-forms/e2e/src/app.e2e-spec.ts
index 59c1ea797d..25022d2290 100644
--- a/aio/content/examples/reactive-forms/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/reactive-forms/e2e/src/app.e2e-spec.ts
@@ -2,1019 +2,144 @@
 
 import { browser, element, by } from 'protractor';
 
-function finalDemoAddressForm(element: any, index: number) {
-  let form = {
-    street: element.all(by.css('input[formcontrolname=street]')).get(index).getAttribute('value'),
-    city: element.all(by.css('input[formcontrolname=city]')).get(index).getAttribute('value'),
-    state: element.all(by.css('select[formcontrolname=state]')).get(index).getAttribute('value'),
-    zip: element.all(by.css('input[formcontrolname=zip]')).get(index).getAttribute('value')
-  };
-  return form;
-}
+describe('Reactive forms', function () {
+  const nameEditor = element(by.css('app-name-editor'));
+  const profileEditor = element(by.css('app-profile-editor'));
+  const nameEditorLink = element(by.cssContainingText('app-root > nav > a', 'Name Editor'));
+  const profileEditorLink = element(by.cssContainingText('app-root > nav > a', 'Profile Editor'));
 
-describe('Reactive forms', function() {
-  let select: any;
-
-  beforeEach(function() {
+  beforeAll(function () {
     browser.get('');
-    select = element(by.css('.container > h4 > select'));
   });
 
-  describe('navigation', function() {
-    it('should display the title', function() {
-      let title = element(by.css('.container > h1'));
-      expect(title.getText()).toBe('Reactive Forms');
+  describe('Name Editor', function () {
+    const nameInput = nameEditor.element(by.css('input'));
+    const updateButton = nameEditor.element(by.buttonText('Update Name'));
+    const nameText = 'John Smith';
+
+    beforeAll(async () => {
+      await nameEditorLink.click();
     });
 
-    it('should contain a dropdown with each example', function() {
-      expect(select.isDisplayed()).toBe(true);
+    beforeEach(async () => {
+      await nameInput.clear();
     });
 
-    it('should have 9 options for different demos', function() {
-      let options = select.all(by.tagName('option'));
-      expect(options.count()).toBe(9);
+    it('should update the name value when the name control is updated', async () => {
+      await nameInput.sendKeys(nameText);
+
+      const value = await nameInput.getAttribute('value');
+
+      expect(value).toBe(nameText);
     });
 
-    it('should start with Final Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('Final Demo');
-      });
+    it('should update the name control when the Update Name button is clicked', async () => {
+      await nameInput.sendKeys(nameText);
+      const value = await nameInput.getAttribute('value');
+
+      expect(value).toBe(nameText);
+      await updateButton.click();
+
+      const value = await nameInput.getAttribute('value');
+
+      expect(value).toBe('Nancy');
+    });
+
+    it('should update the displayed control value when the name control updated', async () => {
+      await nameInput.sendKeys(nameText);
+      const valueElement = nameEditor.element(by.cssContainingText('p', 'Value:'));
+      const nameValueElement = await valueElement.getText();
+      const nameValue = nameValueElement.toString().replace('Value: ',  '');
+
+      expect(nameValue).toBe(nameText);
     });
   });
 
-// *************Begin Final Demo test*******************************
+  describe('Profile Editor', function () {
+    const firstNameInput = getInput('firstName');
+    const lastNameInput = getInput('lastName');
+    const streetInput = getInput('street');
+    const addAliasButton = element(by.buttonText('Add Alias'));
+    const updateButton = profileEditor.element(by.buttonText('Update Profile'));
+    const profile = {
+      firstName: 'John',
+      lastName: 'Smith',
+      street: '345 South Lane',
+      city: 'Northtown',
+      state: 'XX',
+      zip: 12345
+    };
 
-  describe('final demo', function() {
-    it('does not select any hero by default', function() {
-      let heroSection = element(by.css('app-hero-list > div'));
-      expect(heroSection.isPresent()).toBe(false);
+    beforeAll(async () => {
+      await profileEditorLink.click();
     });
 
-    it('refreshes the page upon button click', function() {
-      // We move to another page...
-      let whirlwindButton = element.all(by.css('nav a')).get(0);
-      whirlwindButton.click();
-      let refresh = element(by.css('button'));
-      refresh.click();
-      let heroSection = element(by.css('app-hero-list > div'));
-      expect(heroSection.isPresent()).toBe(false);
+    beforeEach(async () => {
+      await browser.get('');
+      await profileEditorLink.click();
     });
 
-    describe('Whirlwind form', function() {
-      beforeEach(function() {
-        let whirlwindButton = element.all(by.css('nav a')).get(0);
-        whirlwindButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Whirlwind');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Whirlwind');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('123 Main');
-        expect(address1.state).toBe('CA');
-        expect(address1.zip).toBe('94801');
-        expect(address1.city).toBe('Anywhere');
-        let address2 = finalDemoAddressForm(element, 1);
-        expect(address2.street).toBe('456 Maple');
-        expect(address2.state).toBe('VA');
-        expect(address2.zip).toBe('23226');
-        expect(address2.city).toBe('Somewhere');
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail > p'));
-        expect(json.getText()).toContain('Whirlwind');
-        expect(json.getText()).toContain('Anywhere');
-        expect(json.getText()).toContain('Somewhere');
-        expect(json.getText()).toContain('VA');
-      });
-
-      it('has two disabled buttons by default', function() {
-        let buttons = element.all(by.css('app-hero-detail > form > div > button'));
-        expect(buttons.get(0).getAttribute('disabled')).toBe('true');
-        expect(buttons.get(1).getAttribute('disabled')).toBe('true');
-      });
-
-      it('enables the buttons after we edit the form', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let buttons = element.all(by.css('app-hero-detail > form > div > button'));
-        expect(buttons.get(0).getAttribute('disabled')).toBeNull();
-        expect(buttons.get(1).getAttribute('disabled')).toBeNull();
-      });
-
-      it('saves the changes when the save button is clicked', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let save = element.all(by.css('app-hero-detail > form > div > button')).get(0);
-        save.click();
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Whirlwinda');
-      });
-
-      it('reverts the changes when the revert button is clicked', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let revert = element.all(by.css('app-hero-detail > form > div > button')).get(1);
-        revert.click();
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Whirlwind');
-        expect(nameInput.getAttribute('value')).toBe('Whirlwind');
-      });
-
-      it('is able to add a new empty address', function() {
-        let newLairButton = element.all(by.css('button')).get(3);
-        newLairButton.click();
-        let address3 = finalDemoAddressForm(element, 2);
-        expect(address3.street).toBe('');
-        expect(address3.state).toBe('');
-        expect(address3.zip).toBe('');
-        expect(address3.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
+    it('should be invalid by default', async () => {
+      expect(await profileEditor.getText()).toContain('Form Status: INVALID');
     });
 
-    describe('Bombastic form', function() {
-      beforeEach(function() {
-        let bombastaButton = element.all(by.css('nav a')).get(1);
-        bombastaButton.click();
-      });
+    it('should be valid if the First Name is filled in', async () => {
+      await firstNameInput.clear();
+      await firstNameInput.sendKeys('John Smith');
 
-      it('should show a hero information when the button is clicked', function() {
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Bombastic');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Bombastic');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('789 Elm');
-        // expect(address1.state).toBe('OH');
-        expect(address1.zip).toBe('04501');
-        expect(address1.city).toBe('Smallville');
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail > p'));
-        expect(json.getText()).toContain('Bombastic');
-        expect(json.getText()).toContain('Smallville');
-        expect(json.getText()).toContain('OH');
-        expect(json.getText()).toContain('04501');
-      });
-
-      it('has two disabled buttons by default', function() {
-        let buttons = element.all(by.css('app-hero-detail > form > div > button'));
-        expect(buttons.get(0).getAttribute('disabled')).toBe('true');
-        expect(buttons.get(1).getAttribute('disabled')).toBe('true');
-      });
-
-      it('enables the buttons after we edit the form', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let buttons = element.all(by.css('app-hero-detail > form > div > button'));
-        expect(buttons.get(0).getAttribute('disabled')).toBeNull();
-        expect(buttons.get(1).getAttribute('disabled')).toBeNull();
-      });
-
-      it('saves the changes when the save button is clicked', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let save = element.all(by.css('app-hero-detail > form > div > button')).get(0);
-        save.click();
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Bombastica');
-      });
-
-      it('reverts the changes when the revert button is clicked', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let revert = element.all(by.css('app-hero-detail > form > div > button')).get(1);
-        revert.click();
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Bombastic');
-        expect(nameInput.getAttribute('value')).toBe('Bombastic');
-      });
-
-      it('is able to add a new empty address', function() {
-        let newLairButton = element.all(by.css('button')).get(3);
-        newLairButton.click();
-        let address2 = finalDemoAddressForm(element, 1);
-        expect(address2.street).toBe('');
-        expect(address2.state).toBe('');
-        expect(address2.zip).toBe('');
-        expect(address2.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
+      expect(await profileEditor.getText()).toContain('Form Status: VALID');
     });
 
-    describe('Magneta form', function() {
+    it('should update the name when the button is clicked', async () => {
+      await firstNameInput.clear();
+      await streetInput.clear();
+      await firstNameInput.sendKeys('John');
+      await streetInput.sendKeys('345 Smith Lane');
+      const firstNameInitial = await firstNameInput.getAttribute('value');
+      const streetNameInitial = await streetInput.getAttribute('value');
 
-      beforeEach(function() {
-        let magnetaButton = element.all(by.css('nav a')).get(2);
-        magnetaButton.click();
-      });
+      expect(firstNameInitial).toBe('John');
+      expect(streetNameInitial).toBe('345 Smith Lane');
+      await updateButton.click();
 
-      it('should show hero information when the button is clicked', function() {
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Magneta');
-      });
+      const nameValue = await firstNameInput.getAttribute('value');
+      const streetValue = await streetInput.getAttribute('value');
 
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Magneta');
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail > p'));
-        expect(json.getText()).toContain('Magneta');
-      });
-
-      it('has two disabled buttons by default', function() {
-        let buttons = element.all(by.css('app-hero-detail > form > div > button'));
-        expect(buttons.get(0).getAttribute('disabled')).toBe('true');
-        expect(buttons.get(1).getAttribute('disabled')).toBe('true');
-      });
-
-      it('enables the buttons after we edit the form', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let buttons = element.all(by.css('app-hero-detail > form > div > button'));
-        expect(buttons.get(0).getAttribute('disabled')).toBeNull();
-        expect(buttons.get(1).getAttribute('disabled')).toBeNull();
-      });
-
-      it('saves the changes when the save button is clicked', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let save = element.all(by.css('app-hero-detail > form > div > button')).get(0);
-        save.click();
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Magnetaa');
-      });
-
-      it('reverts the changes when the revert button is clicked', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        nameInput.sendKeys('a');
-        let revert = element.all(by.css('app-hero-detail > form > div > button')).get(1);
-        revert.click();
-        let editMessage = element(by.css('app-hero-list > div > h3'));
-        expect(editMessage.getText()).toBe('Editing: Magneta');
-        expect(nameInput.getAttribute('value')).toBe('Magneta');
-      });
-
-      it('is able to add a new empty address', function() {
-        let newLairButton = element.all(by.css('button')).get(3);
-        newLairButton.click();
-        let address = finalDemoAddressForm(element, 0);
-        expect(address.street).toBe('');
-        expect(address.state).toBe('');
-        expect(address.zip).toBe('');
-        expect(address.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-    });
-  }); // final demo
-
-// *************Begin FormArray Demo test*******************************
-
-
- describe('formArray demo', function() {
-    beforeEach(function() {
-        let FormArrayOption = element.all(by.css('select option')).get(7);
-        FormArrayOption.click();
+      expect(nameValue).toBe('Nancy');
+      expect(streetValue).toBe('123 Drew Street');
     });
 
-    it('should show FormArray Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('FormArray Demo');
-      });
-     });
+    it('should add an alias field when the Add Alias button is clicked', async () => {
+      await addAliasButton.click();
 
-    it('does not select any hero by default', function() {
-      let heroSection = element(by.css('app-hero-list > div'));
-      expect(heroSection.isPresent()).toBe(false);
+      const aliasInputs = profileEditor.all(by.cssContainingText('label', 'Alias'));
+
+      expect(await aliasInputs.count()).toBe(2);
     });
 
-    it('refreshes the page upon button click', function() {
-      // We move to another page...
-      let whirlwindButton = element.all(by.css('nav a')).get(0);
-      whirlwindButton.click();
-      let refresh = element(by.css('button'));
-      refresh.click();
-      let heroSection = element(by.css('app-hero-list > div'));
-      expect(heroSection.isPresent()).toBe(false);
+    it('should update the displayed form value when form inputs are updated', async () => {
+      const aliasText = 'Johnny';
+      const inputs = await Promise.all(
+        Object.keys(profile)
+          .map(key =>
+            getInput(key).sendKeys(`${profile[key]}`)
+          )
+      );
+
+      const aliasInputs = profileEditor.all(by.cssContainingText('label', 'Alias'));
+      const aliasInput = aliasInputs.get(0).element(by.css('input'));
+      await aliasInput.sendKeys(aliasText);
+      const formValueElement = profileEditor.all(by.cssContainingText('p', 'Form Value:'));
+      const formValue = await formValueElement.getText();
+      const formJson = JSON.parse(formValue.toString().replace('Form Value:', ''));
+
+      expect(profile.firstName).toBe(formJson.firstName);
+      expect(profile.lastName).toBe(formJson.lastName);
+      expect(formJson.aliases[0]).toBe(aliasText);
     });
+  });
 
-    describe('Whirlwind form', function() {
-      beforeEach(function() {
-        let whirlwindButton = element.all(by.css('nav a')).get(0);
-        whirlwindButton.click();
-      });
-
-      it('should show hero information when the button is clicked', function() {
-          let editMessage = element(by.css('div.demo > div > div > h3'));
-          expect(editMessage.getText()).toBe('Editing: Whirlwind');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Whirlwind');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('123 Main');
-        expect(address1.state).toBe('CA');
-        expect(address1.zip).toBe('94801');
-        expect(address1.city).toBe('Anywhere');
-        let address2 = finalDemoAddressForm(element, 1);
-        expect(address2.street).toBe('456 Maple');
-        expect(address2.state).toBe('VA');
-        expect(address2.zip).toBe('23226');
-        expect(address2.city).toBe('Somewhere');
-      });
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail-8 > p'));
-        expect(json.getText()).toContain('Whirlwind');
-        expect(json.getText()).toContain('Anywhere');
-        expect(json.getText()).toContain('Somewhere');
-        expect(json.getText()).toContain('VA');
-      });
-
-      it('is able to add a new empty address', function() {
-        let newLairButton = element.all(by.css('button')).get(1);
-        newLairButton.click();
-        let address2 = finalDemoAddressForm(element, 2);
-        expect(address2.street).toBe('');
-        expect(address2.state).toBe('');
-        expect(address2.zip).toBe('');
-        expect(address2.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-    }); // Whirlwind form
-
-    describe('Bombastic FormArray form', function() {
-      beforeEach(function() {
-        let bombasticButton = element.all(by.css('nav a')).get(1);
-        bombasticButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('div.demo > div > div > h3'));
-          expect(editMessage.getText()).toBe('Editing: Bombastic');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        // nameInput.getAttribute('value').then(function(name: string) {
-        //   expect(name).toBe('Whirlwind');
-        // });
-        expect(nameInput.getAttribute('value')).toBe('Bombastic');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('789 Elm');
-        // expect(address1.state).toBe('OH');
-        // This select should be OH not CA, which it shows in the UI, the JSON shows OH.
-        expect(address1.zip).toBe('04501');
-        expect(address1.city).toBe('Smallville');
-      });
-
-      it('shows a json output from the form', function() {
-          let json = element(by.css('app-hero-detail-8 > p'));
-          expect(json.getText()).toContain('Bombastic');
-          expect(json.getText()).toContain('Smallville');
-          expect(json.getText()).toContain('04501');
-          expect(json.getText()).toContain('789 Elm');
-        });
-
-      it('is able to add a new empty address', function() {
-        let newLairButton = element.all(by.css('button')).get(1);
-        newLairButton.click();
-        let address1 = finalDemoAddressForm(element, 1);
-        expect(address1.street).toBe('');
-        expect(address1.state).toBe('');
-        expect(address1.zip).toBe('');
-        expect(address1.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-    }); // Bombastic FormArray form
-
-    describe('Magneta FormArray form', function() {
-      beforeEach(function() {
-        let magnetaButton = element.all(by.css('nav a')).get(2);
-        magnetaButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('div.demo > div > div > h3'));
-          expect(editMessage.getText()).toBe('Editing: Magneta');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Magneta');
-      });
-
-      it('shows a json output from the form', function() {
-          let json = element(by.css('app-hero-detail-8 > p'));
-          expect(json.getText()).toContain('Magneta');
-        });
-
-      it('is able to add a new empty address', function() {
-        let newLairButton = element.all(by.css('button')).get(1);
-        newLairButton.click();
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('');
-        expect(address1.state).toBe('');
-        expect(address1.zip).toBe('');
-        expect(address1.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-    }); // Magneta FormArray form
-
-  }); // formArray demo
-
-
-// *************Begin SetValue Demo test*******************************
-
- describe('SetValue demo', function() {
-    beforeEach(function() {
-      let SetValueOption = element.all(by.css('select option')).get(6);
-      SetValueOption.click();
-    });
-
-    it('should show SetValue Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('SetValue Demo');
-      });
-     });
-
-    it('does not select any hero by default', function() {
-      let heroSection = element(by.css('app-hero-list > div'));
-      expect(heroSection.isPresent()).toBe(false);
-    });
-
-    it('refreshes the page upon button click', function() {
-      // We move to another page...
-      let whirlwindButton = element.all(by.css('nav a')).get(0);
-      whirlwindButton.click();
-      let refresh = element(by.css('button'));
-      refresh.click();
-      let heroSection = element(by.css('app-hero-list > div'));
-      expect(heroSection.isPresent()).toBe(false);
-    });
-
-    describe('Whirlwind setValue form', function() {
-      beforeEach(function() {
-        let whirlwindButton = element.all(by.css('nav a')).get(0);
-        whirlwindButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('.demo > div > div > h3'));
-          expect(editMessage.getText()).toBe('Editing: Whirlwind');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Whirlwind');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('123 Main');
-        expect(address1.state).toBe('CA');
-        expect(address1.zip).toBe('94801');
-        expect(address1.city).toBe('Anywhere');
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail-7 > p'));
-        expect(json.getText()).toContain('Whirlwind');
-        expect(json.getText()).toContain('Anywhere');
-        let nameOutput = element(by.css('app-hero-detail-7 > p ~ p'));
-        expect(nameOutput.getText()).toContain('Name value: Whirlwind');
-        let streetOutput = element(by.css('app-hero-detail-7 > p ~ p ~ p'));
-        expect(streetOutput.getText()).toContain('Street value: 123 Main');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-    }); // Whirlwind setValue form
-
-    describe('Bombastic setValue form', function() {
-      beforeEach(function() {
-        let bombasticButton = element.all(by.css('nav a')).get(1);
-        bombasticButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('.demo > div > div > h3'));
-          expect(editMessage.getText()).toBe('Editing: Bombastic');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Bombastic');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('789 Elm');
-        expect(address1.state).toBe('OH');
-        expect(address1.zip).toBe('04501');
-        expect(address1.city).toBe('Smallville');
-      });
-
-      it('shows a json output from the form', function() {
-          let json = element(by.css('app-hero-detail-7 > p'));
-          expect(json.getText()).toContain('Bombastic');
-          expect(json.getText()).toContain('Smallville');
-          expect(json.getText()).toContain('04501');
-          expect(json.getText()).toContain('789 Elm');
-          let nameOutput = element(by.css('app-hero-detail-7 > p ~ p'));
-          expect(nameOutput.getText()).toContain('Name value: Bombastic');
-          let streetOutput = element(by.css('app-hero-detail-7 > p ~ p ~ p'));
-          expect(streetOutput.getText()).toContain('Street value: 789 Elm');
-        });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-    }); // Bombastic setValue form
-
-    describe('Magneta setValue form', function() {
-      beforeEach(function() {
-        let magnetaButton = element.all(by.css('nav a')).get(2);
-        magnetaButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('.demo > div > div > h3'));
-          expect(editMessage.getText()).toBe('Editing: Magneta');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Magneta');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-      it('shows a json output from the form', function() {
-          let json = element(by.css('app-hero-detail-7 > p'));
-          expect(json.getText()).toContain('Magneta');
-          let nameOutput = element(by.css('app-hero-detail-7 > p ~ p'));
-          expect(nameOutput.getText()).toContain('Name value: Magneta');
-          let streetOutput = element(by.css('app-hero-detail-7 > p ~ p ~ p'));
-          expect(streetOutput.getText()).toContain('Street value:');
-        });
-
-    }); // Magneta setValue form
-  }); // SetValue demo
-
-// *************Begin patchValue Demo test*******************************
-
- describe('patchValue demo', function() {
-    beforeEach(function() {
-      let SetValueOption = element.all(by.css('select option')).get(5);
-      SetValueOption.click();
-    });
-
-    it('should show patchValue Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('PatchValue Demo');
-      });
-     });
-
-    it('does not select any hero by default', function() {
-      let heroSection = element(by.css('.demo > div > div'));
-      expect(heroSection.isPresent()).toBe(false);
-    });
-
-    it('refreshes the page upon button click', function() {
-      // We move to another page...
-      let whirlwindButton = element.all(by.css('nav a')).get(0);
-      whirlwindButton.click();
-      let refresh = element(by.css('button'));
-      refresh.click();
-      let heroSection = element(by.css('.demo > div > div'));
-      expect(heroSection.isPresent()).toBe(false);
-    });
-
-    describe('Whirlwind patchValue form', function() {
-      beforeEach(function() {
-        let whirlwindButton = element.all(by.css('nav a')).get(0);
-        whirlwindButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('h2 ~ h3'));
-          expect(editMessage.getText()).toBe('Editing: Whirlwind');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Whirlwind');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('');
-        expect(address1.state).toBe('');
-        expect(address1.zip).toBe('');
-        expect(address1.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail-6 > p'));
-        expect(json.getText()).toContain('Whirlwind');
-        let nameOutput = element(by.css('app-hero-detail-6 > p ~ p'));
-        expect(nameOutput.getText()).toContain('Name value: Whirlwind');
-        let streetOutput = element(by.css('app-hero-detail-6 > p ~ p ~ p'));
-        expect(streetOutput.getText()).toContain('Street value:');
-      });
-
-
-    }); // Bombastic patchValue form
-    describe('Bombastic patchValue form', function() {
-      beforeEach(function() {
-        let bombasticButton = element.all(by.css('nav a')).get(1);
-        bombasticButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('h2 ~ h3'));
-          expect(editMessage.getText()).toBe('Editing: Bombastic');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Bombastic');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('');
-        expect(address1.state).toBe('');
-        expect(address1.zip).toBe('');
-        expect(address1.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail-6 > p'));
-        expect(json.getText()).toContain('Bombastic');
-        let nameOutput = element(by.css('app-hero-detail-6 > p ~ p'));
-        expect(nameOutput.getText()).toContain('Name value: Bombastic');
-        let streetOutput = element(by.css('app-hero-detail-6 > p ~ p ~ p'));
-        expect(streetOutput.getText()).toContain('Street value:');
-      });
-    }); // Bombastic patchValue form
-
-    describe('Magneta patchValue form', function() {
-      beforeEach(function() {
-        let magnetaButton = element.all(by.css('nav a')).get(2);
-        magnetaButton.click();
-      });
-
-      it('should show a hero information when the button is clicked', function() {
-          let editMessage = element(by.css('h2 ~ h3'));
-          expect(editMessage.getText()).toBe('Editing: Magneta');
-      });
-
-      it('should show a form with the selected hero information', function() {
-        let nameInput = element(by.css('input[formcontrolname=name]'));
-        expect(nameInput.getAttribute('value')).toBe('Magneta');
-        let address1 = finalDemoAddressForm(element, 0);
-        expect(address1.street).toBe('');
-        expect(address1.state).toBe('');
-        expect(address1.zip).toBe('');
-        expect(address1.city).toBe('');
-      });
-
-      it('should show three radio buttons', function() {
-        let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-        expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-        expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-        expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-      });
-
-      it('should show a checkbox', function() {
-        let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-        expect(checkbox.getAttribute('checked')).toBe(null);
-      });
-
-      it('shows a json output from the form', function() {
-        let json = element(by.css('app-hero-detail-6 > p'));
-        expect(json.getText()).toContain('Magneta');
-        let nameOutput = element(by.css('app-hero-detail-6 > p ~ p'));
-        expect(nameOutput.getText()).toContain('Name value: Magneta');
-        let streetOutput = element(by.css('app-hero-detail-6 > p ~ p ~ p'));
-        expect(streetOutput.getText()).toContain('Street value:');
-      });
-
-    }); // Magneta patchValue form
-  }); // PatchValue demo
-
-
-
-// *************Begin Nested FormBuilder Demo test*******************************
-
- describe('Nested FormBuilder demo', function() {
-    beforeEach(function() {
-      let NestedFormBuilderOption = element.all(by.css('select option')).get(4);
-      NestedFormBuilderOption.click();
-    });
-
-    it('should show Nested FormBuilder Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('Nested FormBuilder group Demo');
-      });
-     });
-
-    it('should show a form for hero information', function() {
-      let nameInput = element(by.css('input[formcontrolname=name]'));
-      expect(nameInput.getAttribute('value')).toBe('');
-      let address1 = finalDemoAddressForm(element, 0);
-      expect(address1.street).toBe('');
-      expect(address1.state).toBe('');
-      expect(address1.zip).toBe('');
-      expect(address1.city).toBe('');
-    });
-
-    it('should show three radio buttons', function() {
-      let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-      expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-      expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-      expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-    });
-
-    it('should show a checkbox', function() {
-      let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-      expect(checkbox.getAttribute('checked')).toBe(null);
-    });
-
-    it('shows a json output from the form', function() {
-      let json = element(by.css('app-hero-detail-5 > p'));
-      expect(json.getText()).toContain('address');
-      let nameOutput = element(by.css('app-hero-detail-5 > p ~ p'));
-      expect(nameOutput.getText()).toContain('Name value:');
-      let streetOutput = element(by.css('app-hero-detail-5 > p ~ p ~ p'));
-      expect(streetOutput.getText()).toContain('Street value:');
-    });
-
-  }); // Nested FormBuilder demo
-
-// *************Begin Group with multiple controls Demo test*******************************
-
- describe('Group with multiple controls demo', function() {
-    beforeEach(function() {
-      let NestedFormBuilderOption = element.all(by.css('select option')).get(3);
-      NestedFormBuilderOption.click();
-    });
-
-    it('should show Group with multiple controls Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('Group with multiple controls Demo');
-      });
-     });
-
-    it('should show header', function() {
-        let header = element(by.css('app-hero-detail-4 > h3'));
-        expect(header.getText()).toBe('A FormGroup with multiple FormControls');
-    });
-
-    it('should show a form for hero information', function() {
-      let nameInput = element(by.css('input[formcontrolname=name]'));
-      expect(nameInput.getAttribute('value')).toBe('');
-      let address1 = finalDemoAddressForm(element, 0);
-      expect(address1.street).toBe('');
-      expect(address1.state).toBe('');
-      expect(address1.zip).toBe('');
-      expect(address1.city).toBe('');
-    });
-
-    it('should show three radio buttons', function() {
-      let radioButtons = element.all(by.css('input[formcontrolname=power]'));
-      expect(radioButtons.get(0).getAttribute('value')).toBe('flight');
-      expect(radioButtons.get(1).getAttribute('value')).toBe('x-ray vision');
-      expect(radioButtons.get(2).getAttribute('value')).toBe('strength');
-    });
-    it('should show a checkbox', function() {
-      let checkbox = element(by.css('input[formcontrolname=sidekick]'));
-      expect(checkbox.getAttribute('checked')).toBe(null);
-    });
-    it('shows a json output from the form', function() {
-      let json = element(by.css('app-hero-detail-4 > p'));
-      expect(json.getText()).toContain('power');
-    });
-
-}); // Group with multiple controls demo
-
-
-
-// *************Begin Group with multiple controls Demo test*******************************
-
- describe('Simple FormBuilder Group demo', function() {
-    beforeEach(function() {
-      let SimpleFormBuilderOption = element.all(by.css('select option')).get(2);
-      SimpleFormBuilderOption.click();
-    });
-
-    it('should show Simple FormBuilder group Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('Simple FormBuilder group Demo');
-      });
-     });
-
-    it('should show header', function() {
-        let header = element(by.css('app-hero-detail-3 > h3'));
-        expect(header.getText()).toBe('A FormGroup with a single FormControl using FormBuilder');
-    });
-
-    it('should show a form for hero information', function() {
-      let nameInput = element(by.css('input[formcontrolname=name]'));
-      expect(nameInput.getAttribute('value')).toBe('');
-    });
-
-    it('shows a json output from the form', function() {
-      let json = element(by.css('app-hero-detail-3 > p'));
-      expect(json.getText()).toContain('name');
-      let validStatus = element(by.css('app-hero-detail-3 > p ~ p'));
-      expect(validStatus.getText()).toContain('INVALID');
-    });
-
-}); // Group with multiple controls demo
-
-
-// *************Begin FormControl in a FormGroup Demo test*******************************
-
- describe('FormControl in a FormGroup demo', function() {
-    beforeEach(function() {
-      let SimpleFormBuilderOption = element.all(by.css('select option')).get(1);
-      SimpleFormBuilderOption.click();
-    });
-
-    it('should show FormControl in a FormGroup Demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('FormControl in a FormGroup Demo');
-      });
-     });
-
-    it('should show header', function() {
-        let header = element(by.css('app-hero-detail-2 > h3'));
-        expect(header.getText()).toBe('FormControl in a FormGroup');
-    });
-
-    it('should show a form for hero information', function() {
-      let nameInput = element(by.css('input[formcontrolname=name]'));
-      expect(nameInput.getAttribute('value')).toBe('');
-    });
-
-    it('shows a json output from the form', function() {
-      let json = element(by.css('app-hero-detail-2 > p'));
-      expect(json.getText()).toContain('name');
-    });
-
-}); // Group with multiple controls demo
-
-// *************Begin Just A FormControl Demo test*******************************
-
- describe('Just a FormControl demo', function() {
-    beforeEach(function() {
-      let FormControlOption = element.all(by.css('select option')).get(0);
-      FormControlOption.click();
-    });
-
-    it('should show Just a FormControl demo', function() {
-      select.getAttribute('value').then(function(demo: string) {
-        expect(demo).toBe('Just a FormControl Demo');
-      });
-     });
-
-    it('should show header', function() {
-        let header = element(by.css('app-hero-detail-1 > h3'));
-        expect(header.getText()).toBe('Just a FormControl');
-    });
-
-    it('should show a form for hero information', function() {
-      let nameInput = element(by.css('input'));
-      expect(nameInput.getAttribute('value')).toBe('');
-    });
-
-  }); // Just a FormControl demo test
-
-
-}); // reactive forms
+  function getInput(key: string) {
+    return element(by.css(`input[formcontrolname=${key}`));
+  }
+});
diff --git a/aio/content/examples/reactive-forms/final.stackblitz.json b/aio/content/examples/reactive-forms/final.stackblitz.json
deleted file mode 100644
index f789236245..0000000000
--- a/aio/content/examples/reactive-forms/final.stackblitz.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "description": "Angular Reactive Forms (final)",
-  "files":[
-    "src/styles.css",
-
-    "src/app/app.component.ts",
-    "src/app/app.component.html",
-    "src/app/app.component.css",
-    "src/app/app.module.ts",
-    "src/app/data-model.ts",
-    "src/app/hero.service.ts",
-    "src/app/hero-detail/hero-detail.component.html",
-    "src/app/hero-detail/hero-detail.component.ts",
-    "src/app/hero-detail/hero-detail.component.css",
-    "src/app/hero-list/hero-list.component.html",
-    "src/app/hero-list/hero-list.component.ts",
-    "src/app/hero-list/hero-list.component.css",
-
-    "src/main-final.ts",
-    "src/index-final.html"
-  ],
-  "main": "src/index-final.html",
-  "tags": ["reactive", "forms"]
-}
diff --git a/aio/content/examples/reactive-forms/src/app/app.component.1.html b/aio/content/examples/reactive-forms/src/app/app.component.1.html
index 14316fbe62..57ca7e22fb 100644
--- a/aio/content/examples/reactive-forms/src/app/app.component.1.html
+++ b/aio/content/examples/reactive-forms/src/app/app.component.1.html
@@ -1,4 +1,10 @@
-<div class="container">
-  <h1>Reactive Forms</h1>
-  <app-hero-detail></app-hero-detail>
-</div>
+<!-- #docplaster -->
+<h1>Reactive Forms</h1>
+
+<!-- #docregion app-name-editor-->
+<app-name-editor></app-name-editor>
+<!-- #enddocregion app-name-editor-->
+
+<!-- #docregion app-profile-editor -->
+<app-profile-editor></app-profile-editor>
+<!-- #enddocregion app-profile-editor -->
\ No newline at end of file
diff --git a/aio/content/examples/reactive-forms/src/app/app.component.html b/aio/content/examples/reactive-forms/src/app/app.component.html
index b7d0e6d580..a953480634 100644
--- a/aio/content/examples/reactive-forms/src/app/app.component.html
+++ b/aio/content/examples/reactive-forms/src/app/app.component.html
@@ -1,4 +1,17 @@
-<div class="container">
-  <h1>Reactive Forms</h1>
-  <app-hero-list></app-hero-list>
-</div>
+<!-- #docplaster -->
+<!-- #docregion app-name-editor -->
+<h1>Reactive Forms</h1>
+
+<!-- #enddocregion app-name-editor -->
+<nav>
+  <a (click)="toggleEditor('name')">Name Editor</a>
+  <a (click)="toggleEditor('profile')">Profile Editor</a>
+</nav>
+
+<!-- #docregion app-name-editor -->
+<app-name-editor *ngIf="showNameEditor"></app-name-editor>
+<!-- #enddocregion app-name-editor -->
+
+<!-- #docregion app-profile-editor -->
+<app-profile-editor *ngIf="showProfileEditor"></app-profile-editor>
+<!-- #enddocregion app-profile-editor -->
diff --git a/aio/content/examples/reactive-forms/src/app/app.component.spec.ts b/aio/content/examples/reactive-forms/src/app/app.component.spec.ts
new file mode 100644
index 0000000000..fff9fa666d
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/app.component.spec.ts
@@ -0,0 +1,27 @@
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('app');
+  }));
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to reactive-forms!');
+  }));
+});
diff --git a/aio/content/examples/reactive-forms/src/app/app.component.ts b/aio/content/examples/reactive-forms/src/app/app.component.ts
index f7baece9b5..5c9993b6b6 100644
--- a/aio/content/examples/reactive-forms/src/app/app.component.ts
+++ b/aio/content/examples/reactive-forms/src/app/app.component.ts
@@ -1,9 +1,24 @@
-// #docregion
 import { Component } from '@angular/core';
 
+export type EditorType = 'name' | 'profile';
+
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent { }
+export class AppComponent {
+  editor: EditorType = 'name';
+
+  get showNameEditor() {
+    return this.editor === 'name';
+  }
+
+  get showProfileEditor() {
+    return this.editor === 'profile';
+  }
+
+  toggleEditor(type: EditorType) {
+    this.editor = type;
+  }
+}
diff --git a/aio/content/examples/reactive-forms/src/app/app.module.ts b/aio/content/examples/reactive-forms/src/app/app.module.ts
index 39b074c178..9ccc26e4af 100644
--- a/aio/content/examples/reactive-forms/src/app/app.module.ts
+++ b/aio/content/examples/reactive-forms/src/app/app.module.ts
@@ -1,45 +1,34 @@
 // #docplaster
-// #docregion
-// #docregion v1
-import { NgModule }            from '@angular/core';
-import { BrowserModule }       from '@angular/platform-browser';
-import { ReactiveFormsModule } from '@angular/forms';  // <-- #1 import module
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+// #docregion imports
+import { ReactiveFormsModule } from '@angular/forms';
 
-import { AppComponent }        from './app.component';
-import { HeroDetailComponent } from './hero-detail/hero-detail.component';
-// #enddocregion v1
-// #docregion hero-service-list
-// add JavaScript imports
-import { HeroListComponent }   from './hero-list/hero-list.component';
-import { HeroService }         from './hero.service';
-// #docregion v1
+// #enddocregion imports
+import { AppComponent } from './app.component';
+import { NameEditorComponent } from './name-editor/name-editor.component';
+import { ProfileEditorComponent } from './profile-editor/profile-editor.component';
 
+// #docregion imports
 @NgModule({
+// #enddocregion imports
   declarations: [
     AppComponent,
-    HeroDetailComponent,
-// #enddocregion v1
-    HeroListComponent // <--declare HeroListComponent
-// #docregion v1
+    NameEditorComponent,
+    ProfileEditorComponent
   ],
- // #enddocregion hero-service-list
+// #docregion imports
   imports: [
+// #enddocregion imports
     BrowserModule,
-    ReactiveFormsModule // <-- #2 add to @NgModule imports
+// #docregion imports
+    // other imports ...
+    ReactiveFormsModule
   ],
-  // #enddocregion v1
-  // export for the DemoModule
-  // #docregion hero-service-list
-  // ...
-  exports: [
-    AppComponent,
-    HeroDetailComponent,
-    HeroListComponent // <-- export HeroListComponent
-  ],
-  providers: [ HeroService ], // <-- provide HeroService
-// #enddocregion hero-service-list
-// #docregion v1
-  bootstrap: [ AppComponent ]
+// #enddocregion imports
+  providers: [],
+  bootstrap: [AppComponent]
+// #docregion imports
 })
 export class AppModule { }
-// #enddocregion v1
+// #enddocregion imports
diff --git a/aio/content/examples/reactive-forms/src/app/data-model.ts b/aio/content/examples/reactive-forms/src/app/data-model.ts
deleted file mode 100644
index ad01ddee56..0000000000
--- a/aio/content/examples/reactive-forms/src/app/data-model.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// #docregion
-// #docregion model-classes
-export class Hero {
-  id = 0;
-  name = '';
-  addresses: Address[];
-}
-
-export class Address {
-  street = '';
-  city   = '';
-  state  = '';
-  zip    = '';
-}
-// #enddocregion model-classes
-
-export const heroes: Hero[] = [
-  {
-    id: 1,
-    name: 'Whirlwind',
-    addresses: [
-      {street: '123 Main',  city: 'Anywhere', state: 'CA',  zip: '94801'},
-      {street: '456 Maple', city: 'Somewhere', state: 'VA', zip: '23226'},
-    ]
-  },
-  {
-    id: 2,
-    name: 'Bombastic',
-    addresses: [
-      {street: '789 Elm',  city: 'Smallville', state: 'OH',  zip: '04501'},
-    ]
-  },
-  {
-    id: 3,
-    name: 'Magneta',
-    addresses: [ ]
-  },
-];
-
-export const states = ['CA', 'MD', 'OH', 'VA'];
diff --git a/aio/content/examples/reactive-forms/src/app/demo.component.html b/aio/content/examples/reactive-forms/src/app/demo.component.html
deleted file mode 100644
index 369427a739..0000000000
--- a/aio/content/examples/reactive-forms/src/app/demo.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="container">
-<h1>Reactive Forms</h1>
-<h4><i>Pick a demo:</i>
-  <select [selectedIndex]="demo - 1" (change)="selectDemo($event.target.selectedIndex)">
-    <option *ngFor="let demo of demos">{{demo}}</option>
-  </select>
-</h4>
-
-<hr>
-
-<div class="demo">
-  <app-hero-list *ngIf="demo===final"></app-hero-list>
-  <app-hero-detail-1 *ngIf="demo===1"></app-hero-detail-1>
-  <app-hero-detail-2 *ngIf="demo===2"></app-hero-detail-2>
-  <app-hero-detail-3 *ngIf="demo===3"></app-hero-detail-3>
-  <app-hero-detail-4 *ngIf="demo===4"></app-hero-detail-4>
-  <app-hero-detail-5 *ngIf="demo===5"></app-hero-detail-5>
-
-  <div *ngIf="demo >= 6 && demo !== final" >
-
-    <h3 *ngIf="isLoading"><i>Loading heroes ... </i></h3>
-    <h3 *ngIf="!isLoading">Select a hero:</h3>
-
-    <nav>
-      <button (click)="getHeroes()" class="btn btn-primary">Refresh</button>
-      <a *ngFor="let hero of heroes | async" (click)="select(hero)">{{hero.name}}</a>
-    </nav>
-
-    <div *ngIf="selectedHero">
-      <hr>
-      <h2>Hero Detail</h2>
-      <h3>Editing: {{selectedHero.name}}</h3>
-      <app-hero-detail-6 [hero]=selectedHero *ngIf="demo===6"></app-hero-detail-6>
-      <app-hero-detail-7 [hero]=selectedHero *ngIf="demo===7"></app-hero-detail-7>
-      <app-hero-detail-8 [hero]=selectedHero *ngIf="demo===8"></app-hero-detail-8>
-
-    </div>
-  </div>
-</div>
-</div>
diff --git a/aio/content/examples/reactive-forms/src/app/demo.component.ts b/aio/content/examples/reactive-forms/src/app/demo.component.ts
deleted file mode 100644
index 71658e7b6b..0000000000
--- a/aio/content/examples/reactive-forms/src/app/demo.component.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/* tslint:disable:member-ordering */
-import { Component }  from '@angular/core';
-import { Observable } from 'rxjs';
-import { finalize } from 'rxjs/operators';
-
-import { Hero }        from './data-model';
-import { HeroService } from './hero.service';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './demo.component.html'
-})
-export class DemoComponent {
-
-  demos: string[] = [
-    'Just a FormControl',
-    'FormControl in a FormGroup',
-    'Simple FormBuilder group',
-    'Group with multiple controls',
-    'Nested FormBuilder group',
-    'PatchValue',
-    'SetValue',
-    'FormArray',
-    'Final'].map(n => n + ' Demo');
-
-  final = this.demos.length;
-  demo = this.final; // current demo
-
-  heroes: Observable<Hero[]>;
-  isLoading = false;
-  selectedHero: Hero;
-
-  constructor(private heroService: HeroService) { }
-
-  getHeroes() {
-    this.isLoading = true;
-    this.heroes = this.heroService.getHeroes().pipe(
-                      finalize(() => this.isLoading = false)
-    );
-    this.selectedHero = undefined;
-  }
-
-  select(hero: Hero) { this.selectedHero = hero; }
-
-  selectDemo(demo: number) {
-    this.demo = demo + 1;
-    this.getHeroes();
-  }
-}
diff --git a/aio/content/examples/reactive-forms/src/app/demo.module.ts b/aio/content/examples/reactive-forms/src/app/demo.module.ts
deleted file mode 100644
index a8b71ab5b6..0000000000
--- a/aio/content/examples/reactive-forms/src/app/demo.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NgModule }             from '@angular/core';
-import { BrowserModule }        from '@angular/platform-browser';
-import { ReactiveFormsModule }  from '@angular/forms';
-
-import { AppModule }            from './app.module';
-import { DemoComponent }        from './demo.component';
-import { HeroDetailComponent1 } from './hero-detail/hero-detail-1.component';
-import { HeroDetailComponent2 } from './hero-detail/hero-detail-2.component';
-import { HeroDetailComponent3 } from './hero-detail/hero-detail-3.component';
-import { HeroDetailComponent4 } from './hero-detail/hero-detail-4.component';
-import { HeroDetailComponent5 } from './hero-detail/hero-detail-5.component';
-import { HeroDetailComponent6 } from './hero-detail/hero-detail-6.component';
-import { HeroDetailComponent7 } from './hero-detail/hero-detail-7.component';
-import { HeroDetailComponent8 } from './hero-detail/hero-detail-8.component';
-
-@NgModule({
-  imports: [
-    BrowserModule,
-    ReactiveFormsModule,
-    AppModule,
-  ],
-  declarations: [ DemoComponent,
-  HeroDetailComponent1,
-  HeroDetailComponent2,
-  HeroDetailComponent3,
-  HeroDetailComponent4,
-  HeroDetailComponent5,
-  HeroDetailComponent6,
-  HeroDetailComponent7,
-  HeroDetailComponent8],
-  bootstrap:    [ DemoComponent ]
-})
-export class DemoModule { }
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.html
deleted file mode 100644
index 7217708d22..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- #docregion simple-control-->
-<h2>Hero Detail</h2>
-<h3><i>Just a FormControl</i></h3>
-<label class="center-block">Name:
-  <input class="form-control" [formControl]="name">
-</label>
-<!-- #enddocregion simple-control-->
-
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.ts
deleted file mode 100644
index 7ce88f3522..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-1.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* tslint:disable:component-class-suffix */
-
-import { Component } from '@angular/core';
-// #docregion import
-import { FormControl } from '@angular/forms';
-// #enddocregion import
-
-@Component({
-  selector: 'app-hero-detail-1',
-  templateUrl: './hero-detail-1.component.html'
-})
-// #docregion v1
-export class HeroDetailComponent1 {
-  name = new FormControl();
-}
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html
deleted file mode 100644
index 79410c4a6d..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- #docregion basic-form-->
-<h2>Hero Detail</h2>
-<h3><i>FormControl in a FormGroup</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-</form>
-<!-- #enddocregion basic-form-->
-
-<!-- #docregion form-value-json -->
-<p>Form value: {{ heroForm.value | json }}</p>
-<!-- #enddocregion form-value-json  -->
-
-
-
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.ts
deleted file mode 100644
index 6508904ffa..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }              from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-2',
-  templateUrl: './hero-detail-2.component.html'
-})
-// #docregion v2
-export class HeroDetailComponent2 {
-  heroForm = new FormGroup ({
-    name: new FormControl()
-  });
-}
-// #enddocregion v2
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.html
deleted file mode 100644
index 89c5513566..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- #docregion basic-form-->
-<h2>Hero Detail</h2>
-<h3><i>A FormGroup with a single FormControl using FormBuilder</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-</form>
-<!-- #enddocregion basic-form-->
-
-<!-- #docregion form-value-json -->
-<p>Form value: {{ heroForm.value | json }}</p>
-<p>Form status: {{ heroForm.status | json }}</p>
-<!-- #enddocregion form-value-json -->
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.ts
deleted file mode 100644
index 81388c8faa..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }                          from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-3',
-  templateUrl: './hero-detail-3.component.html'
-})
-// #docregion v3
-export class HeroDetailComponent3 {
-  heroForm: FormGroup; // <--- heroForm is of type FormGroup
-
-  constructor(private fb: FormBuilder) { // <--- inject FormBuilder
-    this.createForm();
-  }
-
-  createForm() {
-    // #docregion required
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-    });
-    // #enddocregion required
-  }
-}
-// #enddocregion v3
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3a.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3a.component.ts
deleted file mode 100644
index 7cc0b1ca8f..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3a.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }              from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-3',
-  templateUrl: './hero-detail-3.component.html'
-})
-// #docregion v3a
-export class HeroDetailComponent3 {
-  heroForm: FormGroup; // <--- heroForm is of type FormGroup
-
-  constructor(private fb: FormBuilder) { // <--- inject FormBuilder
-    this.createForm();
-  }
-
-  createForm() {
-    this.heroForm = this.fb.group({
-      name: '', // <--- the FormControl called "name"
-    });
-  }
-}
-// #enddocregion v3a
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.html
deleted file mode 100644
index 8702eeb540..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- #docregion -->
-<h2>Hero Detail</h2>
-<h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Street:
-      <input class="form-control" formControlName="street">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">City:
-      <input class="form-control" formControlName="city">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">State:
-      <select class="form-control" formControlName="state">
-          <option *ngFor="let state of states" [value]="state">{{state}}</option>
-      </select>
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Zip Code:
-      <input class="form-control" formControlName="zip">
-    </label>
-  </div>
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-
-
-<p>Form value: {{ heroForm.value | json }}</p>
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.ts
deleted file mode 100644
index b9a61aa1ea..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }                          from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-
-import { states } from '../data-model';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-4',
-  templateUrl: './hero-detail-4.component.html'
-})
-// #docregion v4
-export class HeroDetailComponent4 {
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      street: '',
-      city: '',
-      state: '',
-      zip: '',
-      power: '',
-      sidekick: ''
-    });
-  }
-}
-// #enddocregion v4
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.html
deleted file mode 100644
index bc73ce006e..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-<form [formGroup]="heroForm">
-    <div class="form-group">
-      <label class="center-block">Name:
-        <input class="form-control" formControlName="name">
-      </label>
-    </div>
-<!-- #docregion add-group-->
-    <div formGroupName="address" class="well well-lg">
-      <h4>Secret Lair</h4>
-      <div class="form-group">
-        <label class="center-block">Street:
-          <input class="form-control" formControlName="street">
-        </label>
-      </div>
-      <div class="form-group">
-        <label class="center-block">City:
-          <input class="form-control" formControlName="city">
-        </label>
-      </div>
-      <div class="form-group">
-        <label class="center-block">State:
-          <select class="form-control" formControlName="state">
-            <option *ngFor="let state of states" [value]="state">{{state}}</option>
-          </select>
-        </label>
-      </div>
-      <div class="form-group">
-        <label class="center-block">Zip Code:
-          <input class="form-control" formControlName="zip">
-        </label>
-      </div>
-    </div>
-<!-- #enddocregion add-group-->
-    <div class="form-group radio">
-      <h4>Super power:</h4>
-      <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-      <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-      <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-    </div>
-    <div class="checkbox">
-      <label class="center-block">
-        <input type="checkbox" formControlName="sidekick">I have a sidekick.
-      </label>
-    </div>
-</form>
-
-<p>heroForm value: {{ heroForm.value | json}}</p>
-<h4>Extra info for the curious:</h4>
-<!-- #docregion inspect-value -->
-<p>Name value: {{ heroForm.get('name').value }}</p>
-<!-- #enddocregion inspect-value -->
-
-<!-- #docregion inspect-child-control -->
-<p>Street value: {{ heroForm.get('address.street').value}}</p>
-<!-- #enddocregion inspect-child-control -->
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.ts
deleted file mode 100644
index 1193265c5b..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/* tslint:disable:component-class-suffix */
-import { Component }                          from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-
-import { states } from '../data-model';
-
-@Component({
-  selector: 'app-hero-detail-5',
-  templateUrl: './hero-detail-5.component.html'
-})
-// #docregion v5
-export class HeroDetailComponent5 {
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    this.heroForm = this.fb.group({ // <-- the parent FormGroup
-      name: ['', Validators.required ],
-      address: this.fb.group({ // <-- the child FormGroup
-        street: '',
-        city: '',
-        state: '',
-        zip: ''
-      }),
-      power: '',
-      sidekick: ''
-    });
-  }
-}
-// #enddocregion v5
-
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.html
deleted file mode 100644
index a6f352a9b9..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- #docregion -->
-<h2>Hero Detail</h2>
-<h3><i>PatchValue to initialize a value</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Street:
-      <input class="form-control" formControlName="street">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">City:
-      <input class="form-control" formControlName="city">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">State:
-      <select class="form-control" formControlName="state">
-        <option *ngFor="let state of states" [value]="state">{{state}}</option>
-      </select>
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Zip Code:
-      <input class="form-control" formControlName="zip">
-    </label>
-  </div>
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-
-
-<p>Form value: {{ heroForm.value | json }}</p>
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.ts
deleted file mode 100644
index 042b21aaf7..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion import-input
-import { Component, Input, OnChanges }             from '@angular/core';
-// #enddocregion import-input
-import { FormBuilder, FormGroup, Validators }      from '@angular/forms';
-
-// #docregion import-hero
-import { Hero, states } from '../data-model';
-// #enddocregion import-hero
-
-////////// 6 ////////////////////
-
-@Component({
-  selector: 'app-hero-detail-6',
-  templateUrl: './hero-detail-5.component.html'
-})
-// #docregion v6
-export class HeroDetailComponent6 implements OnChanges {
-  // #docregion hero
-  @Input() hero: Hero;
-  // #enddocregion hero
-
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    // #docregion hero-form-model
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      address: this.fb.group({
-        street: '',
-        city: '',
-        state: '',
-        zip: ''
-      }),
-      power: '',
-      sidekick: ''
-    });
-    // #enddocregion hero-form-model
-  }
-
-  // #docregion patch-value-on-changes
-  ngOnChanges() { // <-- call rebuildForm in ngOnChanges
-    this.rebuildForm();
-  }
-  // #enddocregion patch-value-on-changes
-
-  // #docregion patch-value-rebuildform
-  rebuildForm() { // <-- wrap patchValue in rebuildForm
-    this.heroForm.reset();
-    // #docregion patch-value
-    this.heroForm.patchValue({
-      name: this.hero.name
-    });
-    // #enddocregion patch-value
-  }
-  // #enddocregion patch-value-rebuildform
-}
-
-
-
-// #enddocregion v6
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.html
deleted file mode 100644
index 57b00ca92c..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- #docregion -->
-<h2>Hero Detail</h2>
-<h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Street:
-      <input class="form-control" formControlName="street">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">City:
-      <input class="form-control" formControlName="city">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">State:
-      <select class="form-control" formControlName="state">
-        <option *ngFor="let state of states" [value]="state">{{state}}</option>
-      </select>
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Zip Code:
-      <input class="form-control" formControlName="zip">
-    </label>
-  </div>
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-
-
-<p>Form value: {{ heroForm.value | json }}</p>
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.ts
deleted file mode 100644
index b70b2e879d..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docplaster
-// #docregion imports
-import { Component, Input, OnChanges }             from '@angular/core';
-import { FormBuilder, FormGroup, Validators }      from '@angular/forms';
-
-// #docregion import-address
-import { Address, Hero, states } from '../data-model';
-// #enddocregion import-address
-
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-7',
-  templateUrl: './hero-detail-5.component.html'
-})
-// #docregion v7
-export class HeroDetailComponent7 implements OnChanges {
-  @Input() hero: Hero;
-
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    // #docregion address-form-group
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      address: this.fb.group(new Address()), // <-- a FormGroup with a new address
-      power: '',
-      sidekick: ''
-    });
-    // #enddocregion address-form-group
-  }
-
-  // #docregion ngOnChanges
-  ngOnChanges() {
-    this.rebuildForm();
-  }
-   // #enddocregion ngOnChanges
-
-    // #docregion rebuildForm
-  rebuildForm() {
-    this.heroForm.reset({
-      name: this.hero.name,
-      // #docregion set-value-address
-      address: this.hero.addresses[0] || new Address()
-      // #enddocregion set-value-address
-    });
-  }
-  // #enddocregion rebuildForm
-
-  /* First version of rebuildForm */
-  rebuildForm1() {
-    // #docregion reset
-    this.heroForm.reset();
-     // #enddocregion reset
-     // #docregion set-value
-     this.heroForm.setValue({
-      name:    this.hero.name,
-      address: this.hero.addresses[0] || new Address()
-   });
-    // #enddocregion set-value
-  }
-}
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.html
deleted file mode 100644
index bfb591551e..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- #docplaster-->
-<h3><i>Using FormArray to add groups</i></h3>
-
-<form [formGroup]="heroForm">
-    <p>Form Changed: {{ heroForm.dirty }}</p>
-
-    <div class="form-group">
-      <label class="center-block">Name:
-        <input class="form-control" formControlName="name">
-      </label>
-    </div>
-    <!-- #docregion form-array-->
-    <!-- #docregion form-array-skeleton -->
-    <!-- #docregion form-array-name -->
-    <div formArrayName="secretLairs" class="well well-lg">
-    <!-- #enddocregion form-array-name -->
-      <div *ngFor="let address of secretLairs.controls; let i=index" [formGroupName]="i" >
-        <!-- The repeated address template -->
-    <!-- #enddocregion form-array-skeleton -->
-        <h4>Address #{{i + 1}}</h4>
-        <div style="margin-left: 1em;">
-          <div class="form-group">
-            <label class="center-block">Street:
-              <input class="form-control" formControlName="street">
-            </label>
-          </div>
-          <div class="form-group">
-            <label class="center-block">City:
-              <input class="form-control" formControlName="city">
-            </label>
-          </div>
-          <div class="form-group">
-            <label class="center-block">State:
-              <select class="form-control" formControlName="state">
-                <option *ngFor="let state of states" [value]="state">{{state}}</option>
-              </select>
-            </label>
-          </div>
-          <div class="form-group">
-            <label class="center-block">Zip Code:
-              <input class="form-control" formControlName="zip">
-            </label>
-          </div>
-        </div>
-        <br>
-        <!-- End of the repeated address template -->
-    <!-- #docregion form-array-skeleton -->
-      </div>
-    <!-- #enddocregion form-array-skeleton -->
-    <!-- #enddocregion form-array-->
-      <!-- #docregion add-lair -->
-      <button (click)="addLair()" type="button">Add a Secret Lair</button>
-      <!-- #enddocregion add-lair -->
-    <!-- #docregion form-array-->
-    <!-- #docregion form-array-skeleton -->
-    </div>
-    <!-- #enddocregion form-array-skeleton -->
-    <!-- #enddocregion form-array-->
-    <div class="form-group radio">
-        <h4>Super power:</h4>
-        <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-        <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-        <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-      </div>
-      <div class="checkbox">
-        <label class="center-block">
-          <input type="checkbox" formControlName="sidekick">I have a sidekick.
-        </label>
-      </div>
-</form>
-
-<p>heroForm value: {{ heroForm.value | json}}</p>
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.ts
deleted file mode 100644
index f3e09df7fe..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component, Input, OnChanges }                   from '@angular/core';
-import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
-
-import { Address, Hero, states } from '../data-model';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-8',
-  templateUrl: './hero-detail-8.component.html'
-})
-// #docregion v8
-export class HeroDetailComponent8 implements OnChanges {
-  @Input() hero: Hero;
-
-  heroForm: FormGroup;
-  states = states;
-
-  // #docregion ctor
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-    this.logNameChange();
-  }
-  // #enddocregion ctor
-
-  createForm() {
-    // #docregion secretLairs-form-array
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      secretLairs: this.fb.array([]), // <-- secretLairs as an empty FormArray
-      power: '',
-      sidekick: ''
-    });
-    // #enddocregion secretLairs-form-array
-  }
-
-  logNameChange() {/* Coming soon */}
-
-  // #docregion onchanges
-  ngOnChanges() {
-    this.rebuildForm();
-  }
-  // #enddocregion onchanges
-
-  // #docregion rebuildform
-  rebuildForm() {
-    this.heroForm.reset({
-      name: this.hero.name
-    });
-    this.setAddresses(this.hero.addresses);
-  }
-// #enddocregion rebuildform
-
-  // #docregion get-secret-lairs
-  get secretLairs(): FormArray {
-    return this.heroForm.get('secretLairs') as FormArray;
-  };
-  // #enddocregion get-secret-lairs
-
-  // #docregion set-addresses
-  setAddresses(addresses: Address[]) {
-    const addressFGs = addresses.map(address => this.fb.group(address));
-    const addressFormArray = this.fb.array(addressFGs);
-    this.heroForm.setControl('secretLairs', addressFormArray);
-  }
-  // #enddocregion set-addresses
-
-  // #docregion add-lair
-  addLair() {
-    this.secretLairs.push(this.fb.group(new Address()));
-  }
-  // #enddocregion add-lair
-}
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.css b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.html
deleted file mode 100644
index c5e77ba43d..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- #docplaster -->
-<!-- #docregion -->
-  <!-- #docregion buttons -->
-<form [formGroup]="heroForm" (ngSubmit)="onSubmit()">
-  <div style="margin-bottom: 1em">
-    <button type="submit"
-            [disabled]="heroForm.pristine" class="btn btn-success">Save</button> &nbsp;
-    <button type="button" (click)="revert()"
-            [disabled]="heroForm.pristine" class="btn btn-danger">Revert</button>
-  </div>
-
-  <!-- Hero Detail Controls -->
-  <!-- #enddocregion buttons -->
-  <div class="form-group">
-      <label class="center-block">Name:
-        <input class="form-control" formControlName="name">
-      </label>
-  </div>
-
-  <div formArrayName="secretLairs" class="well well-lg">
-    <div *ngFor="let address of secretLairs.controls; let i=index" [formGroupName]="i" >
-      <!-- The repeated address template -->
-      <h4>Address #{{i + 1}}</h4>
-      <div style="margin-left: 1em;">
-        <div class="form-group">
-          <label class="center-block">Street:
-            <input class="form-control" formControlName="street">
-          </label>
-        </div>
-        <div class="form-group">
-          <label class="center-block">City:
-            <input class="form-control" formControlName="city">
-          </label>
-        </div>
-        <div class="form-group">
-          <label class="center-block">State:
-            <select class="form-control" formControlName="state">
-              <option *ngFor="let state of states" [value]="state">{{state}}</option>
-            </select>
-          </label>
-        </div>
-        <div class="form-group">
-          <label class="center-block">Zip Code:
-            <input class="form-control" formControlName="zip">
-          </label>
-        </div>
-      </div>
-      <br>
-      <!-- End of the repeated address template -->
-    </div>
-    <button (click)="addLair()" type="button">Add a Secret Lair</button>
-  </div>
-  <!-- #docregion buttons -->
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-  <!-- #enddocregion buttons -->
-
-<p>heroForm value: {{ heroForm.value | json}}</p>
-
-<!-- #docregion name-change-log -->
-<h4>Name change log</h4>
-<div *ngFor="let name of nameChangeLog">{{name}}</div>
-<!-- #enddocregion name-change-log -->
diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.ts b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.ts
deleted file mode 100644
index 13ef66b0f9..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-// #docplaster
-// #docregion
-import { Component, Input, OnChanges }       from '@angular/core';
-import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
-
-import { Address, Hero, states } from '../data-model';
-// #docregion import-service
-import { HeroService }           from '../hero.service';
-// #enddocregion import-service
-
-@Component({
-  selector: 'app-hero-detail',
-  templateUrl: './hero-detail.component.html',
-  styleUrls: ['./hero-detail.component.css']
-})
-
-// #docregion onchanges-implementation
-export class HeroDetailComponent implements OnChanges {
-// #enddocregion onchanges-implementation
-  @Input() hero: Hero;
-
-  heroForm: FormGroup;
-  // #docregion log-name-change
-  nameChangeLog: string[] = [];
-  // #enddocregion log-name-change
-  states = states;
-
-  // #docregion ctor
-  constructor(
-    private fb: FormBuilder,
-    private heroService: HeroService) {
-
-    this.createForm();
-    this.logNameChange();
-  }
-  // #enddocregion ctor
-
-  createForm() {
-    this.heroForm = this.fb.group({
-      name: '',
-      secretLairs: this.fb.array([]),
-      power: '',
-      sidekick: ''
-    });
-  }
-
-  ngOnChanges() {
-    this.rebuildForm();
-  }
-
-  rebuildForm() {
-    this.heroForm.reset({
-      name: this.hero.name
-    });
-    this.setAddresses(this.hero.addresses);
-  }
-
-  get secretLairs(): FormArray {
-    return this.heroForm.get('secretLairs') as FormArray;
-  };
-
-  setAddresses(addresses: Address[]) {
-    const addressFGs = addresses.map(address => this.fb.group(address));
-    const addressFormArray = this.fb.array(addressFGs);
-    this.heroForm.setControl('secretLairs', addressFormArray);
-  }
-
-  addLair() {
-    this.secretLairs.push(this.fb.group(new Address()));
-  }
-
-  // #docregion on-submit
-  onSubmit() {
-    this.hero = this.prepareSaveHero();
-    this.heroService.updateHero(this.hero).subscribe(/* error handling */);
-    this.rebuildForm();
-  }
-  // #enddocregion on-submit
-
-  // #docregion prepare-save-hero
-  prepareSaveHero(): Hero {
-    const formModel = this.heroForm.value;
-
-    // deep copy of form model lairs
-    const secretLairsDeepCopy: Address[] = formModel.secretLairs.map(
-      (address: Address) => Object.assign({}, address)
-    );
-
-    // return new `Hero` object containing a combination of original hero value(s)
-    // and deep copies of changed form model values
-    const saveHero: Hero = {
-      id: this.hero.id,
-      name: formModel.name as string,
-      // addresses: formModel.secretLairs // <-- bad!
-      addresses: secretLairsDeepCopy
-    };
-    return saveHero;
-  }
-  // #enddocregion prepare-save-hero
-
-  // #docregion revert
-  revert() { this.rebuildForm(); }
-  // #enddocregion revert
-
-  // #docregion log-name-change
-  logNameChange() {
-    const nameControl = this.heroForm.get('name');
-    nameControl.valueChanges.forEach(
-      (value: string) => this.nameChangeLog.push(value)
-    );
-  }
-  // #enddocregion log-name-change
-}
diff --git a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.1.html b/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.1.html
deleted file mode 100644
index 409c9b2a5c..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- #docregion -->
-<nav>
-  <a *ngFor="let hero of heroes | async" (click)="select(hero)">{{hero.name}}</a>
-</nav>
-
-<div *ngIf="selectedHero">
-  <app-hero-detail [hero]="selectedHero"></app-hero-detail>
-</div>
diff --git a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.css b/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.html b/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.html
deleted file mode 100644
index 78356caeb2..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- #docregion -->
-<h3 *ngIf="isLoading"><i>Loading heroes ... </i></h3>
-<h3 *ngIf="!isLoading">Select a hero:</h3>
-
-<nav>
-  <button (click)="getHeroes()" class="btn btn-primary">Refresh</button>
-  <a *ngFor="let hero of heroes | async" (click)="select(hero)">{{hero.name}}</a>
-</nav>
-
-<div *ngIf="selectedHero">
-  <hr>
-  <h2>Hero Detail</h2>
-  <h3>Editing: {{selectedHero.name}}</h3>
-  <!-- #docregion hero-binding -->
-  <app-hero-detail [hero]="selectedHero"></app-hero-detail>
-  <!-- #enddocregion hero-binding -->
-</div>
diff --git a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts b/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts
deleted file mode 100644
index 1243a0a5c0..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// #docregion
-import { Component, OnInit } from '@angular/core';
-import { Observable }        from 'rxjs';
-import { finalize } from 'rxjs/operators';
-
-import { Hero }        from '../data-model';
-import { HeroService } from '../hero.service';
-
-@Component({
-  selector: 'app-hero-list',
-  templateUrl: './hero-list.component.html',
-  styleUrls: ['./hero-list.component.css']
-})
-export class HeroListComponent implements OnInit {
-  heroes: Observable<Hero[]>;
-  isLoading = false;
-  selectedHero: Hero;
-
-  constructor(private heroService: HeroService) { }
-
-  ngOnInit() { this.getHeroes(); }
-
-  getHeroes() {
-    this.isLoading = true;
-    this.heroes = this.heroService.getHeroes()
-                      // TODO: error handling
-                      .pipe(finalize(() => this.isLoading = false));
-    this.selectedHero = undefined;
-  }
-
-  select(hero: Hero) { this.selectedHero = hero; }
-}
diff --git a/aio/content/examples/reactive-forms/src/app/hero.service.ts b/aio/content/examples/reactive-forms/src/app/hero.service.ts
deleted file mode 100644
index ff1caf064a..0000000000
--- a/aio/content/examples/reactive-forms/src/app/hero.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// #docregion
-import { Injectable } from '@angular/core';
-
-import { Observable, of } from 'rxjs';
-import { delay } from 'rxjs/operators';
-
-import { Hero, heroes } from './data-model';
-
-@Injectable()
-export class HeroService {
-
-  delayMs = 500;
-
-  // Fake server get; assume nothing can go wrong
-  getHeroes(): Observable<Hero[]> {
-    return of(heroes).pipe(delay(this.delayMs)); // simulate latency with delay
-  }
-
-  // Fake server update; assume nothing can go wrong
-  updateHero(hero: Hero): Observable<Hero>  {
-    const oldHero = heroes.find(h => h.id === hero.id);
-    const newHero = Object.assign(oldHero, hero); // Demo: mutate cached hero
-    return of(newHero).pipe(delay(this.delayMs)); // simulate latency with delay
-  }
-}
diff --git a/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.css b/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.css
new file mode 100644
index 0000000000..c89ab4cc0b
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.css
@@ -0,0 +1,19 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  padding-top: 24px;
+}
+
+label {
+  display: block;
+  width: 6em;
+  margin: .5em 0;
+  color: #607D8B;
+  font-weight: bold;
+}
+
+input {
+  height: 2em;
+  font-size: 1em;
+  padding-left: .4em;
+}
\ No newline at end of file
diff --git a/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.html b/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.html
new file mode 100644
index 0000000000..95f1948ffa
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.html
@@ -0,0 +1,21 @@
+<!-- #docregion control-binding -->
+<label>
+  Name:
+  <input type="text" [formControl]="name">
+</label>
+
+<!-- #enddocregion control-binding -->
+
+<!-- #docregion display-value -->
+
+<p>
+  Value: {{ name.value }}
+</p>
+<!-- #enddocregion display-value -->
+
+<!-- #docregion update-value -->
+
+<p>
+  <button (click)="updateName()">Update Name</button>
+</p>
+<!-- #enddocregion update-value -->
diff --git a/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.ts b/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.ts
new file mode 100644
index 0000000000..b549b560ea
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.ts
@@ -0,0 +1,22 @@
+// #docplaster
+// #docregion create-control
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+
+@Component({
+  selector: 'app-name-editor',
+  templateUrl: './name-editor.component.html',
+  styleUrls: ['./name-editor.component.css']
+})
+export class NameEditorComponent {
+  name = new FormControl('');
+// #enddocregion create-control
+
+// #docregion update-value
+  updateName() {
+    this.name.setValue('Nancy');
+  }
+// #enddocregion update-value
+// #docregion create-control
+}
+// #enddocregion create-control
diff --git a/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.html b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.html
new file mode 100644
index 0000000000..c1fd2a10d2
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.html
@@ -0,0 +1,67 @@
+<!-- #docplaster -->
+<!-- #docregion formgroup -->
+<form [formGroup]="profileForm">
+  
+  <label>
+    First Name:
+    <input type="text" formControlName="firstName">
+  </label>
+
+  <label>
+    Last Name:
+    <input type="text" formControlName="lastName">
+  </label>
+
+<!-- #enddocregion formgroup -->
+  <!-- #docregion formgroupname -->
+  <div formGroupName="address">
+    <h3>Address</h3>
+
+    <label>
+      Street:
+      <input type="text" formControlName="street">
+    </label>
+
+    <label>
+      City:
+      <input type="text" formControlName="city">
+    </label>
+    
+    <label>
+      State:
+      <input type="text" formControlName="state">
+    </label>
+
+    <label>
+      Zip Code:
+      <input type="text" formControlName="zip">
+    </label>
+  </div>
+  <!-- #enddocregion formgroupname -->
+
+  <!-- #docregion formarrayname -->
+  <div formArrayName="aliases">
+    <h3>Aliases</h3> <button (click)="addAlias()">Add Alias</button>
+
+    <div *ngFor="let address of aliases.controls; let i=index">
+      <!-- The repeated alias template -->
+      <label>
+        Alias:
+        <input type="text" [formControlName]="i">
+      </label>
+    </div>
+  </div>
+  <!-- #enddocregion formarrayname -->
+<!-- #docregion formgroup -->  
+</form>
+<!-- #enddocregion formgroup -->
+
+<p>
+  Form Value: {{ profileForm.value | json }}
+</p>
+
+<!-- #docregion patch-value -->
+<p>
+  <button (click)="updateProfile()">Update Profile</button>
+</p>
+<!-- #enddocregion patch-value -->
\ No newline at end of file
diff --git a/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.ts b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.ts
new file mode 100644
index 0000000000..94d388847e
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.ts
@@ -0,0 +1,40 @@
+// #docplaster
+// #docregion formgroup, nested-formgroup
+import { Component } from '@angular/core';
+// #docregion imports
+import { FormGroup, FormControl } from '@angular/forms';
+// #enddocregion imports
+
+@Component({
+  selector: 'app-profile-editor',
+  templateUrl: './profile-editor.component.html',
+  styleUrls: ['./profile-editor.component.css']
+})
+export class ProfileEditorComponent {
+// #docregion formgroup-compare
+  profileForm = new FormGroup({
+    firstName: new FormControl(''),
+    lastName: new FormControl(''),
+// #enddocregion formgroup
+    address: new FormGroup({
+      street: new FormControl(''),
+      city: new FormControl(''),
+      state: new FormControl(''),
+      zip: new FormControl('')
+    })
+// #docregion formgroup
+  });
+// #enddocregion formgroup, nested-formgroup, formgroup-compare
+// #docregion patch-value
+  updateProfile() {
+    this.profileForm.patchValue({
+      firstName: 'Nancy',
+      address: {
+        street: '123 Drew Street'
+      }
+    });
+  }
+// #enddocregion patch-value
+// #docregion formgroup, nested-formgroup
+}
+// #enddocregion formgroup
diff --git a/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.2.ts b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.2.ts
new file mode 100644
index 0000000000..d482d70b01
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.2.ts
@@ -0,0 +1,58 @@
+// #docplaster
+// #docregion form-builder
+import { Component } from '@angular/core';
+// #docregion form-builder-imports
+import { FormBuilder } from '@angular/forms';
+// #enddocregion form-builder-imports, form-builder
+// #docregion form-array-imports
+import { FormArray } from '@angular/forms';
+// #docregion form-builder-imports, form-builder
+// #enddocregion form-builder-imports, form-array-imports
+
+@Component({
+  selector: 'app-profile-editor',
+  templateUrl: './profile-editor.component.html',
+  styleUrls: ['./profile-editor.component.css']
+})
+export class ProfileEditorComponent {
+// #docregion formgroup-compare
+  profileForm = this.fb.group({
+    firstName: [''],
+    lastName: [''],
+    address: this.fb.group({
+      street: [''],
+      city: [''],
+      state: [''],
+      zip: ['']
+    }),
+// #enddocregion form-builder, formgroup-compare
+    aliases: this.fb.array([
+      this.fb.control('')
+    ])
+// #docregion form-builder, formgroup-compare
+  });
+// #enddocregion form-builder, formgroup-compare
+  get aliases() {
+    return this.profileForm.get('aliases') as FormArray;
+  }
+
+// #docregion inject-form-builder, form-builder
+
+  constructor(private fb: FormBuilder) { }
+// #enddocregion inject-form-builder, form-builder
+
+  updateProfile() {
+    this.profileForm.patchValue({
+      firstName: 'Nancy',
+      address: {
+        street: '123 Drew Street'
+      }
+    });
+  }
+
+  addAlias() {
+    this.aliases.push(this.fb.control(''));
+  }
+// #docregion form-builder
+}
+// #enddocregion form-builder
diff --git a/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.css b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.css
new file mode 100644
index 0000000000..6d29164b1a
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.css
@@ -0,0 +1,39 @@
+/* ProfileEditorComponent's private CSS styles */
+:host {
+  display: flex;
+  flex-direction: column;
+  padding-top: 24px;
+}
+
+label {
+  display: block;
+  width: 6em;
+  margin: .5em 0;
+  color: #607D8B;
+  font-weight: bold;
+}
+
+input {
+  height: 2em;
+  font-size: 1em;
+  padding-left: .4em;
+}
+
+button {
+  font-family: Arial;
+  background-color: #eee;
+  border: none;
+  padding: 5px 10px;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+button:hover {
+  background-color: #cfd8dc;
+}
+
+button:disabled {
+  background-color: #eee;
+  color: #ccc;
+  cursor: auto;
+}
diff --git a/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.html b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.html
new file mode 100644
index 0000000000..86178e1c3c
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.html
@@ -0,0 +1,80 @@
+<!-- #docplaster -->
+<!-- #docregion ng-submit -->
+<form [formGroup]="profileForm" (ngSubmit)="onSubmit()">
+<!-- #enddocregion ng-submit -->
+  <label>
+    First Name:
+    <!-- #docregion required-attribute -->
+    <input type="text" formControlName="firstName" required>
+    <!-- #enddocregion required-attribute -->
+  </label>
+
+  <label>
+    Last Name:
+    <input type="text" formControlName="lastName">
+  </label>
+
+  <div formGroupName="address">
+    <h3>Address</h3>
+
+    <label>
+      Street:
+      <input type="text" formControlName="street">
+    </label>
+
+    <label>
+      City:
+      <input type="text" formControlName="city">
+    </label>
+    
+    <label>
+      State:
+      <input type="text" formControlName="state">
+    </label>
+
+    <label>
+      Zip Code:
+      <input type="text" formControlName="zip">
+    </label>
+  </div>
+
+  <!-- #docregion formarrayname -->
+  <div formArrayName="aliases">
+    <h3>Aliases</h3> <button (click)="addAlias()">Add Alias</button>
+
+    <div *ngFor="let address of aliases.controls; let i=index">
+      <!-- The repeated alias template -->
+      <label>
+        Alias:
+        <input type="text" [formControlName]="i">
+      </label>
+    </div>
+  </div>
+  <!-- #enddocregion formarrayname -->
+
+  <!-- #docregion submit-button -->
+  <button type="submit" [disabled]="!profileForm.valid">Submit</button>
+  <!-- #enddocregion submit-button -->
+</form>
+
+<hr>
+
+<!-- #docregion display-value -->
+
+<p>
+  Form Value: {{ profileForm.value | json }}
+</p>
+<!-- #enddocregion display-value -->
+
+<!-- #docregion display-status -->
+
+<p>
+  Form Status: {{ profileForm.status }}
+</p>
+<!-- #enddocregion display-status -->
+
+<!-- #docregion patch-value -->
+<p>
+  <button (click)="updateProfile()">Update Profile</button>
+</p>
+<!-- #enddocregion patch-value -->
diff --git a/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.ts b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.ts
new file mode 100644
index 0000000000..813c97d5c0
--- /dev/null
+++ b/aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.ts
@@ -0,0 +1,73 @@
+// #docplaster
+// #docregion form-builder
+import { Component } from '@angular/core';
+// #docregion form-builder-imports
+import { FormBuilder } from '@angular/forms';
+// #enddocregion form-builder-imports
+// #docregion validator-imports
+import { Validators } from '@angular/forms';
+// #enddocregion validator-imports
+// #docregion form-array-imports
+import { FormArray } from '@angular/forms';
+// #enddocregion form-array-imports
+
+@Component({
+  selector: 'app-profile-editor',
+  templateUrl: './profile-editor.component.html',
+  styleUrls: ['./profile-editor.component.css']
+})
+export class ProfileEditorComponent {
+// #docregion required-validator, aliases
+  profileForm = this.fb.group({
+    firstName: ['', Validators.required],
+    lastName: [''],
+    address: this.fb.group({
+      street: [''],
+      city: [''],
+      state: [''],
+      zip: ['']
+    }),
+// #enddocregion form-builder, required-validator
+    aliases: this.fb.array([
+      this.fb.control('')
+    ])
+// #docregion form-builder, required-validator
+  });
+// #enddocregion form-builder, required-validator, aliases
+// #docregion aliases-getter
+
+  get aliases() {
+    return this.profileForm.get('aliases') as FormArray;
+  }
+
+// #enddocregion aliases-getter
+// #docregion inject-form-builder, form-builder
+  constructor(private fb: FormBuilder) { }
+
+// #enddocregion inject-form-builder
+
+  updateProfile() {
+    this.profileForm.patchValue({
+      firstName: 'Nancy',
+      address: {
+        street: '123 Drew Street'
+      }
+    });
+  }
+// #enddocregion form-builder
+// #docregion add-alias
+
+  addAlias() {
+    this.aliases.push(this.fb.control(''));
+  }
+// #enddocregion add-alias
+// #docregion on-submit
+
+  onSubmit() {
+    // TODO: Use EventEmitter with form value
+    console.warn(this.profileForm.value);
+  }
+// #enddocregion on-submit
+// #docregion form-builder
+}
+// #enddocregion form-builder
diff --git a/aio/content/examples/reactive-forms/src/index-final.html b/aio/content/examples/reactive-forms/src/index-final.html
deleted file mode 100644
index 13416ffe40..0000000000
--- a/aio/content/examples/reactive-forms/src/index-final.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<!-- #docregion -->
-<html lang="en">
-
-<head>
-  <title>Hero Form</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <!-- #docregion bootstrap -->
-  <link rel="stylesheet" href="https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css">
-</head>
-
-<body>
-  <app-root></app-root>
-</body>
-
-</html>
diff --git a/aio/content/examples/reactive-forms/src/index.html b/aio/content/examples/reactive-forms/src/index.html
index 7121ad3455..4a6b8fdac0 100644
--- a/aio/content/examples/reactive-forms/src/index.html
+++ b/aio/content/examples/reactive-forms/src/index.html
@@ -2,10 +2,9 @@
 <!-- #docregion -->
 <html lang="en">
   <head>
-    <title>Hero Form</title>
+    <title>Angular Reactive Forms</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css">
   </head>
 
   <body>
diff --git a/aio/content/examples/reactive-forms/src/main-final.ts b/aio/content/examples/reactive-forms/src/main-final.ts
deleted file mode 100644
index 0a1ea31596..0000000000
--- a/aio/content/examples/reactive-forms/src/main-final.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// tslint:disable:no-unused-variable
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
-
-platformBrowserDynamic().bootstrapModule(AppModule);
-
diff --git a/aio/content/examples/reactive-forms/src/main.ts b/aio/content/examples/reactive-forms/src/main.ts
index bd1865a45b..6c835d9116 100644
--- a/aio/content/examples/reactive-forms/src/main.ts
+++ b/aio/content/examples/reactive-forms/src/main.ts
@@ -2,12 +2,11 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app/app.module'; // just the final version
-import { DemoModule } from './app/demo.module'; // demo picker
+import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
 if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(DemoModule);
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/aio/content/examples/reactive-forms/src/styles.1.css b/aio/content/examples/reactive-forms/src/styles.1.css
deleted file mode 100644
index 167a66be4f..0000000000
--- a/aio/content/examples/reactive-forms/src/styles.1.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url('https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css');
diff --git a/aio/content/examples/reactive-forms/stackblitz.json b/aio/content/examples/reactive-forms/stackblitz.json
index 2b325c037b..5696d23db7 100644
--- a/aio/content/examples/reactive-forms/stackblitz.json
+++ b/aio/content/examples/reactive-forms/stackblitz.json
@@ -3,6 +3,7 @@
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
+    "!**/*.[0-9].*",
 
     "!src/app/app.component.1.ts",
     "!src/app/hero-list.component.1.html",
diff --git a/aio/content/guide/reactive-forms.md b/aio/content/guide/reactive-forms.md
index 34cb42ecca..8e7467fe07 100644
--- a/aio/content/guide/reactive-forms.md
+++ b/aio/content/guide/reactive-forms.md
@@ -1,261 +1,465 @@
-# Reactive Forms
+# Reactive forms
+
+_Reactive forms_ provide a model-driven approach to handling form inputs whose values change over time. This guide shows you how to create and update a simple form control, progress to using multiple controls in a group, validate form values, and implement more advanced forms.
 
-_Reactive forms_ is an Angular technique for creating forms in a _reactive_ style.
-This guide explains reactive forms as you follow the steps to build a "Hero Detail Editor" form.
 
 
 {@a toc}
 
-Try the <live-example stackblitz="final" title="Reactive Forms (final) in Stackblitz">Reactive Forms live-example</live-example>.
-
-You can also run the <live-example title="Reactive Forms Demo in Stackblitz">Reactive Forms Demo</live-example> version
-and choose one of the intermediate steps from the "demo picker" at the top.
-
+Try the <live-example title="Reactive Forms in Stackblitz">Reactive Forms live-example</live-example>.
 
 {@a intro}
 
+## Introduction to reactive forms
 
-## Introduction to Reactive Forms
+Reactive forms use an explicit and immutable approach to managing the state of a form at a given point in time. Each change to the form state returns a new state, which maintains the integrity of the model between changes. Reactive forms are built around observable streams, where form inputs and values are provided as streams of input values, also while giving you synchronous access to the data. This approach allows your templates to take advantage of these streams of form state changes, rather than to be dependent to them.
 
-Angular offers two form-building technologies: _reactive_ forms and _template-driven_ forms.
-The two technologies belong to the `@angular/forms` library
-and share a common set of form control classes.
+Reactive forms also allow for easier testing because you have an assurance that your data is consistent and predictable when requested. Consumers outside your templates have access to the same streams, where they can manipulate that data safely.
 
-But they diverge markedly in philosophy, programming style, and technique.
-They even have their own modules: the `ReactiveFormsModule` and the `FormsModule`.
+Reactive forms differ from template-driven forms in distinct ways. Reactive forms provide more predictability with synchronous access to the data model, immutability with observable operators, and change tracking through observable streams. If you prefer direct access to modify data in your template, template-driven forms are less explicit because they rely on directives embedded in the template, along with mutable data to track changes asynchronously. See the [Appendix](#appendix) for detailed comparisons between the two paradigms.
 
-### Reactive forms
-Angular _reactive_ forms facilitate a _reactive style_ of programming
-that favors explicit management of the data flowing between
-a non-UI _data model_ (typically retrieved from a server) and a
-UI-oriented _form model_ that retains the states
-and values of the HTML controls on screen. Reactive forms offer the ease
-of using reactive patterns, testing, and validation.
+## Getting started
 
-With _reactive_ forms, you create a tree of Angular form control objects
-in the component class and bind them to native form control elements in the
-component template, using techniques described in this guide.
+This section describes the key steps to add a single form control. The example allows a user to enter their name into an input field, captures that input value, and displays the current value of the form control element.
 
-You create and manipulate form control objects directly in the
-component class. As the component class has immediate access to both the data
-model and the form control structure, you can push data model values into
-the form controls and pull user-changed values back out. The component can
-observe changes in form control state and react to those changes.
+### Step 1 - Register the `ReactiveFormsModule`
 
-One advantage of working with form control objects directly is that value and validity updates
-are [always synchronous and under your control](guide/reactive-forms#async-vs-sync "Async vs sync").
-You won't encounter the timing issues that sometimes plague a template-driven form
-and reactive forms can be easier to unit test.
+To use reactive forms, import `ReactiveFormsModule` from the `@angular/forms` package and add it to your NgModule's `imports` array.
 
-In keeping with the reactive paradigm, the component
-preserves the immutability of the _data model_,
-treating it as a pure source of original values.
-Rather than update the data model directly,
-the component extracts user changes and forwards them to an external component or service,
-which does something with them (such as saving them)
-and returns a new _data model_ to the component that reflects the updated model state.
+<code-example path="reactive-forms/src/app/app.module.ts" region="imports" title="src/app/app.module.ts (excerpt)">
 
-Using reactive form directives does not require you to follow all reactive priniciples,
-but it does facilitate the reactive programming approach should you choose to use it.
+</code-example>
 
-### Template-driven forms
+### Step 2 - Import and create a new form control 
 
-_Template-driven_ forms, introduced in the [Template guide](guide/forms), take a completely different approach.
-
-You place HTML form controls (such as `<input>` and `<select>`) in the component template and
-bind them to _data model_ properties in the component, using directives
-like `ngModel`.
-
-You don't create Angular form control objects. Angular directives
-create them for you, using the information in your data bindings.
-You don't push and pull data values. Angular handles that for you with `ngModel`.
-Angular updates the mutable _data model_ with user changes as they happen.
-
-For this reason, the `ngModel` directive is not part of the ReactiveFormsModule.
-
-While this means less code in the component class,
-[template-driven forms are asynchronous](guide/reactive-forms#async-vs-sync "Async vs sync")
-which may complicate development in more advanced scenarios.
-
-
-{@a async-vs-sync}
-
-
-### Async vs. sync
-
-Reactive forms are synchronous while template-driven forms are asynchronous.
-
-In reactive forms, you create the entire form control tree in code.
-You can immediately update a value or drill down through the descendants of the parent form
-because all controls are always available.
-
-Template-driven forms delegate creation of their form controls to directives.
-To avoid "_changed after checked_" errors,
-these directives take more than one cycle to build the entire control tree.
-That means you must wait a tick before manipulating any of the controls
-from within the component class.
-
-For example, if you inject the form control with a `@ViewChild(NgForm)` query and examine it in the
-[`ngAfterViewInit` lifecycle hook](guide/lifecycle-hooks#afterview "Lifecycle hooks guide: AfterView"),
-you'll discover that it has no children.
-You must wait a tick, using `setTimeout`, before you can
-extract a value from a control, test its validity, or set it to a new value.
-
-The asynchrony of template-driven forms also complicates unit testing.
-You must wrap your test block in `async()` or `fakeAsync()` to
-avoid looking for values in the form that aren't there yet.
-With reactive forms, everything is available when you expect it to be.
-
-### Choosing reactive or template-driven forms
-
-Reactive and template-driven forms are
-two different architectural paradigms,
-with their own strengths and weaknesses.
-Choose the approach that works best for you.
-You may decide to use both in the same application.
-
-The rest of this page explores the _reactive_ paradigm and
-concentrates exclusively on reactive forms techniques.
-For information on _template-driven forms_, see the [_Forms_](guide/forms) guide.
-
-In the next section, you'll set up your project for the reactive form demo.
-Then you'll learn about the [Angular form classes](guide/reactive-forms#essentials) and how to use them in a reactive form.
-
-
-
-{@a setup}
-
-
-## Setup
-
-Create a new project named <code>angular-reactive-forms</code>:
+Generate a component for the control.
 
 <code-example language="sh" class="code-shell">
 
-  ng new angular-reactive-forms
+  ng generate component NameEditor
 
 </code-example>
 
-{@a data-model}
+The `FormControl` is the most basic building block when using reactive forms. To register a single form control, import the `FormControl` class into your component and create a new instance of `FormControl` to save as a class property.
 
-
-## Create a data model
-The focus of this guide is a reactive forms component that edits a hero.
-You'll need a `hero` class and some hero data.
-
-Using the CLI, generate a new class named `data-model`:
-
-<code-example language="sh" class="code-shell">
-
-  ng generate class data-model
+<code-example path="reactive-forms/src/app/name-editor/name-editor.component.ts" region="create-control" title="src/app/name-editor/name-editor.component.ts">
 
 </code-example>
 
-And copy the following into `data-model.ts`:
+The constructor of the `FormControl` can be used to set its initial value, which in this case is set to an empty string. By creating these controls in your component class, you get immediate access to listen, update, and validate the state of the form input. 
 
-<code-example path="reactive-forms/src/app/data-model.ts" title="src/app/data-model.ts" linenums="false">
+### Step 3 - Register the control in the template
+
+After you create the control in the component class, you must associate it with a form control element in the template. Update the template with the form control using the `formControl` binding provided by the `FormControlDirective` included in the `ReactiveFormsModule`.
+
+<code-example path="reactive-forms/src/app/name-editor/name-editor.component.html" region="control-binding" linenums="false" title="src/app/name-editor/name-editor.component.html">
 
 </code-example>
 
-The file exports two classes and two constants. The `Address`
-and `Hero` classes define the application _data model_.
-The `heroes` and `states` constants supply the test data.
+<div class="alert is-helpful">
 
-{@a create-component}
-
-
-## Create a _reactive forms_ component
-
-Generate a new component named `HeroDetail`:
-
-<code-example language="sh" class="code-shell">
-
-  ng generate component HeroDetail
-
-</code-example>
-
-And import:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-1.component.ts" region="import" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-Next, update the `HeroDetailComponent` class with a `FormControl`.
-`FormControl` is a directive that allows you to create and manage
-a `FormControl` instance directly.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-1.component.ts" region="v1" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-This creates a `FormControl` called `name`.
-It will be bound in the template to an HTML `<input>` element for the hero name.
-
-A `FormControl` constructor accepts three, optional arguments:
-the initial data value, an array of validators, and an array of async validators.
-
-
-<div class="l-sub-section">
-
-This simple control doesn't have data or validators.
-In real apps, most form controls have both. For in-depth information on
-`Validators`, see the [Form Validation](guide/form-validation) guide.
+*Note*: For a more detailed list of classes and directives provided by the `ReactiveFormsModule`, see the [Reactive Forms API](#reactive-forms-api) section.
 
 </div>
 
-{@a create-template}
+Using the template binding syntax, the form control is now registered to the `name` input element in the template. The form control and DOM element communicate with each other: the view reflects changes in the model, and the model reflects changes in the view.
 
-## Create the template
+#### Display the component
 
-Now update the component's template with the following markup.
+The `FormControl` assigned to `name` is displayed once the component is added to a template. 
 
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-1.component.html" region="simple-control" title="src/app/hero-detail/hero-detail.component.html" linenums="false">
+<code-example path="reactive-forms/src/app/app.component.1.html" region="app-name-editor" linenums="false" title="src/app/app.component.html (name editor)">
 
 </code-example>
 
-To let Angular know that this is the input that you want to
-associate to the `name` `FormControl` in the class,
-you need `[formControl]="name"` in the template on the `<input>`.
+<figure>
+  <img src="generated/images/guide/reactive-forms/name-editor-1.png" alt="Name Editor">
+</figure>
 
-<div class="l-sub-section">
+## Managing control values
 
-Disregard the `form-control` CSS class. It belongs to the
-<a href="http://getbootstrap.com/" title="Bootstrap CSS">Bootstrap CSS library</a>,
-not Angular, and styles the form but in no way impacts the logic.
+Reactive forms give you access to the form control state and value at a point in time. You can manipulate 
+the current state and value through the component class or the component template. The following examples display the value of a `FormControl` and change it.
+
+{@a display-value}
+
+### Display the control’s value
+
+Every `FormControl` provides its current value as an observable through the `valueChanges` property. You can listen to changes in the form’s value in the template using the `AsyncPipe` or in the component class using the `subscribe()` method. The `value` property also gives you a snapshot of the current value. 
+
+Display the current value using interpolation in the template as shown in the following example.
+
+<code-example path="reactive-forms/src/app/name-editor/name-editor.component.html" region="display-value" linenums="false" title="src/app/name-editor/name-editor.component.html (control value)">
+
+</code-example>
+
+The displayed value changes as you update the form control element.
+
+Reactive forms also provide access to more information about a given control through properties and methods provided with each instance. These properties and methods of the underlying [AbstractControl](api/forms/AbstractControl) are used to control form state and determine when to display messages when handling validation. For more information, see [Simple Form Validation](#simple-form-validation) later in this guide.
+
+Read about other `FormControl` properties and methods in the [Reactive Forms API](#reactive-forms-api) section.
+
+### Replace the form control value
+
+Reactive forms have methods to change a control's value programmatically, which gives you the flexibility to update the control’s value without user interaction. The `FormControl` provides a `setValue()` method which updates the value of the form control and validates the structure of the value provided against the control’s structure. For example, when retrieving form data from a backend API or service, use the `setValue()` method to update the control to its new value, replacing the old value entirely. 
+
+The following example adds a method to the component class to update the value of the control to _Nancy_ using the `setValue()` method.
+
+<code-example path="reactive-forms/src/app/name-editor/name-editor.component.ts" region="update-value" title="src/app/name-editor/name-editor.component.ts (update value)">
+
+</code-example>
+
+Update the template with a button to simulate a name update. Any value entered in the form control element before clicking the `Update Name` button will be reflected as its current value. 
+
+<code-example path="reactive-forms/src/app/name-editor/name-editor.component.html" region="update-value" linenums="false" title="src/app/name-editor/name-editor.component.html (update value)">
+
+</code-example>
+
+Because the form model is the source of truth for the control, when you click the button the value of the input is also changed within the component class, overriding its current value.
+
+<figure>
+  <img src="generated/images/guide/reactive-forms/name-editor-2.png" alt="Name Editor Update">
+</figure>
+
+<div class="alert is-helpful">
+
+*Note*: In this example, you are only using a single control, but when using the `setValue()` method with a `FormGroup` or `FormArray` the value needs to match the structure of the group or array.
 
 </div>
 
-{@a import}
+## Grouping form controls
 
-## Import the `ReactiveFormsModule`
+Just as a `FormControl` instance gives you control over a single input field, a `FormGroup` tracks the form state of a group of `FormControl` instances (for example, a form). Each control in `FormGroup` is tracked by name when creating the `FormGroup`. The following example shows how to manage multiple `FormControl` instances in a single group.
 
-The `HeroDetailComponent` template uses the `formControlName`
-directive from the `ReactiveFormsModule`.
+Generate a `ProfileEditor` component and import the `FormGroup` and `FormControl` classes from the `@angular/forms` package.
 
-Do the following two things in `app.module.ts`:
+<code-example language="sh" class="code-shell">
 
-1. Use a JavaScript `import` statement to access
-the `ReactiveFormsModule`.
-1. Add `ReactiveFormsModule` to the `AppModule`'s `imports` list.
-
-<code-example path="reactive-forms/src/app/app.module.ts" region="v1" title="src/app/app.module.ts (excerpt)" linenums="false">
+  ng generate component ProfileEditor
 
 </code-example>
 
-{@a update}
-
-## Display the `HeroDetailComponent`
-Revise the `AppComponent` template so it displays the `HeroDetailComponent`.
-
-<code-example path="reactive-forms/src/app/app.component.1.html" title="src/app/app.component.html" linenums="false">
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.ts" region="imports" title="src/app/profile-editor/profile-editor.component.ts (imports)">
 
 </code-example>
 
-{@a essentials}
+### Step 1 - Create a `FormGroup`
 
-## Essential form classes
-This guide uses four fundamental classes to build a reactive form:
+Create a property in the component class named `profileForm` and set the property to a new instance of a `FormGroup`. To initialize the `FormGroup`, provide the constructor with an object of controls with their respective names. 
 
+For the profile form, add two `FormControl` instances with the names `firstName` and `lastName`.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.ts" region="formgroup" title="src/app/profile-editor/profile-editor.component.ts (form group)">
+
+</code-example>
+
+The individual form controls are now collected within a group. The `FormGroup` provides its model value as an object reduced from the values of each control in the group. A `FormGroup` instance has the same properties (such as `value`, `untouched`) and methods (such as `setValue()`) as a `FormControl` instance.
+
+### Step 2 - Associate the `FormGroup` model and view
+
+The `FormGroup` also tracks the status and changes of each of its controls, so if one of the control’s status or value changes, the parent control also emits a new status or value change. The model for the group is maintained from its members. After you define the model, you must  update the template to reflect the model in the view.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.html" region="formgroup" linenums="false" title="src/app/profile-editor/profile-editor.component.html (template form group)">
+
+</code-example>
+
+Note that just as the `FormGroup` contains a group of controls, the _profileForm_ `FormGroup` is bound to the `form` element with the `FormGroup` directive, creating a communication layer between the model and the form containing the inputs. The `formControlName` input provided by the `FormControlName` directive binds each individual input to the form control defined in the `FormGroup`. The form controls communicate with their respective elements. The also communicate changes to the `FormGroup`, which provides the source of truth for the model value.
+
+### Save form data
+
+The `ProfileEditor` component takes input from the user, but in a real scenario you want to capture the form value for further processing outside the component. The `FormGroup` directive listens for the `submit` event emitted by the `form` element and emits an `ngSubmit` event that you can bind to a callback function. 
+
+Add an `ngSubmit` event listener to the `form` tag with the `onSubmit()` callback method.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.html" region="ng-submit" linenums="false" title="src/app/profile-editor/profile-editor.component.html (submit event)">
+
+</code-example>
+
+The `onSubmit()` method in the `ProfileEditor` component captures the current value of the `profileForm`. To keep the form encapsulated, to provide the form value outside the component, use an `EventEmitter`. The following example uses `console.warn` to log to the browser console.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.ts" region="on-submit" title="src/app/profile-editor/profile-editor.component.ts (submit method)">
+
+</code-example>
+
+The `submit` event is emitted by the `form` tag using the native DOM event. You trigger the event by clicking a button with `submit` type. This allows the user to use the enter key to trigger submission after filling out the form. 
+
+Add a `button` to the bottom of the form to trigger the form submission.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.html" region="submit-button" linenums="false" title="src/app/profile-editor/profile-editor.component.html (submit button)">
+
+</code-example>
+
+<div class="alert is-helpful">
+
+*Note:* The button in the snippet above also has a `disabled` binding attached to it to disable the button when the `profileForm` is invalid. You aren't performing any validation yet, so the button is always enabled. Simple form validation is covered later in the [Form Validation](#simple-form-validation) section.
+
+</div>
+
+#### Display the component
+
+The `ProileEditor` component that contains the form is displayed when added to a component template.
+
+<code-example path="reactive-forms/src/app/app.component.1.html" region="app-profile-editor" linenums="false" title="src/app/app.component.html (profile editor)">
+
+</code-example>
+
+The `ProfileEditor` allows you to manage the `FormControl` instances for the `firstName` and `lastName` controls within the `FormGroup`.
+
+<figure>
+  <img src="generated/images/guide/reactive-forms/profile-editor-1.png" alt="Profile Editor">
+</figure>
+
+## Nesting form groups
+
+When building complex forms, managing the different areas of information is easier in smaller sections, and some groups of information naturally fall into the same group. Using a nested `FormGroup` allows you to break large forms groups into smaller, more manageable ones.
+
+### Step 1 - Create a nested group
+
+An address is a good example of information that can be grouped together. A `FormGroup` can accept both `FormControl` and `FormGroup` instances as children. This makes composing complex form models easier to maintain and logically group together. To create a nested group in the `profileForm`, add a nested `address` `FormGroup`.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.ts" region="nested-formgroup" linenums="false" title="src/app/profile-editor/profile-editor.component.ts (nested form group)">
+
+</code-example>
+
+In this example, the `address group` combines the current `firstName` and `lastName` controls with the new `street`, `city`, `state` and `zip` controls. Even though the `address` `FormGroup` is a child of the overall `profileForm` `FormGroup`, the same rules still apply with value and status changes. Changes in status and value from the nested form group will propagate up to the parent form group, maintaining consistency with the overall model.
+
+### Step 2 - Group the nested form in the template
+
+After you update the model in the component class, update the template to connect the `FormGroup` instance and its input elements.
+
+Add the `address` form group containing the `firstName` and `lastName` fields to the `ProfileEditor` template.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.html" region="formgroupname" linenums="false" title="src/app/profile-editor/profile-editor.component.html (template nested form group)">
+
+</code-example>
+
+The `ProfileEditor` form is displayed as one group, but the model is broken down further to represent the logical grouping areas.
+
+<figure>
+  <img src="generated/images/guide/reactive-forms/profile-editor-2.png" alt="Profile Editor Update">
+</figure>
+
+<div class="alert is-helpful">
+
+*Note*: Display the value for the `FormGroup` in the component template using the `value` property and the `JsonPipe`.
+
+</div>
+
+## Partial model updates
+
+When updating the value for a `FormGroup` that contains multiple controls, you may only want to update parts of the model instead of replacing its entire value. This section covers how to update specific parts of an `AbstractControl` model.
+
+### Patch the model value
+
+With a single control, you used the `setValue()` method to set the new value for an individual control. The `setValue()` method is more strict about adhering to the structure of the `FormGroup` and replaces the entire value for the control. The `patchValue()` method is more forgiving; it only replaces properties defined in the object that have changed in the form model, because you’re only providing partial updates. The strict checks in `setValue()` help catch errors in the nesting of complex forms, while `patchValue()` will fail silently in those cases.
+
+In the `ProfileEditorComponent`, the `updateProfile` method with the following example below to update the first name and street address for the user.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.ts" region="patch-value" title="src/app/profile-editor/profile-editor.component.ts (patch value)">
+
+</code-example>
+
+Simulate an update by adding a button to the template to update the user profile on demand.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.html" region="patch-value" linenums="false" title="src/app/profile-editor/profile-editor.component.html (update value)">
+
+</code-example>
+
+When the button is clicked, the `profileForm` model is updated with just the `firstName` and `street` being modified. Notice that the `street` is provided in an object inside the `address` property. This is necessary because the `patchValue()` method applies the update against the model structure. `PatchValue()` only updates properties that the form model defines.
+
+## Generating form controls with `FormBuilder`
+
+Creating multiple form control instances manually can become very repetitive when dealing with multiple forms. The `FormBuilder` service provides convenience methods to handle generating controls. Underneath, the `FormBuilder` is creating and returning the instances in the same manner, but with much less work. The following section refactors the `ProfileEditor` component to use the `FormBuilder` instead of creating each `FormControl` and `FormGroup` by hand.
+
+### Step 1 - Import the `FormBuilder` class
+
+To use the `FormBuilder` service, import its class from the `@angular/forms` package.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.2.ts" region="form-builder-imports" title="src/app/profile-editor/profile-editor.component.ts (import)">
+
+</code-example>
+
+### Step 2 - Inject the `FormBuilder` service
+
+The FormBuilder is an injectable service that is provided with the `ReactiveFormsModule`. Inject this dependency by adding it to the component constructor.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.2.ts" region="inject-form-builder" title="src/app/profile-editor/profile-editor.component.ts (constructor)">
+
+</code-example>
+
+### Step 3 - Generate form controls
+
+The `FormBuilder` service has three methods: `control()`, `group()`, and `array()`. These methods are factory methods for generating form controls in your component class including a `FormControl`, `FormGroup`, and `FormArray` respectively. 
+
+Replace the creation of the `profileForm` by using the `group` method to create the controls.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.2.ts" region="form-builder" title="src/app/profile-editor/profile-editor.component.ts (form builder)">
+
+</code-example>
+
+In the example above, you use the `group()` method with the same names to define the properties in the model. Here, the value for each control name is an array containing the initial value as the first item.
+
+<div class="alert is-helpful">
+
+*Note*: You can define the control with just the initial value, but if your controls need sync or async validation, add sync and async validators as the second and third items in the array.
+
+</div>
+
+Compare the two paths to achieve the same result.
+
+<code-tabs>
+
+  <code-pane path="reactive-forms/src/app/profile-editor/profile-editor.component.1.ts" region="formgroup-compare" title="src/app/profile-editor/profile-editor.component.ts (instances)">
+  
+  </code-pane>
+
+  <code-pane path="reactive-forms/src/app/profile-editor/profile-editor.component.2.ts" region="formgroup-compare" title="src/app/profile-editor/profile-editor.component.ts (form builder)">
+
+  </code-pane>
+
+</code-tabs>
+
+## Simple form validation
+
+Form validation is necessary when receiving user input through forms. This section covers adding a single validator to a form control and displaying the overall form status. Form validation is covered more extensively in the [Form Validation](guide/form-validation) guide.
+
+### Step 1 - Import a validator function
+
+Reactive forms include a set of validator functions out of the box for common use cases. These functions receive a control to validate against and return an error object or null based on the validation check.
+
+Import the `Validators` class from the `@angular/forms` package.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.ts" region="validator-imports" title="src/app/profile-editor/profile-editor.component.ts (import)">
+
+</code-example>
+
+### Step 2 - Make a field required
+
+The most common validation is making a field required. This section describes how to add a required validation to the `firstName` control.
+
+In the `ProfileEditor` component, add the `Validators.required` static method as the second item in the array for the `firstName` control.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.ts" region="required-validator" title="src/app/profile-editor/profile-editor.component.ts (required validator)">
+
+</code-example>
+
+HTML5 has a set of built-in attributes that can be used for native validation, including `required`, `minlength`, `maxlength`, and more. Although _optional_, you can take advantage of these as additional attributes on your form input elements. Add the `required` attribute to the `firstName` input element.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.html" region="required-attribute" linenums="false" title="src/app/profile-editor/profile-editor.component.html (required attribute)">
+
+</code-example>
+
+<div class="alert is-important">
+
+*Note:* These HTML5 validation attributes should be used _in combination with_ the built-in validators provided by Angular's reactive forms. Using these two validation practices in combination prevents errors about the expression being changed after the template has been checked.
+
+</div>
+
+### Display form status
+
+Now that you’ve added a required field to the form control, its initial status is invalid. This invalid status propagates to the parent `FormGroup`, making its status invalid. You have access to the current status of the `FormGroup` through the `status` property on the instance.
+
+Display the current status of the `profileForm` using interpolation.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.html" region="display-status" linenums="false" title="src/app/profile-editor/profile-editor.component.html (display status)">
+
+</code-example>
+
+<figure>
+  <img src="generated/images/guide/reactive-forms/profile-editor-3.png" alt="Profile Editor Validation">
+</figure>
+
+The submit button is disabled because the `profileForm` is invalid due to the required `firstName` form control. After you fill out the `firstName` input, the form becomes valid and the submit button is enabled.
+
+For more on form validation, visit the [Form Validation](guide/form-validation) guide.
+
+## Dynamic controls using form arrays
+
+A `FormArray` is an alternative to a `FormGroup` for managing  any number of unnamed controls. As with `FormGroup` instances, you can dynamically insert and remove controls from a `FormArray`, and the `FormArray` instance's value and validation status is calculated from its child controls. However, you don't need to define a key for each control by name, so this is a great option if you don't know the number of child values in advance. The following example shows you how to manage an array of _aliases_ in the `ProfileEditor`.
+
+### Step 1 - Import the `FormArray`
+
+Import the `FormArray` class from `@angular/forms` to use for type information. The `FormBuilder` service is ready to create a `FormArray` instance.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.2.ts" region="form-array-imports" title="src/app/profile-editor/profile-editor.component.ts (import)">
+
+</code-example>
+
+### Step 2 - Define a `FormArray`
+
+You can initialize a `FormArray` with any number of controls, from zero to many, by defining them in an array. Add an `aliases` property to the `FormGroup` for the `profileForm` to define the `FormArray`.
+
+Use the `FormBuilder.array()` method to define the array, and the `FormBuilder.control()` method to populate the array with an initial control.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.ts" region="aliases" title="src/app/profile-editor/profile-editor.component.ts (aliases form array)">
+
+</code-example>
+
+The _aliases_ control in the `FormGroup` is now populated with a single control until more are added dynamically.
+
+### Step 3 - Access the `FormArray` control
+
+Because a `FormArray` represents an undefined number of controls in array, accessing the control through a getter provides convenience and reusability. Use the _getter_ syntax to create an _aliases_ class property to retrieve the alias's `FormArray` control from the parent `FormGroup`.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.ts" region="aliases-getter" title="src/app/profile-editor/profile-editor.component.ts (aliases getter)">
+
+</code-example>
+
+The getter provides easy access to the aliases `FormArray` instead of repeating the `profileForm.get()` method to get the instance.
+
+<div class="alert is-helpful">
+
+*Note*: Because the returned control is of type `AbstractControl`, you provide an explicit type to access the `FormArray` specific syntax for the methods.
+
+</div>
+
+Define a method to dynamically insert an alias control into the alias's `FormArray`. The `FormArray.push()` method inserts the control as a new item in the array.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.ts" region="add-alias" title="src/app/profile-editor/profile-editor.component.ts (add alias)">
+
+</code-example>
+
+In the template, the controls are iterated over to display each control as a separate input field.
+
+### Step 4 - Display the form array in the template
+
+After you define the aliases `FormArray` in your model, you must add it to the template for user input. Similar to the `formGroupName` input provided by the `FormGroupNameDirective`, a `formArrayName` binds communication from the `FormArray` to the template with the `FormArrayNameDirective`. 
+
+Add the template HTML below after the closing `formGroupName` `<div>` element.
+
+<code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.html" region="formarrayname" linenums="false" title="src/app/profile-editor/profile-editor.component.html (aliases form array template)">
+
+</code-example>
+
+The `*ngFor` directive iterates over each `FormControl` provided by the aliases `FormArray`. Because `FormArray` elements are unnamed, you assign the _index_ to the `i` variable and pass it to each control to bind it to the `formControlName` input. 
+
+<figure>
+  <img src="generated/images/guide/reactive-forms/profile-editor-4.png" alt="Profile Editor Aliases">
+</figure>
+
+Each time a new `alias` is added, the `FormArray` is provided its control based on the index. This allows you to track each individual control when calculating the status and value of the root control.
+
+#### Add an Alias
+
+Initially, the form only contains one `Alias` field. Click the `Add Alias` button, and another field appears. You can also validate the array of aliases reported by the form model displayed by the `Form Value` at the bottom of the template.
+
+<div class="alert is-helpful">
+
+*Note*: Instead of a `FormControl` for each alias, you could compose another `FormGroup` with additional fields. The process of defining a control for each item is the same.
+
+</div>
+
+{@a appendix}
+
+## Appendix
+
+{@a reactive-forms-api}
+
+### Reactive forms API
+
+Listed below are the base classes and services used to create and manage form controls.
+
+#### Classes
 
 <table>
 
@@ -279,9 +483,7 @@ This guide uses four fundamental classes to build a reactive form:
 
     <td>
 
-      [`AbstractControl`](api/forms/AbstractControl "API Reference: FormControl") is the abstract base class for the three concrete form control classes;
-`FormControl`, `FormGroup`, and `FormArray`.
-It provides their common behaviors and properties.
+      The abstract base class for the three concrete form control classes; `FormControl`, `FormGroup`, and `FormArray`. It provides their common behaviors and properties.
 
     </td>
 
@@ -295,9 +497,7 @@ It provides their common behaviors and properties.
 
     <td>
 
-      [`FormControl`](api/forms/FormControl "API Reference: FormControl")
-tracks the value and validity status of an individual form control.
-It corresponds to an HTML form control such as an `<input>` or `<select>`.
+      Manages the value and validity status of an individual form control. It corresponds to an HTML form control such as an `<input>` or `<select>`.
 
     </td>
 
@@ -311,10 +511,7 @@ It corresponds to an HTML form control such as an `<input>` or `<select>`.
 
     <td>
 
-      [`FormGroup`](api/forms/FormGroup "API Reference: FormGroup")
-tracks the value and validity state of a group of `AbstractControl` instances.
-The group's properties include its child controls.
-The top-level form in your component is a `FormGroup`.
+      Manages the value and validity state of a group of `AbstractControl` instances. The group's properties include its child controls. The top-level form in your component is a `FormGroup`.
 
     </td>
 
@@ -328,356 +525,38 @@ The top-level form in your component is a `FormGroup`.
 
     <td>
 
-      [`FormArray`](api/forms/FormArray "API Reference: FormArray")
-tracks the value and validity state of a numerically indexed array of `AbstractControl` instances.
+    Manages the value and validity state of a numerically indexed array of `AbstractControl` instances.
 
     </td>
 
   </tr>
 
+  <tr>
+
+    <td style="vertical-align: top">
+      <code>FormBuilder</code>
+    </td>
+
+    <td>
+
+      An injectable service that provides factory methods for creating control instances.
+
+    </td>
+
+  </tr>  
+
 </table>
 
+When importing the `ReactiveFormsModule`, you also gain access to directives to use in your templates for binding the data model to the forms declaratively.
 
-## Style the app
+#### Directives
 
-To use the bootstrap CSS classes that are in the template HTML of both the `AppComponent` and the `HeroDetailComponent`,
-add the `bootstrap` CSS stylesheet to the head of `styles.css`:
-
-
-<code-example path="reactive-forms/src/styles.1.css" title="styles.css" linenums="false">
-
-</code-example>
-
-Now that everything is wired up, serve the app with:
-
-<code-example language="sh" class="code-shell">
-
-  ng serve
-
-</code-example>
-
-The browser should display something like this:
-
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/just-formcontrol.png" alt="Single FormControl">
-</figure>
-
-{@a formgroup}
-
-## Add a FormGroup
-Usually, if you have multiple `FormControls`, you register
-them within a parent `FormGroup`.
-To add a `FormGroup`, add it to the imports section
-of `hero-detail.component.ts`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-2.component.ts" region="imports" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-In the class, wrap the `FormControl` in a `FormGroup` called `heroForm` as follows:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-2.component.ts" region="v2" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-Now that you've made changes in the class, they need to be reflected in the
-template. Update `hero-detail.component.html` by replacing it with the following.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-2.component.html" region="basic-form" title="src/app/hero-detail/hero-detail.component.html" linenums="false">
-
-</code-example>
-
-Notice that now the single `<input>` is in a `<form>` element.
-
-`formGroup` is a reactive form directive that takes an existing
-`FormGroup` instance and associates it with an HTML element.
-In this case, it associates the `FormGroup` you saved as
-`heroForm` with the `<form>` element.
-
-Because the class now has a `FormGroup`, you must update the template
-syntax for associating the `<input>` with the corresponding
-`FormControl` in the component class.
-Without a parent `FormGroup`,
-`[formControl]="name"` worked earlier because that directive
-can stand alone, that is, it works without being in a `FormGroup`.
-With a parent `FormGroup`, the `name` `<input>` needs the syntax
-`formControlName=name` in order to be associated
-with the correct `FormControl`
-in the class. This syntax tells Angular to look for the parent
-`FormGroup`, in this case `heroForm`, and then _inside_ that group
-to look for a `FormControl` called `name`.
-
-
-{@a json}
-
-## Taking a look at the form model
-
-When the user enters data into an `<input>`, the value
-goes into the **_form model_**.
-To see the form model, add the following line after the
-closing `<form>` tag in the `hero-detail.component.html`:
-
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-2.component.html" region="form-value-json" title="src/app/hero-detail/hero-detail.component.html" linenums="false">
-
-</code-example>
-
-
-The `heroForm.value` returns the _form model_.
-Piping it through the `JsonPipe` renders the model as JSON in the browser:
-
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/json-output.png" alt="JSON output">
-</figure>
-
-The initial `name` property value is the empty string.
-Type into the name `<input>` and watch the keystrokes appear in the JSON.
-
-In real life apps, forms get big fast.
-`FormBuilder` makes form development and maintenance easier.
-
-
-{@a formbuilder}
-
-## Introduction to `FormBuilder`
-
-The `FormBuilder` class helps reduce repetition and
-clutter by handling details of control creation for you.
-
-To use `FormBuilder`, import it into `hero-detail.component.ts`. You can remove `FormControl`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-3a.component.ts" region="imports" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-Use it to refactor the `HeroDetailComponent` into something that's easier to read and write,
-by following this plan:
-
-* Explicitly declare the type of the `heroForm` property to be `FormGroup`; you'll initialize it later.
-* Inject a `FormBuilder` into the constructor.
-* Add a new method that uses the `FormBuilder` to define the `heroForm`; call it `createForm()`.
-* Call `createForm()` in the constructor.
-
-The revised `HeroDetailComponent` looks like this:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-3a.component.ts" region="v3a" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-
-`FormBuilder.group` is a factory method that creates a `FormGroup`. &nbsp;
-`FormBuilder.group` takes an object whose keys and values are `FormControl` names and their definitions.
-In this example, the `name` control is defined by its initial data value, an empty string.
-
-Defining a group of controls in a single object makes your code more compact and readable because you don't have to write repeated `new FormControl(...)` statements.
-
-{@a validators}
-
-### `Validators.required`
-Though this guide doesn't go deeply into validations, here is one example that
-demonstrates the simplicity of using `Validators.required` in reactive forms.
-
-First, import the `Validators` symbol.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-3.component.ts" region="imports" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-
-To make the `name` `FormControl` required, replace the `name`
-property in the `FormGroup` with an array.
-The first item is the initial value for `name`;
-the second is the required validator, `Validators.required`.
-
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-3.component.ts" region="required" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-
-<div class="l-sub-section">
-
-Reactive validators are simple, composable functions.
-Configuring validation is different in template-driven forms in that you must wrap validators in a directive.
-
-</div>
-
-Update the diagnostic message at the bottom of the template to display the form's validity status.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-3.component.html" region="form-value-json" title="src/app/hero-detail/hero-detail.component.html (excerpt)" linenums="false">
-
-</code-example>
-
-The browser displays the following:
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/validators-json-output.png" alt="Single FormControl">
-</figure>
-
-`Validators.required` is working. The status is `INVALID` because the `<input>` has no value.
-Type into the `<input>` to see the status change from `INVALID` to `VALID`.
-
-In a real app, you'd replace the diagnosic message with a user-friendly experience.
-
-Using `Validators.required` is optional for the rest of the guide.
-It remains in each of the following examples with the same configuration.
-
-For more on validating Angular forms, see the
-[Form Validation](guide/form-validation) guide.
-
-### More `FormControl`s
-
-This section adds additional `FormControl`s for the address, a super power, and a sidekick.
-
-Additionally, the address has a state property. The user will select a state with a `<select>` and you'll populate
-the `<option>` elements with states. So import `states` from `data-model.ts`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-4.component.ts" region="imports" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-Declare the `states` property and add some address `FormControls` to the `heroForm` as follows.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-4.component.ts" region="v4" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-Then add corresponding markup in `hero-detail.component.html` as follows.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-4.component.html" title="src/app/hero-detail/hero-detail.component.html" linenums="false">
-
-</code-example>
-
-<div class="alert is-helpful">
-
-*Note*: Ignore the many mentions of `form-group`,
-`form-control`, `center-block`, and `checkbox` in this markup.
-Those are _bootstrap_ CSS classes that Angular itself ignores.
-Pay attention to the `[formGroup]` and `formControlName` attributes.
-They are the Angular directives that bind the HTML controls to the
-Angular `FormGroup` and `FormControl` properties in the component class.
-
-</div>
-
-The revised template includes more text `<input>` elements, a `<select>` for the `state`, radio buttons for the `power`,
-and a `<checkbox>` for the `sidekick`.
-
-You must bind the value property of the `<option>` with `[value]="state"`.
-If you do not bind the value, the select shows the first option from the data model.
-
-The component _class_ defines control properties without regard for their representation in the template.
-You define the `state`, `power`, and `sidekick` controls the same way you defined the `name` control.
-You tie these controls to the template HTML elements in the same way,
-specifying the `FormControl` name with the `formControlName` directive.
-
-See the API reference for more information about
-[radio buttons](api/forms/RadioControlValueAccessor "API: RadioControlValueAccessor"),
-[selects](api/forms/SelectControlValueAccessor "API: SelectControlValueAccessor"), and
-[checkboxes](api/forms/CheckboxControlValueAccessor "API: CheckboxControlValueAccessor").
-
-
-
-{@a grouping}
-
-
-### Nested FormGroups
-
-To manage the size of the form more effectively, you can group some of the related `FormControls`
-into a nested `FormGroup`. For example, the `street`, `city`, `state`, and `zip` are ideal properties for an address `FormGroup`.
-Nesting groups and controls in this way allows you to
-mirror the hierarchical structure of the data model
-and helps track validation and state for related sets of controls.
-
-You used the `FormBuilder` to create one `FormGroup` in this component called `heroForm`.
-Let that be the parent `FormGroup`.
-Use `FormBuilder` again to create a child `FormGroup` that encapsulates the `address` controls;
-assign the result to a new `address` property of the parent `FormGroup`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-5.component.ts" region="v5" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-
-When you change the structure of the form controls in the component class,
-you must make corresponding adjustments to the component template.
-
-In `hero-detail.component.html`, wrap the address-related `FormControls` in a `<div>`.
-Add a `formGroupName` directive to the `div` and bind it to `"address"`.
-That's the property of the `address` child `FormGroup` within the parent `FormGroup` called `heroForm`. Leave the `<div>` with the `name` `<input>`.
-
-To make this change visually obvious, add an `<h4>` header near the top with the text, _Secret Lair_.
-The new address HTML looks like this:
-
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-5.component.html" region="add-group" title="src/app/hero-detail/hero-detail.component.html (excerpt)" linenums="false">
-
-</code-example>
-
-
-After these changes, the JSON output in the browser shows the revised form model
-with the nested address `FormGroup`:
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/address-group.png" alt="JSON output">
-</figure>
-
-This shows that the template
-and the form model are talking to one another.
-
-{@a properties}
-
-## Inspect `FormControl` Properties
-
-You can inspect an individual `FormControl` within a form by extracting it with the `get()` method.
-You can do this within the component class or display it on the
-page by adding the following to the template,
-immediately after the `{{form.value | json}}` interpolation as follows:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-5.component.html" region="inspect-value" title="src/app/hero-detail/hero-detail.component.html" linenums="false">
-
-</code-example>
-
-To get the state of a `FormControl` that’s inside a `FormGroup`, use dot notation to traverse to the control.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-5.component.html" region="inspect-child-control" title="src/app/hero-detail/hero-detail.component.html" linenums="false">
-
-</code-example>
-
-<div class="alert is-helpful">
-
-*Note*: If you're coding along, remember to remove this reference to `address.street` when you get to the section on `FormArray`. In that section, you change the name of address in the component class and it will throw an error if you leave it in the template.
-
-</div>
-
-You can use this technique to display any property of a `FormControl`
-such as one of the following:
-
-<style>
-  td, th {vertical-align: top}
-</style>
-
-
-
-<table width="100%">
-
-  <col width="10%">
-
-  </col>
-
-  <col width="90%">
-
-  </col>
+<table>
 
   <tr>
 
     <th>
-      Property
+      Directive
     </th>
 
     <th>
@@ -688,59 +567,69 @@ such as one of the following:
 
   <tr>
 
-    <td>
-      <code>myControl.value</code>
+    <td style="vertical-align: top">
+      <code>FormControlDirective</code>
     </td>
 
     <td>
 
+      Syncs a standalone `FormControl` instance to a form control element.
 
-      the value of a `FormControl`.
     </td>
 
   </tr>
 
   <tr>
 
-    <td>
-      <code>myControl.status</code>
+    <td style="vertical-align: top">
+      <code>FormControlName</code>
     </td>
 
     <td>
 
+      Syncs a `FormControl` in an existing `FormGroup` to a form control element by name.
 
-      the validity of a `FormControl`. Possible values: `VALID`,
-       `INVALID`, `PENDING`, or `DISABLED`.
     </td>
 
   </tr>
 
   <tr>
 
-    <td>
-      <code>myControl.pristine</code>
+    <td style="vertical-align: top">
+      <code>FormGroupDirective</code>
     </td>
 
     <td>
 
+      Syncs an existing `FormGroup` to a DOM element.
 
-      `true` if the user has _not_ changed the value in the UI.
-      Its opposite is `myControl.dirty`.
     </td>
 
   </tr>
 
   <tr>
 
-    <td>
-      <code>myControl.untouched</code>
+    <td style="vertical-align: top">
+      <code>FormGroupName</code>
     </td>
 
     <td>
 
+      Syncs a nested `FormGroup` to a DOM element.
 
-      `true` if the control user has not yet entered the HTML control
-       and triggered its blur event. Its opposite is `myControl.touched`.
+    </td>
+
+  </tr>
+
+  <tr>
+
+    <td style="vertical-align: top">
+      <code>FormArrayName</code>
+    </td>
+
+    <td>
+
+      Syncs a nested `FormArray` to a DOM element.
 
     </td>
 
@@ -748,638 +637,46 @@ such as one of the following:
 
 </table>
 
+### Comparison to template-driven forms
 
+_Template-driven_ forms, introduced in the [Template-driven forms guide](guide/forms), take a completely different approach.
 
-Read about other `FormControl` properties in the
-[_AbstractControl_](api/forms/AbstractControl) API reference.
+* You place HTML form controls (such as `<input>` and `<select>`) in the component template and bind them to _data model_ properties in the component, using directives such as `ngModel`.
 
-One common reason for inspecting `FormControl` properties is to
-make sure the user entered valid values.
-Read more about validating Angular forms in the
-[Form Validation](guide/form-validation) guide.
+* You don't create Angular form control objects. Angular directives create them for you, using the information in your data bindings.
 
-{@a data-model-form-model}
+* You don't push and pull data values. Angular handles that for you with `ngModel`. Angular updates the mutable _data model_ with user changes as they happen.
 
-## The data model and the form model
+While this means less code in the component class,
+[template-driven forms are asynchronous](guide/reactive-forms#async-vs-sync "Async vs sync")
+which may complicate development in more advanced scenarios.
 
-At the moment, the form is displaying empty values.
-The `HeroDetailComponent` should display values of a hero,
-possibly a hero retrieved from a remote server.
 
-In this app, the `HeroDetailComponent` gets its hero from a parent `HeroListComponent`.
+{@a async-vs-sync}
 
-The `hero` from the server is the **_data model_**.
-The `FormControl` structure is the **_form model_**.
 
-The component must copy the hero values in the data model into the form model.
-There are two important implications:
+### Async vs. sync
 
-1. The developer must understand how the properties of the data model
-map to the properties of the form model.
+Reactive forms are synchronous, and template-driven forms are asynchronous.
 
-2. User changes flow from the DOM elements to the form model, not to the data model.
+In reactive forms, you create the entire form control tree in code.
+You can immediately update a value or drill down through the descendants of the parent form
+because all controls are always available.
 
-The form controls never update the _data model_.
+Template-driven forms delegate creation of their form controls to directives.
+To avoid "_changed after checked_" errors,
+these directives take more than one cycle to build the entire control tree.
+That means you must wait a tick before manipulating any of the controls
+from within the component class.
 
-The form and data model structures don't need to match exactly.
-You often present a subset of the data model on a particular screen.
-But it makes things easier if the shape of the form model is close to the shape of the data model.
+For example, if you inject the form control with a `@ViewChild(NgForm)` query and examine it in the
+[`ngAfterViewInit` lifecycle hook](guide/lifecycle-hooks#afterview "Lifecycle hooks guide: AfterView"),
+you'll discover that it has no children.
+You must wait a tick, using `setTimeout`, before you can
+extract a value from a control, test its validity, or set it to a new value.
 
-In this `HeroDetailComponent`, the two models are quite close.
+The asynchrony of template-driven forms also complicates unit testing.
+You must wrap your test block in `async()` or `fakeAsync()` to
+avoid looking for values in the form that aren't there yet.
+With reactive forms, everything is available when you expect it to be.
 
-Here are the definitions of `Hero` and `Address` in `data-model.ts`:
-
-<code-example path="reactive-forms/src/app/data-model.ts" region="model-classes" title="src/app/data-model.ts (classes)" linenums="false">
-
-</code-example>
-
-Here, again, is the component's `FormGroup` definition.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-6.component.ts" region="hero-form-model" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-
-There are two significant differences between these models:
-
-1. The `Hero` has an `id`. The form model does not because you generally don't show primary keys to users.
-
-1. The `Hero` has an array of addresses. This form model presents only one address,
-which is covered in the section on [`FormArray`](guide/reactive-forms#form-array "Form arrays") below.
-
-Keeping the two models close in shape facilitates copying the data model properties
-to the form model with the `patchValue()` and `setValue()` methods in the next section.
-
-
-First, refactor the `address` `FormGroup` definition as follows:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="address-form-group" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-
-Also be sure to update the `import` from `data-model` so you can reference the `Hero` and `Address` classes:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="import-address" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-{@a set-data}
-
-## Populate the form model with `setValue()` and `patchValue()`
-
-<div class="alert is-helpful">
-
-*Note*: If you're coding along, this section is optional as the rest of the steps do not rely on it.
-
-</div>
-
-Previously, you created a control and initialized its value at the same time.
-You can also initialize or reset the values later with the
-`setValue()` and `patchValue()` methods.
-
-### `setValue()`
-With `setValue()`, you assign every form control value at once
-by passing in a data object whose properties exactly match the form model behind the `FormGroup`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="set-value" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-The `setValue()` method checks the data object thoroughly before assigning any form control values.
-
-It will not accept a data object that doesn't match the `FormGroup` structure or is
-missing values for any control in the group. This way, it can return helpful
-error messages if you have a typo or if you've nested controls incorrectly.
-Conversely, `patchValue()` will fail silently.
-
-Notice that you can almost use the entire `hero` as the argument to `setValue()`
-because its shape is similar to the component's `FormGroup` structure.
-
-You can only show the hero's first address and you must account for the possibility that the `hero` has no addresses at all, as in the conditional setting of the `address` property in the data object argument:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="set-value-address" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-
-
-### `patchValue()`
-With **`patchValue()`**, you can assign values to specific controls in a `FormGroup`
-by supplying an object of key/value pairs for them.
-
-This example sets only the form's `name` control.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-6.component.ts" region="patch-value" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-
-With `patchValue()` you have more flexibility to cope with divergent data and form models.
-But unlike `setValue()`,  `patchValue()` cannot check for missing control
-values and doesn't throw helpful errors.
-
-
-{@a hero-list}
-
-## Create the `HeroListComponent` and `HeroService`
-
-To demonstrate further reactive forms techniques, it is helpful to add more functionality to the example by adding a `HeroListComponent` and a `HeroService`.
-
-The `HeroDetailComponent` is a nested sub-component of the `HeroListComponent` in a _master/detail_ view. Together they look like this:
-
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/hero-list.png" alt="HeroListComponent">
-</figure>
-
-
-First, add a `HeroListComponent` with the following command:
-
-<code-example language="sh" class="code-shell">
-
-  ng generate component HeroList
-
-</code-example>
-
-Give the `HeroListComponent` the following contents:
-
-<code-example path="reactive-forms/src/app/hero-list/hero-list.component.ts" title="hero-list.component.ts" linenums="false">
-
-</code-example>
-
-
-Next, add a `HeroService` using the following command:
-
-<code-example language="sh" class="code-shell">
-
-  ng generate service Hero
-
-</code-example>
-
-Then, give it the following contents:
-
-<code-example path="reactive-forms/src/app/hero.service.ts" title="hero.service.ts" linenums="false">
-
-</code-example>
-
-The `HeroListComponent` uses an injected `HeroService` to retrieve heroes from the server
-and then presents those heroes to the user as a series of buttons.
-The `HeroService` emulates an HTTP service.
-It returns an `Observable` of heroes that resolves after a short delay,
-both to simulate network latency and to indicate visually
-the necessarily asynchronous nature of the application.
-
-When the user clicks on a hero,
-the component sets its `selectedHero` property which
-is bound to the `hero` `@Input()` property of the `HeroDetailComponent`.
-The `HeroDetailComponent` detects the changed hero and resets its form
-with that hero's data values.
-
-A refresh button clears the hero list and the current selected hero before refetching the heroes.
-
-Notice that `hero-list.component.ts` imports `Observable` and the `finalize` operator, while `hero.service.ts` imports `Observable`, `of`, and the `delay` operator from `rxjs`.
-
-The remaining `HeroListComponent` and `HeroService` implementation details are beyond the scope of this tutorial.
-However, the techniques involved are covered elsewhere in the documentation, including the _Tour of Heroes_
-[here](tutorial/toh-pt3 "ToH: Multiple Components") and [here](tutorial/toh-pt4 "ToH: Services").
-
-To use the `HeroService`, import it into `AppModule` and add it to the `providers` array. To use the `HeroListComponent`, import it, declare it, and export it:
-
-<code-example path="reactive-forms/src/app/app.module.ts" region="hero-service-list" title="app.module.ts (excerpts)" linenums="false">
-
-</code-example>
-
-
-Next, update the `HeroListComponent` template with the following:
-
-<code-example path="reactive-forms/src/app/hero-list/hero-list.component.html" title="hero-list.component.html" linenums="false">
-
-</code-example>
-
-These changes need to be reflected in the `AppComponent` template. Replace the contents of `app.component.html` with updated markup to use the `HeroListComponent`, instead of the `HeroDetailComponent`:
-
-<code-example path="reactive-forms/src/app/app.component.html" title="app.component.html" linenums="false">
-
-</code-example>
-
-
-Finally, add an `@Input()` property to the `HeroDetailComponent`
-so `HeroDetailComponent` can receive the data from `HeroListComponent`. Remember to add the `Input` symbol to the `@angular/core `  `import` statement in the list of JavaScript imports too.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-6.component.ts" region="hero" title="hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-Now you should be able to click on a button for a hero and a form renders.
-
-## When to set form model values (`ngOnChanges`)
-
-When to set form model values depends upon when the component gets the data model values.
-
-The `HeroListComponent` displays hero names to the user.
-When the user clicks on a hero, the `HeroListComponent` passes the selected hero into the `HeroDetailComponent`
-by binding to its `hero` `@Input()` property.
-
-<code-example path="reactive-forms/src/app/hero-list/hero-list.component.1.html" title="hero-list.component.html (simplified)" linenums="false">
-
-</code-example>
-
-In this approach, the value of `hero` in the `HeroDetailComponent` changes
-every time the user selects a new hero.
-You can call `setValue()` using the [ngOnChanges](guide/lifecycle-hooks#onchanges)
-lifecycle hook, which Angular calls whenever the `@Input()` `hero` property changes.
-
-### Reset the form
-
-First, import the `OnChanges` symbol in `hero-detail.component.ts`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-6.component.ts" region="import-input" title="src/app/hero-detail/hero-detail.component.ts (core imports)" linenums="false">
-
-</code-example>
-
-Next, let Angular know that the `HeroDetailComponent` implements `OnChanges`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="onchanges-implementation" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-
-Add the `ngOnChanges` method to the class as follows:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="ngOnChanges" title="src/app/hero-detail/hero-detail.component.ts (ngOnchanges)" linenums="false">
-
-</code-example>
-
-Notice that it calls `rebuildForm()`, which is a method where you
-can set the values. You can name `rebuildForm()` anything that makes sense to you. It isn't built into Angular, but is a method you create to effectively leverage the `ngOnChanges` lifecycle hook.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="rebuildForm" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-The `rebuildForm()` method does two things; resets the hero's name and the address.
-
-{@a form-array}
-
-## Use _FormArray_ to present an array of `FormGroups`
-A `FormGroup` is a named object whose property values are `FormControls` and other `FormGroups`.
-
-Sometimes you need to present an arbitrary number of controls or groups.
-For example, a hero may have zero, one, or any number of addresses.
-
-The `Hero.addresses` property is an array of `Address` instances.
-An `address`  `FormGroup` can display one `Address`.
-An Angular `FormArray` can display an array of `address`  `FormGroups`.
-
-To get access to the `FormArray` class, import it into `hero-detail.component.ts`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="imports" title="src/app/hero-detail/hero-detail.component.ts (excerpt)" linenums="false">
-
-</code-example>
-
-To work with a `FormArray` do the following:
-
-1. Define the items in the array; that is, `FormControls` or `FormGroups`.
-
-1. Initialize the array with items created from data in the data model.
-
-1. Add and remove items as the user requires.
-
-Define a `FormArray` for `Hero.addresses` and
-let the user add or modify addresses.
-
-You’ll need to redefine the form model in the `HeroDetailComponent` `createForm()` method,
-which currently only displays the first hero address in an `address` `FormGroup`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-7.component.ts" region="address-form-group" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-### From `address` to `secretLairs`
-
-From the user's point of view, heroes don't have _addresses_.
-Addresses are for mere mortals. Heroes have _secret lairs_!
-Replace the address `FormGroup` definition with a `secretLairs`  `FormArray` definition:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="secretLairs-form-array" title="src/app/hero-detail/hero-detail-8.component.ts" linenums="false">
-
-</code-example>
-
-In `hero-detail.component.html` change `formGroupName="address"` to `formArrayName="secretLairs"`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.html" region="form-array-name" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-<div class="alert is-helpful">
-
-Changing the form control name from `address` to `secretLairs` underscores an important point:
-the _form model_ doesn't have to match the _data model_.
-
-Obviously, there has to be a relationship between the two.
-But it can be anything that makes sense within the application domain.
-
-_Presentation_ requirements often differ from _data_ requirements.
-The reactive forms approach both emphasizes and facilitates this distinction.
-
-</div>
-
-### Initialize the `secretLairs` _FormArray_
-
-The default form displays a nameless hero with no addresses.
-
-You need a method to populate (or repopulate) the `secretLairs` with actual hero addresses whenever
-the parent `HeroListComponent` sets the `HeroDetailComponent.hero`  `@Input()` property to a new `Hero`.
-
-The following `setAddresses()` method replaces the `secretLairs`  `FormArray` with a new `FormArray`,
-initialized by an array of hero address `FormGroups`. Add this to the `HeroDetailComponent` class:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="set-addresses" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-Notice that you replace the previous `FormArray` with the
-`FormGroup.setControl()` method, not with `setValue()`.
-You're replacing a _control_, not the _value_ of a control.
-
-Notice also that the `secretLairs`  `FormArray` contains `FormGroups`, not `Addresses`.
-
-Next, call `setAddresses()` from within `rebuildForm()`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="rebuildform" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-
-### Get the _FormArray_
-The `HeroDetailComponent` should be able to display, add, and remove items from the `secretLairs`  `FormArray`.
-
-Use the `FormGroup.get()` method to acquire a reference to that `FormArray`.
-Wrap the expression in a `secretLairs` convenience property for clarity and re-use. Add the following to `HeroDetailComponent`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="get-secret-lairs" title="src/app/hero-detail/hero-detail.component.ts (secretLairs property)" linenums="false">
-
-</code-example>
-
-### Display the _FormArray_
-
-The current HTML template displays a single `address` `FormGroup`.
-Revise it to display zero, one, or more of the hero's `address`  `FormGroups`.
-
-This is mostly a matter of wrapping the previous template HTML for an address in a `<div>` and
-repeating that `<div>` with `*ngFor`.
-
-There are three key points when writing the `*ngFor`:
-
-1. Add another wrapping `<div>`, around the `<div>` with `*ngFor`, and
-set its `formArrayName` directive to `"secretLairs"`.
-This step establishes the `secretLairs`  `FormArray` as the context for form controls in the inner, repeated HTML template.
-
-1. The source of the repeated items is the `FormArray.controls`, not the `FormArray` itself.
-Each control is an `address`  `FormGroup`, exactly what the previous (now repeated) template HTML expected.
-
-1. Each repeated `FormGroup` needs a unique `formGroupName`, which must be the index of the `FormGroup` in the `FormArray`.
-You'll re-use that index to compose a unique label for each address.
-
-Here's the skeleton for the secret lairs section of the HTML template:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.html" region="form-array-skeleton" title="src/app/hero-detail/hero-detail.component.html (*ngFor)" linenums="false">
-
-</code-example>
-
-Here's the complete template for the secret lairs section. Add this to `HeroDetailComponent` template, replacing the `forGroupName=address`  `<div>`:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.html" region="form-array" title="src/app/hero-detail/hero-detail.component.html (excerpt)">
-
-</code-example>
-
-
-
-### Add a new lair to the _FormArray_
-
-Add an `addLair()` method that gets the `secretLairs`  `FormArray` and appends a new `address`  `FormGroup` to it.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="add-lair" title="src/app/hero-detail/hero-detail.component.ts (addLair method)" linenums="false">
-
-</code-example>
-
-Place a button on the form so the user can add a new _secret lair_ and wire it to the component's `addLair()` method. Put it just before the closing `</div>` of the `secretLairs`  `FormArray`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.html" region="add-lair" title="src/app/hero-detail/hero-detail.component.html (addLair button)" linenums="false">
-
-</code-example>
-
-<div class="alert is-important">
-
-Be sure to add the `type="button"` attribute 
-because without an explicit type, the button type defaults to "submit".
-When you later add a form submit action, every "submit" button triggers the submit action which
-might do something like save the current changes.
-You do not want to save changes when the user clicks the _Add a Secret Lair_ button.
-
-</div>
-
-### Try it!
-
-Back in the browser, select the hero named "Magneta".
-"Magneta" doesn't have an address, as you can see in the diagnostic JSON at the bottom of the form.
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/addresses-array.png" alt="JSON output of addresses array">
-</figure>
-
-
-Click the "_Add a Secret Lair_" button.
-A new address section appears. Well done!
-
-### Remove a lair
-
-This example can _add_ addresses but it can't _remove_ them.
-For extra credit, write a `removeLair` method and wire it to a button on the repeating address HTML.
-
-{@a observe-control}
-
-## Observe control changes
-
-Angular calls `ngOnChanges()` when the user picks a hero in the parent `HeroListComponent`.
-Picking a hero changes the `HeroDetailComponent.hero`  `@Input()` property.
-
-Angular does _not_ call `ngOnChanges()` when the user modifies the hero's `name` or `secretLairs`.
-Fortunately, you can learn about such changes by subscribing to one of the `FormControl` properties
-that raises a change event.
-
-These are properties, such as `valueChanges`, that return an RxJS `Observable`.
-You don't need to know much about RxJS `Observable` to monitor form control values.
-
-Add the following method to log changes to the value of the `name` `FormControl`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="log-name-change" title="src/app/hero-detail/hero-detail.component.ts (logNameChange)" linenums="false">
-
-</code-example>
-
-Call it in the constructor, after `createForm()`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.ts" region="ctor" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">
-
-</code-example>
-
-The `logNameChange()` method pushes name-change values into a `nameChangeLog` array.
-Display that array at the bottom of the component template with this `*ngFor` binding:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.html" region="name-change-log" title="src/app/hero-detail/hero-detail.component.html (Name change log)" linenums="false">
-
-</code-example>
-
-
-
-Return to the browser, select a hero; for example, Magneta, and start typing in the `name`  `<input>`.
-You should see a new name in the log after each keystroke.
-
-### When to use it
-
-An interpolation binding is the easier way to display a name change.
-Subscribing to an observable `FormControl` property is handy for triggering
-application logic within the component class.
-
-{@a save}
-
-## Save form data
-
-The `HeroDetailComponent` captures user input but it doesn't do anything with it.
-In a real app, you'd probably save those hero changes, revert unsaved changes, and resume editing.
-After you implement both features in this section, the form will look like this:
-
-
-<figure>
-  <img src="generated/images/guide/reactive-forms/save-revert-buttons.png" alt="Form with save & revert buttons">
-</figure>
-
-
-
-### Save
-When the user submits the form,
-the `HeroDetailComponent` will pass an instance of the hero _data model_
-to a save method on the injected `HeroService`. Add the following to `HeroDetailComponent`.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="on-submit" title="src/app/hero-detail/hero-detail.component.ts (onSubmit)" linenums="false">
-
-</code-example>
-
-<!-- TODO: Need to add `private heroService: HeroService` to constructor and import the HeroService. Remove novalidate-->
-
-This original `hero` had the pre-save values. The user's changes are still in the _form model_.
-So you create a new `hero` from a combination of original hero values (the `hero.id`)
-and deep copies of the changed form model values, using the `prepareSaveHero()` helper.
-
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="prepare-save-hero" title="src/app/hero-detail/hero-detail.component.ts (prepareSaveHero)" linenums="false">
-
-</code-example>
-
-Make sure to import `HeroService` and add it to the constructor:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="import-service" title="src/app/hero-detail/hero-detail.component.ts (prepareSaveHero)" linenums="false">
-
-</code-example>
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="ctor" title="src/app/hero-detail/hero-detail.component.ts (prepareSaveHero)" linenums="false">
-
-</code-example>
-
-<div class="l-sub-section">
-
-**Address deep copy**
-
-Had you assigned the `formModel.secretLairs` to `saveHero.addresses` (see line commented out),
-the addresses in `saveHero.addresses` array would be the same objects
-as the lairs in the `formModel.secretLairs`.
-A user's subsequent changes to a lair street would mutate an address street in the `saveHero`.
-
-The `prepareSaveHero` method makes copies of the form model's `secretLairs` objects so that can't happen.
-
-
-</div>
-
-
-
-### Revert (cancel changes)
-The user cancels changes and reverts the form to the original state by pressing the Revert button.
-
-Reverting is easy. Simply re-execute the `rebuildForm()` method that built the form model from the original, unchanged `hero` data model.
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.ts" region="revert" title="src/app/hero-detail/hero-detail.component.ts (revert)" linenums="false">
-
-</code-example>
-
-
-
-### Buttons
-Add the "Save" and "Revert" buttons near the top of the component's template:
-
-<code-example path="reactive-forms/src/app/hero-detail/hero-detail.component.html" region="buttons" title="src/app/hero-detail/hero-detail.component.html (Save and Revert buttons)" linenums="false">
-
-</code-example>
-
-
-
-The buttons are disabled until the user "dirties" the form by changing a value in any of its form controls (`heroForm.dirty`).
-
-Clicking a button of type `"submit"` triggers the `ngSubmit` event which calls the component's `onSubmit` method.
-Clicking the revert button triggers a call to the component's `revert` method.
-Users now can save or revert changes.
-
-Try the <live-example stackblitz="final" title="Reactive Forms (final) in Stackblitz"></live-example>.
-
-{@a source-code}
-
-
-The key files of the final version are as follows:
-
-
-<code-tabs>
-
-  <code-pane title="src/app/app.component.html" path="reactive-forms/src/app/app.component.html">
-
-  </code-pane>
-
-  <code-pane title="src/app/app.component.ts" path="reactive-forms/src/app/app.component.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/app.module.ts" path="reactive-forms/src/app/app.module.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/hero-detail/hero-detail.component.ts" path="reactive-forms/src/app/hero-detail/hero-detail.component.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/hero-detail/hero-detail.component.html" path="reactive-forms/src/app/hero-detail/hero-detail.component.html">
-
-  </code-pane>
-
-  <code-pane title="src/app/hero-list/hero-list.component.html" path="reactive-forms/src/app/hero-list/hero-list.component.html">
-
-  </code-pane>
-
-  <code-pane title="src/app/hero-list/hero-list.component.ts" path="reactive-forms/src/app/hero-list/hero-list.component.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/data-model.ts" path="reactive-forms/src/app/data-model.ts">
-
-  </code-pane>
-
-  <code-pane title="src/app/hero.service.ts" path="reactive-forms/src/app/hero.service.ts">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
-You can download the complete source for all steps in this guide
-from the <live-example title="Reactive Forms Demo in Stackblitz">Reactive Forms Demo</live-example> live example.
diff --git a/aio/content/images/guide/reactive-forms/address-group.png b/aio/content/images/guide/reactive-forms/address-group.png
deleted file mode 100644
index ee1587c1072fd6793cdce709c9c73413b6654837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6022
zcmZ{oWmH>Dx5pEpKyfGpONzU@yCxJZPD@kV-JuXD6l<ZlYoQd^;u4A#D-I79+$rAT
zaP!=E-B0)459ge{X7<dQHD~so{r^SlXsHq6(cl39079s`vK{~c{EW86a52#D%KBJ;
z^yjIYx``(MfdA~@2MEZ_rUC#c#i7ay`hE+)moL-w`)09MZ$msOp`Qt2^3{K-tE$Ks
zBCrOjnK{A=5$v$f^uc49z9!{evdg0cBdZ3EkNgKCdw5cv-+gl~^5i%T%JlbK6(37E
zzv-9iJ*j}Dpj!|IrFzA9#{Zi7z;eA}bR!&XmSPzGYZ@TY=Ku8nw=0aI=3m$U^goOu
zyzg)RXv^JSJlx;D7vG|M6LdQGSfZIFdVhC57E;L=2a#$FygVw=&Lf&dblsf|N74m1
z2mIN`A%32mWIL9--0FQW_a>yn|9tzn^Y-XZl+Q*#Axw1d@9)L2Jh_$H(c`YiPPE^9
z9Abz3`RcBRR?i(RNeTb6&8pXJxiW#XwR1D&M)OAt-yO{wo!pn`Y_1afHRt(Ww_2eF
z;^~O14snRUSLn6ynYY_b8Y&4xvx+s+juxA$v(a-vb;B?peGb(n<nB&-&UeP%Bp66O
z?v><$!LmW=JiKo@N1&~JeZLo*=Jjc{0&gz%vcy~kdyU?_Q;DSHeYI<2QI=0ah~+Kj
zd=jb@NmP7)xe{{hI$*<XoV~x);t5$CA4GKo3T-qxFCL*f9L*Wz<#!^nYU1eRWPJ{e
zgNO@>d5mjTN5xjMMI2{uLnaUB>s^;y|IA^`#!zsf{C9F9iRsYW2DTeX7oZh&^1Im8
zmAF0~pwmw0fBX1wA54Z_t=7P#7WWY>k+||AQy9AB<Alk93chvzIw3D~w0m4;P(E8}
zb~$V2>fJ*+AsBFB$1CfyB;GwvXLGdFa^6qtnl0{LC^6j|{jA`Q9*-Ap^M`b#*zM&d
zLU)#})Y##*$5*YKR*$Wr?~ZelyNym}p)V$QYHp#c8y%OZ+r#=XFrR6|?y~R7lLWt1
z0WT+F4AqZR1@|ARg=BAbncRnZ?_y@;mBgN9F|yiJ$1UX7vS_4ozv+|)3HXUk^|%wH
zyPs_ielEA9C6Rk~b8&sX^OAJKbP}tR#JJIkTFabh{SCl4Z0N;m_V>(Rn?)4)-q(cB
zOjEaZn^uDBU9QX)xDT0ZpEv2Oq1?@G@2skngRkdelCgEZZYWMqt4s8B94)s+j(MoM
zoh1Sc9S0f}yabHmu_Hiy=6BsVbPYM=5--2Ls0|CPob}#IlXZ}+Z84Q$^?XZqUb*iu
zj1YFKOGkKmzAIp-k5K5hw_L<M-yYq7F1=f5uy4;0%}-%=-yX?WPK^Dc7Vq&6!LG&p
zt536bnZWh0$E0An2GH@txG`lFF?kHx$&>>G0-eUjs|_^Mt6<qmPEBO>h?c?Aewdsv
zmj)Yw9vl6>VA(w(4R;A*%ALy0#dRIE2qVy%eEzUPBNd_TKss{e)owFNQ{K#sKL%CF
zvSTmrs|nKC)aWgWeAqH_8W?D`HeQc26BI}muw1J#_$2pmWf{!aEW&*>r=LkJkwX1_
z4?DpoJf1`c)Zc8ic9+QQh(w>zNah|qcn1AJJO&$ox8HQQ5gWs93YU=u=5xNYoCcU3
zv|uTR%p_S!?Rdge?X+UX)S)`9GaIoM@kzj+fXlSMSaA~c)7j_8L73R<lUWe+#m@{F
zGS=WxaHRBQ33_wRedykP_>B*@=Qd$ck)G^|tKW~w`*Sd-W+i&{chS{TPufd3U1y>*
zqn1pW(U}BVoQ%4f%_fMAROT*WAZp1Tph#s`3p{rKQ|QJ{RQ!GwN?t|=feuV)7683-
zBs}|}PX%!d`0T(%>a*jZ{f1We4b_|J5p6GP;7YA!WOrK&PFq$EMlB5V!omRe?IN`w
z<YUdGvMO7K>)qAqi&g1Vabm-a_dPWnT^QA|x42^%#^QsxF(nx+I_t~=Ic#5NWM!di
z?gXmWXTy9sn+)r36nEOqLH>s-JkI`fUUr7x$z8C_BRi%m8F|8V=tGj4w04<zx~{ir
zVV2ETaxY_Sa}VFJdV(JZN|KAzd#UZRngHBos~SJDt}aL-*e|_o4;mw;aILH$riHd&
zCfN2&lX^uh*6oypIyD&%X^Bb`bOF!$B<)E;$MiPI_S{OQ<zGd4rJ5~Grk~-usxpO@
z6*~9F-~6=8j^U<}VwL3~d<sucz!(#H@!s`1B-IX|FUb3&E9<7&;14i~9(RJopD@cZ
zN`^10pX$ijHj4Qm=oEWgZOt=Z%2D(^Y}OyOYJ5_|VzAzgO9l6~^q|Bsl@w*N!*?~@
zGu)m^PqLnPf8>Q@m)(nLNt;)$>%|2p9Zd%kO)%0A{`mYk!tSd$I*32Y!iM1Ngp!7x
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
A`Tzg`

diff --git a/aio/content/images/guide/reactive-forms/addresses-array.png b/aio/content/images/guide/reactive-forms/addresses-array.png
deleted file mode 100644
index b86733613e27001c1ce38e2ed3df2599d4828e3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4692
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

diff --git a/aio/content/images/guide/reactive-forms/hero-detail.png b/aio/content/images/guide/reactive-forms/hero-detail.png
deleted file mode 100644
index 1079d3dee3e6154e00d812df9c1d625323b46075..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4608
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

diff --git a/aio/content/images/guide/reactive-forms/hero-list.png b/aio/content/images/guide/reactive-forms/hero-list.png
deleted file mode 100644
index 151eee981f5bc32dfa1a22a5f16a667fb94b8bb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5950
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
U1FLZ&|Fs2BL0!H|&OG#g05Qsl-T(jq

diff --git a/aio/content/images/guide/reactive-forms/json-output.png b/aio/content/images/guide/reactive-forms/json-output.png
deleted file mode 100644
index 11f4e77fd962af2f9b1e66c11a0aafdd2f014562..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14427
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

diff --git a/aio/content/images/guide/reactive-forms/just-formcontrol.png b/aio/content/images/guide/reactive-forms/just-formcontrol.png
deleted file mode 100644
index d300239a2f9bdc397814f3674e58e917a4ef1a91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8732
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
R{<_C21sPT8YDu%;{{rt<*(m@3

diff --git a/aio/content/images/guide/reactive-forms/name-editor-1.png b/aio/content/images/guide/reactive-forms/name-editor-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..06ef679f5d561b65d3df3c41d6c4e27d305de446
GIT binary patch
literal 8582
zcmeHrXEdDMyZ$IqgNQN`!9?#Pdh|pDLG%_vwCDyijLt+5ov0xQf>+Oo-lO;4JJD;@
z(H)7&`~RO$=iB*k)^FB&W<Ad?_jTWU@B7-<-hnDFWr+yx6951JB6+!IY5)MH>GgXl
z9?tbY+$9nT0NiG^l$KVJmzD;pI6~f9+L!?Va)B{%xEfLIls+q9c{w=?gv!_VGtbxt
zGW;nkHGVvo!^CIufB(f;7D%B_$WE`*uSq)j3ZSde^p4`k3>~FLw38~3njP{HQ0X?~
zzA_D6zN(w5fUe9Wo~(2MzR-4(218Yd0FE*zAItlsmXD(~nAb=_02(PAH>tSBm>?`;
z69$avRFve>G?7o+tTxSJt=INdVOsl7g$e)&88PUpX2-oK4VbgjM>5g@o{|hDDt7{<
znHyLUrPw%l<4=1&y*P@1R(@ol5X5)jY_kOXqw@HHJTt&*uRQ+Nl;WzaEt{z<sWR)k
zDeUn$j=5hTZ+|gfAvn9K6Lp*5+U!aDc|h-hQObjt%RC%V)ekQsRM>mwyN)G0ck7sh
zWCi&H9@}Uj7&%`if3LP1S7%sM^z+b)rlrBsCEOEusB8pY$->mtS@?2+TM&KA8ixw-
zMT3@w6|?A}DWB>~*y5KNA!(`x|J&B#%y|3b_#H@AWnKZhK1q=zFi{wtaoDp*aZ{Pk
zVw0$NR-x%Wy|jDdI;?VXS}lR4K)k55hq+H`S-Qi*sft}yS>MQzjLVri?8VP}haqmu
z%Y7ce`Q8>oyyWMK|9*4zNmv(<@jY9saa6?v85_5V@5ckXk<t!($4`EARDYwdWp&{3
z%2WJIM<rxYr}UXj)FND97y5L`jjzpi;N5X5vgX7d$+q8&5SA2ta*w(osTn_9v&Cl;
zAy<$2#0TH>TZV5oh!AhmZQXqiY^IDi2f%N`_L$@O=idFuyj9X4=3=ba-cJ{>)_#>s
z$$;s|r7q%(^7qyNyyP{vf=I{b*cSEgU^vb}J{d<_xRf&f!nS%Z+1=xZT&`!{Ig@YI
zpc^3d4SdqXV~p2NDOB(201>+@abW~)5x4J6Ew3FXOTH_D7mhcIpY(oG{k_abI(qYW
ztbO<<x9@dvUz}~)bF2<ikTiLI@m{4ipTnugpu;jJsK1z-Do{D|%qyA?sT+3e1CB?A
zd~|BRG)<&qQ2DM7r8%N6972_-w8Tj0bB);dhP!^N&7~u$W$-F)qBOxpYHeaW6I(Z|
zV~~l43A_O!(;aCIsFlgBO)N@<WyHq&!hdC*2>U`ia+#g-oHm`$#l~>=P6qdv=m@QI
zT>PKKv$dJy)K4e$ng*ArKj%%NNt)wkpFNAw>(ui%R+gn&saxAi!1%?9=;(ro5KsAr
ziQV$K+)nH{C(=LS00>X?#K;pwi|Aj100b%lhCvcM{_b%^U2XTuF(7j!@16*Mz`zIH
zQuKGCtaoC^7_8^yp(FQI`-Yi^5%Y#@jKKMw_#EILT%|c|VJvPRXM36{KkE#_YV4Xh
znpN35@89>`5lIV=2gQC6UkGsl)ynbQ4QzVICU^g1;D<Z+cnNiVqUp`#n2K&?Kk<?c
z1F=Lv<!~LTT|dAWAQ8%}{%WeWLwF@mWz%Ub0QV8hU!wXH`AN8*0n<AB2#W7dhmNGO
z^bxK)6_a@e9vK1Do2la2mVI2`aB|`(H1qP{3*vJ8=s;T8fJgAI)^c@NMtnV+0)=VJ
z7l`d^{O1FOfxV3@a|*jJJXj0@QW^>uNOld*IS|iz7{|z}@oXAgo-!NVPmNc3IrdUm
zQJAPMiMv6RKC%t;ifnqmEbeI+eGelylO1TAL6A)JLwKMk<6Zd_Q{}yf%@M+1J=7jq
z(pU<u39k`k2Om6<(QJO!tjqL_NmJ&l+E=xLB88>+4vH9a_6t*@BBt@+2hz)t<`HpG
zWs%hFaqX`cy@HsV6BeZ9znH2ntFyDZvt_ZNSRtC4n%x@WnyuLcnk(5_|7>fE=bow@
zGH3={$(pIMsF@9!4bcp}UAJA=yC3>iW<M)qV9&DCLZCRR7`K?j3Ra?OWh0P0p<lvY
zB2vO(RXEhX9=ndQ9yLrj+&N5=W2m*$53<&={KhYQAIhJ@A7(K%v^x0JTEw!&V%ds&
zcq+s7<$eXFeCG=eo#3nz73<s)`TSN`h}}!`{)&TJ2et=;2i&%4r6q!Tq6$?S?%~df
z&V^yIJyc1INoyjSBC<{*_oy0!e!N}eiRB~avEz|gyT69By5|(Px;<Qzc4h#1pIk?4
zSojQ*GUHUEe5!cy=ECM8=JfCsMP!d9>g#|rcw6xPXTjBbsp1Xp*zjlVAFvp<snYzN
z{T=-Ih|2C8@Ne?*3K9t1rOxLQu^ck#;yDuP;We=J=qjIlZ?|Ag&#!CiIJJ07J>Xt_
zmys5a@*{U8BBe$}vrIk3NyW47yzaZ*L0w0mriHTN-Q&&U3k4yMc1n1VABy75RIMFa
zKiaGrv3=9G9=AG~>6l<2w~ExP8HQSmTbDYeI^`dVQzwL`C?zYEbPMRE<p<c7ZsANi
ziw^Y+zkH)@1|O#_fqw^1K)&rz$y2R8R^u;nTU5f$k@k^BNar^;s)ndWrUyMA4tEon
zFovzK#-!`XdON|Kx*VpKT}I_Q*`~7FvisLUzbEmHR&<;s5Oy;)nH4Dbc5Xa6GC4L8
z469gr0S|S2y*ROO+T1;@v`{*lKRMkX-tAd)rbJ>Jt`nX?Yc7tTj7WxxCyGhBRk$v>
z)BHN^octj==^lsLM~;}Bn3RQjZkjAN?v5`Eu5}(L?N4t`u9>g5?&co3FG99^_h+}S
zIO_#L9B<(Dxl*lC@^ka`C{FN*jTZC{CHZ}gyF-+D6rZW|@1291I2rlA3VszD5`ew6
zfKol=q_;5}Qz|7*>?|-s`Bw$>5=&A%3H=cMPlyY-C6F!9Cgf>)L%NpCbZ}`1rOarn
z50!IQPW%~i1nG+O4q*rjrqLGIw*0I<l~+FE;&vW={CaoiE+$zl%al^Fd^A%jV>XMD
zVvf99%7bYA*r~@}2gl<-!C$Gq;;G+Plh2mVo>V_$##YwhOSMkhXj%vqV%AkokXV~C
z^=*F~75-8+rQwq!PiRE!=TeR>J{EuV?llGTtU~3TrJ{1{3b5;C^>DRaElFL-6=x$$
zI_FQ<Oy%XAE;~fZ7yUj4Q+y7;!tV`5f@U?nVeK=K;t^4wzk{`zgt$;2<P@U0L<ELi
z)(^62jNKiO<$S#y5G8{`#-~NEgXCD`srO3eAD*RkJwFQGG(te0X#NPWlpiF1Ir^D9
z!OOvaI)sTYnZlp^QjjdAJ!zb`6E<?LOJa`OHN%VhDM}*Ctl(tI4_dYC*E9Jzg;&!3
zGK0P~tthPy$OyL3w<xxsX=tr`f2pRIr^U%uThZp;pV@qDJik!N#H}#Gb@Hl#<FVno
z&MSjcS2p<CiD8mg{;|^=-Ik)#CA&_c0#L!7{Bq;~WT}U@yQrb4H8)LbIR9+{x9$Zh
zfz7%nCY)`yIJQWuwDdcDQJPUwb0x)wgf;<tq4q7UEj>uNSNkc7+J(Bn=3urQ9@U>Y
zpp+s=C^S29w=$z(BB#=W!@>H;NY>=X(vr*NUA=B+->r<vy3IRVt5f&N_BBG?mAbhb
zUw2yfztXiuZ3k9OqOi9t$2PvfJ0)6b2QJ>!*<1zB4tmu&fEJ`WpM?9mljzdE@{ac^
z|4N*ls5+_#{%6NV&T>`wuGiO${;J(ybm^C4{iYKdP8ut#dnVB)gyBRFz+y9_oOauf
zBV899I-_H&SXxu6ovo&_O9x4_dXw=VLyH8y93JbYd{<hj?xA_S<4}9~ZqlzZxBy6E
z=vV_Q@6ONPE;?KCckVrE2}9Df7978R>>#kZ{>ggN8dxA}xKkeK@^hp+P)HQAYbRcp
z1U)-UdMA1TUzui@;;1Nes5?i@`>uPBUs@Yx>8<n!JRt!~1bM?yk5IdvECVblRg@AL
z;#}Tu_wtr2_V+WlBesu#WCpMr^196(woCQ>-orv01Dey$tHR)#pYBx#3I-(Ax~E!K
zTVZvr=hFkgNz~ly?W#)@6WxL2=K1O_@=$#*%lu+cB1%Hr19>rUEU>UqgP1~KJd$lt
zeQ=9stS{s?U}h8G6N}kPyaiBUX5D#9@FW@~e+zNd)Nz*hbP6ywPa?G-2B4q6XU1R?
z8<G8sOY$AdG1gGCSvgS<e`B-mS}*~G^F0X`79<n^62SZ=!^_iGXY^*SQ;=%Y7Lc$X
z4S!nEw(}*idlA;|L3*ruNi@*`Ii+W9OS(Qf;M>dTLID6urr!^Syc**#006_-QbPx(
zqogQe0<q;bGKCnMal6>sU$+JT#9TzKUv14`Mj#hk8#}0oi#YwC79!X0zl*{2pg&Du
z*5dR!N-7{}h@%-ufSaG2hhBmJ1OkaUn!XiLd-fdN{rXFs-U0@*7XgFea5y)dj~n7>
z4u16b@nbL#FPN8?>$(LO)YT4V<iceKWw<f&*UmFDsEMPcJ<Jkf2l{Q-$Qa@T6Q`&D
z4fOBt#!oXB%m0UD2StZ<9U%C34fqi^5BOi(*ImVamx^dY%^am6wzg(=FbQ=NM>8`!
zs09Qj_NU8#t3(5efq#4P|9N#2@}JV{m?a3r!2gb)1c6=G3^xEk7AybkiG~Zt*0lGB
z*+Wm<Uvb+X+jJd`0tMuEUwmxYx<8a5TOX5Im7z<-U^2+V+h6opODHD<r}Ckxcbm@T
z8o`U~clY8cIT&u6n3YA|28PM#^JMmXbv$N>l=(=N_+cf%WY?~;SExdvRuT*soIP7U
zoZr1wvxC~dICrU`D+KQy?C&Qi2Wh*If~0%^7?{|2FvYovFxzo|{5$B99zr}*FFb6#
zKi>%A>n|ERpKdaAEjDl6?_R$vr2=kY7ZD59FaPa|`Dyl#$?M85jhL9a0n~5y(RMHp
zU632RJD@%z3`AZd(KlDL9UrM>A+$4hR=@d3jm+bWiJ?KHK>O7Hda5G@+OWs6Nk)T!
zB2I|@IxWHpif}5&5L8Bk+-W<<xrqP+lZNt6o5&O(kp&HM9Uj*IVt7*8?)WV~+pNJ&
zzvP-e2NH#b${t*_Nae*#4#)Pk{D>oNYB!!~UrIA~okHfobNoDH(J{!e^({*|b6;M3
z!a~;JX$cgjgtkV_zB1&?UT$2aMw<MR3ei&D6d@}EBJ#4_5>S6*x{FtQ5n%?0lV!jS
z1Gfq(s=8m*R92=LA-4+@+&f=!nTwzY7nCYBiKWXCbs_3~S60IA&^BuA(0x3i%lPi!
z2I*3*n7U2wyT0Zm=KSh>=;FB`0vJz(Oh|R5D30>vp_7cLl^J?Th#&-0hP++FUrSEW
zY}9^7?tVsgf?x5quHv>DABU#zj^Ng@W&&3dDOOUuxh~gqT}(VKp*8(gbEgR>U{9*>
zNRnQIQ=RIKPm&I6^|Iy*bKW%EBPVq$bt(Iw{2V5`4MQk`*GB~0=!q{kLyvciYmvr1
z8^9^5vddFoI{dOa;ZX33hn8hl;sNfg1O=T&0Xq#{II^Jk*=$E*y7&0Na<GOn4NYKV
zf};Ct)hk%3Ud`Q|o8^mmNdOazXbx!H9Sb%Lsyp4|Z;&O+9)yrIhpiAd{W?>s%}d}n
zzcl|jBYBdpQ}vHvUP$c;7`c=!l(QV71E0Ov9Zr#?o5TrECeax-B;KYC+D^0!45+Jk
zNZC9-w%;{~+#fzABqwey__301KE6KYHhXGZyIdHVb|jlDa;Mb_bJ))nRcrsHEk@j7
zbUM-aXNO<6wu+5+E2^xuHlb5>r5TIl!t6jupQ7KGf*GBUG{Du>hn?;HBs;Vr(sW8*
z374~xqsf7FGY%&_TDm{S0(L0omjcJM$BCRijn2?a{+wqvvT;QA!--o*WK+Uq>Ab7u
zsS-cu3NxM^aUc)ZF5;LqYD9}svdD~oYILcpgeQ;XHr>|S$BrQRy(Ni*Cvu)heF&Nx
zlv(UGv5V*{n~uEMkMO!zoj6N(#6;4W=zE&O%njq`dArT&+^?QJa4S23539Et%mS-s
z@`(^EhU^VfeeT2Gl};|(2&+scy}Mv}>IDOFH*2U~laXfwVbim)gxnsrBB9n2du~V<
zlmtmh6zpz~J8HI%s({pZDv8;n{L3Mph6jS8Ht=;t(yL6=dab3a%}lk#_BzC=?N@`_
zGUs-vd+>>1L5^sdjWJ&Uv8G>kcz8>cFG~VB4|t@2?gQ?&KAERdva$W*$%@JG&z5F(
zWr<((H$34;*ma6gi0pTD7)`l&`QWtbhwy9jGV_%;9$TqOT)h=J$rrxN0koqt7y0Fd
z5PI^%>ATi-j!+x-;|gK5nz_|%mt5hMb;lJQu1Zf64;1{2o3p~o>7ZwvHhdcr;wYYr
zvk=*B&D~Qrw<f#LS~!~dHS(&0oL{-_Jf-CDv!SDr$62ams2&TZ>D9Uba)XXG{0BUT
zkS<WXFgdVxczFIBM=bY7U~*KmA0CurpAyL06pEayTwkh2^IU;5LYKt!(WN&j^vt-^
zKhAh#yRy+aUG`^SO{?)nWr2Ux+Q!4P+RN76#nE7B<MZAo<WH6b--Xl{7aZ0ol~4+x
zzJVeBV*!?$QU8q7Lxbb<aTj~u5T&lZQEh!#-<>wf7GG~+(iZ0BstbkAU@0y4$odRh
z^6-ytNQWJrtE5D3e<b0)0Ug|y_Cw7qbq<^7@zR2R(J)q=7I1$dtQ*xzqp4oabTim{
z_+4Hgju7@Tf1SN0$qyx9N^LwZonU8E3m)Q`%A<2W4r-L_aF5;zf0nyZp0GECF%rHC
zbC?W<2TdA25T^~85hKmAey8)Zh${;Qwir_o(!&3ESa?EcB7gB@mQAMBq*$JI^ON5D
z4tUSd`@Rn8VGeC`+T4ldu}_2ndg8s`37Yl(Y)2}X2)3WnRV~{1)Xh&y%Xel3kUP7l
zQ764EM|9hXM^Fys+6qZ$q6>cF8fYnV-#Kpy9K4Y<<Jn*7W#*sAwyi$G7_l{dqPUsV
zlkhxTdBc7Kre#KZv(wG3ldj5vs)Wy*o8>plXo6Y|YG7fSOI65)=lL-;7BPAv{DeHf
zSV^FJGPj+mD!g{YZ^x^`TicFZG)cR+s8<<Wu2f)CJm!wFL`^6aG#cKR{Q|>0#GQKU
z>2m?M3!&gDoe&9;d2l*PS905Ay6)9y<q>ZMv0tHx*bO^m`zIy4qB83a3fL@_p+)3j
zrjsPHz|X;#>?n)zi0Kc#x3Tuo({?SW6uhP-u`{66dka%W@*#JYTKKvsr%Rbj&u6ra
z+o#%%l7i<?q#eF)i<Rg;cs-pN#6iyiyf-v7NI~LZu5ch!F)TCPAaVC*?`EQiSLCLl
zG3d<+MLO)FOziIqy%IOH*xhU^TSvWg0*40(5e?Bi6+2v0-h>3pE!|5z<e&}r_BydR
zDAY4JYhJ@bZnZX_I0<ovfH~QY@}`UVV`q*lba?BIUJOk5d7v|vmw>;?x94_RxzKn`
zXql^puEO`6;Im-Op5C0=y0ITCL9)EVxMi^%Nul87=25R)p(8Op&n;62rlmgUqw>AW
zF_%HpF%e)@GS|_jW^(Vz<+$+PDRNAm4dP`erYiQ~qCti<2H)JoeD^q0TqYu4kvg|L
z1l3e_wR~BAc<$NGzW-NNX;(>ow;24CumTLA#x)4El@1M{rzT`S;ula9qYn3kxKEW>
z+UAuXX>3kILBxWdb1sh-iNh)#b(~~K+pO%g^rres92v&qv=5sh+-pJ7V4AS`gvJCQ
zPSrNbyUJ)PoeYSt!TpX^OTC)8V3E9yoyy=3d4l|;T9wxewO%3Z)DM(dIJ;lpqmI=C
zKi;j~<Jn%YyYjvY&u`E%tNp$^vOAG0l9-q685IOwzC7=#Y>Xn)6Fr)+-}I<;r3!Ag
zUYMz*p4FnXzMZ+nF`a<kBaiTk#Uqktp?q5tz?O^I@{FaaxRGIs4MB)SxvO>Ot&Q5T
zt3fUJKw%<Mi4K@QL#{UpgkPp?=ek?kTm&OBp@zJcrzL@Cv4Dvv#VzuW8UsW5h97qZ
z;rbR@c^tdw3l%y;R8U;I(+d@G)(|UR$gSF{ESJ1K@!iE)yP%oM=ONW6EzP(gy=zwb
zwd0;`1qU7+wQkDibBS2}b>$9cz|O5oi4nUoDrGU4vIEu8!cc<HG?6=bp|#_@R5!f@
zS~F^YsuxHhFU-x$ycfrJG#^MMA+fufx{z5QG}T94L&&Tgk+Qq~)*BJt)6%Zq`g5gD
zSZKEx(Lojae21PyKH=i+82z7wiT6aPVHb^?f0se)+4>kV3kT3<hi!erUkQqxd96V+
zk9N7x3hK+&wLG2-wEZiIc}jew1WUppf0eW?@J`#rOPhaXYWB6#&i3?BK)1K3x>m`~
z#{Vi~MXo;k6jZi(%6OTyv^1Yy{nYOfwwJ-i!NDnLbIW@VK#Y@GSc7tJ|L`V%n-y95
z)CYi&$GGAXW19yf#4w3<m)Bxmpy&7_0iG$7ZJrVOgy4#eT_jec#&+YmirTey{~9X5
zc@rxr+(#-lOPd|d;xE`i5i!L`f0-LU7fJ85?H#<xKu@>)br2r~N4}xegV^;DBpYN$
z->7-kY#%ADftLG}H#iZpQlQR3j+lQ5<WAd*37tlCqVM71nYy}VsG<4q>$N3$YHJ-d
z4lM?PQ@K#%#f=lu8d4w*OB15t8=N)<P{h)Ig8e-<|C!nUEMrXU|0!oHC&UX<Q&XKG
z4X1zEDf?Ez$yb*QTExQNlJ;8<iWFz0me8k?lj}@B7w5-BlSIWeNmL^`(7JT*`bOcz
z-2xk(t&Z2(>WUSEKDaMl6W<=H4-d@|i`SXGhr^zN&Ry_z?(U?Lq6xhH8fB44Ljuhh
zhS!WSE6squE%<ni(oX%42ik?YYZvMQo}+I77_U)23aOl+UGTbg!J8x$O|Ej>pa>?&
zmpwEco?p9gNqZjyjiN6FQut4x|EFej?h0cd%Tu&PiH868t*5-q%Vz~o-@N-ToY9pM

literal 0
HcmV?d00001

diff --git a/aio/content/images/guide/reactive-forms/name-editor-2.png b/aio/content/images/guide/reactive-forms/name-editor-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e94e4a1961e00196d99c308629b1b92ff4639823
GIT binary patch
literal 22715
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%0DR~tyhIMpoKSb
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
LE@w&|uEhQij9M@r

literal 0
HcmV?d00001

diff --git a/aio/content/images/guide/reactive-forms/profile-editor-1.png b/aio/content/images/guide/reactive-forms/profile-editor-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9cf0de511886f01f5eb256e87fecae1a83103ec
GIT binary patch
literal 18881
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
b8|0c;mV57X<fDJSFfAh?FJ2&O@b>=z*Peg}

literal 0
HcmV?d00001

diff --git a/aio/content/images/guide/reactive-forms/profile-editor-2.png b/aio/content/images/guide/reactive-forms/profile-editor-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..06396d10decfdc7141925bd6eff701f3f2bda727
GIT binary patch
literal 17538
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
ZavoZs23Z2XAOZm)Ev_I|E@JrkzW^{{d3XQ-

literal 0
HcmV?d00001

diff --git a/aio/content/images/guide/reactive-forms/profile-editor-3.png b/aio/content/images/guide/reactive-forms/profile-editor-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f995737ea25c9f8193d1f7a722c9cbb0a1ab73
GIT binary patch
literal 34124
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

literal 0
HcmV?d00001

diff --git a/aio/content/images/guide/reactive-forms/profile-editor-4.png b/aio/content/images/guide/reactive-forms/profile-editor-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..9de55211469585e908be75df19123d88ed76fe9a
GIT binary patch
literal 42477
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

literal 0
HcmV?d00001

diff --git a/aio/content/images/guide/reactive-forms/save-revert-buttons.png b/aio/content/images/guide/reactive-forms/save-revert-buttons.png
deleted file mode 100644
index 6c9d0c55a704c4a39fc85cc88c22e29750810e78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7023
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
bi&1C+&+T$ENKPjH^)Q!{Qj#o(82bMQTXCWe

diff --git a/aio/content/images/guide/reactive-forms/validators-json-output.png b/aio/content/images/guide/reactive-forms/validators-json-output.png
deleted file mode 100644
index aca7c0450d14c4f9cca8550146102b7b3df057f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24228
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
B7E=HK


From f9669e50ff08cd39f0826f6e608b091996f03031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 19 Jul 2018 13:17:30 -0700
Subject: [PATCH 493/582] release: cut the v6.1.0-rc.3 release

Note that RC1 and RC2 glitched out midway during the npm release.
Therefore there is only one commit
---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 package.json |  4 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df46098787..23f330f65f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+<a name="6.1.0-rc.3"></a>
+# [6.1.0-rc.3](https://github.com/angular/angular/compare/6.1.0-rc.2...6.1.0-rc.3) (2018-07-19)
+
+
+### Bug Fixes
+
+* **common:** do not round factional seconds ([#24831](https://github.com/angular/angular/issues/24831)) ([a527c69](https://github.com/angular/angular/commit/a527c69)), closes [#24384](https://github.com/angular/angular/issues/24384)
+* **common:** format fractional seconds ([#24844](https://github.com/angular/angular/issues/24844)) ([0b4d85e](https://github.com/angular/angular/commit/0b4d85e)), closes [#24831](https://github.com/angular/angular/issues/24831)
+* **common:** properly update collection reference in NgForOf ([#24684](https://github.com/angular/angular/issues/24684)) ([ff84c5c](https://github.com/angular/angular/commit/ff84c5c)), closes [#24155](https://github.com/angular/angular/issues/24155)
+* **common:** use correct currency format for locale de-AT ([#24658](https://github.com/angular/angular/issues/24658)) ([dcabb05](https://github.com/angular/angular/commit/dcabb05)), closes [#24609](https://github.com/angular/angular/issues/24609)
+* **compiler:** fix a few non-tree-shakeable code patterns ([#24677](https://github.com/angular/angular/issues/24677)) ([50d4a4f](https://github.com/angular/angular/commit/50d4a4f))
+* **compiler:** i18n_extractor now outputs the correct source file name ([#24885](https://github.com/angular/angular/issues/24885)) ([c8ad965](https://github.com/angular/angular/commit/c8ad965)), closes [#24884](https://github.com/angular/angular/issues/24884)
+* **compiler-cli:** Use typescript to resolve modules for metadata ([#22856](https://github.com/angular/angular/issues/22856)) ([0d5f2d3](https://github.com/angular/angular/commit/0d5f2d3))
+* **core:** mark NgModule as not the root if APP_ROOT is set to false ([#24814](https://github.com/angular/angular/issues/24814)) ([1089261](https://github.com/angular/angular/commit/1089261))
+* **core:** use addCustomEqualityTester instead of overriding toEqual ([#22983](https://github.com/angular/angular/issues/22983)) ([0922228](https://github.com/angular/angular/commit/0922228)), closes [#22939](https://github.com/angular/angular/issues/22939)
+* **language-service:** do not overwrite native `Reflect` ([#24299](https://github.com/angular/angular/issues/24299)) ([6881404](https://github.com/angular/angular/commit/6881404)), closes [#21420](https://github.com/angular/angular/issues/21420)
+* **platform-browser:** add missing deps for HammerGesturesPlugin ([#24682](https://github.com/angular/angular/issues/24682)) ([13d60ea](https://github.com/angular/angular/commit/13d60ea))
+* **platform-browser:** mark Meta and Title services as tree shakable providers ([#24815](https://github.com/angular/angular/issues/24815)) ([197387d](https://github.com/angular/angular/commit/197387d))
+* **platform-browser:** workaround wrong import path generated by ngc for DOCUMENT ([#24830](https://github.com/angular/angular/issues/24830)) ([7d27ecc](https://github.com/angular/angular/commit/7d27ecc))
+* **router:** add ability to recover from malformed url ([#23283](https://github.com/angular/angular/issues/23283)) ([86d254d](https://github.com/angular/angular/commit/86d254d)), closes [#21468](https://github.com/angular/angular/issues/21468)
+* **service-worker:** avoid network requests when looking up hashed resources in cache ([#24127](https://github.com/angular/angular/issues/24127)) ([52d43a9](https://github.com/angular/angular/commit/52d43a9))
+
+
+### Features
+
+* **bazel:** Initial commit of protractor_web_test_suite ([#24787](https://github.com/angular/angular/issues/24787)) ([71e0df0](https://github.com/angular/angular/commit/71e0df0))
+* **bazel:** protractor_web_test_suite for release ([#24787](https://github.com/angular/angular/issues/24787)) ([161ff5c](https://github.com/angular/angular/commit/161ff5c))
+* **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([3553977](https://github.com/angular/angular/commit/3553977))
+* **core:** add support for using async/await with Jasmine ([#24637](https://github.com/angular/angular/issues/24637)) ([71100e6](https://github.com/angular/angular/commit/71100e6))
+* **router:** add urlUpdateStrategy allow updating the browser URL at the beginning of navigation ([#24820](https://github.com/angular/angular/issues/24820)) ([328971f](https://github.com/angular/angular/commit/328971f)), closes [#24616](https://github.com/angular/angular/issues/24616)
+* **service-worker:** add support for `?` in SW config globbing ([#24105](https://github.com/angular/angular/issues/24105)) ([250527c](https://github.com/angular/angular/commit/250527c))
+
+
+Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.3 instead. Sorry! :-)
+
+
 <a name="6.0.9"></a>
 ## [6.0.9](https://github.com/angular/angular/compare/6.0.8...6.0.9) (2018-07-11)
 
diff --git a/package.json b/package.json
index e9d9072de4..ec0c270098 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.1.0-rc.0",
+  "version": "6.1.0-rc.3",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -124,4 +124,4 @@
     "xhr2": "0.1.4",
     "yargs": "9.0.1"
   }
-}
\ No newline at end of file
+}

From 2aab1c9dd6b8104614199fa2189542ef9b96e871 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 20 Jul 2018 10:17:05 -0700
Subject: [PATCH 494/582] ci: remove Tina from pullaprove (#25006)

She has been removed as a collaborator to the project and pullaprove rejects
this config file which still lists her name.

PR Close #25006
---
 .pullapprove.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.pullapprove.yml b/.pullapprove.yml
index 9ca33a0c8d..1ac9acfb6b 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -23,7 +23,6 @@
 # petebacondarwin - Pete Bacon Darwin
 # pkozlowski-opensource - Pawel Kozlowski
 # robwormald - Rob Wormald
-# tinayuangao - Tina Gao
 # vicb - Victor Berchet
 # vikerman - Vikram Subramanian
 
@@ -218,7 +217,6 @@ groups:
         - "aio/content/examples/reactive-forms/*"
     users:
       - kara #primary
-      - tinayuangao #secondary
       - IgorMinar #fallback
       - mhevery #fallback
 

From 5840a86f98da200ce657573c2ad6c1c7ae1fc990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Jamet?= <rjamet@google.com>
Date: Tue, 29 May 2018 15:03:48 +0200
Subject: [PATCH 495/582] docs: Add notes on manual sanitization to security
 guide (#24176)

Some users have remarked that we don't explain how to manually call
sanitization, so add a few lines on that.

PR Close #24176
---
 aio/content/guide/security.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/security.md b/aio/content/guide/security.md
index aa0dde3293..27bda4d597 100644
--- a/aio/content/guide/security.md
+++ b/aio/content/guide/security.md
@@ -127,13 +127,19 @@ tag but keeps safe content such as the text content of the `<script>` tag and th
 </figure>
 
 
-
-### Avoid direct use of the DOM APIs
+### Direct use of the DOM APIs and explicit sanitization calls
 
 The built-in browser DOM APIs don't automatically protect you from security vulnerabilities.
 For example, `document`, the node available through `ElementRef`, and many third-party APIs
-contain unsafe methods. Avoid directly interacting with the DOM and instead use Angular
-templates where possible.
+contain unsafe methods. In the same way, if you interact with other libraries that manipulate
+the DOM, you likely won't have the same automatic sanitization as with Angular interpolations.
+Avoid directly interacting with the DOM and instead use Angular templates where possible.
+
+For cases where this is unavoidable, use the built-in Angular sanitization functions.
+Sanitize untrusted values with the [DomSanitizer.sanitize](api/platform-browser/DomSanitizer#sanitize)
+method and the appropriate `SecurityContext`. That function also accepts values that were
+marked as trusted using the `bypassSecurityTrust`... functions, and will not sanitize them,
+as [described below](#bypass-security-apis).
 
 ### Content security policy
 

From 270176bbe4bd87a5a9e7ea9e4e725ab51fb87407 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Mon, 25 Jun 2018 20:05:00 +0200
Subject: [PATCH 496/582] docs: more info on currency digits (#24661)

Adds an example of using the `currency` pipe with a currency that has no cents like CLP,
which will format the amount with no digits if `digitsInfo` is not provided:

    <!-- outputs CA$14.00 -->
    {{ 14 | currency:'CAD' }}
    <!-- outputs CLP14 -->
    {{ 14 | currency:'CLP' }}

Amends the docs, adds an example and fix an error with a current example.

PR Close #24661
---
 packages/common/src/pipes/number_pipe.ts           | 3 +++
 packages/examples/common/pipes/ts/currency_pipe.ts | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/common/src/pipes/number_pipe.ts b/packages/common/src/pipes/number_pipe.ts
index 8ad02f59b9..26a9cec33c 100644
--- a/packages/common/src/pipes/number_pipe.ts
+++ b/packages/common/src/pipes/number_pipe.ts
@@ -181,6 +181,9 @@ export class CurrencyPipe implements PipeTransform {
    * Default is `0`.
    *   - `maxFractionDigits`: The maximum number of digits after the decimal point.
    * Default is `3`.
+   * If not provided, the number will be formatted with the proper amount of digits,
+   * depending on what the [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) specifies.
+   * For example, the Canadian dollar has 2 digits, whereas the Chilean peso has none.
    * @param locale A locale code for the locale format rules to use.
    * When not supplied, uses the value of `LOCALE_ID`, which is `en-US` by default.
    * See [Setting your app locale](guide/i18n#setting-up-the-locale-of-your-app).
diff --git a/packages/examples/common/pipes/ts/currency_pipe.ts b/packages/examples/common/pipes/ts/currency_pipe.ts
index 23a700dbff..27565594cc 100644
--- a/packages/examples/common/pipes/ts/currency_pipe.ts
+++ b/packages/examples/common/pipes/ts/currency_pipe.ts
@@ -18,7 +18,7 @@ registerLocaleData(localeFr);
 @Component({
   selector: 'currency-pipe',
   template: `<div>
-    <!--output '$0.259'-->
+    <!--output '$0.26'-->
     <p>A: {{a | currency}}</p>
 
     <!--output 'CA$0.26'-->
@@ -35,6 +35,9 @@ registerLocaleData(localeFr);
 
     <!--output '0 001,35 CA$'-->
     <p>B: {{b | currency:'CAD':'symbol':'4.2-2':'fr'}}</p>
+
+    <!--output 'CLP1' because CLP has no cents-->
+    <p>B: {{b | currency:'CLP'}}</p>
   </div>`
 })
 export class CurrencyPipeComponent {

From 453693fd334f99fcb236d2e1f9c2a568d94eead9 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 14 Jul 2018 21:23:14 +0300
Subject: [PATCH 497/582] docs: clean up `elements` example (indentation,
 import order, etc) (#24840)

PR Close #24840
---
 .../elements/src/app/app.component.ts         | 20 ++++++++-----------
 .../examples/elements/src/app/app.module.ts   | 16 +++++++--------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/aio/content/examples/elements/src/app/app.component.ts b/aio/content/examples/elements/src/app/app.component.ts
index 092a8c8ba2..2ef51e0ebe 100644
--- a/aio/content/examples/elements/src/app/app.component.ts
+++ b/aio/content/examples/elements/src/app/app.component.ts
@@ -8,19 +8,15 @@ import { PopupComponent } from './popup.component';
   selector: 'app-root',
   template: `
     <input #input value="Message">
-    <button (click)="popup.showAsComponent(input.value)">
-        Show as component </button>
-    <button (click)="popup.showAsElement(input.value)">
-        Show as element </button>
-  `
+    <button (click)="popup.showAsComponent(input.value)">Show as component</button>
+    <button (click)="popup.showAsElement(input.value)">Show as element</button>
+  `,
 })
-
 export class AppComponent {
-   constructor(private injector: Injector, public popup: PopupService) {
-    // on init, convert PopupComponent to a custom element
-    const PopupElement =
-createNgElementConstructor(PopupComponent, {injector: this.injector});
-    // register the custom element with the browser.
-       customElements.define('popup-element', PopupElement);
+  constructor(injector: Injector, public popup: PopupService) {
+    // Convert `PopupComponent` to a custom element.
+    const PopupElement = createNgElementConstructor(PopupComponent, {injector});
+    // Register the custom element with the browser.
+    customElements.define('popup-element', PopupElement);
   }
 }
diff --git a/aio/content/examples/elements/src/app/app.module.ts b/aio/content/examples/elements/src/app/app.module.ts
index 0c2eec1938..3b78fa6951 100644
--- a/aio/content/examples/elements/src/app/app.module.ts
+++ b/aio/content/examples/elements/src/app/app.module.ts
@@ -1,22 +1,22 @@
 // #docregion
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
-import { PopupService } from './popup.service';
 import { PopupComponent } from './popup.component';
+import { PopupService } from './popup.service';
 
-// include the PopupService provider,
-// but exclude PopupComponent from compilation,
-// because it will be added dynamically
+// Include the `PopupService` provider,
+// but exclude `PopupComponent` from compilation,
+// because it will be added dynamically.
 
 @NgModule({
-  declarations: [AppComponent, PopupComponent],
   imports: [BrowserModule, BrowserAnimationsModule],
   providers: [PopupService],
+  declarations: [AppComponent, PopupComponent],
   bootstrap: [AppComponent],
   entryComponents: [PopupComponent],
 })
-
-export class AppModule {}
+export class AppModule {
+}

From b137f09345d4fec3aa6ba775adb1b1d908f47f7f Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 14 Jul 2018 21:24:36 +0300
Subject: [PATCH 498/582] docs: refactor `elements` example (#24840)

This makes the closing behavior more deterministic, which makes it
easier to be e2e-tested.

PR Close #24840
---
 .../elements/src/app/popup.component.ts       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/aio/content/examples/elements/src/app/popup.component.ts b/aio/content/examples/elements/src/app/popup.component.ts
index 8272c37234..cc8f9610a7 100644
--- a/aio/content/examples/elements/src/app/popup.component.ts
+++ b/aio/content/examples/elements/src/app/popup.component.ts
@@ -1,14 +1,15 @@
 // #docregion
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { AnimationEvent } from '@angular/animations';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 
 @Component({
   selector: 'my-popup',
-  template: 'Popup: {{message}}',
+  template: `
+    <span>Popup: {{message}}</span>
+    <button (click)="closed.next()">&#x2716;</button>
+  `,
   host: {
     '[@state]': 'state',
-    '(@state.done)': 'onAnimationDone($event)',
   },
   animations: [
     trigger('state', [
@@ -27,13 +28,17 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
       height: 48px;
       padding: 16px;
       display: flex;
+      justify-content: space-between;
       align-items: center;
       border-top: 1px solid black;
       font-size: 24px;
     }
+
+    button {
+      border-radius: 50%;
+    }
   `]
 })
-
 export class PopupComponent {
   private state: 'opened' | 'closed' = 'closed';
 
@@ -41,18 +46,10 @@ export class PopupComponent {
   set message(message: string) {
     this._message = message;
     this.state = 'opened';
-
-    setTimeout(() => this.state = 'closed', 2000);
   }
   get message(): string { return this._message; }
   _message: string;
 
   @Output()
   closed = new EventEmitter();
-
-  onAnimationDone(e: AnimationEvent) {
-    if (e.toState === 'closed') {
-      this.closed.next();
-    }
-  }
 }

From 9be222f44824a3e28f5573e66728f0ebef5a4ee9 Mon Sep 17 00:00:00 2001
From: Jan De Wilde <jan.de.wilde87@gmail.com>
Date: Wed, 11 Jul 2018 16:34:56 +0200
Subject: [PATCH 499/582] docs: fix `elements` example (#24840)

PR Close #24840
---
 .../examples/elements/src/app/app.component.ts        |  5 ++---
 aio/content/examples/elements/src/app/app.module.ts   |  1 -
 .../examples/elements/src/app/popup.component.ts      |  1 -
 .../examples/elements/src/app/popup.service.ts        |  7 +++----
 aio/content/examples/elements/src/main.ts             | 11 +++++++++++
 aio/tools/examples/shared/package.json                |  1 +
 aio/tools/examples/shared/yarn.lock                   |  6 ++++++
 7 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 aio/content/examples/elements/src/main.ts

diff --git a/aio/content/examples/elements/src/app/app.component.ts b/aio/content/examples/elements/src/app/app.component.ts
index 2ef51e0ebe..2e7fb600f8 100644
--- a/aio/content/examples/elements/src/app/app.component.ts
+++ b/aio/content/examples/elements/src/app/app.component.ts
@@ -1,6 +1,5 @@
-// #docregion
 import { Component, Injector } from '@angular/core';
-import { createNgElementConstructor } from '../elements-dist';
+import { createCustomElement } from '@angular/elements';
 import { PopupService } from './popup.service';
 import { PopupComponent } from './popup.component';
 
@@ -15,7 +14,7 @@ import { PopupComponent } from './popup.component';
 export class AppComponent {
   constructor(injector: Injector, public popup: PopupService) {
     // Convert `PopupComponent` to a custom element.
-    const PopupElement = createNgElementConstructor(PopupComponent, {injector});
+    const PopupElement = createCustomElement(PopupComponent, {injector});
     // Register the custom element with the browser.
     customElements.define('popup-element', PopupElement);
   }
diff --git a/aio/content/examples/elements/src/app/app.module.ts b/aio/content/examples/elements/src/app/app.module.ts
index 3b78fa6951..f273e77b14 100644
--- a/aio/content/examples/elements/src/app/app.module.ts
+++ b/aio/content/examples/elements/src/app/app.module.ts
@@ -1,4 +1,3 @@
-// #docregion
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
diff --git a/aio/content/examples/elements/src/app/popup.component.ts b/aio/content/examples/elements/src/app/popup.component.ts
index cc8f9610a7..6fee4ef8c1 100644
--- a/aio/content/examples/elements/src/app/popup.component.ts
+++ b/aio/content/examples/elements/src/app/popup.component.ts
@@ -1,4 +1,3 @@
-// #docregion
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 
diff --git a/aio/content/examples/elements/src/app/popup.service.ts b/aio/content/examples/elements/src/app/popup.service.ts
index 0c44615e84..11cd98ec1f 100644
--- a/aio/content/examples/elements/src/app/popup.service.ts
+++ b/aio/content/examples/elements/src/app/popup.service.ts
@@ -1,9 +1,8 @@
 
-// #docregion
 import { ApplicationRef, ComponentFactoryResolver, Injectable, Injector } from '@angular/core';
-
+import { NgElement, WithProperties } from '@angular/elements';
 import { PopupComponent } from './popup.component';
-import { NgElementConstructor } from '../elements-dist';
+
 
 @Injectable()
 export class PopupService {
@@ -40,7 +39,7 @@ export class PopupService {
   // This uses the new custom-element method to add the popup to the DOM.
   showAsElement(message: string) {
     // Create element
-    const popupEl = document.createElement('popup-element');
+    const popupEl: NgElement & WithProperties<PopupComponent> = document.createElement('popup-element') as any;
 
     // Listen to the close event
     popupEl.addEventListener('closed', () => document.body.removeChild(popupEl));
diff --git a/aio/content/examples/elements/src/main.ts b/aio/content/examples/elements/src/main.ts
new file mode 100644
index 0000000000..a9ca1caf8c
--- /dev/null
+++ b/aio/content/examples/elements/src/main.ts
@@ -0,0 +1,11 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 1b74fa4af6..1d0bdbc183 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -22,6 +22,7 @@
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "@angular/core": "^6.0.0",
+    "@angular/elements": "^6.0.0",
     "@angular/forms": "^6.0.0",
     "@angular/http": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index 3313b5b4fb..96143da810 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -140,6 +140,12 @@
   dependencies:
     tslib "^1.9.0"
 
+"@angular/elements@^6.0.0":
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-6.0.9.tgz#6c238632631fa545f4893db8b48a4e89b2a277b2"
+  dependencies:
+    tslib "^1.9.0"
+
 "@angular/forms@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.0.tgz#436e2df39dc57db124da5a5c02bc63909fdf7046"

From ead3f926cbdf7ff6c2d53c99c8c59f9007500eb3 Mon Sep 17 00:00:00 2001
From: Jan De Wilde <jan.de.wilde87@gmail.com>
Date: Thu, 12 Jul 2018 17:05:18 +0200
Subject: [PATCH 500/582] docs: add e2e tests for `elements` example (#24840)

PR Close #24840
---
 .../examples/elements/e2e/src/app.e2e-spec.ts | 69 +++++++++++++++++++
 .../examples/elements/example-config.json     |  0
 aio/content/examples/elements/src/index.html  | 12 ++++
 3 files changed, 81 insertions(+)
 create mode 100644 aio/content/examples/elements/e2e/src/app.e2e-spec.ts
 create mode 100644 aio/content/examples/elements/example-config.json
 create mode 100644 aio/content/examples/elements/src/index.html

diff --git a/aio/content/examples/elements/e2e/src/app.e2e-spec.ts b/aio/content/examples/elements/e2e/src/app.e2e-spec.ts
new file mode 100644
index 0000000000..e3385efc8f
--- /dev/null
+++ b/aio/content/examples/elements/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,69 @@
+'use strict'; // necessary for es6 output in node
+
+import { browser, by, element } from 'protractor';
+
+/* tslint:disable:quotemark */
+describe('Elements', () => {
+  const messageInput = element(by.css('input'));
+  const popupButtons = element.all(by.css('button'));
+
+  beforeEach(() => browser.get(''));
+
+  describe('popup component', () => {
+    const popupComponentButton = popupButtons.get(0);
+    const popupComponent = element(by.css('popup-component'));
+    const closeButton = popupComponent.element(by.css('button'));
+
+    it('should be displayed on button click', () => {
+      expect(popupComponent.isPresent()).toBe(false);
+
+      popupComponentButton.click();
+      expect(popupComponent.isPresent()).toBe(true);
+    });
+
+    it('should display the specified message', () => {
+      messageInput.clear();
+      messageInput.sendKeys('Angular rocks!');
+
+      popupComponentButton.click();
+      expect(popupComponent.getText()).toContain('Popup: Angular rocks!');
+    });
+
+    it('should be closed on "close" button click', () => {
+      popupComponentButton.click();
+      expect(popupComponent.isPresent()).toBe(true);
+
+      closeButton.click();
+      expect(popupComponent.isPresent()).toBe(false);
+    });
+  });
+
+  describe('popup element', () => {
+    const popupElementButton = popupButtons.get(1);
+    const popupElement = element(by.css('popup-element'));
+    const closeButton = popupElement.element(by.css('button'));
+
+    it('should be displayed on button click', () => {
+      expect(popupElement.isPresent()).toBe(false);
+
+      popupElementButton.click();
+      expect(popupElement.isPresent()).toBe(true);
+    });
+
+    it('should display the specified message', () => {
+      messageInput.clear();
+      messageInput.sendKeys('Angular rocks!');
+
+      popupElementButton.click();
+      expect(popupElement.getText()).toContain('Popup: Angular rocks!');
+    });
+
+    it('should be closed on "close" button click', () => {
+      popupElementButton.click();
+      expect(popupElement.isPresent()).toBe(true);
+
+      closeButton.click();
+      expect(popupElement.isPresent()).toBe(false);
+    });
+  });
+});
diff --git a/aio/content/examples/elements/example-config.json b/aio/content/examples/elements/example-config.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/aio/content/examples/elements/src/index.html b/aio/content/examples/elements/src/index.html
new file mode 100644
index 0000000000..e8a1b6e353
--- /dev/null
+++ b/aio/content/examples/elements/src/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <base href="/">
+    <title>Elements</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <app-root></app-root>
+  </body>
+</html>

From 1c533c913d8377dd124258b95c9c529b237479a6 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 16 Jul 2018 22:52:59 +0300
Subject: [PATCH 501/582] build(docs-infra): add support for examples of type
 `elements` (#24840)

Examples using `@angular/elements` need to transpile to es2015 for
Custom Elements to work (on browsers that natively support them).

Alternatively, a polyfill would need to be loaded. For now, changing the
transpilation target to es2015 is the simplest solution.

PR Close #24840
---
 .../examples/elements/example-config.json     |  3 +++
 aio/tools/examples/example-boilerplate.js     | 13 ++++++++----
 .../shared/boilerplate/elements/tsconfig.json | 20 +++++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 aio/tools/examples/shared/boilerplate/elements/tsconfig.json

diff --git a/aio/content/examples/elements/example-config.json b/aio/content/examples/elements/example-config.json
index e69de29bb2..cc42921173 100644
--- a/aio/content/examples/elements/example-config.json
+++ b/aio/content/examples/elements/example-config.json
@@ -0,0 +1,3 @@
+{
+  "projectType": "elements"
+}
diff --git a/aio/tools/examples/example-boilerplate.js b/aio/tools/examples/example-boilerplate.js
index 4f4c7bedf3..773b37aea6 100644
--- a/aio/tools/examples/example-boilerplate.js
+++ b/aio/tools/examples/example-boilerplate.js
@@ -50,13 +50,12 @@ const BOILERPLATE_PATHS = {
 // This maps the CLI files that exists in a parent folder
 const cliRelativePath = BOILERPLATE_PATHS.cli.map(file => `../cli/${file}`);
 
-BOILERPLATE_PATHS.i18n = [
+BOILERPLATE_PATHS.elements = [
   ...cliRelativePath,
-  'angular.json',
-  'package.json'
+  'tsconfig.json'
 ];
 
-BOILERPLATE_PATHS.universal = [
+BOILERPLATE_PATHS.i18n = [
   ...cliRelativePath,
   'angular.json',
   'package.json'
@@ -67,6 +66,12 @@ BOILERPLATE_PATHS.testing = [
   'angular.json'
 ];
 
+BOILERPLATE_PATHS.universal = [
+  ...cliRelativePath,
+  'angular.json',
+  'package.json'
+];
+
 const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
 
 class ExampleBoilerPlate {
diff --git a/aio/tools/examples/shared/boilerplate/elements/tsconfig.json b/aio/tools/examples/shared/boilerplate/elements/tsconfig.json
new file mode 100644
index 0000000000..1a4f29fa89
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/elements/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es2015",  // Custom Elements require ES2015 classes (or polyfill).
+    "skipLibCheck": true,
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  }
+}

From 7ebd8e59a88fb7e43ae8461bccacfcb6ac95b0dd Mon Sep 17 00:00:00 2001
From: Marius Lichtblau <marius.lichtblau@googlemail.com>
Date: Fri, 13 Jul 2018 20:30:23 +0200
Subject: [PATCH 502/582] docs: update i18n doc regarding aot compilation
 (#24875)

Add missing lines to code example to allow using ng serve with custom i18n configurations.

PR Close #24875
---
 aio/content/guide/i18n.md | 66 +++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index 4bcb42a408..cba2241cee 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -54,10 +54,10 @@ If you use JIT, you also need to define the `LOCALE_ID` provider in your main mo
 </code-example>
 
 
-For more information about Unicode locale identifiers, see the 
+For more information about Unicode locale identifiers, see the
 [CLDR core spec](http://cldr.unicode.org/core-spec#Unicode_Language_and_Locale_Identifiers).
 
-For a complete list of locales supported by Angular, see 
+For a complete list of locales supported by Angular, see
 [the Angular repository](https://github.com/angular/angular/tree/master/packages/common/locales).
 
 The locale identifiers used by CLDR and Angular are based on [BCP47](http://www.rfc-editor.org/rfc/bcp/bcp47.txt).
@@ -101,10 +101,10 @@ specify a custom locale id. For example, Angular's locale data defines the local
 "fr". You can use the second parameter to associate the imported French locale data with the custom
 locale id "fr-FR" instead of "fr".
 
-The files in `@angular/common/locales` contain most of the locale data that you 
+The files in `@angular/common/locales` contain most of the locale data that you
 need, but some advanced formatting options might only be available in the extra dataset that you can
 import from `@angular/common/locales/extra`. An error message informs you when this is the case.
-  
+
   <code-example path="i18n/doc-files/app.locale_data_extra.ts" region="import-locale-extra" title="src/app/app.module.ts" linenums="false">
   </code-example>
 
@@ -113,15 +113,15 @@ import from `@angular/common/locales/extra`. An error message informs you when t
   All locale data used by Angular are extracted from the Unicode Consortium's
   <a href="http://cldr.unicode.org/" title="CLDR">Common Locale Data Repository (CLDR)</a>.
 
-</div> 
+</div>
 
 
 ## Template translations
 
 <div class="l-sub-section">
 
-  This document refers to a unit of translatable text as "text," a "message", or a 
-  "text message." 
+  This document refers to a unit of translatable text as "text," a "message", or a
+  "text message."
 
 </div>
 
@@ -168,7 +168,7 @@ To mark the greeting for translation, add the `i18n` attribute to the `<h1>` tag
 {@a help-translator}
 ### Help the translator with a description and meaning
 
-To translate a text message accurately, the translator may need additional information or context. 
+To translate a text message accurately, the translator may need additional information or context.
 
 You can add a description of the text message as the value of the `i18n` attribute, as shown in the
 example below:
@@ -176,7 +176,7 @@ example below:
 <code-example path="i18n/doc-files/app.component.html" region="i18n-attribute-desc" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-The translator may also need to know the meaning or intent of the text message within this particular 
+The translator may also need to know the meaning or intent of the text message within this particular
 app context.
 
 You add context by beginning the `i18n` attribute value with the _meaning_ and
@@ -192,7 +192,7 @@ The Angular extraction tool preserves both the meaning and the description in th
 source file to facilitate contextually-specific translations, but only the combination of meaning
 and text message are used to generate the specific id of a translation. If you have two
 similar text messages with different meanings, they are extracted separately. If you have two similar
-text messages with different descriptions (not different meanings), then they are extracted only once. 
+text messages with different descriptions (not different meanings), then they are extracted only once.
 
 
 {@a custom-id}
@@ -208,7 +208,7 @@ When you change the translatable text, the extractor tool generates a new id for
 You must then update the translation file with the new id.
 
 Alternatively, you can specify a custom id in the `i18n` attribute by using the prefix `@@`.
-The example below defines the custom id `introductionHeader`: 
+The example below defines the custom id `introductionHeader`:
 
 <code-example path='i18n/doc-files/app.component.html' region='i18n-attribute-solo-id' title='app/app.component.html' linenums="false">
 </code-example>
@@ -220,7 +220,7 @@ custom id.
 </code-example>
 
 The custom id is persistent. The extractor tool does not change it when the translatable text changes.
-Therefore, you do not need to update the translation. This approach makes maintenance easier. 
+Therefore, you do not need to update the translation. This approach makes maintenance easier.
 
 #### Use a custom id with a description
 
@@ -266,7 +266,7 @@ the same text, `Bonjour`:
     <!-- ... -->
     <p>Bonjour</p>
   ```
- 
+
 
 
 {@a no-element}
@@ -474,7 +474,7 @@ file. This information is not used by Angular, but external translation tools ma
 ## Translate text messages
 
 The `ng xi18n` command generates a translation source file named `messages.xlf` in the project `src`
-folder. 
+folder.
 
 The next step is to translate this source file into the specific language
 translation files. The example in this guide creates a French translation file.
@@ -526,7 +526,7 @@ This sample file is easy to translate without a special editor or knowledge of F
 </code-example>
 
 > This XML element represents the translation of the `<h1>` greeting tag that you marked with the
-  `i18n` attribute earlier in this guide. 
+  `i18n` attribute earlier in this guide.
 
 > Note that the translation unit `id=introductionHeader` is derived from the
   [custom `id`](#custom-id "Set a custom id") that you set earlier, but
@@ -573,7 +573,7 @@ To translate a `plural`, translate its ICU format match values:
 <code-example path="i18n/doc-files/messages.fr.xlf.html" region="translated-plural" title="src/locale/messages.fr.xlf (&lt;trans-unit&gt;)" linenums="false">
 </code-example>
 
-You can add or remove plural cases, with each language having its own cardinality.  (See 
+You can add or remove plural cases, with each language having its own cardinality.  (See
 [CLDR plural rules](http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html).)
 
 {@a translate-select}
@@ -609,7 +609,7 @@ Here they are together, after translation:
 {@a translate-nested}
 ### Translate a nested expression
 
-A nested expression is similar to the previous examples. As in the previous example, there are 
+A nested expression is similar to the previous examples. As in the previous example, there are
 two translation units. The first one contains the text outside of the nested expression:
 
 <code-example path="i18n/doc-files/messages.fr.xlf.html" region="translate-nested-1" title="src/locale/messages.fr.xlf (&lt;trans-unit&gt;)" linenums="false">
@@ -683,28 +683,40 @@ You also need to instruct the AOT compiler to use your translation configuration
 * `i18nLocale`: the locale id.
 
 ```
-"configurations": {
+"build": {
   ...
-  "fr": {
-    "aot": true,
-    "outputPath": "dist/my-project-fr/",
-    "i18nFile": "src/locale/messages.fr.xlf",
-    "i18nFormat": "xlf",
-    "i18nLocale": "fr",
+  "configurations": {
     ...
+    "fr": {
+      "aot": true,
+      "outputPath": "dist/my-project-fr/",
+      "i18nFile": "src/locale/messages.fr.xlf",
+      "i18nFormat": "xlf",
+      "i18nLocale": "fr",
+      ...
+    }
+  }
+},
+"serve": {
+  ...
+  "configurations": {
+    ...
+    "fr": {
+      "browserTarget": "angular.io-example:build:fr"
+    }
   }
 }
 ```
 
-You then pass the configuration with the `ng serve` or `ng build` commands. 
-The example below shows how to serve the French language file created in previous 
+You then pass the configuration with the `ng serve` or `ng build` commands.
+The example below shows how to serve the French language file created in previous
 sections of this guide:
 
 <code-example language="sh" class="code-shell">
   ng serve --configuration=fr
 </code-example>
 
-For production builds, you define a separate `production-fr` build configuration in 
+For production builds, you define a separate `production-fr` build configuration in
 your `angular.json`.
 
 ```

From 70b51a62557fdfaf449bdc225c4c9bc12a619a79 Mon Sep 17 00:00:00 2001
From: Marius Lichtblau <marius.lichtblau@googlemail.com>
Date: Mon, 16 Jul 2018 19:41:19 +0200
Subject: [PATCH 503/582] docs: update i18n with requested changes (#24875)

use more general project name in code example

PR Close #24875
---
 aio/content/guide/i18n.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index cba2241cee..fb94050d96 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -702,7 +702,7 @@ You also need to instruct the AOT compiler to use your translation configuration
   "configurations": {
     ...
     "fr": {
-      "browserTarget": "angular.io-example:build:fr"
+      "browserTarget": "*project-name*:build:fr"
     }
   }
 }

From c438b5eedac9e177df43bfeabfed3ac35ea408f6 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Thu, 10 May 2018 23:35:21 -0700
Subject: [PATCH 504/582] build(bazel): turn on preserve-symlinks (#24881)

This change turns on preserve-symlinks in nodejs to verify hermeticity of the Angular build.

BREAKING CHANGE: Use of @angular/bazel rules now requires calling ng_setup_workspace() in your WORKSPACE file.

For example:

local_repository(
    name = "angular",
    path = "node_modules/@angular/bazel",
)

load("@angular//:index.bzl", "ng_setup_workspace")

ng_setup_workspace()

PR Close #24881
---
 BUILD.bazel                                   | 180 ++++++++++++++++++
 WORKSPACE                                     |   9 +-
 integration/bazel/WORKSPACE                   |   8 +
 integration/bazel/yarn.lock                   |  96 +++-------
 packages/bazel/index.bzl                      |   2 +
 packages/bazel/package.json                   |   2 -
 packages/bazel/src/ng_package/BUILD.bazel     |   2 +
 packages/bazel/src/ng_package/ng_package.bzl  |   6 +-
 packages/bazel/src/ng_package/package.json    |   9 +
 packages/bazel/src/ng_package/yarn.lock       | 127 ++++++++++++
 packages/bazel/src/ng_setup_workspace.bzl     |  20 ++
 packages/bazel/src/ngc-wrapped/BUILD.bazel    |   1 -
 .../elements/schematics/ng-add/BUILD.bazel    |   4 +-
 tools/validate-commit-message/BUILD.bazel     |   4 +
 14 files changed, 389 insertions(+), 81 deletions(-)
 create mode 100644 packages/bazel/src/ng_package/package.json
 create mode 100644 packages/bazel/src/ng_package/yarn.lock
 create mode 100644 packages/bazel/src/ng_setup_workspace.bzl

diff --git a/BUILD.bazel b/BUILD.bazel
index 42cbb6a5a2..b255a31acd 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -17,18 +17,197 @@ alias(
 node_modules_filegroup(
     name = "node_modules",
     packages = [
+        "adm-zip",
+        "ajv",
+        "angular",
+        "angular-1.5",
+        "angular-mocks",
+        "angular-mocks-1.5",
+        "anymatch",
+        "arr-diff",
+        "arr-flatten",
+        "arr-union",
+        "array-unique",
+        "asn1",
+        "assert-plus",
+        "assign-symbols",
+        "async-each",
+        "asynckit",
+        "atob",
+        "aws-sign2",
+        "aws4",
+        "balanced-match",
+        "base",
+        "base64-js",
+        "binary-extensions",
+        "blocking-proxy",
+        "brace-expansion",
+        "braces",
         "bytebuffer",
+        "cache-base",
+        "caseless",
+        "chokidar",
+        "class-utils",
+        "co",
+        "collection-visit",
+        "combined-stream",
+        "component-emitter",
+        "concat-map",
+        "copy-descriptor",
+        "core-util-is",
+        "debug",
+        "decode-uri-component",
+        "define-property",
+        "delayed-stream",
+        "domino",
+        "expand-brackets",
+        "expand-range",
+        "extend",
+        "extend-shallow",
+        "extglob",
+        "extsprintf",
+        "fast-deep-equal",
+        "fast-json-stable-stringify",
+        "filename-regex",
+        "fill-range",
+        "for-in",
+        "for-own",
+        "forever-agent",
+        "form-data",
+        "fragment-cache",
+        "fs.realpath",
+        "get-value",
+        "glob",
+        "glob-base",
+        "glob-parent",
+        "graceful-fs",
         "hammerjs",
+        "har-schema",
+        "har-validator",
+        "has-value",
+        "has-values",
+        "http-signature",
+        "https-proxy-agent",
+        "inflight",
+        "inherits",
+        "is-accessor-descriptor",
+        "is-binary-path",
+        "is-buffer",
+        "is-data-descriptor",
+        "is-descriptor",
+        "is-dotfile",
+        "is-equal-shallow",
+        "is-extendable",
+        "is-extglob",
+        "is-glob",
+        "is-number",
+        "is-plain-object",
+        "is-posix-bracket",
+        "is-primitive",
+        "is-typedarray",
+        "is-windows",
+        "isarray",
+        "isobject",
+        "isstream",
         "jasmine",
+        "jasmine-core",
+        "jasminewd2",
+        "json-schema",
+        "json-schema-traverse",
+        "json-stable-stringify",
+        "json-stringify-safe",
+        "jsprim",
+        "kind-of",
+        "long",
+        "lru-cache",
+        "map-cache",
+        "map-visit",
+        "math-random",
+        "micromatch",
+        "mime-db",
+        "mime-types",
+        "minimatch",
         "minimist",
+        "mixin-deep",
+        "nanomatch",
+        "normalize-path",
+        "oauth-sign",
+        "object.omit",
+        "object.pick",
+        "object-copy",
+        "object-visit",
+        "once",
+        "optimist",
+        "options",
+        "os-tmpdir",
+        "parse-glob",
+        "pascalcase",
+        "path-dirname",
+        "path-is-absolute",
+        "performance-now",
+        "posix-character-classes",
+        "preserve",
+        "process-nextick-args",
         "protobufjs",
         "protractor",
+        "qs",
+        "randomatic",
+        "readable-stream",
+        "readdirp",
         "reflect-metadata",
+        "regex-cache",
+        "regex-not",
+        "remove-trailing-separator",
+        "repeat-element",
+        "repeat-string",
+        "request",
+        "ret",
+        "rimraf",
+        "safe-buffer",
+        "safe-regex",
+        "sax",
+        "semver",
+        "set-immediate-shim",
+        "set-value",
+        "shelljs",
+        "sigmund",
+        "snapdragon",
+        "snapdragon-node",
+        "snapdragon-util",
+        "source-map",
+        "source-map-resolve",
         "source-map-support",
+        "source-map-url",
+        "split-string",
+        "sshpk",
+        "static-extend",
+        "stringstream",
+        "tmp",
+        "to-object-path",
+        "to-regex",
+        "to-regex-range",
+        "tough-cookie",
         "tsickle",
         "tslib",
         "tsutils",
+        "tunnel-agent",
         "typescript",
+        "union-value",
+        "unset-value",
+        "upath",
+        "uri-js",
+        "urix",
+        "use",
+        "util-deprecate",
+        "uuid",
+        "verror",
+        "webdriver-js-extender",
+        "webdriver-manager",
+        "wordwrap",
+        "wrappy",
+        "xhr2",
+        "xml2js",
+        "xmlbuilder",
         "zone.js",
         "@angular-devkit/core",
         "@angular-devkit/schematics",
@@ -37,6 +216,7 @@ node_modules_filegroup(
     ],
     patterns = [
         "node_modules/protractor/**",
+        "node_modules/@schematics/angular/**",
     ],
 )
 
diff --git a/WORKSPACE b/WORKSPACE
index 05919663e4..d41d1848a9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -78,7 +78,10 @@ http_archive(
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
 check_bazel_version("0.15.0")
-node_repositories(package_json = ["//:package.json"])
+node_repositories(
+  package_json = ["//:package.json"],
+  preserve_symlinks = True,
+)
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
 
@@ -97,6 +100,10 @@ load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 
+load("//packages/bazel/src:ng_setup_workspace.bzl", "ng_setup_workspace")
+
+ng_setup_workspace()
+
 #
 # Point Bazel to WORKSPACEs that live in subdirectories
 #
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 1eb968725c..8fd3999ee0 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -81,3 +81,11 @@ local_repository(
     name = "rxjs",
     path = "node_modules/rxjs/src",
 )
+
+#
+# Load and install our dependencies from local repositories
+#
+
+load("@angular//:index.bzl", "ng_setup_workspace")
+
+ng_setup_workspace()
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index 474faef7fb..6ad83a8e88 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -3,49 +3,47 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/bazel@file:../../dist/packages-dist/bazel":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     "@bazel/typescript" "^0.15.0"
     "@types/node" "6.0.84"
-    "@types/shelljs" "0.7.7"
     protobufjs "5.0.0"
-    shelljs "0.7.8"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.29.0"
+    tsickle "^0.30.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "6.1.0-beta.1"
+  version "6.1.0-beta.3"
   dependencies:
     tslib "^1.9.0"
 
@@ -53,30 +51,10 @@
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.15.0.tgz#bd588b8b9fcc5763c3f14787fdb29ba4e127258d"
 
-"@types/events@*":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
-
-"@types/glob@*":
-  version "5.0.35"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/jasmine@2.8.7":
   version "2.8.7"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.7.tgz#3fe583928ae0a22cdd34cedf930eeffeda2602fd"
 
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-
-"@types/node@*":
-  version "10.3.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.4.tgz#c74e8aec19e555df44609b8057311052a2c84d9e"
-
 "@types/node@6.0.84":
   version "6.0.84"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
@@ -93,13 +71,6 @@
   version "2.53.43"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707"
 
-"@types/shelljs@0.7.7":
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.7.tgz#1f7bfa28947661afea06365db9b1135bbc903ec4"
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
 "@types/source-map@0.5.1":
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
@@ -403,6 +374,10 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
+diff@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -569,7 +544,7 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6:
+glob@^7.0.3, glob@^7.0.5, glob@^7.0.6:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -684,10 +659,6 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
@@ -792,6 +763,12 @@ jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
 
+jasmine-diff@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
+  dependencies:
+    diff "^3.2.0"
+
 jasmine@^2.5.3:
   version "2.99.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
@@ -1068,10 +1045,6 @@ path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -1192,12 +1165,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
@@ -1249,12 +1216,6 @@ requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
-resolve@^1.1.6:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  dependencies:
-    path-parse "^1.0.5"
-
 rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -1323,14 +1284,6 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
-shelljs@0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -1440,10 +1393,11 @@ tough-cookie@~2.3.3:
   dependencies:
     punycode "^1.4.1"
 
-tsickle@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.29.0.tgz#812806554bb46c1aa16eb0fe2a051da95ca8f5a4"
+tsickle@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.30.0.tgz#7941146ae92933854a8742fa1047606c4536649b"
   dependencies:
+    jasmine-diff "^0.1.3"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
@@ -1469,7 +1423,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 "typescript@file:../../node_modules/typescript":
-  version "2.8.3"
+  version "2.9.2"
 
 ultron@1.0.x:
   version "1.0.2"
diff --git a/packages/bazel/index.bzl b/packages/bazel/index.bzl
index 1cb77d4e52..ebf756931f 100644
--- a/packages/bazel/index.bzl
+++ b/packages/bazel/index.bzl
@@ -8,6 +8,7 @@ Users should not load files under "/src"
 """
 
 load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module")
+load("//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
 load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package")
 load("//packages/bazel/src/protractor:protractor_web_test.bzl",
      _protractor_web_test = "protractor_web_test",
@@ -17,3 +18,4 @@ ng_module = _ng_module
 ng_package = _ng_package
 protractor_web_test = _protractor_web_test
 protractor_web_test_suite = _protractor_web_test_suite
+ng_setup_workspace = _ng_setup_workspace
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index 72464fafba..b922668a57 100644
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@@ -7,8 +7,6 @@
   "dependencies": {
     "@bazel/typescript": "^0.15.0",
     "@types/node": "6.0.84",
-    "@types/shelljs": "0.7.7",
-    "shelljs": "0.7.8",
     "protobufjs": "5.0.0"
   },
   "peerDependencies": {
diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel
index 1080489e22..5f0438ca6c 100644
--- a/packages/bazel/src/ng_package/BUILD.bazel
+++ b/packages/bazel/src/ng_package/BUILD.bazel
@@ -14,6 +14,7 @@ exports_files(["rollup.config.js"])
 ts_library(
     name = "lib",
     srcs = glob(["*.ts"]),
+    node_modules = "@angular_packager_deps//:node_modules",
     tsconfig = ":tsconfig.json",
 )
 
@@ -21,4 +22,5 @@ nodejs_binary(
     name = "packager",
     data = ["lib"],
     entry_point = "angular/packages/bazel/src/ng_package/packager.js",
+    node_modules = "@angular_packager_deps//:node_modules",
 )
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 875b3728e7..3350bb4cfd 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -226,11 +226,11 @@ def _ng_package_impl(ctx):
     esm2015_config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, _esm2015_root_dir(ctx)]), filename="_%s.rollup_esm2015.conf.js")
     esm5_config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, esm5_root_dir(ctx)]), filename="_%s.rollup_esm5.conf.js")
 
-    fesm2015.append(_rollup(ctx, "fesm2015", esm2015_config, es2015_entry_point, esm_2015_files, fesm2015_output))
-    fesm5.append(_rollup(ctx, "fesm5", esm5_config, es5_entry_point, esm5_sources, fesm5_output))
+    fesm2015.append(_rollup(ctx, "fesm2015", esm2015_config, es2015_entry_point, esm_2015_files + ctx.files.node_modules, fesm2015_output))
+    fesm5.append(_rollup(ctx, "fesm5", esm5_config, es5_entry_point, esm5_sources + ctx.files.node_modules, fesm5_output))
 
     bundles.append(
-        _rollup(ctx, "umd", esm5_config, es5_entry_point, esm5_sources, umd_output,
+        _rollup(ctx, "umd", esm5_config, es5_entry_point, esm5_sources + ctx.files.node_modules, umd_output,
                 format = "umd", package_name = package_name, include_tslib = True))
     uglify_sourcemap = run_uglify(ctx, umd_output, min_output,
         config_name = entry_point.replace("/", "_"))
diff --git a/packages/bazel/src/ng_package/package.json b/packages/bazel/src/ng_package/package.json
new file mode 100644
index 0000000000..5bdd3ddceb
--- /dev/null
+++ b/packages/bazel/src/ng_package/package.json
@@ -0,0 +1,9 @@
+{
+  "description": "runtime dependences for packager",
+  "devDependencies": {
+    "@types/node": "6.0.84",
+    "@types/shelljs": "0.7.7",
+    "shelljs": "0.8.2",
+    "typescript": "2.7.2"
+  }
+}
diff --git a/packages/bazel/src/ng_package/yarn.lock b/packages/bazel/src/ng_package/yarn.lock
new file mode 100644
index 0000000000..4730fcb12b
--- /dev/null
+++ b/packages/bazel/src/ng_package/yarn.lock
@@ -0,0 +1,127 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/events@*":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+
+"@types/glob@*":
+  version "5.0.35"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+
+"@types/node@*":
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.8.tgz#37b4d91d4e958e4c2ba0be2b86e7ed4ff19b0858"
+
+"@types/node@6.0.84":
+  version "6.0.84"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
+
+"@types/shelljs@0.7.7":
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.7.tgz#1f7bfa28947661afea06365db9b1135bbc903ec4"
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+glob@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+resolve@^1.1.6:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+  dependencies:
+    path-parse "^1.0.5"
+
+shelljs@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+typescript@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
diff --git a/packages/bazel/src/ng_setup_workspace.bzl b/packages/bazel/src/ng_setup_workspace.bzl
new file mode 100644
index 0000000000..95c83ee633
--- /dev/null
+++ b/packages/bazel/src/ng_setup_workspace.bzl
@@ -0,0 +1,20 @@
+# 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
+
+"Install toolchain dependencies"
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
+
+def ng_setup_workspace():
+  """This repository rule should be called from your WORKSPACE file.
+
+  It creates some additional Bazel external repositories that are used internally
+  by the Angular rules.
+  """
+  yarn_install(
+      name = "angular_packager_deps",
+      package_json = "@angular//packages/bazel/src/ng_package:package.json",
+      yarn_lock = "@angular//packages/bazel/src/ng_package:yarn.lock",
+  )
diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel
index cedd7e5c2e..3aa7d15b0a 100644
--- a/packages/bazel/src/ngc-wrapped/BUILD.bazel
+++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel
@@ -33,7 +33,6 @@ nodejs_binary(
         "@build_bazel_rules_typescript//internal:worker_protocol.proto",
     ],
     entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js",
-    node_modules = "@build_bazel_rules_typescript_tsc_wrapped_deps//:node_modules",
     visibility = ["//visibility:public"],
 )
 
diff --git a/packages/elements/schematics/ng-add/BUILD.bazel b/packages/elements/schematics/ng-add/BUILD.bazel
index fb9d93fc02..28bdcb0a2d 100644
--- a/packages/elements/schematics/ng-add/BUILD.bazel
+++ b/packages/elements/schematics/ng-add/BUILD.bazel
@@ -37,10 +37,8 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    data = [
-        "//packages/elements/schematics:collection.json",
-    ],
     deps = [
         ":test_lib",
+        "//packages/elements/schematics:collection",
     ],
 )
diff --git a/tools/validate-commit-message/BUILD.bazel b/tools/validate-commit-message/BUILD.bazel
index 7570f699b8..06b1402f43 100644
--- a/tools/validate-commit-message/BUILD.bazel
+++ b/tools/validate-commit-message/BUILD.bazel
@@ -3,4 +3,8 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 jasmine_node_test(
     name = "validate-commit-message",
     srcs = glob(["*.js"]),
+    data = [
+        "commit-message.json",
+        "spec/support/jasmine.json",
+    ],
 )

From 56b3f1703e57c86eed4a24feb40b2fc6284ad6f1 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Mon, 16 Jul 2018 14:21:54 +0200
Subject: [PATCH 505/582] fix(ivy): invoke lifecycle hooks of directives placed
 on ng-template (#24899)

PR Close #24899
---
 packages/core/src/render3/instructions.ts    |  6 +-
 packages/core/test/render3/lifecycle_spec.ts | 64 +++++++++++++++++++-
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index a226cbb499..187ada2015 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -1727,10 +1727,8 @@ export function container(
 
   isParent = false;
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Container);
-  if (queries) {
-    // check if a given container node matches
-    queries.addNode(node);
-  }
+  queries && queries.addNode(node);  // check if a given container node matches
+  queueLifecycleHooks(node.tNode.flags, tView);
 }
 
 /**
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 4bb3656fb2..48c72a4d3f 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -6,11 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {SimpleChanges} from '../../src/core';
-import {ComponentTemplate, LifecycleHooksFeature, NgOnChangesFeature, defineComponent, defineDirective} from '../../src/render3/index';
+import {OnDestroy, SimpleChanges} from '../../src/core';
+import {AttributeMarker, ComponentTemplate, LifecycleHooksFeature, NgOnChangesFeature, defineComponent, defineDirective} from '../../src/render3/index';
 import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, listener, markDirty, projection, projectionDef, store, text} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {containerEl, renderComponent, renderToHtml, requestAnimationFrame} from './render_util';
+
+import {NgIf} from './common_with_def';
+import {ComponentFixture, containerEl, createComponent, renderComponent, renderToHtml, requestAnimationFrame} from './render_util';
 
 describe('lifecycles', () => {
 
@@ -2525,4 +2527,60 @@ describe('lifecycles', () => {
 
   });
 
+  describe('non-regression', () => {
+
+    it('should call lifecycle hooks for directives active on <ng-template>', () => {
+      let destroyed = false;
+
+      class OnDestroyDirective implements OnDestroy {
+        ngOnDestroy() { destroyed = true; }
+
+        static ngDirectiveDef = defineDirective({
+          type: OnDestroyDirective,
+          selectors: [['', 'onDestroyDirective', '']],
+          factory: () => new OnDestroyDirective()
+        });
+      }
+
+
+      function conditionTpl(rf: RenderFlags, ctx: Cmpt) {
+        if (rf & RenderFlags.Create) {
+          container(0, cmptTpl, null, [AttributeMarker.SelectOnly, 'onDestroyDirective']);
+        }
+      }
+
+      /**
+       * <ng-template [ngIf]="condition">
+       *  <ng-template onDestroyDirective></ng-template>
+       * </ng-template>
+       */
+      function cmptTpl(rf: RenderFlags, cmpt: Cmpt) {
+        if (rf & RenderFlags.Create) {
+          container(0, conditionTpl, null, [AttributeMarker.SelectOnly, 'ngIf']);
+        }
+        if (rf & RenderFlags.Update) {
+          elementProperty(0, 'ngIf', bind(cmpt.showing));
+        }
+      }
+
+      class Cmpt {
+        showing = true;
+        static ngComponentDef = defineComponent({
+          type: Cmpt,
+          factory: () => new Cmpt(),
+          selectors: [['cmpt']],
+          template: cmptTpl,
+          directives: [NgIf, OnDestroyDirective]
+        });
+      }
+
+      const fixture = new ComponentFixture(Cmpt);
+      expect(destroyed).toBeFalsy();
+
+      fixture.component.showing = false;
+      fixture.update();
+      expect(destroyed).toBeTruthy();
+    });
+  });
+
 });

From 2d38fa104bd541bf50e7379ebab027dc01e58fc8 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 17 Jul 2018 11:19:24 +0300
Subject: [PATCH 506/582] test(platform-webworker): avoid flakes due to
 existing `PlatformRef` (#24916)

PR Close #24916
---
 .../worker/renderer_v2_integration_spec.ts    | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
index 3a3b5e209f..d66e25a96a 100644
--- a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
+++ b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, ComponentRef, Renderer2, RendererFactory2, RendererType2, RootRenderer} from '@angular/core';
+import {Component, ComponentRef, Renderer2, RendererFactory2, RendererType2, destroyPlatform} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
@@ -37,6 +37,9 @@ let lastCreatedRenderer: Renderer2;
     let uiRenderStore: RenderStore;
     let wwRenderStore: RenderStore;
 
+    beforeEach(() => destroyPlatform());
+    afterEach(() => destroyPlatform());
+
     beforeEach(() => {
       // UI side
       uiRenderStore = new RenderStore();
@@ -81,10 +84,6 @@ let lastCreatedRenderer: Renderer2;
     }
 
     it('should update text nodes', () => {
-      // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
-      // TODO (matsko): revisit this once things become more stable in the saucelabs world
-      if (isOldIE()) return;
-
       const fixture =
           TestBed.overrideTemplate(MyComp2, '<div>{{ctxProp}}</div>').createComponent(MyComp2);
       const renderEl = getRenderElement(fixture.nativeElement);
@@ -97,10 +96,6 @@ let lastCreatedRenderer: Renderer2;
 
     it('should update any element property/attributes/class/style(s) independent of the compilation on the root element and other elements',
        () => {
-         // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
-         // TODO (matsko): revisit this once things become more stable in the saucelabs world
-         if (isOldIE()) return;
-
          const fixture =
              TestBed.overrideTemplate(MyComp2, '<input [title]="y" style="position:absolute">')
                  .createComponent(MyComp2);
@@ -135,10 +130,6 @@ let lastCreatedRenderer: Renderer2;
        });
 
     it('should update any template comment property/attributes', () => {
-      // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
-      // TODO (matsko): revisit this once things become more stable in the saucelabs world
-      if (isOldIE()) return;
-
       const fixture =
           TestBed.overrideTemplate(MyComp2, '<ng-container *ngIf="ctxBoolProp"></ng-container>')
               .createComponent(MyComp2);
@@ -149,10 +140,6 @@ let lastCreatedRenderer: Renderer2;
     });
 
     it('should add and remove fragments', () => {
-      // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
-      // TODO (matsko): revisit this once things become more stable in the saucelabs world
-      if (isOldIE()) return;
-
       const fixture =
           TestBed
               .overrideTemplate(MyComp2, '<ng-container *ngIf="ctxBoolProp">hello</ng-container>')
@@ -172,10 +159,6 @@ let lastCreatedRenderer: Renderer2;
 
     if (getDOM().supportsDOMEvents()) {
       it('should listen to events', () => {
-        // IE (v11 to be exact) has been problematic lately with saucelabs for this specific test
-        // TODO (matsko): revisit this once things become more stable in the saucelabs world
-        if (isOldIE()) return;
-
         const fixture = TestBed.overrideTemplate(MyComp2, '<input (change)="ctxNumProp = 1">')
                             .createComponent(MyComp2);
 

From 3cd9645daa4d35685ca1bdbe02f44dc34d11464d Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 17 Jul 2018 12:14:18 +0300
Subject: [PATCH 507/582] fix(docs-infra): fix table header layout in API pages
 (#24919)

PR Close #24919
---
 aio/src/styles/2-modules/_api-pages.scss         |  9 +++------
 .../templates/api/decorator.template.html        |  6 ++++--
 .../templates/api/lib/memberHelpers.html         | 16 +++++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/aio/src/styles/2-modules/_api-pages.scss b/aio/src/styles/2-modules/_api-pages.scss
index 41768a0bd9..55e273408f 100644
--- a/aio/src/styles/2-modules/_api-pages.scss
+++ b/aio/src/styles/2-modules/_api-pages.scss
@@ -31,13 +31,10 @@
   }
 
   .method-table, .option-table, .list-table {
-    th {
-      display: flex;
+    .with-github-links {
       align-items: center;
-
-      h3 {
-        flex: 1;
-      }
+      display: flex;
+      justify-content: space-between;
 
       .github-links {
         a {
diff --git a/aio/tools/transforms/templates/api/decorator.template.html b/aio/tools/transforms/templates/api/decorator.template.html
index 6a32d634b7..dca547549f 100644
--- a/aio/tools/transforms/templates/api/decorator.template.html
+++ b/aio/tools/transforms/templates/api/decorator.template.html
@@ -13,8 +13,10 @@
   <a id="{$ option.anchor $}"></a>
   <table class="is-full-width option-table">
     <thead><tr><th>
-      <h3>{$ option.name $}</h3>
-      {$ github.githubLinks(option, versionInfo) $}
+      <div class="with-github-links">
+        <h3>{$ option.name $}</h3>
+        {$ github.githubLinks(option, versionInfo) $}
+      </div>
     </th></tr></thead>
     <tbody>
       <tr>
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index de81f1f5a2..0a8fca6a07 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -74,13 +74,15 @@
 <a id="{$ method.anchor $}"></a>
 <table class="is-full-width method-table {$ cssClass $}">
   {% if method.name !== 'constructor' %}<thead><tr><th>
-    <h3>
-      {% if method.isCallMember %}<i>call signature</i>
-      {% elseif method.isNewMember %}<i>construct signature</i>
-      {% else %}{$ method.name $}()
-      {% endif %}
-    </h3>
-    {$ github.githubLinks(method, versionInfo) $}
+    <div class="with-github-links">
+      <h3>
+        {% if method.isCallMember %}<i>call signature</i>
+        {% elseif method.isNewMember %}<i>construct signature</i>
+        {% else %}{$ method.name $}()
+        {% endif %}
+      </h3>
+      {$ github.githubLinks(method, versionInfo) $}
+    </div>
   </th></tr></thead>{% endif %}
   <tbody>
     {% if method.shortDescription %}<tr>

From 23766b85e910f2a1488081de48e1c90d052629c6 Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Tue, 17 Jul 2018 06:44:28 -0700
Subject: [PATCH 508/582] build: Fix windows tests (#24927)

closes #24927
---
 WORKSPACE                           | 6 +++---
 packages/upgrade/static/BUILD.bazel | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index d41d1848a9..550831a6ed 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.1.zip",
-    strip_prefix = "rules_typescript-0.15.1",
-    sha256 = "3792cc20ef13bb1d1d8b1760894c3320f02a87843e3a04fed7e8e454a75328b6",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.3.zip",
+    strip_prefix = "rules_typescript-0.15.3",
+    sha256 = "a2b26ac3fc13036011196063db1bf7f1eae81334449201dc28087ebfa3708c99",
 )
 
 http_archive(
diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel
index 8c5a448dd2..328c9bd724 100644
--- a/packages/upgrade/static/BUILD.bazel
+++ b/packages/upgrade/static/BUILD.bazel
@@ -6,7 +6,9 @@ load("//tools:defaults.bzl", "ng_module")
 
 ng_module(
     name = "static",
-    srcs = glob(["**/*.ts"]),
+    # Workaround for Bazel issue where Windows symlinks
+    # aka. junctions are not traversed by glob
+    srcs = glob(["*.ts"]) + glob(["src/**/*.ts"]),
     module_name = "@angular/upgrade/static",
     deps = [
         "//packages/core",

From b8f740b25377a3230e5efbce992808d56572c0ac Mon Sep 17 00:00:00 2001
From: Xapuu <xapu.ivanov@gmail.com>
Date: Tue, 17 Jul 2018 20:24:30 +0300
Subject: [PATCH 509/582] docs: remove closing parenthesis from provides guide
 (#24935)

PR Close #24935
---
 aio/content/guide/providers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/providers.md b/aio/content/guide/providers.md
index 941f663865..893fca5931 100644
--- a/aio/content/guide/providers.md
+++ b/aio/content/guide/providers.md
@@ -32,7 +32,7 @@ The service itself is a class that the CLI generated and that's decorated with `
 
 When you add a service provider to the root application injector, it’s available throughout the app. Additionally, these providers are also available to all the classes in the app as long they have the lookup token. 
 
-You should always provide your service in the root injector unless there is a case where you want the service to be available only if the consumer imports a particular `@NgModule)`.
+You should always provide your service in the root injector unless there is a case where you want the service to be available only if the consumer imports a particular `@NgModule`.
 
 ## providedIn and NgModules
 

From bb58138579eeee868109b31ae20359db291914bd Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 10 Jul 2018 14:07:09 -0700
Subject: [PATCH 510/582] docs: fix bad link (#24825)

PR Close #24825
---
 aio/content/guide/architecture-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/architecture-components.md b/aio/content/guide/architecture-components.md
index 7b8e808f35..7cbaa8e4a8 100644
--- a/aio/content/guide/architecture-components.md
+++ b/aio/content/guide/architecture-components.md
@@ -11,7 +11,7 @@ A _component_ controls a patch of screen called a *view*. For example, individua
 You define a component's application logic&mdash;what it does to support the view&mdash;inside a class.
 The class interacts with the view through an API of properties and methods.
 
-For example, the `HeroListComponent` has a `heroes` property that holds an array of heroes. It also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list. The component acquires the heroes from a service, which is a TypeScript [parameter property[(http://www.typescriptlang.org/docs/handbook/classes.html#parameter-properties) on the constructor. The service is provided to the component through the dependency injection system.
+For example, the `HeroListComponent` has a `heroes` property that holds an array of heroes. It also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list. The component acquires the heroes from a service, which is a TypeScript [parameter property](http://www.typescriptlang.org/docs/handbook/classes.html#parameter-properties) on the constructor. The service is provided to the component through the dependency injection system.
 
 <code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (class)" region="class"></code-example>
 

From f58f3dc07a5961f881c7ef993dd2acb65f8326f4 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 3 Jul 2018 14:09:56 -0700
Subject: [PATCH 511/582] fix(ivy): handle ReadKeyExpr code generation (#24862)

This implements a missing expression type in ngtsc code generation:
that of bracket access to an object property.

PR Close #24862
---
 packages/compiler-cli/src/ngtsc/transform/src/translator.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index c5e8f967cd..339778938f 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -237,8 +237,9 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     return ts.createPropertyAccess(ast.receiver.visitExpression(this, context), ast.name);
   }
 
-  visitReadKeyExpr(ast: ReadKeyExpr, context: any): never {
-    throw new Error('Method not implemented.');
+  visitReadKeyExpr(ast: ReadKeyExpr, context: any): ts.ElementAccessExpression {
+    return ts.createElementAccess(
+        ast.receiver.visitExpression(this, context), ast.index.visitExpression(this, context));
   }
 
   visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any): ts.ArrayLiteralExpression {

From 8a5cd2200a9083573fb50037462266c8c0bf57ea Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 6 Jul 2018 09:31:46 -0700
Subject: [PATCH 512/582] fix(ivy): allow building router with ngtsc (#24862)

This commit adds the ivy-local tag to //packages/router. Since the
router depends on //packages/upgrade, it makes that package
compatible with ngtsc as well.

PR Close #24862
---
 packages/router/BUILD.bazel                         | 1 +
 packages/upgrade/BUILD.bazel                        | 1 +
 packages/upgrade/src/dynamic/upgrade_adapter.ts     | 2 +-
 packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
index 547927f85b..9a73da61c4 100644
--- a/packages/router/BUILD.bazel
+++ b/packages/router/BUILD.bazel
@@ -30,6 +30,7 @@ ng_package(
     entry_point = "packages/router/index.js",
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index 09bff3383e..92f3ddd17f 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -27,6 +27,7 @@ ng_package(
     entry_point = "packages/upgrade/index.js",
     tags = [
         "ivy-jit",
+        "ivy-local",
         "release-with-framework",
     ],
     deps = [
diff --git a/packages/upgrade/src/dynamic/upgrade_adapter.ts b/packages/upgrade/src/dynamic/upgrade_adapter.ts
index 0ce767c1f0..cc16325dc1 100644
--- a/packages/upgrade/src/dynamic/upgrade_adapter.ts
+++ b/packages/upgrade/src/dynamic/upgrade_adapter.ts
@@ -571,7 +571,7 @@ export class UpgradeAdapter {
               };
               // At this point we have ng1 injector and we have prepared
               // ng1 components to be upgraded, we now can bootstrap ng2.
-              @NgModule(ngModule)
+              @NgModule({jit: true, ...ngModule})
               class DynamicNgUpgradeModule {
                 constructor() {}
                 ngDoBootstrap() {}
diff --git a/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts b/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts
index ffee28a0bf..b31657bc7b 100644
--- a/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts
+++ b/packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts
@@ -45,7 +45,7 @@ export class UpgradeNg1ComponentAdapterBuilder {
     // TODO(tbosch): find or file a bug against TypeScript for this.
     const directive = {selector: selector, inputs: this.inputsRename, outputs: this.outputsRename};
 
-    @Directive(directive)
+    @Directive({jit: true, ...directive})
     class MyClass {
       // TODO(issue/24571): remove '!'.
       directive !: angular.IDirective;

From 1008bb62871976fc4e98e6f7c707ec823679040c Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 9 Jul 2018 10:16:47 -0700
Subject: [PATCH 513/582] fix(ivy): unwrap parenthesized or cast expressions
 for metadata (#24862)

Metadata in Ivy must be literal. For example,

@NgModule({...})

is legal, whereas

const meta = {...};
@NgModule(meta)

is not.

However, some code contains additional superfluous parentheses:

@NgModule(({...}))

It is desirable that ngtsc accept this form of literal object.

PR Close #24862
---
 .../src/ngtsc/annotations/src/component.ts    |  5 +--
 .../src/ngtsc/annotations/src/directive.ts    |  4 +--
 .../src/ngtsc/annotations/src/ng_module.ts    |  6 ++--
 .../src/ngtsc/annotations/src/pipe.ts         |  4 +--
 .../src/ngtsc/annotations/src/util.ts         | 13 +++++++
 .../src/ngtsc/annotations/test/util_spec.ts   | 35 +++++++++++++++++++
 6 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index 64b2913fe1..f62a492330 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -17,7 +17,7 @@ import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 import {ResourceLoader} from './api';
 import {extractDirectiveMetadata} from './directive';
 import {SelectorScopeRegistry} from './selector_scope';
-import {isAngularCore} from './util';
+import {isAngularCore, unwrapExpression} from './util';
 
 const EMPTY_MAP = new Map<string, Expression>();
 
@@ -156,7 +156,8 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     if (decorator.args === null || decorator.args.length !== 1) {
       throw new Error(`Incorrect number of arguments to @Component decorator`);
     }
-    const meta = decorator.args[0];
+    const meta = unwrapExpression(decorator.args[0]);
+
     if (!ts.isObjectLiteralExpression(meta)) {
       throw new Error(`Decorator argument must be literal.`);
     }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 4fc2b657cb..94ec30d397 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -15,7 +15,7 @@ import {filterToMembersWithDecorator} from '../../metadata/src/reflector';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {getConstructorDependencies, isAngularCore} from './util';
+import {getConstructorDependencies, isAngularCore, unwrapExpression} from './util';
 
 const EMPTY_OBJECT: {[key: string]: string} = {};
 
@@ -63,7 +63,7 @@ export function extractDirectiveMetadata(
   if (decorator.args === null || decorator.args.length !== 1) {
     throw new Error(`Incorrect number of arguments to @${decorator.name} decorator`);
   }
-  const meta = decorator.args[0];
+  const meta = unwrapExpression(decorator.args[0]);
   if (!ts.isObjectLiteralExpression(meta)) {
     throw new Error(`Decorator argument must be literal.`);
   }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index 1a91a0e238..54ccce6ae2 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -14,7 +14,7 @@ import {Reference, ResolvedValue, reflectObjectLiteral, staticallyResolve} from
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {getConstructorDependencies, isAngularCore, referenceToExpression} from './util';
+import {getConstructorDependencies, isAngularCore, referenceToExpression, unwrapExpression} from './util';
 
 export interface NgModuleAnalysis {
   ngModuleDef: R3NgModuleMetadata;
@@ -43,7 +43,9 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
 
     // @NgModule can be invoked without arguments. In case it is, pretend as if a blank object
     // literal was specified. This simplifies the code below.
-    const meta = decorator.args.length === 1 ? decorator.args[0] : ts.createObjectLiteral([]);
+    const meta = decorator.args.length === 1 ? unwrapExpression(decorator.args[0]) :
+                                               ts.createObjectLiteral([]);
+
     if (!ts.isObjectLiteralExpression(meta)) {
       throw new Error(`Decorator argument must be literal.`);
     }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
index c3da6204eb..4331746afc 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
@@ -14,7 +14,7 @@ import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {getConstructorDependencies, isAngularCore} from './util';
+import {getConstructorDependencies, isAngularCore, unwrapExpression} from './util';
 
 export class PipeDecoratorHandler implements DecoratorHandler<R3PipeMetadata> {
   constructor(
@@ -35,7 +35,7 @@ export class PipeDecoratorHandler implements DecoratorHandler<R3PipeMetadata> {
     if (decorator.args === null) {
       throw new Error(`@Pipe must be called`);
     }
-    const meta = decorator.args[0];
+    const meta = unwrapExpression(decorator.args[0]);
     if (!ts.isObjectLiteralExpression(meta)) {
       throw new Error(`Decorator argument must be literal.`);
     }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index ec63dd357b..6322ddef86 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -87,3 +87,16 @@ export function referenceToExpression(ref: Reference, context: ts.SourceFile): E
 export function isAngularCore(decorator: Decorator): boolean {
   return decorator.import !== null && decorator.import.from === '@angular/core';
 }
+
+/**
+ * Unwrap a `ts.Expression`, removing outer type-casts or parentheses until the expression is in its
+ * lowest level form.
+ *
+ * For example, the expression "(foo as Type)" unwraps to "foo".
+ */
+export function unwrapExpression(node: ts.Expression): ts.Expression {
+  while (ts.isAsExpression(node) || ts.isParenthesizedExpression(node)) {
+    node = node.expression;
+  }
+  return node;
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts
new file mode 100644
index 0000000000..95fc30ef1c
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts
@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {unwrapExpression} from '../src/util';
+
+describe('ngtsc annotation utilities', () => {
+  describe('unwrapExpression', () => {
+    const obj = ts.createObjectLiteral();
+    it('should pass through an ObjectLiteralExpression',
+       () => { expect(unwrapExpression(obj)).toBe(obj); });
+
+    it('should unwrap an ObjectLiteralExpression in parentheses', () => {
+      const wrapped = ts.createParen(obj);
+      expect(unwrapExpression(wrapped)).toBe(obj);
+    });
+
+    it('should unwrap an ObjectLiteralExpression with a type cast', () => {
+      const cast = ts.createAsExpression(obj, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
+      expect(unwrapExpression(cast)).toBe(obj);
+    });
+
+    it('should unwrap an ObjectLiteralExpression with a type cast in parentheses', () => {
+      const cast = ts.createAsExpression(obj, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
+      const wrapped = ts.createParen(cast);
+      expect(unwrapExpression(wrapped)).toBe(obj);
+    });
+  });
+});

From 60aeee7abfcc149d9f33ed9519b242b4bccea641 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 9 Jul 2018 11:36:30 -0700
Subject: [PATCH 514/582] feat(ivy): selector side of ModuleWithProviders via
 type metadata (#24862)

Within an @NgModule it's common to include in the imports a call to
a ModuleWithProviders function, for example RouterModule.forRoot().
The old ngc compiler was able to handle this pattern because it had
global knowledge of metadata of not only the input compilation unit
but also all dependencies.

The ngtsc compiler for Ivy doesn't have this knowledge, so the
pattern of ModuleWithProviders functions is more difficult. ngtsc
must be able to determine which module is imported via the function
in order to expand the selector scope and properly tree-shake
directives and pipes.

This commit implements a solution to this problem, by adding a type
parameter to ModuleWithProviders through which the actual module
type can be passed between compilation units.

The provider side isn't a problem because the imports are always
copied directly to the ngInjectorDef.

PR Close #24862
---
 .../src/ngtsc/annotations/src/ng_module.ts    | 48 ++++++++++++++++-
 .../src/ngtsc/metadata/src/resolver.ts        | 52 ++++++++++++++++---
 .../test/ngtsc/fake_core/index.ts             |  1 +
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 26 ++++++++++
 packages/core/src/metadata/ng_module.ts       |  7 +--
 packages/forms/src/form_providers.ts          |  2 +-
 packages/platform-browser/src/browser.ts      |  2 +-
 packages/router/src/router_module.ts          |  4 +-
 .../testing/src/router_testing_module.ts      |  3 +-
 tools/public_api_guard/core/core.d.ts         |  4 +-
 tools/public_api_guard/forms/forms.d.ts       |  2 +-
 .../platform-browser/platform-browser.d.ts    |  2 +-
 tools/public_api_guard/router/router.d.ts     |  4 +-
 tools/public_api_guard/router/testing.d.ts    |  2 +-
 14 files changed, 136 insertions(+), 23 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index 54ccce6ae2..aac8f1bfef 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -64,12 +64,16 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
     }
     let imports: Reference[] = [];
     if (ngModule.has('imports')) {
-      const importsMeta = staticallyResolve(ngModule.get('imports') !, this.checker);
+      const importsMeta = staticallyResolve(
+          ngModule.get('imports') !, this.checker,
+          node => this._extractModuleFromModuleWithProvidersFn(node));
       imports = resolveTypeList(importsMeta, 'imports');
     }
     let exports: Reference[] = [];
     if (ngModule.has('exports')) {
-      const exportsMeta = staticallyResolve(ngModule.get('exports') !, this.checker);
+      const exportsMeta = staticallyResolve(
+          ngModule.get('exports') !, this.checker,
+          node => this._extractModuleFromModuleWithProvidersFn(node));
       exports = resolveTypeList(exportsMeta, 'exports');
     }
 
@@ -125,6 +129,46 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
       },
     ];
   }
+
+  /**
+   * Given a `FunctionDeclaration` or `MethodDeclaration`, check if it is typed as a
+   * `ModuleWithProviders` and return an expression referencing the module if available.
+   */
+  private _extractModuleFromModuleWithProvidersFn(node: ts.FunctionDeclaration|
+                                                  ts.MethodDeclaration): ts.Expression|null {
+    const type = node.type;
+    // Examine the type of the function to see if it's a ModuleWithProviders reference.
+    if (type === undefined || !ts.isTypeReferenceNode(type) || !ts.isIdentifier(type.typeName)) {
+      return null;
+    }
+
+    // Look at the type itself to see where it comes from.
+    const id = this.reflector.getImportOfIdentifier(type.typeName);
+
+    // If it's not named ModuleWithProviders, bail.
+    if (id === null || id.name !== 'ModuleWithProviders') {
+      return null;
+    }
+
+    // If it's not from @angular/core, bail.
+    if (!this.isCore && id.from !== '@angular/core') {
+      return null;
+    }
+
+    // If there's no type parameter specified, bail.
+    if (type.typeArguments === undefined || type.typeArguments.length !== 1) {
+      return null;
+    }
+
+    const arg = type.typeArguments[0];
+
+    // If the argument isn't an Identifier, bail.
+    if (!ts.isTypeReferenceNode(arg) || !ts.isIdentifier(arg.typeName)) {
+      return null;
+    }
+
+    return arg.typeName;
+  }
 }
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index 9740d4e222..9c3f7891f7 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -107,6 +107,8 @@ export abstract class Reference {
  * referenceable.
  */
 export class NodeReference extends Reference {
+  constructor(node: ts.Node, readonly moduleName: string|null) { super(node); }
+
   toExpression(context: ts.SourceFile): null { return null; }
 }
 
@@ -177,11 +179,22 @@ export class AbsoluteReference extends Reference {
  *
  * @param node the expression to statically resolve if possible
  * @param checker a `ts.TypeChecker` used to understand the expression
+ * @param foreignFunctionResolver a function which will be used whenever a "foreign function" is
+ * encountered. A foreign function is a function which has no body - usually the result of calling
+ * a function declared in another library's .d.ts file. In these cases, the foreignFunctionResolver
+ * will be called with the function's declaration, and can optionally return a `ts.Expression`
+ * (possibly extracted from the foreign function's type signature) which will be used as the result
+ * of the call.
  * @returns a `ResolvedValue` representing the resolved value
  */
-export function staticallyResolve(node: ts.Expression, checker: ts.TypeChecker): ResolvedValue {
-  return new StaticInterpreter(checker).visit(
-      node, {absoluteModuleName: null, scope: new Map<ts.ParameterDeclaration, ResolvedValue>()});
+export function staticallyResolve(
+    node: ts.Expression, checker: ts.TypeChecker,
+    foreignFunctionResolver?: (node: ts.FunctionDeclaration | ts.MethodDeclaration) =>
+        ts.Expression | null): ResolvedValue {
+  return new StaticInterpreter(checker).visit(node, {
+    absoluteModuleName: null,
+    scope: new Map<ts.ParameterDeclaration, ResolvedValue>(), foreignFunctionResolver,
+  });
 }
 
 interface BinaryOperatorDef {
@@ -226,6 +239,7 @@ const UNARY_OPERATORS = new Map<ts.SyntaxKind, (a: any) => any>([
 interface Context {
   absoluteModuleName: string|null;
   scope: Scope;
+  foreignFunctionResolver?(node: ts.FunctionDeclaration|ts.MethodDeclaration): ts.Expression|null;
 }
 
 class StaticInterpreter {
@@ -472,6 +486,10 @@ class StaticInterpreter {
     } else if (lhs instanceof Reference) {
       const ref = lhs.node;
       if (ts.isClassDeclaration(ref)) {
+        let absoluteModuleName = context.absoluteModuleName;
+        if (lhs instanceof NodeReference || lhs instanceof AbsoluteReference) {
+          absoluteModuleName = lhs.moduleName || absoluteModuleName;
+        }
         let value: ResolvedValue = undefined;
         const member =
             ref.members.filter(member => isStatic(member))
@@ -482,7 +500,7 @@ class StaticInterpreter {
           if (ts.isPropertyDeclaration(member) && member.initializer !== undefined) {
             value = this.visitExpression(member.initializer, context);
           } else if (ts.isMethodDeclaration(member)) {
-            value = new NodeReference(member);
+            value = new NodeReference(member, absoluteModuleName);
           }
         }
         return value;
@@ -495,13 +513,35 @@ class StaticInterpreter {
     const lhs = this.visitExpression(node.expression, context);
     if (!(lhs instanceof Reference)) {
       throw new Error(`attempting to call something that is not a function: ${lhs}`);
-    } else if (!isFunctionOrMethodDeclaration(lhs.node) || !lhs.node.body) {
+    } else if (!isFunctionOrMethodDeclaration(lhs.node)) {
       throw new Error(
           `calling something that is not a function declaration? ${ts.SyntaxKind[lhs.node.kind]}`);
     }
 
     const fn = lhs.node;
-    const body = fn.body as ts.Block;
+
+    // If the function is foreign (declared through a d.ts file), attempt to resolve it with the
+    // foreignFunctionResolver, if one is specified.
+    if (fn.body === undefined) {
+      let expr: ts.Expression|null = null;
+      if (context.foreignFunctionResolver) {
+        expr = context.foreignFunctionResolver(fn);
+      }
+      if (expr === null) {
+        throw new Error(`could not resolve foreign function declaration`);
+      }
+
+      // If the function is declared in a different file, resolve the foreign function expression
+      // using the absolute module name of that file (if any).
+      let absoluteModuleName: string|null = context.absoluteModuleName;
+      if (lhs instanceof NodeReference || lhs instanceof AbsoluteReference) {
+        absoluteModuleName = lhs.moduleName || absoluteModuleName;
+      }
+
+      return this.visitExpression(expr, {...context, absoluteModuleName});
+    }
+
+    const body = fn.body;
     if (body.statements.length !== 1 || !ts.isReturnStatement(body.statements[0])) {
       throw new Error('Function body must have a single return statement only.');
     }
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index beceb52459..7999ab1cc4 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -26,3 +26,4 @@ export const Inject = callableParamDecorator();
 export const Self = callableParamDecorator();
 export const SkipSelf = callableParamDecorator();
 export const Optional = callableParamDecorator();
+export type ModuleWithProviders<T> = any;
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index e690129325..3046f5dbc6 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -344,4 +344,30 @@ describe('ngtsc behavioral tests', () => {
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [TestPipe,TestCmp], [], []>');
   });
+
+  it('should unwrap a ModuleWithProviders functoin if a generic type is provided for it', () => {
+    writeConfig();
+    write(`test.ts`, `
+        import {NgModule} from '@angular/core';
+        import {RouterModule} from 'router';
+
+        @NgModule({imports: [RouterModule.forRoot()]})
+        export class TestModule {}
+    `);
+
+    write('node_modules/router/index.d.ts', `
+        import {ModuleWithProviders} from '@angular/core';
+
+        declare class RouterModule {
+          static forRoot(): ModuleWithProviders<RouterModule>;
+        }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+    const dtsContents = getContents('test.d.ts');
+    expect(dtsContents).toContain(`import * as i1 from 'router';`);
+    expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [], [i1.RouterModule], []>');
+  });
 });
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index ed4634a25c..78de8a4347 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -73,10 +73,11 @@ export interface NgModuleDef<T, Declarations, Imports, Exports> {
 /**
  * A wrapper around an NgModule that associates it with the providers.
  *
- *
+ * @param T the module type. In Ivy applications, this must be explicitly
+ * provided.
  */
-export interface ModuleWithProviders {
-  ngModule: Type<any>;
+export interface ModuleWithProviders<T = any> {
+  ngModule: Type<T>;
   providers?: Provider[];
 }
 
diff --git a/packages/forms/src/form_providers.ts b/packages/forms/src/form_providers.ts
index 586a13b506..a0759331f8 100644
--- a/packages/forms/src/form_providers.ts
+++ b/packages/forms/src/form_providers.ts
@@ -38,7 +38,7 @@ export class FormsModule {
 export class ReactiveFormsModule {
   static withConfig(opts: {
     /** @deprecated as of v6 */ warnOnNgModelWithFormControl: 'never' | 'once' | 'always'
-  }): ModuleWithProviders {
+  }): ModuleWithProviders<ReactiveFormsModule> {
     return {
       ngModule: ReactiveFormsModule,
       providers: [{
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
index 8123f422ee..be4821570b 100644
--- a/packages/platform-browser/src/browser.ts
+++ b/packages/platform-browser/src/browser.ts
@@ -112,7 +112,7 @@ export class BrowserModule {
    *
    * @experimental
    */
-  static withServerTransition(params: {appId: string}): ModuleWithProviders {
+  static withServerTransition(params: {appId: string}): ModuleWithProviders<BrowserModule> {
     return {
       ngModule: BrowserModule,
       providers: [
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index 73995ef7d3..7566ee1400 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -155,7 +155,7 @@ export class RouterModule {
    * * `paramsInheritanceStrategy` defines how the router merges params, data and resolved data
    * from parent to child routes.
    */
-  static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders {
+  static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders<RouterModule> {
     return {
       ngModule: RouterModule,
       providers: [
@@ -193,7 +193,7 @@ export class RouterModule {
   /**
    * Creates a module with all the router directives and a provider registering routes.
    */
-  static forChild(routes: Routes): ModuleWithProviders {
+  static forChild(routes: Routes): ModuleWithProviders<RouterModule> {
     return {ngModule: RouterModule, providers: [provideRoutes(routes)]};
   }
 }
diff --git a/packages/router/testing/src/router_testing_module.ts b/packages/router/testing/src/router_testing_module.ts
index ef4c5ab387..4f2935a483 100644
--- a/packages/router/testing/src/router_testing_module.ts
+++ b/packages/router/testing/src/router_testing_module.ts
@@ -180,7 +180,8 @@ export function setupTestingRouter(
   ]
 })
 export class RouterTestingModule {
-  static withRoutes(routes: Routes, config?: ExtraOptions): ModuleWithProviders {
+  static withRoutes(routes: Routes, config?: ExtraOptions):
+      ModuleWithProviders<RouterTestingModule> {
     return {
       ngModule: RouterTestingModule,
       providers: [
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 09052c005c..dc2ebf8627 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -510,8 +510,8 @@ export declare class ModuleWithComponentFactories<T> {
     constructor(ngModuleFactory: NgModuleFactory<T>, componentFactories: ComponentFactory<any>[]);
 }
 
-export interface ModuleWithProviders {
-    ngModule: Type<any>;
+export interface ModuleWithProviders<T = any> {
+    ngModule: Type<T>;
     providers?: Provider[];
 }
 
diff --git a/tools/public_api_guard/forms/forms.d.ts b/tools/public_api_guard/forms/forms.d.ts
index 4af0d6af73..9defb7acc0 100644
--- a/tools/public_api_guard/forms/forms.d.ts
+++ b/tools/public_api_guard/forms/forms.d.ts
@@ -458,7 +458,7 @@ export declare class RadioControlValueAccessor implements ControlValueAccessor,
 
 export declare class ReactiveFormsModule {
     static withConfig(opts: { warnOnNgModelWithFormControl: 'never' | 'once' | 'always';
-    }): ModuleWithProviders;
+    }): ModuleWithProviders<ReactiveFormsModule>;
 }
 
 export declare class RequiredValidator implements Validator {
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
index 52231287f2..df3c1c135a 100644
--- a/tools/public_api_guard/platform-browser/platform-browser.d.ts
+++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts
@@ -2,7 +2,7 @@ export declare class BrowserModule {
     constructor(parentModule: BrowserModule | null);
     /** @experimental */ static withServerTransition(params: {
         appId: string;
-    }): ModuleWithProviders;
+    }): ModuleWithProviders<BrowserModule>;
 }
 
 /** @experimental */
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index 8965f82018..6575a15279 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -414,8 +414,8 @@ export declare class RouterLinkWithHref implements OnChanges, OnDestroy {
 
 export declare class RouterModule {
     constructor(guard: any, router: Router);
-    static forChild(routes: Routes): ModuleWithProviders;
-    static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders;
+    static forChild(routes: Routes): ModuleWithProviders<RouterModule>;
+    static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders<RouterModule>;
 }
 
 export declare class RouterOutlet implements OnDestroy, OnInit {
diff --git a/tools/public_api_guard/router/testing.d.ts b/tools/public_api_guard/router/testing.d.ts
index d401d5a72d..a6396352c0 100644
--- a/tools/public_api_guard/router/testing.d.ts
+++ b/tools/public_api_guard/router/testing.d.ts
@@ -1,5 +1,5 @@
 export declare class RouterTestingModule {
-    static withRoutes(routes: Routes, config?: ExtraOptions): ModuleWithProviders;
+    static withRoutes(routes: Routes, config?: ExtraOptions): ModuleWithProviders<RouterTestingModule>;
 }
 
 export declare function setupTestingRouter(urlSerializer: UrlSerializer, contexts: ChildrenOutletContexts, location: Location, loader: NgModuleFactoryLoader, compiler: Compiler, injector: Injector, routes: Route[][], opts?: ExtraOptions, urlHandlingStrategy?: UrlHandlingStrategy): Router;

From e346c3c2f22befdaeee663ef1efbd9a30b7379c5 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 9 Jul 2018 11:37:53 -0700
Subject: [PATCH 515/582] refactor(ivy): fix an unnecessarily deep import
 (#24862)

PR Close #24862
---
 packages/compiler-cli/src/ngtsc/annotations/src/directive.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 94ec30d397..2d460d28dd 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -10,8 +10,7 @@ import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileDirectiveFrom
 import * as ts from 'typescript';
 
 import {ClassMember, ClassMemberKind, Decorator, Import, ReflectionHost} from '../../host';
-import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
-import {filterToMembersWithDecorator} from '../../metadata/src/reflector';
+import {filterToMembersWithDecorator, reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';

From 8a986d4642a82734cda9624934ff96da86e42aa9 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 9 Jul 2018 11:39:15 -0700
Subject: [PATCH 516/582] feat(ivy): statically resolve template expressions
 (#24862)

This commit adds support for template substitution expressions for
ngtsc static resolution.

PR Close #24862
---
 .../src/ngtsc/metadata/src/resolver.ts         | 18 ++++++++++++++++++
 .../src/ngtsc/metadata/test/resolver_spec.ts   |  3 +++
 packages/compiler-cli/test/ngtsc/ngtsc_spec.ts |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index 9c3f7891f7..a63ec59081 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -258,6 +258,8 @@ class StaticInterpreter {
       return node.text;
     } else if (ts.isNoSubstitutionTemplateLiteral(node)) {
       return node.text;
+    } else if (ts.isTemplateExpression(node)) {
+      return this.visitTemplateExpression(node, context);
     } else if (ts.isNumericLiteral(node)) {
       return parseFloat(node.text);
     } else if (ts.isObjectLiteralExpression(node)) {
@@ -362,6 +364,22 @@ class StaticInterpreter {
     return this.visitSymbol(symbol, context);
   }
 
+  private visitTemplateExpression(node: ts.TemplateExpression, context: Context): ResolvedValue {
+    const pieces: string[] = [node.head.text];
+    for (let i = 0; i < node.templateSpans.length; i++) {
+      const span = node.templateSpans[i];
+      const value = this.visit(span.expression, context);
+      if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' ||
+          value == null) {
+        pieces.push(`${value}`);
+      } else {
+        return DYNAMIC_VALUE;
+      }
+      pieces.push(span.literal.text);
+    }
+    return pieces.join('');
+  }
+
   private visitSymbol(symbol: ts.Symbol, context: Context): ResolvedValue {
     let absoluteModuleName = context.absoluteModuleName;
     if (symbol.declarations !== undefined && symbol.declarations.length > 0) {
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
index 7a41ad3595..740dd1ea0c 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
@@ -249,4 +249,7 @@ describe('ngtsc metadata', () => {
                'obj.fn("test")'))
         .toEqual('test');
   });
+
+  it('template expressions work',
+     () => { expect(evaluate('const a = 2, b = 4;', '`1${a}3${b}5`')).toEqual('12345'); });
 });
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 3046f5dbc6..7ad4cf2ffa 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -345,7 +345,7 @@ describe('ngtsc behavioral tests', () => {
     expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [TestPipe,TestCmp], [], []>');
   });
 
-  it('should unwrap a ModuleWithProviders functoin if a generic type is provided for it', () => {
+  it('should unwrap a ModuleWithProviders function if a generic type is provided for it', () => {
     writeConfig();
     write(`test.ts`, `
         import {NgModule} from '@angular/core';

From 53a16006d65164ba0e354958bc0f93a278503850 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 9 Jul 2018 11:39:26 -0700
Subject: [PATCH 517/582] fix(ivy): export InheritDefinitionFeature (#24862)

PR Close #24862
---
 packages/core/src/core_render3_private_export.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index ee98d506bd..3d23effe0e 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -23,6 +23,7 @@ export {
   injectChangeDetectorRef as ɵinjectChangeDetectorRef,
   injectAttribute as ɵinjectAttribute,
   PublicFeature as ɵPublicFeature,
+  InheritDefinitionFeature as ɵInheritDefinitionFeature,
   NgOnChangesFeature as ɵNgOnChangesFeature,
   NgModuleDef as ɵNgModuleDef,
   NgModuleType as ɵNgModuleType,

From f9a6a175bfec6a8eb769f550ee361521ba8ffd92 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 10 Jul 2018 09:57:48 -0700
Subject: [PATCH 518/582] fix(ivy): properly inject all special token types
 (#24862)

Previously ngtsc had a few bugs handling special token types:

* Injector was not properly translated to INJECTOR
* ChangeDetectorRef was not injected via injectChangeDetectorRef()

This commit fixes these two bugs, and also adds a test to ensure
they continue to work correctly.

PR Close #24862
---
 .../src/ngtsc/annotations/src/util.ts         |  3 ++
 .../test/ngtsc/fake_core/index.ts             |  7 ++++
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 38 +++++++++++++++++++
 packages/compiler/src/render3/r3_factory.ts   |  9 ++++-
 .../compiler/src/render3/r3_identifiers.ts    |  3 ++
 5 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index 6322ddef86..fe82cfdfca 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -53,6 +53,9 @@ export function getConstructorDependencies(
       const importedSymbol = reflector.getImportOfIdentifier(tokenExpr);
       if (importedSymbol !== null && importedSymbol.from === '@angular/core') {
         switch (importedSymbol.name) {
+          case 'ChangeDetectorRef':
+            resolved = R3ResolvedDependencyType.ChangeDetectorRef;
+            break;
           case 'ElementRef':
             resolved = R3ResolvedDependencyType.ElementRef;
             break;
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index 7999ab1cc4..0735b5621a 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -22,8 +22,15 @@ export const Injectable = callableClassDecorator();
 export const NgModule = callableClassDecorator();
 export const Pipe = callableClassDecorator();
 
+export const Attribute = callableParamDecorator();
 export const Inject = callableParamDecorator();
 export const Self = callableParamDecorator();
 export const SkipSelf = callableParamDecorator();
 export const Optional = callableParamDecorator();
 export type ModuleWithProviders<T> = any;
+
+export class ChangeDetectorRef {}
+export class ElementRef {}
+export class Injector {}
+export class TemplateRef {}
+export class ViewContainerRef {}
\ No newline at end of file
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 7ad4cf2ffa..0d5fc832b5 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -370,4 +370,42 @@ describe('ngtsc behavioral tests', () => {
     expect(dtsContents).toContain(`import * as i1 from 'router';`);
     expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [], [i1.RouterModule], []>');
   });
+
+  it('should inject special types according to the metadata', () => {
+    writeConfig();
+    write(`test.ts`, `
+        import {
+          Attribute,
+          ChangeDetectorRef,
+          Component,
+          ElementRef,
+          Injector,
+          TemplateRef,
+          ViewContainerRef,
+        } from '@angular/core';
+
+        @Component({
+          selector: 'test',
+          template: 'Test',
+        })
+        class FooCmp {
+          constructor(
+            @Attribute("test") attr: string,
+            cdr: ChangeDetectorRef,
+            er: ElementRef,
+            i: Injector,
+            tr: TemplateRef,
+            vcr: ViewContainerRef,
+          ) {}
+        }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+    const jsContents = getContents('test.js');
+    expect(jsContents)
+        .toContain(
+            `factory: function FooCmp_Factory() { return new FooCmp(i0.ɵinjectAttribute("test"), i0.ɵinjectChangeDetectorRef(), i0.ɵinjectElementRef(), i0.ɵdirectiveInject(i0.INJECTOR), i0.ɵinjectTemplateRef(), i0.ɵinjectViewContainerRef()); }`);
+  });
 });
diff --git a/packages/compiler/src/render3/r3_factory.ts b/packages/compiler/src/render3/r3_factory.ts
index 178434026d..ba50ae1550 100644
--- a/packages/compiler/src/render3/r3_factory.ts
+++ b/packages/compiler/src/render3/r3_factory.ts
@@ -106,6 +106,11 @@ export enum R3ResolvedDependencyType {
    * The dependency is for `ViewContainerRef`.
    */
   ViewContainerRef = 5,
+
+  /**
+   * The dependency is for `ChangeDetectorRef`.
+   */
+  ChangeDetectorRef = 6,
 }
 
 /**
@@ -182,7 +187,7 @@ function compileInjectDependency(
       }
 
       // Build up the arguments to the injectFn call.
-      const injectArgs = [dep.token];
+      const injectArgs = [token];
       // If this dependency is optional or otherwise has non-default flags, then additional
       // parameters describing how to inject the dependency must be passed to the inject function
       // that's being used.
@@ -200,6 +205,8 @@ function compileInjectDependency(
       return o.importExpr(R3.injectTemplateRef).callFn([]);
     case R3ResolvedDependencyType.ViewContainerRef:
       return o.importExpr(R3.injectViewContainerRef).callFn([]);
+    case R3ResolvedDependencyType.ChangeDetectorRef:
+      return o.importExpr(R3.injectChangeDetectorRef).callFn([]);
     default:
       return unsupported(
           `Unknown R3ResolvedDependencyType: ${R3ResolvedDependencyType[dep.resolved]}`);
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 698326b6a8..72f2f30ba0 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -97,6 +97,9 @@ export class Identifiers {
   static injectViewContainerRef:
       o.ExternalReference = {name: 'ɵinjectViewContainerRef', moduleName: CORE};
 
+  static injectChangeDetectorRef:
+      o.ExternalReference = {name: 'ɵinjectChangeDetectorRef', moduleName: CORE};
+
   static directiveInject: o.ExternalReference = {name: 'ɵdirectiveInject', moduleName: CORE};
 
   static defineComponent: o.ExternalReference = {name: 'ɵdefineComponent', moduleName: CORE};

From 42d42871538e33285cca83d5a9e85f2c6ebf4401 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 10 Jul 2018 09:59:29 -0700
Subject: [PATCH 519/582] fix(ivy): ngInjectorDef should copy full
 imports/exports nodes (#24862)

@NgModule()s get compiled to two fields: ngModuleDef and ngInjectorDef.
Both fields contain imports, as both selector scopes and injectors have
the concept of composed units of configuration. Previously these fields
were generated by static resolution of imports and exports in metadata.

Support for ModuleWithProviders requires they be generated differently.
ngModuleDef's imports/exports are generated as resolved lists of types,
whereas ngInjectorDef's imports should reflect the raw expressions that
the developer wrote in the metadata.

This change modifies the NgModule handler and properly copies raw nodes
for the imports and exports into the ngInjectorDef.

PR Close #24862
---
 .../src/ngtsc/annotations/src/ng_module.ts            | 11 +++++++++--
 packages/compiler-cli/test/ngtsc/ngtsc_spec.ts        |  6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index aac8f1bfef..bd4153ca20 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -96,12 +96,19 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
         new WrappedNodeExpr(ngModule.get('providers') !) :
         new LiteralArrayExpr([]);
 
+    const injectorImports: WrappedNodeExpr<ts.Expression>[] = [];
+    if (ngModule.has('imports')) {
+      injectorImports.push(new WrappedNodeExpr(ngModule.get('imports') !));
+    }
+    if (ngModule.has('exports')) {
+      injectorImports.push(new WrappedNodeExpr(ngModule.get('exports') !));
+    }
+
     const ngInjectorDef: R3InjectorMetadata = {
       name: node.name !.text,
       type: new WrappedNodeExpr(node.name !),
       deps: getConstructorDependencies(node, this.reflector, this.isCore), providers,
-      imports: new LiteralArrayExpr(
-          [...imports, ...exports].map(imp => referenceToExpression(imp, context))),
+      imports: new LiteralArrayExpr(injectorImports),
     };
 
     return {
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 0d5fc832b5..eb5e1623b0 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -236,7 +236,7 @@ describe('ngtsc behavioral tests', () => {
         .toContain(
             `TestModule.ngInjectorDef = i0.defineInjector({ factory: ` +
             `function TestModule_Factory() { return new TestModule(); }, providers: [{ provide: ` +
-            `Token, useValue: 'test' }], imports: [OtherModule] });`);
+            `Token, useValue: 'test' }], imports: [[OtherModule]] });`);
 
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents)
@@ -366,6 +366,10 @@ describe('ngtsc behavioral tests', () => {
     const exitCode = main(['-p', basePath], errorSpy);
     expect(errorSpy).not.toHaveBeenCalled();
     expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain('imports: [[RouterModule.forRoot()]]');
+
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents).toContain(`import * as i1 from 'router';`);
     expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [], [i1.RouterModule], []>');

From ae4563202c9de3c63596e99b3f6aab3bd8633852 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 10 Jul 2018 10:00:06 -0700
Subject: [PATCH 520/582] fix(ivy): export NgModuleFactory adapter (#24862)

PR Close #24862
---
 packages/core/src/core_render3_private_export.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 3d23effe0e..0bbf7810e3 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -29,6 +29,7 @@ export {
   NgModuleType as ɵNgModuleType,
   CssSelectorList as ɵCssSelectorList,
   markDirty as ɵmarkDirty,
+  NgModuleFactory as ɵNgModuleFactory,
   NC as ɵNC,
   C as ɵC,
   E as ɵE,

From 964487302301cddc218cce339a5c1b49d1dc3f70 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 10 Jul 2018 10:01:30 -0700
Subject: [PATCH 521/582] fix(ivy): ignore imports without ngInjectorDef in
 r3_injector (#24862)

ngInjectorDef.imports is generated from @NgModule.imports plus
@NgModule.exports. A problem arises as a result, because @NgModule
exports contain not only other modules (which will have ngInjectorDef
fields), but components, directives, and pipes as well. Because of
locality, it's difficult for the compiler to filter these out at
build time.

It's not impossible, but for now filtering them out at runtime will
allow testing of the compiler against complex applications.

PR Close #24862
---
 packages/core/src/di/r3_injector.ts       | 11 ++++++++---
 packages/core/test/di/r3_injector_spec.ts | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index 28742c19a2..e8dcdf42ef 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -231,9 +231,9 @@ export class R3Injector {
       def = ngModule.ngInjectorDef;
     }
 
-    // If no definition was found, throw.
+    // If no definition was found, it might be from exports. Remove it.
     if (def == null) {
-      throw new Error(`Type ${stringify(defType)} is missing an ngInjectorDef definition.`);
+      return;
     }
 
     // Check for circular dependencies.
@@ -333,7 +333,12 @@ export class R3Injector {
 function injectableDefRecord(token: Type<any>| InjectionToken<any>): Record<any> {
   const def = (token as InjectableType<any>).ngInjectableDef as InjectableDef<any>;
   if (def === undefined) {
-    throw new Error(`Type ${stringify(token)} is missing an ngInjectableDef definition.`);
+    if (token instanceof InjectionToken) {
+      throw new Error(`Token ${stringify(token)} is missing an ngInjectableDef definition.`);
+    }
+    // TODO(alxhub): there should probably be a strict mode which throws here instead of assuming a
+    // no-args constructor.
+    return makeRecord(() => new (token as Type<any>)());
   }
   return makeRecord(def.factory);
 }
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 5e690b2f86..5f7a59124c 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -143,6 +143,16 @@ describe('InjectorDef-based createInjector()', () => {
     });
   }
 
+  class NotAModule {}
+
+  class ImportsNotAModule {
+    static ngInjectorDef = defineInjector({
+      factory: () => new ImportsNotAModule(),
+      imports: [NotAModule],
+      providers: [],
+    });
+  }
+
   class ScopedService {
     static ngInjectableDef = defineInjectable({
       providedIn: Module,
@@ -241,4 +251,9 @@ describe('InjectorDef-based createInjector()', () => {
     expect(() => (injector as R3Injector).destroy())
         .toThrowError('Injector has already been destroyed.');
   });
+
+  it('should not crash when importing something that has no ngInjectorDef', () => {
+    injector = createInjector(ImportsNotAModule);
+    expect(injector.get(ImportsNotAModule)).toBeDefined();
+  });
 });

From 6eb6ac7c12c020ad027baf6fec3405e07de6a165 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 11 Jul 2018 12:11:19 -0700
Subject: [PATCH 522/582] fix(ivy): fix a couple issues with Input/Output
 compilation (#24862)

PR Close #24862
---
 .../compiler-cli/src/ngtsc/annotations/src/directive.ts     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 2d460d28dd..a28e72907f 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -80,17 +80,19 @@ export function extractDirectiveMetadata(
   const decoratedElements =
       members.filter(member => !member.isStatic && member.decorators !== null);
 
+  const coreModule = isCore ? undefined : '@angular/core';
+
   // Construct the map of inputs both from the @Directive/@Component
   // decorator, and the decorated
   // fields.
   const inputsFromMeta = parseFieldToPropertyMapping(directive, 'inputs', checker);
   const inputsFromFields = parseDecoratedFields(
-      filterToMembersWithDecorator(decoratedElements, 'Input', '@angular/core'), checker);
+      filterToMembersWithDecorator(decoratedElements, 'Input', coreModule), checker);
 
   // And outputs.
   const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', checker);
   const outputsFromFields = parseDecoratedFields(
-      filterToMembersWithDecorator(decoratedElements, '@angular/core', 'Output'), checker);
+      filterToMembersWithDecorator(decoratedElements, 'Output', coreModule), checker);
 
   // Parse the selector.
   let selector = '';

From 76f8f7892035ca4781d33b4242be70550a7d0ab8 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 18 Jul 2018 09:32:36 -0700
Subject: [PATCH 523/582] feat(ivy): compile queries in ngtsc (#24862)

This commit adds support for @ContentChild[ren] and @ViewChild[ren] in
ngtsc. Previously queries were ignored.

PR Close #24862
---
 .../src/ngtsc/annotations/src/component.ts    |  32 ++--
 .../src/ngtsc/annotations/src/directive.ts    | 152 ++++++++++++++++--
 .../test/ngtsc/fake_core/index.ts             |  15 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     |  32 ++++
 4 files changed, 211 insertions(+), 20 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index f62a492330..435d712ead 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -11,11 +11,11 @@ import * as path from 'path';
 import * as ts from 'typescript';
 
 import {Decorator, ReflectionHost} from '../../host';
-import {reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {filterToMembersWithDecorator, reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {ResourceLoader} from './api';
-import {extractDirectiveMetadata} from './directive';
+import {extractDirectiveMetadata, extractQueriesFromDecorator, queriesFromFields} from './directive';
 import {SelectorScopeRegistry} from './selector_scope';
 import {isAngularCore, unwrapExpression} from './util';
 
@@ -59,9 +59,9 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
 
     // @Component inherits @Directive, so begin by extracting the @Directive metadata and building
     // on it.
-    const directiveMetadata =
+    const directiveResult =
         extractDirectiveMetadata(node, decorator, this.checker, this.reflector, this.isCore);
-    if (directiveMetadata === undefined) {
+    if (directiveResult === undefined) {
       // `extractDirectiveMetadata` returns undefined when the @Directive has `jit: true`. In this
       // case, compilation of the decorator is skipped. Returning an empty object signifies
       // that no analysis was produced.
@@ -69,7 +69,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     }
 
     // Next, read the `@Component`-specific fields.
-    const component = reflectObjectLiteral(meta);
+    const {decoratedElements, decorator: component, metadata} = directiveResult;
 
     let templateStr: string|null = null;
     if (component.has('templateUrl')) {
@@ -109,15 +109,29 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
 
     // If the component has a selector, it should be registered with the `SelectorScopeRegistry` so
     // when this component appears in an `@NgModule` scope, its selector can be determined.
-    if (directiveMetadata.selector !== null) {
-      this.scopeRegistry.registerSelector(node, directiveMetadata.selector);
+    if (metadata.selector !== null) {
+      this.scopeRegistry.registerSelector(node, metadata.selector);
+    }
+
+    // Construct the list of view queries.
+    const coreModule = this.isCore ? undefined : '@angular/core';
+    const viewChildFromFields = queriesFromFields(
+        filterToMembersWithDecorator(decoratedElements, 'ViewChild', coreModule), this.checker);
+    const viewChildrenFromFields = queriesFromFields(
+        filterToMembersWithDecorator(decoratedElements, 'ViewChildren', coreModule), this.checker);
+    const viewQueries = [...viewChildFromFields, ...viewChildrenFromFields];
+
+    if (component.has('queries')) {
+      const queriesFromDecorator = extractQueriesFromDecorator(
+          component.get('queries') !, this.reflector, this.checker, this.isCore);
+      viewQueries.push(...queriesFromDecorator.view);
     }
 
     return {
       analysis: {
-        ...directiveMetadata,
+        ...metadata,
         template,
-        viewQueries: [],
+        viewQueries,
 
         // These will be replaced during the compilation step, after all `NgModule`s have been
         // analyzed and the full compilation scope for the component can be realized.
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index a28e72907f..0b4b0d4086 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ConstantPool, R3DirectiveMetadata, WrappedNodeExpr, compileDirectiveFromMetadata, makeBindingParser} from '@angular/compiler';
+import {ConstantPool, Expression, R3DirectiveMetadata, R3QueryMetadata, WrappedNodeExpr, compileDirectiveFromMetadata, makeBindingParser} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {ClassMember, ClassMemberKind, Decorator, Import, ReflectionHost} from '../../host';
-import {filterToMembersWithDecorator, reflectObjectLiteral, staticallyResolve} from '../../metadata';
+import {Reference, filterToMembersWithDecorator, reflectObjectLiteral, staticallyResolve} from '../../metadata';
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
@@ -29,8 +29,9 @@ export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMe
   }
 
   analyze(node: ts.ClassDeclaration, decorator: Decorator): AnalysisOutput<R3DirectiveMetadata> {
-    const analysis =
+    const directiveResult =
         extractDirectiveMetadata(node, decorator, this.checker, this.reflector, this.isCore);
+    const analysis = directiveResult && directiveResult.metadata;
 
     // If the directive has a selector, it should be registered with the `SelectorScopeRegistry` so
     // when this directive appears in an `@NgModule` scope, its selector can be determined.
@@ -58,7 +59,11 @@ export class DirectiveDecoratorHandler implements DecoratorHandler<R3DirectiveMe
  */
 export function extractDirectiveMetadata(
     clazz: ts.ClassDeclaration, decorator: Decorator, checker: ts.TypeChecker,
-    reflector: ReflectionHost, isCore: boolean): R3DirectiveMetadata|undefined {
+    reflector: ReflectionHost, isCore: boolean): {
+  decorator: Map<string, ts.Expression>,
+  metadata: R3DirectiveMetadata,
+  decoratedElements: ClassMember[],
+}|undefined {
   if (decorator.args === null || decorator.args.length !== 1) {
     throw new Error(`Incorrect number of arguments to @${decorator.name} decorator`);
   }
@@ -93,6 +98,19 @@ export function extractDirectiveMetadata(
   const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', checker);
   const outputsFromFields = parseDecoratedFields(
       filterToMembersWithDecorator(decoratedElements, 'Output', coreModule), checker);
+  // Construct the list of queries.
+  const contentChildFromFields = queriesFromFields(
+      filterToMembersWithDecorator(decoratedElements, 'ContentChild', coreModule), checker);
+  const contentChildrenFromFields = queriesFromFields(
+      filterToMembersWithDecorator(decoratedElements, 'ContentChildren', coreModule), checker);
+
+  const queries = [...contentChildFromFields, ...contentChildrenFromFields];
+
+  if (directive.has('queries')) {
+    const queriesFromDecorator =
+        extractQueriesFromDecorator(directive.get('queries') !, reflector, checker, isCore);
+    queries.push(...queriesFromDecorator.content);
+  }
 
   // Parse the selector.
   let selector = '';
@@ -112,7 +130,7 @@ export function extractDirectiveMetadata(
   // Detect if the component inherits from another class
   const usesInheritance = clazz.heritageClauses !== undefined &&
       clazz.heritageClauses.some(hc => hc.token === ts.SyntaxKind.ExtendsKeyword);
-  return {
+  const metadata: R3DirectiveMetadata = {
     name: clazz.name !.text,
     deps: getConstructorDependencies(clazz, reflector, isCore),
     host: {
@@ -124,17 +142,105 @@ export function extractDirectiveMetadata(
         usesOnChanges,
     },
     inputs: {...inputsFromMeta, ...inputsFromFields},
-    outputs: {...outputsFromMeta, ...outputsFromFields},
-    queries: [], selector,
+    outputs: {...outputsFromMeta, ...outputsFromFields}, queries, selector,
     type: new WrappedNodeExpr(clazz.name !),
     typeSourceSpan: null !, usesInheritance,
   };
+  return {decoratedElements, decorator: directive, metadata};
 }
 
-function assertIsStringArray(value: any[]): value is string[] {
+export function extractQueryMetadata(
+    name: string, args: ReadonlyArray<ts.Expression>, propertyName: string,
+    checker: ts.TypeChecker): R3QueryMetadata {
+  if (args.length === 0) {
+    throw new Error(`@${name} must have arguments`);
+  }
+  const first = name === 'ViewChild' || name === 'ContentChild';
+  const arg = staticallyResolve(args[0], checker);
+
+  // Extract the predicate
+  let predicate: Expression|string[]|null = null;
+  if (arg instanceof Reference) {
+    predicate = new WrappedNodeExpr(args[0]);
+  } else if (typeof arg === 'string') {
+    predicate = [arg];
+  } else if (isStringArrayOrDie(arg, '@' + name)) {
+    predicate = arg as string[];
+  } else {
+    throw new Error(`@${name} predicate cannot be interpreted`);
+  }
+
+  // Extract the read and descendants options.
+  let read: Expression|null = null;
+  // The default value for descendants is true for every decorator except @ContentChildren.
+  let descendants: boolean = name !== 'ContentChildren';
+  if (args.length === 2) {
+    const optionsExpr = unwrapExpression(args[1]);
+    if (!ts.isObjectLiteralExpression(optionsExpr)) {
+      throw new Error(`@${name} options must be an object literal`);
+    }
+    const options = reflectObjectLiteral(optionsExpr);
+    if (options.has('read')) {
+      read = new WrappedNodeExpr(options.get('read') !);
+    }
+
+    if (options.has('descendants')) {
+      const descendantsValue = staticallyResolve(options.get('descendants') !, checker);
+      if (typeof descendantsValue !== 'boolean') {
+        throw new Error(`@${name} options.descendants must be a boolean`);
+      }
+      descendants = descendantsValue;
+    }
+  } else if (args.length > 2) {
+    // Too many arguments.
+    throw new Error(`@${name} has too many arguments`);
+  }
+
+  return {
+      propertyName, predicate, first, descendants, read,
+  };
+}
+
+export function extractQueriesFromDecorator(
+    queryData: ts.Expression, reflector: ReflectionHost, checker: ts.TypeChecker,
+    isCore: boolean): {
+  content: R3QueryMetadata[],
+  view: R3QueryMetadata[],
+} {
+  const content: R3QueryMetadata[] = [], view: R3QueryMetadata[] = [];
+  const expr = unwrapExpression(queryData);
+  if (!ts.isObjectLiteralExpression(queryData)) {
+    throw new Error(`queries metadata must be an object literal`);
+  }
+  reflectObjectLiteral(queryData).forEach((queryExpr, propertyName) => {
+    queryExpr = unwrapExpression(queryExpr);
+    if (!ts.isNewExpression(queryExpr) || !ts.isIdentifier(queryExpr.expression)) {
+      throw new Error(`query metadata must be an instance of a query type`);
+    }
+    const type = reflector.getImportOfIdentifier(queryExpr.expression);
+    if (type === null || (!isCore && type.from !== '@angular/core') ||
+        !QUERY_TYPES.has(type.name)) {
+      throw new Error(`query metadata must be an instance of a query type`);
+    }
+
+    const query = extractQueryMetadata(type.name, queryExpr.arguments || [], propertyName, checker);
+    if (type.name.startsWith('Content')) {
+      content.push(query);
+    } else {
+      view.push(query);
+    }
+  });
+  return {content, view};
+}
+
+function isStringArrayOrDie(value: any, name: string): value is string[] {
+  if (!Array.isArray(value)) {
+    return false;
+  }
+
   for (let i = 0; i < value.length; i++) {
     if (typeof value[i] !== 'string') {
-      throw new Error(`Failed to resolve @Directive.inputs[${i}] to a string`);
+      throw new Error(`Failed to resolve ${name}[${i}] to a string`);
     }
   }
   return true;
@@ -153,7 +259,7 @@ function parseFieldToPropertyMapping(
 
   // Resolve the field of interest from the directive metadata to a string[].
   const metaValues = staticallyResolve(directive.get(field) !, checker);
-  if (!Array.isArray(metaValues) || !assertIsStringArray(metaValues)) {
+  if (!isStringArrayOrDie(metaValues, field)) {
     throw new Error(`Failed to resolve @Directive.${field}`);
   }
 
@@ -199,3 +305,29 @@ function parseDecoratedFields(
       },
       {} as{[field: string]: string});
 }
+
+export function queriesFromFields(
+    fields: {member: ClassMember, decorators: Decorator[]}[],
+    checker: ts.TypeChecker): R3QueryMetadata[] {
+  return fields.map(({member, decorators}) => {
+    if (decorators.length !== 1) {
+      throw new Error(`Cannot have multiple query decorators on the same class member`);
+    } else if (!isPropertyTypeMember(member)) {
+      throw new Error(`Query decorator must go on a property-type member`);
+    }
+    const decorator = decorators[0];
+    return extractQueryMetadata(decorator.name, decorator.args || [], member.name, checker);
+  });
+}
+
+function isPropertyTypeMember(member: ClassMember): boolean {
+  return member.kind === ClassMemberKind.Getter || member.kind === ClassMemberKind.Setter ||
+      member.kind === ClassMemberKind.Property;
+}
+
+const QUERY_TYPES = new Set([
+  'ContentChild',
+  'ContentChildren',
+  'ViewChild',
+  'ViewChildren',
+]);
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index 0735b5621a..de31c8b04c 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -6,7 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-type FnWithArg<T> = (arg?: any) => T;
+interface FnWithArg<T> {
+  (...args: any[]): T;
+  new (...args: any[]): T;
+}
 
 function callableClassDecorator(): FnWithArg<(clazz: any) => any> {
   return null !;
@@ -16,6 +19,10 @@ function callableParamDecorator(): FnWithArg<(a: any, b: any, c: any) => void> {
   return null !;
 }
 
+function callablePropDecorator(): FnWithArg<(a: any, b: any) => any> {
+  return null !;
+}
+
 export const Component = callableClassDecorator();
 export const Directive = callableClassDecorator();
 export const Injectable = callableClassDecorator();
@@ -27,6 +34,12 @@ export const Inject = callableParamDecorator();
 export const Self = callableParamDecorator();
 export const SkipSelf = callableParamDecorator();
 export const Optional = callableParamDecorator();
+
+export const ContentChild = callablePropDecorator();
+export const ContentChildren = callablePropDecorator();
+export const ViewChild = callablePropDecorator();
+export const ViewChildren = callablePropDecorator();
+
 export type ModuleWithProviders<T> = any;
 
 export class ChangeDetectorRef {}
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index eb5e1623b0..82a019f025 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -412,4 +412,36 @@ describe('ngtsc behavioral tests', () => {
         .toContain(
             `factory: function FooCmp_Factory() { return new FooCmp(i0.ɵinjectAttribute("test"), i0.ɵinjectChangeDetectorRef(), i0.ɵinjectElementRef(), i0.ɵdirectiveInject(i0.INJECTOR), i0.ɵinjectTemplateRef(), i0.ɵinjectViewContainerRef()); }`);
   });
+
+  it('should generate queries for components', () => {
+    writeConfig();
+    write(`test.ts`, `
+        import {Component, ContentChild, ContentChildren, TemplateRef, ViewChild} from '@angular/core';
+
+        @Component({
+          selector: 'test',
+          template: '<div #foo></div>',
+          queries: {
+            'mview': new ViewChild('test1'),
+            'mcontent': new ContentChild('test2'),
+          }
+        })
+        class FooCmp {
+          @ContentChild('bar', {read: TemplateRef}) child: any;
+          @ContentChildren(TemplateRef) children: any;
+          get aview(): any { return null; }
+          @ViewChild('accessor') set aview(value: any) {}
+        }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain(`i0.ɵQ(null, ["bar"], true, TemplateRef)`);
+    expect(jsContents).toContain(`i0.ɵQ(null, TemplateRef, false)`);
+    expect(jsContents).toContain(`i0.ɵQ(null, ["test2"], true)`);
+    expect(jsContents).toContain(`i0.ɵQ(0, ["accessor"], true)`);
+    expect(jsContents).toContain(`i0.ɵQ(1, ["test1"], true)`);
+  });
 });

From 2e724ec68bb4c1b60494e2a931b4da08c862af0c Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 18 Jul 2018 09:50:16 -0700
Subject: [PATCH 524/582] feat(ivy): support host bindings in ngtsc (#24862)

This change adds support for host bindings to ngtsc, and parses them
both from decorators and from the metadata in the top-level annotation.

PR Close #24862
---
 .../src/ngtsc/annotations/src/directive.ts    | 91 +++++++++++++++++--
 .../test/ngtsc/fake_core/index.ts             |  2 +
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 37 ++++++++
 3 files changed, 123 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 0b4b0d4086..625e429861 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ConstantPool, Expression, R3DirectiveMetadata, R3QueryMetadata, WrappedNodeExpr, compileDirectiveFromMetadata, makeBindingParser} from '@angular/compiler';
+import {ConstantPool, Expression, R3DirectiveMetadata, R3QueryMetadata, WrappedNodeExpr, compileDirectiveFromMetadata, makeBindingParser, parseHostBindings} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {ClassMember, ClassMemberKind, Decorator, Import, ReflectionHost} from '../../host';
@@ -122,6 +122,8 @@ export function extractDirectiveMetadata(
     selector = resolved;
   }
 
+  const host = extractHostBindings(directive, decoratedElements, checker, coreModule);
+
   // Determine if `ngOnChanges` is a lifecycle hook defined on the component.
   const usesOnChanges = members.find(
                             member => member.isStatic && member.kind === ClassMemberKind.Method &&
@@ -132,12 +134,7 @@ export function extractDirectiveMetadata(
       clazz.heritageClauses.some(hc => hc.token === ts.SyntaxKind.ExtendsKeyword);
   const metadata: R3DirectiveMetadata = {
     name: clazz.name !.text,
-    deps: getConstructorDependencies(clazz, reflector, isCore),
-    host: {
-      attributes: {},
-      listeners: {},
-      properties: {},
-    },
+    deps: getConstructorDependencies(clazz, reflector, isCore), host,
     lifecycle: {
         usesOnChanges,
     },
@@ -325,6 +322,86 @@ function isPropertyTypeMember(member: ClassMember): boolean {
       member.kind === ClassMemberKind.Property;
 }
 
+type StringMap = {
+  [key: string]: string
+};
+
+function extractHostBindings(
+    metadata: Map<string, ts.Expression>, members: ClassMember[], checker: ts.TypeChecker,
+    coreModule: string | undefined): {
+  attributes: StringMap,
+  listeners: StringMap,
+  properties: StringMap,
+} {
+  let hostMetadata: StringMap = {};
+  if (metadata.has('host')) {
+    const hostMetaMap = staticallyResolve(metadata.get('host') !, checker);
+    if (!(hostMetaMap instanceof Map)) {
+      throw new Error(`Decorator host metadata must be an object`);
+    }
+    hostMetaMap.forEach((value, key) => {
+      if (typeof value !== 'string' || typeof key !== 'string') {
+        throw new Error(`Decorator host metadata must be a string -> string object, got ${value}`);
+      }
+      hostMetadata[key] = value;
+    });
+  }
+
+  const {attributes, listeners, properties, animations} = parseHostBindings(hostMetadata);
+
+  filterToMembersWithDecorator(members, 'HostBinding', coreModule)
+      .forEach(({member, decorators}) => {
+        decorators.forEach(decorator => {
+          let hostPropertyName: string = member.name;
+          if (decorator.args !== null && decorator.args.length > 0) {
+            if (decorator.args.length !== 1) {
+              throw new Error(`@HostBinding() can have at most one argument`);
+            }
+
+            const resolved = staticallyResolve(decorator.args[0], checker);
+            if (typeof resolved !== 'string') {
+              throw new Error(`@HostBinding()'s argument must be a string`);
+            }
+
+            hostPropertyName = resolved;
+          }
+
+          properties[hostPropertyName] = member.name;
+        });
+      });
+
+  filterToMembersWithDecorator(members, 'HostListener', coreModule)
+      .forEach(({member, decorators}) => {
+        decorators.forEach(decorator => {
+          let eventName: string = member.name;
+          let args: string[] = [];
+          if (decorator.args !== null && decorator.args.length > 0) {
+            if (decorator.args.length > 2) {
+              throw new Error(`@HostListener() can have at most two arguments`);
+            }
+
+            const resolved = staticallyResolve(decorator.args[0], checker);
+            if (typeof resolved !== 'string') {
+              throw new Error(`@HostListener()'s event name argument must be a string`);
+            }
+
+            eventName = resolved;
+
+            if (decorator.args.length === 2) {
+              const resolvedArgs = staticallyResolve(decorator.args[1], checker);
+              if (!isStringArrayOrDie(resolvedArgs, '@HostListener.args')) {
+                throw new Error(`@HostListener second argument must be a string array`);
+              }
+              args = resolvedArgs;
+            }
+          }
+
+          listeners[eventName] = `${member.name}(${args.join(',')})`;
+        });
+      });
+  return {attributes, properties, listeners};
+}
+
 const QUERY_TYPES = new Set([
   'ContentChild',
   'ContentChildren',
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index de31c8b04c..e20fecbc82 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -37,6 +37,8 @@ export const Optional = callableParamDecorator();
 
 export const ContentChild = callablePropDecorator();
 export const ContentChildren = callablePropDecorator();
+export const HostBinding = callablePropDecorator();
+export const HostListener = callablePropDecorator();
 export const ViewChild = callablePropDecorator();
 export const ViewChildren = callablePropDecorator();
 
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 82a019f025..7934243bc2 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -444,4 +444,41 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain(`i0.ɵQ(0, ["accessor"], true)`);
     expect(jsContents).toContain(`i0.ɵQ(1, ["test1"], true)`);
   });
+
+  it('should generate host bindings for directives', () => {
+    writeConfig();
+    write(`test.ts`, `
+        import {Component, HostBinding, HostListener, TemplateRef} from '@angular/core';
+
+        @Component({
+          selector: 'test',
+          template: 'Test',
+          host: {
+            '[attr.hello]': 'foo',
+            '(click)': 'onClick($event)',
+            '[prop]': 'bar',
+          },
+        })
+        class FooCmp {
+          onClick(event: any): void {}
+
+          @HostBinding('class.someclass')
+          get someClass(): boolean { return false; }
+
+          @HostListener('onChange', ['arg'])
+          onChange(event: any, arg: any): void {}
+        }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain(`i0.ɵp(elIndex, "attr.hello", i0.ɵb(i0.ɵd(dirIndex).foo));`);
+    expect(jsContents).toContain(`i0.ɵp(elIndex, "prop", i0.ɵb(i0.ɵd(dirIndex).bar));`);
+    expect(jsContents)
+        .toContain('i0.ɵp(elIndex, "class.someclass", i0.ɵb(i0.ɵd(dirIndex).someClass))');
+    expect(jsContents).toContain('i0.ɵd(dirIndex).onClick($event)');
+    expect(jsContents).toContain('i0.ɵd(dirIndex).onChange(i0.ɵd(dirIndex).arg)');
+  });
 });

From 5d7005eef5afdf62aa2e245b4134f240ad509c24 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 12 Jul 2018 12:11:18 -0700
Subject: [PATCH 525/582] feat(ivy): port the static resolver to use the
 ReflectionHost (#24862)

Previously, the static resolver did its own interpretation of statements
in the TypeScript AST, which only functioned on TypeScript code. ES5
code in particular would not work with the resolver as it had hard-coded
assumptions about AST structure.

This commit changes the resolver to use a ReflectionHost instead, which
abstracts away understanding of the structural side of the AST. It adds 3
new methods to the ReflectionHost in support of this functionality:

* getDeclarationOfIdentifier
* getExportsOfModule
* isClass

PR Close #24862
---
 .../src/ngtsc/annotations/src/component.ts    |  17 ++-
 .../src/ngtsc/annotations/src/directive.ts    |  52 ++++----
 .../src/ngtsc/annotations/src/ng_module.ts    |   7 +-
 .../src/ngtsc/annotations/src/pipe.ts         |   4 +-
 .../src/ngtsc/host/src/reflection.ts          | 124 +++++++++++++++++-
 .../src/ngtsc/metadata/src/reflector.ts       |  99 +++++++++++++-
 .../src/ngtsc/metadata/src/resolver.ts        | 107 ++++++---------
 .../src/ngtsc/metadata/test/reflector_spec.ts |  42 ++++++
 .../src/ngtsc/metadata/test/resolver_spec.ts  |  22 +++-
 9 files changed, 353 insertions(+), 121 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index 435d712ead..989152dcea 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -43,7 +43,8 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     const component = reflectObjectLiteral(meta);
 
     if (this.resourceLoader.preload !== undefined && component.has('templateUrl')) {
-      const templateUrl = staticallyResolve(component.get('templateUrl') !, this.checker);
+      const templateUrl =
+          staticallyResolve(component.get('templateUrl') !, this.reflector, this.checker);
       if (typeof templateUrl !== 'string') {
         throw new Error(`templateUrl should be a string`);
       }
@@ -73,7 +74,8 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
 
     let templateStr: string|null = null;
     if (component.has('templateUrl')) {
-      const templateUrl = staticallyResolve(component.get('templateUrl') !, this.checker);
+      const templateUrl =
+          staticallyResolve(component.get('templateUrl') !, this.reflector, this.checker);
       if (typeof templateUrl !== 'string') {
         throw new Error(`templateUrl should be a string`);
       }
@@ -81,7 +83,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
       templateStr = this.resourceLoader.load(url);
     } else if (component.has('template')) {
       const templateExpr = component.get('template') !;
-      const resolvedTemplate = staticallyResolve(templateExpr, this.checker);
+      const resolvedTemplate = staticallyResolve(templateExpr, this.reflector, this.checker);
       if (typeof resolvedTemplate !== 'string') {
         throw new Error(`Template must statically resolve to a string: ${node.name!.text}`);
       }
@@ -92,7 +94,8 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
 
     let preserveWhitespaces: boolean = false;
     if (component.has('preserveWhitespaces')) {
-      const value = staticallyResolve(component.get('preserveWhitespaces') !, this.checker);
+      const value =
+          staticallyResolve(component.get('preserveWhitespaces') !, this.reflector, this.checker);
       if (typeof value !== 'boolean') {
         throw new Error(`preserveWhitespaces must resolve to a boolean if present`);
       }
@@ -116,9 +119,11 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     // Construct the list of view queries.
     const coreModule = this.isCore ? undefined : '@angular/core';
     const viewChildFromFields = queriesFromFields(
-        filterToMembersWithDecorator(decoratedElements, 'ViewChild', coreModule), this.checker);
+        filterToMembersWithDecorator(decoratedElements, 'ViewChild', coreModule), this.reflector,
+        this.checker);
     const viewChildrenFromFields = queriesFromFields(
-        filterToMembersWithDecorator(decoratedElements, 'ViewChildren', coreModule), this.checker);
+        filterToMembersWithDecorator(decoratedElements, 'ViewChildren', coreModule), this.reflector,
+        this.checker);
     const viewQueries = [...viewChildFromFields, ...viewChildrenFromFields];
 
     if (component.has('queries')) {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 625e429861..69a4ad1d33 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -90,19 +90,21 @@ export function extractDirectiveMetadata(
   // Construct the map of inputs both from the @Directive/@Component
   // decorator, and the decorated
   // fields.
-  const inputsFromMeta = parseFieldToPropertyMapping(directive, 'inputs', checker);
+  const inputsFromMeta = parseFieldToPropertyMapping(directive, 'inputs', reflector, checker);
   const inputsFromFields = parseDecoratedFields(
-      filterToMembersWithDecorator(decoratedElements, 'Input', coreModule), checker);
+      filterToMembersWithDecorator(decoratedElements, 'Input', coreModule), reflector, checker);
 
   // And outputs.
-  const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', checker);
+  const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', reflector, checker);
   const outputsFromFields = parseDecoratedFields(
-      filterToMembersWithDecorator(decoratedElements, 'Output', coreModule), checker);
+      filterToMembersWithDecorator(decoratedElements, 'Output', coreModule), reflector, checker);
   // Construct the list of queries.
   const contentChildFromFields = queriesFromFields(
-      filterToMembersWithDecorator(decoratedElements, 'ContentChild', coreModule), checker);
+      filterToMembersWithDecorator(decoratedElements, 'ContentChild', coreModule), reflector,
+      checker);
   const contentChildrenFromFields = queriesFromFields(
-      filterToMembersWithDecorator(decoratedElements, 'ContentChildren', coreModule), checker);
+      filterToMembersWithDecorator(decoratedElements, 'ContentChildren', coreModule), reflector,
+      checker);
 
   const queries = [...contentChildFromFields, ...contentChildrenFromFields];
 
@@ -115,14 +117,14 @@ export function extractDirectiveMetadata(
   // Parse the selector.
   let selector = '';
   if (directive.has('selector')) {
-    const resolved = staticallyResolve(directive.get('selector') !, checker);
+    const resolved = staticallyResolve(directive.get('selector') !, reflector, checker);
     if (typeof resolved !== 'string') {
       throw new Error(`Selector must be a string`);
     }
     selector = resolved;
   }
 
-  const host = extractHostBindings(directive, decoratedElements, checker, coreModule);
+  const host = extractHostBindings(directive, decoratedElements, reflector, checker, coreModule);
 
   // Determine if `ngOnChanges` is a lifecycle hook defined on the component.
   const usesOnChanges = members.find(
@@ -148,12 +150,12 @@ export function extractDirectiveMetadata(
 
 export function extractQueryMetadata(
     name: string, args: ReadonlyArray<ts.Expression>, propertyName: string,
-    checker: ts.TypeChecker): R3QueryMetadata {
+    reflector: ReflectionHost, checker: ts.TypeChecker): R3QueryMetadata {
   if (args.length === 0) {
     throw new Error(`@${name} must have arguments`);
   }
   const first = name === 'ViewChild' || name === 'ContentChild';
-  const arg = staticallyResolve(args[0], checker);
+  const arg = staticallyResolve(args[0], reflector, checker);
 
   // Extract the predicate
   let predicate: Expression|string[]|null = null;
@@ -182,7 +184,7 @@ export function extractQueryMetadata(
     }
 
     if (options.has('descendants')) {
-      const descendantsValue = staticallyResolve(options.get('descendants') !, checker);
+      const descendantsValue = staticallyResolve(options.get('descendants') !, reflector, checker);
       if (typeof descendantsValue !== 'boolean') {
         throw new Error(`@${name} options.descendants must be a boolean`);
       }
@@ -220,7 +222,8 @@ export function extractQueriesFromDecorator(
       throw new Error(`query metadata must be an instance of a query type`);
     }
 
-    const query = extractQueryMetadata(type.name, queryExpr.arguments || [], propertyName, checker);
+    const query = extractQueryMetadata(
+        type.name, queryExpr.arguments || [], propertyName, reflector, checker);
     if (type.name.startsWith('Content')) {
       content.push(query);
     } else {
@@ -248,14 +251,14 @@ function isStringArrayOrDie(value: any, name: string): value is string[] {
  * correctly shaped metadata object.
  */
 function parseFieldToPropertyMapping(
-    directive: Map<string, ts.Expression>, field: string,
+    directive: Map<string, ts.Expression>, field: string, reflector: ReflectionHost,
     checker: ts.TypeChecker): {[field: string]: string} {
   if (!directive.has(field)) {
     return EMPTY_OBJECT;
   }
 
   // Resolve the field of interest from the directive metadata to a string[].
-  const metaValues = staticallyResolve(directive.get(field) !, checker);
+  const metaValues = staticallyResolve(directive.get(field) !, reflector, checker);
   if (!isStringArrayOrDie(metaValues, field)) {
     throw new Error(`Failed to resolve @Directive.${field}`);
   }
@@ -276,7 +279,7 @@ function parseFieldToPropertyMapping(
  * object.
  */
 function parseDecoratedFields(
-    fields: {member: ClassMember, decorators: Decorator[]}[],
+    fields: {member: ClassMember, decorators: Decorator[]}[], reflector: ReflectionHost,
     checker: ts.TypeChecker): {[field: string]: string} {
   return fields.reduce(
       (results, field) => {
@@ -287,7 +290,7 @@ function parseDecoratedFields(
           if (decorator.args == null || decorator.args.length === 0) {
             results[fieldName] = fieldName;
           } else if (decorator.args.length === 1) {
-            const property = staticallyResolve(decorator.args[0], checker);
+            const property = staticallyResolve(decorator.args[0], reflector, checker);
             if (typeof property !== 'string') {
               throw new Error(`Decorator argument must resolve to a string`);
             }
@@ -304,7 +307,7 @@ function parseDecoratedFields(
 }
 
 export function queriesFromFields(
-    fields: {member: ClassMember, decorators: Decorator[]}[],
+    fields: {member: ClassMember, decorators: Decorator[]}[], reflector: ReflectionHost,
     checker: ts.TypeChecker): R3QueryMetadata[] {
   return fields.map(({member, decorators}) => {
     if (decorators.length !== 1) {
@@ -313,7 +316,8 @@ export function queriesFromFields(
       throw new Error(`Query decorator must go on a property-type member`);
     }
     const decorator = decorators[0];
-    return extractQueryMetadata(decorator.name, decorator.args || [], member.name, checker);
+    return extractQueryMetadata(
+        decorator.name, decorator.args || [], member.name, reflector, checker);
   });
 }
 
@@ -327,15 +331,15 @@ type StringMap = {
 };
 
 function extractHostBindings(
-    metadata: Map<string, ts.Expression>, members: ClassMember[], checker: ts.TypeChecker,
-    coreModule: string | undefined): {
+    metadata: Map<string, ts.Expression>, members: ClassMember[], reflector: ReflectionHost,
+    checker: ts.TypeChecker, coreModule: string | undefined): {
   attributes: StringMap,
   listeners: StringMap,
   properties: StringMap,
 } {
   let hostMetadata: StringMap = {};
   if (metadata.has('host')) {
-    const hostMetaMap = staticallyResolve(metadata.get('host') !, checker);
+    const hostMetaMap = staticallyResolve(metadata.get('host') !, reflector, checker);
     if (!(hostMetaMap instanceof Map)) {
       throw new Error(`Decorator host metadata must be an object`);
     }
@@ -358,7 +362,7 @@ function extractHostBindings(
               throw new Error(`@HostBinding() can have at most one argument`);
             }
 
-            const resolved = staticallyResolve(decorator.args[0], checker);
+            const resolved = staticallyResolve(decorator.args[0], reflector, checker);
             if (typeof resolved !== 'string') {
               throw new Error(`@HostBinding()'s argument must be a string`);
             }
@@ -380,7 +384,7 @@ function extractHostBindings(
               throw new Error(`@HostListener() can have at most two arguments`);
             }
 
-            const resolved = staticallyResolve(decorator.args[0], checker);
+            const resolved = staticallyResolve(decorator.args[0], reflector, checker);
             if (typeof resolved !== 'string') {
               throw new Error(`@HostListener()'s event name argument must be a string`);
             }
@@ -388,7 +392,7 @@ function extractHostBindings(
             eventName = resolved;
 
             if (decorator.args.length === 2) {
-              const resolvedArgs = staticallyResolve(decorator.args[1], checker);
+              const resolvedArgs = staticallyResolve(decorator.args[1], reflector, checker);
               if (!isStringArrayOrDie(resolvedArgs, '@HostListener.args')) {
                 throw new Error(`@HostListener second argument must be a string array`);
               }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index bd4153ca20..f0fe5b322d 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -59,20 +59,21 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
     // Extract the module declarations, imports, and exports.
     let declarations: Reference[] = [];
     if (ngModule.has('declarations')) {
-      const declarationMeta = staticallyResolve(ngModule.get('declarations') !, this.checker);
+      const declarationMeta =
+          staticallyResolve(ngModule.get('declarations') !, this.reflector, this.checker);
       declarations = resolveTypeList(declarationMeta, 'declarations');
     }
     let imports: Reference[] = [];
     if (ngModule.has('imports')) {
       const importsMeta = staticallyResolve(
-          ngModule.get('imports') !, this.checker,
+          ngModule.get('imports') !, this.reflector, this.checker,
           node => this._extractModuleFromModuleWithProvidersFn(node));
       imports = resolveTypeList(importsMeta, 'imports');
     }
     let exports: Reference[] = [];
     if (ngModule.has('exports')) {
       const exportsMeta = staticallyResolve(
-          ngModule.get('exports') !, this.checker,
+          ngModule.get('exports') !, this.reflector, this.checker,
           node => this._extractModuleFromModuleWithProvidersFn(node));
       exports = resolveTypeList(exportsMeta, 'exports');
     }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
index 4331746afc..eabff8452d 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
@@ -44,7 +44,7 @@ export class PipeDecoratorHandler implements DecoratorHandler<R3PipeMetadata> {
     if (!pipe.has('name')) {
       throw new Error(`@Pipe decorator is missing name field`);
     }
-    const pipeName = staticallyResolve(pipe.get('name') !, this.checker);
+    const pipeName = staticallyResolve(pipe.get('name') !, this.reflector, this.checker);
     if (typeof pipeName !== 'string') {
       throw new Error(`@Pipe.name must be a string`);
     }
@@ -52,7 +52,7 @@ export class PipeDecoratorHandler implements DecoratorHandler<R3PipeMetadata> {
 
     let pure = true;
     if (pipe.has('pure')) {
-      const pureValue = staticallyResolve(pipe.get('pure') !, this.checker);
+      const pureValue = staticallyResolve(pipe.get('pure') !, this.reflector, this.checker);
       if (typeof pureValue !== 'boolean') {
         throw new Error(`@Pipe.pure must be a boolean`);
       }
diff --git a/packages/compiler-cli/src/ngtsc/host/src/reflection.ts b/packages/compiler-cli/src/ngtsc/host/src/reflection.ts
index c6c809737b..d47f27c269 100644
--- a/packages/compiler-cli/src/ngtsc/host/src/reflection.ts
+++ b/packages/compiler-cli/src/ngtsc/host/src/reflection.ts
@@ -83,10 +83,57 @@ export interface ClassMember {
   nameNode: ts.Identifier|null;
 
   /**
-   * TypeScript `ts.Expression` which initializes this member, if the member is a property, or
-   * `null` otherwise.
+   * TypeScript `ts.Expression` which represents the value of the member.
+   *
+   * If the member is a property, this will be the property initializer if there is one, or null
+   * otherwise.
    */
-  initializer: ts.Expression|null;
+  value: ts.Expression|null;
+
+  /**
+   * TypeScript `ts.Declaration` which represents the implementation of the member.
+   *
+   * In TypeScript code this is identical to the node, but in downleveled code this should always be
+   * the Declaration which actually represents the member's runtime value.
+   *
+   * For example, the TS code:
+   *
+   * ```
+   * class Clazz {
+   *   static get property(): string {
+   *     return 'value';
+   *   }
+   * }
+   * ```
+   *
+   * Downlevels to:
+   *
+   * ```
+   * var Clazz = (function () {
+   *   function Clazz() {
+   *   }
+   *   Object.defineProperty(Clazz, "property", {
+   *       get: function () {
+   *           return 'value';
+   *       },
+   *       enumerable: true,
+   *       configurable: true
+   *   });
+   *   return Clazz;
+   * }());
+   * ```
+   *
+   * In this example, for the property "property", the node would be the entire
+   * Object.defineProperty ExpressionStatement, but the implementation would be this
+   * FunctionDeclaration:
+   *
+   * ```
+   * function () {
+   *   return 'value';
+   * },
+   * ```
+   */
+  implementation: ts.Declaration|null;
 
   /**
    * Whether the member is static or not.
@@ -151,6 +198,24 @@ export interface Import {
   from: string;
 }
 
+/**
+ * The declaration of a symbol, along with information about how it was imported into the
+ * application.
+ */
+export interface Declaration {
+  /**
+   * TypeScript reference to the declaration itself.
+   */
+  node: ts.Declaration;
+
+  /**
+   * The absolute module path from which the symbol was imported into the application, if the symbol
+   * was imported via an absolute module (even through a chain of re-exports). If the symbol is part
+   * of the application and was not imported from an absolute path, this will be `null`.
+   */
+  viaModule: string|null;
+}
+
 /**
  * Abstracts reflection operations on a TypeScript AST.
  *
@@ -220,4 +285,57 @@ export interface ReflectionHost {
    * `null` if the identifier doesn't resolve to an import but instead is locally defined.
    */
   getImportOfIdentifier(id: ts.Identifier): Import|null;
+
+  /**
+   * Trace an identifier to its declaration, if possible.
+   *
+   * This method attempts to resolve the declaration of the given identifier, tracing back through
+   * imports and re-exports until the original declaration statement is found. A `Declaration`
+   * object is returned if the original declaration is found, or `null` is returned otherwise.
+   *
+   * If the declaration is in a different module, and that module is imported via an absolute path,
+   * this method also returns the absolute path of the imported module. For example, if the code is:
+   *
+   * ```
+   * import {RouterModule} from '@angular/core';
+   *
+   * export const ROUTES = RouterModule.forRoot([...]);
+   * ```
+   *
+   * and if `getDeclarationOfIdentifier` is called on `RouterModule` in the `ROUTES` expression,
+   * then it would trace `RouterModule` via its import from `@angular/core`, and note that the
+   * definition was imported from `@angular/core` into the application where it was referenced.
+   *
+   * If the definition is re-exported several times from different absolute module names, only
+   * the first one (the one by which the application refers to the module) is returned.
+   *
+   * This module name is returned in the `viaModule` field of the `Declaration`. If The declaration
+   * is relative to the application itself and there was no import through an absolute path, then
+   * `viaModule` is `null`.
+   *
+   * @param id a TypeScript `ts.Identifier` to trace back to a declaration.
+   *
+   * @returns metadata about the `Declaration` if the original declaration is found, or `null`
+   * otherwise.
+   */
+  getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null;
+
+  /**
+   * Collect the declarations exported from a module by name.
+   *
+   * Iterates over the exports of a module (including re-exports) and returns a map of export
+   * name to its `Declaration`. If an exported value is itself re-exported from another module,
+   * the `Declaration`'s `viaModule` will reflect that.
+   *
+   * @param node a TypeScript `ts.Node` representing the module (for example a `ts.SourceFile`) for
+   * which to collect exports.
+   *
+   * @returns a map of `Declaration`s for the module's exports, by name.
+   */
+  getExportsOfModule(module: ts.Node): Map<string, Declaration>|null;
+
+  /**
+   * Check whether the given declaration node actually represents a class.
+   */
+  isClass(node: ts.Declaration): boolean;
 }
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts b/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
index 61cab4e721..014abbae89 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/reflector.ts
@@ -8,7 +8,7 @@
 
 import * as ts from 'typescript';
 
-import {ClassMember, ClassMemberKind, Decorator, Import, Parameter, ReflectionHost} from '../../host';
+import {ClassMember, ClassMemberKind, Declaration, Decorator, Import, Parameter, ReflectionHost} from '../../host';
 
 /**
  * reflector.ts implements static reflection of declarations using the TypeScript `ts.TypeChecker`.
@@ -104,7 +104,94 @@ export class TypeScriptReflectionHost implements ReflectionHost {
     return {from, name};
   }
 
-  isClass(node: ts.Node): node is ts.Declaration { return ts.isClassDeclaration(node); }
+  getExportsOfModule(node: ts.Node): Map<string, Declaration>|null {
+    // In TypeScript code, modules are only ts.SourceFiles. Throw if the node isn't a module.
+    if (!ts.isSourceFile(node)) {
+      throw new Error(`getDeclarationsOfModule() called on non-SourceFile in TS code`);
+    }
+    const map = new Map<string, Declaration>();
+
+    // Reflect the module to a Symbol, and use getExportsOfModule() to get a list of exported
+    // Symbols.
+    const symbol = this.checker.getSymbolAtLocation(node);
+    if (symbol === undefined) {
+      return null;
+    }
+    this.checker.getExportsOfModule(symbol).forEach(exportSymbol => {
+      // Map each exported Symbol to a Declaration and add it to the map.
+      const decl = this._getDeclarationOfSymbol(exportSymbol);
+      if (decl !== null) {
+        map.set(exportSymbol.name, decl);
+      }
+    });
+    return map;
+  }
+
+  isClass(node: ts.Declaration): node is ts.ClassDeclaration {
+    // In TypeScript code, classes are ts.ClassDeclarations.
+    return ts.isClassDeclaration(node);
+  }
+
+  getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
+    // Resolve the identifier to a Symbol, and return the declaration of that.
+    let symbol: ts.Symbol|undefined = this.checker.getSymbolAtLocation(id);
+    if (symbol === undefined) {
+      return null;
+    }
+    return this._getDeclarationOfSymbol(symbol);
+  }
+
+  /**
+   * Resolve a `ts.Symbol` to its declaration, keeping track of the `viaModule` along the way.
+   *
+   * @internal
+   */
+  protected _getDeclarationOfSymbol(symbol: ts.Symbol): Declaration|null {
+    let viaModule: string|null = null;
+    // Look through the Symbol's immediate declarations, and see if any of them are import-type
+    // statements.
+    if (symbol.declarations !== undefined && symbol.declarations.length > 0) {
+      for (let i = 0; i < symbol.declarations.length; i++) {
+        const decl = symbol.declarations[i];
+        if (ts.isImportSpecifier(decl) && decl.parent !== undefined &&
+            decl.parent.parent !== undefined && decl.parent.parent.parent !== undefined) {
+          // Find the ImportDeclaration that imported this Symbol.
+          const importDecl = decl.parent.parent.parent;
+          // The moduleSpecifier should always be a string.
+          if (ts.isStringLiteral(importDecl.moduleSpecifier)) {
+            // Check if the moduleSpecifier is absolute. If it is, this symbol comes from an
+            // external module, and the import path becomes the viaModule.
+            const moduleSpecifier = importDecl.moduleSpecifier.text;
+            if (!moduleSpecifier.startsWith('.')) {
+              viaModule = moduleSpecifier;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    // Now, resolve the Symbol to its declaration by following any and all aliases.
+    while (symbol.flags & ts.SymbolFlags.Alias) {
+      symbol = this.checker.getAliasedSymbol(symbol);
+    }
+
+    // Look at the resolved Symbol's declarations and pick one of them to return. Value declarations
+    // are given precedence over type declarations.
+    if (symbol.valueDeclaration !== undefined) {
+      return {
+        node: symbol.valueDeclaration,
+        viaModule,
+      };
+    } else if (symbol.declarations !== undefined && symbol.declarations.length > 0) {
+      return {
+        node: symbol.declarations[0],
+        viaModule,
+      };
+    } else {
+      return null;
+    }
+  }
 
   private _reflectDecorator(node: ts.Decorator): Decorator|null {
     // Attempt to resolve the decorator expression into a reference to a concrete Identifier. The
@@ -135,13 +222,13 @@ export class TypeScriptReflectionHost implements ReflectionHost {
 
   private _reflectMember(node: ts.ClassElement): ClassMember|null {
     let kind: ClassMemberKind|null = null;
-    let initializer: ts.Expression|null = null;
+    let value: ts.Expression|null = null;
     let name: string|null = null;
     let nameNode: ts.Identifier|null = null;
 
     if (ts.isPropertyDeclaration(node)) {
       kind = ClassMemberKind.Property;
-      initializer = node.initializer || null;
+      value = node.initializer || null;
     } else if (ts.isGetAccessorDeclaration(node)) {
       kind = ClassMemberKind.Getter;
     } else if (ts.isSetAccessorDeclaration(node)) {
@@ -169,8 +256,8 @@ export class TypeScriptReflectionHost implements ReflectionHost {
 
     return {
       node,
-      kind,
-      type: node.type || null, name, nameNode, decorators, initializer, isStatic,
+      implementation: node, kind,
+      type: node.type || null, name, nameNode, decorators, value, isStatic,
     };
   }
 }
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index a63ec59081..530406392c 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -15,6 +15,8 @@ import {Expression, ExternalExpr, ExternalReference, WrappedNodeExpr} from '@ang
 import * as path from 'path';
 import * as ts from 'typescript';
 
+import {ClassMemberKind, ReflectionHost} from '../../host';
+
 const TS_DTS_EXTENSION = /(\.d)?\.ts$/;
 
 /**
@@ -188,10 +190,10 @@ export class AbsoluteReference extends Reference {
  * @returns a `ResolvedValue` representing the resolved value
  */
 export function staticallyResolve(
-    node: ts.Expression, checker: ts.TypeChecker,
+    node: ts.Expression, host: ReflectionHost, checker: ts.TypeChecker,
     foreignFunctionResolver?: (node: ts.FunctionDeclaration | ts.MethodDeclaration) =>
         ts.Expression | null): ResolvedValue {
-  return new StaticInterpreter(checker).visit(node, {
+  return new StaticInterpreter(host, checker).visit(node, {
     absoluteModuleName: null,
     scope: new Map<ts.ParameterDeclaration, ResolvedValue>(), foreignFunctionResolver,
   });
@@ -243,7 +245,7 @@ interface Context {
 }
 
 class StaticInterpreter {
-  constructor(private checker: ts.TypeChecker) {}
+  constructor(private host: ReflectionHost, private checker: ts.TypeChecker) {}
 
   visit(node: ts.Expression, context: Context): ResolvedValue {
     return this.visitExpression(node, context);
@@ -286,7 +288,7 @@ class StaticInterpreter {
       return this.visitExpression(node.expression, context);
     } else if (ts.isNonNullExpression(node)) {
       return this.visitExpression(node.expression, context);
-    } else if (ts.isClassDeclaration(node)) {
+    } else if (isPossibleClassDeclaration(node) && this.host.isClass(node)) {
       return this.visitDeclaration(node, context);
     } else {
       return DYNAMIC_VALUE;
@@ -356,14 +358,6 @@ class StaticInterpreter {
     return map;
   }
 
-  private visitIdentifier(node: ts.Identifier, context: Context): ResolvedValue {
-    let symbol: ts.Symbol|undefined = this.checker.getSymbolAtLocation(node);
-    if (symbol === undefined) {
-      return DYNAMIC_VALUE;
-    }
-    return this.visitSymbol(symbol, context);
-  }
-
   private visitTemplateExpression(node: ts.TemplateExpression, context: Context): ResolvedValue {
     const pieces: string[] = [node.head.text];
     for (let i = 0; i < node.templateSpans.length; i++) {
@@ -380,48 +374,19 @@ class StaticInterpreter {
     return pieces.join('');
   }
 
-  private visitSymbol(symbol: ts.Symbol, context: Context): ResolvedValue {
-    let absoluteModuleName = context.absoluteModuleName;
-    if (symbol.declarations !== undefined && symbol.declarations.length > 0) {
-      for (let i = 0; i < symbol.declarations.length; i++) {
-        const decl = symbol.declarations[i];
-        if (ts.isImportSpecifier(decl) && decl.parent !== undefined &&
-            decl.parent.parent !== undefined && decl.parent.parent.parent !== undefined) {
-          const importDecl = decl.parent.parent.parent;
-          if (ts.isStringLiteral(importDecl.moduleSpecifier)) {
-            const moduleSpecifier = importDecl.moduleSpecifier.text;
-            if (!moduleSpecifier.startsWith('.')) {
-              absoluteModuleName = moduleSpecifier;
-            }
-          }
-        }
-      }
-    }
-
-    const newContext = {...context, absoluteModuleName};
-
-    while (symbol.flags & ts.SymbolFlags.Alias) {
-      symbol = this.checker.getAliasedSymbol(symbol);
-    }
-
-    if (symbol.declarations === undefined) {
+  private visitIdentifier(node: ts.Identifier, context: Context): ResolvedValue {
+    const decl = this.host.getDeclarationOfIdentifier(node);
+    if (decl === null) {
       return DYNAMIC_VALUE;
     }
-
-    if (symbol.valueDeclaration !== undefined) {
-      return this.visitDeclaration(symbol.valueDeclaration, newContext);
-    }
-
-    return symbol.declarations.reduce<ResolvedValue>((prev, decl) => {
-      if (!(isDynamicValue(prev) || prev instanceof Reference)) {
-        return prev;
-      }
-      return this.visitDeclaration(decl, newContext);
-    }, DYNAMIC_VALUE);
+    return this.visitDeclaration(
+        decl.node, {...context, absoluteModuleName: decl.viaModule || context.absoluteModuleName});
   }
 
   private visitDeclaration(node: ts.Declaration, context: Context): ResolvedValue {
-    if (ts.isVariableDeclaration(node)) {
+    if (this.host.isClass(node)) {
+      return this.getReference(node, context);
+    } else if (ts.isVariableDeclaration(node)) {
       if (!node.initializer) {
         return undefined;
       }
@@ -471,14 +436,18 @@ class StaticInterpreter {
   }
 
   private visitSourceFile(node: ts.SourceFile, context: Context): ResolvedValue {
-    const map = new Map<string, ResolvedValue>();
-    const symbol = this.checker.getSymbolAtLocation(node);
-    if (symbol === undefined) {
+    const declarations = this.host.getExportsOfModule(node);
+    if (declarations === null) {
       return DYNAMIC_VALUE;
     }
-    const exports = this.checker.getExportsOfModule(symbol);
-    exports.forEach(symbol => map.set(symbol.name, this.visitSymbol(symbol, context)));
-
+    const map = new Map<string, ResolvedValue>();
+    declarations.forEach((decl, name) => {
+      const value = this.visitDeclaration(decl.node, {
+        ...context,
+        absoluteModuleName: decl.viaModule || context.absoluteModuleName,
+      });
+      map.set(name, value);
+    });
     return map;
   }
 
@@ -503,22 +472,21 @@ class StaticInterpreter {
       return lhs[rhs];
     } else if (lhs instanceof Reference) {
       const ref = lhs.node;
-      if (ts.isClassDeclaration(ref)) {
+      if (isPossibleClassDeclaration(ref) && this.host.isClass(ref)) {
         let absoluteModuleName = context.absoluteModuleName;
         if (lhs instanceof NodeReference || lhs instanceof AbsoluteReference) {
           absoluteModuleName = lhs.moduleName || absoluteModuleName;
         }
         let value: ResolvedValue = undefined;
-        const member =
-            ref.members.filter(member => isStatic(member))
-                .find(
-                    member => member.name !== undefined &&
-                        this.stringNameFromPropertyName(member.name, context) === strIndex);
+        const member = this.host.getMembersOfClass(ref).find(
+            member => member.isStatic && member.name === strIndex);
         if (member !== undefined) {
-          if (ts.isPropertyDeclaration(member) && member.initializer !== undefined) {
-            value = this.visitExpression(member.initializer, context);
-          } else if (ts.isMethodDeclaration(member)) {
-            value = new NodeReference(member, absoluteModuleName);
+          if (member.value !== null) {
+            value = this.visitExpression(member.value, context);
+          } else if (member.implementation !== null) {
+            value = new NodeReference(member.implementation, absoluteModuleName);
+          } else {
+            value = new NodeReference(member.node, absoluteModuleName);
           }
         }
         return value;
@@ -657,11 +625,6 @@ class StaticInterpreter {
   }
 }
 
-function isStatic(element: ts.ClassElement): boolean {
-  return element.modifiers !== undefined &&
-      element.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword);
-}
-
 function isFunctionOrMethodDeclaration(node: ts.Node): node is ts.FunctionDeclaration|
     ts.MethodDeclaration {
   return ts.isFunctionDeclaration(node) || ts.isMethodDeclaration(node);
@@ -691,3 +654,7 @@ function identifierOfDeclaration(decl: ts.Declaration): ts.Identifier|undefined
     return undefined;
   }
 }
+
+function isPossibleClassDeclaration(node: ts.Node): node is ts.Declaration {
+  return ts.isClassDeclaration(node) || ts.isVariableDeclaration(node);
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
index 245dc8937b..47e05f0642 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/reflector_spec.ts
@@ -120,6 +120,48 @@ describe('reflector', () => {
       expectParameter(args[1], 'otherBar', 'star.Bar');
     });
   });
+
+  it('should reflect a re-export', () => {
+    const {program} = makeProgram([
+      {name: '/node_modules/absolute/index.ts', contents: 'export class Target {}'},
+      {name: 'local1.ts', contents: `export {Target as AliasTarget} from 'absolute';`},
+      {name: 'local2.ts', contents: `export {AliasTarget as Target} from './local1';`}, {
+        name: 'entry.ts',
+        contents: `
+          import {Target} from './local2';
+          import {Target as DirectTarget} from 'absolute';
+
+          const target = Target;
+          const directTarget = DirectTarget;
+      `
+      }
+    ]);
+    const target = getDeclaration(program, 'entry.ts', 'target', ts.isVariableDeclaration);
+    if (target.initializer === undefined || !ts.isIdentifier(target.initializer)) {
+      return fail('Unexpected initializer for target');
+    }
+    const directTarget =
+        getDeclaration(program, 'entry.ts', 'directTarget', ts.isVariableDeclaration);
+    if (directTarget.initializer === undefined || !ts.isIdentifier(directTarget.initializer)) {
+      return fail('Unexpected initializer for directTarget');
+    }
+    const Target = target.initializer;
+    const DirectTarget = directTarget.initializer;
+
+    const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
+    const targetDecl = host.getDeclarationOfIdentifier(Target);
+    const directTargetDecl = host.getDeclarationOfIdentifier(DirectTarget);
+    if (targetDecl === null) {
+      return fail('No declaration found for Target');
+    } else if (directTargetDecl === null) {
+      return fail('No declaration found for DirectTarget');
+    }
+    expect(targetDecl.node.getSourceFile().fileName).toBe('/node_modules/absolute/index.ts');
+    expect(ts.isClassDeclaration(targetDecl.node)).toBe(true);
+    expect(directTargetDecl.viaModule).toBe('absolute');
+    expect(directTargetDecl.node).toBe(targetDecl.node);
+  });
 });
 
 function expectParameter(
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
index 740dd1ea0c..c4d1cc27a8 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
@@ -9,6 +9,7 @@
 import {ExternalExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
+import {TypeScriptReflectionHost} from '..';
 import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
 import {Reference, ResolvedValue, staticallyResolve} from '../src/resolver';
 
@@ -30,7 +31,8 @@ function makeExpression(
 
 function evaluate<T extends ResolvedValue>(code: string, expr: string): T {
   const {expression, checker} = makeExpression(code, expr);
-  return staticallyResolve(expression, checker) as T;
+  const host = new TypeScriptReflectionHost(checker);
+  return staticallyResolve(expression, host, checker) as T;
 }
 
 describe('ngtsc metadata', () => {
@@ -52,8 +54,9 @@ describe('ngtsc metadata', () => {
       }
     ]);
     const decl = getDeclaration(program, 'entry.ts', 'X', ts.isVariableDeclaration);
+    const host = new TypeScriptReflectionHost(program.getTypeChecker());
 
-    const value = staticallyResolve(decl.initializer !, program.getTypeChecker());
+    const value = staticallyResolve(decl.initializer !, host, program.getTypeChecker());
     expect(value).toEqual('test');
   });
 
@@ -132,9 +135,10 @@ describe('ngtsc metadata', () => {
       },
     ]);
     const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
-    const resolved = staticallyResolve(expr, checker);
+    const resolved = staticallyResolve(expr, host, checker);
     if (!(resolved instanceof Reference)) {
       return fail('Expected expression to resolve to a reference');
     }
@@ -160,9 +164,10 @@ describe('ngtsc metadata', () => {
       },
     ]);
     const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
-    const resolved = staticallyResolve(expr, checker);
+    const resolved = staticallyResolve(expr, host, checker);
     if (!(resolved instanceof Reference)) {
       return fail('Expected expression to resolve to a reference');
     }
@@ -188,9 +193,10 @@ describe('ngtsc metadata', () => {
       },
     ]);
     const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
-    expect(staticallyResolve(expr, checker)).toEqual('test');
+    expect(staticallyResolve(expr, host, checker)).toEqual('test');
   });
 
   it('reads values from named exports', () => {
@@ -205,9 +211,10 @@ describe('ngtsc metadata', () => {
       },
     ]);
     const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
-    expect(staticallyResolve(expr, checker)).toEqual('test');
+    expect(staticallyResolve(expr, host, checker)).toEqual('test');
   });
 
   it('chain of re-exports works', () => {
@@ -222,9 +229,10 @@ describe('ngtsc metadata', () => {
       },
     ]);
     const checker = program.getTypeChecker();
+    const host = new TypeScriptReflectionHost(checker);
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
-    expect(staticallyResolve(expr, checker)).toEqual('test');
+    expect(staticallyResolve(expr, host, checker)).toEqual('test');
   });
 
   it('map spread works', () => {

From 6f8ec256ef1cadc43b8d7b91ab26673a4397972f Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 12 Jul 2018 14:52:29 -0700
Subject: [PATCH 526/582] fix(ivy): detect ngOnChanges as a non-static method
 (#24862)

Previously ngtsc had a bug where it would only detect the presence of
ngOnChanges as a static method. This commit flips the condition and only
recognizes ngOnChanges as a non-static method.

PR Close #24862
---
 .../compiler-cli/src/ngtsc/annotations/src/directive.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 69a4ad1d33..a96cc61ad0 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -127,9 +127,9 @@ export function extractDirectiveMetadata(
   const host = extractHostBindings(directive, decoratedElements, reflector, checker, coreModule);
 
   // Determine if `ngOnChanges` is a lifecycle hook defined on the component.
-  const usesOnChanges = members.find(
-                            member => member.isStatic && member.kind === ClassMemberKind.Method &&
-                                member.name === 'ngOnChanges') !== undefined;
+  const usesOnChanges = members.some(
+      member => !member.isStatic && member.kind === ClassMemberKind.Method &&
+          member.name === 'ngOnChanges');
 
   // Detect if the component inherits from another class
   const usesInheritance = clazz.heritageClauses !== undefined &&

From 139f5b367234443d12a68c1042b92352cb48fcd7 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 12 Jul 2018 15:04:07 -0700
Subject: [PATCH 527/582] fix(ivy): references track the identifier they were
 discovered under (#24862)

Previously, references had the concept of an identifier, but would not
properly detect whether the identifier should be used or not when
generating an expression. This change fixes that logic.

Additionally, now whenever an identifier resolves to a reference (even
one imported from another module) as part of resolving an expression,
the reference is updated to use that identifier. This ensures that for
a class Foo declared in foo.ts, but referenced in an expression in
bar.ts, the Reference returned includes the identifier from bar.ts,
meaning that writing an expression in bar.ts for the Reference will not
generate an import.

PR Close #24862
---
 .../src/ngtsc/metadata/src/resolver.ts        | 23 +++++++++++++--
 .../src/ngtsc/metadata/test/resolver_spec.ts  | 29 +++++++++++--------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index 530406392c..98a4e7cb21 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -100,6 +100,8 @@ export abstract class Reference {
    * import if needed.
    */
   abstract toExpression(context: ts.SourceFile): Expression|null;
+
+  abstract withIdentifier(identifier: ts.Identifier): Reference;
 }
 
 /**
@@ -112,6 +114,8 @@ export class NodeReference extends Reference {
   constructor(node: ts.Node, readonly moduleName: string|null) { super(node); }
 
   toExpression(context: ts.SourceFile): null { return null; }
+
+  withIdentifier(identifier: ts.Identifier): NodeReference { return this; }
 }
 
 /**
@@ -125,7 +129,7 @@ export class ResolvedReference extends Reference {
   readonly expressable = true;
 
   toExpression(context: ts.SourceFile): Expression {
-    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.node).getSourceFile()) {
+    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.identifier).getSourceFile()) {
       return new WrappedNodeExpr(this.identifier);
     } else {
       // Relative import from context -> this.node.getSourceFile().
@@ -150,6 +154,10 @@ export class ResolvedReference extends Reference {
       }
     }
   }
+
+  withIdentifier(identifier: ts.Identifier): ResolvedReference {
+    return new ResolvedReference(this.node, identifier);
+  }
 }
 
 /**
@@ -168,12 +176,16 @@ export class AbsoluteReference extends Reference {
   readonly expressable = true;
 
   toExpression(context: ts.SourceFile): Expression {
-    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.node.getSourceFile())) {
+    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.identifier).getSourceFile()) {
       return new WrappedNodeExpr(this.identifier);
     } else {
       return new ExternalExpr(new ExternalReference(this.moduleName, this.symbolName));
     }
   }
+
+  withIdentifier(identifier: ts.Identifier): AbsoluteReference {
+    return new AbsoluteReference(this.node, identifier, this.moduleName, this.symbolName);
+  }
 }
 
 /**
@@ -379,8 +391,13 @@ class StaticInterpreter {
     if (decl === null) {
       return DYNAMIC_VALUE;
     }
-    return this.visitDeclaration(
+    const result = this.visitDeclaration(
         decl.node, {...context, absoluteModuleName: decl.viaModule || context.absoluteModuleName});
+    if (result instanceof Reference) {
+      return result.withIdentifier(node);
+    } else {
+      return result;
+    }
   }
 
   private visitDeclaration(node: ts.Declaration, context: Context): ResolvedValue {
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
index c4d1cc27a8..ee34ca4501 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/resolver_spec.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ExternalExpr} from '@angular/compiler';
+import {WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {TypeScriptReflectionHost} from '..';
 import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
-import {Reference, ResolvedValue, staticallyResolve} from '../src/resolver';
+import {AbsoluteReference, Reference, ResolvedValue, staticallyResolve} from '../src/resolver';
 
 function makeSimpleProgram(contents: string): ts.Program {
   return makeProgram([{name: 'entry.ts', contents}]).program;
@@ -145,11 +145,13 @@ describe('ngtsc metadata', () => {
     expect(ts.isFunctionDeclaration(resolved.node)).toBe(true);
     expect(resolved.expressable).toBe(true);
     const reference = resolved.toExpression(program.getSourceFile('entry.ts') !);
-    if (!(reference instanceof ExternalExpr)) {
-      return fail('Expected expression reference to be an external (import) expression');
+    if (!(reference instanceof WrappedNodeExpr)) {
+      return fail('Expected expression reference to be a wrapped node');
     }
-    expect(reference.value.moduleName).toBe('./second');
-    expect(reference.value.name).toBe('foo');
+    if (!ts.isIdentifier(reference.node)) {
+      return fail('Expected expression to be an Identifier');
+    }
+    expect(reference.node.getSourceFile()).toEqual(program.getSourceFile('entry.ts') !);
   });
 
   it('absolute imports work', () => {
@@ -168,17 +170,20 @@ describe('ngtsc metadata', () => {
     const result = getDeclaration(program, 'entry.ts', 'target$', ts.isVariableDeclaration);
     const expr = result.initializer !;
     const resolved = staticallyResolve(expr, host, checker);
-    if (!(resolved instanceof Reference)) {
-      return fail('Expected expression to resolve to a reference');
+    if (!(resolved instanceof AbsoluteReference)) {
+      return fail('Expected expression to resolve to an absolute reference');
     }
+    expect(resolved.moduleName).toBe('some_library');
     expect(ts.isFunctionDeclaration(resolved.node)).toBe(true);
     expect(resolved.expressable).toBe(true);
     const reference = resolved.toExpression(program.getSourceFile('entry.ts') !);
-    if (!(reference instanceof ExternalExpr)) {
-      return fail('Expected expression reference to be an external (import) expression');
+    if (!(reference instanceof WrappedNodeExpr)) {
+      return fail('Expected expression reference to be a wrapped node');
     }
-    expect(reference.value.moduleName).toBe('some_library');
-    expect(reference.value.name).toBe('foo');
+    if (!ts.isIdentifier(reference.node)) {
+      return fail('Expected expression to be an Identifier');
+    }
+    expect(reference.node.getSourceFile()).toEqual(program.getSourceFile('entry.ts') !);
   });
 
   it('reads values from default exports', () => {

From b7bbc82e3e21c1735fcddf84e789ebc159b90ab6 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 12 Jul 2018 15:09:05 -0700
Subject: [PATCH 528/582] fix(ivy): wrap non-statement assignment expressions
 in parentheses (#24862)

Previously, when translating an assignment expression (e.g. x = 3), the
translator would always print the statement as X = Y. However, if the
expression is included in a larger expression (X = (Y = Z)), the
translator would print "X = Y = Z" without regard for the outer
expression context.

Now, the translator understands when it's printing an expression
statement (X = Y;) vs an expression in a larger context (X = (Y = Z);)
and encapsulates the latter in parentheses.

PR Close #24862
---
 .../src/ngtsc/transform/src/translator.ts     | 169 ++++++++++--------
 1 file changed, 97 insertions(+), 72 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index 339778938f..2fd42200be 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -6,10 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
+import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
 import * as ts from 'typescript';
+
 import {relativePathBetween} from '../../util/src/path';
 
+export class Context {
+  constructor(readonly isStatement: boolean) {}
+
+  get withExpressionMode(): Context { return this.isStatement ? new Context(false) : this; }
+
+  get withStatementMode(): Context { return this.isStatement ? new Context(true) : this; }
+}
+
 const BINARY_OPERATORS = new Map<BinaryOperator, ts.BinaryOperator>([
   [BinaryOperator.And, ts.SyntaxKind.AmpersandAmpersandToken],
   [BinaryOperator.Bigger, ts.SyntaxKind.GreaterThanToken],
@@ -73,110 +82,120 @@ export class ImportManager {
 }
 
 export function translateExpression(expression: Expression, imports: ImportManager): ts.Expression {
-  return expression.visitExpression(new ExpressionTranslatorVisitor(imports), null);
+  return expression.visitExpression(new ExpressionTranslatorVisitor(imports), new Context(false));
 }
 
 export function translateStatement(statement: Statement, imports: ImportManager): ts.Statement {
-  return statement.visitStatement(new ExpressionTranslatorVisitor(imports), null);
+  return statement.visitStatement(new ExpressionTranslatorVisitor(imports), new Context(true));
 }
 
 export function translateType(type: Type, imports: ImportManager): string {
-  return type.visitType(new TypeTranslatorVisitor(imports), null);
+  return type.visitType(new TypeTranslatorVisitor(imports), new Context(false));
 }
 
 class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor {
   constructor(private imports: ImportManager) {}
 
-  visitDeclareVarStmt(stmt: DeclareVarStmt, context: any): ts.VariableStatement {
+  visitDeclareVarStmt(stmt: DeclareVarStmt, context: Context): ts.VariableStatement {
+    const nodeFlags = stmt.hasModifier(StmtModifier.Final) ? ts.NodeFlags.Const : ts.NodeFlags.None;
     return ts.createVariableStatement(
-        undefined,
-        ts.createVariableDeclarationList([ts.createVariableDeclaration(
-            stmt.name, undefined, stmt.value && stmt.value.visitExpression(this, context))]));
+        undefined, ts.createVariableDeclarationList(
+                       [ts.createVariableDeclaration(
+                           stmt.name, undefined, stmt.value &&
+                               stmt.value.visitExpression(this, context.withExpressionMode))],
+                       nodeFlags));
   }
 
-  visitDeclareFunctionStmt(stmt: DeclareFunctionStmt, context: any): ts.FunctionDeclaration {
+  visitDeclareFunctionStmt(stmt: DeclareFunctionStmt, context: Context): ts.FunctionDeclaration {
     return ts.createFunctionDeclaration(
         undefined, undefined, undefined, stmt.name, undefined,
         stmt.params.map(param => ts.createParameter(undefined, undefined, undefined, param.name)),
-        undefined,
-        ts.createBlock(stmt.statements.map(child => child.visitStatement(this, context))));
+        undefined, ts.createBlock(stmt.statements.map(
+                       child => child.visitStatement(this, context.withStatementMode))));
   }
 
-  visitExpressionStmt(stmt: ExpressionStatement, context: any): ts.ExpressionStatement {
-    return ts.createStatement(stmt.expr.visitExpression(this, context));
+  visitExpressionStmt(stmt: ExpressionStatement, context: Context): ts.ExpressionStatement {
+    return ts.createStatement(stmt.expr.visitExpression(this, context.withStatementMode));
   }
 
-  visitReturnStmt(stmt: ReturnStatement, context: any): ts.ReturnStatement {
-    return ts.createReturn(stmt.value.visitExpression(this, context));
+  visitReturnStmt(stmt: ReturnStatement, context: Context): ts.ReturnStatement {
+    return ts.createReturn(stmt.value.visitExpression(this, context.withExpressionMode));
   }
 
-  visitDeclareClassStmt(stmt: ClassStmt, context: any) {
+  visitDeclareClassStmt(stmt: ClassStmt, context: Context) {
     throw new Error('Method not implemented.');
   }
 
-  visitIfStmt(stmt: IfStmt, context: any): ts.IfStatement {
+  visitIfStmt(stmt: IfStmt, context: Context): ts.IfStatement {
     return ts.createIf(
         stmt.condition.visitExpression(this, context),
-        ts.createBlock(stmt.trueCase.map(child => child.visitStatement(this, context))),
+        ts.createBlock(
+            stmt.trueCase.map(child => child.visitStatement(this, context.withStatementMode))),
         stmt.falseCase.length > 0 ?
-            ts.createBlock(stmt.falseCase.map(child => child.visitStatement(this, context))) :
+            ts.createBlock(stmt.falseCase.map(
+                child => child.visitStatement(this, context.withStatementMode))) :
             undefined);
   }
 
-  visitTryCatchStmt(stmt: TryCatchStmt, context: any) {
+  visitTryCatchStmt(stmt: TryCatchStmt, context: Context) {
     throw new Error('Method not implemented.');
   }
 
-  visitThrowStmt(stmt: ThrowStmt, context: any) { throw new Error('Method not implemented.'); }
+  visitThrowStmt(stmt: ThrowStmt, context: Context) { throw new Error('Method not implemented.'); }
 
-  visitCommentStmt(stmt: CommentStmt, context: any): never {
+  visitCommentStmt(stmt: CommentStmt, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitJSDocCommentStmt(stmt: JSDocCommentStmt, context: any): never {
-    throw new Error('Method not implemented.');
+  visitJSDocCommentStmt(stmt: JSDocCommentStmt, context: Context): ts.NotEmittedStatement {
+    const commentStmt = ts.createNotEmittedStatement(ts.createLiteral(''));
+    const text = stmt.toString();
+    const kind = ts.SyntaxKind.MultiLineCommentTrivia;
+    ts.setSyntheticLeadingComments(commentStmt, [{kind, text, pos: -1, end: -1}]);
+    return commentStmt;
   }
 
-  visitReadVarExpr(ast: ReadVarExpr, context: any): ts.Identifier {
+  visitReadVarExpr(ast: ReadVarExpr, context: Context): ts.Identifier {
     return ts.createIdentifier(ast.name !);
   }
 
-  visitWriteVarExpr(expr: WriteVarExpr, context: any): ts.BinaryExpression {
-    return ts.createBinary(
+  visitWriteVarExpr(expr: WriteVarExpr, context: Context): ts.Expression {
+    const result: ts.Expression = ts.createBinary(
         ts.createIdentifier(expr.name), ts.SyntaxKind.EqualsToken,
         expr.value.visitExpression(this, context));
+    return context.isStatement ? result : ts.createParen(result);
   }
 
-  visitWriteKeyExpr(expr: WriteKeyExpr, context: any): never {
+  visitWriteKeyExpr(expr: WriteKeyExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitWritePropExpr(expr: WritePropExpr, context: any): ts.BinaryExpression {
+  visitWritePropExpr(expr: WritePropExpr, context: Context): ts.BinaryExpression {
     return ts.createBinary(
         ts.createPropertyAccess(expr.receiver.visitExpression(this, context), expr.name),
         ts.SyntaxKind.EqualsToken, expr.value.visitExpression(this, context));
   }
 
-  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: any): ts.CallExpression {
+  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: Context): ts.CallExpression {
     const target = ast.receiver.visitExpression(this, context);
     return ts.createCall(
         ast.name !== null ? ts.createPropertyAccess(target, ast.name) : target, undefined,
         ast.args.map(arg => arg.visitExpression(this, context)));
   }
 
-  visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: any): ts.CallExpression {
+  visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: Context): ts.CallExpression {
     return ts.createCall(
         ast.fn.visitExpression(this, context), undefined,
         ast.args.map(arg => arg.visitExpression(this, context)));
   }
 
-  visitInstantiateExpr(ast: InstantiateExpr, context: any): ts.NewExpression {
+  visitInstantiateExpr(ast: InstantiateExpr, context: Context): ts.NewExpression {
     return ts.createNew(
         ast.classExpr.visitExpression(this, context), undefined,
         ast.args.map(arg => arg.visitExpression(this, context)));
   }
 
-  visitLiteralExpr(ast: LiteralExpr, context: any): ts.Expression {
+  visitLiteralExpr(ast: LiteralExpr, context: Context): ts.Expression {
     if (ast.value === undefined) {
       return ts.createIdentifier('undefined');
     } else if (ast.value === null) {
@@ -186,7 +205,7 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     }
   }
 
-  visitExternalExpr(ast: ExternalExpr, context: any): ts.PropertyAccessExpression {
+  visitExternalExpr(ast: ExternalExpr, context: Context): ts.PropertyAccessExpression {
     if (ast.value.moduleName === null || ast.value.name === null) {
       throw new Error(`Import unknown module or symbol ${ast.value}`);
     }
@@ -195,26 +214,26 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
         ts.createIdentifier(ast.value.name));
   }
 
-  visitConditionalExpr(ast: ConditionalExpr, context: any): ts.ParenthesizedExpression {
+  visitConditionalExpr(ast: ConditionalExpr, context: Context): ts.ParenthesizedExpression {
     return ts.createParen(ts.createConditional(
         ast.condition.visitExpression(this, context), ast.trueCase.visitExpression(this, context),
         ast.falseCase !.visitExpression(this, context)));
   }
 
-  visitNotExpr(ast: NotExpr, context: any): ts.PrefixUnaryExpression {
+  visitNotExpr(ast: NotExpr, context: Context): ts.PrefixUnaryExpression {
     return ts.createPrefix(
         ts.SyntaxKind.ExclamationToken, ast.condition.visitExpression(this, context));
   }
 
-  visitAssertNotNullExpr(ast: AssertNotNull, context: any): ts.NonNullExpression {
+  visitAssertNotNullExpr(ast: AssertNotNull, context: Context): ts.NonNullExpression {
     return ts.createNonNullExpression(ast.condition.visitExpression(this, context));
   }
 
-  visitCastExpr(ast: CastExpr, context: any): ts.Expression {
+  visitCastExpr(ast: CastExpr, context: Context): ts.Expression {
     return ast.value.visitExpression(this, context);
   }
 
-  visitFunctionExpr(ast: FunctionExpr, context: any): ts.FunctionExpression {
+  visitFunctionExpr(ast: FunctionExpr, context: Context): ts.FunctionExpression {
     return ts.createFunctionExpression(
         undefined, undefined, ast.name || undefined, undefined,
         ast.params.map(
@@ -223,7 +242,7 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
         undefined, ts.createBlock(ast.statements.map(stmt => stmt.visitStatement(this, context))));
   }
 
-  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): ts.Expression {
+  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: Context): ts.Expression {
     if (!BINARY_OPERATORS.has(ast.operator)) {
       throw new Error(`Unknown binary operator: ${BinaryOperator[ast.operator]}`);
     }
@@ -233,20 +252,20 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     return ast.parens ? ts.createParen(binEx) : binEx;
   }
 
-  visitReadPropExpr(ast: ReadPropExpr, context: any): ts.PropertyAccessExpression {
+  visitReadPropExpr(ast: ReadPropExpr, context: Context): ts.PropertyAccessExpression {
     return ts.createPropertyAccess(ast.receiver.visitExpression(this, context), ast.name);
   }
 
-  visitReadKeyExpr(ast: ReadKeyExpr, context: any): ts.ElementAccessExpression {
+  visitReadKeyExpr(ast: ReadKeyExpr, context: Context): ts.ElementAccessExpression {
     return ts.createElementAccess(
         ast.receiver.visitExpression(this, context), ast.index.visitExpression(this, context));
   }
 
-  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any): ts.ArrayLiteralExpression {
+  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: Context): ts.ArrayLiteralExpression {
     return ts.createArrayLiteral(ast.entries.map(expr => expr.visitExpression(this, context)));
   }
 
-  visitLiteralMapExpr(ast: LiteralMapExpr, context: any): ts.ObjectLiteralExpression {
+  visitLiteralMapExpr(ast: LiteralMapExpr, context: Context): ts.ObjectLiteralExpression {
     const entries = ast.entries.map(
         entry => ts.createPropertyAssignment(
             entry.quoted ? ts.createLiteral(entry.key) : ts.createIdentifier(entry.key),
@@ -254,17 +273,17 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     return ts.createObjectLiteral(entries);
   }
 
-  visitCommaExpr(ast: CommaExpr, context: any): never {
+  visitCommaExpr(ast: CommaExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: any): any { return ast.node; }
+  visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: Context): any { return ast.node; }
 }
 
 export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
   constructor(private imports: ImportManager) {}
 
-  visitBuiltinType(type: BuiltinType, context: any): string {
+  visitBuiltinType(type: BuiltinType, context: Context): string {
     switch (type.name) {
       case BuiltinTypeName.Bool:
         return 'boolean';
@@ -280,15 +299,15 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     }
   }
 
-  visitExpressionType(type: ExpressionType, context: any): any {
+  visitExpressionType(type: ExpressionType, context: Context): any {
     return type.value.visitExpression(this, context);
   }
 
-  visitArrayType(type: ArrayType, context: any): string {
+  visitArrayType(type: ArrayType, context: Context): string {
     return `Array<${type.visitType(this, context)}>`;
   }
 
-  visitMapType(type: MapType, context: any): string {
+  visitMapType(type: MapType, context: Context): string {
     if (type.valueType !== null) {
       return `{[key: string]: ${type.valueType.visitType(this, context)}}`;
     } else {
@@ -296,38 +315,38 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     }
   }
 
-  visitReadVarExpr(ast: ReadVarExpr, context: any): string {
+  visitReadVarExpr(ast: ReadVarExpr, context: Context): string {
     if (ast.name === null) {
       throw new Error(`ReadVarExpr with no variable name in type`);
     }
     return ast.name;
   }
 
-  visitWriteVarExpr(expr: WriteVarExpr, context: any): never {
+  visitWriteVarExpr(expr: WriteVarExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitWriteKeyExpr(expr: WriteKeyExpr, context: any): never {
+  visitWriteKeyExpr(expr: WriteKeyExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitWritePropExpr(expr: WritePropExpr, context: any): never {
+  visitWritePropExpr(expr: WritePropExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: any): never {
+  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: any): never {
+  visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitInstantiateExpr(ast: InstantiateExpr, context: any): never {
+  visitInstantiateExpr(ast: InstantiateExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitLiteralExpr(ast: LiteralExpr, context: any): string {
+  visitLiteralExpr(ast: LiteralExpr, context: Context): string {
     if (typeof ast.value === 'string') {
       const escaped = ast.value.replace(/\'/g, '\\\'');
       return `'${escaped}'`;
@@ -336,7 +355,7 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     }
   }
 
-  visitExternalExpr(ast: ExternalExpr, context: any): string {
+  visitExternalExpr(ast: ExternalExpr, context: Context): string {
     if (ast.value.moduleName === null || ast.value.name === null) {
       throw new Error(`Import unknown module or symbol`);
     }
@@ -350,40 +369,46 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     }
   }
 
-  visitConditionalExpr(ast: ConditionalExpr, context: any) {
+  visitConditionalExpr(ast: ConditionalExpr, context: Context) {
     throw new Error('Method not implemented.');
   }
 
-  visitNotExpr(ast: NotExpr, context: any) { throw new Error('Method not implemented.'); }
+  visitNotExpr(ast: NotExpr, context: Context) { throw new Error('Method not implemented.'); }
 
-  visitAssertNotNullExpr(ast: AssertNotNull, context: any) {
+  visitAssertNotNullExpr(ast: AssertNotNull, context: Context) {
     throw new Error('Method not implemented.');
   }
 
-  visitCastExpr(ast: CastExpr, context: any) { throw new Error('Method not implemented.'); }
+  visitCastExpr(ast: CastExpr, context: Context) { throw new Error('Method not implemented.'); }
 
-  visitFunctionExpr(ast: FunctionExpr, context: any) { throw new Error('Method not implemented.'); }
-
-  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any) {
+  visitFunctionExpr(ast: FunctionExpr, context: Context) {
     throw new Error('Method not implemented.');
   }
 
-  visitReadPropExpr(ast: ReadPropExpr, context: any) { throw new Error('Method not implemented.'); }
+  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
 
-  visitReadKeyExpr(ast: ReadKeyExpr, context: any) { throw new Error('Method not implemented.'); }
+  visitReadPropExpr(ast: ReadPropExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
 
-  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: any): string {
+  visitReadKeyExpr(ast: ReadKeyExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: Context): string {
     const values = ast.entries.map(expr => expr.visitExpression(this, context));
     return `[${values.join(',')}]`;
   }
 
-  visitLiteralMapExpr(ast: LiteralMapExpr, context: any) {
+  visitLiteralMapExpr(ast: LiteralMapExpr, context: Context) {
     throw new Error('Method not implemented.');
   }
 
-  visitCommaExpr(ast: CommaExpr, context: any) { throw new Error('Method not implemented.'); }
+  visitCommaExpr(ast: CommaExpr, context: Context) { throw new Error('Method not implemented.'); }
 
-  visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: any) {
+  visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: Context) {
     const node: ts.Node = ast.node;
     if (ts.isIdentifier(node)) {
       return node.text;

From 9fd70c97158f9fbd01758eb0cfa6eba7efe3b8db Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 12 Jul 2018 15:10:55 -0700
Subject: [PATCH 529/582] refactor(ivy): run the compiler compliance tests
 against ngtsc (#24862)

This commit moves the compiler compliance tests into compiler-cli,
and uses ngtsc to run them instead of the custom compilation
pipeline used before. Testing against ngtsc allows for validation
of the real compiler output.

This commit also fixes a few small issues that prevented the tests
from passing.

PR Close #24862
---
 karma-js.conf.js                              |   1 +
 .../compiler-cli/test/compliance/BUILD.bazel  |  35 ++
 .../compiler-cli/test/compliance/README.md    |   1 +
 .../test/compliance/mock_compile.ts           | 178 +++++++
 .../test/compliance}/mock_compiler_spec.ts    |   7 +-
 .../r3_compiler_compliance_spec.ts            | 439 +++++++++---------
 .../r3_view_compiler_binding_spec.ts          |  20 +-
 .../compliance}/r3_view_compiler_di_spec.ts   |   2 +-
 .../compliance}/r3_view_compiler_i18n_spec.ts |  32 +-
 .../r3_view_compiler_input_outputs_spec.ts    |  22 +-
 .../r3_view_compiler_listener_spec.ts         |   8 +-
 .../test/compliance}/r3_view_compiler_spec.ts |   8 +-
 .../r3_view_compiler_styling_spec.ts          |  64 +--
 .../r3_view_compiler_template_spec.ts         |  30 +-
 packages/compiler/test/render3/BUILD.bazel    |   4 -
 .../compiler/test/render3/mock_compile.ts     | 329 -------------
 tools/cjs-jasmine/index.ts                    |   1 +
 17 files changed, 529 insertions(+), 652 deletions(-)
 create mode 100644 packages/compiler-cli/test/compliance/BUILD.bazel
 create mode 100644 packages/compiler-cli/test/compliance/README.md
 create mode 100644 packages/compiler-cli/test/compliance/mock_compile.ts
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/mock_compiler_spec.ts (96%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_compiler_compliance_spec.ts (77%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_binding_spec.ts (84%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_di_spec.ts (96%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_i18n_spec.ts (87%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_input_outputs_spec.ts (76%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_listener_spec.ts (85%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_spec.ts (91%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_styling_spec.ts (78%)
 rename packages/{compiler/test/render3 => compiler-cli/test/compliance}/r3_view_compiler_template_spec.ts (75%)
 delete mode 100644 packages/compiler/test/render3/mock_compile.ts

diff --git a/karma-js.conf.js b/karma-js.conf.js
index 48b8a555fd..910a13bab3 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -73,6 +73,7 @@ module.exports = function(config) {
       'dist/all/@angular/benchpress/**',
       'dist/all/@angular/compiler-cli/**',
       'dist/all/@angular/compiler-cli/src/ngtsc/**',
+      'dist/all/@angular/compiler-cli/test/compliance/**',
       'dist/all/@angular/compiler-cli/test/ngtsc/**',
       'dist/all/@angular/compiler/test/aot/**',
       'dist/all/@angular/compiler/test/render3/**',
diff --git a/packages/compiler-cli/test/compliance/BUILD.bazel b/packages/compiler-cli/test/compliance/BUILD.bazel
new file mode 100644
index 0000000000..365b20bc3d
--- /dev/null
+++ b/packages/compiler-cli/test/compliance/BUILD.bazel
@@ -0,0 +1,35 @@
+load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "test_lib",
+    testonly = 1,
+    srcs = glob(
+        ["**/*.ts"],
+    ),
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli",
+        "//packages/compiler/test:test_utils",
+        "//packages/compiler/testing",
+        "//packages/core",
+    ],
+)
+
+jasmine_node_test(
+    name = "compliance",
+    bootstrap = ["angular/tools/testing/init_node_spec.js"],
+    data = [
+        "//packages/common:npm_package",
+        "//packages/core:npm_package",
+    ],
+    tags = [
+        "ivy-local",
+        "ivy-only",
+    ],
+    deps = [
+        ":test_lib",
+        "//tools/testing:node",
+    ],
+)
diff --git a/packages/compiler-cli/test/compliance/README.md b/packages/compiler-cli/test/compliance/README.md
new file mode 100644
index 0000000000..7c522a1396
--- /dev/null
+++ b/packages/compiler-cli/test/compliance/README.md
@@ -0,0 +1 @@
+Tests in this directory are excluded from running in the browser and only run in node.
\ No newline at end of file
diff --git a/packages/compiler-cli/test/compliance/mock_compile.ts b/packages/compiler-cli/test/compliance/mock_compile.ts
new file mode 100644
index 0000000000..e258951271
--- /dev/null
+++ b/packages/compiler-cli/test/compliance/mock_compile.ts
@@ -0,0 +1,178 @@
+/**
+ * @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 {AotCompilerOptions} from '@angular/compiler';
+import {escapeRegExp} from '@angular/compiler/src/util';
+import {MockCompilerHost, MockData, MockDirectory, arrayToMockDir, settings, toMockFileArray} from '@angular/compiler/test/aot/test_util';
+import * as ts from 'typescript';
+
+import {NgtscProgram} from '../../src/ngtsc/program';
+
+
+const IDENTIFIER = /[A-Za-z_$ɵ][A-Za-z0-9_$]*/;
+const OPERATOR =
+    /!|%|\*|\/|\^|&&?|\|\|?|\(|\)|\{|\}|\[|\]|:|;|<=?|>=?|={1,3}|!==?|=>|\+\+?|--?|@|,|\.|\.\.\./;
+const STRING = /'[^']*'|"[^"]*"|`[\s\S]*?`/;
+const NUMBER = /\d+/;
+
+const ELLIPSIS = '…';
+const TOKEN = new RegExp(
+    `\\s*((${IDENTIFIER.source})|(${OPERATOR.source})|(${STRING.source})|${NUMBER.source}|${ELLIPSIS})`,
+    'y');
+
+type Piece = string | RegExp;
+
+const SKIP = /(?:.|\n|\r)*/;
+
+const ERROR_CONTEXT_WIDTH = 30;
+// Transform the expected output to set of tokens
+function tokenize(text: string): Piece[] {
+  TOKEN.lastIndex = 0;
+
+  let match: RegExpMatchArray|null;
+  const pieces: Piece[] = [];
+
+  while ((match = TOKEN.exec(text)) !== null) {
+    const token = match[1];
+    if (token === 'IDENT') {
+      pieces.push(IDENTIFIER);
+    } else if (token === ELLIPSIS) {
+      pieces.push(SKIP);
+    } else {
+      pieces.push(token);
+    }
+  }
+
+  if (pieces.length === 0 || TOKEN.lastIndex !== 0) {
+    const from = TOKEN.lastIndex;
+    const to = from + ERROR_CONTEXT_WIDTH;
+    throw Error(`Invalid test, no token found for '${text.substr(from, to)}...'`);
+  }
+
+  return pieces;
+}
+
+export function expectEmit(
+    source: string, expected: string, description: string,
+    assertIdentifiers?: {[name: string]: RegExp}) {
+  // turns `// ...` into `…`
+  // remove `// TODO` comment lines
+  expected = expected.replace(/\/\/\s*\.\.\./g, ELLIPSIS).replace(/\/\/\s*TODO.*?\n/g, '');
+
+  const pieces = tokenize(expected);
+  const {regexp, groups} = buildMatcher(pieces);
+  const matches = source.match(regexp);
+  if (matches === null) {
+    let last: number = 0;
+    for (let i = 1; i < pieces.length; i++) {
+      const {regexp} = buildMatcher(pieces.slice(0, i));
+      const m = source.match(regexp);
+      const expectedPiece = pieces[i - 1] == IDENTIFIER ? '<IDENT>' : pieces[i - 1];
+      if (!m) {
+        fail(
+            `${description}: Expected to find ${expectedPiece} '${source.substr(0,last)}[<---HERE expected "${expectedPiece}"]${source.substr(last)}'`);
+        return;
+      } else {
+        last = (m.index || 0) + m[0].length;
+      }
+    }
+    fail(
+        `Test helper failure: Expected expression failed but the reporting logic could not find where it failed in: ${source}`);
+  } else {
+    if (assertIdentifiers) {
+      // It might be possible to add the constraints in the original regexp (see `buildMatcher`)
+      // by transforming the assertion regexps when using anchoring, grouping, back references,
+      // flags, ...
+      //
+      // Checking identifiers after they have matched allows for a simple and flexible
+      // implementation.
+      // The overall performance are not impacted when `assertIdentifiers` is empty.
+      const ids = Object.keys(assertIdentifiers);
+      for (let i = 0; i < ids.length; i++) {
+        const id = ids[i];
+        if (groups.has(id)) {
+          const name = matches[groups.get(id) as number];
+          const regexp = assertIdentifiers[id];
+          if (!regexp.test(name)) {
+            throw Error(
+                `${description}: The matching identifier "${id}" is "${name}" which doesn't match ${regexp}`);
+          }
+        }
+      }
+    }
+  }
+}
+
+const IDENT_LIKE = /^[a-z][A-Z]/;
+const MATCHING_IDENT = /^\$.*\$$/;
+
+/*
+ * Builds a regexp that matches the given `pieces`
+ *
+ * It returns:
+ * - the `regexp` to be used to match the generated code,
+ * - the `groups` which maps `$...$` identifier to their position in the regexp matches.
+ */
+function buildMatcher(pieces: (string | RegExp)[]): {regexp: RegExp, groups: Map<string, number>} {
+  const results: string[] = [];
+  let first = true;
+  let group = 0;
+
+  const groups = new Map<string, number>();
+  for (const piece of pieces) {
+    if (!first)
+      results.push(`\\s${typeof piece === 'string' && IDENT_LIKE.test(piece) ? '+' : '*'}`);
+    first = false;
+    if (typeof piece === 'string') {
+      if (MATCHING_IDENT.test(piece)) {
+        const matchGroup = groups.get(piece);
+        if (!matchGroup) {
+          results.push('(' + IDENTIFIER.source + ')');
+          const newGroup = ++group;
+          groups.set(piece, newGroup);
+        } else {
+          results.push(`\\${matchGroup}`);
+        }
+      } else {
+        results.push(escapeRegExp(piece));
+      }
+    } else {
+      results.push('(?:' + piece.source + ')');
+    }
+  }
+  return {
+    regexp: new RegExp(results.join('')),
+    groups,
+  };
+}
+
+
+export function compile(
+    data: MockDirectory, angularFiles: MockData, options: AotCompilerOptions = {},
+    errorCollector: (error: any, fileName?: string) => void = error => { throw error;}): {
+  source: string,
+} {
+  const testFiles = toMockFileArray(data);
+  const scripts = testFiles.map(entry => entry.fileName);
+  const angularFilesArray = toMockFileArray(angularFiles);
+  const files = arrayToMockDir([...testFiles, ...angularFilesArray]);
+  const mockCompilerHost = new MockCompilerHost(scripts, files);
+
+  const program = new NgtscProgram(
+      scripts, {
+        target: ts.ScriptTarget.ES2015,
+        module: ts.ModuleKind.ES2015,
+        moduleResolution: ts.ModuleResolutionKind.NodeJs, ...options,
+      },
+      mockCompilerHost);
+  program.emit();
+  const source =
+      scripts.map(script => mockCompilerHost.readFile(script.replace(/\.ts$/, '.js'))).join('\n');
+
+  return {source};
+}
diff --git a/packages/compiler/test/render3/mock_compiler_spec.ts b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
similarity index 96%
rename from packages/compiler/test/render3/mock_compiler_spec.ts
rename to packages/compiler-cli/test/compliance/mock_compiler_spec.ts
index 3b7ceffa87..128890af0e 100644
--- a/packages/compiler/test/render3/mock_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
@@ -7,7 +7,7 @@
  */
 
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 describe('mock_compiler', () => {
@@ -47,9 +47,6 @@ describe('mock_compiler', () => {
       // result.source contains just the emitted factory declarations regardless of the original
       // module.
       expect(result.source).toContain('Hello');
-
-      // The output context is also returned if the actual output ast is needed.
-      expect(result.outputContext.statements.length).toBeGreaterThan(0);
     });
   });
 
@@ -143,7 +140,7 @@ describe('mock_compiler', () => {
     expectEmit(
         result.source, `
     // TODO: this comment should not be taken into account
-    $r3$.ɵT(0, 'Hello!');
+    $r3$.ɵT(0, "Hello!");
     // TODO: this comment should not be taken into account
     `,
         'todo comments should be ignored');
diff --git a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
similarity index 77%
rename from packages/compiler/test/render3/r3_compiler_compliance_spec.ts
rename to packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 007c103bc4..33bf098b7f 100644
--- a/packages/compiler/test/render3/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {InitialStylingFlags} from '../../src/core';
-import {MockDirectory, setup} from '../aot/test_util';
-
+import {InitialStylingFlags} from '@angular/compiler/src/core';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 
@@ -47,21 +46,21 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-        const $c1$ = ['title', 'Hello'];
-        const $c2$ = ['my-app', ${InitialStylingFlags.VALUES_MODE}, 'my-app', true];
-        const $c3$ = ['cx', '20', 'cy', '30', 'r', '50'];
+        const $c1$ = ["title", "Hello"];
+        const $c2$ = ["my-app", ${InitialStylingFlags.VALUES_MODE}, "my-app", true];
+        const $c3$ = ["cx", "20", "cy", "30", "r", "50"];
         …
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $c1$);
-            $r3$.ɵs((null as any), $c2$);
+            $r3$.ɵE(0, "div", $c1$);
+            $r3$.ɵs(null, $c2$);
             $r3$.ɵNS();
-            $r3$.ɵE(1, 'svg');
-            $r3$.ɵEe(2, 'circle', $c3$);
+            $r3$.ɵE(1, "svg");
+            $r3$.ɵEe(2, "circle", $c3$);
             $r3$.ɵe();
             $r3$.ɵNH();
-            $r3$.ɵE(3, 'p');
-            $r3$.ɵT(4, 'test');
+            $r3$.ɵE(3, "p");
+            $r3$.ɵT(4, "test");
             $r3$.ɵe();
             $r3$.ɵe();
           }
@@ -98,20 +97,20 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-        const $c1$ = ['title', 'Hello'];
-        const $c2$ = ['my-app', ${InitialStylingFlags.VALUES_MODE}, 'my-app', true];
+        const $c1$ = ["title", "Hello"];
+        const $c2$ = ["my-app", ${InitialStylingFlags.VALUES_MODE}, "my-app", true];
         …
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $c1$);
-            $r3$.ɵs((null as any), $c2$);
+            $r3$.ɵE(0, "div", $c1$);
+            $r3$.ɵs(null, $c2$);
             $r3$.ɵNM();
-            $r3$.ɵE(1, 'math');
-            $r3$.ɵEe(2, 'infinity');
+            $r3$.ɵE(1, "math");
+            $r3$.ɵEe(2, "infinity");
             $r3$.ɵe();
             $r3$.ɵNH();
-            $r3$.ɵE(3, 'p');
-            $r3$.ɵT(4, 'test');
+            $r3$.ɵE(3, "p");
+            $r3$.ɵT(4, "test");
             $r3$.ɵe();
             $r3$.ɵe();
           }
@@ -148,18 +147,18 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-        const $c1$ = ['title', 'Hello'];
-        const $c2$ = ['my-app', ${InitialStylingFlags.VALUES_MODE}, 'my-app', true];
+        const $c1$ = ["title", "Hello"];
+        const $c2$ = ["my-app", ${InitialStylingFlags.VALUES_MODE}, "my-app", true];
         …
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div', $c1$);
-            $r3$.ɵs((null as any), $c2$);
-            $r3$.ɵT(1, 'Hello ');
-            $r3$.ɵE(2, 'b');
-            $r3$.ɵT(3, 'World');
+            $r3$.ɵE(0, "div", $c1$);
+            $r3$.ɵs(null, $c2$);
+            $r3$.ɵT(1, "Hello ");
+            $r3$.ɵE(2, "b");
+            $r3$.ɵT(3, "World");
             $r3$.ɵe();
-            $r3$.ɵT(4, '!');
+            $r3$.ɵT(4, "!");
             $r3$.ɵe();
           }
         }
@@ -197,16 +196,16 @@ describe('compiler compliance', () => {
 
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
-          const $c1$ = ['class', 'my-app', 0, 'http://someuri/foo', 'foo:bar', 'baz', 'title', 'Hello', 0, 'http://someuri/foo', 'foo:qux', 'quacks'];
+          const $c1$ = ["class", "my-app", 0, "http://someuri/foo", "foo:bar", "baz", "title", "Hello", 0, "http://someuri/foo", "foo:qux", "quacks"];
           …
-          template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div', $e0_attrs$);
-              $r3$.ɵT(1, 'Hello ');
-              $r3$.ɵE(2, 'b');
-              $r3$.ɵT(3, 'World');
+              $r3$.ɵE(0, "div", $e0_attrs$);
+              $r3$.ɵT(1, "Hello ");
+              $r3$.ɵE(2, "b");
+              $r3$.ɵT(3, "World");
               $r3$.ɵe();
-              $r3$.ɵT(4, '!');
+              $r3$.ɵT(4, "!");
               $r3$.ɵe();
             }
           }
@@ -241,12 +240,12 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
+            $r3$.ɵEe(0, "div");
           }
           if (rf & 2) {
-            $r3$.ɵp(0, 'id', $r3$.ɵb(ctx.id));
+            $r3$.ɵp(0, "id", $r3$.ɵb(ctx.id));
           }
         }
       `;
@@ -285,17 +284,17 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵEe(0, 'div');
-            $r3$.ɵPp(1,'pipe');
+            $r3$.ɵEe(0, "div");
+            $r3$.ɵPp(1,"pipe");
             $r3$.ɵrS(10);
           }
           if (rf & 2) {
-            $r3$.ɵp(0, 'ternary', $r3$.ɵb((ctx.cond ? $r3$.ɵf1(2, _c0, ctx.a): _c1)));
-            $r3$.ɵp(0, 'pipe', $r3$.ɵb($r3$.ɵpb3(6, 1, ctx.value, 1, 2)));
-            $r3$.ɵp(0, 'and', $r3$.ɵb((ctx.cond && $r3$.ɵf1(4, _c0, ctx.b))));
-            $r3$.ɵp(0, 'or', $r3$.ɵb((ctx.cond || $r3$.ɵf1(6, _c0, ctx.c))));
+            $r3$.ɵp(0, "ternary", $r3$.ɵb((ctx.cond ? $r3$.ɵf1(2, _c0, ctx.a): _c1)));
+            $r3$.ɵp(0, "pipe", $r3$.ɵb($r3$.ɵpb3(6, 1, ctx.value, 1, 2)));
+            $r3$.ɵp(0, "and", $r3$.ɵb((ctx.cond && $r3$.ɵf1(4, _c0, ctx.b))));
+            $r3$.ɵp(0, "or", $r3$.ɵb((ctx.cond || $r3$.ɵf1(6, _c0, ctx.c))));
           }
         }
       `;
@@ -330,24 +329,25 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        const _c0 = ['background-color'];
-        const _c1 = ['error'];
-        class MyComponent {
-          static ngComponentDef = i0.ɵdefineComponent({type:MyComponent,selectors:[['my-component']],
-              factory:function MyComponent_Factory(){
-                return new MyComponent();
-              },template:function MyComponent_Template(rf:number,ctx:any){
-                if (rf & 1) {
-                  $r3$.ɵE(0, 'div');
-                  $r3$.ɵs(_c0, _c1);
-                  $r3$.ɵe();
-                }
-                if (rf & 2) {
-                  $r3$.ɵsp(0, 0, ctx.color);
-                  $r3$.ɵcp(0, 0, ctx.error);
-                  $r3$.ɵsa(0);
-                }
+        const _c0 = ["background-color"];
+        const _c1 = ["error"];
+        …
+        MyComponent.ngComponentDef = i0.ɵdefineComponent({type:MyComponent,selectors:[["my-component"]],
+            factory:function MyComponent_Factory(){
+              return new MyComponent();
+            },template:function MyComponent_Template(rf,ctx){
+              if (rf & 1) {
+                $r3$.ɵE(0, "div");
+                $r3$.ɵs(_c0, _c1);
+                $r3$.ɵe();
               }
+              if (rf & 2) {
+                $r3$.ɵsp(0, 0, ctx.color);
+                $r3$.ɵcp(0, 0, ctx.error);
+                $r3$.ɵsa(0);
+              }
+            }
+        });
       `;
 
 
@@ -383,38 +383,38 @@ describe('compiler compliance', () => {
 
       // ChildComponent definition should be:
       const ChildComponentDefinition = `
-        static ngComponentDef = $r3$.ɵdefineComponent({
+        ChildComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: ChildComponent,
-          selectors: [['child']],
+          selectors: [["child"]],
           factory: function ChildComponent_Factory() { return new ChildComponent(); },
-          template: function ChildComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function ChildComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵT(0, 'child-view');
+              $r3$.ɵT(0, "child-view");
             }
           }
         });`;
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        static ngDirectiveDef = $r3$.ɵdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ɵdefineDirective({
           type: SomeDirective,
-          selectors: [['', 'some-directive', '']],
+          selectors: [["", "some-directive", ""]],
           factory: function SomeDirective_Factory() {return new SomeDirective(); }
         });
       `;
 
       // MyComponent definition should be:
       const MyComponentDefinition = `
-        const $c1$ = ['some-directive', ''];
+        const $c1$ = ["some-directive", ""];
         …
-        static ngComponentDef = $r3$.ɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: MyComponent,
-          selectors: [['my-component']],
+          selectors: [["my-component"]],
           factory: function MyComponent_Factory() { return new MyComponent(); },
-          template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'child', $c1$);
-              $r3$.ɵT(1, '!');
+              $r3$.ɵEe(0, "child", $c1$);
+              $r3$.ɵT(1, "!");
             }
           },
           directives: [ChildComponent, SomeDirective]
@@ -450,18 +450,18 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        static ngDirectiveDef = $r3$.ɵdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ɵdefineDirective({
           type: SomeDirective,
-          selectors: [['div', 'some-directive', '', 8, 'foo', 3, 'title', '', 9, 'baz']],
+          selectors: [["div", "some-directive", "", 8, "foo", 3, "title", "", 9, "baz"]],
           factory: function SomeDirective_Factory() {return new SomeDirective(); }
         });
       `;
 
       // OtherDirective definition should be:
       const OtherDirectiveDefinition = `
-        static ngDirectiveDef = $r3$.ɵdefineDirective({
+        OtherDirective.ngDirectiveDef = $r3$.ɵdefineDirective({
           type: OtherDirective,
-          selectors: [['', 5, 'span', 'title', '', 9, 'baz']],
+          selectors: [["", 5, "span", "title", "", 9, "baz"]],
           factory: function OtherDirective_Factory() {return new OtherDirective(); }
         });
       `;
@@ -491,13 +491,12 @@ describe('compiler compliance', () => {
       };
 
       const HostBindingDirDeclaration = `
-        static ngDirectiveDef = $r3$.ɵdefineDirective({
+        HostBindingDir.ngDirectiveDef = $r3$.ɵdefineDirective({
           type: HostBindingDir,
-          selectors: [['', 'hostBindingDir', '']],
+          selectors: [["", "hostBindingDir", ""]],
           factory: function HostBindingDir_Factory() { return new HostBindingDir(); },
-          hostBindings: function HostBindingDir_HostBindings(
-              dirIndex: $number$, elIndex: $number$) {
-            $r3$.ɵp(elIndex, 'id', $r3$.ɵb($r3$.ɵd(dirIndex).dirId));
+          hostBindings: function HostBindingDir_HostBindings(dirIndex, elIndex) {
+            $r3$.ɵp(elIndex, "id", $r3$.ɵb($r3$.ɵd(dirIndex).dirId));
           }
         });
       `;
@@ -534,34 +533,34 @@ describe('compiler compliance', () => {
       };
 
       const IfDirectiveDefinition = `
-        static ngDirectiveDef = $r3$.ɵdefineDirective({
+        IfDirective.ngDirectiveDef = $r3$.ɵdefineDirective({
           type: IfDirective,
-          selectors: [['', 'if', '']],
+          selectors: [["", "if", ""]],
           factory: function IfDirective_Factory() { return new IfDirective($r3$.ɵinjectTemplateRef()); }
         });`;
       const MyComponentDefinition = `
-        const $c1$ = ['foo', ''];
-        const $c2$ = ['if', ''];
+        const $c1$ = ["foo", ""];
+        const $c2$ = ["if", ""];
         …
-        static ngComponentDef = $r3$.ɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: MyComponent,
-          selectors: [['my-component']],
+          selectors: [["my-component"]],
           factory: function MyComponent_Factory() { return new MyComponent(); },
-          template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'ul', null, $c1$);
+              $r3$.ɵE(0, "ul", null, $c1$);
               $r3$.ɵC(2, MyComponent_li_Template_2, null, $c2$);
               $r3$.ɵe();
             }
             const $foo$ = $r3$.ɵld(1);
-            function MyComponent_li_Template_2(rf: IDENT, ctx0: IDENT) {
+            function MyComponent_li_Template_2(rf, ctx0) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'li');
+                $r3$.ɵE(0, "li");
                 $r3$.ɵT(1);
                 $r3$.ɵe();
               }
               if (rf & 2) {
-                $r3$.ɵt(1, $r3$.ɵi2('', ctx.salutation, ' ', $foo$, ''));
+                $r3$.ɵt(1, $r3$.ɵi2("", ctx.salutation, " ", $foo$, ""));
               }
             }
           },
@@ -611,19 +610,19 @@ describe('compiler compliance', () => {
         };
 
         const MyAppDeclaration = `
-          const $e0_ff$ = ($v$: any) => { return ['Nancy', $v$]; };
+          const $e0_ff$ = function ($v$) { return ["Nancy", $v$]; };
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵdefineComponent({
             type: MyApp,
-            selectors: [['my-app']],
+            selectors: [["my-app"]],
             factory: function MyApp_Factory() { return new MyApp(); },
-            template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
+            template: function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'my-comp');
+                $r3$.ɵEe(0, "my-comp");
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
-                $r3$.ɵp(0, 'names', $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.customName)));
+                $r3$.ɵp(0, "names", $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.customName)));
               }
             },
            directives: [MyComp]
@@ -688,22 +687,22 @@ describe('compiler compliance', () => {
         };
 
         const MyAppDefinition = `
-          const $e0_ff$ = ($v0$: $any$, $v1$: $any$, $v2$: $any$, $v3$: $any$, $v4$: $any$, $v5$: $any$, $v6$: $any$, $v7$: $any$, $v8$: $any$) => {
-            return ['start-', $v0$, $v1$, $v2$, $v3$, $v4$, '-middle-', $v5$, $v6$, $v7$, $v8$, '-end'];
+          const $e0_ff$ = function ($v0$, $v1$, $v2$, $v3$, $v4$, $v5$, $v6$, $v7$, $v8$) {
+            return ["start-", $v0$, $v1$, $v2$, $v3$, $v4$, "-middle-", $v5$, $v6$, $v7$, $v8$, "-end"];
           }
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵdefineComponent({
             type: MyApp,
-            selectors: [['my-app']],
+            selectors: [["my-app"]],
             factory: function MyApp_Factory() { return new MyApp(); },
-            template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
+            template: function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'my-comp');
+                $r3$.ɵEe(0, "my-comp");
                 $r3$.ɵrS(10);
               }
               if (rf & 2) {
                 $r3$.ɵp(
-                    0, 'names',
+                    0, "names",
                     $r3$.ɵb($r3$.ɵfV(10, $e0_ff$, [ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8])));
               }
             },
@@ -751,19 +750,19 @@ describe('compiler compliance', () => {
         };
 
         const MyAppDefinition = `
-          const $e0_ff$ = ($v$: any) => { return {'duration': 500, animation: $v$}; };
+          const $e0_ff$ = function ($v$) { return {"duration": 500, animation: $v$}; };
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵdefineComponent({
             type: MyApp,
-            selectors: [['my-app']],
+            selectors: [["my-app"]],
             factory: function MyApp_Factory() { return new MyApp(); },
-            template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
+            template: function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'object-comp');
+                $r3$.ɵEe(0, "object-comp");
                 $r3$.ɵrS(2);
               }
               if (rf & 2) {
-                $r3$.ɵp(0, 'config', $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.name)));
+                $r3$.ɵp(0, "config", $r3$.ɵb($r3$.ɵf1(2, $e0_ff$, ctx.name)));
               }
             },
             directives: [ObjectComp]
@@ -814,22 +813,22 @@ describe('compiler compliance', () => {
 
         const MyAppDefinition = `
           const $c0$ = {opacity: 0, duration: 0};
-          const $e0_ff$ = ($v$: any) => { return {opacity: 1, duration: $v$}; };
-          const $e0_ff_1$ = ($v$: any) => { return [$c0$, $v$]; };
-          const $e0_ff_2$ = ($v1$: any, $v2$: any) => { return {animation: $v1$, actions: $v2$}; };
+          const $e0_ff$ = function ($v$) { return {opacity: 1, duration: $v$}; };
+          const $e0_ff_1$ = function ($v$) { return [$c0$, $v$]; };
+          const $e0_ff_2$ = function ($v1$, $v2$) { return {animation: $v1$, actions: $v2$}; };
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵdefineComponent({
             type: MyApp,
-            selectors: [['my-app']],
+            selectors: [["my-app"]],
             factory: function MyApp_Factory() { return new MyApp(); },
-            template: function MyApp_Template(rf: $RenderFlags$, ctx: $MyApp$) {
+            template: function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'nested-comp');
+                $r3$.ɵEe(0, "nested-comp");
                 $r3$.ɵrS(7);
               }
               if (rf & 2) {
                 $r3$.ɵp(
-                    0, 'config',
+                    0, "config",
                     $r3$.ɵb($r3$.ɵf2(7, $e0_ff_2$, ctx.name, $r3$.ɵf1(4, $e0_ff_1$, $r3$.ɵf1(2, $e0_ff$, ctx.duration)))));
               }
             },
@@ -875,14 +874,14 @@ describe('compiler compliance', () => {
       };
 
       const SimpleComponentDefinition = `
-        static ngComponentDef = $r3$.ɵdefineComponent({
+        SimpleComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: SimpleComponent,
-          selectors: [['simple']],
+          selectors: [["simple"]],
           factory: function SimpleComponent_Factory() { return new SimpleComponent(); },
-          template: function SimpleComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function SimpleComponent_Template(rf, ctx) {
             if (rf & 1) {
               $r3$.ɵpD();
-              $r3$.ɵE(0, 'div');
+              $r3$.ɵE(0, "div");
               $r3$.ɵP(1);
               $r3$.ɵe();
             }
@@ -890,22 +889,22 @@ describe('compiler compliance', () => {
         });`;
 
       const ComplexComponentDefinition = `
-        const $c1$ = [[['span', 'title', 'tofirst']], [['span', 'title', 'tosecond']]];
-        const $c2$ = ['span[title=toFirst]', 'span[title=toSecond]'];
-        const $c3$ = ['id','first'];
-        const $c4$ = ['id','second'];
+        const $c1$ = [[["span", "title", "tofirst"]], [["span", "title", "tosecond"]]];
+        const $c2$ = ["span[title=toFirst]", "span[title=toSecond]"];
+        const $c3$ = ["id","first"];
+        const $c4$ = ["id","second"];
         …
-        static ngComponentDef = $r3$.ɵdefineComponent({
+        ComplexComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: ComplexComponent,
-          selectors: [['complex']],
+          selectors: [["complex"]],
           factory: function ComplexComponent_Factory() { return new ComplexComponent(); },
-          template: function ComplexComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function ComplexComponent_Template(rf, ctx) {
             if (rf & 1) {
               $r3$.ɵpD($c1$, $c2$);
-              $r3$.ɵE(0, 'div', $c3$);
+              $r3$.ɵE(0, "div", $c3$);
               $r3$.ɵP(1, 1);
               $r3$.ɵe();
-              $r3$.ɵE(2, 'div', $c4$);
+              $r3$.ɵE(2, "div", $c4$);
               $r3$.ɵP(3, 2);
               $r3$.ɵe();
             }
@@ -958,17 +957,17 @@ describe('compiler compliance', () => {
         };
 
         const ViewQueryComponentDefinition = `
-          const $e0_attrs$ = ['someDir',''];
+          const $e0_attrs$ = ["someDir",""];
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ɵdefineComponent({
             type: ViewQueryComponent,
-            selectors: [['view-query-component']],
+            selectors: [["view-query-component"]],
             factory: function ViewQueryComponent_Factory() { return new ViewQueryComponent(); },
-            template: function ViewQueryComponent_Template(rf: $RenderFlags$, ctx: $ViewQueryComponent$) {
-              var $tmp$: $any$;
+            template: function ViewQueryComponent_Template(rf, ctx) {
+              var $tmp$;
               if (rf & 1) {
                 $r3$.ɵQ(0, SomeDirective, true);
-                $r3$.ɵEe(1, 'div', $e0_attrs$);
+                $r3$.ɵEe(1, "div", $e0_attrs$);
               }
               if (rf & 2) {
                 ($r3$.ɵqR(($tmp$ = $r3$.ɵld(0))) && (ctx.someDir = $tmp$.first));
@@ -1018,22 +1017,20 @@ describe('compiler compliance', () => {
         };
 
         const ContentQueryComponentDefinition = `
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ɵdefineComponent({
             type: ContentQueryComponent,
-            selectors: [['content-query-component']],
+            selectors: [["content-query-component"]],
             factory: function ContentQueryComponent_Factory() {
               return [new ContentQueryComponent(), $r3$.ɵQ(null, SomeDirective, true)];
             },
-            hostBindings: function ContentQueryComponent_HostBindings(
-                dirIndex: $number$, elIndex: $number$) {
-              var $tmp$: $any$;
+            hostBindings: function ContentQueryComponent_HostBindings(dirIndex, elIndex) {
+              var $tmp$;
               ($r3$.ɵqR(($tmp$ = $r3$.ɵd(dirIndex)[1])) && ($r3$.ɵd(dirIndex)[0].someDir = $tmp$.first));
             },
-            template: function ContentQueryComponent_Template(
-                rf: $RenderFlags$, ctx: $ContentQueryComponent$) {
+            template: function ContentQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵpD();
-                $r3$.ɵE(0, 'div');
+                $r3$.ɵE(0, "div");
                 $r3$.ɵP(1);
                 $r3$.ɵe();
               }
@@ -1089,41 +1086,41 @@ describe('compiler compliance', () => {
 
       it('should render pipes', () => {
         const MyPipeDefinition = `
-            static ngPipeDef = $r3$.ɵdefinePipe(
-                {name: 'myPipe', type: MyPipe, factory: function MyPipe_Factory() { return new MyPipe(); }, pure: false});
+            MyPipe.ngPipeDef = $r3$.ɵdefinePipe(
+                {name: "myPipe", type: MyPipe, factory: function MyPipe_Factory() { return new MyPipe(); }, pure: false});
         `;
 
         const MyPurePipeDefinition = `
-            static ngPipeDef = $r3$.ɵdefinePipe({
-              name: 'myPurePipe',
+            MyPurePipe.ngPipeDef = $r3$.ɵdefinePipe({
+              name: "myPurePipe",
               type: MyPurePipe,
               factory: function MyPurePipe_Factory() { return new MyPurePipe(); },
               pure: true
             });`;
 
         const MyAppDefinition = `
-            const $c0$ = ($a0$: any) => {
+            const $c0$ = function ($a0$) {
               return [$a0$, 1, 2, 3, 4, 5];
             };
             // ...
-            static ngComponentDef = $r3$.ɵdefineComponent({
+            MyApp.ngComponentDef = $r3$.ɵdefineComponent({
               type: MyApp,
-              selectors: [['my-app']],
+              selectors: [["my-app"]],
               factory: function MyApp_Factory() { return new MyApp(); },
-              template: function MyApp_Template(rf: IDENT, ctx: IDENT) {
+              template: function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
                   $r3$.ɵT(0);
-                  $r3$.ɵPp(1, 'myPurePipe');
-                  $r3$.ɵPp(2, 'myPipe');
-                  $r3$.ɵE(3, 'p');
+                  $r3$.ɵPp(1, "myPurePipe");
+                  $r3$.ɵPp(2, "myPipe");
+                  $r3$.ɵE(3, "p");
                   $r3$.ɵT(4);
-                  $r3$.ɵPp(5, 'myPipe');
+                  $r3$.ɵPp(5, "myPipe");
                   $r3$.ɵe();
                   $r3$.ɵrS(15);
                 }
                 if (rf & 2) {
-                  $r3$.ɵt(0, $r3$.ɵi1('', $r3$.ɵpb2(1, 3, $r3$.ɵpb2(2, 6, ctx.name, ctx.size), ctx.size), ''));
-                  $r3$.ɵt(4, $r3$.ɵi1('', $r3$.ɵpbV(5, 13 , $r3$.ɵf1(15, $c0$, ctx.name)), ''));
+                  $r3$.ɵt(0, $r3$.ɵi1("", $r3$.ɵpb2(1, 3, $r3$.ɵpb2(2, 6, ctx.name, ctx.size), ctx.size), ""));
+                  $r3$.ɵt(4, $r3$.ɵi1("", $r3$.ɵpbV(5, 13 , $r3$.ɵf1(15, $c0$, ctx.name)), ""));
                 }
               },
               pipes: [MyPurePipe, MyPipe]
@@ -1154,20 +1151,20 @@ describe('compiler compliance', () => {
       };
 
       const MyComponentDefinition = `
-        const $c1$ = ['user', ''];
+        const $c1$ = ["user", ""];
         …
-        static ngComponentDef = $r3$.ɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: MyComponent,
-          selectors: [['my-component']],
+          selectors: [["my-component"]],
           factory: function MyComponent_Factory() { return new MyComponent(); },
-          template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+          template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵEe(0, 'input', null, $c1$);
+              $r3$.ɵEe(0, "input", null, $c1$);
               $r3$.ɵT(2);
             }
             const $user$ = $r3$.ɵld(1);
             if (rf & 2) {
-              $r3$.ɵt(2, $r3$.ɵi1('Hello ', $user$.value, '!'));
+              $r3$.ɵt(2, $r3$.ɵi1("Hello ", $user$.value, "!"));
             }
           }
         });
@@ -1225,28 +1222,28 @@ describe('compiler compliance', () => {
 
       it('should gen hooks with a few simple components', () => {
         const LifecycleCompDefinition = `
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          LifecycleComp.ngComponentDef = $r3$.ɵdefineComponent({
             type: LifecycleComp,
-            selectors: [['lifecycle-comp']],
+            selectors: [["lifecycle-comp"]],
             factory: function LifecycleComp_Factory() { return new LifecycleComp(); },
-            inputs: {nameMin: 'name'},
+            inputs: {nameMin: "name"},
             features: [$r3$.ɵNgOnChangesFeature],
-            template: function LifecycleComp_Template(rf: IDENT, ctx: IDENT) {}
+            template: function LifecycleComp_Template(rf, ctx) {}
           });`;
 
         const SimpleLayoutDefinition = `
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          SimpleLayout.ngComponentDef = $r3$.ɵdefineComponent({
             type: SimpleLayout,
-            selectors: [['simple-layout']],
+            selectors: [["simple-layout"]],
             factory: function SimpleLayout_Factory() { return new SimpleLayout(); },
-            template: function SimpleLayout_Template(rf: IDENT, ctx: IDENT) {
+            template: function SimpleLayout_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵEe(0, 'lifecycle-comp');
-                $r3$.ɵEe(1, 'lifecycle-comp');
+                $r3$.ɵEe(0, "lifecycle-comp");
+                $r3$.ɵEe(1, "lifecycle-comp");
               }
               if (rf & 2) {
-                $r3$.ɵp(0, 'name', $r3$.ɵb(ctx.name1));
-                $r3$.ɵp(1, 'name', $r3$.ɵb(ctx.name2));
+                $r3$.ɵp(0, "name", $r3$.ɵb(ctx.name1));
+                $r3$.ɵp(1, "name", $r3$.ɵb(ctx.name2));
               }
             },
             directives: [LifecycleComp]
@@ -1340,37 +1337,37 @@ describe('compiler compliance', () => {
 
         // TODO(benlesh): Enforce this when the directives are specified
         const ForDirectiveDefinition = `
-              static ngDirectiveDef = $r3$.ɵdefineDirective({
+              ForOfDirective.ngDirectiveDef = $r3$.ɵdefineDirective({
                 type: ForOfDirective,
-                selectors: [['', 'forOf', '']],
+                selectors: [["", "forOf", ""]],
                 factory: function ForOfDirective_Factory() {
                   return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
                 },
                 features: [$r3$.ɵNgOnChangesFeature],
-                inputs: {forOf: 'forOf'}
+                inputs: {forOf: "forOf"}
               });
             `;
 
         const MyComponentDefinition = `
-              const $_c0$ = ['for','','forOf',''];
+              const $_c0$ = ["for","","forOf",""];
               …
-              static ngComponentDef = $r3$.ɵdefineComponent({
+              MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
                 type: MyComponent,
-                selectors: [['my-component']],
+                selectors: [["my-component"]],
                 factory: function MyComponent_Factory() { return new MyComponent(); },
-                template: function MyComponent_Template(rf:IDENT,ctx:IDENT){
+                template: function MyComponent_Template(rf, ctx){
                   if (rf & 1) {
                     $r3$.ɵNS();
-                    $r3$.ɵE(0,'svg');
+                    $r3$.ɵE(0,"svg");
                     $r3$.ɵC(1,MyComponent__svg_g_Template_1,null,$_c0$);
                     $r3$.ɵe();
                   }
-                  if (rf & 2) { $r3$.ɵp(1,'forOf',$r3$.ɵb(ctx.items)); }
-                  function MyComponent__svg_g_Template_1(rf:IDENT,ctx0:IDENT) {
+                  if (rf & 2) { $r3$.ɵp(1,"forOf",$r3$.ɵb(ctx.items)); }
+                  function MyComponent__svg_g_Template_1(rf, ctx0) {
                     if (rf & 1) {
                       $r3$.ɵNS();
-                      $r3$.ɵE(0,'g');
-                      $r3$.ɵEe(1,'circle');
+                      $r3$.ɵE(0,"g");
+                      $r3$.ɵEe(1,"circle");
                       $r3$.ɵe();
                     }
                   }
@@ -1413,43 +1410,43 @@ describe('compiler compliance', () => {
 
         // TODO(chuckj): Enforce this when the directives are specified
         const ForDirectiveDefinition = `
-          static ngDirectiveDef = $r3$.ɵdefineDirective({
+          ForOfDirective.ngDirectiveDef = $r3$.ɵdefineDirective({
             type: ForOfDirective,
-            selectors: [['', 'forOf', '']],
+            selectors: [["", "forOf", ""]],
             factory: function ForOfDirective_Factory() {
               return new ForOfDirective($r3$.ɵinjectViewContainerRef(), $r3$.ɵinjectTemplateRef());
             },
             features: [$r3$.ɵNgOnChangesFeature],
-            inputs: {forOf: 'forOf'}
+            inputs: {forOf: "forOf"}
           });
         `;
 
         const MyComponentDefinition = `
-          const $_c0$ = ['for','','forOf',''];
+          const $_c0$ = ["for","","forOf",""];
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
             type: MyComponent,
-            selectors: [['my-component']],
+            selectors: [["my-component"]],
             factory: function MyComponent_Factory() { return new MyComponent(); },
-            template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+            template: function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'ul');
+                $r3$.ɵE(0, "ul");
                 $r3$.ɵC(1, MyComponent_li_Template_1, null, $_c0$);
                 $r3$.ɵe();
               }
               if (rf & 2) {
-                $r3$.ɵp(1, 'forOf', $r3$.ɵb(ctx.items));
+                $r3$.ɵp(1, "forOf", $r3$.ɵb(ctx.items));
               }
 
-              function MyComponent_li_Template_1(rf: IDENT, ctx0: IDENT) {
+              function MyComponent_li_Template_1(rf, ctx0) {
                 if (rf & 1) {
-                  $r3$.ɵE(0, 'li');
+                  $r3$.ɵE(0, "li");
                   $r3$.ɵT(1);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
                   const $item$ = ctx0.$implicit;
-                  $r3$.ɵt(1, $r3$.ɵi1('', $item$.name, ''));
+                  $r3$.ɵt(1, $r3$.ɵi1("", $item$.name, ""));
                 }
               }
             },
@@ -1503,49 +1500,49 @@ describe('compiler compliance', () => {
         };
 
         const MyComponentDefinition = `
-          const $c1$ = ['for', '', 'forOf', ''];
+          const $c1$ = ["for", "", "forOf", ""];
           …
-          static ngComponentDef = $r3$.ɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
             type: MyComponent,
-            selectors: [['my-component']],
+            selectors: [["my-component"]],
             factory: function MyComponent_Factory() { return new MyComponent(); },
-            template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+            template: function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵE(0, 'ul');
+                $r3$.ɵE(0, "ul");
                 $r3$.ɵC(1, MyComponent_li_Template_1, null, $c1$);
                 $r3$.ɵe();
               }
               if (rf & 2) {
-                $r3$.ɵp(1, 'forOf', $r3$.ɵb(ctx.items));
+                $r3$.ɵp(1, "forOf", $r3$.ɵb(ctx.items));
               }
 
-              function MyComponent_li_Template_1(rf: IDENT, ctx0: IDENT) {
+              function MyComponent_li_Template_1(rf, ctx0) {
                 if (rf & 1) {
-                  $r3$.ɵE(0, 'li');
-                  $r3$.ɵE(1, 'div');
+                  $r3$.ɵE(0, "li");
+                  $r3$.ɵE(1, "div");
                   $r3$.ɵT(2);
                   $r3$.ɵe();
-                  $r3$.ɵE(3, 'ul');
+                  $r3$.ɵE(3, "ul");
                   $r3$.ɵC(4, MyComponent_li_li_Template_4, null, $c1$);
                   $r3$.ɵe();
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
                   const $item$ = ctx0.$implicit;
-                  $r3$.ɵt(2, $r3$.ɵi1('', IDENT.name, ''));
-                  $r3$.ɵp(4, 'forOf', $r3$.ɵb(IDENT.infos));
+                  $r3$.ɵt(2, $r3$.ɵi1("", IDENT.name, ""));
+                  $r3$.ɵp(4, "forOf", $r3$.ɵb(IDENT.infos));
                 }
 
-                function MyComponent_li_li_Template_4(rf: IDENT, ctx1: IDENT) {
+                function MyComponent_li_li_Template_4(rf, ctx1) {
                   if (rf & 1) {
-                    $r3$.ɵE(0, 'li');
+                    $r3$.ɵE(0, "li");
                     $r3$.ɵT(1);
                     $r3$.ɵe();
                   }
                   if (rf & 2) {
                     const $item$ = ctx0.$implicit;
                     const $info$ = ctx1.$implicit;
-                    $r3$.ɵt(1, $r3$.ɵi2(' ', $item$.name, ': ', $info$.description, ' '));
+                    $r3$.ɵt(1, $r3$.ɵi2(" ", $item$.name, ": ", $info$.description, " "));
                   }
                 }
               }
diff --git a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
similarity index 84%
rename from packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index a9f4f3672e..4b6d9b474b 100644
--- a/packages/compiler/test/render3/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 describe('compiler compliance: bindings', () => {
@@ -37,14 +37,14 @@ describe('compiler compliance: bindings', () => {
       };
 
       const template = `
-      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+      template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ɵE(0, 'div');
+          $i0$.ɵE(0, "div");
           $i0$.ɵT(1);
           $i0$.ɵe();
         }
         if (rf & 2) {
-          $i0$.ɵt(1, $i0$.ɵi1('Hello ', $ctx$.name, ''));
+          $i0$.ɵt(1, $i0$.ɵi1("Hello ", $ctx$.name, ""));
         }
       }`;
       const result = compile(files, angularFiles);
@@ -73,12 +73,12 @@ describe('compiler compliance: bindings', () => {
       };
 
       const template = `
-      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+      template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ɵEe(0, 'a');
+          $i0$.ɵEe(0, "a");
         }
         if (rf & 2) {
-          $i0$.ɵp(0, 'title', $i0$.ɵb($ctx$.title));
+          $i0$.ɵp(0, "title", $i0$.ɵb($ctx$.title));
         }
       }`;
       const result = compile(files, angularFiles);
@@ -105,12 +105,12 @@ describe('compiler compliance: bindings', () => {
       };
 
       const template = `
-      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+      template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ɵEe(0, 'a');
+          $i0$.ɵEe(0, "a");
         }
         if (rf & 2) {
-          $i0$.ɵp(0, 'title', $i0$.ɵi1('Hello ', $ctx$.name, ''));
+          $i0$.ɵp(0, "title", $i0$.ɵi1("Hello ", $ctx$.name, ""));
         }
       }`;
       const result = compile(files, angularFiles);
diff --git a/packages/compiler/test/render3/r3_view_compiler_di_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
similarity index 96%
rename from packages/compiler/test/render3/r3_view_compiler_di_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
index 11912e0ee6..455569a0a5 100644
--- a/packages/compiler/test/render3/r3_view_compiler_di_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 describe('compiler compliance: dependency injection', () => {
diff --git a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
similarity index 87%
rename from packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index 1065b3acb9..f3af5b9a3b 100644
--- a/packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 const TRANSLATION_NAME_REGEXP = /^MSG_[A-Z0-9]+/;
@@ -43,15 +43,15 @@ describe('i18n support in the view compiler', () => {
       };
 
       const template = `
-      const $msg_1$ = goog.getMsg('Hello world');
-      const $msg_2$ = goog.getMsg('farewell');
+      const $msg_1$ = goog.getMsg("Hello world");
+      const $msg_2$ = goog.getMsg("farewell");
       …
-      template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+      template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
           …
           $r3$.ɵT(1, $msg_1$);
           …
-          $r3$.ɵT(3,'&');
+          $r3$.ɵT(3,"&");
           …
           $r3$.ɵT(5, $msg_2$);
           …
@@ -92,18 +92,18 @@ describe('i18n support in the view compiler', () => {
       /**
        * @desc desc
        */
-      const $msg_1$ = goog.getMsg('introduction');
-      const $c1$ = ['title', $msg_1$];
+      const $msg_1$ = goog.getMsg("introduction");
+      const $c1$ = ["title", $msg_1$];
       …
       /**
        * @desc desc
        * @meaning meaning
        */
-      const $msg_2$ = goog.getMsg('Hello world');
+      const $msg_2$ = goog.getMsg("Hello world");
       …
-      template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+      template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $r3$.ɵE(0, 'div', $c1$);
+          $r3$.ɵE(0, "div", $c1$);
           $r3$.ɵT(1, $msg_2$);
           $r3$.ɵe();
         }
@@ -143,12 +143,12 @@ describe('i18n support in the view compiler', () => {
        * @desc d
        * @meaning m
        */
-      const $msg_1$ = goog.getMsg('introduction');
-      const $c1$ = ['id', 'static', 'title', $msg_1$];
+      const $msg_1$ = goog.getMsg("introduction");
+      const $c1$ = ["id", "static", "title", $msg_1$];
       …
-      template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
+      template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $r3$.ɵEe(0, 'div', $c1$);
+          $r3$.ɵEe(0, "div", $c1$);
         }
       }
     `;
@@ -186,8 +186,8 @@ describe('i18n support in the view compiler', () => {
       };
 
       const template = `
-      const $r1$ = {'b':[2], 'i':[4, 6]};
-      const $r2$ = {'i':[13]};
+      const $r1$ = {"b":[2], "i":[4, 6]};
+      const $r2$ = {"i":[13]};
     `;
 
       const result = compile(files, angularFiles);
diff --git a/packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
similarity index 76%
rename from packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
index bfdbc3ab87..6b8adb4abf 100644
--- a/packages/compiler/test/render3/r3_view_compiler_input_outputs_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 describe('compiler compliance: listen()', () => {
@@ -52,29 +52,29 @@ describe('compiler compliance: listen()', () => {
     };
 
     const componentDef = `
-      static ngComponentDef = IDENT.ɵdefineComponent({
+      MyComponent.ngComponentDef = IDENT.ɵdefineComponent({
           …
           inputs:{
-            componentInput: 'componentInput',
-            originalComponentInput: 'renamedComponentInput'
+            componentInput: "componentInput",
+            originalComponentInput: "renamedComponentInput"
           },
           outputs: {
-            componentOutput: 'componentOutput',
-            originalComponentOutput: 'renamedComponentOutput'
+            componentOutput: "componentOutput",
+            originalComponentOutput: "renamedComponentOutput"
           }
           …
         });`;
 
     const directiveDef = `
-      static ngDirectiveDef = IDENT.ɵdefineDirective({
+      MyDirective.ngDirectiveDef = IDENT.ɵdefineDirective({
         …
         inputs:{
-          directiveInput: 'directiveInput',
-          originalDirectiveInput: 'renamedDirectiveInput'
+          directiveInput: "directiveInput",
+          originalDirectiveInput: "renamedDirectiveInput"
         },
         outputs: {
-          directiveOutput: 'directiveOutput',
-          originalDirectiveOutput: 'renamedDirectiveOutput'
+          directiveOutput: "directiveOutput",
+          originalDirectiveOutput: "renamedDirectiveOutput"
         }
         …
       });`;
diff --git a/packages/compiler/test/render3/r3_view_compiler_listener_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
similarity index 85%
rename from packages/compiler/test/render3/r3_view_compiler_listener_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
index 7dbf578df2..2fc273996e 100644
--- a/packages/compiler/test/render3/r3_view_compiler_listener_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 /* These tests are codified version of the tests in compiler_canonical_spec.ts. Every
@@ -41,10 +41,10 @@ describe('compiler compliance: listen()', () => {
 
     // The template should look like this (where IDENT is a wild card for an identifier):
     const template = `
-        template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵE(0, 'div');
-            $r3$.ɵL('click', function MyComponent_Template_div_click_listener($event: $any$) {
+            $r3$.ɵE(0, "div");
+            $r3$.ɵL("click", function MyComponent_Template_div_click_listener($event) {
               ctx.onClick($event);
               return (1 == 2);
             });
diff --git a/packages/compiler/test/render3/r3_view_compiler_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
similarity index 91%
rename from packages/compiler/test/render3/r3_view_compiler_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
index 192aee4b0b..c67dfb1efe 100644
--- a/packages/compiler/test/render3/r3_view_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 describe('r3_view_compiler', () => {
@@ -114,9 +114,9 @@ describe('r3_view_compiler', () => {
         }
       };
 
-      const bV_call = `$r3$.ɵiV([' ',ctx.list[0],' ',ctx.list[1],' ',ctx.list[2],' ',ctx.list[3],
-        ' ',ctx.list[4],' ',ctx.list[5],' ',ctx.list[6],' ',ctx.list[7],' ',ctx.list[8],
-        ' '])`;
+      const bV_call = `$r3$.ɵiV([" ",ctx.list[0]," ",ctx.list[1]," ",ctx.list[2]," ",ctx.list[3],
+        " ",ctx.list[4]," ",ctx.list[5]," ",ctx.list[6]," ",ctx.list[7]," ",ctx.list[8],
+        " "])`;
       const result = compile(files, angularFiles);
       expectEmit(result.source, bV_call, 'Incorrect bV call');
     });
diff --git a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
similarity index 78%
rename from packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 63b29ae47a..24ddf9447d 100644
--- a/packages/compiler/test/render3/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {InitialStylingFlags} from '../../src/core';
-import {MockDirectory, setup} from '../aot/test_util';
+import {InitialStylingFlags} from '@angular/compiler/src/core';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 
 import {compile, expectEmit} from './mock_compile';
 
@@ -40,9 +40,9 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-          template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+          template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
+              $r3$.ɵE(0, "div");
               $r3$.ɵs();
               $r3$.ɵe();
             }
@@ -85,17 +85,17 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-          const _c0 = ['opacity','width','height',${InitialStylingFlags.VALUES_MODE},'opacity','1'];
-          class MyComponent {
-            static ngComponentDef = i0.ɵdefineComponent({
+          const _c0 = ["opacity","width","height",${InitialStylingFlags.VALUES_MODE},"opacity","1"];
+          …
+          MyComponent.ngComponentDef = i0.ɵdefineComponent({
               type: MyComponent,
-              selectors:[['my-component']],
+              selectors:[["my-component"]],
               factory:function MyComponent_Factory(){
                 return new MyComponent();
               },
-              template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+              template: function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ɵE(0, 'div');
+                  $r3$.ɵE(0, "div");
                   $r3$.ɵs(_c0);
                   $r3$.ɵe();
                 }
@@ -104,7 +104,7 @@ describe('compiler compliance: styling', () => {
                   $r3$.ɵsp(0, 1, $ctx$.myWidth);
                   $r3$.ɵsp(0, 2, $ctx$.myHeight);
                   $r3$.ɵsa(0);
-                  $r3$.ɵa(0, 'style', $r3$.ɵb('border-width: 10px'));
+                  $r3$.ɵa(0, "style", $r3$.ɵb("border-width: 10px"));
                 }
               }
             });
@@ -137,14 +137,14 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-          template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+          template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵE(0, 'div');
+              $r3$.ɵE(0, "div");
               $r3$.ɵs();
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsm(0,(null as any),$ctx$.myClassExp);
+              $r3$.ɵsm(0,null,$ctx$.myClassExp);
               $r3$.ɵsa(0);
             }
           }
@@ -182,26 +182,26 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-          const _c0 = ['grape','apple','orange',${InitialStylingFlags.VALUES_MODE},'grape',true];
-          class MyComponent {
-            static ngComponentDef = i0.ɵdefineComponent({
+          const _c0 = ["grape","apple","orange",${InitialStylingFlags.VALUES_MODE},"grape",true];
+          …
+          MyComponent.ngComponentDef = i0.ɵdefineComponent({
               type: MyComponent,
-              selectors:[['my-component']],
+              selectors:[["my-component"]],
               factory:function MyComponent_Factory(){
                 return new MyComponent();
               },
-              template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+              template: function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ɵE(0, 'div');
-                  $r3$.ɵs((null as any), _c0);
+                  $r3$.ɵE(0, "div");
+                  $r3$.ɵs(null, _c0);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
-                  $r3$.ɵsm(0, (null as any), $ctx$.myClassExp);
+                  $r3$.ɵsm(0, null, $ctx$.myClassExp);
                   $r3$.ɵcp(0, 1, $ctx$.yesToApple);
                   $r3$.ɵcp(0, 2, $ctx$.yesToOrange);
                   $r3$.ɵsa(0);
-                  $r3$.ɵa(0, 'class', $r3$.ɵb('banana'));
+                  $r3$.ɵa(0, "class", $r3$.ɵb("banana"));
                 }
               }
             });
@@ -234,24 +234,24 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-          const _c0 = ['width',${InitialStylingFlags.VALUES_MODE},'width','100px'];
-          const _c1 = ['foo',${InitialStylingFlags.VALUES_MODE},'foo',true];
-          class MyComponent {
-            static ngComponentDef = i0.ɵdefineComponent({
+          const _c0 = ["width",${InitialStylingFlags.VALUES_MODE},"width","100px"];
+          const _c1 = ["foo",${InitialStylingFlags.VALUES_MODE},"foo",true];
+          …
+          MyComponent.ngComponentDef = i0.ɵdefineComponent({
               type: MyComponent,
-              selectors:[['my-component']],
+              selectors:[["my-component"]],
               factory:function MyComponent_Factory(){
                 return new MyComponent();
               },
-              template: function MyComponent_Template(rf: $RenderFlags$, $ctx$: $MyComponent$) {
+              template: function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ɵE(0, 'div');
+                  $r3$.ɵE(0, "div");
                   $r3$.ɵs(_c0, _c1);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
-                  $r3$.ɵa(0, 'class', $r3$.ɵb('round'));
-                  $r3$.ɵa(0, 'style', $r3$.ɵb('height:100px'));
+                  $r3$.ɵa(0, "class", $r3$.ɵb("round"));
+                  $r3$.ɵa(0, "style", $r3$.ɵb("height:100px"));
                 }
               }
             });
diff --git a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
similarity index 75%
rename from packages/compiler/test/render3/r3_view_compiler_template_spec.ts
rename to packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
index 12041faec4..8c7d522ce8 100644
--- a/packages/compiler/test/render3/r3_view_compiler_template_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockDirectory, setup} from '../aot/test_util';
+import {MockDirectory, setup} from '@angular/compiler/test/aot/test_util';
 import {compile, expectEmit} from './mock_compile';
 
 describe('compiler compliance: template', () => {
@@ -51,39 +51,39 @@ describe('compiler compliance: template', () => {
 
     // The template should look like this (where IDENT is a wild card for an identifier):
     const template = `
-      const $c0$ = ['ngFor','','ngForOf',''];
+      const $c0$ = ["ngFor","","ngForOf",""];
       // ...
-      template:function MyComponent_Template(rf: IDENT, $ctx$: IDENT){
+      template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
           $i0$.ɵC(0, MyComponent_ul_Template_0, null, _c0);
         }
         if (rf & 2) {
-          $i0$.ɵp(0, 'ngForOf', $i0$.ɵb($ctx$.items));
+          $i0$.ɵp(0, "ngForOf", $i0$.ɵb($ctx$.items));
         }
 
-        function MyComponent_ul_Template_0(rf: IDENT, $ctx0$: IDENT) {
+        function MyComponent_ul_Template_0(rf, $ctx0$) {
           if (rf & 1) {
-            $i0$.ɵE(0, 'ul');
+            $i0$.ɵE(0, "ul");
             $i0$.ɵC(1, MyComponent_ul_li_Template_1, null, _c0);
             $i0$.ɵe();
           }
           if (rf & 2) {
             const $outer$ = $ctx0$.$implicit;
-            $i0$.ɵp(1, 'ngForOf', $i0$.ɵb($outer$.items));
+            $i0$.ɵp(1, "ngForOf", $i0$.ɵb($outer$.items));
           }
-          function MyComponent_ul_li_Template_1(rf: IDENT, $ctx1$: IDENT) {
+          function MyComponent_ul_li_Template_1(rf, $ctx1$) {
             if (rf & 1) {
-              $i0$.ɵE(0, 'li');
+              $i0$.ɵE(0, "li");
               $i0$.ɵC(1, MyComponent_ul_li_div_Template_1, null, _c0);
               $i0$.ɵe();
             }
             if (rf & 2) {
-              $i0$.ɵp(1, 'ngForOf', $i0$.ɵb($ctx$.items));
+              $i0$.ɵp(1, "ngForOf", $i0$.ɵb($ctx$.items));
             }
-            function MyComponent_ul_li_div_Template_1(rf: IDENT, $ctx2$: IDENT) {
+            function MyComponent_ul_li_div_Template_1(rf, $ctx2$) {
               if (rf & 1) {
-                $i0$.ɵE(0, 'div');
-                $i0$.ɵL('click', function MyComponent_ul_li_div_Template_1_div_click_listener($event:any){
+                $i0$.ɵE(0, "div");
+                $i0$.ɵL("click", function MyComponent_ul_li_div_Template_1_div_click_listener($event){
                   const $outer$ = $ctx0$.$implicit;
                   const $middle$ = $ctx1$.$implicit;
                   const $inner$ = $ctx2$.$implicit;
@@ -96,8 +96,8 @@ describe('compiler compliance: template', () => {
                 const $outer$ = $ctx0$.$implicit;
                 const $middle$ = $ctx1$.$implicit;
                 const $inner$ = $ctx2$.$implicit;
-                $i0$.ɵp(0, 'title', $i0$.ɵb(ctx.format($outer$, $middle$, $inner$, $ctx$.component)));
-                $i0$.ɵt(1, $i0$.ɵi1(' ', ctx.format($outer$, $middle$, $inner$, $ctx$.component), ' '));
+                $i0$.ɵp(0, "title", $i0$.ɵb(ctx.format($outer$, $middle$, $inner$, $ctx$.component)));
+                $i0$.ɵt(1, $i0$.ɵi1(" ", ctx.format($outer$, $middle$, $inner$, $ctx$.component), " "));
               }
             }
           }
diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel
index 27bd131ce3..48af3bc592 100644
--- a/packages/compiler/test/render3/BUILD.bazel
+++ b/packages/compiler/test/render3/BUILD.bazel
@@ -20,10 +20,6 @@ ts_library(
 jasmine_node_test(
     name = "test",
     bootstrap = ["angular/tools/testing/init_node_spec.js"],
-    data = [
-        "//packages/common:npm_package",
-        "//packages/core:npm_package",
-    ],
     deps = [
         ":test_lib",
         "//tools/testing:node",
diff --git a/packages/compiler/test/render3/mock_compile.ts b/packages/compiler/test/render3/mock_compile.ts
deleted file mode 100644
index 441a53c942..0000000000
--- a/packages/compiler/test/render3/mock_compile.ts
+++ /dev/null
@@ -1,329 +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 {AotCompilerOptions, AotSummaryResolver, CompileMetadataResolver, CompilerConfig, DEFAULT_INTERPOLATION_CONFIG, DirectiveNormalizer, DirectiveResolver, DomElementSchemaRegistry, HtmlParser, Lexer, NgModuleResolver, ParseError, Parser, PipeResolver, StaticReflector, StaticSymbol, StaticSymbolCache, StaticSymbolResolver, TemplateParser, TypeScriptEmitter, analyzeNgModules, createAotUrlResolver} from '@angular/compiler';
-import {ViewEncapsulation} from '@angular/core';
-import * as ts from 'typescript';
-
-import {NgAnalyzedModules} from '../../src/aot/compiler';
-import {ConstantPool} from '../../src/constant_pool';
-import * as html from '../../src/ml_parser/ast';
-import {removeWhitespaces} from '../../src/ml_parser/html_whitespaces';
-import * as o from '../../src/output/output_ast';
-import {compilePipeFromRender2} from '../../src/render3/r3_pipe_compiler';
-import {htmlAstToRender3Ast} from '../../src/render3/r3_template_transform';
-import {compileComponentFromRender2, compileDirectiveFromRender2} from '../../src/render3/view/compiler';
-import {BindingParser} from '../../src/template_parser/binding_parser';
-import {OutputContext, escapeRegExp} from '../../src/util';
-import {MockAotCompilerHost, MockCompilerHost, MockData, MockDirectory, arrayToMockDir, expectNoDiagnostics, settings, toMockFileArray} from '../aot/test_util';
-
-
-const IDENTIFIER = /[A-Za-z_$ɵ][A-Za-z0-9_$]*/;
-const OPERATOR =
-    /!|%|\*|\/|\^|&&?|\|\|?|\(|\)|\{|\}|\[|\]|:|;|<=?|>=?|={1,3}|!==?|=>|\+\+?|--?|@|,|\.|\.\.\./;
-const STRING = /'[^']*'|"[^"]*"|`[\s\S]*?`/;
-const NUMBER = /\d+/;
-
-const ELLIPSIS = '…';
-const TOKEN = new RegExp(
-    `\\s*((${IDENTIFIER.source})|(${OPERATOR.source})|(${STRING.source})|${NUMBER.source}|${ELLIPSIS})`,
-    'y');
-
-type Piece = string | RegExp;
-
-const SKIP = /(?:.|\n|\r)*/;
-
-const ERROR_CONTEXT_WIDTH = 30;
-// Transform the expected output to set of tokens
-function tokenize(text: string): Piece[] {
-  TOKEN.lastIndex = 0;
-
-  let match: RegExpMatchArray|null;
-  const pieces: Piece[] = [];
-
-  while ((match = TOKEN.exec(text)) !== null) {
-    const token = match[1];
-    if (token === 'IDENT') {
-      pieces.push(IDENTIFIER);
-    } else if (token === ELLIPSIS) {
-      pieces.push(SKIP);
-    } else {
-      pieces.push(token);
-    }
-  }
-
-  if (pieces.length === 0 || TOKEN.lastIndex !== 0) {
-    const from = TOKEN.lastIndex;
-    const to = from + ERROR_CONTEXT_WIDTH;
-    throw Error(`Invalid test, no token found for '${text.substr(from, to)}...'`);
-  }
-
-  return pieces;
-}
-
-export function expectEmit(
-    source: string, expected: string, description: string,
-    assertIdentifiers?: {[name: string]: RegExp}) {
-  // turns `// ...` into `…`
-  // remove `// TODO` comment lines
-  expected = expected.replace(/\/\/\s*\.\.\./g, ELLIPSIS).replace(/\/\/\s*TODO.*?\n/g, '');
-
-  const pieces = tokenize(expected);
-  const {regexp, groups} = buildMatcher(pieces);
-  const matches = source.match(regexp);
-  if (matches === null) {
-    let last: number = 0;
-    for (let i = 1; i < pieces.length; i++) {
-      const {regexp} = buildMatcher(pieces.slice(0, i));
-      const m = source.match(regexp);
-      const expectedPiece = pieces[i - 1] == IDENTIFIER ? '<IDENT>' : pieces[i - 1];
-      if (!m) {
-        fail(
-            `${description}: Expected to find ${expectedPiece} '${source.substr(0,last)}[<---HERE expected "${expectedPiece}"]${source.substr(last)}'`);
-        return;
-      } else {
-        last = (m.index || 0) + m[0].length;
-      }
-    }
-    fail(
-        `Test helper failure: Expected expression failed but the reporting logic could not find where it failed in: ${source}`);
-  } else {
-    if (assertIdentifiers) {
-      // It might be possible to add the constraints in the original regexp (see `buildMatcher`)
-      // by transforming the assertion regexps when using anchoring, grouping, back references,
-      // flags, ...
-      //
-      // Checking identifiers after they have matched allows for a simple and flexible
-      // implementation.
-      // The overall performance are not impacted when `assertIdentifiers` is empty.
-      const ids = Object.keys(assertIdentifiers);
-      for (let i = 0; i < ids.length; i++) {
-        const id = ids[i];
-        if (groups.has(id)) {
-          const name = matches[groups.get(id) as number];
-          const regexp = assertIdentifiers[id];
-          if (!regexp.test(name)) {
-            throw Error(
-                `${description}: The matching identifier "${id}" is "${name}" which doesn't match ${regexp}`);
-          }
-        }
-      }
-    }
-  }
-}
-
-const IDENT_LIKE = /^[a-z][A-Z]/;
-const MATCHING_IDENT = /^\$.*\$$/;
-
-/*
- * Builds a regexp that matches the given `pieces`
- *
- * It returns:
- * - the `regexp` to be used to match the generated code,
- * - the `groups` which maps `$...$` identifier to their position in the regexp matches.
- */
-function buildMatcher(pieces: (string | RegExp)[]): {regexp: RegExp, groups: Map<string, number>} {
-  const results: string[] = [];
-  let first = true;
-  let group = 0;
-
-  const groups = new Map<string, number>();
-  for (const piece of pieces) {
-    if (!first)
-      results.push(`\\s${typeof piece === 'string' && IDENT_LIKE.test(piece) ? '+' : '*'}`);
-    first = false;
-    if (typeof piece === 'string') {
-      if (MATCHING_IDENT.test(piece)) {
-        const matchGroup = groups.get(piece);
-        if (!matchGroup) {
-          results.push('(' + IDENTIFIER.source + ')');
-          const newGroup = ++group;
-          groups.set(piece, newGroup);
-        } else {
-          results.push(`\\${matchGroup}`);
-        }
-      } else {
-        results.push(escapeRegExp(piece));
-      }
-    } else {
-      results.push('(?:' + piece.source + ')');
-    }
-  }
-  return {
-    regexp: new RegExp(results.join('')),
-    groups,
-  };
-}
-
-function doCompile(
-    data: MockDirectory, angularFiles: MockData, options: AotCompilerOptions = {},
-    errorCollector: (error: any, fileName?: string) => void = error => { throw error; },
-    compileAction: (
-        outputCtx: OutputContext, analyzedModules: NgAnalyzedModules,
-        resolver: CompileMetadataResolver, htmlParser: HtmlParser, templateParser: TemplateParser,
-        hostBindingParser: BindingParser, reflector: StaticReflector) => void) {
-  const testFiles = toMockFileArray(data);
-  const scripts = testFiles.map(entry => entry.fileName);
-  const angularFilesArray = toMockFileArray(angularFiles);
-  const files = arrayToMockDir([...testFiles, ...angularFilesArray]);
-  const mockCompilerHost = new MockCompilerHost(scripts, files);
-  const compilerHost = new MockAotCompilerHost(mockCompilerHost);
-
-  const program = ts.createProgram(scripts, {...settings}, mockCompilerHost);
-  expectNoDiagnostics(program);
-
-  // TODO(chuckj): Replace with a variant of createAotCompiler() when the r3_view_compiler is
-  // integrated
-
-  const urlResolver = createAotUrlResolver(compilerHost);
-  const symbolCache = new StaticSymbolCache();
-  const summaryResolver = new AotSummaryResolver(compilerHost, symbolCache);
-  const symbolResolver = new StaticSymbolResolver(compilerHost, symbolCache, summaryResolver);
-  const staticReflector =
-      new StaticReflector(summaryResolver, symbolResolver, [], [], errorCollector);
-  const htmlParser = new HtmlParser();
-  const config = new CompilerConfig({
-    defaultEncapsulation: ViewEncapsulation.Emulated,
-    useJit: false,
-    missingTranslation: options.missingTranslation,
-    preserveWhitespaces: options.preserveWhitespaces,
-    strictInjectionParameters: options.strictInjectionParameters,
-  });
-  const normalizer = new DirectiveNormalizer(
-      {get: (url: string) => compilerHost.loadResource(url)}, urlResolver, htmlParser, config);
-  const expressionParser = new Parser(new Lexer());
-  const elementSchemaRegistry = new DomElementSchemaRegistry();
-  const templateParser = new TemplateParser(
-      config, staticReflector, expressionParser, elementSchemaRegistry, htmlParser, console, []);
-  const resolver = new CompileMetadataResolver(
-      config, htmlParser, new NgModuleResolver(staticReflector),
-      new DirectiveResolver(staticReflector), new PipeResolver(staticReflector), summaryResolver,
-      elementSchemaRegistry, normalizer, console, symbolCache, staticReflector, errorCollector);
-
-  // Create the TypeScript program
-  const sourceFiles = program.getSourceFiles().map(sf => sf.fileName);
-
-  // Analyze the modules
-  // TODO(chuckj): Eventually this should not be necessary as the ts.SourceFile should be sufficient
-  // to generate a template definition.
-  const analyzedModules = analyzeNgModules(sourceFiles, compilerHost, symbolResolver, resolver);
-
-  const pipesOrDirectives = Array.from(analyzedModules.ngModuleByPipeOrDirective.keys());
-
-  const fakeOutputContext: OutputContext = {
-    genFilePath: 'fakeFactory.ts',
-    statements: [],
-    importExpr(symbol: StaticSymbol, typeParams: o.Type[]) {
-      if (!(symbol instanceof StaticSymbol)) {
-        if (!symbol) {
-          throw new Error('Invalid: undefined passed to as a symbol');
-        }
-        throw new Error(`Invalid: ${(symbol as any).constructor.name} is not a symbol`);
-      }
-      return (symbol.members || [])
-          .reduce(
-              (expr, member) => expr.prop(member),
-              <o.Expression>o.importExpr(new o.ExternalReference(symbol.filePath, symbol.name)));
-    },
-    constantPool: new ConstantPool()
-  };
-
-  const errors: ParseError[] = [];
-
-  const hostBindingParser = new BindingParser(
-      expressionParser, DEFAULT_INTERPOLATION_CONFIG, elementSchemaRegistry, null, errors);
-
-  // Load all directives and pipes
-  for (const pipeOrDirective of pipesOrDirectives) {
-    const module = analyzedModules.ngModuleByPipeOrDirective.get(pipeOrDirective) !;
-    resolver.loadNgModuleDirectiveAndPipeMetadata(module.type.reference, true);
-  }
-
-  compileAction(
-      fakeOutputContext, analyzedModules, resolver, htmlParser, templateParser, hostBindingParser,
-      staticReflector);
-
-  fakeOutputContext.statements.unshift(...fakeOutputContext.constantPool.statements);
-
-  const emitter = new TypeScriptEmitter();
-
-  const result = emitter.emitStatementsAndContext(
-      fakeOutputContext.genFilePath, fakeOutputContext.statements, '', false,
-      /* referenceFilter */ undefined,
-      /* importFilter */ e => e.moduleName != null && e.moduleName.startsWith('/app'));
-
-  if (errors.length) {
-    throw new Error('Unexpected errors:' + errors.map(e => e.toString()).join(', '));
-  }
-
-  return {source: result.sourceText, outputContext: fakeOutputContext};
-}
-
-export function compile(
-    data: MockDirectory, angularFiles: MockData, options: AotCompilerOptions = {},
-    errorCollector: (error: any, fileName?: string) => void = error => { throw error;}) {
-  return doCompile(
-      data, angularFiles, options, errorCollector,
-      (outputCtx: OutputContext, analyzedModules: NgAnalyzedModules,
-       resolver: CompileMetadataResolver, htmlParser: HtmlParser, templateParser: TemplateParser,
-       hostBindingParser: BindingParser, reflector: StaticReflector) => {
-        const pipesOrDirectives = Array.from(analyzedModules.ngModuleByPipeOrDirective.keys());
-        for (const pipeOrDirective of pipesOrDirectives) {
-          const module = analyzedModules.ngModuleByPipeOrDirective.get(pipeOrDirective);
-          if (!module || !module.type.reference.filePath.startsWith('/app')) {
-            continue;
-          }
-          if (resolver.isDirective(pipeOrDirective)) {
-            const directive = resolver.getDirectiveMetadata(pipeOrDirective);
-            if (directive.isComponent) {
-              const fakeUrl = 'ng://fake-template-url.html';
-              let htmlAst = htmlParser.parse(directive.template !.template !, fakeUrl);
-
-              // Map of StaticType by directive selectors
-              const directiveTypeBySel = new Map<string, any>();
-
-              const directives = module.transitiveModule.directives.map(
-                  dir => resolver.getDirectiveSummary(dir.reference));
-
-              directives.forEach(directive => {
-                if (directive.selector) {
-                  directiveTypeBySel.set(directive.selector, directive.type.reference);
-                }
-              });
-
-              // Map of StaticType by pipe names
-              const pipeTypeByName = new Map<string, any>();
-
-              const pipes = module.transitiveModule.pipes.map(
-                  pipe => resolver.getPipeSummary(pipe.reference));
-
-              pipes.forEach(pipe => { pipeTypeByName.set(pipe.name, pipe.type.reference); });
-
-              const preserveWhitespaces = directive.template !.preserveWhitespaces;
-              if (!preserveWhitespaces) {
-                htmlAst = removeWhitespaces(htmlAst);
-              }
-
-              const render3Ast = htmlAstToRender3Ast(htmlAst.rootNodes, hostBindingParser);
-
-              compileComponentFromRender2(
-                  outputCtx, directive, render3Ast, reflector, hostBindingParser,
-                  directiveTypeBySel, pipeTypeByName);
-            } else {
-              compileDirectiveFromRender2(outputCtx, directive, reflector, hostBindingParser);
-            }
-          } else if (resolver.isPipe(pipeOrDirective)) {
-            const metadata = resolver.getPipeMetadata(pipeOrDirective);
-            if (metadata) {
-              compilePipeFromRender2(outputCtx, metadata, reflector);
-            }
-          }
-        }
-
-      });
-}
diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts
index 2527b28d3f..8b06bad1d6 100644
--- a/tools/cjs-jasmine/index.ts
+++ b/tools/cjs-jasmine/index.ts
@@ -58,6 +58,7 @@ const specFiles =
             '@angular/_testing_init/**',
             '@angular/compiler/test/aot/**',
             '@angular/compiler/test/render3/**',
+            '@angular/compiler-cli/test/compliance/**',
             '@angular/core/test/bundling/**',
             '@angular/core/test/fake_async_spec.*',
             '@angular/core/test/render3/**',

From d3594fc1c5793c225480c237966f39d6f149be14 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 13 Jul 2018 14:32:46 -0700
Subject: [PATCH 530/582] fix(ivy): correctly export all *Def symbols as
 private (#24862)

Previously, some of the *Def symbols were not exported or were exported
as public API. This commit ensures every definition type is in the
private export namespace.

PR Close #24862
---
 .../compiler-cli/src/ngtsc/transform/src/translator.ts     | 2 +-
 packages/compiler-cli/test/ngtsc/ngtsc_spec.ts             | 4 ++--
 packages/compiler/src/identifiers.ts                       | 2 +-
 packages/core/src/core_private_export.ts                   | 1 +
 packages/core/src/core_render3_private_export.ts           | 2 +-
 packages/core/src/di.ts                                    | 2 +-
 packages/core/src/r3_symbols.ts                            | 2 +-
 packages/core/src/render3/index.ts                         | 2 +-
 packages/core/src/render3/ng_module_ref.ts                 | 5 ++---
 packages/core/test/application_ref_integration_spec.ts     | 7 +++----
 tools/public_api_guard/core/core.d.ts                      | 6 ------
 11 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index 2fd42200be..32b3ada9ec 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -43,7 +43,7 @@ const CORE_SUPPORTED_SYMBOLS = new Set<string>([
   'defineInjector',
   'ɵdefineNgModule',
   'inject',
-  'InjectableDef',
+  'ɵInjectableDef',
   'ɵInjectorDef',
   'ɵNgModuleDef',
 ]);
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 7934243bc2..38769fc2b9 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -119,8 +119,8 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.InjectableDef<Dep>;');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.InjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵInjectableDef<Dep>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵInjectableDef<Service>;');
   });
 
   it('should compile Components without errors', () => {
diff --git a/packages/compiler/src/identifiers.ts b/packages/compiler/src/identifiers.ts
index dcfc98598e..121f97f21b 100644
--- a/packages/compiler/src/identifiers.ts
+++ b/packages/compiler/src/identifiers.ts
@@ -65,7 +65,7 @@ export class Identifiers {
   static INJECTOR: o.ExternalReference = {name: 'INJECTOR', moduleName: CORE};
   static Injector: o.ExternalReference = {name: 'Injector', moduleName: CORE};
   static defineInjectable: o.ExternalReference = {name: 'defineInjectable', moduleName: CORE};
-  static InjectableDef: o.ExternalReference = {name: 'InjectableDef', moduleName: CORE};
+  static InjectableDef: o.ExternalReference = {name: 'ɵInjectableDef', moduleName: CORE};
   static ViewEncapsulation: o.ExternalReference = {
     name: 'ViewEncapsulation',
     moduleName: CORE,
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index f5e015b94e..a9dd899762 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -13,6 +13,7 @@ export {devModeEqual as ɵdevModeEqual} from './change_detection/change_detectio
 export {isListLikeIterable as ɵisListLikeIterable} from './change_detection/change_detection_util';
 export {ChangeDetectorStatus as ɵChangeDetectorStatus, isDefaultChangeDetectionStrategy as ɵisDefaultChangeDetectionStrategy} from './change_detection/constants';
 export {Console as ɵConsole} from './console';
+export {InjectableDef as ɵInjectableDef, InjectorDef as ɵInjectorDef} from './di/defs';
 export {inject as ɵinject, setCurrentInjector as ɵsetCurrentInjector} from './di/injector';
 export {APP_ROOT as ɵAPP_ROOT} from './di/scope';
 export {ivyEnabled as ɵivyEnabled} from './ivy_switch';
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 0bbf7810e3..eefb5c8ec9 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -25,7 +25,6 @@ export {
   PublicFeature as ɵPublicFeature,
   InheritDefinitionFeature as ɵInheritDefinitionFeature,
   NgOnChangesFeature as ɵNgOnChangesFeature,
-  NgModuleDef as ɵNgModuleDef,
   NgModuleType as ɵNgModuleType,
   CssSelectorList as ɵCssSelectorList,
   markDirty as ɵmarkDirty,
@@ -100,6 +99,7 @@ export {
   I18nInstruction as ɵI18nInstruction,
   I18nExpInstruction as ɵI18nExpInstruction,
 } from './render3/index';
+export {NgModuleDef as ɵNgModuleDef} from './metadata/ng_module';
 export {
   bypassSanitizationTrustHtml as ɵbypassSanitizationTrustHtml,
   bypassSanitizationTrustStyle as ɵbypassSanitizationTrustStyle,
diff --git a/packages/core/src/di.ts b/packages/core/src/di.ts
index 0a776ced01..1e6b201b84 100644
--- a/packages/core/src/di.ts
+++ b/packages/core/src/di.ts
@@ -13,7 +13,7 @@
  */
 
 export * from './di/metadata';
-export {InjectableType, InjectorDef, InjectorType, defineInjectable, defineInjector} from './di/defs';
+export {InjectableType, InjectorType, defineInjectable, defineInjector} from './di/defs';
 export {forwardRef, resolveForwardRef, ForwardRefFn} from './di/forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './di/injectable';
 export {inject, InjectFlags, INJECTOR, Injector} from './di/injector';
diff --git a/packages/core/src/r3_symbols.ts b/packages/core/src/r3_symbols.ts
index ab344a1f06..10a3d014ee 100644
--- a/packages/core/src/r3_symbols.ts
+++ b/packages/core/src/r3_symbols.ts
@@ -19,7 +19,7 @@
  * The below symbols are used for @Injectable and @NgModule compilation.
  */
 
-export {InjectableDef, InjectorDef as ɵInjectorDef, defineInjectable, defineInjector} from './di/defs';
+export {InjectableDef as ɵInjectableDef, InjectorDef as ɵInjectorDef, defineInjectable, defineInjector} from './di/defs';
 export {inject} from './di/injector';
 export {NgModuleDef as ɵNgModuleDef} from './metadata/ng_module';
 export {defineNgModule as ɵdefineNgModule} from './render3/definition';
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index e022bc4144..2838b658af 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -95,7 +95,7 @@ export {
   I18nExpInstruction
 } from './i18n';
 
-export {NgModuleDef, NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
+export {NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
 
 export {
     AttributeMarker
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
index 1844b3b57c..6b6aeb6198 100644
--- a/packages/core/src/render3/ng_module_ref.ts
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -11,14 +11,13 @@ import {StaticProvider} from '../di/provider';
 import {createInjector} from '../di/r3_injector';
 import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
 import {InternalNgModuleRef, NgModuleFactory as viewEngine_NgModuleFactory, NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
+import {NgModuleDefInternal} from '../metadata/ng_module';
 import {Type} from '../type';
 import {stringify} from '../util';
 import {assertDefined} from './assert';
 import {ComponentFactoryResolver} from './component_ref';
 
-export interface NgModuleType { ngModuleDef: NgModuleDef; }
-
-export interface NgModuleDef { bootstrap: Type<any>[]; }
+export interface NgModuleType { ngModuleDef: NgModuleDefInternal<any>; }
 
 export const COMPONENT_FACTORY_RESOLVER: StaticProvider = {
   provide: viewEngine_ComponentFactoryResolver,
diff --git a/packages/core/test/application_ref_integration_spec.ts b/packages/core/test/application_ref_integration_spec.ts
index 9dee7acc17..31b57aaa24 100644
--- a/packages/core/test/application_ref_integration_spec.ts
+++ b/packages/core/test/application_ref_integration_spec.ts
@@ -86,10 +86,9 @@ describe('ApplicationRef bootstrap', () => {
   providers: APPLICATION_MODULE_PROVIDERS
 });
 
-export function defineNgModule({bootstrap}: {bootstrap?: Type<any>[]}): NgModuleDef {
-  return {
-    bootstrap: bootstrap || [],
-  };
+export function defineNgModule({bootstrap}: {bootstrap?: Type<any>[]}):
+    NgModuleDef<any, any, any, any> {
+  return ({ bootstrap: bootstrap || [], } as any);
 }
 
 /////////////////////////////////////////////////////////
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index dc2ebf8627..84a8114039 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -408,12 +408,6 @@ export declare abstract class Injector {
 /** @experimental */
 export declare const INJECTOR: InjectionToken<Injector>;
 
-export interface InjectorDef<T> {
-    factory: () => T;
-    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
-    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
-}
-
 /** @experimental */
 export interface InjectorType<T> extends Type<T> {
     ngInjectorDef: never;

From ed1db4032256e20ca46b449d7750f9da9d86ba47 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 17 Jul 2018 13:34:20 -0700
Subject: [PATCH 531/582] fix(ivy): use 'typeof' and 'never' for type metadata
 (#24862)

Previously ngtsc would use a tuple of class types for listing metadata
in .d.ts files. For example, an @NgModule's declarations might be
represented with the type:

[NgIf, NgForOf, NgClass]

If the module had no declarations, an empty tuple [] would be produced.

This has two problems.

1. If the class type has generic type parameters, TypeScript will
complain that they're not provided.

2. The empty tuple type is not actually legal.

This commit addresses both problems.

1. Class types are now represented using the `typeof` operator, so the
above declarations would be represented as:

[typeof NgIf, typeof NgForOf, typeof NgClass].

Since typeof operates on a value, it doesn't require generic type
arguments.

2. Instead of an empty tuple, `never` is used to indicate no metadata.

PR Close #24862
---
 .../ngtsc/annotations/src/selector_scope.ts   |  6 ++--
 .../annotations/test/selector_scope_spec.ts   |  2 +-
 .../src/ngtsc/transform/src/translator.ts     | 12 ++++++-
 .../src/transformers/node_emitter.ts          |  7 +++-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 12 ++++---
 packages/compiler/src/compiler.ts             |  2 +-
 packages/compiler/src/constant_pool.ts        |  4 +++
 .../compiler/src/output/abstract_emitter.ts   |  4 +++
 packages/compiler/src/output/output_ast.ts    | 32 ++++++++++++++++++-
 .../compiler/src/output/output_interpreter.ts |  3 ++
 packages/compiler/src/output/ts_emitter.ts    |  3 ++
 .../src/render3/r3_module_compiler.ts         |  9 ++++--
 .../hello_world_r2/bundle.golden_symbols.json |  3 ++
 13 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
index 06778fbc10..997c60c96e 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
@@ -353,10 +353,10 @@ export class SelectorScopeRegistry {
       return [];
     }
     return def.elementTypes.map(element => {
-      if (!ts.isTypeReferenceNode(element)) {
-        throw new Error(`Expected TypeReferenceNode`);
+      if (!ts.isTypeQueryNode(element)) {
+        throw new Error(`Expected TypeQueryNode`);
       }
-      const type = element.typeName;
+      const type = element.exprName;
       const {node, from} = reflectTypeEntityToDeclaration(type, this.checker);
       const moduleName = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
       const clazz = node as ts.Declaration;
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
index 87ff276bd0..a4a287e444 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/selector_scope_spec.ts
@@ -31,7 +31,7 @@ describe('SelectorScopeRegistry', () => {
         import * as i0 from './component';
         
         export declare class SomeModule {
-          static ngModuleDef: NgModuleDef<SomeModule, [i0.SomeCmp], any, [i0.SomeCmp]>;
+          static ngModuleDef: NgModuleDef<SomeModule, [typeof i0.SomeCmp], never, [typeof i0.SomeCmp]>;
         }
 
         export declare class SomeCmp {
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index 32b3ada9ec..b5353da37c 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
+import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, Type, TypeVisitor, TypeofExpr, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {relativePathBetween} from '../../util/src/path';
@@ -278,6 +278,10 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
   }
 
   visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: Context): any { return ast.node; }
+
+  visitTypeofExpr(ast: TypeofExpr, context: Context): ts.TypeOfExpression {
+    return ts.createTypeOf(ast.expr.visitExpression(this, context));
+  }
 }
 
 export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
@@ -294,6 +298,8 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
         return 'number';
       case BuiltinTypeName.String:
         return 'string';
+      case BuiltinTypeName.None:
+        return 'never';
       default:
         throw new Error(`Unsupported builtin type: ${BuiltinTypeName[type.name]}`);
     }
@@ -417,4 +423,8 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
           `Unsupported WrappedNodeExpr in TypeTranslatorVisitor: ${ts.SyntaxKind[node.kind]}`);
     }
   }
+
+  visitTypeofExpr(ast: TypeofExpr, context: Context): string {
+    return `typeof ${ast.expr.visitExpression(this, context)}`;
+  }
 }
\ No newline at end of file
diff --git a/packages/compiler-cli/src/transformers/node_emitter.ts b/packages/compiler-cli/src/transformers/node_emitter.ts
index 35fba0943f..66c31a1458 100644
--- a/packages/compiler-cli/src/transformers/node_emitter.ts
+++ b/packages/compiler-cli/src/transformers/node_emitter.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinVar, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, ExpressionStatement, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, NotExpr, ParseSourceFile, ParseSourceSpan, PartialModule, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
+import {AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinVar, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, ExpressionStatement, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, NotExpr, ParseSourceFile, ParseSourceSpan, PartialModule, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, TypeofExpr, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {error} from './util';
@@ -465,6 +465,11 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   // ExpressionVisitor
   visitWrappedNodeExpr(expr: WrappedNodeExpr<any>) { return this.record(expr, expr.node); }
 
+  visitTypeofExpr(expr: TypeofExpr) {
+    const typeOf = ts.createTypeOf(expr.expr.visitExpression(this, null));
+    return this.record(expr, typeOf);
+  }
+
   // ExpressionVisitor
   visitReadVarExpr(expr: ReadVarExpr) {
     switch (expr.builtin) {
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 38769fc2b9..044480c114 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -198,7 +198,8 @@ describe('ngtsc behavioral tests', () => {
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents).toContain('static ngComponentDef: i0.ɵComponentDef<TestCmp, \'test-cmp\'>');
     expect(dtsContents)
-        .toContain('static ngModuleDef: i0.ɵNgModuleDef<TestModule, [TestCmp], [], []>');
+        .toContain(
+            'static ngModuleDef: i0.ɵNgModuleDef<TestModule, [typeof TestCmp], never, never>');
     expect(dtsContents).not.toContain('__decorate');
   });
 
@@ -240,7 +241,8 @@ describe('ngtsc behavioral tests', () => {
 
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents)
-        .toContain('static ngModuleDef: i0.ɵNgModuleDef<TestModule, [TestCmp], [OtherModule], []>');
+        .toContain(
+            'static ngModuleDef: i0.ɵNgModuleDef<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
     expect(dtsContents).toContain('static ngInjectorDef: i0.ɵInjectorDef');
   });
 
@@ -342,7 +344,8 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('pipes: [TestPipe]');
 
     const dtsContents = getContents('test.d.ts');
-    expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [TestPipe,TestCmp], [], []>');
+    expect(dtsContents)
+        .toContain('i0.ɵNgModuleDef<TestModule, [typeof TestPipe,typeof TestCmp], never, never>');
   });
 
   it('should unwrap a ModuleWithProviders function if a generic type is provided for it', () => {
@@ -372,7 +375,8 @@ describe('ngtsc behavioral tests', () => {
 
     const dtsContents = getContents('test.d.ts');
     expect(dtsContents).toContain(`import * as i1 from 'router';`);
-    expect(dtsContents).toContain('i0.ɵNgModuleDef<TestModule, [], [i1.RouterModule], []>');
+    expect(dtsContents)
+        .toContain('i0.ɵNgModuleDef<TestModule, never, [typeof i1.RouterModule], never>');
   });
 
   it('should inject special types according to the metadata', () => {
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index 98398f2716..2f81a1cd85 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -68,7 +68,7 @@ export * from './ml_parser/html_tags';
 export * from './ml_parser/interpolation_config';
 export * from './ml_parser/tags';
 export {NgModuleCompiler} from './ng_module_compiler';
-export {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinType, BuiltinTypeName, BuiltinVar, CastExpr, ClassField, ClassMethod, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr, StmtModifier, Statement, collectExternalReferences} from './output/output_ast';
+export {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinType, BuiltinTypeName, BuiltinVar, CastExpr, ClassField, ClassMethod, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr, StmtModifier, Statement, TypeofExpr, collectExternalReferences} from './output/output_ast';
 export {EmitterVisitorContext} from './output/abstract_emitter';
 export * from './output/ts_emitter';
 export * from './parse_util';
diff --git a/packages/compiler/src/constant_pool.ts b/packages/compiler/src/constant_pool.ts
index 81feef39f0..aa95cd0a8a 100644
--- a/packages/compiler/src/constant_pool.ts
+++ b/packages/compiler/src/constant_pool.ts
@@ -298,6 +298,10 @@ class KeyVisitor implements o.ExpressionVisitor {
 
   visitReadVarExpr(node: o.ReadVarExpr) { return `VAR:${node.name}`; }
 
+  visitTypeofExpr(node: o.TypeofExpr, context: any): string {
+    return `TYPEOF:${node.expr.visitExpression(this, context)}`;
+  }
+
   visitWrappedNodeExpr = invalid;
   visitWriteVarExpr = invalid;
   visitWriteKeyExpr = invalid;
diff --git a/packages/compiler/src/output/abstract_emitter.ts b/packages/compiler/src/output/abstract_emitter.ts
index 9780ded14f..ac26cdba21 100644
--- a/packages/compiler/src/output/abstract_emitter.ts
+++ b/packages/compiler/src/output/abstract_emitter.ts
@@ -315,6 +315,10 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex
   visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: EmitterVisitorContext): any {
     throw new Error('Abstract emitter cannot visit WrappedNodeExpr.');
   }
+  visitTypeofExpr(expr: o.TypeofExpr, ctx: EmitterVisitorContext): any {
+    ctx.print(expr, 'typeof ');
+    expr.expr.visitExpression(this, ctx);
+  }
   visitReadVarExpr(ast: o.ReadVarExpr, ctx: EmitterVisitorContext): any {
     let varName = ast.name !;
     if (ast.builtin != null) {
diff --git a/packages/compiler/src/output/output_ast.ts b/packages/compiler/src/output/output_ast.ts
index 69d05c67fe..dd58b7fecd 100644
--- a/packages/compiler/src/output/output_ast.ts
+++ b/packages/compiler/src/output/output_ast.ts
@@ -33,7 +33,8 @@ export enum BuiltinTypeName {
   Int,
   Number,
   Function,
-  Inferred
+  Inferred,
+  None,
 }
 
 export class BuiltinType extends Type {
@@ -77,6 +78,7 @@ export const INT_TYPE = new BuiltinType(BuiltinTypeName.Int);
 export const NUMBER_TYPE = new BuiltinType(BuiltinTypeName.Number);
 export const STRING_TYPE = new BuiltinType(BuiltinTypeName.String);
 export const FUNCTION_TYPE = new BuiltinType(BuiltinTypeName.Function);
+export const NONE_TYPE = new BuiltinType(BuiltinTypeName.None);
 
 export interface TypeVisitor {
   visitBuiltinType(type: BuiltinType, context: any): any;
@@ -279,6 +281,22 @@ export class ReadVarExpr extends Expression {
   }
 }
 
+export class TypeofExpr extends Expression {
+  constructor(public expr: Expression, type?: Type|null, sourceSpan?: ParseSourceSpan|null) {
+    super(type, sourceSpan);
+  }
+
+  visitExpression(visitor: ExpressionVisitor, context: any) {
+    return visitor.visitTypeofExpr(this, context);
+  }
+
+  isEquivalent(e: Expression): boolean {
+    return e instanceof TypeofExpr && e.expr.isEquivalent(this.expr);
+  }
+
+  isConstant(): boolean { return this.expr.isConstant(); }
+}
+
 export class WrappedNodeExpr<T> extends Expression {
   constructor(public node: T, type?: Type|null, sourceSpan?: ParseSourceSpan|null) {
     super(type, sourceSpan);
@@ -738,6 +756,7 @@ export interface ExpressionVisitor {
   visitLiteralMapExpr(ast: LiteralMapExpr, context: any): any;
   visitCommaExpr(ast: CommaExpr, context: any): any;
   visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: any): any;
+  visitTypeofExpr(ast: TypeofExpr, context: any): any;
 }
 
 export const THIS_EXPR = new ReadVarExpr(BuiltinVar.This, null, null);
@@ -993,6 +1012,12 @@ export class AstTransformer implements StatementVisitor, ExpressionVisitor {
     return this.transformExpr(ast, context);
   }
 
+  visitTypeofExpr(expr: TypeofExpr, context: any): any {
+    return this.transformExpr(
+        new TypeofExpr(expr.expr.visitExpression(this, context), expr.type, expr.sourceSpan),
+        context);
+  }
+
   visitWriteVarExpr(expr: WriteVarExpr, context: any): any {
     return this.transformExpr(
         new WriteVarExpr(
@@ -1220,6 +1245,7 @@ export class RecursiveAstVisitor implements StatementVisitor, ExpressionVisitor
   visitArrayType(type: ArrayType, context: any): any { return this.visitType(type, context); }
   visitMapType(type: MapType, context: any): any { return this.visitType(type, context); }
   visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: any): any { return ast; }
+  visitTypeofExpr(ast: TypeofExpr, context: any): any { return this.visitExpression(ast, context); }
   visitReadVarExpr(ast: ReadVarExpr, context: any): any {
     return this.visitExpression(ast, context);
   }
@@ -1474,6 +1500,10 @@ export function expressionType(
   return new ExpressionType(expr, typeModifiers);
 }
 
+export function typeofExpr(expr: Expression) {
+  return new TypeofExpr(expr);
+}
+
 export function literalArr(
     values: Expression[], type?: Type | null,
     sourceSpan?: ParseSourceSpan | null): LiteralArrayExpr {
diff --git a/packages/compiler/src/output/output_interpreter.ts b/packages/compiler/src/output/output_interpreter.ts
index fdf3d61ac1..7f63f7bb6c 100644
--- a/packages/compiler/src/output/output_interpreter.ts
+++ b/packages/compiler/src/output/output_interpreter.ts
@@ -117,6 +117,9 @@ class StatementInterpreter implements o.StatementVisitor, o.ExpressionVisitor {
   visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, ctx: _ExecutionContext): never {
     throw new Error('Cannot interpret a WrappedNodeExpr.');
   }
+  visitTypeofExpr(ast: o.TypeofExpr, ctx: _ExecutionContext): never {
+    throw new Error('Cannot interpret a TypeofExpr');
+  }
   visitReadVarExpr(ast: o.ReadVarExpr, ctx: _ExecutionContext): any {
     let varName = ast.name !;
     if (ast.builtin != null) {
diff --git a/packages/compiler/src/output/ts_emitter.ts b/packages/compiler/src/output/ts_emitter.ts
index eff352943e..ad01cf1a67 100644
--- a/packages/compiler/src/output/ts_emitter.ts
+++ b/packages/compiler/src/output/ts_emitter.ts
@@ -349,6 +349,9 @@ class _TsEmitterVisitor extends AbstractEmitterVisitor implements o.TypeVisitor
       case o.BuiltinTypeName.String:
         typeStr = 'string';
         break;
+      case o.BuiltinTypeName.None:
+        typeStr = 'never';
+        break;
       default:
         throw new Error(`Unsupported builtin type ${type.name}`);
     }
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index 921bae7ecf..e9938bf5a5 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -74,8 +74,8 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
   })]);
 
   const type = new o.ExpressionType(o.importExpr(R3.NgModuleDef, [
-    new o.ExpressionType(moduleType), new o.ExpressionType(o.literalArr(declarations)),
-    new o.ExpressionType(o.literalArr(imports)), new o.ExpressionType(o.literalArr(exports))
+    new o.ExpressionType(moduleType), tupleTypeOf(declarations), tupleTypeOf(imports),
+    tupleTypeOf(exports)
   ]));
 
   const additionalStatements: o.Statement[] = [];
@@ -147,3 +147,8 @@ function accessExportScope(module: o.Expression): o.Expression {
   const selectorScope = new o.ReadPropExpr(module, 'ngModuleDef');
   return new o.ReadPropExpr(selectorScope, 'exported');
 }
+
+function tupleTypeOf(exp: o.Expression[]): o.Type {
+  const types = exp.map(type => o.typeofExpr(type));
+  return exp.length > 0 ? o.expressionType(o.literalArr(types)) : o.NONE_TYPE;
+}
\ No newline at end of file
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index ce849e0a5f..cfb0615eeb 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -1559,6 +1559,9 @@
   {
     "name": "TypeModifier"
   },
+  {
+    "name": "TypeofExpr"
+  },
   {
     "name": "UNDEFINED_RENDERER_TYPE_ID"
   },

From 2b8b647006c7d1b463139dcf55ef603033e50441 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 13 Jul 2018 14:47:05 -0700
Subject: [PATCH 532/582] fix(ivy): export injectElementRef (#24862)

PR Close #24862
---
 packages/core/src/core_render3_private_export.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index eefb5c8ec9..d51c1d5468 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -18,6 +18,7 @@ export {
   DirectiveType as ɵDirectiveType,
   RenderFlags as ɵRenderFlags,
   directiveInject as ɵdirectiveInject,
+  injectElementRef as ɵinjectElementRef,
   injectTemplateRef as ɵinjectTemplateRef,
   injectViewContainerRef as ɵinjectViewContainerRef,
   injectChangeDetectorRef as ɵinjectChangeDetectorRef,

From 41ef75869c86752e7089f74a9f01b0cf06c6a6e4 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 13 Jul 2018 14:49:01 -0700
Subject: [PATCH 533/582] fix(ivy): types in .d.ts files should account for
 generics (#24862)

Ivy definition types have a generic type which specifies the return
type of the factory function. For example:

static ngDirectiveDef<NgForOf, '[ngFor][ngForOf]'>

However, in this case NgForOf itself has a type parameter <T>. Thus,
writing the above is incorrect.

This commit modifies ngtsc to understand the genericness of NgForOf and
to write the following:

static ngDirectiveDef<NgForOf<any>, '[ngFor][ngForOf]'>

PR Close #24862
---
 .../src/ngtsc/annotations/src/directive.ts     |  1 +
 .../src/ngtsc/transform/src/translator.ts      | 10 ++++++++--
 packages/compiler/src/output/output_ast.ts     | 14 +++++++++++---
 packages/compiler/src/output/ts_emitter.ts     |  5 +++++
 packages/compiler/src/render3/util.ts          | 11 +++++++++++
 packages/compiler/src/render3/view/api.ts      |  5 +++++
 packages/compiler/src/render3/view/compiler.ts | 18 +++++++++++-------
 packages/core/src/render3/jit/directive.ts     |  1 +
 8 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index a96cc61ad0..36909e4226 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -143,6 +143,7 @@ export function extractDirectiveMetadata(
     inputs: {...inputsFromMeta, ...inputsFromFields},
     outputs: {...outputsFromMeta, ...outputsFromFields}, queries, selector,
     type: new WrappedNodeExpr(clazz.name !),
+    typeArgumentCount: (clazz.typeParameters || []).length,
     typeSourceSpan: null !, usesInheritance,
   };
   return {decoratedElements, decorator: directive, metadata};
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
index b5353da37c..f54aaef524 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/translator.ts
@@ -305,8 +305,14 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     }
   }
 
-  visitExpressionType(type: ExpressionType, context: Context): any {
-    return type.value.visitExpression(this, context);
+  visitExpressionType(type: ExpressionType, context: Context): string {
+    const exprStr = type.value.visitExpression(this, context);
+    if (type.typeParams !== null) {
+      const typeSegments = type.typeParams.map(param => param.visitType(this, context));
+      return `${exprStr}<${typeSegments.join(',')}>`;
+    } else {
+      return exprStr;
+    }
   }
 
   visitArrayType(type: ArrayType, context: Context): string {
diff --git a/packages/compiler/src/output/output_ast.ts b/packages/compiler/src/output/output_ast.ts
index dd58b7fecd..46a592c770 100644
--- a/packages/compiler/src/output/output_ast.ts
+++ b/packages/compiler/src/output/output_ast.ts
@@ -47,7 +47,11 @@ export class BuiltinType extends Type {
 }
 
 export class ExpressionType extends Type {
-  constructor(public value: Expression, modifiers: TypeModifier[]|null = null) { super(modifiers); }
+  constructor(
+      public value: Expression, modifiers: TypeModifier[]|null = null,
+      public typeParams: Type[]|null = null) {
+    super(modifiers);
+  }
   visitType(visitor: TypeVisitor, context: any): any {
     return visitor.visitExpressionType(this, context);
   }
@@ -1240,6 +1244,9 @@ export class RecursiveAstVisitor implements StatementVisitor, ExpressionVisitor
   visitBuiltinType(type: BuiltinType, context: any): any { return this.visitType(type, context); }
   visitExpressionType(type: ExpressionType, context: any): any {
     type.value.visitExpression(this, context);
+    if (type.typeParams !== null) {
+      type.typeParams.forEach(param => this.visitType(param, context));
+    }
     return this.visitType(type, context);
   }
   visitArrayType(type: ArrayType, context: any): any { return this.visitType(type, context); }
@@ -1496,8 +1503,9 @@ export function importType(
 }
 
 export function expressionType(
-    expr: Expression, typeModifiers: TypeModifier[] | null = null): ExpressionType {
-  return new ExpressionType(expr, typeModifiers);
+    expr: Expression, typeModifiers: TypeModifier[] | null = null,
+    typeParams: Type[] | null = null): ExpressionType {
+  return new ExpressionType(expr, typeModifiers, typeParams);
 }
 
 export function typeofExpr(expr: Expression) {
diff --git a/packages/compiler/src/output/ts_emitter.ts b/packages/compiler/src/output/ts_emitter.ts
index ad01cf1a67..e82a3258e0 100644
--- a/packages/compiler/src/output/ts_emitter.ts
+++ b/packages/compiler/src/output/ts_emitter.ts
@@ -361,6 +361,11 @@ class _TsEmitterVisitor extends AbstractEmitterVisitor implements o.TypeVisitor
 
   visitExpressionType(ast: o.ExpressionType, ctx: EmitterVisitorContext): any {
     ast.value.visitExpression(this, ctx);
+    if (ast.typeParams !== null) {
+      ctx.print(null, '<');
+      this.visitAllObjects(type => this.visitType(type, ctx), ast.typeParams, ctx, ',');
+      ctx.print(null, '>');
+    }
     return null;
   }
 
diff --git a/packages/compiler/src/render3/util.ts b/packages/compiler/src/render3/util.ts
index dd5fe5214e..ae619ef2da 100644
--- a/packages/compiler/src/render3/util.ts
+++ b/packages/compiler/src/render3/util.ts
@@ -36,3 +36,14 @@ export function convertMetaToOutput(meta: any, ctx: OutputContext): o.Expression
 
   throw new Error(`Internal error: Unsupported or unknown metadata: ${meta}`);
 }
+
+export function typeWithParameters(type: o.Expression, numParams: number): o.ExpressionType {
+  let params: o.Type[]|null = null;
+  if (numParams > 0) {
+    params = [];
+    for (let i = 0; i < numParams; i++) {
+      params.push(o.DYNAMIC_TYPE);
+    }
+  }
+  return o.expressionType(type, null, params);
+}
diff --git a/packages/compiler/src/render3/view/api.ts b/packages/compiler/src/render3/view/api.ts
index 8ebcc44fb8..a315990f5e 100644
--- a/packages/compiler/src/render3/view/api.ts
+++ b/packages/compiler/src/render3/view/api.ts
@@ -25,6 +25,11 @@ export interface R3DirectiveMetadata {
    */
   type: o.Expression;
 
+  /**
+   * Number of generic type parameters of the type itself.
+   */
+  typeArgumentCount: number;
+
   /**
    * A source span for the directive type.
    */
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 96d7167adc..0905821b33 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -20,11 +20,12 @@ import {ParseSourceSpan, typeSourceSpan} from '../../parse_util';
 import {CssSelector, SelectorMatcher} from '../../selector';
 import {BindingParser} from '../../template_parser/binding_parser';
 import {OutputContext, error} from '../../util';
-
 import * as t from '../r3_ast';
 import {R3DependencyMetadata, R3ResolvedDependencyType, compileFactoryFunction, dependenciesFromGlobalMetadata} from '../r3_factory';
 import {Identifiers as R3} from '../r3_identifiers';
 import {Render3ParseResult} from '../r3_template_transform';
+import {typeWithParameters} from '../util';
+
 import {R3ComponentDef, R3ComponentMetadata, R3DirectiveDef, R3DirectiveMetadata, R3QueryMetadata} from './api';
 import {BindingScope, TemplateDefinitionBuilder} from './template';
 import {CONTEXT_NAME, DefinitionMap, ID_SEPARATOR, MEANING_SEPARATOR, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, temporaryAllocator, unsupported} from './util';
@@ -93,9 +94,10 @@ export function compileDirectiveFromMetadata(
   // string literal, which must be on one line.
   const selectorForType = (meta.selector || '').replace(/\n/g, '');
 
-  const type = new o.ExpressionType(o.importExpr(
-      R3.DirectiveDef,
-      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(selectorForType))]));
+  const type = new o.ExpressionType(o.importExpr(R3.DirectiveDef, [
+    typeWithParameters(meta.type, meta.typeArgumentCount),
+    new o.ExpressionType(o.literal(selectorForType))
+  ]));
   return {expression, type};
 }
 
@@ -167,9 +169,10 @@ export function compileComponentFromMetadata(
   const selectorForType = (meta.selector || '').replace(/\n/g, '');
 
   const expression = o.importExpr(R3.defineComponent).callFn([definitionMap.toLiteralMap()]);
-  const type = new o.ExpressionType(o.importExpr(
-      R3.ComponentDef,
-      [new o.ExpressionType(meta.type), new o.ExpressionType(o.literal(selectorForType))]));
+  const type = new o.ExpressionType(o.importExpr(R3.ComponentDef, [
+    typeWithParameters(meta.type, meta.typeArgumentCount),
+    new o.ExpressionType(o.literal(selectorForType))
+  ]));
 
   return {expression, type};
 }
@@ -252,6 +255,7 @@ function directiveMetadataFromGlobalMetadata(
   return {
     name,
     type: outputCtx.importExpr(directive.type.reference),
+    typeArgumentCount: 0,
     typeSourceSpan:
         typeSourceSpan(directive.isComponent ? 'Component' : 'Directive', directive.type),
     selector: directive.selector,
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index 70ba78624d..de24c9035d 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -155,6 +155,7 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
   return {
     name: type.name,
     type: new WrappedNodeExpr(type),
+    typeArgumentCount: 0,
     selector: metadata.selector !,
     deps: reflectDependencies(type), host,
     inputs: {...inputsFromMetadata, ...inputsFromType},

From 86203736e9d7b510816dad57101ae340db07be9d Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 13 Jul 2018 13:27:50 -0700
Subject: [PATCH 534/582] fix(service-worker): don't include sourceMappingURL
 in ngsw-worker (#24877)

Fixes #23596

PR Close #24877
---
 packages/service-worker/BUILD.bazel | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
index 8be9e9c52f..da9adc885f 100644
--- a/packages/service-worker/BUILD.bazel
+++ b/packages/service-worker/BUILD.bazel
@@ -30,7 +30,9 @@ genrule(
     name = "ngsw_worker_renamed",
     srcs = ["//packages/service-worker/worker:ngsw_worker.es6.js"],
     outs = ["ngsw-worker.js"],
-    cmd = "cp $< $@",
+    # Remove sourcemap since this file will be served in production site
+    # See https://github.com/angular/angular/issues/23596
+    cmd = "grep -v '//# sourceMappingURL' < $< > $@",
 )
 
 ng_package(

From f1ab3942187b52effeb74aac9c5f242e94f812ca Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 2 Jul 2018 12:06:52 -0700
Subject: [PATCH 535/582] docs: add api doc to commonly queried elements

---
 aio/content/guide/ngmodule-api.md             |  11 +-
 .../change_detection/change_detector_ref.ts   | 194 +++++---------
 .../core/src/change_detection/constants.ts    |  41 +--
 packages/core/src/di/metadata.ts              |  67 +++--
 packages/core/src/event_emitter.ts            |  38 ++-
 packages/core/src/metadata/di.ts              |   9 +-
 packages/core/src/metadata/directives.ts      | 212 +++------------
 packages/core/src/metadata/lifecycle_hooks.ts | 245 ++++++++++++------
 packages/core/src/metadata/ng_module.ts       |  81 +++++-
 packages/core/src/render/api.ts               | 191 +++++++++++++-
 .../core/ts/change_detect/change-detection.ts |  96 +++++++
 11 files changed, 712 insertions(+), 473 deletions(-)
 create mode 100644 packages/examples/core/ts/change_detect/change-detection.ts

diff --git a/aio/content/guide/ngmodule-api.md b/aio/content/guide/ngmodule-api.md
index e661cad113..5e11305445 100644
--- a/aio/content/guide/ngmodule-api.md
+++ b/aio/content/guide/ngmodule-api.md
@@ -12,8 +12,8 @@ A basic understanding of the following concepts:
 
 At a high level, NgModules are a way to organize Angular apps
 and they accomplish this through the metadata in the `@NgModule`
-decorator. The metadata falls
-into three categories:
+decorator.
+The metadata falls into three categories:
 
 * **Static:** Compiler configuration which tells the compiler about directive selectors and where in templates the directives should be applied through selector matching. This is configured via the `declarations` array.
 * **Runtime:** Injector configuration via the `providers` array.
@@ -75,9 +75,8 @@ The following table summarizes the `@NgModule` metadata properties.
       </ol>
 
       Components, directives, and pipes must belong to _exactly_ one module.
-      The compiler emits an error if you try to declare the same class in more than one module.
-
-      Don't re-declare a class imported from another module.
+      The compiler emits an error if you try to declare the same class in more than one module. Be careful not to re-declare a class that is imported
+      directly or indirectly from another module.
 
     </td>
 
@@ -108,7 +107,7 @@ The following table summarizes the `@NgModule` metadata properties.
 
       Components in external modules continue to receive the instance provided by their injectors.
 
-      For more information on injector hierarchy and scoping, see [Providers](guide/providers).
+      For more information on injector hierarchy and scoping, see [Providers](guide/providers) and the [DI Guide](guide/dependency-injection).
 
     </td>
 
diff --git a/packages/core/src/change_detection/change_detector_ref.ts b/packages/core/src/change_detection/change_detector_ref.ts
index 2c50ff96aa..ffe982f003 100644
--- a/packages/core/src/change_detection/change_detector_ref.ts
+++ b/packages/core/src/change_detection/change_detector_ref.ts
@@ -6,179 +6,101 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+/**
+ * Base class for Angular Views, provides change detection functionality.
+ * A change-detection tree collects all views that are to be checked for changes.
+ * Use the methods to add and remove views from the tree, initiate change-detection,
+ * and exlicitly mark views as _dirty_, meaning that they have changed and need to be rerendered.
+ *
+ * @usageNotes
+ *
+ * The following examples demonstrate how to modify default change-detection behavior
+ * to perform explicit detection when needed.
+ *
+ * ### Use `markForCheck()` with `checkOnce` strategy
+ *
+ * The following example sets the `OnPush` change-detection strategy for a component
+ * (`checkOnce`, rather than the default `checkAlways`), then forces a second check
+ * after an interval. See [live demo](http://plnkr.co/edit/GC512b?p=preview).
+ *
+ * <code-example path="core/ts/change_detect/change-detection.ts"
+ * region="mark-for-check"></code-example>
+ *
+ * ### Detach change detector to limit how often check occurs
+ *
+ * The following example defines a component with a large list of read-only data
+ * that is expected to change constantly, many times per second.
+ * To improve performance, we want to check and update the list
+ * less often than the changes actually occur. To do that, we detach
+ * the component's change detector and perform an explicit local check every five seconds.
+ *
+ * <code-example path="core/ts/change_detect/change-detection.ts" region="detach"></code-example>
+ *
+ *
+ * ### Reattaching a detached component
+ *
+ * The following example creates a component displaying live data.
+ * The component detaches its change detector from the main change detector tree
+ * when the `live` property is set to false, and reattaches it when the property
+ * becomes true.
+ *
+ * <code-example path="core/ts/change_detect/change-detection.ts" region="detach"></code-example>
+ *
+ */
 export abstract class ChangeDetectorRef {
   /**
-   * Marks a view and all of its ancestors dirty.
+   * When a view uses the {@link ChangeDetectionStrategy#OnPush OnPush} (checkOnce)
+   * change detection strategy, explicitly marks the view as changed so that
+   * it can be checked again.
    *
-   * This can be used to ensure an {@link ChangeDetectionStrategy#OnPush OnPush} component is
-   * checked when it needs to be re-rendered but the two normal triggers haven't marked it
-   * dirty (i.e. inputs haven't changed and events haven't fired in the view).
+   * Components are normally marked as dirty (in need of rerendering) when inputs
+   * have changed or events have fired in the view. Call this method to ensure that
+   * a component is checked even if these triggers have not occured.
    *
    * <!-- TODO: Add a link to a chapter on OnPush components -->
    *
-   * @usageNotes
-   * ### Example
-   *
-   * ```typescript
-   * @Component({
-   *   selector: 'my-app',
-   *   template: `Number of ticks: {{numberOfTicks}}`
-   *   changeDetection: ChangeDetectionStrategy.OnPush,
-   * })
-   * class AppComponent {
-   *   numberOfTicks = 0;
-   *
-   *   constructor(private ref: ChangeDetectorRef) {
-   *     setInterval(() => {
-   *       this.numberOfTicks++;
-   *       // the following is required, otherwise the view will not be updated
-   *       this.ref.markForCheck();
-   *     }, 1000);
-   *   }
-   * }
-   * ```
    */
   abstract markForCheck(): void;
 
   /**
-   * Detaches the view from the change detection tree.
+   * Detaches this view from the change-detection tree.
+   * A detached view is  not checked until it is reattached.
+   * Use in combination with `detectChanges()` to implement local change detection checks.
    *
-   * Detached views will not be checked during change detection runs until they are
-   * re-attached, even if they are dirty. `detach` can be used in combination with
-   * {@link ChangeDetectorRef#detectChanges detectChanges} to implement local change
-   * detection checks.
+   * Detached views are not checked during change detection runs until they are
+   * re-attached, even if they are marked as dirty.
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
    *
-   * @usageNotes
-   * ### Example
-   *
-   * The following example defines a component with a large list of readonly data.
-   * Imagine the data changes constantly, many times per second. For performance reasons,
-   * we want to check and update the list every five seconds. We can do that by detaching
-   * the component's change detector and doing a local check every five seconds.
-   *
-   * ```typescript
-   * class DataProvider {
-   *   // in a real application the returned data will be different every time
-   *   get data() {
-   *     return [1,2,3,4,5];
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'giant-list',
-   *   template: `
-   *     <li *ngFor="let d of dataProvider.data">Data {{d}}</li>
-   *   `,
-   * })
-   * class GiantList {
-   *   constructor(private ref: ChangeDetectorRef, private dataProvider: DataProvider) {
-   *     ref.detach();
-   *     setInterval(() => {
-   *       this.ref.detectChanges();
-   *     }, 5000);
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'app',
-   *   providers: [DataProvider],
-   *   template: `
-   *     <giant-list><giant-list>
-   *   `,
-   * })
-   * class App {
-   * }
-   * ```
    */
   abstract detach(): void;
 
   /**
-   * Checks the view and its children.
-   *
-   * This can also be used in combination with {@link ChangeDetectorRef#detach detach} to implement
-   * local change detection checks.
+   * Checks this view and its children. Use in combination with {@link ChangeDetectorRef#detach
+   * detach}
+   * to implement local change detection checks.
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
    *
-   * @usageNotes
-   *
-   * Imagine, the data changes constantly, many times per second. For performance reasons,
-   * we want to check and update the list every five seconds.
-   *
-   * We can do that by detaching the component's change detector and doing a local change detection
-   * check every five seconds.
-   *
-   * See {@link ChangeDetectorRef#detach detach} for more information.
    */
   abstract detectChanges(): void;
 
   /**
    * Checks the change detector and its children, and throws if any changes are detected.
    *
-   * This is used in development mode to verify that running change detection doesn't introduce
+   * Use in development mode to verify that running change detection doesn't introduce
    * other changes.
    */
   abstract checkNoChanges(): void;
 
   /**
-   * Re-attaches the view to the change detection tree.
-   *
-   * This can be used to re-attach views that were previously detached from the tree
-   * using {@link ChangeDetectorRef#detach detach}. Views are attached to the tree by default.
+   * Re-attaches the previously detached view to the change detection tree.
+   * Views are attached to the tree by default.
    *
    * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
    *
-   * @usageNotes
-   * ### Example
-   *
-   * The following example creates a component displaying `live` data. The component will detach
-   * its change detector from the main change detector tree when the component's live property
-   * is set to false.
-   *
-   * ```typescript
-   * class DataProvider {
-   *   data = 1;
-   *
-   *   constructor() {
-   *     setInterval(() => {
-   *       this.data = this.data * 2;
-   *     }, 500);
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'live-data',
-   *   inputs: ['live'],
-   *   template: 'Data: {{dataProvider.data}}'
-   * })
-   * class LiveData {
-   *   constructor(private ref: ChangeDetectorRef, private dataProvider: DataProvider) {}
-   *
-   *   set live(value) {
-   *     if (value) {
-   *       this.ref.reattach();
-   *     } else {
-   *       this.ref.detach();
-   *     }
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'my-app',
-   *   providers: [DataProvider],
-   *   template: `
-   *     Live Update: <input type="checkbox" [(ngModel)]="live">
-   *     <live-data [live]="live"><live-data>
-   *   `,
-   * })
-   * class AppComponent {
-   *   live = true;
-   * }
-   * ```
    */
   abstract reattach(): void;
 }
diff --git a/packages/core/src/change_detection/constants.ts b/packages/core/src/change_detection/constants.ts
index 6add5fc6b2..3713b0f5a5 100644
--- a/packages/core/src/change_detection/constants.ts
+++ b/packages/core/src/change_detection/constants.ts
@@ -8,63 +8,74 @@
 
 
 /**
- * Describes within the change detector which strategy will be used the next time change
- * detection is triggered.
+ * The strategy that the default change detector uses to detect changes.
+ * When set, takes effect the next time change detection is triggered.
  *
  */
 export enum ChangeDetectionStrategy {
   /**
-   * `OnPush` means that the change detector's mode will be initially set to `CheckOnce`.
+   * Use the `CheckOnce` strategy, meaning that automatic change detection is deactivated
+   * until reactivated by setting the strategy to `Default` (`CheckAlways`).
+   * Change detection can still be explictly invoked.
    */
   OnPush = 0,
 
   /**
-   * `Default` means that the change detector's mode will be initially set to `CheckAlways`.
+   * Use the default `CheckAlways` strategy, in which change detection is automatic until
+   * explicitly deactivated.
    */
   Default = 1,
 }
 
 /**
- * Describes the status of the detector.
+ * Defines the possible states of the default change detector.
+ * @see `ChangeDetectorRef`
  */
 export enum ChangeDetectorStatus {
   /**
-   * `CheckOnce` means that after calling detectChanges the mode of the change detector
-   * will become `Checked`.
+   * A state in which, after calling `detectChanges()`, the change detector
+   * state becomes `Checked`, and must be explicitly invoked or reactivated.
    */
   CheckOnce,
 
   /**
-   * `Checked` means that the change detector should be skipped until its mode changes to
-   * `CheckOnce`.
+   * A state in which change detection is skipped until the change detector mode
+   * becomes `CheckOnce`.
    */
   Checked,
 
   /**
-   * `CheckAlways` means that after calling detectChanges the mode of the change detector
-   * will remain `CheckAlways`.
+   * A state in which change detection continues automatically until explictly
+   * deactivated.
    */
   CheckAlways,
 
   /**
-   * `Detached` means that the change detector sub tree is not a part of the main tree and
+   * A state in which a change detector sub tree is not a part of the main tree and
    * should be skipped.
    */
   Detached,
 
   /**
-   * `Errored` means that the change detector encountered an error checking a binding
+   * Indicates that the change detector encountered an error checking a binding
    * or calling a directive lifecycle method and is now in an inconsistent state. Change
-   * detectors in this state will no longer detect changes.
+   * detectors in this state do not detect changes.
    */
   Errored,
 
   /**
-   * `Destroyed` means that the change detector is destroyed.
+   * Indicates that the change detector has been destroyed.
    */
   Destroyed,
 }
 
+/**
+ * Reports whether a given strategy is currently the default for change detection.
+ * @param changeDetectionStrategy The strategy to check.
+ * @returns True if the given strategy is the current default, false otherwise.
+ * @see `ChangeDetectorStatus`
+ * @see `ChangeDetectorRef` 
+ */
 export function isDefaultChangeDetectionStrategy(changeDetectionStrategy: ChangeDetectionStrategy):
     boolean {
   return changeDetectionStrategy == null ||
diff --git a/packages/core/src/di/metadata.ts b/packages/core/src/di/metadata.ts
index ac10a47402..8198c9d0ea 100644
--- a/packages/core/src/di/metadata.ts
+++ b/packages/core/src/di/metadata.ts
@@ -18,19 +18,19 @@ import {EMPTY_ARRAY} from '../view/util';
  */
 export interface InjectDecorator {
   /**
-   * A parameter decorator that specifies a dependency.
+   * A constructor parameter decorator that specifies a
+   * custom provider of a dependency.
    *
-   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
+   * @see ["Dependency Injection Guide"](guide/dependency-injection).
    *
    * @usageNotes
-   * ### Example
+   * The following example shows a class constructor that specifies a
+   * custom provider of a dependency using the parameter decorator.
    *
    * {@example core/di/ts/metadata_spec.ts region='Inject'}
    *
-   * When `@Inject()` is not present, `Injector` will use the type annotation of the
-   * parameter.
-   *
-   * ### Example
+   * When `@Inject()` is not present, the `Injector` uses the type annotation of the
+   * parameter as the provider.
    *
    * {@example core/di/ts/metadata_spec.ts region='InjectWithoutDecorator'}
    */
@@ -41,7 +41,12 @@ export interface InjectDecorator {
 /**
  * Type of the Inject metadata.
  */
-export interface Inject { token: any; }
+export interface Inject {
+  /**
+   * Injector token that maps to the dependency to be injected.
+   */
+  token: any;
+}
 
 /**
  * Inject decorator and metadata.
@@ -56,15 +61,14 @@ export const Inject: InjectDecorator = makeParamDecorator('Inject', (token: any)
  */
 export interface OptionalDecorator {
   /**
-   * A parameter metadata that marks a dependency as optional.
-   * `Injector` provides `null` if the dependency is not found.
+   * A constructor parameter decorator that marks a dependency as optional.
    *
-   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
-   *
-   * @usageNotes
-   * ### Example
+   * The DI framework provides null if the dependency is not found.
+   * For example, the following code allows the possibility of a null result:  
    *
    * {@example core/di/ts/metadata_spec.ts region='Optional'}
+   *
+   * @see ["Dependency Injection Guide"](guide/dependency-injection).
    */
   (): any;
   new (): Optional;
@@ -87,14 +91,18 @@ export const Optional: OptionalDecorator = makeParamDecorator('Optional');
  */
 export interface SelfDecorator {
   /**
-   * Specifies that an `Injector` should retrieve a dependency only from itself.
+   * A constructor parameter decorator that tells the DI framework
+   * to retrieve a dependency only from the local injector.
    *
-   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
-   *
-   * @usageNotes
-   * ### Example
+   * In the following example, the dependency can be resolved
+   * by the local injector when instantiating the class itself, but not
+   * when instantiating a child.
    *
    * {@example core/di/ts/metadata_spec.ts region='Self'}
+   *
+   * @see ["Dependency Injection Guide"](guide/dependency-injection).
+   *
+   *
    */
   (): any;
   new (): Self;
@@ -118,14 +126,17 @@ export const Self: SelfDecorator = makeParamDecorator('Self');
  */
 export interface SkipSelfDecorator {
   /**
-   * Specifies that the dependency resolution should start from the parent injector.
+   * A constructor parameter decorator that tells the DI framework
+   * that dependency resolution should start from the parent injector.
    *
-   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
-   *
-   * @usageNotes
-   * ### Example
+   * In the following example, the dependency can be resolved when
+   * instantiating a child, but not when instantiating the class itself.
    *
    * {@example core/di/ts/metadata_spec.ts region='SkipSelf'}
+   *
+   * @see ["Dependency Injection Guide"](guide/dependency-injection).
+   *
+   *
    */
   (): any;
   new (): SkipSelf;
@@ -150,13 +161,13 @@ export const SkipSelf: SkipSelfDecorator = makeParamDecorator('SkipSelf');
  */
 export interface HostDecorator {
   /**
-   * Specifies that an injector should retrieve a dependency from any injector until
+   * A constructor parameter decorator that tells the DI framework
+   * to retrieve a dependency from any injector until
    * reaching the host element of the current component.
    *
-   * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
+   * @see ["Dependency Injection Guide"](guide/dependency-injection).
    *
-   * @usageNotes
-   * ### Example
+   * @usageNotes 
    *
    * {@example core/di/ts/metadata_spec.ts region='Host'}
    */
diff --git a/packages/core/src/event_emitter.ts b/packages/core/src/event_emitter.ts
index 582bb61fb6..1e5368e88e 100644
--- a/packages/core/src/event_emitter.ts
+++ b/packages/core/src/event_emitter.ts
@@ -9,13 +9,15 @@
 import {Subject, Subscription} from 'rxjs';
 
 /**
- * Use by directives and components to emit custom Events.
+ * Use in directives and components to emit custom events synchronously
+ * or asynchronously, and register handlers for those events by subscribing
+ * to an instance.
  *
  * @usageNotes
- * ### Examples
  *
- * In the following example, `Zippy` alternatively emits `open` and `close` events when its
- * title gets clicked:
+ * In the following example, a component defines two output properties
+ * that create event emitters. When the title is clicked, the emitter
+ * emits an open or close event to toggle the current visibility state.
  *
  * ```
  * @Component({
@@ -43,7 +45,7 @@ import {Subject, Subscription} from 'rxjs';
  * }
  * ```
  *
- * The events payload can be accessed by the parameter `$event` on the components output event
+ * Access the event object with the `$event` argument passed to the output event
  * handler:
  *
  * ```
@@ -63,23 +65,37 @@ export class EventEmitter<T> extends Subject<T> {
   // we can't mark it as internal now because EventEmitter exported via @angular/core would not
   // contain this property making it incompatible with all the code that uses EventEmitter via
   // facades, which are local to the code and do not have this property stripped.
-  // tslint:disable-next-line
-  __isAsync: boolean;
+  /**
+   * Internal
+   */
+  __isAsync: boolean;  // tslint:disable-line
 
   /**
-   * Creates an instance of {@link EventEmitter}, which depending on `isAsync`,
-   * delivers events synchronously or asynchronously.
+   * Creates an instance of this class that can
+   * deliver events synchronously or asynchronously.
+   *
+   * @param isAsync When true, deliver events asynchronously.
    *
-   * @param isAsync By default, events are delivered synchronously (default value: `false`).
-   * Set to `true` for asynchronous event delivery.
    */
   constructor(isAsync: boolean = false) {
     super();
     this.__isAsync = isAsync;
   }
 
+  /**
+   * Emits an event containing a given value.
+   * @param value The value to emit.
+   */
   emit(value?: T) { super.next(value); }
 
+  /**
+   * Registers handlers for events emitted by this instance.
+   * @param generatorOrNext When supplied, a custom handler for emitted events.
+   * @param error When supplied, a custom handler for an error notification
+   * from this emitter.
+   * @param complete When supplied, a custom handler for a completion
+   * notification from this emitter.
+   */
   subscribe(generatorOrNext?: any, error?: any, complete?: any): any {
     let schedulerFn: (t: any) => any;
     let errorFn = (err: any): any => null;
diff --git a/packages/core/src/metadata/di.ts b/packages/core/src/metadata/di.ts
index d25a9a52fa..c568bbdf18 100644
--- a/packages/core/src/metadata/di.ts
+++ b/packages/core/src/metadata/di.ts
@@ -309,11 +309,10 @@ export const ViewChildren: ViewChildrenDecorator = makePropDecorator(
 export interface ViewChildDecorator {
   /**
    * @description
-   * Configures a view query.
-   *
-   * You can use ViewChild to get the first element or the directive matching the selector from the
-   * view DOM. If the view DOM changes, and a new child matches the selector,
-   * the property will be updated.
+   * Property decorator that configures a view query.
+   * The change detector looks for the first element or the directive matching the selector
+   * in the view DOM. If the view DOM changes, and a new child matches the selector,
+   * the property is updated.
    *
    * View queries are set before the `ngAfterViewInit` callback is called.
    *
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 0784cef48b..e1e8a296f0 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -19,37 +19,18 @@ import {ViewEncapsulation} from './view';
  */
 export interface DirectiveDecorator {
   /**
-   * Marks a class as an Angular directive and collects directive configuration
-   * metadata.
-   *
-   * Directive decorator allows you to mark a class as an Angular directive and provide additional
-   * metadata that determines how the directive should be processed, instantiated and used at
+   * Marks a class as an Angular directive. You can define your own
+   * directives to attach custom behavior to elements in the DOM.
+   * The options provide configuration metadata that determines
+   * how the directive should be processed, instantiated and used at
    * runtime.
    *
-   * Directives allow you to attach behavior to elements in the DOM..
+   * Directive classes, like component classes, can implement
+   * [life-cycle hoooks](guide/lifecycle-hooks) to influence their configuration and behavior.
    *
-   * A directive must belong to an NgModule in order for it to be usable
-   * by another directive, component, or application. To specify that a directive is a member of an
-   * NgModule,
-   * you should list it in the `declarations` field of that NgModule.
-   *
-   * In addition to the metadata configuration specified via the Directive decorator,
-   * directives can control their runtime behavior by implementing various Life-Cycle hooks.
-   *
-   * **Metadata Properties:**
-   *
-   * * **exportAs** - name under which the component instance is exported in a template. Can be
-   * given a single name or a comma-delimited list of names.
-   * * **host** - map of class property to host element bindings for events, properties and
-   * attributes
-   * * **inputs** - list of class property names to data-bind as component inputs
-   * * **outputs** - list of class property names that expose output events that others can
-   * subscribe to
-   * * **providers** - list of providers available to this component and its children
-   * * **queries** -  configure queries that can be injected into the component
-   * * **selector** - css selector that identifies this component in a template
    *
    * @usageNotes
+   * To define a directive, mark the class with the decorator and provide metadata.
    *
    * ```
    * import {Directive} from '@angular/core';
@@ -58,9 +39,27 @@ export interface DirectiveDecorator {
    *   selector: 'my-directive',
    * })
    * export class MyDirective {
+   * ...
    * }
    * ```
    *
+   * ### Declaring directives
+   *
+   * Directives are [declarables](guide/glossary#declarable).
+   * Like component and pipes, they must be declared by an NgModule
+   * in order to be usable in an app.
+   *
+   * A directive must belong to exactly one NgModule. Do not re-declare
+   * a directive imported from another module.
+   * List the directive class in the `declarations` field of an NgModule.
+   *
+   * ```
+   * declarations: [
+   *  AppComponent,
+   *  MyDirective
+   * ],
+   * ```
+   *
    * @Annotation
    */
   (obj: Directive): TypeDecorator;
@@ -75,10 +74,7 @@ export interface Directive {
   /**
    * The CSS selector that triggers the instantiation of a directive.
    *
-   * Angular only allows directives to trigger on CSS selectors that do not cross element
-   * boundaries.
-   *
-   * `selector` may be declared as one of the following:
+   * Declare as one of the following:
    *
    * - `element-name`: select by element name.
    * - `.class`: select by class name.
@@ -87,12 +83,10 @@ export interface Directive {
    * - `:not(sub_selector)`: select only if the element does not match the `sub_selector`.
    * - `selector1, selector2`: select if either `selector1` or `selector2` matches.
    *
-   * @usageNotes
-   * ### Example
-   *
-   * Suppose we have a directive with an `input[type=text]` selector.
-   *
-   * And the following HTML:
+   * Angular only allows directives to trigger on CSS selectors that do not cross element
+   * boundaries. For example, consider a directive with an `input[type=text]` selector.
+   * For the following HTML, the directive is instantiated only on the
+   * `<input type="text">` element.
    *
    * ```html
    * <form>
@@ -101,8 +95,6 @@ export interface Directive {
    * <form>
    * ```
    *
-   * The directive would only be instantiated on the `<input type="text">` element.
-   *
    */
   selector?: string;
 
@@ -110,7 +102,6 @@ export interface Directive {
    * Enumerates the set of data-bound input properties for a directive
    *
    * Angular automatically updates input properties during change detection.
-   *
    * The `inputs` property defines a set of `directiveProperty` to `bindingProperty`
    * configuration:
    *
@@ -118,8 +109,8 @@ export interface Directive {
    * - `bindingProperty` specifies the DOM property where the value is read from.
    *
    * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
-   *
    * @usageNotes
+   *
    * ### Example
    *
    * The following example creates a component with two data-bound properties.
@@ -154,6 +145,7 @@ export interface Directive {
    * - `bindingProperty` specifies the DOM property the event handler is attached to.
    *
    * @usageNotes
+   *
    * ### Example
    *
    * ```typescript
@@ -175,138 +167,8 @@ export interface Directive {
   outputs?: string[];
 
   /**
-   * Specify the events, actions, properties and attributes related to the host element.
-   *
-   * @usageNotes
-   * The key corresponds to the name of the event, property or attribute on the host to
-   * bind. The value is formatted differently depending upon the type of the binding.
-   *
-   * ### Host Listeners
-   *
-   * Specifies which DOM events a directive listens to via a set of `(event)` to `method`
-   * key-value pairs:
-   *
-   * - `event`: the DOM event that the directive listens to.
-   * - `statement`: the statement to execute when the event occurs.
-   * If the evaluation of the statement returns `false`, then `preventDefault`is applied on the DOM
-   * event.
-   *
-   * To listen to global events, a target must be added to the event name.
-   * The target can be `window`, `document` or `body`.
-   *
-   * When writing a directive event binding, you can also refer to the $event local variable.
-   *
-   * The following example declares a directive that attaches a click listener to the button and
-   * counts clicks.
-   *
-   * ```typescript
-   * @Directive({
-   *   selector: 'button[counting]',
-   *   host: {
-   *     '(click)': 'onClick($event.target)'
-   *   }
-   * })
-   * class CountClicks {
-   *   numberOfClicks = 0;
-   *
-   *   onClick(btn) {
-   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'app',
-   *   template: `<button counting>Increment</button>`
-   * })
-   * class App {}
-   * ```
-   * See [live demo](http://plnkr.co/edit/DlA5KU?p=preview)
-   *
-   * ### Host Property Bindings
-   *
-   * Specifies which DOM properties a directive updates.
-   *
-   * Angular automatically checks host property bindings during change detection.
-   * If a binding changes, it will update the host element of the directive.
-   *
-   * The following example creates a directive that sets the `valid` and `invalid` classes
-   * on the DOM element that has ngModel directive on it.
-   *
-   * ```typescript
-   * @Directive({
-   *   selector: '[ngModel]',
-   *   host: {
-   *     '[class.valid]': 'valid',
-   *     '[class.invalid]': 'invalid'
-   *   }
-   * })
-   * class NgModelStatus {
-   *   constructor(public control:NgModel) {}
-   *   get valid { return this.control.valid; }
-   *   get invalid { return this.control.invalid; }
-   * }
-   *
-   * @Component({
-   *   selector: 'app',
-   *   template: `<input [(ngModel)]="prop">`
-   * })
-   * class App {
-   *   prop;
-   * }
-   * ```
-   * See [live demo](http://plnkr.co/edit/gNg0ED?p=preview).
-   *
-   * ### Attributes
-   *
-   * Specifies static attributes that should be propagated to a host element.
-   *
-   * In this example using `my-button` directive (ex.: `<div my-button></div>`) on a host element
-   * (here: `<div>` ) will ensure that this element will get the "button" role.
-   *
-   * ```typescript
-   * @Directive({
-   *   selector: '[my-button]',
-   *   host: {
-   *     'role': 'button'
-   *   }
-   * })
-   * class MyButton {
-   * }
-   * ```
-   * Attaching the `my-button` directive to the host `<div>` element
-   * ensures that this element gets the "button" role.
-   *
-   * ```html
-   * <div my-button></div>
-   * ```
-   *
-   * @usageNotes
-   * ### Simple Example
-   *
-   * The following simple example shows how a class is injected,
-   * using a provider specified in the directive metadata:
-   *
-   * ```
-   * class Greeter {
-   *    greet(name:string) {
-   *      return 'Hello ' + name + '!';
-   *    }
-   * }
-   *
-   * @Directive({
-   *   selector: 'greet',
-   *   providers: [
-   *     Greeter
-   *   ]
-   * })
-   * class HelloWorld {
-   *   greeter:Greeter;
-   *
-   *   constructor(greeter:Greeter) {
-   *     this.greeter = greeter;
-   *   }
-   * }
-   * ```
+   * A set of injection tokens that allow the DI system to
+   * provide a dependency to this directive or component.
    */
   providers?: Provider[];
 
@@ -314,6 +176,7 @@ export interface Directive {
    * Defines the name that can be used in the template to assign this directive to a variable.
    *
    * @usageNotes
+   *
    * ### Simple Example
    *
    * ```
@@ -330,7 +193,6 @@ export interface Directive {
    * })
    * class MainComponent {
    * }
-   *
    * ```
    */
   exportAs?: string;
@@ -456,7 +318,9 @@ export interface Directive {
   host?: {[key: string]: string};
 
   /**
-   * See the `Component` decorator.
+   * Configures the [injector](guide/glossary#injector) of this
+   * directive or component with a [token](guide/glossary#di-token)
+   * that maps to a [provider](guide/glossary#provider) of a dependency.
    */
   providers?: Provider[];
 
diff --git a/packages/core/src/metadata/lifecycle_hooks.ts b/packages/core/src/metadata/lifecycle_hooks.ts
index 426752f28f..d28f62eb11 100644
--- a/packages/core/src/metadata/lifecycle_hooks.ts
+++ b/packages/core/src/metadata/lifecycle_hooks.ts
@@ -10,138 +10,225 @@ import {SimpleChange} from '../change_detection/change_detection_util';
 
 
 /**
- * A `changes` object whose keys are property names and
- * values are instances of {@link SimpleChange}. See {@link OnChanges}
+ * Defines an object that associates properties with
+ * instances of `SimpleChange`.
+ *
+ * @see `OnChanges`
  *
  */
 export interface SimpleChanges { [propName: string]: SimpleChange; }
 
 /**
+ * @description
+ * A lifecycle hook that is called when any data-bound property of a directive changes.
+ * Define an `ngOnChanges()` method to handle the changes.
+ *
+ * @see `DoCheck`
+ * @see `OnInit`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface to
+ * define an on-changes handler for an input property.
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='OnChanges'}
  *
- * @description
- * Lifecycle hook that is called when any data-bound property of a directive changes.
- *
- * `ngOnChanges` is called right after the data-bound properties have been checked and before view
- * and content children are checked if at least one of them has changed.
- * The `changes` parameter contains the changed properties.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#onchanges).
- *
- *
  */
-export interface OnChanges { ngOnChanges(changes: SimpleChanges): void; }
+export interface OnChanges {
+  /**
+   * A callback method that is invoked immediately after the
+   * default change detector has checked data-bound properties
+   * if at least one has changed, and before the view and content
+   * children are checked.
+   * @param changes The changed properties.
+   */
+  ngOnChanges(changes: SimpleChanges): void;
+}
 
 /**
+ * @description
+ * A lifecycle hook that is called after Angular has initialized
+ * all data-bound properties of a directive.
+ * Define an `ngOnInit()` method to handle any additional initialization tasks.
+ *
+ * @see `AfterContentInit`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface to
+ * define its own initialization method.
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='OnInit'}
  *
- * @description
- * Lifecycle hook that is called after data-bound properties of a directive are
- * initialized.
- *
- * `ngOnInit` is called right after the directive's data-bound properties have been checked for the
- * first time, and before any of its children have been checked. It is invoked only once when the
- * directive is instantiated.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks).
- *
  *
  */
-export interface OnInit { ngOnInit(): void; }
+export interface OnInit {
+  /**
+   * A callback method that is invoked immediately after the
+   * default change detector has checked the directive's
+   * data-bound properties for the first time,
+   * and before any of the view or content children have been checked.
+   * It is invoked only once when the directive is instantiated.
+   */
+  ngOnInit(): void;
+}
 
 /**
+ * A lifecycle hook that invokes a custom change-detection function for a directive,
+ * in addition to the check performed by the default change-detector.
+ * 
+ * The default change-detection algorithm looks for differences by comparing
+ * bound-property values by reference across change detection runs. You can use this
+ * hook to check for and respond to changes by some other means.
+ *
+ * When the default change detector detects changes, it invokes `ngOnChanges()` if supplied,
+ * regardless of whether you perform additional change detection.
+ * Typically, you should not use both `DoCheck` and `OnChanges` to respond to
+ * changes on the same input. 
+ * 
+ * @see `OnChanges`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface
+ * to invoke it own change-detection cycle.  
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='DoCheck'}
  *
- * @description
- * Lifecycle hook that is called when Angular dirty checks a directive.
- *
- * `ngDoCheck` gets called to check the changes in the directives in addition to the default
- * algorithm. The default change detection algorithm looks for differences by comparing
- * bound-property values by reference across change detection runs.
- *
- * Note that a directive typically should not use both `DoCheck` and {@link OnChanges} to respond to
- * changes on the same input, as `ngOnChanges` will continue to be called when the default change
- * detector detects changes.
- *
- * See {@link KeyValueDiffers} and {@link IterableDiffers} for implementing custom dirty checking
- * for collections.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#docheck).
- *
- *
  */
-export interface DoCheck { ngDoCheck(): void; }
+export interface DoCheck {
+  /**
+     * A callback method that performs change-detection, invoked
+     * after the default change-detector runs.
+     * @see `KeyValueDiffers` and `IterableDiffers` for implementing
+     * custom change checking for collections.
+     * 
+     */
+  ngDoCheck(): void;
+}
 
 /**
+ * A lifecycle hook that is called when a directive, pipe, or service is destroyed.
+ * Use for any custom cleanup that needs to occur when the
+ * instance is destroyed.
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface
+ * to define it own custom clean-up method.
+ *  
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='OnDestroy'}
  *
- * @description
- * Lifecycle hook that is called when a directive, pipe or service is destroyed.
- *
- * `ngOnDestroy` callback is typically used for any custom cleanup that needs to occur when the
- * instance is destroyed.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks).
- *
- *
  */
-export interface OnDestroy { ngOnDestroy(): void; }
+export interface OnDestroy {
+  /**
+   * A callback method that performs custom clean-up, invoked immediately
+   * after a directive, pipe, or service instance is destroyed.
+   */
+  ngOnDestroy(): void;
+}
 
 /**
+ * @description
+ * A lifecycle hook that is called after Angular has fully initialized
+ * all content of a directive.
+ * Define an `ngAfterContentInit()` method to handle any additional initialization tasks.
+ *
+ * @see `OnInit`
+ * @see `AfterViewInit`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
  *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface to
+ * define its own content initialization method.
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='AfterContentInit'}
  *
- * @description
- * Lifecycle hook that is called after a directive's content has been fully
- * initialized.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#aftercontent).
- *
  *
  */
-export interface AfterContentInit { ngAfterContentInit(): void; }
+export interface AfterContentInit {
+  /**
+   * A callback method that is invoked immediately after
+   * Angular has completed initialization of all of the directive's
+   * content.
+   * It is invoked only once when the directive is instantiated.
+   */
+  ngAfterContentInit(): void;
+}
 
 /**
+ * @description
+ * A lifecycle hook that is called after the default change detector has
+ * completed checking all content of a directive.
+ *
+ * @see `AfterViewChecked`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface to
+ * define its own after-check functionality.
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='AfterContentChecked'}
  *
- * @description
- * Lifecycle hook that is called after every check of a directive's content.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#aftercontent).
- *
  *
  */
-export interface AfterContentChecked { ngAfterContentChecked(): void; }
+export interface AfterContentChecked {
+  /**
+   * A callback method that is invoked immediately after the
+   * default change detector has completed checking all of the directive's
+   * content.
+   */
+  ngAfterContentChecked(): void;
+}
 
 /**
+ * @description
+ * A lifecycle hook that is called after Angular has fully initialized
+ * a component's view.
+ * Define an `ngAfterViewInit()` method to handle any additional initialization tasks.
+ *
+ * @see `OnInit`
+ * @see `AfterContentInit`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface to
+ * define its own view initialization method.
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='AfterViewInit'}
  *
- * @description
- * Lifecycle hook that is called after a component's view has been fully
- * initialized.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#afterview).
- *
  *
  */
-export interface AfterViewInit { ngAfterViewInit(): void; }
+export interface AfterViewInit {
+  /**
+   * A callback method that is invoked immediately after
+   * Angular has completed initialization of a component's view.
+   * It is invoked only once when the view is instantiated.
+   *
+   */
+  ngAfterViewInit(): void;
+}
 
 /**
+ * @description
+ * A lifecycle hook that is called after the default change detector has
+ * completed checking a component's view for changes.
+ *
+ * @see `AfterContentChecked`
+ * @see [Lifecycle Hooks](guide/lifecycle-hooks#onchanges) guide
+ *
  * @usageNotes
+ * The following snippet shows how a component can implement this interface to
+ * define its own after-check functionality.
+ *
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='AfterViewChecked'}
  *
- * @description
- * Lifecycle hook that is called after every check of a component's view.
- *
- * See ["Lifecycle Hooks Guide"](guide/lifecycle-hooks#afterview).
- *
- *
  */
-export interface AfterViewChecked { ngAfterViewChecked(): void; }
+export interface AfterViewChecked {
+  /**
+   * A callback method that is invoked immediately after the
+   * default change detector has completed one change-check cycle
+   * for a component's view.
+   */
+  ngAfterViewChecked(): void;
+}
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 78de8a4347..6e3ce00e83 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -136,9 +136,26 @@ export interface NgModule {
   /**
    * The set of injectable objects that are available in the injector
    * of this module.
+   * 
+   * @see [Dependency Injection guide](guide/dependency-injection)
+   * @see [NgModule guide](guide/providers)
    *
    * @usageNotes
    *
+   * Dependencies whose providers are listed here become available for injection
+   * into any component, directive, pipe or service that is a child of this injector.
+   * The NgModule used for bootstrapping uses the root injector, and can provide dependencies
+   * to any part of the app.
+   * 
+   * A lazy-loaded module has its own injector, typically a child of the app root injector.
+   * Lazy-loaded services are scoped to the lazy-loaded module's injector.
+   * If a lazy-loaded module also provides the `UserService`, any component created
+   * within that module's context (such as by router navigation) gets the local instance
+   * of the service, not the instance in the root injector. 
+   * Components in external modules continue to receive the instance provided by their injectors.
+   * 
+   * ### Example
+   *
    * The following example defines a class that is injected in
    * the HelloWorld NgModule:
    *
@@ -166,10 +183,20 @@ export interface NgModule {
   providers?: Provider[];
 
   /**
-   * The set of directives and pipes that belong to this module.
+   * The set of components, directives, and pipes ([declarables](guide/glossary#declarable))
+   * that belong to this module.
    *
    * @usageNotes
    *
+   * The set of selectors that are available to a template include those declared here, and
+   * those that are exported from imported NgModules.
+   *
+   * Declarables must belong to exactly one module.
+   * The compiler emits an error if you try to declare the same class in more than one module.
+   * Be careful not to declare a class that is imported from another module.
+   *
+   * ### Example
+   *
    * The following example allows the CommonModule to use the `NgFor`
    * directive.
    *
@@ -184,13 +211,19 @@ export interface NgModule {
   declarations?: Array<Type<any>|any[]>;
 
   /**
-   * The set of NgModules, with or without providers,
-   * whose exported directives/pipes
+   * The set of NgModules whose exported directives and pipes
    * are available to templates in this module.
    *
    * @usageNotes
    *
-   * The following example allows MainModule to use CommonModule:
+   * A template can exported declarables from any
+   * imported module, including those that are imported indirectly.
+   * For example, `CommonModule` imports `BrowserModule`, make the
+   * `BrowserModule` exports available wherever `CommonModule` is imported.
+   *
+   * ### Example
+   *
+   * The following example allows MainModule to use `CommonModule`:
    *
    * ```javascript
    * @NgModule({
@@ -199,17 +232,31 @@ export interface NgModule {
    * class MainModule {
    * }
    * ```
-   *  @see {@link ModuleWithProviders}
+   *
    */
   imports?: Array<Type<any>|ModuleWithProviders|any[]>;
 
   /**
-   * The set of directives, pipe, and NgModules that can be used
-   * within the template of any component that is part of an
-   * NgModule that imports this NgModule.
+   * The set of components, directives, and pipes declared in this
+   * NgModule that can be used in the template of any component that is part of an
+   * NgModule that imports this NgModule. Exported declarations are the module's public API.
    *
    * @usageNotes
    *
+   * Declarations are private by default. If this module does not export UserComponent,
+   * then only the components within this module can use UserComponent.
+   *
+   * Importing a module does not automatically re-export the imported module's imports.
+   * Module 'B' can't use `ngIf` just because it imported module 'A' which imported `CommonModule`.
+   * Module 'B' must import `CommonModule` itself.
+   *
+   * A module can list another module among its exports, in which case all of that module's
+   * public declaration are exported. Re-export makes module transitivity explicit.
+   * If Module 'A' re-exports `CommonModule` and Module 'B' imports Module 'A',
+   * then Module 'B' components can use `ngIf` even though 'B' itself did not import `CommonModule`.
+   *
+   * ### Example
+   *
    * The following example exports the `NgFor` directive from CommonModule.
    *
    * ```javascript
@@ -223,9 +270,18 @@ export interface NgModule {
   exports?: Array<Type<any>|any[]>;
 
   /**
-   * The set of components to compile when this NgModule is defined.
+   * The set of components to compile when this NgModule is defined,
+   * so that they can be dynamically loaded into the view.
+   *
    * For each component listed here, Angular creates a `ComponentFactory`
    * and stores it in the `ComponentFactoryResolver`.
+   *
+   * Angular automatically adds components in the module's bootstrap
+   * and route definitions into the `entryComponents` list. Use this
+   * option to add components that are bootstrapped
+   * using one of the imperative techniques, such as `ViewComponentRef.createComponent()`.
+   *
+   * @see [Entry Components](guide/entry-components)
    */
   entryComponents?: Array<Type<any>|any[]>;
 
@@ -285,5 +341,12 @@ export const NgModule: NgModuleDecorator = makeDecorator(
     /**
      * Decorator that marks the following class as an NgModule, and supplies
      * configuration metadata for it.
+     *
+     * * The `declarations` and `entryComponents` options configure the compiler
+     * with information about what belongs to the NgModule.
+     * * The `providers` options configures the NgModule's injector to provide
+     * dependencies the NgModule members.
+     * * The `import` and `export` options bring in members from other modules, and make
+     * this module's members available to others.
      */
     (type: Type<any>, meta: NgModule) => (R3_COMPILE_NGMODULE || preR3NgModuleCompile)(type, meta));
diff --git a/packages/core/src/render/api.ts b/packages/core/src/render/api.ts
index ac80fd769c..b3b281bb3f 100644
--- a/packages/core/src/render/api.ts
+++ b/packages/core/src/render/api.ts
@@ -113,78 +113,249 @@ export abstract class RootRenderer {
 }
 
 /**
- * @experimental
+ * Used by `RendererFactory2` to associate custom rendering data and styles
+ * with a rendering implementation.
+ *  @experimental
  */
 export interface RendererType2 {
+  /**
+   * A unique identifying string for the new renderer, used when creating
+   * unique styles for encapsulation.
+   */
   id: string;
+  /**
+   * The view encapsulation type, which determines how styles are applied to
+   * DOM elements. One of
+   * - `Emulated` (default): Emulate native scoping of styles.
+   * - `Native`: Use the native encapsulation mechanism of the renderer.
+   * - `ShadowDoc`: Use modern [Shadow
+   * DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+   * create a ShadowRoot for component's host element.
+   * - `None`: Do not provide any template or style encapsulation.
+   */
   encapsulation: ViewEncapsulation;
+  /**
+   * Defines CSS styles to be stored on a renderer instance.
+   */
   styles: (string|any[])[];
+  /**
+   * Defines arbitrary developer-defined data to be stored on a renderer instance.
+   * This is useful for renderers that delegate to other renderers.
+   */
   data: {[kind: string]: any};
 }
 
 /**
+ * Creates and initializes a custom renderer that implements the `Renderer2` base class.
+ *
  * @experimental
  */
 export abstract class RendererFactory2 {
+  /**
+   * Implements a custom renderer for a host DOM element.
+   * @param hostElement The element to render.
+   * @param type The base class to implement.
+   * @returns The new custom renderer instance.
+   */
   abstract createRenderer(hostElement: any, type: RendererType2|null): Renderer2;
+  /**
+   * A callback invoked when rendering has begun.
+   */
   abstract begin?(): void;
+  /**
+   * A callback invoked when rendering has completed.
+   */
   abstract end?(): void;
+  /**
+   * Use with animations test-only mode. Notifies the test when rendering has completed.
+   * @returns The asynchronous result of the developer-defined function.
+   */
   abstract whenRenderingDone?(): Promise<any>;
 }
 
 /**
+ * Flags for renderer-specific style modifiers.
  * @experimental
  */
 export enum RendererStyleFlags2 {
+  /**
+   * Marks a style as important.
+   */
   Important = 1 << 0,
+  /**
+   * Marks a style as using dash case naming (this-is-dash-case).
+   */
   DashCase = 1 << 1
 }
 
 /**
+ * Extend this base class to implement custom rendering. By default, Angular
+ * renders a template into DOM. You can use custom rendering to intercept
+ * rendering calls, or to render to something other than DOM.
+ *
+ * Create your custom renderer using `RendererFactory2`.
+ *
+ * Use a custom renderer to bypass Angular's templating and make custom UI changes that can't be
+ * expressed declaratively.
+ * For example if you need to set a property or an attribute whose name is
+ * not statically known, use the `setElementProperty()` or
+ * `setElementAttribute()` method.
+ *
  * @experimental
  */
 export abstract class Renderer2 {
   /**
-   * This field can be used to store arbitrary data on this renderer instance.
+   * Implement this callback to store arbitrary developer-defined data on a renderer instance,
+   * as an object containing key-value pairs.
    * This is useful for renderers that delegate to other renderers.
    */
   abstract get data(): {[key: string]: any};
 
+  /**
+   * Implement this callback to destroy the renderer or the host element.
+   */
   abstract destroy(): void;
+  /**
+   * Implement this callback to create an instance of the host element.
+   * @param name An identifying name for the new element, unique within the namespace.
+   * @param namespace The namespace for the new element.
+   * @returns The new element.
+   */
   abstract createElement(name: string, namespace?: string|null): any;
+  /**
+   * Implement this callback to add a comment to the DOM of the host element.
+   * @param value The comment text.
+   * @returns The modified element.
+   */
   abstract createComment(value: string): any;
+
+  /**
+   * Implement this callback to add text to the DOM of the host element.
+   * @param value The text string.
+   * @returns The modified element.
+   */
   abstract createText(value: string): any;
   /**
-   * This property is allowed to be null / undefined,
-   * in which case the view engine won't call it.
+   * If null or undefined, the view engine won't call it.
    * This is used as a performance optimization for production mode.
    */
   // TODO(issue/24571): remove '!'.
   destroyNode !: ((node: any) => void) | null;
+  /**
+   * Appends a child to a given parent node in the host element DOM.
+   * @param parent The parent node.
+   * @param newChild The new child node.
+   */
   abstract appendChild(parent: any, newChild: any): void;
+  /**
+   * Implement this callback to insert a child node at a given position in a parent node
+   * in the host element DOM.
+   * @param parent The parent node.
+   * @param newChild The new child nodes.
+   * @param refChild The existing child node that should precede the new node.
+   */
   abstract insertBefore(parent: any, newChild: any, refChild: any): void;
+  /**
+   * Implement this callback to remove a child node from the host element's DOM.
+   * @param parent The parent node.
+   * @param oldChild The child node to remove.
+   */
   abstract removeChild(parent: any, oldChild: any): void;
+  /**
+   * Implement this callback to get the root element of a DOM element.
+   * @param selectorOrNode The DOM element.
+   * @returns The root element.
+   */
   abstract selectRootElement(selectorOrNode: string|any): any;
   /**
-   * Attention: On WebWorkers, this will always return a value,
-   * as we are asking for a result synchronously. I.e.
-   * the caller can't rely on checking whether this is null or not.
+   * Implement this callback to get the parent of a given node
+   * in the host element's DOM.
+   * @param node The child node to query.
+   * @returns The parent node, or null if there is no parent.
+   * For WebWorkers, always returns true.
+   * This is because the check is synchronous,
+   * and the caller can't rely on checking for null.
    */
   abstract parentNode(node: any): any;
   /**
-   * Attention: On WebWorkers, this will always return a value,
-   * as we are asking for a result synchronously. I.e.
-   * the caller can't rely on checking whether this is null or not.
+   * Implement this callback to get the next sibling node of a given node
+   * in the host element's DOM.
+   * @returns The sibling node, or null if there is no sibling.
+   * For WebWorkers, always returns a value.
+   * This is because the check is synchronous,
+   * and the caller can't rely on checking for null.
    */
   abstract nextSibling(node: any): any;
+  /**
+   * Implement this callback to set an attribute value for an element in the DOM.
+   * @param el The element.
+   * @param name The attribute name.
+   * @param value The new value.
+   * @param namespace The namespace.
+   */
   abstract setAttribute(el: any, name: string, value: string, namespace?: string|null): void;
+
+  /**
+   * Implement this callback to remove an attribute from an element in the DOM.
+   * @param el The element.
+   * @param name The attribute name.
+   * @param namespace The namespace.
+   */
   abstract removeAttribute(el: any, name: string, namespace?: string|null): void;
+  /**
+   * Implement this callback to add a class to an element in the DOM.
+   * @param el The element.
+   * @param name The class name.
+   */
   abstract addClass(el: any, name: string): void;
+
+  /**
+   * Implement this callback to remove a class from an element in the DOM.
+   * @param el The element.
+   * @param name The class name.
+   */
   abstract removeClass(el: any, name: string): void;
+
+  /**
+   * Implement this callback to set a CSS style for an element in the DOM.
+   * @param el The element.
+   * @param style The name of the style.
+   * @param value The new value.
+   * @param flags Flags for style variations. No flags are set by default.
+   */
   abstract setStyle(el: any, style: string, value: any, flags?: RendererStyleFlags2): void;
+
+  /**
+   * Implement this callback to remove the value from a CSS style for an element in the DOM.
+   * @param el The element.
+   * @param style The name of the style.
+   * @param flags Flags for style variations to remove, if set. ???
+   */
   abstract removeStyle(el: any, style: string, flags?: RendererStyleFlags2): void;
+
+  /**
+   * Implement this callback to set the value of a property of an element in the DOM.
+   * @param el The element.
+   * @param name The property name.
+   * @param value The new value.
+   */
   abstract setProperty(el: any, name: string, value: any): void;
+
+  /**
+   * Implement this callback to set the value of a node in the host element.
+   * @param node The node.
+   * @param value The new value.
+   */
   abstract setValue(node: any, value: string): void;
+
+  /**
+   * Implement this callback to start an event listener.
+   * @param target The context in which to listen for events. Can be
+   * the entire window or document, the body of the document, or a specific
+   * DOM element.
+   * @param eventName The event to listen for.
+   * @param callback A handler function to invoke when the event occurs.
+   */
   abstract listen(
       target: 'window'|'document'|'body'|any, eventName: string,
       callback: (event: any) => boolean | void): () => void;
diff --git a/packages/examples/core/ts/change_detect/change-detection.ts b/packages/examples/core/ts/change_detect/change-detection.ts
new file mode 100644
index 0000000000..8124ab43de
--- /dev/null
+++ b/packages/examples/core/ts/change_detect/change-detection.ts
@@ -0,0 +1,96 @@
+/**
+ * @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
+ */
+/* tslint:disable:no-console  */
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Directive} from '@angular/core';
+
+
+// #docregion mark-for-check
+@Component({
+  selector: 'my-app',
+  template: `Number of ticks: {{numberOfTicks}}`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+
+class AppComponent {
+  numberOfTicks = 0;
+
+  constructor(private ref: ChangeDetectorRef) {
+    setInterval(() => {
+      this.numberOfTicks++;
+      // require view to be updated
+      this.ref.markForCheck();
+    }, 1000);
+  }
+}
+// #enddocregion mark-for-check
+
+// #docregion detach
+class DataListProvider {
+  // in a real application the returned data will be different every time
+  get data() { return [1, 2, 3, 4, 5]; }
+}
+
+@Component({
+  selector: 'giant-list',
+  template: `
+      <li *ngFor="let d of dataProvider.data">Data {{d}}</li>
+    `,
+})
+class GiantList {
+  constructor(private ref: ChangeDetectorRef, private dataProvider: DataListProvider) {
+    ref.detach();
+    setInterval(() => { this.ref.detectChanges(); }, 5000);
+  }
+}
+
+@Component({
+  selector: 'app',
+  providers: [DataListProvider],
+  template: `
+      <giant-list><giant-list>
+    `,
+})
+class App {
+}
+// #enddocregion detach
+
+// #docregion reattach
+class DataProvider {
+  data = 1;
+  constructor() {
+    setInterval(() => { this.data = 2; }, 500);
+  }
+}
+
+
+@Component({selector: 'live-data', inputs: ['live'], template: 'Data: {{dataProvider.data}}'})
+class LiveData {
+  constructor(private ref: ChangeDetectorRef, private dataProvider: DataProvider) {}
+
+  set live(value: boolean) {
+    if (value) {
+      this.ref.reattach();
+    } else {
+      this.ref.detach();
+    }
+  }
+}
+
+@Component({
+  selector: 'app',
+  providers: [DataProvider],
+  template: `
+       Live Update: <input type="checkbox" [(ngModel)]="live">
+       <live-data [live]="live"><live-data>
+     `,
+})
+
+class App1 {
+  live = true;
+}
+// #enddocregion reattach

From 7960d1879d87f1d9e4f7f202423960d874a6a08f Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 18 Jul 2018 10:26:59 -0700
Subject: [PATCH 536/582] docs: technical review incorporated (#24744)

closes #24744
---
 .../change_detection/change_detector_ref.ts   |  6 +--
 packages/core/src/metadata/directives.ts      |  2 +-
 packages/core/src/metadata/lifecycle_hooks.ts |  6 +--
 packages/core/src/metadata/ng_module.ts       | 38 ++++++++++---------
 packages/core/src/render/api.ts               | 18 +++++----
 5 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/packages/core/src/change_detection/change_detector_ref.ts b/packages/core/src/change_detection/change_detector_ref.ts
index ffe982f003..49cdaf425d 100644
--- a/packages/core/src/change_detection/change_detector_ref.ts
+++ b/packages/core/src/change_detection/change_detector_ref.ts
@@ -10,17 +10,17 @@
  * Base class for Angular Views, provides change detection functionality.
  * A change-detection tree collects all views that are to be checked for changes.
  * Use the methods to add and remove views from the tree, initiate change-detection,
- * and exlicitly mark views as _dirty_, meaning that they have changed and need to be rerendered.
+ * and explicitly mark views as _dirty_, meaning that they have changed and need to be rerendered.
  *
  * @usageNotes
  *
  * The following examples demonstrate how to modify default change-detection behavior
  * to perform explicit detection when needed.
  *
- * ### Use `markForCheck()` with `checkOnce` strategy
+ * ### Use `markForCheck()` with `CheckOnce` strategy
  *
  * The following example sets the `OnPush` change-detection strategy for a component
- * (`checkOnce`, rather than the default `checkAlways`), then forces a second check
+ * (`CheckOnce`, rather than the default `CheckAlways`), then forces a second check
  * after an interval. See [live demo](http://plnkr.co/edit/GC512b?p=preview).
  *
  * <code-example path="core/ts/change_detect/change-detection.ts"
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index e1e8a296f0..7a0bcbe0d8 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -46,7 +46,7 @@ export interface DirectiveDecorator {
    * ### Declaring directives
    *
    * Directives are [declarables](guide/glossary#declarable).
-   * Like component and pipes, they must be declared by an NgModule
+   * They must be declared by an NgModule
    * in order to be usable in an app.
    *
    * A directive must belong to exactly one NgModule. Do not re-declare
diff --git a/packages/core/src/metadata/lifecycle_hooks.ts b/packages/core/src/metadata/lifecycle_hooks.ts
index d28f62eb11..61ce3af80a 100644
--- a/packages/core/src/metadata/lifecycle_hooks.ts
+++ b/packages/core/src/metadata/lifecycle_hooks.ts
@@ -100,9 +100,9 @@ export interface DoCheck {
   /**
      * A callback method that performs change-detection, invoked
      * after the default change-detector runs.
-     * @see `KeyValueDiffers` and `IterableDiffers` for implementing
+     * See `KeyValueDiffers` and `IterableDiffers` for implementing
      * custom change checking for collections.
-     * 
+     *
      */
   ngDoCheck(): void;
 }
@@ -115,7 +115,7 @@ export interface DoCheck {
  *
  * @usageNotes
  * The following snippet shows how a component can implement this interface
- * to define it own custom clean-up method.
+ * to define its own custom clean-up method.
  *  
  * {@example core/ts/metadata/lifecycle_hooks_spec.ts region='OnDestroy'}
  *
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 6e3ce00e83..124bd314e3 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -211,19 +211,22 @@ export interface NgModule {
   declarations?: Array<Type<any>|any[]>;
 
   /**
-   * The set of NgModules whose exported directives and pipes
+   * The set of NgModules whose exported [declarables](guide/glossary#declarable)
    * are available to templates in this module.
    *
    * @usageNotes
    *
-   * A template can exported declarables from any
-   * imported module, including those that are imported indirectly.
-   * For example, `CommonModule` imports `BrowserModule`, make the
-   * `BrowserModule` exports available wherever `CommonModule` is imported.
+   * A template can use exported declarables from any
+   * imported module, including those from modules that are imported indirectly
+   * and re-exported.
+   * For example, `ModuleA` imports `ModuleB`, and also exports
+   * it, which makes the declarables from `ModuleB` available
+   * wherever `ModuleA` is imported.
    *
    * ### Example
    *
-   * The following example allows MainModule to use `CommonModule`:
+   * The following example allows MainModule to use anthing exported by
+   * `CommonModule`:
    *
    * ```javascript
    * @NgModule({
@@ -241,19 +244,18 @@ export interface NgModule {
    * NgModule that can be used in the template of any component that is part of an
    * NgModule that imports this NgModule. Exported declarations are the module's public API.
    *
+   * A declarable belongs to one and only one NgModule.
+   * A module can list another module among its exports, in which case all of that module's
+   * public declaration are exported.
+   *
    * @usageNotes
    *
-   * Declarations are private by default. If this module does not export UserComponent,
-   * then only the components within this module can use UserComponent.
+   * Declarations are private by default.
+   * If this ModuleA does not export UserComponent, then only the components within this
+   * ModuleA can use UserComponent.
    *
-   * Importing a module does not automatically re-export the imported module's imports.
-   * Module 'B' can't use `ngIf` just because it imported module 'A' which imported `CommonModule`.
-   * Module 'B' must import `CommonModule` itself.
-   *
-   * A module can list another module among its exports, in which case all of that module's
-   * public declaration are exported. Re-export makes module transitivity explicit.
-   * If Module 'A' re-exports `CommonModule` and Module 'B' imports Module 'A',
-   * then Module 'B' components can use `ngIf` even though 'B' itself did not import `CommonModule`.
+   * ModuleA can import ModuleB and also export it, making exports from ModuleB
+   * available to an NgModule that imports ModuleA.
    *
    * ### Example
    *
@@ -279,7 +281,7 @@ export interface NgModule {
    * Angular automatically adds components in the module's bootstrap
    * and route definitions into the `entryComponents` list. Use this
    * option to add components that are bootstrapped
-   * using one of the imperative techniques, such as `ViewComponentRef.createComponent()`.
+   * using one of the imperative techniques, such as `ViewContainerRef.createComponent()`.
    *
    * @see [Entry Components](guide/entry-components)
    */
@@ -346,7 +348,7 @@ export const NgModule: NgModuleDecorator = makeDecorator(
      * with information about what belongs to the NgModule.
      * * The `providers` options configures the NgModule's injector to provide
      * dependencies the NgModule members.
-     * * The `import` and `export` options bring in members from other modules, and make
+     * * The `imports` and `exports` options bring in members from other modules, and make
      * this module's members available to others.
      */
     (type: Type<any>, meta: NgModule) => (R3_COMPILE_NGMODULE || preR3NgModuleCompile)(type, meta));
diff --git a/packages/core/src/render/api.ts b/packages/core/src/render/api.ts
index b3b281bb3f..ab442b419b 100644
--- a/packages/core/src/render/api.ts
+++ b/packages/core/src/render/api.ts
@@ -128,7 +128,7 @@ export interface RendererType2 {
    * DOM elements. One of
    * - `Emulated` (default): Emulate native scoping of styles.
    * - `Native`: Use the native encapsulation mechanism of the renderer.
-   * - `ShadowDoc`: Use modern [Shadow
+   * - `ShadowDom`: Use modern [Shadow
    * DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
    * create a ShadowRoot for component's host element.
    * - `None`: Do not provide any template or style encapsulation.
@@ -152,7 +152,7 @@ export interface RendererType2 {
  */
 export abstract class RendererFactory2 {
   /**
-   * Implements a custom renderer for a host DOM element.
+   * Creates and initializes a custom renderer for a host DOM element.
    * @param hostElement The element to render.
    * @param type The base class to implement.
    * @returns The new custom renderer instance.
@@ -195,17 +195,17 @@ export enum RendererStyleFlags2 {
  *
  * Create your custom renderer using `RendererFactory2`.
  *
- * Use a custom renderer to bypass Angular's templating and make custom UI changes that can't be
- * expressed declaratively.
+ * Use a custom renderer to bypass Angular's templating and
+ * make custom UI changes that can't be expressed declaratively.
  * For example if you need to set a property or an attribute whose name is
- * not statically known, use the `setElementProperty()` or
- * `setElementAttribute()` method.
+ * not statically known, use the `setProperty()` or
+ * `setAttribute()` method.
  *
  * @experimental
  */
 export abstract class Renderer2 {
   /**
-   * Implement this callback to store arbitrary developer-defined data on a renderer instance,
+   * Use to store arbitrary developer-defined data on a renderer instance,
    * as an object containing key-value pairs.
    * This is useful for renderers that delegate to other renderers.
    */
@@ -262,7 +262,8 @@ export abstract class Renderer2 {
    */
   abstract removeChild(parent: any, oldChild: any): void;
   /**
-   * Implement this callback to get the root element of a DOM element.
+   * Implement this callback to prepare an element to be bootstrapped
+   * as a root element, and return the element instance.
    * @param selectorOrNode The DOM element.
    * @returns The root element.
    */
@@ -355,6 +356,7 @@ export abstract class Renderer2 {
    * DOM element.
    * @param eventName The event to listen for.
    * @param callback A handler function to invoke when the event occurs.
+   * @returns An "unlisten" function for disposing of this handler.
    */
   abstract listen(
       target: 'window'|'document'|'body'|any, eventName: string,

From 6b859daea49be41195bb8d93f1d02fc09b8bc42a Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Sun, 22 Jul 2018 00:05:53 -0700
Subject: [PATCH 537/582] fix(core): stop reusing provider definitions across
 NgModuleRef instances (#25022)

Fixes #25018.

Instantiating a NgModuleRef from NgModuleFactory reuses the NgModuleDefinition if it is already present. However the NgModuleDefinition has a providers array which modified when tree shakable providers are instantiated. This corrupts the provider definitions the next time the same factory is used to create a new NgModuleRef - Two provider definitions can end up with the same index anf the injector could potentially return a completely wrong object for a provider token.

This scenario is more likely on the server where the same NgModuleFactory is reused across requests.

The fix clones the cached NgModuleDefinition so that any tree shakable providers added later do not affect the cached copy.

PR Close #25022
---
 packages/core/src/view/entrypoint.ts          | 21 +++++++++-
 .../hello_world_r2/bundle.golden_symbols.json |  3 ++
 .../test/linker/ng_module_integration_spec.ts | 42 ++++++++++++++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/view/entrypoint.ts b/packages/core/src/view/entrypoint.ts
index 7bd118e6cf..ff2933baf1 100644
--- a/packages/core/src/view/entrypoint.ts
+++ b/packages/core/src/view/entrypoint.ts
@@ -12,7 +12,7 @@ import {NgModuleFactory, NgModuleRef} from '../linker/ng_module_factory';
 import {Type} from '../type';
 
 import {initServicesIfNeeded} from './services';
-import {NgModuleDefinitionFactory, ProviderOverride, Services, ViewDefinition} from './types';
+import {NgModuleDefinition, NgModuleDefinitionFactory, NgModuleProviderDef, ProviderOverride, Services, ViewDefinition} from './types';
 import {resolveDefinition} from './util';
 
 export function overrideProvider(override: ProviderOverride) {
@@ -38,6 +38,20 @@ export function createNgModuleFactory(
   return new NgModuleFactory_(ngModuleType, bootstrapComponents, defFactory);
 }
 
+function cloneNgModuleDefinition(def: NgModuleDefinition): NgModuleDefinition {
+  const providers = Array.from(def.providers);
+  const modules = Array.from(def.modules);
+  const providersByKey: {[tokenKey: string]: NgModuleProviderDef} = {};
+  for (const key in def.providersByKey) {
+    providersByKey[key] = def.providersByKey[key];
+  }
+
+  return {
+    factory: def.factory,
+    isRoot: def.isRoot, providers, modules, providersByKey,
+  };
+}
+
 class NgModuleFactory_ extends NgModuleFactory<any> {
   constructor(
       public readonly moduleType: Type<any>, private _bootstrapComponents: Type<any>[],
@@ -49,7 +63,10 @@ class NgModuleFactory_ extends NgModuleFactory<any> {
 
   create(parentInjector: Injector|null): NgModuleRef<any> {
     initServicesIfNeeded();
-    const def = resolveDefinition(this._ngModuleDefFactory);
+    // Clone the NgModuleDefinition so that any tree shakeable provider definition
+    // added to this instance of the NgModuleRef doesn't affect the cached copy.
+    // See https://github.com/angular/angular/issues/25018.
+    const def = cloneNgModuleDefinition(resolveDefinition(this._ngModuleDefFactory));
     return Services.createNgModuleRef(
         this.moduleType, parentInjector || Injector.NULL, this._bootstrapComponents, def);
   }
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index cfb0615eeb..cabdda2fb0 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -2414,6 +2414,9 @@
   {
     "name": "checkStable"
   },
+  {
+    "name": "cloneNgModuleDefinition"
+  },
   {
     "name": "collectReferences"
   },
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 45f530f76d..6a9369abd7 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -8,10 +8,13 @@
 
 import {ANALYZE_FOR_ENTRY_COMPONENTS, CUSTOM_ELEMENTS_SCHEMA, Compiler, Component, ComponentFactoryResolver, Directive, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, forwardRef, getModuleFactory} from '@angular/core';
 import {Console} from '@angular/core/src/console';
+import {InjectableDef, defineInjectable} from '@angular/core/src/di/defs';
+import {NgModuleData} from '@angular/core/src/view/types';
+import {tokenKey} from '@angular/core/src/view/util';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
-import {InternalNgModuleRef} from '../../src/linker/ng_module_factory';
+import {InternalNgModuleRef, NgModuleFactory} from '../../src/linker/ng_module_factory';
 import {clearModulesForTest} from '../../src/linker/ng_module_factory_loader';
 import {stringify} from '../../src/util';
 
@@ -117,9 +120,13 @@ function declareTests({useJit}: {useJit: boolean}) {
       injector = _injector;
     }));
 
+    function createModuleFactory<T>(moduleType: Type<T>): NgModuleFactory<T> {
+      return compiler.compileModuleSync(moduleType);
+    }
+
     function createModule<T>(
         moduleType: Type<T>, parentInjector?: Injector | null): NgModuleRef<T> {
-      return compiler.compileModuleSync(moduleType).create(parentInjector || null);
+      return createModuleFactory(moduleType).create(parentInjector || null);
     }
 
     function createComp<T>(compType: Type<T>, moduleType: Type<any>): ComponentFixture<T> {
@@ -1290,6 +1297,37 @@ function declareTests({useJit}: {useJit: boolean}) {
                   `Invalid provider for the NgModule 'ImportedModule1' - only instances of Provider and Type are allowed, got: [?broken?]`);
         });
       });
+
+      describe('tree shakable providers', () => {
+        it('definition should not persist across NgModuleRef instances', () => {
+          @NgModule()
+          class SomeModule {
+          }
+
+          class Bar {
+            static ngInjectableDef: InjectableDef<Bar> = defineInjectable({
+              factory: () => new Bar(),
+              providedIn: SomeModule,
+            });
+          }
+
+          const factory = createModuleFactory(SomeModule);
+          const ngModuleRef1 = factory.create(null);
+
+          // Inject a tree shakeable provider token.
+          ngModuleRef1.injector.get(Bar);
+
+          // Tree Shakeable provider definition should get added to the NgModule data.
+          const providerDef1 = (ngModuleRef1 as NgModuleData)._def.providersByKey[tokenKey(Bar)];
+          expect(providerDef1).not.toBeUndefined();
+
+          // Instantiate the same module. The tree shakeable provider
+          // definition should not already be present.
+          const ngModuleRef2 = factory.create(null);
+          const providerDef2 = (ngModuleRef2 as NgModuleData)._def.providersByKey[tokenKey(Bar)];
+          expect(providerDef2).toBeUndefined();
+        });
+      });
     });
   });
 }

From 4d6f467feaed5a40128fbbb163c1ea25c6621822 Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Wed, 11 Jul 2018 18:27:54 +0200
Subject: [PATCH 538/582] docs: refactor style guide example 01-01 (#22738)

docs: refactor style guide example 01-01


PR Close #22738
---
 .../styleguide/src/01-01/app/app.component.ts |  4 ++--
 .../01-01/app/heroes/hero.component.avoid.ts  | 23 +++++++++----------
 .../01-01/app/heroes/shared/mock-heroes.ts    |  6 ++---
 .../examples/styleguide/src/01-01/main.ts     |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/aio/content/examples/styleguide/src/01-01/app/app.component.ts b/aio/content/examples/styleguide/src/01-01/app/app.component.ts
index d5bb953540..7e7444d3ae 100644
--- a/aio/content/examples/styleguide/src/01-01/app/app.component.ts
+++ b/aio/content/examples/styleguide/src/01-01/app/app.component.ts
@@ -9,6 +9,6 @@ import { HeroService } from './heroes';
       <toh-heroes></toh-heroes>
     `,
   styleUrls: ['./app.component.css'],
-  providers: [ HeroService ]
+  providers: [HeroService]
 })
-export class AppComponent { }
+export class AppComponent {}
diff --git a/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
index 853e6ab64e..2ec03ca8b3 100644
--- a/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
+++ b/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
@@ -1,9 +1,8 @@
 // #docregion
 /* avoid */
-
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { Component, NgModule, OnInit } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule, Component, OnInit } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 class Hero {
   id: number;
@@ -24,24 +23,24 @@ class AppComponent implements OnInit {
   heroes: Hero[] = [];
 
   ngOnInit() {
-    getHeroes().then(heroes => this.heroes = heroes);
+    getHeroes().then(heroes => (this.heroes = heroes));
   }
 }
 
 @NgModule({
-  imports: [ BrowserModule ],
-  declarations: [ AppComponent ],
-  exports: [ AppComponent ],
-  bootstrap: [ AppComponent ]
+  imports: [BrowserModule],
+  declarations: [AppComponent],
+  exports: [AppComponent],
+  bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {}
 
 platformBrowserDynamic().bootstrapModule(AppModule);
 
 const HEROES: Hero[] = [
-  {id: 1, name: 'Bombasto'},
-  {id: 2, name: 'Tornado'},
-  {id: 3, name: 'Magneta'},
+  { id: 1, name: 'Bombasto' },
+  { id: 2, name: 'Tornado' },
+  { id: 3, name: 'Magneta' }
 ];
 
 function getHeroes(): Promise<Hero[]> {
diff --git a/aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts
index 2e9a69f59d..f3a0ef7ce4 100644
--- a/aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts
+++ b/aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero.model';
 
 export const HEROES: Hero[] = [
-  {id: 1, name: 'Bombasto'},
-  {id: 2, name: 'Tornado'},
-  {id: 3, name: 'Magneta'},
+  { id: 1, name: 'Bombasto' },
+  { id: 2, name: 'Tornado' },
+  { id: 3, name: 'Magneta' }
 ];
diff --git a/aio/content/examples/styleguide/src/01-01/main.ts b/aio/content/examples/styleguide/src/01-01/main.ts
index 7e8269bd65..f332d1d245 100644
--- a/aio/content/examples/styleguide/src/01-01/main.ts
+++ b/aio/content/examples/styleguide/src/01-01/main.ts
@@ -1,6 +1,6 @@
 // #docregion
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule }      from './app/app.module';
+import { AppModule } from './app/app.module';
 
 platformBrowserDynamic().bootstrapModule(AppModule);

From 426324513d74eb13f7146f9ee3e1fe6f5b88c5af Mon Sep 17 00:00:00 2001
From: Kelly Marchewa <kelly_marchewa@yahoo.com>
Date: Sat, 2 Jun 2018 16:56:47 -0500
Subject: [PATCH 539/582] docs: update rxjs link to version 6 (#24269)

PR Close #24269
---
 aio/content/guide/rx-library.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/rx-library.md b/aio/content/guide/rx-library.md
index c0b1418663..e562d8ed35 100644
--- a/aio/content/guide/rx-library.md
+++ b/aio/content/guide/rx-library.md
@@ -45,7 +45,7 @@ The `pipe()` function is also a method on the RxJS `Observable`, so you use this
 
 ### Common operators
 
-RxJS provides many operators (over 150 of them), but only a handful are used frequently. Here is a list of common operators; for usage examples, see  [RxJS 5 Operators By Example](https://github.com/btroncone/learn-rxjs/blob/master/operators/complete.md) in RxJS documentation.
+RxJS provides many operators, but only a handful are used frequently. For a list of operators and usage samples, visit the [RxJS API Documentation](https://rxjs-dev.firebaseapp.com/api).
 
 <div class="l-sub-section">
   Note that, for Angular apps, we prefer combining operators with pipes, rather than chaining. Chaining is used in many RxJS examples.

From 7729bb2bdced29bd1d768964aa8db97deed781bb Mon Sep 17 00:00:00 2001
From: Dario Braun <dario.braun@adesso.de>
Date: Thu, 5 Jul 2018 09:22:48 +0200
Subject: [PATCH 540/582] docs: fix instructions for switching directories
 (#24439)

docs: fix instructions for switching directories


PR Close #24439
---
 aio/content/guide/service-worker-getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/service-worker-getting-started.md b/aio/content/guide/service-worker-getting-started.md
index 45d3c3b2d7..b30c5ee7a2 100644
--- a/aio/content/guide/service-worker-getting-started.md
+++ b/aio/content/guide/service-worker-getting-started.md
@@ -54,7 +54,7 @@ Because `ng serve` does not work with service workers, you must use a separate H
 To serve with `http-server`, change to the directory containing your web files and start the web server: 
 
 ```sh
-cd dist
+cd dist/*project-name*
 http-server -p 8080
 ```
 

From 168c2a645b071d16de85892d580d4c84c1cb778e Mon Sep 17 00:00:00 2001
From: Maicon Wagner <mister-x59@hotmail.com.br>
Date: Thu, 21 Jun 2018 17:09:12 -0300
Subject: [PATCH 541/582] docs: add Truly-UI to resources (#24615) PR Close
 #24615

---
 aio/content/marketing/resources.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 4e704c349c..519d056c34 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -395,6 +395,12 @@
             "rev": true,
             "title": "Essential JS 2",
             "url": "https://www.syncfusion.com/products/angular-js2"
+          },
+          "trulyui": {
+            "desc": "TrulyUI is an Angular UI Framework especially developed for Desktop Applications based on Web Components using the greatest technologies of the world.",
+            "rev": true,
+            "title": "Truly UI",
+            "url": "http://truly-ui.tk"
           }
         }
       }

From bd576bb83f6a2a51f2463b1e2cddc523130d41ab Mon Sep 17 00:00:00 2001
From: Mateusz Karkula <karql.pl@gmail.com>
Date: Mon, 16 Jul 2018 21:02:58 +0200
Subject: [PATCH 542/582] docs: fix multicasting example in observable guide
 (#24911)

PR Close #24911
---
 aio/content/examples/observables/src/multicasting.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/examples/observables/src/multicasting.ts b/aio/content/examples/observables/src/multicasting.ts
index 449f7b73c7..e8275842f0 100644
--- a/aio/content/examples/observables/src/multicasting.ts
+++ b/aio/content/examples/observables/src/multicasting.ts
@@ -15,7 +15,7 @@ function sequenceSubscriber(observer) {
       if (idx === arr.length - 1) {
         observer.complete();
       } else {
-        doSequence(arr, idx++);
+        doSequence(arr, ++idx);
       }
     }, 1000);
   }
@@ -95,7 +95,7 @@ function multicastSequenceSubscriber() {
         },
         complete() {
           // Notify all complete callbacks
-          observers.forEach(obs => obs.complete());
+          observers.slice(0).forEach(obs => obs.complete());
         }
       }, seq, 0);
     }
@@ -121,13 +121,13 @@ function doSequence(observer, arr, idx) {
     if (idx === arr.length - 1) {
       observer.complete();
     } else {
-      doSequence(observer, arr, idx++);
+      doSequence(observer, arr, ++idx);
     }
   }, 1000);
 }
 
 // Create a new Observable that will deliver the above sequence
-const multicastSequence = new Observable(multicastSequenceSubscriber);
+const multicastSequence = new Observable(multicastSequenceSubscriber());
 
 // Subscribe starts the clock, and begins to emit after 1 second
 multicastSequence.subscribe({

From 7c89af34a951f26a166163b3be2d42057f900875 Mon Sep 17 00:00:00 2001
From: Arun Kumar <palerdot@users.noreply.github.com>
Date: Wed, 18 Jul 2018 11:55:36 +0530
Subject: [PATCH 543/582] docs: square odds example in rxjs guide (#24947)

Added argument type to filter function of rxjs. Fixed the
return value of filtering of odd numbers

PR Close #24947
---
 aio/content/examples/rx-library/src/operators.1.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/rx-library/src/operators.1.ts b/aio/content/examples/rx-library/src/operators.1.ts
index d9ea72920a..1949dfe47d 100644
--- a/aio/content/examples/rx-library/src/operators.1.ts
+++ b/aio/content/examples/rx-library/src/operators.1.ts
@@ -8,7 +8,7 @@ const nums = of(1, 2, 3, 4, 5);
 
 // Create a function that accepts an Observable.
 const squareOddVals = pipe(
-  filter(n => n % 2),
+  filter((n: number) => n % 2 !== 0),
   map(n => n * n)
 );
 

From edef58f4664d3b8235fb1f65666ec591a56504be Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 18 Jul 2018 08:31:57 +0100
Subject: [PATCH 544/582] build(docs-infra): ensure all API headings are
 sentence cased (#24949)

Closes #24880

PR Close #24949
---
 .../transforms/templates/api/includes/interface-overview.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/tools/transforms/templates/api/includes/interface-overview.html b/aio/tools/transforms/templates/api/includes/interface-overview.html
index 5b58ff5600..7b2b8d6b06 100644
--- a/aio/tools/transforms/templates/api/includes/interface-overview.html
+++ b/aio/tools/transforms/templates/api/includes/interface-overview.html
@@ -5,6 +5,6 @@
 interface {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} {{$ memberHelper.renderMembers(doc) $}
 }
 </code-example>
-{$ descendants.renderDescendants(doc, 'interface', 'Child Interfaces') $}
-{$ descendants.renderDescendants(doc, 'class', 'Class Implementations') $}
+{$ descendants.renderDescendants(doc, 'interface', 'Child interfaces') $}
+{$ descendants.renderDescendants(doc, 'class', 'Class implementations') $}
 </section>
\ No newline at end of file

From 13f3157823f5f88ce00c46dc44f57073a1c3fad9 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Wed, 18 Jul 2018 09:42:42 +0200
Subject: [PATCH 545/582] fix(ivy): update content query compilation to latest
 runtime (#24957)

PR Close #24957
---
 .../compliance/r3_compiler_compliance_spec.ts | 15 +++-
 packages/compiler/src/render3/r3_factory.ts   | 16 +---
 .../compiler/src/render3/r3_identifiers.ts    |  2 +
 .../compiler/src/render3/view/compiler.ts     | 83 ++++++++++++++-----
 packages/core/src/render3/jit/environment.ts  |  2 +
 5 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 33bf098b7f..6fd0a1c9ed 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -987,7 +987,7 @@ describe('compiler compliance', () => {
           app: {
             ...directive,
             'spec.ts': `
-            import {Component, ContentChild, NgModule} from '@angular/core';
+            import {Component, ContentChild, ContentChildren, NgModule, QueryList} from '@angular/core';
             import {SomeDirective} from './some.directive';
 
             @Component({
@@ -998,6 +998,7 @@ describe('compiler compliance', () => {
             })
             export class ContentQueryComponent {
               @ContentChild(SomeDirective) someDir: SomeDirective;
+              @ContentChildren(SomeDirective) someDirList !: QueryList<SomeDirective>;
             }
 
             @Component({
@@ -1021,11 +1022,17 @@ describe('compiler compliance', () => {
             type: ContentQueryComponent,
             selectors: [["content-query-component"]],
             factory: function ContentQueryComponent_Factory() {
-              return [new ContentQueryComponent(), $r3$.ɵQ(null, SomeDirective, true)];
+              return new ContentQueryComponent();
+            },            
+            contentQueries: function ContentQueryComponent_ContentQueries() {
+              $r3$.ɵQr($r3$.ɵQ(null, SomeDirective, true));
+              $r3$.ɵQr($r3$.ɵQ(null, SomeDirective, false));
             },
-            hostBindings: function ContentQueryComponent_HostBindings(dirIndex, elIndex) {
+            contentQueriesRefresh: function ContentQueryComponent_ContentQueriesRefresh(dirIndex, queryStartIndex) {  
+              const instance = $r3$.ɵd(dirIndex);
               var $tmp$;
-              ($r3$.ɵqR(($tmp$ = $r3$.ɵd(dirIndex)[1])) && ($r3$.ɵd(dirIndex)[0].someDir = $tmp$.first));
+              ($r3$.ɵqR(($tmp$ = $r3$.ɵql(queryStartIndex))) && ($instance$.someDir = $tmp$.first));
+              ($r3$.ɵqR(($tmp$ = $r3$.ɵql((queryStartIndex + 1)))) && ($instance$.someDirList = $tmp$));
             },
             template: function ContentQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
diff --git a/packages/compiler/src/render3/r3_factory.ts b/packages/compiler/src/render3/r3_factory.ts
index ba50ae1550..949f6672de 100644
--- a/packages/compiler/src/render3/r3_factory.ts
+++ b/packages/compiler/src/render3/r3_factory.ts
@@ -54,16 +54,6 @@ export interface R3FactoryMetadata {
    * function could be different, and other options control how it will be invoked.
    */
   injectFn: o.ExternalReference;
-
-  /**
-   * If present, the return of the factory function will be an array with the injected value in the
-   * 0th position and the extra results included in subsequent positions.
-   *
-   * Occasionally APIs want to construct additional values when the factory function is called. The
-   * paradigm there is to have the factory function return an array, with the DI-created value as
-   * well as other values. Specifying `extraResults` enables this functionality.
-   */
-  extraResults?: o.Expression[];
 }
 
 /**
@@ -160,12 +150,8 @@ export function compileFactoryFunction(meta: R3FactoryMetadata): o.Expression {
   const expr = meta.useNew ? new o.InstantiateExpr(meta.fnOrClass, args) :
                              new o.InvokeFunctionExpr(meta.fnOrClass, args);
 
-  // If `extraResults` is specified, then the result is an array consisting of the instantiated
-  // value plus any extra results.
-  const retExpr =
-      meta.extraResults === undefined ? expr : o.literalArr([expr, ...meta.extraResults]);
   return o.fn(
-      [], [new o.ReturnStatement(retExpr)], o.INFERRED_TYPE, undefined, `${meta.name}_Factory`);
+      [], [new o.ReturnStatement(expr)], o.INFERRED_TYPE, undefined, `${meta.name}_Factory`);
 }
 
 function compileInjectDependency(
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 72f2f30ba0..ae60d396a1 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -80,6 +80,7 @@ export class Identifiers {
 
   static load: o.ExternalReference = {name: 'ɵld', moduleName: CORE};
   static loadDirective: o.ExternalReference = {name: 'ɵd', moduleName: CORE};
+  static loadQueryList: o.ExternalReference = {name: 'ɵql', moduleName: CORE};
 
   static pipe: o.ExternalReference = {name: 'ɵPp', moduleName: CORE};
 
@@ -142,6 +143,7 @@ export class Identifiers {
 
   static query: o.ExternalReference = {name: 'ɵQ', moduleName: CORE};
   static queryRefresh: o.ExternalReference = {name: 'ɵqR', moduleName: CORE};
+  static registerContentQuery: o.ExternalReference = {name: 'ɵQr', moduleName: CORE};
 
   static NgOnChangesFeature: o.ExternalReference = {name: 'ɵNgOnChangesFeature', moduleName: CORE};
 
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 0905821b33..f008fa572e 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -41,7 +41,6 @@ function baseDirectiveFields(
   // e.g. `selectors: [['', 'someDir', '']]`
   definitionMap.set('selectors', createDirectiveSelector(meta.selector !));
 
-  const queryDefinitions = createQueryDefinitions(meta.queries, constantPool);
 
   // e.g. `factory: () => new MyApp(injectElementRef())`
   definitionMap.set('factory', compileFactoryFunction({
@@ -50,9 +49,12 @@ function baseDirectiveFields(
                       deps: meta.deps,
                       useNew: true,
                       injectFn: R3.directiveInject,
-                      extraResults: queryDefinitions,
                     }));
 
+  definitionMap.set('contentQueries', createContentQueriesFunction(meta, constantPool));
+
+  definitionMap.set('contentQueriesRefresh', createContentQueriesRefreshFunction(meta));
+
   // e.g. `hostBindings: (dirIndex, elIndex) => { ... }
   definitionMap.set('hostBindings', createHostBindingsFunction(meta, bindingParser));
 
@@ -366,32 +368,71 @@ function createHostAttributesArray(meta: R3DirectiveMetadata): o.Expression|null
   return null;
 }
 
+// Return a contentQueries function or null if one is not necessary.
+function createContentQueriesFunction(
+    meta: R3DirectiveMetadata, constantPool: ConstantPool): o.Expression|null {
+  const queryDefinitions = createQueryDefinitions(meta.queries, constantPool);
+
+  if (queryDefinitions) {
+    const statements: o.Statement[] = queryDefinitions.map((qd: o.Expression) => {
+      return o.importExpr(R3.registerContentQuery).callFn([qd]).toStmt();
+    });
+    const typeName = meta.name;
+    return o.fn(
+        [], statements, o.INFERRED_TYPE, null, typeName ? `${typeName}_ContentQueries` : null);
+  }
+
+  return null;
+}
+
+// Return a contentQueriesRefresh function or null if one is not necessary.
+function createContentQueriesRefreshFunction(meta: R3DirectiveMetadata): o.Expression|null {
+  if (meta.queries.length > 0) {
+    const statements: o.Statement[] = [];
+    const typeName = meta.name;
+    const parameters = [
+      new o.FnParam('dirIndex', o.NUMBER_TYPE),
+      new o.FnParam('queryStartIndex', o.NUMBER_TYPE),
+    ];
+    const directiveInstanceVar = o.variable('instance');
+    // var $tmp$: any;
+    const temporary = temporaryAllocator(statements, TEMPORARY_NAME);
+
+    // const $instance$ = $r3$.ɵd(dirIndex);
+    statements.push(
+        directiveInstanceVar.set(o.importExpr(R3.loadDirective).callFn([o.variable('dirIndex')]))
+            .toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]));
+
+    meta.queries.forEach((query: R3QueryMetadata, idx: number) => {
+      const loadQLArg = o.variable('queryStartIndex');
+      const getQueryList = o.importExpr(R3.loadQueryList).callFn([
+        idx > 0 ? loadQLArg.plus(o.literal(idx)) : loadQLArg
+      ]);
+      const assignToTemporary = temporary().set(getQueryList);
+      const callQueryRefresh = o.importExpr(R3.queryRefresh).callFn([assignToTemporary]);
+
+      const updateDirective = directiveInstanceVar.prop(query.propertyName)
+                                  .set(query.first ? temporary().prop('first') : temporary());
+      const refreshQueryAndUpdateDirective = callQueryRefresh.and(updateDirective);
+
+      statements.push(refreshQueryAndUpdateDirective.toStmt());
+    });
+
+    return o.fn(
+        parameters, statements, o.INFERRED_TYPE, null,
+        typeName ? `${typeName}_ContentQueriesRefresh` : null);
+  }
+
+  return null;
+}
+
 // Return a host binding function or null if one is not necessary.
 function createHostBindingsFunction(
     meta: R3DirectiveMetadata, bindingParser: BindingParser): o.Expression|null {
   const statements: o.Statement[] = [];
 
-  const temporary = temporaryAllocator(statements, TEMPORARY_NAME);
-
   const hostBindingSourceSpan = meta.typeSourceSpan;
 
-  // Calculate the queries
-  for (let index = 0; index < meta.queries.length; index++) {
-    const query = meta.queries[index];
-
-    // e.g. r3.qR(tmp = r3.d(dirIndex)[1]) && (r3.d(dirIndex)[0].someDir = tmp);
-    const getDirectiveMemory = o.importExpr(R3.loadDirective).callFn([o.variable('dirIndex')]);
-    // The query list is at the query index + 1 because the directive itself is in slot 0.
-    const getQueryList = getDirectiveMemory.key(o.literal(index + 1));
-    const assignToTemporary = temporary().set(getQueryList);
-    const callQueryRefresh = o.importExpr(R3.queryRefresh).callFn([assignToTemporary]);
-    const updateDirective = getDirectiveMemory.key(o.literal(0, o.INFERRED_TYPE))
-                                .prop(query.propertyName)
-                                .set(query.first ? temporary().prop('first') : temporary());
-    const andExpression = callQueryRefresh.and(updateDirective);
-    statements.push(andExpression.toStmt());
-  }
-
   const directiveSummary = metadataAsSummary(meta);
 
   // Calculate the host property bindings
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index b5808dd6ad..65e122c5f5 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -38,6 +38,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵcR': r3.cR,
   'ɵcr': r3.cr,
   'ɵd': r3.d,
+  'ɵql': r3.ql,
   'ɵNH': r3.NH,
   'ɵNM': r3.NM,
   'ɵNS': r3.NS,
@@ -77,6 +78,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵPp': r3.Pp,
   'ɵQ': r3.Q,
   'ɵqR': r3.qR,
+  'ɵQr': r3.Qr,
   'ɵrS': r3.rS,
   'ɵs': r3.s,
   'ɵsm': r3.sm,

From 169e9dd2c884b1ac23e2dbcfb4d18a89916bbfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Wed, 11 Jul 2018 10:58:18 -0700
Subject: [PATCH 546/582] feat(ivy): bridge compile instructions to include
 sanitization helpers (#24938)

PR Close #24938
---
 .../src/largetable/render3/table.ts           |   4 +-
 modules/benchmarks/src/tree/render3/tree.ts   |   4 +-
 .../compliance/r3_compiler_compliance_spec.ts |  10 +-
 .../r3_view_compiler_styling_spec.ts          |  75 ++-
 .../compiler/src/render3/r3_identifiers.ts    |   8 +
 .../compiler/src/render3/view/template.ts     | 112 +++-
 .../core/src/core_render3_private_export.ts   |  12 +-
 packages/core/src/render3/instructions.ts     |  58 +-
 packages/core/src/render3/jit/environment.ts  |   8 +
 packages/core/src/render3/styling.ts          | 159 +++--
 packages/core/src/sanitization/bypass.ts      | 143 +++++
 .../core/src/sanitization/sanitization.ts     | 148 +----
 .../core/src/sanitization/style_sanitizer.ts  |  16 +
 .../bundling/todo/bundle.golden_symbols.json  |   9 +
 .../compiler_canonical/elements_spec.ts       |  10 +-
 .../compiler_canonical/sanitize_spec.ts       |   2 +-
 packages/core/test/render3/exports_spec.ts    |   2 +-
 .../core/test/render3/instructions_spec.ts    |  89 ++-
 .../core/test/render3/integration_spec.ts     |   8 +-
 packages/core/test/render3/styling_spec.ts    | 571 +++++++++++-------
 .../test/sanitization/sanatization_spec.ts    |   5 +-
 21 files changed, 963 insertions(+), 490 deletions(-)
 create mode 100644 packages/core/src/sanitization/bypass.ts

diff --git a/modules/benchmarks/src/largetable/render3/table.ts b/modules/benchmarks/src/largetable/render3/table.ts
index 852538c4b2..9893af24b7 100644
--- a/modules/benchmarks/src/largetable/render3/table.ts
+++ b/modules/benchmarks/src/largetable/render3/table.ts
@@ -48,12 +48,12 @@ export class LargeTableComponent {
                     {
                       if (rf2 & RenderFlags.Create) {
                         E(0, 'td');
-                        s(c0);
+                        s(null, c0);
                         { T(1); }
                         e();
                       }
                       if (rf2 & RenderFlags.Update) {
-                        sp(0, 0, cell.row % 2 ? '' : 'grey');
+                        sp(0, 0, null, cell.row % 2 ? '' : 'grey');
                         t(1, b(cell.value));
                       }
                     }
diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts
index 3fc03b2f81..70b9d43ea2 100644
--- a/modules/benchmarks/src/tree/render3/tree.ts
+++ b/modules/benchmarks/src/tree/render3/tree.ts
@@ -41,7 +41,7 @@ export class TreeComponent {
     template: function(rf: RenderFlags, ctx: TreeComponent) {
       if (rf & RenderFlags.Create) {
         E(0, 'span');
-        s(c0);
+        s(null, c0);
         { T(1); }
         e();
         C(2);
@@ -114,7 +114,7 @@ export function TreeTpl(rf: RenderFlags, ctx: TreeNode) {
     E(0, 'tree');
     {
       E(1, 'span');
-      s(c1);
+      s(null, c1);
       { T(2); }
       e();
       C(3);
diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 6fd0a1c9ed..3d549e7665 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -53,7 +53,7 @@ describe('compiler compliance', () => {
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵE(0, "div", $c1$);
-            $r3$.ɵs(null, $c2$);
+            $r3$.ɵs($c2$);
             $r3$.ɵNS();
             $r3$.ɵE(1, "svg");
             $r3$.ɵEe(2, "circle", $c3$);
@@ -103,7 +103,7 @@ describe('compiler compliance', () => {
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵE(0, "div", $c1$);
-            $r3$.ɵs(null, $c2$);
+            $r3$.ɵs($c2$);
             $r3$.ɵNM();
             $r3$.ɵE(1, "math");
             $r3$.ɵEe(2, "infinity");
@@ -153,7 +153,7 @@ describe('compiler compliance', () => {
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵE(0, "div", $c1$);
-            $r3$.ɵs(null, $c2$);
+            $r3$.ɵs($c2$);
             $r3$.ɵT(1, "Hello ");
             $r3$.ɵE(2, "b");
             $r3$.ɵT(3, "World");
@@ -329,8 +329,8 @@ describe('compiler compliance', () => {
 
       const factory = 'factory: function MyComponent_Factory() { return new MyComponent(); }';
       const template = `
-        const _c0 = ["background-color"];
-        const _c1 = ["error"];
+        const _c0 = ["error"];
+        const _c1 = ["background-color"];
         …
         MyComponent.ngComponentDef = i0.ɵdefineComponent({type:MyComponent,selectors:[["my-component"]],
             factory:function MyComponent_Factory(){
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 24ddf9447d..00aa063cae 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -43,11 +43,11 @@ describe('compiler compliance: styling', () => {
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
               $r3$.ɵE(0, "div");
-              $r3$.ɵs();
+              $r3$.ɵs(null, null, $r3$.ɵzss);
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsm(0, $ctx$.myStyleExp);
+              $r3$.ɵsm(0, null, $ctx$.myStyleExp);
               $r3$.ɵsa(0);
             }
           }
@@ -96,15 +96,15 @@ describe('compiler compliance: styling', () => {
               template: function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
                   $r3$.ɵE(0, "div");
-                  $r3$.ɵs(_c0);
+                  $r3$.ɵs(null, _c0, $r3$.ɵzss);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
-                  $r3$.ɵsm(0, $ctx$.myStyleExp);
+                  $r3$.ɵsm(0, null, $ctx$.myStyleExp);
                   $r3$.ɵsp(0, 1, $ctx$.myWidth);
                   $r3$.ɵsp(0, 2, $ctx$.myHeight);
                   $r3$.ɵsa(0);
-                  $r3$.ɵa(0, "style", $r3$.ɵb("border-width: 10px"));
+                  $r3$.ɵa(0, "style", $r3$.ɵb("border-width: 10px"), $r3$.ɵzs);
                 }
               }
             });
@@ -113,6 +113,59 @@ describe('compiler compliance: styling', () => {
          const result = compile(files, angularFiles);
          expectEmit(result.source, template, 'Incorrect template');
        });
+
+    it('should assign a sanitizer instance to the element style allocation instruction if any url-based properties are detected',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+                import {Component, NgModule} from '@angular/core';
+
+                @Component({
+                  selector: 'my-component',
+                  template: \`<div [style.background-image]="myImage">\`
+                })
+                export class MyComponent {
+                  myImage = 'url(foo.jpg)';
+                }
+
+                @NgModule({declarations: [MyComponent]})
+                export class MyModule {}
+            `
+           }
+         };
+
+         const template = `
+          const _c0 = ["background-image"];
+          export class MyComponent {
+              constructor() {
+                  this.myImage = 'url(foo.jpg)';
+              }
+          }
+
+          MyComponent.ngComponentDef = i0.ɵdefineComponent({
+            type: MyComponent,
+            selectors: [["my-component"]],
+            factory: function MyComponent_Factory() {
+              return new MyComponent();
+            },
+            template: function MyComponent_Template(rf, ctx) {
+              if (rf & 1) {
+                i0.ɵE(0, "div");
+                i0.ɵs(null, _c0, i0.ɵzss);
+                i0.ɵe();
+              }
+              if (rf & 2) {
+                i0.ɵsp(0, 0, ctx.myImage);
+                i0.ɵsa(0);
+              }
+            }
+          });
+        `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
   });
 
   describe('[class]', () => {
@@ -144,7 +197,7 @@ describe('compiler compliance: styling', () => {
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsm(0,null,$ctx$.myClassExp);
+              $r3$.ɵsm(0,$ctx$.myClassExp);
               $r3$.ɵsa(0);
             }
           }
@@ -193,11 +246,11 @@ describe('compiler compliance: styling', () => {
               template: function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
                   $r3$.ɵE(0, "div");
-                  $r3$.ɵs(null, _c0);
+                  $r3$.ɵs(_c0);
                   $r3$.ɵe();
                 }
                 if (rf & 2) {
-                  $r3$.ɵsm(0, null, $ctx$.myClassExp);
+                  $r3$.ɵsm(0, $ctx$.myClassExp);
                   $r3$.ɵcp(0, 1, $ctx$.yesToApple);
                   $r3$.ɵcp(0, 2, $ctx$.yesToOrange);
                   $r3$.ɵsa(0);
@@ -234,8 +287,8 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-          const _c0 = ["width",${InitialStylingFlags.VALUES_MODE},"width","100px"];
-          const _c1 = ["foo",${InitialStylingFlags.VALUES_MODE},"foo",true];
+          const _c0 = ["foo",${InitialStylingFlags.VALUES_MODE},"foo",true];
+          const _c1 = ["width",${InitialStylingFlags.VALUES_MODE},"width","100px"];
           …
           MyComponent.ngComponentDef = i0.ɵdefineComponent({
               type: MyComponent,
@@ -251,7 +304,7 @@ describe('compiler compliance: styling', () => {
                 }
                 if (rf & 2) {
                   $r3$.ɵa(0, "class", $r3$.ɵb("round"));
-                  $r3$.ɵa(0, "style", $r3$.ɵb("height:100px"));
+                  $r3$.ɵa(0, "style", $r3$.ɵb("height:100px"), $r3$.ɵzs);
                 }
               }
             });
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index ae60d396a1..5e1aaabd46 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -154,4 +154,12 @@ export class Identifiers {
 
   // Reserve slots for pure functions
   static reserveSlots: o.ExternalReference = {name: 'ɵrS', moduleName: CORE};
+
+  // sanitization-related functions
+  static sanitizeHtml: o.ExternalReference = {name: 'ɵzh', moduleName: CORE};
+  static sanitizeStyle: o.ExternalReference = {name: 'ɵzs', moduleName: CORE};
+  static defaultStyleSanitizer: o.ExternalReference = {name: 'ɵzss', moduleName: CORE};
+  static sanitizeResourceUrl: o.ExternalReference = {name: 'ɵzr', moduleName: CORE};
+  static sanitizeScript: o.ExternalReference = {name: 'ɵzc', moduleName: CORE};
+  static sanitizeUrl: o.ExternalReference = {name: 'ɵzu', moduleName: CORE};
 }
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index e50f2a5ce9..a2a937d7ea 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -368,10 +368,13 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       }
     });
 
+    let hasMapBasedStyling = false;
     for (let i = 0; i < styleInputs.length; i++) {
       const input = styleInputs[i];
       const isMapBasedStyleBinding = i === 0 && input.name === 'style';
-      if (!isMapBasedStyleBinding && !stylesIndexMap.hasOwnProperty(input.name)) {
+      if (isMapBasedStyleBinding) {
+        hasMapBasedStyling = true;
+      } else if (!stylesIndexMap.hasOwnProperty(input.name)) {
         stylesIndexMap[input.name] = currStyleIndex++;
       }
     }
@@ -384,9 +387,16 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       }
     }
 
+    // in the event that a [style] binding is used then sanitization will
+    // always be imported because it is not possible to know ahead of time
+    // whether style bindings will use or not use any sanitizable properties
+    // that isStyleSanitizable() will detect
+    let useDefaultStyleSanitizer = hasMapBasedStyling;
+
     // this will build the instructions so that they fall into the following syntax
     // => [prop1, prop2, prop3, 0, prop1, value1, prop2, value2]
     Object.keys(stylesIndexMap).forEach(prop => {
+      useDefaultStyleSanitizer = useDefaultStyleSanitizer || isStyleSanitizable(prop);
       initialStyleDeclarations.push(o.literal(prop));
     });
 
@@ -473,18 +483,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       if (hasStylingInstructions) {
         const paramsList: (o.Expression)[] = [];
 
-        if (initialStyleDeclarations.length) {
-          // the template compiler handles initial style (e.g. style="foo") values
-          // in a special command called `elementStyle` so that the initial styles
-          // can be processed during runtime. These initial styles values are bound to
-          // a constant because the inital style values do not change (since they're static).
-          paramsList.push(
-              this.constantPool.getConstLiteral(o.literalArr(initialStyleDeclarations), true));
-        } else if (initialClassDeclarations.length) {
-          // no point in having an extra `null` value unless there are follow-up params
-          paramsList.push(o.NULL_EXPR);
-        }
-
         if (initialClassDeclarations.length) {
           // the template compiler handles initial class styling (e.g. class="foo") values
           // in a special command called `elementClass` so that the initial class
@@ -492,6 +490,26 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           // a constant because the inital class values do not change (since they're static).
           paramsList.push(
               this.constantPool.getConstLiteral(o.literalArr(initialClassDeclarations), true));
+        } else if (initialStyleDeclarations.length || useDefaultStyleSanitizer) {
+          // no point in having an extra `null` value unless there are follow-up params
+          paramsList.push(o.NULL_EXPR);
+        }
+
+        if (initialStyleDeclarations.length) {
+          // the template compiler handles initial style (e.g. style="foo") values
+          // in a special command called `elementStyle` so that the initial styles
+          // can be processed during runtime. These initial styles values are bound to
+          // a constant because the inital style values do not change (since they're static).
+          paramsList.push(
+              this.constantPool.getConstLiteral(o.literalArr(initialStyleDeclarations), true));
+        } else if (useDefaultStyleSanitizer) {
+          // no point in having an extra `null` value unless there are follow-up params
+          paramsList.push(o.NULL_EXPR);
+        }
+
+
+        if (useDefaultStyleSanitizer) {
+          paramsList.push(o.importExpr(R3.defaultStyleSanitizer));
         }
 
         this._creationCode.push(o.importExpr(R3.elementStyling).callFn(paramsList).toStmt());
@@ -532,13 +550,13 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       const stylingInput = mapBasedStyleInput || mapBasedClassInput;
       if (stylingInput) {
         const params: o.Expression[] = [];
-        if (mapBasedStyleInput) {
-          params.push(this.convertPropertyBinding(implicit, mapBasedStyleInput.value, true));
-        } else if (mapBasedClassInput) {
-          params.push(o.NULL_EXPR);
-        }
         if (mapBasedClassInput) {
           params.push(this.convertPropertyBinding(implicit, mapBasedClassInput.value, true));
+        } else if (mapBasedStyleInput) {
+          params.push(o.NULL_EXPR);
+        }
+        if (mapBasedStyleInput) {
+          params.push(this.convertPropertyBinding(implicit, mapBasedStyleInput.value, true));
         }
         this.instruction(
             this._bindingCode, stylingInput.sourceSpan, R3.elementStylingMap, indexLiteral,
@@ -551,11 +569,17 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
         for (i; i < styleInputs.length; i++) {
           const input = styleInputs[i];
           const convertedBinding = this.convertPropertyBinding(implicit, input.value, true);
+          const params = [convertedBinding];
+          const sanitizationRef = resolveSanitizationFn(input, input.securityContext);
+          if (sanitizationRef) {
+            params.push(sanitizationRef);
+          }
+
           const key = input.name;
           const styleIndex: number = stylesIndexMap[key] !;
           this.instruction(
               this._bindingCode, input.sourceSpan, R3.elementStyleProp, indexLiteral,
-              o.literal(styleIndex), convertedBinding);
+              o.literal(styleIndex), ...params);
         }
 
         lastInputCommand = styleInputs[styleInputs.length - 1];
@@ -566,11 +590,17 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
         for (i; i < classInputs.length; i++) {
           const input = classInputs[i];
           const convertedBinding = this.convertPropertyBinding(implicit, input.value, true);
+          const params = [convertedBinding];
+          const sanitizationRef = resolveSanitizationFn(input, input.securityContext);
+          if (sanitizationRef) {
+            params.push(sanitizationRef);
+          }
+
           const key = input.name;
           const classIndex: number = classesIndexMap[key] !;
           this.instruction(
               this._bindingCode, input.sourceSpan, R3.elementClassProp, indexLiteral,
-              o.literal(classIndex), convertedBinding);
+              o.literal(classIndex), ...params);
         }
 
         lastInputCommand = classInputs[classInputs.length - 1];
@@ -588,12 +618,19 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       }
 
       const convertedBinding = this.convertPropertyBinding(implicit, input.value);
+
       const instruction = mapBindingToInstruction(input.type);
       if (instruction) {
+        const params = [convertedBinding];
+        const sanitizationRef = resolveSanitizationFn(input, input.securityContext);
+        if (sanitizationRef) {
+          params.push(sanitizationRef);
+        }
+
         // TODO(chuckj): runtime: security context?
         this.instruction(
             this._bindingCode, input.sourceSpan, instruction, o.literal(elementIndex),
-            o.literal(input.name), convertedBinding);
+            o.literal(input.name), ...params);
       } else {
         this._unsupported(`binding type ${input.type}`);
       }
@@ -1061,3 +1098,36 @@ export function makeBindingParser(): BindingParser {
 function isClassBinding(input: t.BoundAttribute): boolean {
   return input.name == 'className' || input.name == 'class';
 }
+
+function resolveSanitizationFn(input: t.BoundAttribute, context: core.SecurityContext) {
+  switch (context) {
+    case core.SecurityContext.HTML:
+      return o.importExpr(R3.sanitizeHtml);
+    case core.SecurityContext.SCRIPT:
+      return o.importExpr(R3.sanitizeScript);
+    case core.SecurityContext.STYLE:
+      // the compiler does not fill in an instruction for [style.prop?] binding
+      // values because the style algorithm knows internally what props are subject
+      // to sanitization (only [attr.style] values are explicitly sanitized)
+      return input.type === BindingType.Attribute ? o.importExpr(R3.sanitizeStyle) : null;
+    case core.SecurityContext.URL:
+      return o.importExpr(R3.sanitizeUrl);
+    case core.SecurityContext.RESOURCE_URL:
+      return o.importExpr(R3.sanitizeResourceUrl);
+    default:
+      return null;
+  }
+}
+
+function isStyleSanitizable(prop: string): boolean {
+  switch (prop) {
+    case 'background-image':
+    case 'background':
+    case 'border-image':
+    case 'filter':
+    case 'list-style':
+    case 'list-style-image':
+      return true;
+  }
+  return false;
+}
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index d51c1d5468..c88234bda0 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -102,14 +102,16 @@ export {
 } from './render3/index';
 export {NgModuleDef as ɵNgModuleDef} from './metadata/ng_module';
 export {
-  bypassSanitizationTrustHtml as ɵbypassSanitizationTrustHtml,
-  bypassSanitizationTrustStyle as ɵbypassSanitizationTrustStyle,
-  bypassSanitizationTrustScript as ɵbypassSanitizationTrustScript,
-  bypassSanitizationTrustUrl as ɵbypassSanitizationTrustUrl,
-  bypassSanitizationTrustResourceUrl as ɵbypassSanitizationTrustResourceUrl,
   sanitizeHtml as ɵsanitizeHtml,
   sanitizeStyle as ɵsanitizeStyle,
   sanitizeUrl as ɵsanitizeUrl,
   sanitizeResourceUrl as ɵsanitizeResourceUrl,
 } from './sanitization/sanitization';
+export {
+  bypassSanitizationTrustHtml as ɵbypassSanitizationTrustHtml,
+  bypassSanitizationTrustStyle as ɵbypassSanitizationTrustStyle,
+  bypassSanitizationTrustScript as ɵbypassSanitizationTrustScript,
+  bypassSanitizationTrustUrl as ɵbypassSanitizationTrustUrl,
+  bypassSanitizationTrustResourceUrl as ɵbypassSanitizationTrustResourceUrl,
+} from './sanitization/bypass';
 // clang-format on
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 187ada2015..eba6b90974 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -10,6 +10,7 @@ import './ng_dev_mode';
 
 import {QueryList} from '../linker';
 import {Sanitizer} from '../sanitization/security';
+import {StyleSanitizeFn} from '../sanitization/style_sanitizer';
 
 import {assertDefined, assertEqual, assertLessThan, assertNotDefined, assertNotEqual} from './assert';
 import {throwCyclicDependencyError, throwErrorIfNoChangesMode, throwMultipleComponentError} from './errors';
@@ -25,7 +26,7 @@ import {BINDING_INDEX, CLEANUP, CONTAINER_INDEX, CONTENT_QUERIES, CONTEXT, Curre
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {appendChild, appendProjectedNode, canInsertNativeNode, createTextNode, findComponentHost, getChildLNode, getLViewChild, getNextLNode, getParentLNode, insertView, removeView} from './node_manipulation';
 import {isNodeMatchingSelectorList, matchingSelectorIndex} from './node_selector_matcher';
-import {StylingContext, StylingIndex, allocStylingContext, createStylingContextTemplate, renderStyling as renderElementStyles, updateClassProp as updateElementClassProp, updateStyleProp as updateElementStyleProp, updateStylingMap} from './styling';
+import {StylingContext, allocStylingContext, createStylingContextTemplate, renderStyling as renderElementStyles, updateClassProp as updateElementClassProp, updateStyleProp as updateElementStyleProp, updateStylingMap} from './styling';
 import {assertDataInRangeInternal, isDifferent, loadElementInternal, loadInternal, stringify} from './util';
 import {ViewRef} from './view_ref';
 
@@ -1291,25 +1292,29 @@ export function elementClassProp<T>(
  *        (Note that this is not the element index, but rather an index value allocated
  *        specifically for element styling--the index must be the next index after the element
  *        index.)
- * @param styleDeclarations A key/value array of CSS styles that will be registered on the element.
- *   Each individual style will be used on the element as long as it is not overridden
- *   by any styles placed on the element by multiple (`[style]`) or singular (`[style.prop]`)
- *   bindings. If a style binding changes its value to null then the initial styling
- *   values that are passed in here will be applied to the element (if matched).
  * @param classDeclarations A key/value array of CSS classes that will be registered on the element.
  *   Each individual style will be used on the element as long as it is not overridden
  *   by any classes placed on the element by multiple (`[class]`) or singular (`[class.named]`)
  *   bindings. If a class binding changes its value to a falsy value then the matching initial
  *   class value that are passed in here will be applied to the element (if matched).
+ * @param styleDeclarations A key/value array of CSS styles that will be registered on the element.
+ *   Each individual style will be used on the element as long as it is not overridden
+ *   by any styles placed on the element by multiple (`[style]`) or singular (`[style.prop]`)
+ *   bindings. If a style binding changes its value to null then the initial styling
+ *   values that are passed in here will be applied to the element (if matched).
+ * @param styleSanitizer An optional sanitizer function that will be used (if provided)
+ *   to sanitize the any CSS property values that are applied to the element (during rendering).
  */
 export function elementStyling<T>(
+    classDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
     styleDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
-    classDeclarations?: (string | boolean | InitialStylingFlags)[] | null): void {
+    styleSanitizer?: StyleSanitizeFn | null): void {
   const lElement = currentElementNode !;
   const tNode = lElement.tNode;
   if (!tNode.stylingTemplate) {
     // initialize the styling template.
-    tNode.stylingTemplate = createStylingContextTemplate(styleDeclarations, classDeclarations);
+    tNode.stylingTemplate =
+        createStylingContextTemplate(classDeclarations, styleDeclarations, styleSanitizer);
   }
   if (styleDeclarations && styleDeclarations.length ||
       classDeclarations && classDeclarations.length) {
@@ -1377,22 +1382,23 @@ export function elementStylingApply<T>(index: number): void {
  *        renaming as part of minification.
  * @param value New value to write (null to remove).
  * @param suffix Optional suffix. Used with scalar values to add unit such as `px`.
- * @param sanitizer An optional function used to transform the value typically used for
- *        sanitization.
+ *        Note that when a suffix is provided then the underlying sanitizer will
+ *        be ignored.
  */
 export function elementStyleProp<T>(
-    index: number, styleIndex: number, value: T | null, suffix?: string): void;
-export function elementStyleProp<T>(
-    index: number, styleIndex: number, value: T | null, sanitizer?: SanitizerFn): void;
-export function elementStyleProp<T>(
-    index: number, styleIndex: number, value: T | null,
-    suffixOrSanitizer?: string | SanitizerFn): void {
+    index: number, styleIndex: number, value: T | null, suffix?: string): void {
   let valueToAdd: string|null = null;
   if (value) {
-    valueToAdd =
-        typeof suffixOrSanitizer == 'function' ? suffixOrSanitizer(value) : stringify(value);
-    if (typeof suffixOrSanitizer == 'string') {
-      valueToAdd = valueToAdd + suffixOrSanitizer;
+    if (suffix) {
+      // when a suffix is applied then it will bypass
+      // sanitization entirely (b/c a new string is created)
+      valueToAdd = stringify(value) + suffix;
+    } else {
+      // sanitization happens by dealing with a String value
+      // this means that the string value will be passed through
+      // into the style rendering later (which is where the value
+      // will be sanitized before it is applied)
+      valueToAdd = value as any as string;
     }
   }
   updateElementStyleProp(getStylingContext(index), styleIndex, valueToAdd);
@@ -1412,17 +1418,17 @@ export function elementStyleProp<T>(
  *        (Note that this is not the element index, but rather an index value allocated
  *        specifically for element styling--the index must be the next index after the element
  *        index.)
- * @param styles A key/value style map of the styles that will be applied to the given element.
- *        Any missing styles (that have already been applied to the element beforehand) will be
- *        removed (unset) from the element's styling.
  * @param classes A key/value style map of CSS classes that will be added to the given element.
  *        Any missing classes (that have already been applied to the element beforehand) will be
  *        removed (unset) from the element's list of CSS classes.
+ * @param styles A key/value style map of the styles that will be applied to the given element.
+ *        Any missing styles (that have already been applied to the element beforehand) will be
+ *        removed (unset) from the element's styling.
  */
 export function elementStylingMap<T>(
-    index: number, styles: {[styleName: string]: any} | null,
-    classes?: {[key: string]: any} | string | null): void {
-  updateStylingMap(getStylingContext(index), styles, classes);
+    index: number, classes: {[key: string]: any} | string | null,
+    styles?: {[styleName: string]: any} | null): void {
+  updateStylingMap(getStylingContext(index), classes, styles);
 }
 
 //////////////////////////
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 65e122c5f5..9a2137d1d8 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -9,6 +9,7 @@
 import {defineInjectable, defineInjector,} from '../../di/defs';
 import {inject} from '../../di/injector';
 import * as r3 from '../index';
+import * as sanitization from '../../sanitization/sanitization';
 
 
 /**
@@ -88,4 +89,11 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵt': r3.t,
   'ɵV': r3.V,
   'ɵv': r3.v,
+
+  'ɵzh': sanitization.sanitizeHtml,
+  'ɵzs': sanitization.sanitizeStyle,
+  'ɵzss': sanitization.defaultStyleSanitizer,
+  'ɵzr': sanitization.sanitizeResourceUrl,
+  'ɵzc': sanitization.sanitizeScript,
+  'ɵzu': sanitization.sanitizeUrl
 };
diff --git a/packages/core/src/render3/styling.ts b/packages/core/src/render3/styling.ts
index d4e2d049da..aa46782341 100644
--- a/packages/core/src/render3/styling.ts
+++ b/packages/core/src/render3/styling.ts
@@ -6,10 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {StyleSanitizeFn} from '../sanitization/style_sanitizer';
 import {InitialStylingFlags} from './interfaces/definition';
 import {LElementNode} from './interfaces/node';
 import {Renderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces/renderer';
 
+
 /**
  * The styling context acts as a styling manifest (shaped as an array) for determining which
  * styling properties have been assigned via the provided `updateStylingMap`, `updateStyleProp`
@@ -51,42 +53,44 @@ import {Renderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces
  *
  * ```
  * context = [
+ *   element,
+ *   styleSanitizer | null,
  *   [null, '100px', '200px', true],  // property names are not needed since they have already been
  * written to DOM.
  *
+ *   configMasterVal,
  *   1, // this instructs how many `style` values there are so that class index values can be
  * offsetted
- *
- *   configMasterVal,
- *
- *   // 3
- *   'width',
- *   pointers(1, 12);  // Point to static `width`: `100px` and multi `width`.
- *   null,
+ *   'last class string applied',
  *
  *   // 6
- *   'height',
- *   pointers(2, 15); // Point to static `height`: `200px` and multi `height`.
+ *   'width',
+ *   pointers(1, 15);  // Point to static `width`: `100px` and multi `width`.
  *   null,
  *
  *   // 9
- *   'foo',
- *   pointers(1, 18);  // Point to static `foo`: `true` and multi `foo`.
+ *   'height',
+ *   pointers(2, 18); // Point to static `height`: `200px` and multi `height`.
  *   null,
  *
  *   // 12
- *   'width',
- *   pointers(1, 3);  // Point to static `width`: `100px` and single `width`.
+ *   'foo',
+ *   pointers(1, 21);  // Point to static `foo`: `true` and multi `foo`.
  *   null,
  *
  *   // 15
- *   'height',
- *   pointers(2, 6);  // Point to static `height`: `200px` and single `height`.
+ *   'width',
+ *   pointers(1, 6);  // Point to static `width`: `100px` and single `width`.
  *   null,
  *
  *   // 18
+ *   'height',
+ *   pointers(2, 9);  // Point to static `height`: `200px` and single `height`.
+ *   null,
+ *
+ *   // 21
  *   'foo',
- *   pointers(3, 9);  // Point to static `foo`: `true` and single `foo`.
+ *   pointers(3, 12);  // Point to static `foo`: `true` and single `foo`.
  *   null,
  * ]
  *
@@ -111,36 +115,41 @@ import {Renderer3, RendererStyleFlags3, isProceduralRenderer} from './interfaces
  * `updateStylingMap` can include new CSS properties that will be added to the context).
  */
 export interface StylingContext extends
-    Array<InitialStyles|number|string|boolean|LElementNode|null> {
+    Array<InitialStyles|number|string|boolean|LElementNode|StyleSanitizeFn|null> {
   /**
    * Location of element that is used as a target for this context.
    */
   [0]: LElementNode|null;
 
+  /**
+   * The style sanitizer that is used within this context
+   */
+  [1]: StyleSanitizeFn|null;
+
   /**
    * Location of initial data shared by all instances of this style.
    */
-  [1]: InitialStyles;
+  [2]: InitialStyles;
 
   /**
    * A numeric value representing the configuration status (whether the context is dirty or not)
    * mixed together (using bit shifting) with a index value which tells the starting index value
    * of where the multi style entries begin.
    */
-  [2]: number;
+  [3]: number;
 
   /**
    * A numeric value representing the class index offset value. Whenever a single class is
    * applied (using `elementClassProp`) it should have an styling index value that doesn't
    * need to take into account any style values that exist in the context.
    */
-  [3]: number;
+  [4]: number;
 
   /**
    * The last CLASS STRING VALUE that was interpreted by elementStylingMap. This is cached
    * So that the algorithm can exit early incase the string has not changed.
    */
-  [4]: string|null;
+  [5]: string|null;
 }
 
 /**
@@ -159,31 +168,35 @@ export interface InitialStyles extends Array<string|null|boolean> { [0]: null; }
  */
 export const enum StylingFlags {
   // Implies no configurations
-  None = 0b00,
+  None = 0b000,
   // Whether or not the entry or context itself is dirty
-  Dirty = 0b01,
+  Dirty = 0b001,
   // Whether or not this is a class-based assignment
-  Class = 0b10,
+  Class = 0b010,
+  // Whether or not a sanitizer was applied to this property
+  Sanitize = 0b100,
   // The max amount of bits used to represent these configuration values
-  BitCountSize = 2,
-  // There are only two bits here
-  BitMask = 0b11
+  BitCountSize = 3,
+  // There are only three bits here
+  BitMask = 0b111
 }
 
 /** Used as numeric pointer values to determine what cells to update in the `StylingContext` */
 export const enum StylingIndex {
   // Position of where the initial styles are stored in the styling context
   ElementPosition = 0,
+  // Position of where the style sanitizer is stored within the styling context
+  StyleSanitizerPosition = 1,
   // Position of where the initial styles are stored in the styling context
-  InitialStylesPosition = 1,
+  InitialStylesPosition = 2,
   // Index of location where the start of single properties are stored. (`updateStyleProp`)
-  MasterFlagPosition = 2,
+  MasterFlagPosition = 3,
   // Index of location where the class index offset value is located
-  ClassOffsetPosition = 3,
+  ClassOffsetPosition = 4,
   // Position of where the last string-based CSS class value was stored
-  CachedCssClassString = 4,
+  CachedCssClassString = 5,
   // Location of single (prop) value entries are stored within the context
-  SingleStylesStartPosition = 5,
+  SingleStylesStartPosition = 6,
   // Multi and single entries are stored in `StylingContext` as: Flag; PropertyName;  PropertyValue
   FlagsOffset = 0,
   PropertyOffset = 1,
@@ -191,9 +204,9 @@ export const enum StylingIndex {
   // Size of each multi or single entry (flag + prop + value)
   Size = 3,
   // Each flag has a binary digit length of this value
-  BitCountSize = 15,  // (32 - 1) / 2 = ~15
+  BitCountSize = 14,  // (32 - 3) / 2 = ~14
   // The binary digit value as a mask
-  BitMask = 0b111111111111111  // 15 bits
+  BitMask = 0b11111111111111  // 14 bits
 }
 
 /**
@@ -233,10 +246,11 @@ export function allocStylingContext(
  *       class will be applied to the element as an initial class since it's true
  */
 export function createStylingContextTemplate(
+    initialClassDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
     initialStyleDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
-    initialClassDeclarations?: (string | boolean | InitialStylingFlags)[] | null): StylingContext {
+    styleSanitizer?: StyleSanitizeFn | null): StylingContext {
   const initialStylingValues: InitialStyles = [null];
-  const context: StylingContext = [null, initialStylingValues, 0, 0, null];
+  const context: StylingContext = [null, styleSanitizer || null, initialStylingValues, 0, 0, null];
 
   // we use two maps since a class name might collide with a CSS style prop
   const stylesLookup: {[key: string]: number} = {};
@@ -314,7 +328,7 @@ export function createStylingContextTemplate(
 
     const indexForMulti = i * StylingIndex.Size + multiStart;
     const indexForSingle = i * StylingIndex.Size + singleStart;
-    const initialFlag = isClassBased ? StylingFlags.Class : StylingFlags.None;
+    const initialFlag = prepareInitialFlag(prop, isClassBased, styleSanitizer || null);
 
     setFlag(context, indexForSingle, pointers(initialFlag, indexForInitial, indexForMulti));
     setProp(context, indexForSingle, prop);
@@ -347,12 +361,12 @@ const EMPTY_OBJ: {[key: string]: any} = {};
  *
  * @param context The styling context that will be updated with the
  *    newly provided style values.
- * @param styles The key/value map of CSS styles that will be used for the update.
  * @param classes The key/value map of CSS class names that will be used for the update.
+ * @param styles The key/value map of CSS styles that will be used for the update.
  */
 export function updateStylingMap(
-    context: StylingContext, styles: {[key: string]: any} | null,
-    classes?: {[key: string]: any} | string | null): void {
+    context: StylingContext, classes: {[key: string]: any} | string | null,
+    styles?: {[key: string]: any} | null): void {
   let classNames: string[] = EMPTY_ARR;
   let applyAllClasses = false;
   let ignoreAllClassUpdates = false;
@@ -407,10 +421,10 @@ export function updateStylingMap(
       const prop = getProp(context, ctxIndex);
       if (prop === newProp) {
         const value = getValue(context, ctxIndex);
-        if (value !== newValue) {
+        const flag = getPointers(context, ctxIndex);
+        if (hasValueChanged(flag, value, newValue)) {
           setValue(context, ctxIndex, newValue);
 
-          const flag = getPointers(context, ctxIndex);
           const initialValue = getInitialValue(context, flag);
 
           // there is no point in setting this to dirty if the previously
@@ -437,7 +451,8 @@ export function updateStylingMap(
           }
         } else {
           // we only care to do this if the insertion is in the middle
-          insertNewMultiProperty(context, ctxIndex, isClassBased, newProp, newValue);
+          const newFlag = prepareInitialFlag(newProp, isClassBased, getStyleSanitizer(context));
+          insertNewMultiProperty(context, ctxIndex, isClassBased, newProp, newFlag, newValue);
           dirty = true;
         }
       }
@@ -468,6 +483,7 @@ export function updateStylingMap(
   // this means that there are left-over properties in the context that
   // were not detected in the context during the loop above. In that
   // case we want to add the new entries into the list
+  const sanitizer = getStyleSanitizer(context);
   while (propIndex < propLimit) {
     const isClassBased = propIndex >= classesStartIndex;
     if (ignoreAllClassUpdates && isClassBased) break;
@@ -476,7 +492,7 @@ export function updateStylingMap(
     const prop = isClassBased ? classNames[adjustedPropIndex] : styleProps[adjustedPropIndex];
     const value: string|boolean =
         isClassBased ? (applyAllClasses ? true : classes[prop]) : styles[prop];
-    const flag = StylingFlags.Dirty | (isClassBased ? StylingFlags.Class : StylingFlags.None);
+    const flag = prepareInitialFlag(prop, isClassBased, sanitizer) | StylingFlags.Dirty;
     context.push(flag, prop, value);
     propIndex++;
     dirty = true;
@@ -508,7 +524,7 @@ export function updateStyleProp(
   const currFlag = getPointers(context, singleIndex);
 
   // didn't change ... nothing to make a note of
-  if (currValue !== value) {
+  if (hasValueChanged(currFlag, currValue, value)) {
     // the value will always get updated (even if the dirty flag is skipped)
     setValue(context, singleIndex, value);
     const indexForMulti = getMultiOrSingleIndex(currFlag);
@@ -573,6 +589,7 @@ export function renderStyling(
   if (isContextDirty(context)) {
     const native = context[StylingIndex.ElementPosition] !.native;
     const multiStartIndex = getMultiStartIndex(context);
+    const styleSanitizer = getStyleSanitizer(context);
     for (let i = StylingIndex.SingleStylesStartPosition; i < context.length;
          i += StylingIndex.Size) {
       // there is no point in rendering styles that have not changed on screen
@@ -607,7 +624,8 @@ export function renderStyling(
         if (isClassBased) {
           setClass(native, prop, valueToApply ? true : false, renderer, classStore);
         } else {
-          setStyle(native, prop, valueToApply as string | null, renderer, styleStore);
+          const sanitizer = (flag & StylingFlags.Sanitize) ? styleSanitizer : null;
+          setStyle(native, prop, valueToApply as string | null, renderer, sanitizer, styleStore);
         }
         setDirty(context, i, false);
       }
@@ -631,7 +649,8 @@ export function renderStyling(
  */
 function setStyle(
     native: any, prop: string, value: string | null, renderer: Renderer3,
-    store?: {[key: string]: any}) {
+    sanitizer: StyleSanitizeFn | null, store?: {[key: string]: any}) {
+  value = sanitizer && value ? sanitizer(prop, value) : value;
   if (store) {
     store[prop] = value;
   } else if (value) {
@@ -697,6 +716,12 @@ function isClassBased(context: StylingContext, index: number): boolean {
   return ((context[adjustedIndex] as number) & StylingFlags.Class) == StylingFlags.Class;
 }
 
+function isSanitizable(context: StylingContext, index: number): boolean {
+  const adjustedIndex =
+      index >= StylingIndex.SingleStylesStartPosition ? (index + StylingIndex.FlagsOffset) : index;
+  return ((context[adjustedIndex] as number) & StylingFlags.Sanitize) == StylingFlags.Sanitize;
+}
+
 function pointers(configFlag: number, staticIndex: number, dynamicIndex: number) {
   return (configFlag & StylingFlags.BitMask) | (staticIndex << StylingFlags.BitCountSize) |
       (dynamicIndex << (StylingIndex.BitCountSize + StylingFlags.BitCountSize));
@@ -721,6 +746,10 @@ function getMultiStartIndex(context: StylingContext): number {
   return getMultiOrSingleIndex(context[StylingIndex.MasterFlagPosition]) as number;
 }
 
+function getStyleSanitizer(context: StylingContext): StyleSanitizeFn|null {
+  return context[StylingIndex.StyleSanitizerPosition];
+}
+
 function setProp(context: StylingContext, index: number, prop: string) {
   context[index + StylingIndex.PropertyOffset] = prop;
 }
@@ -808,7 +837,8 @@ function updateSinglePointerValues(context: StylingContext, indexStartPosition:
       const singleFlag = getPointers(context, singleIndex);
       const initialIndexForSingle = getInitialIndex(singleFlag);
       const flagValue = (isDirty(context, singleIndex) ? StylingFlags.Dirty : StylingFlags.None) |
-          (isClassBased(context, singleIndex) ? StylingFlags.Class : StylingFlags.None);
+          (isClassBased(context, singleIndex) ? StylingFlags.Class : StylingFlags.None) |
+          (isSanitizable(context, singleIndex) ? StylingFlags.Sanitize : StylingFlags.None);
       const updatedFlag = pointers(flagValue, initialIndexForSingle, i);
       setFlag(context, singleIndex, updatedFlag);
     }
@@ -816,14 +846,14 @@ function updateSinglePointerValues(context: StylingContext, indexStartPosition:
 }
 
 function insertNewMultiProperty(
-    context: StylingContext, index: number, classBased: boolean, name: string,
+    context: StylingContext, index: number, classBased: boolean, name: string, flag: number,
     value: string | boolean): void {
   const doShift = index < context.length;
 
   // prop does not exist in the list, add it in
   context.splice(
-      index, 0, StylingFlags.Dirty | (classBased ? StylingFlags.Class : StylingFlags.None), name,
-      value);
+      index, 0, flag | StylingFlags.Dirty | (classBased ? StylingFlags.Class : StylingFlags.None),
+      name, value);
 
   if (doShift) {
     // because the value was inserted midway into the array then we
@@ -839,3 +869,30 @@ function valueExists(value: string | null | boolean, isClassBased?: boolean) {
   }
   return value !== null;
 }
+
+function prepareInitialFlag(
+    name: string, isClassBased: boolean, sanitizer?: StyleSanitizeFn | null) {
+  if (isClassBased) {
+    return StylingFlags.Class;
+  } else if (sanitizer && sanitizer(name)) {
+    return StylingFlags.Sanitize;
+  }
+  return StylingFlags.None;
+}
+
+function hasValueChanged(
+    flag: number, a: string | boolean | null, b: string | boolean | null): boolean {
+  const isClassBased = flag & StylingFlags.Class;
+  const hasValues = a && b;
+  const usesSanitizer = flag & StylingFlags.Sanitize;
+  // the toString() comparison ensures that a value is checked
+  // ... otherwise (during sanitization bypassing) the === comparsion
+  // would fail since a new String() instance is created
+  if (!isClassBased && hasValues && usesSanitizer) {
+    // we know for sure we're dealing with strings at this point
+    return (a as string).toString() !== (b as string).toString();
+  }
+
+  // everything else is safe to check with a normal equality check
+  return a !== b;
+}
diff --git a/packages/core/src/sanitization/bypass.ts b/packages/core/src/sanitization/bypass.ts
new file mode 100644
index 0000000000..a8b812e225
--- /dev/null
+++ b/packages/core/src/sanitization/bypass.ts
@@ -0,0 +1,143 @@
+/**
+ * @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
+ */
+
+const BRAND = '__SANITIZER_TRUSTED_BRAND__';
+
+export const enum BypassType {
+  Url = 'Url',
+  Html = 'Html',
+  ResourceUrl = 'ResourceUrl',
+  Script = 'Script',
+  Style = 'Style',
+}
+
+/**
+ * A branded trusted string used with sanitization.
+ *
+ * See: {@link TrustedHtmlString}, {@link TrustedResourceUrlString}, {@link TrustedScriptString},
+ * {@link TrustedStyleString}, {@link TrustedUrlString}
+ */
+export interface TrustedString extends String { [BRAND]: BypassType; }
+
+/**
+ * A branded trusted string used with sanitization of `html` strings.
+ *
+ * See: {@link bypassSanitizationTrustHtml} and {@link htmlSanitizer}.
+ */
+export interface TrustedHtmlString extends TrustedString { [BRAND]: BypassType.Html; }
+
+/**
+ * A branded trusted string used with sanitization of `style` strings.
+ *
+ * See: {@link bypassSanitizationTrustStyle} and {@link styleSanitizer}.
+ */
+export interface TrustedStyleString extends TrustedString { [BRAND]: BypassType.Style; }
+
+/**
+ * A branded trusted string used with sanitization of `url` strings.
+ *
+ * See: {@link bypassSanitizationTrustScript} and {@link scriptSanitizer}.
+ */
+export interface TrustedScriptString extends TrustedString { [BRAND]: BypassType.Script; }
+
+/**
+ * A branded trusted string used with sanitization of `url` strings.
+ *
+ * See: {@link bypassSanitizationTrustUrl} and {@link urlSanitizer}.
+ */
+export interface TrustedUrlString extends TrustedString { [BRAND]: BypassType.Url; }
+
+/**
+ * A branded trusted string used with sanitization of `resourceUrl` strings.
+ *
+ * See: {@link bypassSanitizationTrustResourceUrl} and {@link resourceUrlSanitizer}.
+ */
+export interface TrustedResourceUrlString extends TrustedString { [BRAND]: BypassType.ResourceUrl; }
+
+export function allowSanitizationBypass(value: any, type: BypassType): boolean {
+  return (value instanceof String && (value as TrustedStyleString)[BRAND] === type) ? true : false;
+}
+
+/**
+ * Mark `html` string as trusted.
+ *
+ * This function wraps the trusted string in `String` and brands it in a way which makes it
+ * recognizable to {@link htmlSanitizer} to be trusted implicitly.
+ *
+ * @param trustedHtml `html` string which needs to be implicitly trusted.
+ * @returns a `html` `String` which has been branded to be implicitly trusted.
+ */
+export function bypassSanitizationTrustHtml(trustedHtml: string): TrustedHtmlString {
+  return bypassSanitizationTrustString(trustedHtml, BypassType.Html);
+}
+/**
+ * Mark `style` string as trusted.
+ *
+ * This function wraps the trusted string in `String` and brands it in a way which makes it
+ * recognizable to {@link styleSanitizer} to be trusted implicitly.
+ *
+ * @param trustedStyle `style` string which needs to be implicitly trusted.
+ * @returns a `style` `String` which has been branded to be implicitly trusted.
+ */
+export function bypassSanitizationTrustStyle(trustedStyle: string): TrustedStyleString {
+  return bypassSanitizationTrustString(trustedStyle, BypassType.Style);
+}
+/**
+ * Mark `script` string as trusted.
+ *
+ * This function wraps the trusted string in `String` and brands it in a way which makes it
+ * recognizable to {@link scriptSanitizer} to be trusted implicitly.
+ *
+ * @param trustedScript `script` string which needs to be implicitly trusted.
+ * @returns a `script` `String` which has been branded to be implicitly trusted.
+ */
+export function bypassSanitizationTrustScript(trustedScript: string): TrustedScriptString {
+  return bypassSanitizationTrustString(trustedScript, BypassType.Script);
+}
+/**
+ * Mark `url` string as trusted.
+ *
+ * This function wraps the trusted string in `String` and brands it in a way which makes it
+ * recognizable to {@link urlSanitizer} to be trusted implicitly.
+ *
+ * @param trustedUrl `url` string which needs to be implicitly trusted.
+ * @returns a `url` `String` which has been branded to be implicitly trusted.
+ */
+export function bypassSanitizationTrustUrl(trustedUrl: string): TrustedUrlString {
+  return bypassSanitizationTrustString(trustedUrl, BypassType.Url);
+}
+/**
+ * Mark `url` string as trusted.
+ *
+ * This function wraps the trusted string in `String` and brands it in a way which makes it
+ * recognizable to {@link resourceUrlSanitizer} to be trusted implicitly.
+ *
+ * @param trustedResourceUrl `url` string which needs to be implicitly trusted.
+ * @returns a `url` `String` which has been branded to be implicitly trusted.
+ */
+export function bypassSanitizationTrustResourceUrl(trustedResourceUrl: string):
+    TrustedResourceUrlString {
+  return bypassSanitizationTrustString(trustedResourceUrl, BypassType.ResourceUrl);
+}
+
+
+function bypassSanitizationTrustString(
+    trustedString: string, mode: BypassType.Html): TrustedHtmlString;
+function bypassSanitizationTrustString(
+    trustedString: string, mode: BypassType.Style): TrustedStyleString;
+function bypassSanitizationTrustString(
+    trustedString: string, mode: BypassType.Script): TrustedScriptString;
+function bypassSanitizationTrustString(
+    trustedString: string, mode: BypassType.Url): TrustedUrlString;
+function bypassSanitizationTrustString(
+    trustedString: string, mode: BypassType.ResourceUrl): TrustedResourceUrlString;
+function bypassSanitizationTrustString(trustedString: string, mode: BypassType): TrustedString {
+  const trusted = new String(trustedString) as TrustedString;
+  trusted[BRAND] = mode;
+  return trusted;
+}
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index ecd0203456..c5fac7314a 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -9,63 +9,13 @@
 import {getCurrentSanitizer} from '../render3/instructions';
 import {stringify} from '../render3/util';
 
+import {BypassType, allowSanitizationBypass} from './bypass';
 import {_sanitizeHtml as _sanitizeHtml} from './html_sanitizer';
 import {SecurityContext} from './security';
-import {_sanitizeStyle as _sanitizeStyle} from './style_sanitizer';
+import {StyleSanitizeFn, _sanitizeStyle as _sanitizeStyle} from './style_sanitizer';
 import {_sanitizeUrl as _sanitizeUrl} from './url_sanitizer';
 
-const BRAND = '__SANITIZER_TRUSTED_BRAND__';
 
-/**
- * A branded trusted string used with sanitization.
- *
- * See: {@link TrustedHtmlString}, {@link TrustedResourceUrlString}, {@link TrustedScriptString},
- * {@link TrustedStyleString}, {@link TrustedUrlString}
- */
-export interface TrustedString extends String {
-  '__SANITIZER_TRUSTED_BRAND__': 'Html'|'Style'|'Script'|'Url'|'ResourceUrl';
-}
-
-/**
- * A branded trusted string used with sanitization of `html` strings.
- *
- * See: {@link bypassSanitizationTrustHtml} and {@link htmlSanitizer}.
- */
-export interface TrustedHtmlString extends TrustedString { '__SANITIZER_TRUSTED_BRAND__': 'Html'; }
-
-/**
- * A branded trusted string used with sanitization of `style` strings.
- *
- * See: {@link bypassSanitizationTrustStyle} and {@link styleSanitizer}.
- */
-export interface TrustedStyleString extends TrustedString {
-  '__SANITIZER_TRUSTED_BRAND__': 'Style';
-}
-
-/**
- * A branded trusted string used with sanitization of `url` strings.
- *
- * See: {@link bypassSanitizationTrustScript} and {@link scriptSanitizer}.
- */
-export interface TrustedScriptString extends TrustedString {
-  '__SANITIZER_TRUSTED_BRAND__': 'Script';
-}
-
-/**
- * A branded trusted string used with sanitization of `url` strings.
- *
- * See: {@link bypassSanitizationTrustUrl} and {@link urlSanitizer}.
- */
-export interface TrustedUrlString extends TrustedString { '__SANITIZER_TRUSTED_BRAND__': 'Url'; }
-
-/**
- * A branded trusted string used with sanitization of `resourceUrl` strings.
- *
- * See: {@link bypassSanitizationTrustResourceUrl} and {@link resourceUrlSanitizer}.
- */
-export interface TrustedResourceUrlString extends TrustedString {
-  '__SANITIZER_TRUSTED_BRAND__': 'ResourceUrl';
-}
 
 /**
  * An `html` sanitizer which converts untrusted `html` **string** into trusted string by removing
@@ -85,7 +35,7 @@ export function sanitizeHtml(unsafeHtml: any): string {
   if (s) {
     return s.sanitize(SecurityContext.HTML, unsafeHtml) || '';
   }
-  if (unsafeHtml instanceof String && (unsafeHtml as TrustedHtmlString)[BRAND] === 'Html') {
+  if (allowSanitizationBypass(unsafeHtml, BypassType.Html)) {
     return unsafeHtml.toString();
   }
   return _sanitizeHtml(document, stringify(unsafeHtml));
@@ -109,7 +59,7 @@ export function sanitizeStyle(unsafeStyle: any): string {
   if (s) {
     return s.sanitize(SecurityContext.STYLE, unsafeStyle) || '';
   }
-  if (unsafeStyle instanceof String && (unsafeStyle as TrustedStyleString)[BRAND] === 'Style') {
+  if (allowSanitizationBypass(unsafeStyle, BypassType.Style)) {
     return unsafeStyle.toString();
   }
   return _sanitizeStyle(stringify(unsafeStyle));
@@ -134,7 +84,7 @@ export function sanitizeUrl(unsafeUrl: any): string {
   if (s) {
     return s.sanitize(SecurityContext.URL, unsafeUrl) || '';
   }
-  if (unsafeUrl instanceof String && (unsafeUrl as TrustedUrlString)[BRAND] === 'Url') {
+  if (allowSanitizationBypass(unsafeUrl, BypassType.Url)) {
     return unsafeUrl.toString();
   }
   return _sanitizeUrl(stringify(unsafeUrl));
@@ -154,8 +104,7 @@ export function sanitizeResourceUrl(unsafeResourceUrl: any): string {
   if (s) {
     return s.sanitize(SecurityContext.RESOURCE_URL, unsafeResourceUrl) || '';
   }
-  if (unsafeResourceUrl instanceof String &&
-      (unsafeResourceUrl as TrustedResourceUrlString)[BRAND] === 'ResourceUrl') {
+  if (allowSanitizationBypass(unsafeResourceUrl, BypassType.ResourceUrl)) {
     return unsafeResourceUrl.toString();
   }
   throw new Error('unsafe value used in a resource URL context (see http://g.co/ng/security#xss)');
@@ -175,85 +124,22 @@ export function sanitizeScript(unsafeScript: any): string {
   if (s) {
     return s.sanitize(SecurityContext.SCRIPT, unsafeScript) || '';
   }
-  if (unsafeScript instanceof String && (unsafeScript as TrustedScriptString)[BRAND] === 'Script') {
+  if (allowSanitizationBypass(unsafeScript, BypassType.Script)) {
     return unsafeScript.toString();
   }
   throw new Error('unsafe value used in a script context');
 }
 
 /**
- * Mark `html` string as trusted.
- *
- * This function wraps the trusted string in `String` and brands it in a way which makes it
- * recognizable to {@link htmlSanitizer} to be trusted implicitly.
- *
- * @param trustedHtml `html` string which needs to be implicitly trusted.
- * @returns a `html` `String` which has been branded to be implicitly trusted.
+ * The default style sanitizer will handle sanitization for style properties by
+ * sanitizing any CSS property that can include a `url` value (usually image-based properties)
  */
-export function bypassSanitizationTrustHtml(trustedHtml: string): TrustedHtmlString {
-  return bypassSanitizationTrustString(trustedHtml, 'Html');
-}
-/**
- * Mark `style` string as trusted.
- *
- * This function wraps the trusted string in `String` and brands it in a way which makes it
- * recognizable to {@link styleSanitizer} to be trusted implicitly.
- *
- * @param trustedStyle `style` string which needs to be implicitly trusted.
- * @returns a `style` `String` which has been branded to be implicitly trusted.
- */
-export function bypassSanitizationTrustStyle(trustedStyle: string): TrustedStyleString {
-  return bypassSanitizationTrustString(trustedStyle, 'Style');
-}
-/**
- * Mark `script` string as trusted.
- *
- * This function wraps the trusted string in `String` and brands it in a way which makes it
- * recognizable to {@link scriptSanitizer} to be trusted implicitly.
- *
- * @param trustedScript `script` string which needs to be implicitly trusted.
- * @returns a `script` `String` which has been branded to be implicitly trusted.
- */
-export function bypassSanitizationTrustScript(trustedScript: string): TrustedScriptString {
-  return bypassSanitizationTrustString(trustedScript, 'Script');
-}
-/**
- * Mark `url` string as trusted.
- *
- * This function wraps the trusted string in `String` and brands it in a way which makes it
- * recognizable to {@link urlSanitizer} to be trusted implicitly.
- *
- * @param trustedUrl `url` string which needs to be implicitly trusted.
- * @returns a `url` `String` which has been branded to be implicitly trusted.
- */
-export function bypassSanitizationTrustUrl(trustedUrl: string): TrustedUrlString {
-  return bypassSanitizationTrustString(trustedUrl, 'Url');
-}
-/**
- * Mark `url` string as trusted.
- *
- * This function wraps the trusted string in `String` and brands it in a way which makes it
- * recognizable to {@link resourceUrlSanitizer} to be trusted implicitly.
- *
- * @param trustedResourceUrl `url` string which needs to be implicitly trusted.
- * @returns a `url` `String` which has been branded to be implicitly trusted.
- */
-export function bypassSanitizationTrustResourceUrl(trustedResourceUrl: string):
-    TrustedResourceUrlString {
-  return bypassSanitizationTrustString(trustedResourceUrl, 'ResourceUrl');
-}
+export const defaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
+  if (value === undefined) {
+    return prop === 'background-image' || prop === 'background' || prop === 'border-image' ||
+        prop === 'filter' || prop === 'filter' || prop === 'list-style' ||
+        prop === 'list-style-image';
+  }
 
-
-function bypassSanitizationTrustString(trustedString: string, mode: 'Html'): TrustedHtmlString;
-function bypassSanitizationTrustString(trustedString: string, mode: 'Style'): TrustedStyleString;
-function bypassSanitizationTrustString(trustedString: string, mode: 'Script'): TrustedScriptString;
-function bypassSanitizationTrustString(trustedString: string, mode: 'Url'): TrustedUrlString;
-function bypassSanitizationTrustString(
-    trustedString: string, mode: 'ResourceUrl'): TrustedResourceUrlString;
-function bypassSanitizationTrustString(
-    trustedString: string,
-    mode: 'Html' | 'Style' | 'Script' | 'Url' | 'ResourceUrl'): TrustedString {
-  const trusted = new String(trustedString) as TrustedString;
-  trusted[BRAND] = mode;
-  return trusted;
-}
+  return sanitizeStyle(value);
+} as StyleSanitizeFn);
diff --git a/packages/core/src/sanitization/style_sanitizer.ts b/packages/core/src/sanitization/style_sanitizer.ts
index c335781048..88a03e8e98 100644
--- a/packages/core/src/sanitization/style_sanitizer.ts
+++ b/packages/core/src/sanitization/style_sanitizer.ts
@@ -101,3 +101,19 @@ export function _sanitizeStyle(value: string): string {
 
   return 'unsafe';
 }
+
+
+/**
+ * Used to intercept and sanitize style values before they are written to the renderer.
+ *
+ * This function is designed to be called in two modes. When a value is not provided
+ * then the function will return a boolean whether a property will be sanitized later.
+ * If a value is provided then the sanitized version of that will be returned.
+ */
+export interface StyleSanitizeFn {
+  /** This mode is designed to instruct whether the property will be used for sanitization
+   * at a later point */
+  (prop: string): boolean;
+  /** This mode is designed to sanitize the provided value */
+  (prop: string, value: string): string;
+}
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 86469d9074..2957b13643 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -539,6 +539,9 @@
   {
     "name": "getRootView"
   },
+  {
+    "name": "getStyleSanitizer"
+  },
   {
     "name": "getStylingContext"
   },
@@ -557,6 +560,9 @@
   {
     "name": "getValue"
   },
+  {
+    "name": "hasValueChanged"
+  },
   {
     "name": "hostElement"
   },
@@ -668,6 +674,9 @@
   {
     "name": "pointers"
   },
+  {
+    "name": "prepareInitialFlag"
+  },
   {
     "name": "projectionNodeStack"
   },
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
index 1d1c8dd41a..1eb490df7e 100644
--- a/packages/core/test/render3/compiler_canonical/elements_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -284,7 +284,7 @@ describe('elements', () => {
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
               $r3$.ɵE(0, 'div');
-              $r3$.ɵs(null, c1);
+              $r3$.ɵs(c1);
               $r3$.ɵe();
             }
             if (rf & 2) {
@@ -323,7 +323,7 @@ describe('elements', () => {
           template: function MyComponent_Template(rf: $RenderFlags$, ctx: $MyComponent$) {
             if (rf & 1) {
               $r3$.ɵE(0, 'div');
-              $r3$.ɵs(c0);
+              $r3$.ɵs(null, c0);
               $r3$.ɵe();
             }
             if (rf & 2) {
@@ -356,8 +356,8 @@ describe('elements', () => {
     it('should bind to many and keep order', () => {
       type $MyComponent$ = MyComponent;
 
-      const c0 = ['color', InitialStylingFlags.VALUES_MODE, 'color', 'red'];
-      const c1 = ['foo'];
+      const c0 = ['foo'];
+      const c1 = ['color', InitialStylingFlags.VALUES_MODE, 'color', 'red'];
 
       @Component({
         selector: 'my-component',
@@ -416,7 +416,7 @@ describe('elements', () => {
               $r3$.ɵe();
             }
             if (rf & 2) {
-              $r3$.ɵsm(0, ctx.styleExp, ctx.classExp);
+              $r3$.ɵsm(0, ctx.classExp, ctx.styleExp);
               $r3$.ɵsa(0);
             }
           }
diff --git a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
index 43fea1b77b..dd2e4b11cb 100644
--- a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
@@ -51,7 +51,7 @@ describe('compiler sanitization', () => {
           if (rf & 2) {
             $r3$.ɵp(0, 'innerHTML', $r3$.ɵb(ctx.innerHTML), $r3$.ɵsanitizeHtml);
             $r3$.ɵp(0, 'hidden', $r3$.ɵb(ctx.hidden));
-            $r3$.ɵsp(0, 0, ctx.style, $r3$.ɵsanitizeStyle);
+            $r3$.ɵsp(0, 0, ctx.style);
             $r3$.ɵsa(0);
             $r3$.ɵp(1, 'src', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
             $r3$.ɵa(1, 'srcset', $r3$.ɵb(ctx.url), $r3$.ɵsanitizeUrl);
diff --git a/packages/core/test/render3/exports_spec.ts b/packages/core/test/render3/exports_spec.ts
index 8db0c81559..b357572fd5 100644
--- a/packages/core/test/render3/exports_spec.ts
+++ b/packages/core/test/render3/exports_spec.ts
@@ -213,7 +213,7 @@ describe('exports', () => {
       function Template(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           elementStart(0, 'div');
-          elementStyling(null, [InitialStylingFlags.VALUES_MODE, 'red', true]);
+          elementStyling([InitialStylingFlags.VALUES_MODE, 'red', true]);
           elementEnd();
           elementStart(1, 'input', ['type', 'checkbox', 'checked', 'true'], ['myInput', '']);
           elementEnd();
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 2e3f74a812..e95b47ba57 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -14,8 +14,10 @@ import {bind, container, element, elementAttribute, elementEnd, elementProperty,
 import {InitialStylingFlags} from '../../src/render3/interfaces/definition';
 import {AttributeMarker, LElementNode, LNode} from '../../src/render3/interfaces/node';
 import {RElement, domRendererFactory3} from '../../src/render3/interfaces/renderer';
-import {TrustedString, bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
+import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl} from '../../src/sanitization/bypass';
+import {defaultStyleSanitizer, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
+import {StyleSanitizeFn} from '../../src/sanitization/style_sanitizer';
 
 import {NgForOf} from './common_with_def';
 import {ComponentFixture, TemplateFixture} from './render_util';
@@ -27,9 +29,10 @@ describe('instructions', () => {
     elementEnd();
   }
 
-  function createDiv(initialStyles?: (string | number)[]) {
+  function createDiv(initialStyles?: (string | number)[], styleSanitizer?: StyleSanitizeFn) {
     elementStart(0, 'div');
-    elementStyling(initialStyles && Array.isArray(initialStyles) ? initialStyles : null);
+    elementStyling(
+        [], initialStyles && Array.isArray(initialStyles) ? initialStyles : null, styleSanitizer);
     elementEnd();
   }
 
@@ -190,39 +193,87 @@ describe('instructions', () => {
   });
 
   describe('elementStyleProp', () => {
-    it('should use sanitizer function', () => {
-      const t = new TemplateFixture(() => { return createDiv(['background-image']); });
+    it('should automatically sanitize unless a bypass operation is applied', () => {
+      const t = new TemplateFixture(
+          () => { return createDiv(['background-image'], defaultStyleSanitizer); });
       t.update(() => {
-        elementStyleProp(0, 0, 'url("http://server")', sanitizeStyle);
+        elementStyleProp(0, 0, 'url("http://server")');
         elementStylingApply(0);
       });
       // nothing is set because sanitizer suppresses it.
       expect(t.html).toEqual('<div></div>');
 
       t.update(() => {
-        elementStyleProp(0, 0, bypassSanitizationTrustStyle('url("http://server")'), sanitizeStyle);
+        elementStyleProp(0, 0, bypassSanitizationTrustStyle('url("http://server2")'));
         elementStylingApply(0);
       });
       expect((t.hostElement.firstChild as HTMLElement).style.getPropertyValue('background-image'))
-          .toEqual('url("http://server")');
+          .toEqual('url("http://server2")');
+    });
+
+    it('should not re-apply the style value even if it is a newly bypassed again', () => {
+      const sanitizerInterceptor = new MockSanitizerInterceptor();
+      const t = createTemplateFixtureWithSanitizer(
+          () => createDiv(['background-image'], sanitizerInterceptor.getStyleSanitizer()),
+          sanitizerInterceptor);
+
+      t.update(() => {
+        elementStyleProp(0, 0, bypassSanitizationTrustStyle('apple'));
+        elementStylingApply(0);
+      });
+
+      expect(sanitizerInterceptor.lastValue !).toEqual('apple');
+      sanitizerInterceptor.lastValue = null;
+
+      t.update(() => {
+        elementStyleProp(0, 0, bypassSanitizationTrustStyle('apple'));
+        elementStylingApply(0);
+      });
+      expect(sanitizerInterceptor.lastValue).toEqual(null);
     });
   });
 
   describe('elementStyleMap', () => {
     function createDivWithStyle() {
       elementStart(0, 'div');
-      elementStyling(['height', InitialStylingFlags.VALUES_MODE, 'height', '10px']);
+      elementStyling([], ['height', InitialStylingFlags.VALUES_MODE, 'height', '10px']);
       elementEnd();
     }
 
     it('should add style', () => {
       const fixture = new TemplateFixture(createDivWithStyle);
       fixture.update(() => {
-        elementStylingMap(0, {'background-color': 'red'});
+        elementStylingMap(0, null, {'background-color': 'red'});
         elementStylingApply(0);
       });
       expect(fixture.html).toEqual('<div style="height: 10px; background-color: red;"></div>');
     });
+
+    it('should sanitize new styles that may contain `url` properties', () => {
+      const detectedValues: string[] = [];
+      const sanitizerInterceptor =
+          new MockSanitizerInterceptor(value => { detectedValues.push(value); });
+      const fixture = createTemplateFixtureWithSanitizer(
+          () => createDiv([], sanitizerInterceptor.getStyleSanitizer()), sanitizerInterceptor);
+
+      fixture.update(() => {
+        elementStylingMap(0, null, {
+          'background-image': 'background-image',
+          'background': 'background',
+          'border-image': 'border-image',
+          'list-style': 'list-style',
+          'list-style-image': 'list-style-image',
+          'filter': 'filter',
+          'width': 'width'
+        });
+        elementStylingApply(0);
+      });
+
+      const props = detectedValues.sort();
+      expect(props).toEqual([
+        'background', 'background-image', 'border-image', 'filter', 'list-style', 'list-style-image'
+      ]);
+    });
   });
 
   describe('elementClass', () => {
@@ -235,7 +286,7 @@ describe('instructions', () => {
     it('should add class', () => {
       const fixture = new TemplateFixture(createDivWithStyling);
       fixture.update(() => {
-        elementStylingMap(0, null, 'multiple classes');
+        elementStylingMap(0, 'multiple classes');
         elementStylingApply(0);
       });
       expect(fixture.html).toEqual('<div class="multiple classes"></div>');
@@ -504,7 +555,23 @@ class LocalMockSanitizer implements Sanitizer {
   bypassSecurityTrustResourceUrl(value: string) { return new LocalSanitizedValue(value); }
 }
 
+class MockSanitizerInterceptor {
+  public lastValue: string|null = null;
+  constructor(private _interceptorFn?: ((value: any) => any)|null) {}
+  getStyleSanitizer() { return defaultStyleSanitizer; }
+  sanitize(context: SecurityContext, value: LocalSanitizedValue|string|null|any): string|null {
+    if (this._interceptorFn) {
+      this._interceptorFn(value);
+    }
+    return this.lastValue = value;
+  }
+}
+
 function stripStyleWsCharacters(value: string): string {
   // color: blue; => color:blue
   return value.replace(/;/g, '').replace(/:\s+/g, ':');
 }
+
+function createTemplateFixtureWithSanitizer(buildFn: () => any, sanitizer: Sanitizer) {
+  return new TemplateFixture(buildFn, () => {}, null, null, sanitizer);
+}
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 1f1182e012..c1e7440471 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -748,7 +748,7 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
-            elementStyling(['border-color']);
+            elementStyling(null, ['border-color']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
@@ -767,7 +767,7 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
-            elementStyling(['font-size']);
+            elementStyling(null, ['font-size']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
@@ -788,7 +788,7 @@ describe('render3 integration test', () => {
         function Template(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
-            elementStyling(null, ['active']);
+            elementStyling(['active']);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
@@ -814,7 +814,7 @@ describe('render3 integration test', () => {
           if (rf & RenderFlags.Create) {
             elementStart(0, 'span');
             elementStyling(
-                null, ['existing', 'active', InitialStylingFlags.VALUES_MODE, 'existing', true]);
+                ['existing', 'active', InitialStylingFlags.VALUES_MODE, 'existing', true]);
             elementEnd();
           }
           if (rf & RenderFlags.Update) {
diff --git a/packages/core/test/render3/styling_spec.ts b/packages/core/test/render3/styling_spec.ts
index c7c558d6f1..46415d86ba 100644
--- a/packages/core/test/render3/styling_spec.ts
+++ b/packages/core/test/render3/styling_spec.ts
@@ -10,6 +10,8 @@ import {InitialStylingFlags, RenderFlags} from '../../src/render3/interfaces/def
 import {LElementNode} from '../../src/render3/interfaces/node';
 import {Renderer3} from '../../src/render3/interfaces/renderer';
 import {StylingContext, StylingFlags, StylingIndex, allocStylingContext, createStylingContextTemplate, isContextDirty, renderStyling as _renderStyling, setContextDirty, updateClassProp, updateStyleProp, updateStylingMap} from '../../src/render3/styling';
+import {defaultStyleSanitizer} from '../../src/sanitization/sanitization';
+import {StyleSanitizeFn} from '../../src/sanitization/style_sanitizer';
 
 import {renderToHtml} from './render_util';
 
@@ -18,9 +20,9 @@ describe('styling', () => {
   beforeEach(() => { element = {} as any; });
 
   function initContext(
-      styles?: (number | string)[] | null,
-      classes?: (string | number | boolean)[] | null): StylingContext {
-    return allocStylingContext(element, createStylingContextTemplate(styles, classes));
+      styles?: (number | string)[] | null, classes?: (string | number | boolean)[] | null,
+      sanitizer?: StyleSanitizeFn | null): StylingContext {
+    return allocStylingContext(element, createStylingContextTemplate(classes, styles, sanitizer));
   }
 
   function renderStyles(context: StylingContext, renderer?: Renderer3) {
@@ -55,14 +57,23 @@ describe('styling', () => {
   }
 
   function updateClasses(context: StylingContext, classes: string | {[key: string]: any} | null) {
-    updateStylingMap(context, null, classes);
+    updateStylingMap(context, classes, null);
   }
 
-  function cleanStyle(a: number = 0, b: number = 0): number { return _clean(a, b, false); }
+  function updateStyles(context: StylingContext, styles: {[key: string]: any} | null) {
+    updateStylingMap(context, null, styles);
+  }
+
+  function cleanStyle(a: number = 0, b: number = 0): number { return _clean(a, b, false, false); }
+
+  function cleanStyleWithSanitization(a: number = 0, b: number = 0): number {
+    return _clean(a, b, false, true);
+  }
 
   function cleanClass(a: number, b: number) { return _clean(a, b, true); }
 
-  function _clean(a: number = 0, b: number = 0, isClassBased: boolean): number {
+  function _clean(
+      a: number = 0, b: number = 0, isClassBased: boolean, sanitizable?: boolean): number {
     let num = 0;
     if (a) {
       num |= a << StylingFlags.BitCountSize;
@@ -73,24 +84,32 @@ describe('styling', () => {
     if (isClassBased) {
       num |= StylingFlags.Class;
     }
+    if (sanitizable) {
+      num |= StylingFlags.Sanitize;
+    }
     return num;
   }
 
-  function _dirty(a: number = 0, b: number = 0, isClassBased: boolean): number {
-    return _clean(a, b, isClassBased) | StylingFlags.Dirty;
+  function _dirty(
+      a: number = 0, b: number = 0, isClassBased: boolean, sanitizable?: boolean): number {
+    return _clean(a, b, isClassBased, sanitizable) | StylingFlags.Dirty;
   }
 
   function dirtyStyle(a: number = 0, b: number = 0): number {
     return _dirty(a, b, false) | StylingFlags.Dirty;
   }
 
+  function dirtyStyleWithSanitization(a: number = 0, b: number = 0): number {
+    return _dirty(a, b, false, true);
+  }
+
   function dirtyClass(a: number, b: number) { return _dirty(a, b, true); }
 
   describe('styles', () => {
     describe('createStylingContextTemplate', () => {
       it('should initialize empty template', () => {
         const template = initContext();
-        expect(template).toEqual([element, [null], cleanStyle(0, 5), 0, null]);
+        expect(template).toEqual([element, null, [null], cleanStyle(0, 6), 0, null]);
       });
 
       it('should initialize static styles', () => {
@@ -98,28 +117,29 @@ describe('styling', () => {
             initContext([InitialStylingFlags.VALUES_MODE, 'color', 'red', 'width', '10px']);
         expect(template).toEqual([
           element,
+          null,
           [null, 'red', '10px'],
-          dirtyStyle(0, 11),  //
+          dirtyStyle(0, 12),  //
           0,
           null,
 
-          // #5
-          cleanStyle(1, 11),
+          // #6
+          cleanStyle(1, 12),
           'color',
           null,
 
-          // #8
-          cleanStyle(2, 14),
+          // #9
+          cleanStyle(2, 15),
           'width',
           null,
 
-          // #11
-          dirtyStyle(1, 5),
+          // #12
+          dirtyStyle(1, 6),
           'color',
           null,
 
-          // #14
-          dirtyStyle(2, 8),
+          // #15
+          dirtyStyle(2, 9),
           'width',
           null,
         ]);
@@ -132,7 +152,7 @@ describe('styling', () => {
            function Template(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
                elementStart(0, 'span');
-               elementStyling([
+               elementStyling([], [
                  'width', 'height', 'opacity',  //
                  InitialStylingFlags.VALUES_MODE, 'width', '100px', 'height', '100px', 'opacity',
                  '0.5'
@@ -160,30 +180,30 @@ describe('styling', () => {
       it('should build a list of multiple styling values', () => {
         const getStyles = trackStylesFactory();
         const stylingContext = initContext();
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
-        updateStylingMap(stylingContext, {height: '200px'});
+        updateStyles(stylingContext, {height: '200px'});
         expect(getStyles(stylingContext)).toEqual({width: null, height: '200px'});
       });
 
       it('should evaluate the delta between style changes when rendering occurs', () => {
         const stylingContext =
             initContext(['width', 'height', InitialStylingFlags.VALUES_MODE, 'width', '100px']);
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           height: '200px',
         });
         expect(renderStyles(stylingContext)).toEqual({width: '100px', height: '200px'});
         expect(renderStyles(stylingContext)).toEqual({});
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
         expect(renderStyles(stylingContext)).toEqual({height: '100px'});
         updateStyleProp(stylingContext, 1, '100px');
         expect(renderStyles(stylingContext)).toEqual({});
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
@@ -193,7 +213,7 @@ describe('styling', () => {
       it('should update individual values on a set of styles', () => {
         const getStyles = trackStylesFactory();
         const stylingContext = initContext(['width', 'height']);
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
@@ -205,7 +225,7 @@ describe('styling', () => {
         const stylingContext = initContext();
         expect(isContextDirty(stylingContext)).toBeFalsy();
 
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
@@ -213,13 +233,13 @@ describe('styling', () => {
 
         setContextDirty(stylingContext, false);
 
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
         expect(isContextDirty(stylingContext)).toBeFalsy();
 
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '200px',
           height: '100px',
         });
@@ -228,7 +248,7 @@ describe('styling', () => {
 
       it('should only mark itself as updated when any single properties have been applied', () => {
         const stylingContext = initContext(['height']);
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
           height: '100px',
         });
@@ -258,7 +278,7 @@ describe('styling', () => {
           opacity: '0',
         });
 
-        updateStylingMap(stylingContext, {width: '200px', height: '200px'});
+        updateStyles(stylingContext, {width: '200px', height: '200px'});
 
         expect(getStyles(stylingContext)).toEqual({
           width: '200px',
@@ -282,7 +302,7 @@ describe('styling', () => {
           opacity: '0',
         });
 
-        updateStylingMap(stylingContext, {});
+        updateStyles(stylingContext, {});
 
         expect(getStyles(stylingContext)).toEqual({
           width: '100px',
@@ -295,68 +315,70 @@ describe('styling', () => {
         const stylingContext = initContext(['width', 'height']);
         const getStyles = trackStylesFactory();
 
-        updateStylingMap(stylingContext, {width: '100px', height: '100px'});
+        updateStyles(stylingContext, {width: '100px', height: '100px'});
 
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          dirtyStyle(0, 11),  //
+          dirtyStyle(0, 12),  //
           2,
           null,
 
-          // #5
-          cleanStyle(0, 11),
+          // #6
+          cleanStyle(0, 12),
           'width',
           null,
 
-          // #8
-          cleanStyle(0, 14),
+          // #9
+          cleanStyle(0, 15),
           'height',
           null,
 
-          // #11
-          dirtyStyle(0, 5),
+          // #12
+          dirtyStyle(0, 6),
           'width',
           '100px',
 
-          // #14
-          dirtyStyle(0, 8),
+          // #15
+          dirtyStyle(0, 9),
           'height',
           '100px',
         ]);
 
         getStyles(stylingContext);
-        updateStylingMap(stylingContext, {width: '200px', opacity: '0'});
+        updateStyles(stylingContext, {width: '200px', opacity: '0'});
 
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          dirtyStyle(0, 11),  //
+          dirtyStyle(0, 12),  //
           2,
           null,
 
-          // #5
-          cleanStyle(0, 11),
+          // #6
+          cleanStyle(0, 12),
           'width',
           null,
 
-          // #8
-          cleanStyle(0, 17),
+          // #9
+          cleanStyle(0, 18),
           'height',
           null,
 
-          // #11
-          dirtyStyle(0, 5),
+          // #12
+          dirtyStyle(0, 6),
           'width',
           '200px',
 
-          // #14
+          // #15
           dirtyStyle(),
           'opacity',
           '0',
 
-          // #17
-          dirtyStyle(0, 8),
+          // #18
+          dirtyStyle(0, 9),
           'height',
           null,
         ]);
@@ -364,69 +386,71 @@ describe('styling', () => {
         getStyles(stylingContext);
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          cleanStyle(0, 11),  //
+          cleanStyle(0, 12),  //
           2,
           null,
 
-          // #5
-          cleanStyle(0, 11),
+          // #6
+          cleanStyle(0, 12),
           'width',
           null,
 
-          // #8
-          cleanStyle(0, 17),
+          // #9
+          cleanStyle(0, 18),
           'height',
           null,
 
-          // #11
-          cleanStyle(0, 5),
+          // #12
+          cleanStyle(0, 6),
           'width',
           '200px',
 
-          // #14
+          // #15
           cleanStyle(),
           'opacity',
           '0',
 
-          // #17
-          cleanStyle(0, 8),
+          // #18
+          cleanStyle(0, 9),
           'height',
           null,
         ]);
 
-        updateStylingMap(stylingContext, {width: null});
+        updateStyles(stylingContext, {width: null});
         updateStyleProp(stylingContext, 0, '300px');
 
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          dirtyStyle(0, 11),  //
+          dirtyStyle(0, 12),  //
           2,
           null,
 
-          // #5
-          dirtyStyle(0, 11),
+          // #6
+          dirtyStyle(0, 12),
           'width',
           '300px',
 
-          // #8
-          cleanStyle(0, 17),
+          // #9
+          cleanStyle(0, 18),
           'height',
           null,
 
-          // #11
-          cleanStyle(0, 5),
+          // #12
+          cleanStyle(0, 6),
           'width',
           null,
 
-          // #14
+          // #15
           dirtyStyle(),
           'opacity',
           null,
 
-          // #17
-          cleanStyle(0, 8),
+          // #18
+          cleanStyle(0, 9),
           'height',
           null,
         ]);
@@ -436,33 +460,34 @@ describe('styling', () => {
         updateStyleProp(stylingContext, 0, null);
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          dirtyStyle(0, 11),  //
+          dirtyStyle(0, 12),  //
           2,
           null,
 
-          // #5
-          dirtyStyle(0, 11),
+          // #6
+          dirtyStyle(0, 12),
           'width',
           null,
 
-          // #8
-          cleanStyle(0, 17),
+          // #9
+          cleanStyle(0, 18),
           'height',
           null,
 
-          // #11
-          cleanStyle(0, 5),
+          // #12
+          cleanStyle(0, 6),
           'width',
           null,
 
-          // #14
+          // #15
           cleanStyle(),
           'opacity',
           null,
 
-          // #17
-          cleanStyle(0, 8),
+          // #18
+          cleanStyle(0, 9),
           'height',
           null,
         ]);
@@ -473,116 +498,119 @@ describe('styling', () => {
            const stylingContext = initContext(['lineHeight']);
            const getStyles = trackStylesFactory();
 
-           updateStylingMap(stylingContext, {width: '100px', height: '100px', opacity: '0.5'});
+           updateStyles(stylingContext, {width: '100px', height: '100px', opacity: '0.5'});
 
            expect(stylingContext).toEqual([
              element,
+             null,
              [null],
-             dirtyStyle(0, 8),  //
+             dirtyStyle(0, 9),  //
              1,
              null,
 
-             // #5
-             cleanStyle(0, 17),
+             // #6
+             cleanStyle(0, 18),
              'lineHeight',
              null,
 
-             // #8
+             // #9
              dirtyStyle(),
              'width',
              '100px',
 
-             // #11
+             // #12
              dirtyStyle(),
              'height',
              '100px',
 
-             // #14
+             // #15
              dirtyStyle(),
              'opacity',
              '0.5',
 
-             // #17
-             cleanStyle(0, 5),
+             // #18
+             cleanStyle(0, 6),
              'lineHeight',
              null,
            ]);
 
            getStyles(stylingContext);
 
-           updateStylingMap(stylingContext, {});
+           updateStyles(stylingContext, {});
            expect(stylingContext).toEqual([
              element,
+             null,
              [null],
-             dirtyStyle(0, 8),  //
+             dirtyStyle(0, 9),  //
              1,
              null,
 
-             // #5
-             cleanStyle(0, 17),
+             // #6
+             cleanStyle(0, 18),
              'lineHeight',
              null,
 
-             // #8
+             // #9
              dirtyStyle(),
              'width',
              null,
 
-             // #11
+             // #12
              dirtyStyle(),
              'height',
              null,
 
-             // #14
+             // #15
              dirtyStyle(),
              'opacity',
              null,
 
-             // #17
-             cleanStyle(0, 5),
+             // #18
+             cleanStyle(0, 6),
              'lineHeight',
              null,
            ]);
 
            getStyles(stylingContext);
-           updateStylingMap(stylingContext, {
+           updateStyles(stylingContext, {
              borderWidth: '5px',
            });
 
            expect(stylingContext).toEqual([
              element,
+             null,
              [null],
-             dirtyStyle(0, 8),  //
+             dirtyStyle(0, 9),  //
              1,
              null,
 
-             // #5
-             cleanStyle(0, 20),
+             // #6
+             cleanStyle(0, 21),
              'lineHeight',
              null,
 
-             // #8
+             // #9
              dirtyStyle(),
              'borderWidth',
              '5px',
 
-             // #11
+             // #12
              cleanStyle(),
              'width',
              null,
 
-             // #14
+             // #15
              cleanStyle(),
              'height',
              null,
 
-             // #17
+             // #18
              cleanStyle(),
              'opacity',
              null,
 
-             // #20
-             cleanStyle(0, 5),
+             // #21
+             cleanStyle(0, 6),
              'lineHeight',
              null,
            ]);
@@ -591,83 +619,85 @@ describe('styling', () => {
 
            expect(stylingContext).toEqual([
              element,
+             null,
              [null],
-             dirtyStyle(0, 8),  //
+             dirtyStyle(0, 9),  //
              1,
              null,
 
-             // #5
-             dirtyStyle(0, 20),
+             // #6
+             dirtyStyle(0, 21),
              'lineHeight',
              '200px',
 
-             // #8
+             // #9
              dirtyStyle(),
              'borderWidth',
              '5px',
 
-             // #11
+             // #12
              cleanStyle(),
              'width',
              null,
 
-             // #14
+             // #15
              cleanStyle(),
              'height',
              null,
 
-             // #17
+             // #18
              cleanStyle(),
              'opacity',
              null,
 
-             // #20
-             cleanStyle(0, 5),
+             // #21
+             cleanStyle(0, 6),
              'lineHeight',
              null,
            ]);
 
-           updateStylingMap(stylingContext, {borderWidth: '15px', borderColor: 'red'});
+           updateStyles(stylingContext, {borderWidth: '15px', borderColor: 'red'});
 
            expect(stylingContext).toEqual([
              element,
+             null,
              [null],
-             dirtyStyle(0, 8),  //
+             dirtyStyle(0, 9),  //
              1,
              null,
 
-             // #5
-             dirtyStyle(0, 23),
+             // #6
+             dirtyStyle(0, 24),
              'lineHeight',
              '200px',
 
-             // #8
+             // #9
              dirtyStyle(),
              'borderWidth',
              '15px',
 
-             // #11
+             // #12
              dirtyStyle(),
              'borderColor',
              'red',
 
-             // #14
+             // #15
              cleanStyle(),
              'width',
              null,
 
-             // #17
+             // #18
              cleanStyle(),
              'height',
              null,
 
-             // #20
+             // #21
              cleanStyle(),
              'opacity',
              null,
 
-             // #23
-             cleanStyle(0, 5),
+             // #24
+             cleanStyle(0, 6),
              'lineHeight',
              null,
            ]);
@@ -677,7 +707,7 @@ describe('styling', () => {
         const getStyles = trackStylesFactory();
         const stylingContext = initContext(['height']);
 
-        updateStylingMap(stylingContext, {
+        updateStyles(stylingContext, {
           width: '100px',
         });
 
@@ -685,23 +715,24 @@ describe('styling', () => {
 
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          dirtyStyle(0, 8),  //
+          dirtyStyle(0, 9),  //
           1,
           null,
 
-          // #5
-          dirtyStyle(0, 11),
+          // #6
+          dirtyStyle(0, 12),
           'height',
           '200px',
 
-          // #5
+          // #6
           dirtyStyle(),
           'width',
           '100px',
 
-          // #11
-          cleanStyle(0, 5),
+          // #12
+          cleanStyle(0, 6),
           'height',
           null,
         ]);
@@ -710,27 +741,140 @@ describe('styling', () => {
 
         expect(stylingContext).toEqual([
           element,
+          null,
           [null],
-          cleanStyle(0, 8),  //
+          cleanStyle(0, 9),  //
           1,
           null,
 
-          // #5
-          cleanStyle(0, 11),
+          // #6
+          cleanStyle(0, 12),
           'height',
           '200px',
 
-          // #5
+          // #6
           cleanStyle(),
           'width',
           '100px',
 
-          // #11
-          cleanStyle(0, 5),
+          // #12
+          cleanStyle(0, 6),
           'height',
           null,
         ]);
       });
+
+      it('should mark styles that may contain url values as being sanitizable (when a sanitizer is passed in)',
+         () => {
+           const getStyles = trackStylesFactory();
+           const initialStyles = ['border-image', 'border-width'];
+           const styleSanitizer = defaultStyleSanitizer;
+           const stylingContext = initContext(initialStyles, null, styleSanitizer);
+
+           updateStyleProp(stylingContext, 0, 'url(foo.jpg)');
+           updateStyleProp(stylingContext, 1, '100px');
+
+           expect(stylingContext).toEqual([
+             element,
+             styleSanitizer,
+             [null],
+             dirtyStyle(0, 12),  //
+             2,
+             null,
+
+             // #6
+             dirtyStyleWithSanitization(0, 12),
+             'border-image',
+             'url(foo.jpg)',
+
+             // #9
+             dirtyStyle(0, 15),
+             'border-width',
+             '100px',
+
+             // #12
+             cleanStyleWithSanitization(0, 6),
+             'border-image',
+             null,
+
+             // #15
+             cleanStyle(0, 9),
+             'border-width',
+             null,
+           ]);
+
+           updateStyles(stylingContext, {'background-image': 'unsafe'});
+
+           expect(stylingContext).toEqual([
+             element,
+             styleSanitizer,
+             [null],
+             dirtyStyle(0, 12),  //
+             2,
+             null,
+
+             // #6
+             dirtyStyleWithSanitization(0, 15),
+             'border-image',
+             'url(foo.jpg)',
+
+             // #9
+             dirtyStyle(0, 18),
+             'border-width',
+             '100px',
+
+             // #12
+             dirtyStyleWithSanitization(0, 0),
+             'background-image',
+             'unsafe',
+
+             // #15
+             cleanStyleWithSanitization(0, 6),
+             'border-image',
+             null,
+
+             // #18
+             cleanStyle(0, 9),
+             'border-width',
+             null,
+           ]);
+
+           getStyles(stylingContext);
+
+           expect(stylingContext).toEqual([
+             element,
+             styleSanitizer,
+             [null],
+             cleanStyle(0, 12),  //
+             2,
+             null,
+
+             // #6
+             cleanStyleWithSanitization(0, 15),
+             'border-image',
+             'url(foo.jpg)',
+
+             // #9
+             cleanStyle(0, 18),
+             'border-width',
+             '100px',
+
+             // #12
+             cleanStyleWithSanitization(0, 0),
+             'background-image',
+             'unsafe',
+
+             // #15
+             cleanStyleWithSanitization(0, 6),
+             'border-image',
+             null,
+
+             // #18
+             cleanStyle(0, 9),
+             'border-width',
+             null,
+           ]);
+         });
     });
   });
 
@@ -739,20 +883,20 @@ describe('styling', () => {
       const template =
           initContext(null, [InitialStylingFlags.VALUES_MODE, 'one', true, 'two', true]);
       expect(template).toEqual([
-        element, [null, true, true], dirtyStyle(0, 11),  //
+        element, null, [null, true, true], dirtyStyle(0, 12),  //
         0, null,
 
-        // #5
-        cleanClass(1, 11), 'one', null,
+        // #6
+        cleanClass(1, 12), 'one', null,
 
-        // #8
-        cleanClass(2, 14), 'two', null,
+        // #9
+        cleanClass(2, 15), 'two', null,
 
-        // #11
-        dirtyClass(1, 5), 'one', null,
+        // #12
+        dirtyClass(1, 6), 'one', null,
 
-        // #14
-        dirtyClass(2, 8), 'two', null
+        // #15
+        dirtyClass(2, 9), 'two', null
       ]);
     });
 
@@ -787,10 +931,10 @@ describe('styling', () => {
          const stylingContext = initContext(null, ['guy']);
          expect(getClasses(stylingContext)).toEqual({});
 
-         updateStylingMap(stylingContext, null, 'foo bar guy');
+         updateStylingMap(stylingContext, 'foo bar guy');
          expect(getClasses(stylingContext)).toEqual({'foo': true, 'bar': true, 'guy': true});
 
-         updateStylingMap(stylingContext, null, 'foo man');
+         updateStylingMap(stylingContext, 'foo man');
          updateClassProp(stylingContext, 0, true);
          expect(getClasses(stylingContext))
              .toEqual({'foo': true, 'man': true, 'bar': false, 'guy': true});
@@ -803,109 +947,111 @@ describe('styling', () => {
       const stylingContext = initContext(initialStyles, initialClasses);
       expect(stylingContext).toEqual([
         element,
+        null,
         [null, '100px', true],
-        dirtyStyle(0, 17),  //
+        dirtyStyle(0, 18),  //
         2,
         null,
 
-        // #5
-        cleanStyle(1, 17),
+        // #6
+        cleanStyle(1, 18),
         'width',
         null,
 
-        // #8
-        cleanStyle(0, 20),
+        // #9
+        cleanStyle(0, 21),
         'height',
         null,
 
-        // #11
-        cleanClass(2, 23),
+        // #12
+        cleanClass(2, 24),
         'wide',
         null,
 
-        // #14
-        cleanClass(0, 26),
+        // #15
+        cleanClass(0, 27),
         'tall',
         null,
 
-        // #17
-        dirtyStyle(1, 5),
+        // #18
+        dirtyStyle(1, 6),
         'width',
         null,
 
-        // #20
-        cleanStyle(0, 8),
+        // #21
+        cleanStyle(0, 9),
         'height',
         null,
 
-        // #23
-        dirtyClass(2, 11),
+        // #24
+        dirtyClass(2, 12),
         'wide',
         null,
 
-        // #26
-        cleanClass(0, 14),
+        // #27
+        cleanClass(0, 15),
         'tall',
         null,
       ]);
 
       expect(getStylesAndClasses(stylingContext)).toEqual([{width: '100px'}, {wide: true}]);
 
-      updateStylingMap(stylingContext, {width: '200px', opacity: '0.5'}, 'tall round');
+      updateStylingMap(stylingContext, 'tall round', {width: '200px', opacity: '0.5'});
       expect(stylingContext).toEqual([
         element,
+        null,
         [null, '100px', true],
-        dirtyStyle(0, 17),  //
+        dirtyStyle(0, 18),  //
         2,
         'tall round',
 
-        // #5
-        cleanStyle(1, 17),
+        // #6
+        cleanStyle(1, 18),
         'width',
         null,
 
-        // #8
-        cleanStyle(0, 32),
+        // #9
+        cleanStyle(0, 33),
         'height',
         null,
 
-        // #11
-        cleanClass(2, 29),
+        // #12
+        cleanClass(2, 30),
         'wide',
         null,
 
-        // #14
-        cleanClass(0, 23),
+        // #15
+        cleanClass(0, 24),
         'tall',
         null,
 
-        // #17
-        dirtyStyle(1, 5),
+        // #18
+        dirtyStyle(1, 6),
         'width',
         '200px',
 
-        // #20
+        // #21
         dirtyStyle(0, 0),
         'opacity',
         '0.5',
 
-        // #23
-        dirtyClass(0, 14),
+        // #24
+        dirtyClass(0, 15),
         'tall',
         true,
 
-        // #26
+        // #27
         dirtyClass(0, 0),
         'round',
         true,
 
-        // #29
-        cleanClass(2, 11),
+        // #30
+        cleanClass(2, 12),
         'wide',
         null,
 
-        // #32
-        cleanStyle(0, 8),
+        // #33
+        cleanStyle(0, 9),
         'height',
         null,
       ]);
@@ -914,63 +1060,64 @@ describe('styling', () => {
         {width: '200px', opacity: '0.5'}, {tall: true, round: true, wide: true}
       ]);
 
-      updateStylingMap(stylingContext, {width: '500px'}, {tall: true, wide: true});
+      updateStylingMap(stylingContext, {tall: true, wide: true}, {width: '500px'});
       updateStyleProp(stylingContext, 0, '300px');
 
       expect(stylingContext).toEqual([
         element,
+        null,
         [null, '100px', true],
-        dirtyStyle(0, 17),  //
+        dirtyStyle(0, 18),  //
         2,
         null,
 
-        // #5
-        dirtyStyle(1, 17),
+        // #6
+        dirtyStyle(1, 18),
         'width',
         '300px',
 
-        // #8
-        cleanStyle(0, 32),
+        // #9
+        cleanStyle(0, 33),
         'height',
         null,
 
-        // #11
-        cleanClass(2, 23),
+        // #12
+        cleanClass(2, 24),
         'wide',
         null,
 
-        // #14
-        cleanClass(0, 20),
+        // #15
+        cleanClass(0, 21),
         'tall',
         null,
 
-        // #17
-        cleanStyle(1, 5),
+        // #18
+        cleanStyle(1, 6),
         'width',
         '500px',
 
-        // #20
-        cleanClass(0, 14),
+        // #21
+        cleanClass(0, 15),
         'tall',
         true,
 
-        // #23
-        cleanClass(2, 11),
+        // #24
+        cleanClass(2, 12),
         'wide',
         true,
 
-        // #26
+        // #27
         dirtyClass(0, 0),
         'round',
         null,
 
-        // #29
+        // #30
         dirtyStyle(0, 0),
         'opacity',
         null,
 
-        // #32
-        cleanStyle(0, 8),
+        // #33
+        cleanStyle(0, 9),
         'height',
         null,
       ]);
diff --git a/packages/core/test/sanitization/sanatization_spec.ts b/packages/core/test/sanitization/sanatization_spec.ts
index 6c9f31e8c0..c1663f4aff 100644
--- a/packages/core/test/sanitization/sanatization_spec.ts
+++ b/packages/core/test/sanitization/sanatization_spec.ts
@@ -7,7 +7,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
+import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl} from '../../src/sanitization/bypass';
+import {sanitizeHtml, sanitizeResourceUrl, sanitizeScript, sanitizeStyle, sanitizeUrl} from '../../src/sanitization/sanitization';
 
 describe('sanitization', () => {
   class Wrap {
@@ -64,4 +65,4 @@ describe('sanitization', () => {
     expect(() => sanitizeScript(bypassSanitizationTrustHtml('true'))).toThrowError(ERROR);
     expect(sanitizeScript(bypassSanitizationTrustScript('true'))).toEqual('true');
   });
-});
\ No newline at end of file
+});

From be3cca4fd589f32d3c101307dcc3851eb91dd011 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Mon, 25 Jun 2018 20:23:38 +0200
Subject: [PATCH 547/582] docs: tests for number/percent/currency pipe (#25028)

Will avoid errors in examples like the one fixed in #24661

Closes #25028
---
 .../common/pipes/ts/e2e_test/pipe_spec.ts     | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts b/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
index f665c6f8b1..10551fcfb1 100644
--- a/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
+++ b/packages/examples/common/pipes/ts/e2e_test/pipe_spec.ts
@@ -68,4 +68,46 @@ describe('pipe', () => {
       expect(element.all(by.css('keyvalue-pipe div')).get(3).getText()).toEqual('2:foo');
     });
   });
+
+  describe('number', () => {
+    it('should work properly', () => {
+      browser.get(URL);
+      waitForElement('number-pipe');
+      const examples = element.all(by.css('number-pipe p'));
+      expect(examples.get(0).getText()).toEqual('e (no formatting): 2.718');
+      expect(examples.get(1).getText()).toEqual('e (3.1-5): 002.71828');
+      expect(examples.get(2).getText()).toEqual('e (4.5-5): 0,002.71828');
+      expect(examples.get(3).getText()).toEqual('e (french): 0 002,71828');
+      expect(examples.get(4).getText()).toEqual('pi (no formatting): 3.14');
+      expect(examples.get(5).getText()).toEqual('pi (3.1-5): 003.14');
+      expect(examples.get(6).getText()).toEqual('pi (3.5-5): 003.14000');
+      expect(examples.get(7).getText()).toEqual('-2.5 (1.0-0): -3');
+    });
+  });
+
+  describe('percent', () => {
+    it('should work properly', () => {
+      browser.get(URL);
+      waitForElement('percent-pipe');
+      const examples = element.all(by.css('percent-pipe p'));
+      expect(examples.get(0).getText()).toEqual('A: 26%');
+      expect(examples.get(1).getText()).toEqual('B: 0,134.950%');
+      expect(examples.get(2).getText()).toEqual('B: 0 134,950 %');
+    });
+  });
+
+  describe('currency', () => {
+    it('should work properly', () => {
+      browser.get(URL);
+      waitForElement('currency-pipe');
+      const examples = element.all(by.css('currency-pipe p'));
+      expect(examples.get(0).getText()).toEqual('A: $0.26');
+      expect(examples.get(1).getText()).toEqual('A: CA$0.26');
+      expect(examples.get(2).getText()).toEqual('A: CAD0.26');
+      expect(examples.get(3).getText()).toEqual('B: CA$0,001.35');
+      expect(examples.get(4).getText()).toEqual('B: $0,001.35');
+      expect(examples.get(5).getText()).toEqual('B: 0 001,35 CA$');
+      expect(examples.get(6).getText()).toEqual('B: CLP1');
+    });
+  });
 });

From d6016f1d1d37e9ab6ee3e7725add1bb63e41f7e4 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 23 Jul 2018 18:33:07 -0700
Subject: [PATCH 548/582] build: update to newer circleCI bazel remote cache
 proxy (#25054)

it fixes the error we currently get on CI

PR Close #25054
---
 .circleci/setup_cache.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/setup_cache.sh b/.circleci/setup_cache.sh
index 232596df4a..d5c8c35b5a 100755
--- a/.circleci/setup_cache.sh
+++ b/.circleci/setup_cache.sh
@@ -5,7 +5,7 @@
 
 set -u -e
 
-readonly DOWNLOAD_URL="https://5-116431813-gh.circle-artifacts.com/0/pkg/bazel-remote-proxy-$(uname -s)_$(uname -m)"
+readonly DOWNLOAD_URL="https://6-116431813-gh.circle-artifacts.com/0/pkg/bazel-remote-proxy-$(uname -s)_$(uname -m)"
 
 curl --fail -o ~/bazel-remote-proxy "$DOWNLOAD_URL"
 chmod +x ~/bazel-remote-proxy

From d523630ea2133ae29bfd6402ab3ab9731b4ac96c Mon Sep 17 00:00:00 2001
From: Stefanie Fluin <sjtrimble@gmail.com>
Date: Thu, 19 Jul 2018 15:00:08 -0700
Subject: [PATCH 549/582] docs(aio): cleanup aalert, callout, subsection use
 and author style (#24986)

PR Close #24986
---
 aio/content/guide/animations.md               |   4 +-
 aio/content/guide/aot-compiler.md             |   8 +-
 aio/content/guide/architecture-modules.md     |   8 +-
 aio/content/guide/architecture.md             |  12 +-
 aio/content/guide/attribute-directives.md     |   6 +-
 aio/content/guide/browser-support.md          |   4 +-
 aio/content/guide/component-interaction.md    |   6 +-
 aio/content/guide/component-styles.md         |   2 +-
 .../guide/dependency-injection-in-action.md   |  20 ++--
 .../guide/dependency-injection-pattern.md     |   4 +-
 aio/content/guide/dependency-injection.md     |  20 ++--
 aio/content/guide/deployment.md               |   4 +-
 aio/content/guide/displaying-data.md          |   8 +-
 aio/content/guide/docs-style-guide.md         | 113 ++++++++++--------
 aio/content/guide/dynamic-component-loader.md |   2 +-
 aio/content/guide/elements.md                 |   2 +-
 aio/content/guide/form-validation.md          |   8 +-
 aio/content/guide/forms.md                    |  24 ++--
 .../hierarchical-dependency-injection.md      |   8 +-
 aio/content/guide/http.md                     |   8 +-
 aio/content/guide/i18n.md                     |  14 +--
 aio/content/guide/lifecycle-hooks.md          |  14 +--
 aio/content/guide/ngmodule-faq.md             |   2 +-
 aio/content/guide/npm-packages.md             |   2 +-
 aio/content/guide/observables.md              |   4 +-
 aio/content/guide/pipes.md                    |   8 +-
 aio/content/guide/quickstart.md               |   6 +-
 aio/content/guide/releases.md                 |   4 +-
 aio/content/guide/router.md                   |  60 +++++-----
 aio/content/guide/rx-library.md               |   4 +-
 aio/content/guide/set-document-title.md       |   2 +-
 aio/content/guide/setup.md                    |   2 +-
 aio/content/guide/structural-directives.md    |   6 +-
 aio/content/guide/styleguide.md               |   8 +-
 aio/content/guide/template-syntax.md          |  30 ++---
 aio/content/guide/testing.md                  |  28 ++---
 aio/content/guide/typescript-configuration.md |   2 +-
 aio/content/guide/universal.md                |  10 +-
 aio/content/guide/updating.md                 |   2 +-
 aio/content/guide/upgrade.md                  |  12 +-
 aio/content/guide/user-input.md               |   4 +-
 aio/content/guide/visual-studio-2015.md       |  12 +-
 aio/content/marketing/contribute.html         |  33 +++--
 aio/content/tutorial/toh-pt0.md               |   4 +-
 aio/content/tutorial/toh-pt4.md               |   6 +-
 aio/content/tutorial/toh-pt5.md               |   8 +-
 aio/content/tutorial/toh-pt6.md               |   4 +-
 aio/src/styles/2-modules/_alert.scss          |  16 ++-
 aio/src/styles/2-modules/_buttons.scss        |  12 +-
 aio/src/styles/2-modules/_callout.scss        |   4 +-
 aio/src/styles/2-modules/_card.scss           |  23 ++++
 aio/src/styles/2-modules/_contribute.scss     |  11 +-
 aio/src/styles/2-modules/_modules-dir.scss    |   1 -
 aio/src/styles/2-modules/_subsection.scss     |  20 ----
 aio/src/styles/_print.scss                    |   2 +-
 55 files changed, 345 insertions(+), 306 deletions(-)
 delete mode 100644 aio/src/styles/2-modules/_subsection.scss

diff --git a/aio/content/guide/animations.md b/aio/content/guide/animations.md
index e9f86a201d..b214696d0a 100644
--- a/aio/content/guide/animations.md
+++ b/aio/content/guide/animations.md
@@ -22,7 +22,7 @@ code uses [AnimationBuilder](/api/animations/AnimationBuilder). If your code doe
 uncomment the `web-animations-js` polyfill from the `polyfills.ts` file generated by Angular CLI.
 </div>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The examples in this page are available as a <live-example></live-example>.
 
@@ -183,7 +183,7 @@ transition definitions, and not in a separate `state(void)` definition. Thus, th
 are different on enter and leave: the element enters from the left
 and leaves to the right.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 These two common animations have their own aliases:
 
diff --git a/aio/content/guide/aot-compiler.md b/aio/content/guide/aot-compiler.md
index 2bc21dc8dd..8516201de7 100644
--- a/aio/content/guide/aot-compiler.md
+++ b/aio/content/guide/aot-compiler.md
@@ -4,7 +4,7 @@ The Angular Ahead-of-Time (AOT) compiler converts your Angular HTML and TypeScri
 
 This guide explains how to build with the AOT compiler using different compiler options and how to write Angular metadata that AOT can compile.
 
-<div class="l-sub-section">
+<div class="alert is-helpful>
 
   <a href="https://www.youtube.com/watch?v=kW9cJsvcsGo">Watch compiler author Tobias Bosch explain the Angular Compiler</a> at AngularConnect 2016.
 
@@ -39,7 +39,7 @@ For AOT compilation, append the `--aot` flags to the _build-only_ or the _build-
   ng serve --aot
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `--prod` meta-flag compiles with AOT by default.
 
@@ -297,7 +297,7 @@ At the same time, the AOT **_collector_** analyzes the metadata recorded in the
 
 You can think of `.metadata.json` as a diagram of the overall structure of a decorator's metadata, represented as an [abstract syntax tree (AST)](https://en.wikipedia.org/wiki/Abstract_syntax_tree).
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Angular's [schema.ts](https://github.com/angular/angular/blob/master/packages/compiler-cli/src/metadata/schema.ts)
 describes the JSON format as a collection of TypeScript interfaces.
@@ -333,7 +333,7 @@ Parentheses                        | `(a + b)`
 If an expression uses unsupported syntax, the _collector_ writes an error node to the `.metadata.json` file. The compiler later reports the error if it needs that
 piece of metadata to generate the application code.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
  If you want `ngc` to report syntax errors immediately rather than produce a `.metadata.json` file with errors, set the `strictMetadataEmit` option in `tsconfig`.
 
diff --git a/aio/content/guide/architecture-modules.md b/aio/content/guide/architecture-modules.md
index 055baae754..c660fb9cb8 100644
--- a/aio/content/guide/architecture-modules.md
+++ b/aio/content/guide/architecture-modules.md
@@ -26,7 +26,7 @@ Here's a simple root NgModule definition:
 
 <code-example path="architecture/src/app/mini-app.ts" region="module" title="src/app/app.module.ts" linenums="false"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The `export` of `AppComponent` is just to show how to export; it isn't actually necessary in this example. A root NgModule has no reason to _export_ anything because other modules don't need to _import_ the root NgModule.
 
@@ -56,7 +56,7 @@ A component and its template together define a _view_. A component can contain a
 
 When you create a component, it is associated directly with a single view, called the _host view_. The host view can be the root of a view hierarchy, which can contain _embedded views_, which are in turn the host views of other components. Those components can be in the same NgModule, or can be imported from other NgModules. Views in the tree can be nested to any depth.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
     The hierarchical structure of views is a key factor in the way Angular detects and responds to changes in the DOM and app data. 
 </div>
 
@@ -72,7 +72,7 @@ Other JavaScript modules use *import statements* to access public objects from o
 
 <code-example path="architecture/src/app/app.module.ts" region="export" linenums="false"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
   <a href="http://exploringjs.com/es6/ch_modules.html">Learn more about the JavaScript module system on the web.</a>
 </div>
 
@@ -99,7 +99,7 @@ In the example of the simple root module above, the application module needs mat
 
 In this way you're using both the Angular and JavaScript module systems _together_. Although it's easy to confuse the two systems, which share the common vocabulary of "imports" and "exports", you will become familiar with the different contexts in which they are used.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Learn more from the [NgModules](guide/ngmodules) page.
 
diff --git a/aio/content/guide/architecture.md b/aio/content/guide/architecture.md
index e1d37bff6c..59476836a1 100644
--- a/aio/content/guide/architecture.md
+++ b/aio/content/guide/architecture.md
@@ -27,7 +27,7 @@ Like JavaScript modules, NgModules can import functionality from other NgModules
 
 Organizing your code into distinct functional modules helps in managing development of complex applications, and in designing for reusability. In addition, this technique lets you take advantage of _lazy-loading_&mdash;that is, loading modules on demand&mdash;in order to minimize the amount of code that needs to be loaded at startup.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   For a more detailed discussion, see [Introduction to modules](guide/architecture-modules).
 
@@ -39,7 +39,7 @@ Every Angular application has at least one component, the *root component* that
 
 The `@Component` decorator identifies the class immediately below it as a component, and provides the template and related component-specific metadata.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
    Decorators are functions that modify JavaScript classes. Angular defines a number of such decorators that attach specific kinds of metadata to classes, so that it knows what those classes mean and how they should work.
 
@@ -59,7 +59,7 @@ Before a view is displayed, Angular evaluates the directives and resolves the bi
 
 Your templates can also use *pipes* to improve the user experience by transforming values for display. Use pipes to display, for example, dates and currency values in a way appropriate to the user's locale. Angular provides predefined pipes for common transformations, and you can also define your own.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   For a more detailed discussion of these concepts, see [Introduction to components](guide/architecture-components).
 
@@ -74,7 +74,7 @@ For data or logic that is not associated with a specific view, and that you want
 
  *Dependency injection* (or DI) lets you keep your component classes lean and efficient. They don't fetch data from the server, validate user input, or log directly to the console; they delegate such tasks to services.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   For a more detailed discusssion, see [Introduction to services and DI](guide/architecture-services).
 
@@ -96,7 +96,7 @@ The router interprets a link URL according to your app's view navigation rules a
 
 To define navigation rules, you associate *navigation paths* with your components. A path uses a URL-like syntax that integrates your program data, in much the same way that template syntax integrates your views with your program data. You can then apply program logic to choose which views to show or to hide, in response to user input and your own access rules.
 
- <div class="l-sub-section">
+ <div class="alert is-helpful">
 
    For a more detailed discussion, see [Routing and navigation](guide/router).
 
@@ -128,7 +128,7 @@ Each of these subjects is introduced in more detail in the following pages.
   * [Pipes](guide/architecture-components#pipes)
 * [Services and dependency injection](guide/architecture-services)
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
    Note that the code referenced on these pages is available as a <live-example></live-example>.
 </div>
diff --git a/aio/content/guide/attribute-directives.md b/aio/content/guide/attribute-directives.md
index 6f5287627a..03c600ab97 100644
--- a/aio/content/guide/attribute-directives.md
+++ b/aio/content/guide/attribute-directives.md
@@ -51,7 +51,7 @@ ng generate directive highlight
 
 The CLI creates `src/app/highlight.directive.ts`, a corresponding test file (`.../spec.ts`, and _declares_ the directive class in the root `AppModule`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 _Directives_ must be declared in [Angular Modules](guide/ngmodules) in the same manner as _components_.
 
@@ -71,7 +71,7 @@ Angular locates each element in the template that has an attribute named `appHig
 
 The _attribute selector_ pattern explains the name of this kind of directive.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 #### Why not "highlight"?
 
@@ -146,7 +146,7 @@ each adorned by the `HostListener` decorator.
 The `@HostListener` decorator lets you subscribe to events of the DOM
 element that hosts an attribute directive, the `<p>` in this case.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Of course you could reach into the DOM with standard JavaScript and attach event listeners manually.
 There are at least three problems with _that_ approach:
diff --git a/aio/content/guide/browser-support.md b/aio/content/guide/browser-support.md
index 9c91a715d8..fea8cd245a 100644
--- a/aio/content/guide/browser-support.md
+++ b/aio/content/guide/browser-support.md
@@ -95,7 +95,7 @@ Angular supports most recent browsers. This includes the following specific vers
 
 </table>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Angular's continuous integration process runs unit tests of the framework on all of these browsers for every pull request,
 using <a href="https://saucelabs.com/">SauceLabs</a> and
@@ -154,7 +154,7 @@ add it yourself, following the same pattern:
 1. install the npm package
 1. `import` the file in `polyfills.ts`
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Non-CLI users should follow the instructions [below](#non-cli).
 </div>
diff --git a/aio/content/guide/component-interaction.md b/aio/content/guide/component-interaction.md
index 38f9d09b14..fd0ef1c53e 100644
--- a/aio/content/guide/component-interaction.md
+++ b/aio/content/guide/component-interaction.md
@@ -119,7 +119,7 @@ E2E tests of input property setter with empty and non-empty names:
 
 Detect and act upon changes to input property values with the `ngOnChanges()` method of the `OnChanges` lifecycle hook interface.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -311,7 +311,7 @@ The following example illustrates this technique with the same
 Neither its appearance nor its behavior will change.
 The child [CountdownTimerComponent](guide/component-interaction#countdown-timer-example) is the same as well.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -400,7 +400,7 @@ Each `AstronautComponent` is a child of the `MissionControlComponent` and theref
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/component-styles.md b/aio/content/guide/component-styles.md
index 1d4eaca201..a5ae119cba 100644
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@@ -187,7 +187,7 @@ They are _not inherited_ by any components nested within the template nor by any
 
 </div>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can specify more than one styles file or even a combination of `styles` and `styleUrls`.
 
diff --git a/aio/content/guide/dependency-injection-in-action.md b/aio/content/guide/dependency-injection-in-action.md
index 358feb1cdf..8d1c222a05 100644
--- a/aio/content/guide/dependency-injection-in-action.md
+++ b/aio/content/guide/dependency-injection-in-action.md
@@ -25,7 +25,7 @@ application and don't need to be listed in any module.
 Service classes can act as their own providers which is why defining them in the `@Injectable` decorator
 is all the registration you need.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -167,7 +167,7 @@ that is visible only to the component and its children, if any.
 You could also provide the `HeroService` to a *different* component elsewhere in the application.
 That would result in a *different* instance of the service, living in a *different* injector.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -433,7 +433,7 @@ It may already have that value in its internal container.
 If it doesn't, it may be able to make one with the help of a ***provider***.
 A *provider* is a recipe for delivering a service associated with a *token*.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -577,7 +577,7 @@ The second provider substitutes the `DateLoggerService` for the `LoggerService`.
 The `LoggerService` is already registered at the `AppComponent` level.
 When _this component_ requests the `LoggerService`, it receives the `DateLoggerService` instead.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -645,7 +645,7 @@ The `HeroOfTheMonthComponent` constructor's `logger` parameter is typed as `Mini
 Behind the scenes, Angular actually sets the `logger` parameter to the full service registered under the `LoggingService` token which happens to be the `DateLoggerService` that was [provided above](guide/dependency-injection-in-action#useclass).
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -707,7 +707,7 @@ After some undisclosed work, the function returns the string of names
 and Angular injects it into the `runnersUp` parameter of the `HeroOfTheMonthComponent`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -769,7 +769,7 @@ A ***class-interface*** should define *only* the members that its consumers are
 Such a narrowing interface helps decouple the concrete class from its consumers.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -866,7 +866,7 @@ and displays them in the order they arrive from the database.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -982,7 +982,7 @@ If you're lucky, they all implement the same base class
 whose API your `NewsComponent` understands.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1165,7 +1165,7 @@ its class signature doesn't mention `Parent`:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/dependency-injection-pattern.md b/aio/content/guide/dependency-injection-pattern.md
index d13f2baa3a..93fd0eb113 100644
--- a/aio/content/guide/dependency-injection-pattern.md
+++ b/aio/content/guide/dependency-injection-pattern.md
@@ -81,7 +81,7 @@ now in the constructor.
 The `Car` class no longer creates an `engine` or `tires`.
 It just consumes them.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 This example leverages TypeScript's constructor syntax for declaring
 parameters and properties simultaneously.
@@ -101,7 +101,7 @@ conform to the general API requirements of an `engine` or `tires`.
 
 Now, if someone extends the `Engine` class, that is not `Car`'s problem.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The _consumer_ of `Car` has the problem. The consumer must update the car creation code to
 something like this:
diff --git a/aio/content/guide/dependency-injection.md b/aio/content/guide/dependency-injection.md
index 6d29c2a0f3..b2559ab55d 100644
--- a/aio/content/guide/dependency-injection.md
+++ b/aio/content/guide/dependency-injection.md
@@ -98,7 +98,7 @@ Without a provider, the injector would not know
 that it is responsible for injecting the service
 nor be able to create the service.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You'll learn much more about _providers_ [below](#providers).
 For now, it is sufficient to know that they configure where and how services are created.
@@ -141,7 +141,7 @@ The second registers a value (`HERO_DI_CONFIG`) under the `APP_CONFIG` _injectio
 With the above registrations, Angular can inject the `UserService` or the `HERO_DI_CONFIG` value
 into any class that it creates.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You'll learn about _injection tokens_ and _provider_ syntax [below](#providers).
 </div>
@@ -174,7 +174,7 @@ You're likely to inject the `UserService` in many places throughout the app
 and will want to inject the same service instance every time.
 Providing the `UserService` with an Angular module is a good choice if an `@Injectable` provider is not an option..
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 To be precise, Angular module providers are registered with the root injector
 _unless the module is_ [lazy loaded](guide/lazy-loading-ngmodules).
@@ -199,7 +199,7 @@ and is never destroyed so the `HeroService` created for the `HeroComponent` also
 If you want to restrict `HeroService` access to the `HeroComponent` and its nested `HeroListComponent`,
 providing the `HeroService` in the `HeroComponent` may be a good choice.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The scope and lifetime of component-provided services is a consequence of [the way Angular creates component instances](#component-child-injectors). 
 
@@ -375,7 +375,7 @@ and let the injector pass them along to the factory function:
 <code-example path="dependency-injection/src/app/heroes/hero.service.provider.ts" region="provider" title="src/app/heroes/hero.service.provider.ts (excerpt)" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `useFactory` field tells Angular that the provider is a factory function
 whose implementation is the `heroServiceFactory`.
@@ -440,7 +440,7 @@ The service can be instantiated by configuring a factory function as shown below
 
 <code-example path="dependency-injection/src/app/tree-shaking/service.0.ts"  title="src/app/tree-shaking/service.0.ts" linenums="false"> </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 To override tree-shakable providers, register the provider using the `providers: []` array syntax of any Angular decorator that supports it.
 
@@ -532,7 +532,7 @@ under test:
 <code-example path="dependency-injection/src/app/test.component.ts" region="spec" title="src/app/test.component.ts" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Learn more in the [Testing](guide/testing) guide.
 
@@ -636,7 +636,7 @@ But what should you use as the token?
 You don't have a class to serve as a token.
 There is no `AppConfig` class.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 ### TypeScript interfaces aren't valid tokens
 
@@ -742,7 +742,7 @@ You can call `get()` with a second parameter, which is the value to return if th
 is not found. Angular can't find the service if it's not registered with this or any ancestor injector.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -776,7 +776,7 @@ If you define the component before the service,
 you'll get a runtime null reference error.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You actually can define the component first with the help of the `forwardRef()` method as explained
 in this [blog post](http://blog.thoughtram.io/angular/2015/09/03/forward-references-in-angular-2.html).
diff --git a/aio/content/guide/deployment.md b/aio/content/guide/deployment.md
index 58b3a26c27..95e3799a2f 100644
--- a/aio/content/guide/deployment.md
+++ b/aio/content/guide/deployment.md
@@ -187,7 +187,7 @@ For example, given the `<base href="/my/app/">`, the browser resolves a URL such
 into a server request for `my/app/some/place/foo.jpg`.
 During navigation, the Angular router uses the _base href_ as the base path to component, template, and module files.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See also the [*APP_BASE_HREF*](api/common/APP_BASE_HREF "API: APP_BASE_HREF") alternative.
 
@@ -215,7 +215,7 @@ The `ng build` command writes generated build artifacts to the output folder.
 The `ng serve` command does not.
 It serves build artifacts from memory instead for a faster development experience.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The output folder is  `dist/` by default.
 To output to a different folder, change the `outputPath` in `angular.json`.
diff --git a/aio/content/guide/displaying-data.md b/aio/content/guide/displaying-data.md
index c5a11d6edc..6f3ba5ea45 100644
--- a/aio/content/guide/displaying-data.md
+++ b/aio/content/guide/displaying-data.md
@@ -13,7 +13,7 @@ The final UI looks like this:
   <img src="generated/images/guide/displaying-data/final.png" alt="Final UI">
 </figure>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -60,7 +60,7 @@ interpolation:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -79,7 +79,7 @@ inserts those values into the browser. Angular updates the display
 when these properties change.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -213,7 +213,7 @@ to the item (the hero) in the current iteration. Angular uses that variable as t
 context for the interpolation in the double curly braces.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/docs-style-guide.md b/aio/content/guide/docs-style-guide.md
index ff2d539930..48d875d8f0 100644
--- a/aio/content/guide/docs-style-guide.md
+++ b/aio/content/guide/docs-style-guide.md
@@ -47,7 +47,7 @@ The reader requests a page by its Page URL. The doc viewer fetches the correspon
 Page URLs mirror the `content` file structure. The URL for the page of a guide is in the form `guide/{page-name}`. The page for _this_ "Authors Style Guide" is located at `content/guide/docs-style-guide.md` and its URL is `guide/docs-style-guide`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 _Tutorial_ pages are exactly like guide pages. The only difference is that they reside in `content/tutorial` instead of `content/guide` and have URLs like `tutorial/{page-name}`.
 
@@ -84,7 +84,7 @@ Standard markdown processors don't allow you to put markdown _within_ HTML tags.
 </div>
 ```
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   It is customary but not required to _precede_ the _closing HTML_ tag with a blank line as well.
 
@@ -162,34 +162,6 @@ Try to minimize the heading depth, preferably only two. But more headings, such
   Try to minimize ...
 ```
 
-## Subsections
-
-Subsections typically present extra detail and references to other pages.
-
-Use subsections for commentary that _enriches_ the reader's understanding of the text that precedes it.
-
-A subsection _must not_ contain anything _essential_ to that understanding. Don't put a critical instruction or a tutorial step in a subsection.
-
-A subsection is content within a `<div>` that has the `l-sub-section` CSS class. You should write the subsection content in markdown.
-
-Here is an example of a subsection `<div>` surrounding the subsection content written in markdown.
-
-<div class="l-sub-section">
-
-  You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
-
-</div>
-
-```html
-<div class="l-sub-section">
-
-You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
-
-</div>
-```
-
-Note that at least one blank line must follow the opening `<div>`. A blank line before the closing `</div>` is customary but not required.
-
 ## Table of contents
 
 Most pages display a table of contents (TOC). The TOC appears in the right panel when the viewport is wide. When narrow, the TOC appears in an expandable/collapsible region near the top of the page.
@@ -322,7 +294,7 @@ The author must also write end-to-end tests for the sample.
 
 Code samples are located in sub-folders of the `content/examples` directory of the `angular/angular` repository. An example folder name should be the same as the guide page it supports.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 A guide page might not have its own sample code. It might refer instead to a sample belonging to another page.
 
@@ -355,7 +327,7 @@ In this example, that path is  `docs-style-guide/src/app/app.module.ts`.
 You added a header to tell the reader where to find the file by setting the `title` attribute.
 Following convention, you set the `title` attribute to the file's location within the sample's root folder.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Unless otherwise noted, all code snippets in this page are derived from sample source code
 located in the `content/examples/docs-style-guide` directory.
@@ -523,7 +495,7 @@ The `linenums` attribute in the second pane restores line numbering for _itself
 
 You must add special code snippet markup to sample source code files before they can be displayed by `<code-example>` and `<code-tabs>` components.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The sample source code for this page, located in `context/examples/docs-style-guide`, contains examples of every code snippet markup described in this section.
 
@@ -570,7 +542,7 @@ The `<code-example>` and `<code-tabs>` components won't display a source code fi
 The _#docregion_ comment begins a code snippet region.
 Every line of code _after_ that comment belongs in the region _until_ the code fragment processor encounters the end of the file or a closing _#enddocregion_.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `src/main.ts` is a simple example of a file with a single _#docregion_ at the top of the file.
 
@@ -613,7 +585,7 @@ You can nest _#docregions_ within _#docregions_
 ... yet more code ...
 /// #enddocregion
 ```
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `src/app/app.module.ts` file has a good example of a nested region.
 
@@ -726,7 +698,7 @@ By adding `<live-example>` to the page you generate links that run sample code i
 
 Live examples (AKA "stackblitz") are defined by one or more `stackblitz.json` files in the root of a code sample folder. Each sample folder usually has a single unnamed definition file, the default `stackblitz.json`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You can create additional, named definition files in the form `name.stackblitz.json`. See `content/examples/testing` for examples.
 
@@ -826,14 +798,14 @@ Here's an embedded live example for this guide.
 
 Every section header tag is also an anchor point. Another guide page could add a link to this section by writing:
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See the ["Anchors"](guide/docs-style-guide#anchors "Style Guide - Anchors") section for details.
 
 </div>
 
 ```html
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See the ["Anchors"](guide/docs-style-guide#anchors "Style Guide - Anchors") section for details.
 
@@ -875,7 +847,7 @@ Now [link to that custom anchor name](#ugly-anchors) as you did before.
 Now [link to that custom anchor name](#ugly-anchors) as you did before.
 ```
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Alternatively, you can use the HTML `<a>` tag.
 
@@ -889,44 +861,81 @@ If you do, be sure to set the `id` attribute - not the `name` attribute! The doc
 
 </div>
 
-## Alerts
+## Alerts and Calllouts
 
-Alerts draw attention to important points. Alerts should not be used for multi-line content (use callouts insteads) or stacked on top of each other.  Note that the content of an alert is indented to the right by two spaces.
+Alerts and callouts present warnings, extra detail or references to other pages. They can also be used to provide commentary that _enriches_ the reader's understanding of the content being presented.
+
+An alert or callout _must not_ contain anything _essential_ to that understanding. Don't put a critical instruction or a tutorial step in a subsection.
+
+### Alerts
+
+Alerts draw attention to short important points. Alerts should not be used for multi-line content (use [callouts](#callouts "callouts") instead).
+
+<div class="alert is-helpful">
+
+  You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
+
+</div>
+
+  Note that at least one blank line must follow both the opening and closing `<div>` tags. A blank line before the closing `</div>` is customary but not required.
+
+```html
+<div class="alert is-helpful">
+
+You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
+
+</div>
+```
+
+There are three different _urgency levels_ used to style the alerts based on the severity or importance of the content.
 
 <div class="alert is-critical">
+
 A critical alert.
+
 </div>
 
 <div class="alert is-important">
+
 An important alert.
+
 </div>
 
 <div class="alert is-helpful">
+
 A helpful, informational alert.
+
 </div>
 
 
 Here is the markup for these alerts.
 ```html
 <div class="alert is-critical">
+
 A critical alert.
+
 </div>
 
 <div class="alert is-important">
+
 An important alert.
+
 </div>
 
 <div class="alert is-helpful">
+
 A helpful, informational alert.
+
 </div>
 ```
 
-Alerts are meant to grab the user's attention and should be used sparingly.
-They are not for casual asides or commentary. Use [subsections](#subsections "subsections") for commentary.
+### Callouts
 
-## Callouts
+Callouts, like alerts, are meant to draw attention to important points. Use a callout when you want a riveting header and multi-line content.
 
-Callouts (like alerts) are meant to draw attention to important points. Use a callout when you want a riveting header and multi-line content.
+If you have more than two paragraphs, consider creating a new page or making it part of the main content.
+
+Callouts use the same _urgency levels_ that alerts do.
 
 <div class="callout is-critical">
 <header>A critical point</header>
@@ -943,7 +952,7 @@ Callouts (like alerts) are meant to draw attention to important points. Use a ca
 </div>
 
 <div class="callout is-helpful">
-<header>A helpful point</header>
+<header>A helpful or informational point</header>
 
 **Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast, Schlitz crucifix
 
@@ -959,10 +968,10 @@ Here is the markup for the first of these callouts.
 </div>
 ```
 
-Notice that
-* the callout header text is forced to all upper case.
-* the callout body can be written in markdown.
-* a blank line separates the `</header>` tag from the markdown content.
+Notice that:
+* the callout header text is forced to all upper case
+* the callout body can be written in markdown
+* a blank line separates the `</header>` tag from the markdown content
 
 Callouts are meant to grab the user's attention. They are not for casual asides. Please use them sparingly.
 
@@ -1254,7 +1263,7 @@ Note that you generally don't wrap a floating image in a `<figure>` element.
 
 If you have a floating image inside an alert, callout, or a subsection, it is a good idea to apply the `clear-fix` class to the `div` to ensure that the image doesn't overflow its container. For example:
 
-<div class="l-sub-section clear-fix">
+<div class="alert is-helpful clear-fix">
 
   <img src="generated/images/guide/docs-style-guide/flying-hero.png"
     alt="flying Angular hero"
@@ -1266,7 +1275,7 @@ If you have a floating image inside an alert, callout, or a subsection, it is a
 </div>
 
 ```html
-<div class="l-sub-section clear-fix">
+<div class="alert is-helpful clear-fix">
 
   <img src="generated/images/guide/docs-style-guide/flying-hero.png"
     alt="flying Angular hero"
diff --git a/aio/content/guide/dynamic-component-loader.md b/aio/content/guide/dynamic-component-loader.md
index c2e3d77748..84c1e4c45d 100644
--- a/aio/content/guide/dynamic-component-loader.md
+++ b/aio/content/guide/dynamic-component-loader.md
@@ -101,7 +101,7 @@ The `loadComponent()` method is doing a lot of the heavy lifting here.
 Take it step by step. First, it picks an ad.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/elements.md b/aio/content/guide/elements.md
index 35b86d2370..c6982e3b75 100644
--- a/aio/content/guide/elements.md
+++ b/aio/content/guide/elements.md
@@ -11,7 +11,7 @@ The `@angular/elements` package exports a `createCustomElement()` API that provi
 Transforming a component to a custom element makes all of the required Angular infrastructure available to the browser. 
 Creating a custom element is simple and straightforward, and automatically connects your component-defined view with change detection and data binding, mapping Angular functionality to the corresponding native HTML equivalents. 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
     We are working on custom elements that can be used by web apps built on other frameworks. 
     A minimal, self-contained version of the Angular framework will be injected as a service to support the component's change-detection and data-binding functionality. 
diff --git a/aio/content/guide/form-validation.md b/aio/content/guide/form-validation.md
index 5f006b61ca..858ddc0ede 100644
--- a/aio/content/guide/form-validation.md
+++ b/aio/content/guide/form-validation.md
@@ -9,7 +9,7 @@ This page shows how to validate user input in the UI and display useful validati
 using both reactive and template-driven forms. It assumes some basic knowledge of the two 
 forms modules.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you're new to forms, start by reviewing the [Forms](guide/forms) and 
 [Reactive Forms](guide/reactive-forms) guides.
@@ -51,7 +51,7 @@ but only if the `name` is invalid and the control is either `dirty` or `touched`
 There are messages for `required`, `minlength`, and `forbiddenName`.
  
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -178,7 +178,7 @@ Once the `ForbiddenValidatorDirective` is ready, you can simply add its selector
 </code-example>
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You may have noticed that the custom validation directive is instantiated with `useExisting`
 rather than `useClass`. The registered validator must be _this instance_ of
@@ -211,7 +211,7 @@ set the color of each form control's border.
 ## Cross field validation 
 This section shows how to perform cross field validation. It assumes some basic knowledge of creating custom validators.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you haven't created custom validators before, start by reviewing the [custom validators section](guide/form-validation#custom-validators).
 
diff --git a/aio/content/guide/forms.md b/aio/content/guide/forms.md
index 66a1e36f10..7d11293445 100644
--- a/aio/content/guide/forms.md
+++ b/aio/content/guide/forms.md
@@ -29,7 +29,7 @@ You can run the <live-example></live-example> in Stackblitz and download the cod
 You can build forms by writing templates in the Angular [template syntax](guide/template-syntax) with
 the form-specific directives and techniques described in this page.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can also use a reactive (or model-driven) approach to build forms.
   However, this page focuses on template-driven forms.
@@ -62,7 +62,7 @@ If you delete the hero name, the form displays a validation error in an attentio
 
 Note that the *Submit* button is disabled, and the "required" bar to the left of the input control changes from green to red.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can customize the colors and location of the "required" bar with standard CSS.
 
@@ -180,7 +180,7 @@ Update it with the following:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   There are two changes:
 
@@ -208,7 +208,7 @@ Replace the contents of its template with the following:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   There are only two changes.
   The `template` is simply the new element tag identified by the component's `selector` property.
@@ -235,7 +235,7 @@ You added a *Submit* button at the bottom with some classes on it for styling.
 
 *You're not using Angular yet*. There are no bindings or extra directives, just layout.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   In template driven forms, if you've imported `FormsModule`, you don't have to do anything
   to the `<form>` tag in order to make use of `FormsModule`. Continue on to see how this works.
@@ -311,7 +311,7 @@ Find the `<input>` tag for *Name* and update it like this:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You added a diagnostic interpolation after the input tag
   so you can see what you're doing.
@@ -331,7 +331,7 @@ a template variable for the form. Update the `<form>` tag with
 
 The variable `heroForm` is now a reference to the `NgForm` directive that governs the form as a whole.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   {@a ngForm}
 
@@ -362,7 +362,7 @@ At some point it might look like this:
 The diagnostic is evidence that values really are flowing from the input box to the model and
 back again.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   That's *two-way data binding*.
   For more information, see
@@ -375,7 +375,7 @@ Notice that you also added a `name` attribute to the `<input>` tag and set it to
 which makes sense for the hero's name. Any unique value will do, but using a descriptive name is helpful.
 Defining a `name` attribute is a requirement when using `[(ngModel)]` in combination with a form.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Internally, Angular creates `FormControl` instances and
   registers them with an `NgForm` directive that Angular attached to the `<form>` tag.
@@ -395,7 +395,7 @@ After revision, the core of the form should look like this:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   * Each input element has an `id` property that is used by the `label` element's `for` attribute
   to match the label to its input control.
@@ -571,7 +571,7 @@ Here's an example of an error message added to the _name_ input box:
 You need a template reference variable to access the input box's Angular control from within the template.
 Here you created a variable called `name` and gave it the value "ngModel".
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Why "ngModel"?
   A directive's [exportAs](api/core/Directive) property
@@ -687,7 +687,7 @@ For you, it was as simple as this:
 
 Submitting the form isn't terribly dramatic at the moment.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   An unsurprising observation for a demo. To be honest,
   jazzing it up won't teach you anything new about forms.
diff --git a/aio/content/guide/hierarchical-dependency-injection.md b/aio/content/guide/hierarchical-dependency-injection.md
index af395f362b..48b671b8bd 100644
--- a/aio/content/guide/hierarchical-dependency-injection.md
+++ b/aio/content/guide/hierarchical-dependency-injection.md
@@ -24,7 +24,7 @@ An Angular application is a tree of components. Each component instance has its
 The tree of components parallels the tree of injectors.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -61,7 +61,7 @@ The requests keep bubbling up until Angular finds an injector that can handle th
 If it runs out of ancestors, Angular throws an error.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -196,7 +196,7 @@ Providing the service at the component level ensures that _every_ instance of th
 No tax return overwriting. No mess.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -244,7 +244,7 @@ its injector produces an instance of `Car` resolved by injector (C) with an `Eng
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/http.md b/aio/content/guide/http.md
index 92fec8e76a..e2f2df0842 100644
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@@ -497,7 +497,7 @@ and displays search results as they arrive.
 
 A search value reaches the service only if it's a new value and the user has stopped typing.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `withRefresh` option is explained [below](#cache-refresh).
 
@@ -517,7 +517,7 @@ it cancels that request and sends a new one.
 server returns them out of order. 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you think you'll reuse this debouncing logic,
 consider moving it to a utility function or into the `PackageSearchService` itself.
@@ -622,7 +622,7 @@ Then import and add it to the `AppModule` _providers array_ like this:
 As you create new interceptors, add them to the `httpInterceptorProviders` array and
 you won't have to revisit the `AppModule`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 There are many more interceptors in the complete sample code.
 
@@ -824,7 +824,7 @@ and emits again later with the updated search results.
 
 The _cache-then-refresh_ option is triggered by the presence of a **custom `x-refresh` header**.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 A checkbox on the `PackageSearchComponent` toggles a `withRefresh` flag,
 which is one of the arguments to `PackageSearchService.search()`.
diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index fb94050d96..2009e09cb2 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -108,7 +108,7 @@ import from `@angular/common/locales/extra`. An error message informs you when t
   <code-example path="i18n/doc-files/app.locale_data_extra.ts" region="import-locale-extra" title="src/app/app.module.ts" linenums="false">
   </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   All locale data used by Angular are extracted from the Unicode Consortium's
   <a href="http://cldr.unicode.org/" title="CLDR">Common Locale Data Repository (CLDR)</a>.
@@ -118,7 +118,7 @@ import from `@angular/common/locales/extra`. An error message informs you when t
 
 ## Template translations
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   This document refers to a unit of translatable text as "text," a "message", or a
   "text message."
@@ -325,7 +325,7 @@ the number of minutes.
 * The third parameter defines a pluralization pattern consisting of pluralization categories and their matching values.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   This syntax conforms to the
   <a href="http://userguide.icu-project.org/formatparse/messages" title="ICU Message Format">ICU Message Format</a>
@@ -352,7 +352,7 @@ Any unmatched cardinality uses `other {{{minutes}} minutes ago}`. You could choo
 for two, three, or any other number if the pluralization rules were different. For the example of
 "minute", only these three patterns are necessary in English.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can use interpolations and html markup inside of your translations.
 
@@ -399,7 +399,7 @@ By default, the tool generates a translation file named `messages.xlf` in the
 <a href="https://en.wikipedia.org/wiki/XLIFF">XML Localization Interchange File Format
 (XLIFF, version 1.2)</a>.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you don't use the CLI, you have two options:
 * You can use the `ng-xi18n` tool directly from the `@angular/compiler-cli` package.
@@ -430,7 +430,7 @@ ng xi18n  --i18n-format=xmb
 
 The sample in this guide uses the default XLIFF 1.2 format.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   XLIFF files have the extension .xlf. The XMB format generates .xmb source files but uses
   .xtb (XML Translation Bundle: XTB) translation files.
@@ -488,7 +488,7 @@ for the project structure to reflect the entire internationalization effort.
 One approach is to dedicate a folder to localization and store related assets, such as
 internationalization files, there.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Localization and internationalization are
   <a href="https://en.wikipedia.org/wiki/Internationalization_and_localization">different but
diff --git a/aio/content/guide/lifecycle-hooks.md b/aio/content/guide/lifecycle-hooks.md
index 6754d200b3..3556d1674a 100644
--- a/aio/content/guide/lifecycle-hooks.md
+++ b/aio/content/guide/lifecycle-hooks.md
@@ -300,7 +300,7 @@ The sequence of log messages follows the prescribed hook calling order:
 `OnChanges`, `OnInit`, `DoCheck`&nbsp;(3x), `AfterContentInit`, `AfterContentChecked`&nbsp;(3x),
 `AfterViewInit`, `AfterViewChecked`&nbsp;(3x), and `OnDestroy`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The constructor isn't an Angular hook *per se*.
   The log confirms that input properties (the `name` property in this case) have no assigned values at construction.
@@ -323,7 +323,7 @@ Go undercover with these two spy hooks to discover when an element is initialize
 This is the perfect infiltration job for a directive.
 The heroes will never know they're being watched.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Kidding aside, pay attention to two key points:
 
@@ -373,7 +373,7 @@ Use `ngOnInit()` for two main reasons:
 
 Experienced developers agree that components should be cheap and safe to construct.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Misko Hevery, Angular team lead,
   [explains why](http://misko.hevery.com/code-reviewers-guide/flaw-constructor-does-real-work/)
@@ -394,7 +394,7 @@ Remember also that a directive's data-bound input properties are not set until _
 That's a problem if you need to initialize the directive based on those properties.
 They'll have been set when `ngOnInit()` runs.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The `ngOnChanges()` method is your first opportunity to access those properties.
   Angular calls `ngOnChanges()` before `ngOnInit()` and many times after that.
@@ -460,7 +460,7 @@ The hero object *reference* didn't change so, from Angular's perspective, there
 
 Use the `DoCheck` hook to detect and act upon changes that Angular doesn't catch on its own.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Use this method to detect a change that Angular overlooked.
 
@@ -549,7 +549,7 @@ The *AfterContent* sample explores the `AfterContentInit()` and `AfterContentChe
 *Content projection* is a way to import HTML content from outside the component and insert that content
 into the component's template in a designated spot.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   AngularJS developers know this technique as *transclusion*.
 
@@ -577,7 +577,7 @@ In this case, the projected content is the `<app-child>` from the parent.
   <img src='generated/images/guide/lifecycle-hooks/projected-child-view.png' alt="Projected Content">
 </figure>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The telltale signs of *content projection* are twofold:
 
diff --git a/aio/content/guide/ngmodule-faq.md b/aio/content/guide/ngmodule-faq.md
index 980a75a670..d3fdd2e616 100644
--- a/aio/content/guide/ngmodule-faq.md
+++ b/aio/content/guide/ngmodule-faq.md
@@ -71,7 +71,7 @@ as well as dynamically loaded in a pop-up dialog.
 This error often means that you haven't declared the directive "x"
 or haven't imported the NgModule to which "x" belongs.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Perhaps you declared "x" in an application sub-module but forgot to export it.
 The "x" class isn't visible to other modules until you add it to the `exports` list.
diff --git a/aio/content/guide/npm-packages.md b/aio/content/guide/npm-packages.md
index dcbd489881..3236f171f0 100644
--- a/aio/content/guide/npm-packages.md
+++ b/aio/content/guide/npm-packages.md
@@ -7,7 +7,7 @@ You can download and install these npm packages with the [**npm client**](https:
 The [**yarn client**](https://yarnpkg.com/en/) is a popular alternative for downloading and installing npm packages.
 The Angular CLI uses `yarn` by default to install npm packages when you create a new project.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Node.js and npm are essential to Angular development.
 
diff --git a/aio/content/guide/observables.md b/aio/content/guide/observables.md
index f07e4b2916..fd3f7392f5 100644
--- a/aio/content/guide/observables.md
+++ b/aio/content/guide/observables.md
@@ -34,7 +34,7 @@ An observer object can define any combination of these handlers. If you don't su
 
 An `Observable` instance begins publishing values only when someone subscribes to it. You subscribe by calling the `subscribe()` method of the instance, passing an observer object to receive the notifications.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
    In order to show how subscribing works, we need to create a new observable. There is a  constructor that you use to create new instances, but for illustration, we can use some static methods on the `Observable` class that create simple observables of frequently used types:
 
@@ -96,7 +96,7 @@ Notice that if you subscribe twice, there will be two separate streams, each emi
 
 <code-example path="observables/src/multicasting.ts" region="multicast_sequence" title="Create a multicast subscriber"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
    Multicasting observables take a bit more setup, but they can be useful for certain applications. Later we will look at tools that simplify the process of multicasting, allowing you to take any observable and make it multicasting.
 </div>
 
diff --git a/aio/content/guide/pipes.md b/aio/content/guide/pipes.md
index 4d2d57ec25..2893ab1ac2 100644
--- a/aio/content/guide/pipes.md
+++ b/aio/content/guide/pipes.md
@@ -54,7 +54,7 @@ Angular comes with a stock of pipes such as
 They are all available for use in any template.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -123,7 +123,7 @@ As you click the button, the displayed date alternates between
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -186,7 +186,7 @@ Your pipe has one such parameter: the `exponent`.
    Your pipe's name is `exponentialStrength`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -390,7 +390,7 @@ For this reason, a pure pipe is preferable when you can live with the change det
 When you can't, you *can* use the impure pipe.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/quickstart.md b/aio/content/guide/quickstart.md
index 66eea81611..36ef5e056d 100644
--- a/aio/content/guide/quickstart.md
+++ b/aio/content/guide/quickstart.md
@@ -28,7 +28,7 @@ You need to set up your development environment before you can do anything.
 Install **[Node.js® and npm](https://nodejs.org/en/download/)**
 if they are not already on your machine.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -73,7 +73,7 @@ The Angular CLI installs the necessary npm packages, creates the project files,
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -630,7 +630,7 @@ These files go in the root folder next to `src/`.
   </tr>
 </table>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 ### Next Step
 
diff --git a/aio/content/guide/releases.md b/aio/content/guide/releases.md
index 532cc72320..9e09cd8d9e 100644
--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@@ -8,7 +8,7 @@ This document contains the practices that we follow to provide you with a leadin
 
 See [Updating your projects](guide/updating "Updating your projects") for information about how to update your apps and libraries to the latest version of Angular.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The practices described in this document apply to Angular 2.0 and later. If you are currently using AngularJS, see [Upgrading from AngularJS](guide/upgrade "Upgrading from Angular JS"). _AngularJS_ is the name for all v1.x versions of Angular.
 
@@ -57,7 +57,7 @@ This cadence of releases gives you access to new beta features as soon as they a
 {@a schedule}
 ## Release schedule
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Disclaimer: The dates are offered as general guidance and may be adjusted by us when necessary to ensure delivery of a high-quality platform. 
 
diff --git a/aio/content/guide/router.md b/aio/content/guide/router.md
index d32f8ba9c5..0ecd1c8151 100644
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@@ -75,7 +75,7 @@ Import what you need from it as you would from any other Angular package.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -336,7 +336,7 @@ It has a great deal of useful information including:
   </tr>
 </table>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Two older properties are still available. They are less capable than their replacements, discouraged, and may be deprecated in a future Angular version.
 
@@ -756,7 +756,7 @@ Modern HTML5 browsers were the first to support `pushState` which is why many pe
 "HTML5 style" URLs.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -866,7 +866,7 @@ Once the application is bootstrapped, the `Router` performs the initial navigati
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -919,7 +919,7 @@ The `RouterOutlet` is a directive from the router library that marks
 the spot in the template where the router should display the views for that outlet.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -949,7 +949,7 @@ or a URL fragment for jumping to different areas on the page. Query string param
 are provided through the `[queryParams]` binding which takes an object (e.g. `{ name: 'value' }`), while the URL fragment
 takes a single value bound to the `[fragment]` input binding.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1010,7 +1010,7 @@ The router will select _this_ route if it can't match a route earlier in the con
 A wildcard route can navigate to a custom "404 Not Found" component or [redirect](#redirect) to an existing route.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1096,7 +1096,7 @@ In this app, the router should select the route to the `HeroListComponent` only
 so set the `pathMatch` value to `'full'`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1313,7 +1313,7 @@ then replacing `RouterModule.forRoot` in the `imports` array with the `AppRoutin
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1482,7 +1482,7 @@ using the same techniques you learned while creating the `AppRoutingModule`.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1509,7 +1509,7 @@ In the `AppRoutingModule`, you used the static **`RouterModule.forRoot`** method
 In a feature module you use the static **`forChild`** method.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1622,7 +1622,7 @@ _before_ the hero routes.
 The wildcard route&mdash;which matches _every_ URL&mdash;will intercept the attempt to navigate to a hero route.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1712,7 +1712,7 @@ The router composes the destination URL from the array like this:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1864,7 +1864,7 @@ You need a way to detect when the route parameters change from _within the same
 The observable `paramMap` property handles that beautifully.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1907,7 +1907,7 @@ It's much simpler to write and read:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2062,7 +2062,7 @@ They are **separated by semicolons ";"**
 This is *matrix URL* notation&mdash;something you may not have seen before.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2090,7 +2090,7 @@ as this one can.
 The list of heroes is unchanged. No hero row is highlighted.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2227,7 +2227,7 @@ The other two `@HostBinding` properties style the display and position of the co
 The `HeroDetailComponent` will ease in from the left when routed to and will slide down when navigating away.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2597,7 +2597,7 @@ Navigation _within_ the feature area remains intact even if you change the paren
 Here's an example:
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2623,7 +2623,7 @@ After the _link parameters array_, add an object with a `relativeTo` property se
 The router then calculates the target URL based on the active route's location.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2781,7 +2781,7 @@ In this case there is only the "popup" outlet property and its value is another
 You are in effect saying, _when the user clicks this link, display the component associated with the `compose` route in the `popup` outlet_.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2898,7 +2898,7 @@ A guard's return value controls the router's behavior:
 * If it returns `false`, the navigation process stops and the user stays put.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3030,7 +3030,7 @@ feature module, a dashboard route and two unfinished components to manage crises
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3207,7 +3207,7 @@ Import and add the `LoginRoutingModule` to the `AppModule` imports as well.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3318,7 +3318,7 @@ This demo does neither. Instead, it asks the user to make that choice explicitly
 in a confirmation dialog box that *waits asynchronously for the user's
 answer*.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3596,7 +3596,7 @@ and fragment to the next route.
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 The `queryParamsHandling` feature also provides a `merge` option, which will preserve and combine the current query parameters with any provided query parameters
@@ -3630,7 +3630,7 @@ You can use these persistent bits of information for things that need to be prov
 authentication tokens or session ids.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3700,7 +3700,7 @@ The lazy loading and re-configuration happen just once, when the route is _first
 the module and routes are available immediately for subsequent requests.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3983,7 +3983,7 @@ Let's take the `Hero` routes and migrate them to new URLs. The `Router` checks f
 
 You'll notice two different types of redirects. The first change is from  `/heroes` to `/superheroes` without any parameters. This is a straightforward redirect, unlike the change from `/hero/:id` to `/superhero/:id`, which includes the `:id` route parameter. Router redirects also use powerful pattern matching, so the `Router` inspects the URL and replaces route parameters in the `path` with their appropriate destination. Previously, you navigated to a URL such as `/hero/15` with a route parameter `id` of `15`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `Router` also supports [query parameters](#query-parameters) and the [fragment](#fragment) when using redirects.
 
@@ -4195,7 +4195,7 @@ making it the default strategy.
 You can switch to the `HashLocationStrategy` with an override during the bootstrapping process if you prefer it.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/rx-library.md b/aio/content/guide/rx-library.md
index e562d8ed35..0fa67384ce 100644
--- a/aio/content/guide/rx-library.md
+++ b/aio/content/guide/rx-library.md
@@ -47,7 +47,7 @@ The `pipe()` function is also a method on the RxJS `Observable`, so you use this
 
 RxJS provides many operators, but only a handful are used frequently. For a list of operators and usage samples, visit the [RxJS API Documentation](https://rxjs-dev.firebaseapp.com/api).
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
   Note that, for Angular apps, we prefer combining operators with pipes, rather than chaining. Chaining is used in many RxJS examples.
 </div>
 
@@ -80,7 +80,7 @@ The following converts the previous example to retry the request before catching
 
 <code-example path="rx-library/src/retry-on-error.ts" title="retry operator"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
    Do not retry **authentication** requests, since these should only be initiated by user action. We don't want to lock out user accounts with repeated login requests that the user has not initiated.
 
diff --git a/aio/content/guide/set-document-title.md b/aio/content/guide/set-document-title.md
index 3da8382760..c6152acc1d 100644
--- a/aio/content/guide/set-document-title.md
+++ b/aio/content/guide/set-document-title.md
@@ -22,7 +22,7 @@ The HTML `<title>` is in the document `<head>`, outside the body, making it inac
 You could grab the browser `document` object and set the title manually.
 That's dirty and undermines your chances of running the app outside of a browser someday.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Running your app outside a browser means that you can take advantage of server-side
   pre-rendering for near-instant first app render times and for SEO.  It means you could run from
diff --git a/aio/content/guide/setup.md b/aio/content/guide/setup.md
index bf3100e0b4..d4813d1571 100644
--- a/aio/content/guide/setup.md
+++ b/aio/content/guide/setup.md
@@ -284,7 +284,7 @@ The following are all in `src/`
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/structural-directives.md b/aio/content/guide/structural-directives.md
index cc186ac568..87be0a89d4 100644
--- a/aio/content/guide/structural-directives.md
+++ b/aio/content/guide/structural-directives.md
@@ -88,7 +88,7 @@ you apply the directive to an element in the HTML template.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -392,7 +392,7 @@ An `NgSwitchCase` displays its host element when its value matches the switch va
 The `NgSwitchDefault` displays its host element when no sibling `NgSwitchCase` matches the switch value.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -691,7 +691,7 @@ The directive consumer expects to bind a true/false condition to `[appUnless]`.
 That means the directive needs an `appUnless` property, decorated with `@Input`
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/styleguide.md b/aio/content/guide/styleguide.md
index 7abf5b70b4..f99656da6f 100644
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@@ -2335,7 +2335,7 @@ Longer file names are far better than _short-but-obscure_ abbreviated names.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -2759,7 +2759,7 @@ Here is a compliant folder and file structure:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3627,7 +3627,7 @@ Yet there is a real danger of that happening accidentally if the `CoreModule` pr
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -3802,7 +3802,7 @@ Developers place components on the page as they would native HTML elements and w
 
 </div>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 There are a few cases where you give a component an attribute, such as when you want to augment a built-in element. For example, [Material Design](https://material.angular.io/components/button/overview) uses this technique with `<button mat-button>`. However, you wouldn't use this technique on a custom element.
 
diff --git a/aio/content/guide/template-syntax.md b/aio/content/guide/template-syntax.md
index fd0f37d184..32e3122018 100644
--- a/aio/content/guide/template-syntax.md
+++ b/aio/content/guide/template-syntax.md
@@ -410,7 +410,7 @@ Your intuition is incorrect! Your everyday HTML mental model is misleading.
 In fact, once you start data binding, you are no longer working with HTML *attributes*. You aren't setting attributes.
 You are setting the *properties* of DOM elements, components, and directives.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 ### HTML attribute vs. DOM property
 
@@ -622,7 +622,7 @@ from a component's data property into a target element property.
 You cannot use property binding to pull values *out* of the target element.
 You can't bind to a property of the target element to _read_ it. You can only _set_ it.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Similarly, you cannot use property binding to *call* a method on the target element.
 
@@ -659,7 +659,7 @@ as it is in the following example:
 <code-example path="template-syntax/src/app/app.component.html" region="property-binding-3" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Technically, Angular is matching the name to a directive [input](guide/template-syntax#inputs-outputs),
 one of the property names listed in the directive's `inputs` array or a property decorated with `@Input()`.
@@ -782,7 +782,7 @@ The template syntax provides specialized one-way bindings for scenarios less wel
 
 You can set the value of an attribute directly with an **attribute binding**.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 This is the only exception to the rule that a binding sets a target property.
 This is the only binding that creates and sets an attribute.
@@ -872,7 +872,7 @@ It removes the class when the expression is falsy.
 <code-example path="template-syntax/src/app/app.component.html" region="class-binding-3" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 While this is a fine way to toggle a single class name,
 the [NgClass directive](guide/template-syntax#ngClass) is usually preferred when managing multiple class names at the same time.
@@ -899,14 +899,14 @@ The following example conditionally sets the font size in  “em” and “%”
 <code-example path="template-syntax/src/app/app.component.html" region="style-binding-2" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 While this is a fine way to set a single style,
 the [NgStyle directive](guide/template-syntax#ngStyle) is generally preferred when setting several inline styles at the same time.
 
 </div>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Note that a _style property_ name can be written in either
 [dash-case](guide/glossary#dash-case), as shown above, or
@@ -958,7 +958,7 @@ of a known directive, as it does in the following example:
 <code-example path="template-syntax/src/app/app.component.html" region="event-binding-3" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `myClick` directive is further described in the section
 on [aliasing input/output properties](guide/template-syntax#aliasing-io).
@@ -1186,7 +1186,7 @@ Adding an `ngClass` property binding to `currentClasses` sets the element's clas
 <code-example path="template-syntax/src/app/app.component.html" region="NgClass-1" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 It's up to you to call `setCurrentClasses()`, both initially and when the dependent properties change.
 
@@ -1222,7 +1222,7 @@ Adding an `ngStyle` property binding to `currentStyles` sets the element's style
 <code-example path="template-syntax/src/app/app.component.html" region="NgStyle-2" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 It's up to you to call `setCurrentStyles()`, both initially and when the dependent properties change.
 
@@ -1273,7 +1273,7 @@ That `ngModel` directive hides these onerous details behind its own  `ngModel` i
 <code-example path="template-syntax/src/app/app.component.html" region="NgModel-3" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `ngModel` data property sets the element's value property and the `ngModelChange` event property
 listens for changes to the element's value.
@@ -1407,7 +1407,7 @@ The `nullHero` will never be displayed.
 <code-example path="template-syntax/src/app/app.component.html" region="NgIf-2" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See also the
 [_safe navigation operator_](guide/template-syntax#safe-navigation-operator "Safe navigation operator (?.)")
@@ -1492,7 +1492,7 @@ The next example captures the `index` in a variable named `i` and displays it wi
 <code-example path="template-syntax/src/app/app.component.html" region="NgFor-3" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 `NgFor` is implemented by the `NgForOf` directive. Read more about the other `NgForOf` context values such as `last`, `even`,
 and `odd` in the [NgForOf API reference](api/common/NgForOf).
@@ -1756,7 +1756,7 @@ because the data bound properties are annotated with `@Input()` and `@Output()`
 <code-example path="template-syntax/src/app/hero-detail.component.ts" region="input-output-1" title="src/app/hero-detail.component.ts" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Alternatively, you can identify members in the `inputs` and `outputs` arrays
 of the directive metadata, as in this example:
@@ -1811,7 +1811,7 @@ You can specify the alias for the property name by passing it into the input/out
 <code-example path="template-syntax/src/app/click.directive.ts" region="output-myClick" title="src/app/click.directive.ts" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You can also alias property names in the `inputs` and `outputs` arrays.
 You write a colon-delimited (`:`) string with
diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index 1509483b66..479e421ff6 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -466,7 +466,7 @@ simply declares `BannerComponent`, the component to test.
   region="configureTestingModule">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 There's no need to declare or import anything else.
 The default test module is pre-configured with 
@@ -917,7 +917,7 @@ so it is safe to call `TestBed.get()` as follows:
   title="TestBed injector">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 For a use case in which `TestBed.get()` does not work,
 see the section [_Override a component's providers_](#component-override), which
@@ -951,7 +951,7 @@ And here are some tests:
 
 The first is a sanity test; it confirms that the stubbed `UserService` is called and working.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The second parameter to the Jasmine matcher (e.g., `'expected name'`) is an optional failure label.
 If the expectation fails, Jasmine displays appends this label to the expectation failure message.
@@ -1407,7 +1407,7 @@ The `DashboardComponent` depends on the Angular router and the `HeroService`.
 You'd probably have to replace them both with test doubles, which is a lot of work.
 The router seems particularly challenging.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The [discussion below](#routing-component) covers testing components that require the router.
 
@@ -1493,7 +1493,7 @@ The test assumes (correctly in this case) that the runtime
 event handler&mdash;the component's `click()` method&mdash;doesn't
 care about the event object.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Other handlers are less forgiving. For example, the `RouterLink`
 directive expects an object with a `button` property
@@ -1696,7 +1696,7 @@ for the `id` to change during its lifetime.
 
 <code-example path="testing/src/app/hero/hero-detail.component.ts" region="ng-on-init" title="app/hero/hero-detail.component.ts (ngOnInit)" linenums="false"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The [Router](guide/router#route-parameters) guide covers `ActivatedRoute.paramMap` in more detail.
 
@@ -1743,7 +1743,7 @@ Here's a test demonstrating the component's behavior when the observed `id` refe
 
 <code-example path="testing/src/app/hero/hero-detail.component.spec.ts" region="route-good-id" title="app/hero/hero-detail.component.spec.ts (existing id)" linenums="false"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `createComponent()` method and `page` object are discussed [below](#page-object).
 Rely on your intuition for now.
@@ -1927,7 +1927,7 @@ which sets the stub's telltale `navigatedTo` property.
 Tests inspect `navigatedTo` to confirm that clicking the anchor
 set the expected route definition.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Whether the router is configured properly to navigate with that route definition is a
 question for a separate set of tests.
@@ -1971,7 +1971,7 @@ as expected:
 
 <code-example path="testing/src/app/app.component.spec.ts" region="tests" title="app/app.component.spec.ts (selected tests)" linenums="false"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The "click" test _in this example_ is misleading.
 It tests the `RouterLinkDirectiveStub` rather than the _component_.
@@ -2258,7 +2258,7 @@ One approach is to configure the testing module from the individual pieces as in
   title="app/hero/hero-detail.component.spec.ts (FormsModule setup)" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Notice that the `beforeEach()` is asynchronous and calls `TestBed.compileComponents`
 because the `HeroDetailComponent` has an external template and css file.
@@ -2329,7 +2329,7 @@ And `TestBed.configureTestingModule` can't configure them either.
 
 Angular has been creating new instances of the real `HeroDetailService` all along!
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 These tests could fail or timeout if the `HeroDetailService` made its own XHR calls to a remote server.
 There might not be a remote server to call.
@@ -2462,7 +2462,7 @@ A better solution is to create an artificial test component that demonstrates al
   <img src='generated/images/guide/testing/highlight-directive-spec.png' alt="HighlightDirective spec in action">
 </figure>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `<input>` case binds the `HighlightDirective` to the name of a color value in the input box.
 The initial value is the word "cyan" which should be the background color of the input box.
@@ -2602,7 +2602,7 @@ Here's a summary of the stand-alone functions, in order of likely utility:
       Simulates the passage of time and the completion of pending asynchronous activities
       by flushing both _timer_ and _micro-task_ queues within the _fakeAsync test zone_.
 
-      <div class="l-sub-section">
+      <div class="alert is-helpful">
 
       The curious, dedicated reader might enjoy this lengthy blog post,
       ["_Tasks, microtasks, queues and schedules_"](https://jakearchibald.com/2015/tasks-microtasks-queues-and-schedules/).
@@ -3221,7 +3221,7 @@ Here are the most useful `DebugElement` members for testers, in approximate orde
 
       The immediate `DebugElement` children. Walk the tree by descending through `children`.
 
-      <div class="l-sub-section">
+      <div class="alert is-helpful">
 
       `DebugElement` also has `childNodes`, a list of `DebugNode` objects.
       `DebugElement` derives from `DebugNode` objects and there are often
diff --git a/aio/content/guide/typescript-configuration.md b/aio/content/guide/typescript-configuration.md
index b7cb188b47..78f1210e23 100644
--- a/aio/content/guide/typescript-configuration.md
+++ b/aio/content/guide/typescript-configuration.md
@@ -21,7 +21,7 @@ that are important to Angular developers, including details about the following
 Typically, you add a TypeScript configuration file called `tsconfig.json` to your project to
 guide the compiler as it generates JavaScript files.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/universal.md b/aio/content/guide/universal.md
index aa1897edc2..5076ee7b74 100644
--- a/aio/content/guide/universal.md
+++ b/aio/content/guide/universal.md
@@ -13,7 +13,7 @@ It can also pre-generate pages as HTML files that you serve later.
 This guide describes a Universal sample application that launches quickly as a server-rendered page.
 Meanwhile, the browser downloads the full client version and switches to it automatically after the code loads.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 [Download the finished sample code](generated/zips/universal/universal.zip),
 which runs in a [Node.js® Express](https://expressjs.com/) server.
@@ -253,7 +253,7 @@ Note how the constructor prepends the origin (if it exists) to the `heroesUrl`.
 
 You don't provide `APP_BASE_HREF` in the browser version, so the `heroesUrl` remains relative.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You can ignore `APP_BASE_HREF` in the browser if you've specified `<base href="/">` in the `index.html`
 to satisfy the router's need for a base address, as the tutorial sample does.
@@ -309,7 +309,7 @@ It may respond to data requests, perhaps directly or as a proxy to a separate da
 
 The sample web server for _this_ guide is based on the popular [Express](https://expressjs.com/) framework.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   _Any_ web server technology can serve a Universal app as long as it can call Universal's `renderModuleFactory`.
   The principles and decision points discussed below apply to any web server technology that you chose.
@@ -357,7 +357,7 @@ It's up to your engine to decide what to do with that page.
 _This engine's_ promise callback returns the rendered page to the [web server](#web-server),
 which then forwards it to the client in the HTTP response.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   This wrappers are very useful to hide the complexity of the `renderModuleFactory`. There are more wrappers for different backend technologies
   at the [Universal repository](https://github.com/angular/universal).
@@ -392,7 +392,7 @@ You configure the Express server pipeline with calls to `app.get()` like this on
 <code-example path="universal/server.ts" title="server.ts (data URL)" region="data-request" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 This sample server doesn't handle data requests.
 
diff --git a/aio/content/guide/updating.md b/aio/content/guide/updating.md
index 244decae62..4c59980dc4 100644
--- a/aio/content/guide/updating.md
+++ b/aio/content/guide/updating.md
@@ -8,7 +8,7 @@ For information about our versioning policy and practices&mdash;including
 support and deprecation practices, as well as the release schedule&mdash;see [Angular versioning and releases](guide/releases "Angular versioning and releases"). 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you are currently using AngularJS, see [Upgrading from AngularJS](guide/upgrade "Upgrading from Angular JS"). _AngularJS_ is the name for all v1.x versions of Angular.
 
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index d13603d104..025300cae4 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -385,7 +385,7 @@ That means that you need at least one module each from both AngularJS and Angula
 You will import `UpgradeModule` inside the NgModule, and then use it for
 bootstrapping the AngularJS module.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 For more information, see [NgModules](guide/ngmodules).
 
@@ -444,7 +444,7 @@ In the constructor of the `AppModule`, use dependency injection to get a hold of
 and use it to bootstrap the AngularJS app in the `AppModule.ngDoBootstrap` method.
 The `upgrade.bootstrap` method takes the exact same arguments as [angular.bootstrap](https://docs.angularjs.org/api/ng/function/angular.bootstrap):
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Note that you do not add a `bootstrap` declaration to the `@NgModule` decorator, since
 AngularJS will own the root template of the application.
@@ -490,7 +490,7 @@ NgModule.
 <code-example path="upgrade-module/src/app/downgrade-static/app.module.ts" region="ngmodule" title="app.module.ts">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 All Angular components, directives and pipes must be declared in an NgModule.
 
@@ -1107,7 +1107,7 @@ can verify you're calling their APIs with the correct kinds of arguments.
 <code-example path="upgrade-phonecat-1-typescript/app/app.config.ts" title="app/app.config.ts">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The [AngularJS 1.x type definitions](https://www.npmjs.com/package/@types/angular)
 you installed are not officially maintained by the Angular team,
@@ -1280,7 +1280,7 @@ so it is already being loaded by the browser.
 Now you're running both AngularJS and Angular at the same time. That's pretty
 exciting! You're not running any actual Angular components yet. That's next.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 #### Why declare _angular_ as _angular.IAngularStatic_?
 
@@ -1640,7 +1640,7 @@ and let that directive construct the appropriate URL to the `PhoneDetailComponen
 <code-example path="upgrade-phonecat-3-final/app/phone-list/phone-list.template.html" region="list" title="app/phone-list/phone-list.template.html (list with links)" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See the [Routing](guide/router) page for details.
 
diff --git a/aio/content/guide/user-input.md b/aio/content/guide/user-input.md
index 6f519bcc3c..177ec4c8fc 100644
--- a/aio/content/guide/user-input.md
+++ b/aio/content/guide/user-input.md
@@ -96,7 +96,7 @@ Here's what the UI displays:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -179,7 +179,7 @@ Type something in the input box, and watch the display update with each keystrok
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/guide/visual-studio-2015.md b/aio/content/guide/visual-studio-2015.md
index fdb137f6bf..87ac3ad1ca 100644
--- a/aio/content/guide/visual-studio-2015.md
+++ b/aio/content/guide/visual-studio-2015.md
@@ -7,7 +7,7 @@ Some developers prefer Visual Studio as their Integrated Development Environment
 This cookbook describes the steps required to set up and use the
 Angular QuickStart files in **Visual Studio 2015 within an ASP.NET 4.x project**.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -25,7 +25,7 @@ the QuickStart application itself.
 To set up the QuickStart files with an **ASP.NET 4.x project** in
 Visual Studio 2015, follow these steps:
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -49,7 +49,7 @@ Note that the resulting code does not map to the docs. Adjust accordingly.
 Install **[Node.js® and npm](https://nodejs.org/en/download/)**
 if they are not already on your machine.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -146,7 +146,7 @@ Create the ASP.NET 4.x project in the usual way as follows:
 * Select the desired ASP.NET 4.5.2 template and click OK.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -281,7 +281,7 @@ rewrite rules near the bottom of the `web.config`:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -299,7 +299,7 @@ match the base href in `index.html`.
 Build and launch the app with debugger by clicking the **Run** button or by pressing `F5`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
diff --git a/aio/content/marketing/contribute.html b/aio/content/marketing/contribute.html
index 76e8ac1620..8cef8c9536 100644
--- a/aio/content/marketing/contribute.html
+++ b/aio/content/marketing/contribute.html
@@ -7,28 +7,37 @@
 
   <p>We'd love for you to contribute to our source code and to make Angular projects even better.</p>
 
-  <div class="l-sub-section">
-    <h3 class="no-anchor">Angular</h3>
+  <div class="card-section">
+    <div>
+      <h3 class="no-anchor">Angular</h3>
 
-    Angular is a next generation mobile and desktop application development platform.
+      Angular is a next generation mobile and desktop application development platform.
 
-    <a href="https://github.com/angular/angular/blob/master/CONTRIBUTING.md" class="button" md-button>Contribute to Angular</a>
+    </div>
+    <a href="https://github.com/angular/angular/blob/master/CONTRIBUTING.md" class="button button-blue" md-button>Contribute</a>
   </div>
 
-  <div class="l-sub-section">
-    <h3 class="no-anchor">Angular Material</h3>
+  <div class="card-section">
+    <div>
+      <h3 class="no-anchor">Angular Material</h3>
 
-    Our goal is to deliver a lean, lightweight set of Angular-based UI elements that implement the material design specification for use in Angular single-page applications (SPAs).
+      Our goal is to deliver a lean, lightweight set of Angular-based UI elements that implement the material design specification
+      for use in Angular single-page applications (SPAs).
 
-    <a href="https://github.com/angular/material2/blob/master/CONTRIBUTING.md" class="button" md-button>Contribute to Angular Material</a>
+    </div>
+
+    <a href="https://github.com/angular/material2/blob/master/CONTRIBUTING.md" class="button button-blue" md-button>Contribute</a>
   </div>
 
-  <div class="l-sub-section">
-    <h3 class="no-anchor">AngularFire</h3>
+  <div class="card-section">
+    <div>
+      <h3 class="no-anchor">AngularFire</h3>
 
-    AngularFire is the officially supported Angular binding for Firebase. Firebase is a full backend so you don't need servers to build your Angular app.
+      AngularFire is the officially supported Angular binding for Firebase. Firebase is a full backend so you don't need servers
+      to build your Angular app.
 
-    <a href="https://github.com/angular/angularfire2" class="button" md-button> Contribute to AngularFire</a>
+    </div>
+    <a href="https://github.com/angular/angularfire2" class="button button-blue" md-button> Contribute</a>
   </div>
 
 </article>
diff --git a/aio/content/tutorial/toh-pt0.md b/aio/content/tutorial/toh-pt0.md
index ffee67949c..0079060c60 100644
--- a/aio/content/tutorial/toh-pt0.md
+++ b/aio/content/tutorial/toh-pt0.md
@@ -19,7 +19,7 @@ Create a new project named `angular-tour-of-heroes` with this CLI command.
 The Angular CLI generated a new project with a default application and supporting files. 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -41,7 +41,7 @@ Go to the project directory and launch the application.
   ng serve --open
 </code-example>
  
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `ng serve` command builds the app, starts the development server,
 watches the source files, and rebuilds the app as you make changes to those files.
diff --git a/aio/content/tutorial/toh-pt4.md b/aio/content/tutorial/toh-pt4.md
index 0c56a0ba69..f15751d651 100644
--- a/aio/content/tutorial/toh-pt4.md
+++ b/aio/content/tutorial/toh-pt4.md
@@ -87,7 +87,7 @@ If you look at the `@Injectable()` statement right before the `HeroService` clas
 When you provide the service at the root level, Angular creates a single, shared instance of `HeroService` and injects into any class that asks for it. 
 Registering the provider in the `@Injectable` metadata also allows Angular to optimize an app by removing the service if it turns out not to be used after all. 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you need to, you can register providers at different levels: 
 in the `HeroesComponent`, in the `AppComponent`, in the `AppModule`. 
@@ -213,7 +213,7 @@ Replace the `getHeroes` method with this one.
 
 `of(HEROES)` returns an `Observable<Hero[]>` that emits  _a single value_, the array of mock heroes.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 In the [HTTP tutorial](tutorial/toh-pt6), you'll call `HttpClient.get<Hero[]>()` which also returns an `Observable<Hero[]>` that emits  _a single value_, an array of heroes from the body of the HTTP response.
 
@@ -320,7 +320,7 @@ when it creates the `HeroService`.
   path="toh-pt4/src/app/hero.service.ts" region="ctor">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 This is a typical "*service-in-service*" scenario:
 you inject the `MessageService` into the `HeroService` which is injected into the `HeroesComponent`.
diff --git a/aio/content/tutorial/toh-pt5.md b/aio/content/tutorial/toh-pt5.md
index 72a9959033..a1bedcaafe 100644
--- a/aio/content/tutorial/toh-pt5.md
+++ b/aio/content/tutorial/toh-pt5.md
@@ -28,7 +28,7 @@ Use the CLI to generate it.
   ng generate module app-routing --flat --module=app
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 `--flat` puts the file in `src/app` instead of its own folder.<br>
 `--module=app` tells the CLI to register it in the `imports` array of the `AppModule`.
@@ -91,7 +91,7 @@ configure it with the `routes` in one step by calling
   region="ngmodule-imports">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The method is called `forRoot()` because you configure the router at the application's root level.
   The `forRoot()` method supplies the service providers and directives needed for routing, 
@@ -112,7 +112,7 @@ You removed `<app-heroes>` because you will only display the `HeroesComponent` w
 
 The `<router-outlet>` tells the router where to display routed views.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `RouterOutlet` is one of the router directives that became available to the `AppComponent`
 because `AppModule` imports `AppRoutingModule` which exported `RouterModule`.
@@ -165,7 +165,7 @@ but not the heroes list.
 Click the link. 
 The address bar updates to `/heroes` and the list of heroes appears.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Make this and future navigation links look better by adding private CSS styles to `app.component.css`
 as listed in the [final code review](#appcomponent) below.
diff --git a/aio/content/tutorial/toh-pt6.md b/aio/content/tutorial/toh-pt6.md
index 91963d11b3..abf12fdfbc 100644
--- a/aio/content/tutorial/toh-pt6.md
+++ b/aio/content/tutorial/toh-pt6.md
@@ -158,7 +158,7 @@ Applying the optional type specifier, `<Hero[]>` , gives you a typed result obje
 The shape of the JSON data is determined by the server's data API.
 The _Tour of Heroes_ data API returns the hero data as an array.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Other APIs may bury the data that you want within an object.
 You might have to dig that data out by processing the `Observable` result
@@ -536,7 +536,7 @@ before passing along the latest string. You'll never make requests more frequent
 It cancels and discards previous search observables, returning only the latest search service observable.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   With the [switchMap operator](http://www.learnrxjs.io/operators/transformation/switchmap.html),
   every qualifying key event can trigger an `HttpClient.get()` method call.
diff --git a/aio/src/styles/2-modules/_alert.scss b/aio/src/styles/2-modules/_alert.scss
index cd5b7becca..213e4fc88f 100644
--- a/aio/src/styles/2-modules/_alert.scss
+++ b/aio/src/styles/2-modules/_alert.scss
@@ -5,9 +5,14 @@
     color: $darkgray;
     width: 100%;
     box-sizing: border-box;
+    clear: both;
+
+    h1, h2, h3, h4, h5, h6 {
+      font-weight: 500;
+    }
 
     &.is-critical {
-        border-left: 10px solid $brightred;
+        border-left: 8px solid $brightred;
         background-color: rgba($brightred, 0.05);
 
         h1, h2, h3, h4, h5, h6 {
@@ -16,7 +21,7 @@
     }
 
     &.is-important {
-        border-left: 10px solid $orange;
+        border-left: 8px solid $orange;
         background-color: rgba($orange, 0.05);
 
         h1, h2, h3, h4, h5, h6 {
@@ -25,7 +30,7 @@
     }
 
     &.is-helpful {
-        border-left: 10px solid $blue;
+        border-left: 8px solid $blue;
         background-color: rgba($blue, 0.05);
 
         h1, h2, h3, h4, h5, h6 {
@@ -34,7 +39,6 @@
     }
 
     > * {
-        margin: 0;
-        padding: 8px 16px;
+        margin: 8px 16px;
     }
-}
\ No newline at end of file
+}
diff --git a/aio/src/styles/2-modules/_buttons.scss b/aio/src/styles/2-modules/_buttons.scss
index 2ebda268bb..deb6086d30 100644
--- a/aio/src/styles/2-modules/_buttons.scss
+++ b/aio/src/styles/2-modules/_buttons.scss
@@ -48,11 +48,19 @@ a.button.mat-button {
   &.button-subtle {
     background: $mediumgray;
     color: darken($offwhite, 10%);
+
+    &:hover {
+      color: rgba($white, 0.7);
+    }
   }
 
-  &.button-navy {
+  &.button-blue {
     background: $blue;
     color: rgba($white, .87);
+
+    &:hover {
+      color: rgba($white, 0.7);
+    }
   }
 
   &.button-banner {
@@ -107,4 +115,4 @@ a.filter-button {
 
 [mat-button], [mat-raised-button], [mat-button], [mat-raised-button] {
   text-transform: uppercase;
-}
\ No newline at end of file
+}
diff --git a/aio/src/styles/2-modules/_callout.scss b/aio/src/styles/2-modules/_callout.scss
index 9de5d2295f..b11f85d702 100644
--- a/aio/src/styles/2-modules/_callout.scss
+++ b/aio/src/styles/2-modules/_callout.scss
@@ -8,6 +8,8 @@
     color: $white;
     line-height: 24px;
     font-weight: 500;
+    padding: 8px 16px;
+    margin: 0;
     text-transform: uppercase;
     border-radius: 4px 4px 0 0;
   }
@@ -44,4 +46,4 @@
       background: $blue;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/aio/src/styles/2-modules/_card.scss b/aio/src/styles/2-modules/_card.scss
index e2d12ce0a7..294cd7a01d 100644
--- a/aio/src/styles/2-modules/_card.scss
+++ b/aio/src/styles/2-modules/_card.scss
@@ -73,3 +73,26 @@
     text-align: center;
   }
 }
+
+.card-section {
+  @include card(auto, 90%);
+  padding: 16px 32px;
+  margin: 16px 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+
+  // Removes on-hover effect from card mixin
+  &:hover {
+    box-shadow: 0 2px 2px rgba($black, 0.24), 0 0 2px rgba($black, 0.12);
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    margin: 8px 0;
+  }
+
+  a, .button, button {
+    text-align: center;
+  }
+
+}
diff --git a/aio/src/styles/2-modules/_contribute.scss b/aio/src/styles/2-modules/_contribute.scss
index 642b9b8586..73cf429502 100644
--- a/aio/src/styles/2-modules/_contribute.scss
+++ b/aio/src/styles/2-modules/_contribute.scss
@@ -3,9 +3,14 @@
     margin: 0;
   }
 
-  .l-sub-section {
-    width: 90%;
-    margin-bottom: 20px;
+  .card-section {
+    justify-content: space-between;
+    max-width: 880px;
+
+    > :first-child {
+      margin-right: 2rem;
+      width: 60%;
+    }
 
     &:last-child {
       margin-bottom: 0;
diff --git a/aio/src/styles/2-modules/_modules-dir.scss b/aio/src/styles/2-modules/_modules-dir.scss
index 1bb94dc4fb..3584f91dc7 100644
--- a/aio/src/styles/2-modules/_modules-dir.scss
+++ b/aio/src/styles/2-modules/_modules-dir.scss
@@ -24,7 +24,6 @@
    @import 'resources';
    @import 'scrollbar';
    @import 'search-results';
-   @import 'subsection';
    @import 'toc';
    @import 'select-menu';
    @import 'deploy-theme';
diff --git a/aio/src/styles/2-modules/_subsection.scss b/aio/src/styles/2-modules/_subsection.scss
deleted file mode 100644
index 20dc06cd55..0000000000
--- a/aio/src/styles/2-modules/_subsection.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.l-sub-section {
-    color: $darkgray;
-    background-color: rgba($blue, 0.05);
-    border-left: 8px solid $blue;
-    padding: 16px;
-    margin-bottom: 8px;
-    display: table;
-    clear: both;
-    width: 100%;
-    box-sizing: border-box;
-
-    h3 {
-        margin: 8px 0 0;
-    }
-
-    a:hover {
-        color: $blue;
-        text-decoration: underline;
-    }
-}
\ No newline at end of file
diff --git a/aio/src/styles/_print.scss b/aio/src/styles/_print.scss
index 6364dcf795..240ac41e50 100644
--- a/aio/src/styles/_print.scss
+++ b/aio/src/styles/_print.scss
@@ -18,7 +18,7 @@
         page-break-after: avoid;
     }
 
-    ul, ol, img, code-example, table, tr, .alert, .l-subsection, .feature {
+    ul, ol, img, code-example, table, tr, .alert, .feature {
         page-break-inside: avoid;
     }
 

From 445b9a5627fb5584bff6be0b133a49bdd065f517 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Fri, 20 Jul 2018 14:32:23 +0200
Subject: [PATCH 550/582] feat(ivy): support ViewContainerRef.createComponent()
 (#24997)

PR Close #24997
---
 packages/core/src/render3/STATUS.md           |   2 +-
 packages/core/src/render3/component_ref.ts    |  73 +++-
 packages/core/src/render3/di.ts               |  44 ++-
 packages/core/src/render3/index.ts            |   2 +-
 packages/core/src/render3/instructions.ts     |  75 ++--
 packages/core/src/render3/view_ref.ts         |  44 +--
 .../hello_world/bundle.golden_symbols.json    |  15 +
 .../bundling/todo/bundle.golden_symbols.json  |  23 +-
 .../test/render3/view_container_ref_spec.ts   | 339 ++++++++++++++++--
 9 files changed, 484 insertions(+), 133 deletions(-)

diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index 233fdbb7ff..f3d1550331 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -244,7 +244,7 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 | `clear()`              |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `get()`                |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `createEmbededView()`  |  ✅                | ✅           | n/a              | n/a      | n/a         | n/a                  |
-| `createComponent()`    |  ❌                | n/a          | n/a              | n/a      | n/a         | n/a                  |
+| `createComponent()`    |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `insert()`             |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `move()`               |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
 | `indexOf()`            |  ✅                | n/a          | n/a              | n/a      | n/a         | n/a                  |
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index ea8453b4ed..747adbcc7b 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -17,12 +17,12 @@ import {RendererFactory2} from '../render/api';
 import {Type} from '../type';
 
 import {assertComponentType, assertDefined} from './assert';
-import {createRootContext} from './component';
-import {baseDirectiveCreate, createLViewData, createTView, enterView, hostElement, initChangeDetectorIfExisting, locateHostElement} from './instructions';
-import {ComponentDefInternal, ComponentType} from './interfaces/definition';
-import {LElementNode} from './interfaces/node';
-import {RElement} from './interfaces/renderer';
-import {INJECTOR, LViewData, LViewFlags, RootContext} from './interfaces/view';
+import {LifecycleHooksFeature, createRootContext} from './component';
+import {baseDirectiveCreate, createLNode, createLViewData, createTView, elementCreate, enterView, hostElement, initChangeDetectorIfExisting, locateHostElement, renderEmbeddedTemplate} from './instructions';
+import {ComponentDefInternal, ComponentType, RenderFlags} from './interfaces/definition';
+import {LElementNode, TNode, TNodeType} from './interfaces/node';
+import {RElement, domRendererFactory3} from './interfaces/renderer';
+import {FLAGS, INJECTOR, LViewData, LViewFlags, RootContext, TVIEW} from './interfaces/view';
 import {ViewRef} from './view_ref';
 
 export class ComponentFactoryResolver extends viewEngine_ComponentFactoryResolver {
@@ -80,23 +80,28 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
   }
 
   create(
-      parentComponentInjector: Injector, projectableNodes?: any[][]|undefined,
-      rootSelectorOrNode?: any,
+      injector: Injector, projectableNodes?: any[][]|undefined, rootSelectorOrNode?: any,
       ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<T> {
-    ngDevMode && assertDefined(ngModule, 'ngModule should always be defined');
+    const isInternalRootView = rootSelectorOrNode === undefined;
 
-    const rendererFactory = ngModule ? ngModule.injector.get(RendererFactory2) : document;
-    const hostNode = locateHostElement(rendererFactory, rootSelectorOrNode);
+    const rendererFactory =
+        ngModule ? ngModule.injector.get(RendererFactory2) : domRendererFactory3;
+    const hostNode = isInternalRootView ?
+        elementCreate(
+            this.selector, rendererFactory.createRenderer(null, this.componentDef.rendererType)) :
+        locateHostElement(rendererFactory, rootSelectorOrNode);
 
     // The first index of the first selector is the tag name.
     const componentTag = this.componentDef.selectors ![0] ![0] as string;
 
-    const rootContext: RootContext = ngModule !.injector.get(ROOT_CONTEXT);
+    const rootContext: RootContext = ngModule && !isInternalRootView ?
+        ngModule.injector.get(ROOT_CONTEXT) :
+        createRootContext(requestAnimationFrame.bind(window));
 
     // Create the root view. Uses empty TView and ContentTemplate.
     const rootView: LViewData = createLViewData(
         rendererFactory.createRenderer(hostNode, this.componentDef.rendererType),
-        createTView(-1, null, null, null, null), null,
+        createTView(-1, null, null, null, null), rootContext,
         this.componentDef.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways);
     rootView[INJECTOR] = ngModule && ngModule.injector || null;
 
@@ -116,14 +121,49 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
           component = baseDirectiveCreate(0, this.componentDef.factory(), this.componentDef) as T);
       initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
 
+      // TODO: should LifecycleHooksFeature and other host features be generated by the compiler and
+      // executed here?
+      // Angular 5 reference: https://stackblitz.com/edit/lifecycle-hooks-vcref
+      LifecycleHooksFeature(component, this.componentDef);
+
+      // Transform the arrays of native nodes into a LNode structure that can be consumed by the
+      // projection instruction. This is needed to support the reprojection of these nodes.
+      if (projectableNodes) {
+        let index = 0;
+        const projection: TNode[] = elementNode.tNode.projection = [];
+        for (let i = 0; i < projectableNodes.length; i++) {
+          const nodeList = projectableNodes[i];
+          let firstTNode: TNode|null = null;
+          let previousTNode: TNode|null = null;
+          for (let j = 0; j < nodeList.length; j++) {
+            const lNode =
+                createLNode(++index, TNodeType.Element, nodeList[j] as RElement, null, null);
+            if (previousTNode) {
+              previousTNode.next = lNode.tNode;
+            } else {
+              firstTNode = lNode.tNode;
+            }
+            previousTNode = lNode.tNode;
+          }
+          projection.push(firstTNode !);
+        }
+      }
+
+      // Execute the template in creation mode only, and then turn off the CreationMode flag
+      renderEmbeddedTemplate(elementNode, elementNode.data ![TVIEW], component, RenderFlags.Create);
+      elementNode.data ![FLAGS] &= ~LViewFlags.CreationMode;
     } finally {
       enterView(oldView, null);
       if (rendererFactory.end) rendererFactory.end();
     }
 
-    // TODO(misko): this is the wrong injector here.
-    return new ComponentRef(
-        this.componentType, component, rootView, ngModule !.injector, hostNode !);
+    const componentRef =
+        new ComponentRef(this.componentType, component, rootView, injector, hostNode !);
+    if (isInternalRootView) {
+      // The host element of the internal root view is attached to the component's host view node
+      componentRef.hostView._lViewNode !.tNode.child = elementNode.tNode;
+    }
+    return componentRef;
   }
 }
 
@@ -159,6 +199,7 @@ export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
      * We might  want to think about creating a fake component for the top level? Or overwrite
      * detectChanges with a function that calls tickRootContext? */
     this.hostView = this.changeDetectorRef = new ViewRef(rootView, instance);
+    this.hostView._lViewNode = createLNode(-1, TNodeType.View, null, null, null, rootView);
     this.injector = injector;
     this.location = new ElementRef(hostNode);
     this.componentType = componentType;
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index e6eb323f8b..b353fb95db 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -11,6 +11,7 @@
 import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {InjectFlags, Injector, inject, setCurrentInjector} from '../di/injector';
 import {ComponentFactory as viewEngine_ComponentFactory, ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
+import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
 import {ElementRef as viewEngine_ElementRef} from '../linker/element_ref';
 import {NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
 import {TemplateRef as viewEngine_TemplateRef} from '../linker/template_ref';
@@ -19,9 +20,10 @@ import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, ViewRef as viewEngine_Vie
 import {Type} from '../type';
 
 import {assertDefined, assertGreaterThan, assertLessThan} from './assert';
+import {ComponentFactoryResolver} from './component_ref';
 import {addToViewTree, assertPreviousIsParent, createEmbeddedViewNode, createLContainer, createLNodeObject, createTNode, getPreviousOrParentNode, getRenderer, isComponent, renderEmbeddedTemplate, resolveDirective} from './instructions';
 import {VIEWS} from './interfaces/container';
-import {ComponentTemplate, DirectiveDefInternal, RenderFlags} from './interfaces/definition';
+import {DirectiveDefInternal, RenderFlags} from './interfaces/definition';
 import {LInjector} from './interfaces/injector';
 import {AttributeMarker, LContainerNode, LElementNode, LNode, LViewNode, TContainerNode, TElementNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {LQueries, QueryReadType} from './interfaces/query';
@@ -29,8 +31,8 @@ import {Renderer3} from './interfaces/renderer';
 import {DIRECTIVES, HOST_NODE, INJECTOR, LViewData, QUERIES, RENDERER, TVIEW, TView} from './interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
 import {addRemoveViewFromContainer, appendChild, detachView, getChildLNode, getParentLNode, insertView, removeView} from './node_manipulation';
-import {notImplemented, stringify} from './util';
-import {EmbeddedViewRef, ViewRef} from './view_ref';
+import {stringify} from './util';
+import {ViewRef} from './view_ref';
 
 
 
@@ -130,7 +132,7 @@ export function getOrCreateNodeInjectorForNode(node: LElementNode | LContainerNo
     templateRef: null,
     viewContainerRef: null,
     elementRef: null,
-    changeDetectorRef: null
+    changeDetectorRef: null,
   };
 }
 
@@ -221,6 +223,18 @@ export function injectChangeDetectorRef(): viewEngine_ChangeDetectorRef {
   return getOrCreateChangeDetectorRef(getOrCreateNodeInjector(), null);
 }
 
+/**
+ * Creates a ComponentFactoryResolver and stores it on the injector. Or, if the
+ * ComponentFactoryResolver
+ * already exists, retrieves the existing ComponentFactoryResolver.
+ *
+ * @returns The ComponentFactoryResolver instance to use
+ */
+export function injectComponentFactoryResolver(): viewEngine_ComponentFactoryResolver {
+  return componentFactoryResolver;
+}
+const componentFactoryResolver: ComponentFactoryResolver = new ComponentFactoryResolver();
+
 /**
  * Inject static attribute value into directive constructor.
  *
@@ -634,7 +648,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
     const adjustedIdx = this._adjustIndex(index);
     const viewRef = (templateRef as TemplateRef<C>)
                         .createEmbeddedView(context || <any>{}, this._lContainerNode, adjustedIdx);
-    (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
+    (viewRef as ViewRef<any>).attachToViewContainerRef(this);
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
     return viewRef;
   }
@@ -642,15 +656,23 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
   createComponent<C>(
       componentFactory: viewEngine_ComponentFactory<C>, index?: number|undefined,
       injector?: Injector|undefined, projectableNodes?: any[][]|undefined,
-      ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<C> {
-    throw notImplemented();
+      ngModuleRef?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<C> {
+    const contextInjector = injector || this.parentInjector;
+    if (!ngModuleRef && contextInjector) {
+      ngModuleRef = contextInjector.get(viewEngine_NgModuleRef);
+    }
+
+    const componentRef =
+        componentFactory.create(contextInjector, projectableNodes, undefined, ngModuleRef);
+    this.insert(componentRef.hostView, index);
+    return componentRef;
   }
 
   insert(viewRef: viewEngine_ViewRef, index?: number): viewEngine_ViewRef {
     if (viewRef.destroyed) {
       throw new Error('Cannot insert a destroyed View in a ViewContainer!');
     }
-    const lViewNode = (viewRef as EmbeddedViewRef<any>)._lViewNode;
+    const lViewNode = (viewRef as ViewRef<any>)._lViewNode !;
     const adjustedIdx = this._adjustIndex(index);
 
     insertView(this._lContainerNode, lViewNode, adjustedIdx);
@@ -660,7 +682,7 @@ class ViewContainerRef implements viewEngine_ViewContainerRef {
         this._lContainerNode.native;
     addRemoveViewFromContainer(this._lContainerNode, lViewNode, true, beforeNode);
 
-    (viewRef as EmbeddedViewRef<any>).attachToViewContainerRef(this);
+    (viewRef as ViewRef<any>).attachToViewContainerRef(this);
     this._viewRefs.splice(adjustedIdx, 0, viewRef);
 
     return viewRef;
@@ -736,6 +758,8 @@ class TemplateRef<T> implements viewEngine_TemplateRef<T> {
       insertView(containerNode, viewNode, index !);
     }
     renderEmbeddedTemplate(viewNode, this._tView, context, RenderFlags.Create);
-    return new EmbeddedViewRef(viewNode, this._tView.template !as ComponentTemplate<T>, context);
+    const viewRef = new ViewRef(viewNode.data, context);
+    viewRef._lViewNode = viewNode;
+    return viewRef;
   }
 }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 2838b658af..014a092e66 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -15,7 +15,7 @@ import {I18nExpInstruction, I18nInstruction, i18nExpMapping, i18nInterpolation,
 import {ComponentDef, ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
-export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
+export {QUERY_READ_CONTAINER_REF, QUERY_READ_ELEMENT_REF, QUERY_READ_FROM_NODE, QUERY_READ_TEMPLATE_REF, directiveInject, injectAttribute, injectChangeDetectorRef, injectComponentFactoryResolver, injectElementRef, injectTemplateRef, injectViewContainerRef} from './di';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index eba6b90974..3b27b0d5d8 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -529,29 +529,35 @@ export function createEmbeddedViewNode<T>(
  * TView for dynamically created views on their host TNode, which only has one instance.
  */
 export function renderEmbeddedTemplate<T>(
-    viewNode: LViewNode, tView: TView, context: T, rf: RenderFlags): LViewNode {
+    viewNode: LViewNode | LElementNode, tView: TView, context: T, rf: RenderFlags): LViewNode|
+    LElementNode {
   const _isParent = isParent;
   const _previousOrParentNode = previousOrParentNode;
   let oldView: LViewData;
-  try {
-    isParent = true;
-    previousOrParentNode = null !;
+  if (viewNode.data ![PARENT] == null && viewNode.data ![CONTEXT] && !tView.template) {
+    // This is a root view inside the view tree
+    tickRootContext(viewNode.data ![CONTEXT] as RootContext);
+  } else {
+    try {
+      isParent = true;
+      previousOrParentNode = null !;
 
-    oldView = enterView(viewNode.data, viewNode);
-    namespaceHTML();
-    tView.template !(rf, context);
-    if (rf & RenderFlags.Update) {
-      refreshView();
-    } else {
-      viewNode.data[TVIEW].firstTemplatePass = firstTemplatePass = false;
+      oldView = enterView(viewNode.data !, viewNode);
+      namespaceHTML();
+      tView.template !(rf, context);
+      if (rf & RenderFlags.Update) {
+        refreshView();
+      } else {
+        viewNode.data ![TVIEW].firstTemplatePass = firstTemplatePass = false;
+      }
+    } finally {
+      // renderEmbeddedTemplate() is called twice in fact, once for creation only and then once for
+      // update. When for creation only, leaveView() must not trigger view hooks, nor clean flags.
+      const isCreationOnly = (rf & RenderFlags.Create) === RenderFlags.Create;
+      leaveView(oldView !, isCreationOnly);
+      isParent = _isParent;
+      previousOrParentNode = _previousOrParentNode;
     }
-  } finally {
-    // renderEmbeddedTemplate() is called twice in fact, once for creation only and then once for
-    // update. When for creation only, leaveView() must not trigger view hooks, nor clean flags.
-    const isCreationOnly = (rf & RenderFlags.Create) === RenderFlags.Create;
-    leaveView(oldView !, isCreationOnly);
-    isParent = _isParent;
-    previousOrParentNode = _previousOrParentNode;
   }
   return viewNode;
 }
@@ -654,17 +660,7 @@ export function elementStart(
 
   ngDevMode && ngDevMode.rendererCreateElement++;
 
-  let native: RElement;
-
-  if (isProceduralRenderer(renderer)) {
-    native = renderer.createElement(name, _currentNamespace);
-  } else {
-    if (_currentNamespace === null) {
-      native = renderer.createElement(name);
-    } else {
-      native = renderer.createElementNS(_currentNamespace, name);
-    }
-  }
+  const native = elementCreate(name);
 
   ngDevMode && assertDataInRange(index - 1);
 
@@ -679,6 +675,27 @@ export function elementStart(
   createDirectivesAndLocals(localRefs);
   return native;
 }
+/**
+ * Creates a native element from a tag name, using a renderer.
+ * @param name the tag name
+ * @param overriddenRenderer Optional A renderer to override the default one
+ * @returns the element created
+ */
+export function elementCreate(name: string, overriddenRenderer?: Renderer3): RElement {
+  let native: RElement;
+  const rendererToUse = overriddenRenderer || renderer;
+
+  if (isProceduralRenderer(rendererToUse)) {
+    native = rendererToUse.createElement(name, _currentNamespace);
+  } else {
+    if (_currentNamespace === null) {
+      native = rendererToUse.createElement(name);
+    } else {
+      native = rendererToUse.createElementNS(_currentNamespace, name);
+    }
+  }
+  return native;
+}
 
 /**
  * Creates directive instances and populates local refs.
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index 6bf5d4e6b6..1b23cf216c 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -12,7 +12,6 @@ import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_co
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
 
 import {checkNoChanges, detectChanges, markViewDirty, storeCleanupFn, viewAttached} from './instructions';
-import {ComponentTemplate} from './interfaces/definition';
 import {LViewNode} from './interfaces/node';
 import {FLAGS, LViewData, LViewFlags} from './interfaces/view';
 import {destroyLView} from './node_manipulation';
@@ -24,8 +23,13 @@ export interface viewEngine_ChangeDetectorRef_interface extends viewEngine_Chang
 
 export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_InternalViewRef,
     viewEngine_ChangeDetectorRef_interface {
-  // TODO(issue/24571): remove '!'.
-  private _appRef !: ApplicationRef | null;
+  private _appRef: ApplicationRef|null = null;
+  private _viewContainerRef: viewEngine_ViewContainerRef|null = null;
+
+  /**
+   * @internal
+   */
+  _lViewNode: LViewNode|null = null;
 
   context: T;
   // TODO(issue/24571): remove '!'.
@@ -43,7 +47,13 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
     return (this._view[FLAGS] & LViewFlags.Destroyed) === LViewFlags.Destroyed;
   }
 
-  destroy(): void { destroyLView(this._view); }
+  destroy(): void {
+    if (this._viewContainerRef && viewAttached(this._view)) {
+      this._viewContainerRef.detach(this._viewContainerRef.indexOf(this));
+      this._viewContainerRef = null;
+    }
+    destroyLView(this._view);
+  }
 
   onDestroy(callback: Function) { storeCleanupFn(this._view, callback); }
 
@@ -227,31 +237,9 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
    */
   checkNoChanges(): void { checkNoChanges(this.context); }
 
+  attachToViewContainerRef(vcRef: viewEngine_ViewContainerRef) { this._viewContainerRef = vcRef; }
+
   detachFromAppRef() { this._appRef = null; }
 
   attachToAppRef(appRef: ApplicationRef) { this._appRef = appRef; }
 }
-
-
-export class EmbeddedViewRef<T> extends ViewRef<T> {
-  /**
-   * @internal
-   */
-  _lViewNode: LViewNode;
-  private _viewContainerRef: viewEngine_ViewContainerRef|null = null;
-
-  constructor(viewNode: LViewNode, template: ComponentTemplate<T>, context: T) {
-    super(viewNode.data, context);
-    this._lViewNode = viewNode;
-  }
-
-  destroy(): void {
-    if (this._viewContainerRef && viewAttached(this._view)) {
-      this._viewContainerRef.detach(this._viewContainerRef.indexOf(this));
-      this._viewContainerRef = null;
-    }
-    super.destroy();
-  }
-
-  attachToViewContainerRef(vcRef: viewEngine_ViewContainerRef) { this._viewContainerRef = vcRef; }
-}
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 5914081fe2..68ee9b8b51 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -50,6 +50,9 @@
   {
     "name": "NG_PROJECT_AS_ATTR_NAME"
   },
+  {
+    "name": "PARENT"
+  },
   {
     "name": "QUERIES"
   },
@@ -80,6 +83,9 @@
   {
     "name": "_ROOT_DIRECTIVE_INDICES"
   },
+  {
+    "name": "_getComponentHostLElementNode"
+  },
   {
     "name": "_renderCompCount"
   },
@@ -170,6 +176,9 @@
   {
     "name": "getRenderFlags"
   },
+  {
+    "name": "getRootView"
+  },
   {
     "name": "hostElement"
   },
@@ -209,6 +218,9 @@
   {
     "name": "renderComponent"
   },
+  {
+    "name": "renderComponentOrTemplate"
+  },
   {
     "name": "renderEmbeddedTemplate"
   },
@@ -230,6 +242,9 @@
   {
     "name": "text"
   },
+  {
+    "name": "tickRootContext"
+  },
   {
     "name": "updateViewQuery"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 2957b13643..86230a5fc4 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -42,10 +42,7 @@
     "name": "EMPTY_RENDERER_TYPE_ID"
   },
   {
-    "name": "ElementRef"
-  },
-  {
-    "name": "EmbeddedViewRef"
+    "name": "ElementRef$1"
   },
   {
     "name": "FLAGS"
@@ -95,6 +92,9 @@
   {
     "name": "NgIfContext"
   },
+  {
+    "name": "NgModuleRef"
+  },
   {
     "name": "Optional"
   },
@@ -155,6 +155,9 @@
   {
     "name": "ViewEncapsulation$1"
   },
+  {
+    "name": "ViewRef"
+  },
   {
     "name": "_CLEAN_PROMISE"
   },
@@ -167,9 +170,6 @@
   {
     "name": "_ROOT_DIRECTIVE_INDICES"
   },
-  {
-    "name": "__extends"
-  },
   {
     "name": "__read"
   },
@@ -401,6 +401,9 @@
   {
     "name": "elementClassProp"
   },
+  {
+    "name": "elementCreate"
+  },
   {
     "name": "elementEnd"
   },
@@ -437,9 +440,6 @@
   {
     "name": "executePipeOnDestroys"
   },
-  {
-    "name": "extendStatics"
-  },
   {
     "name": "extractDirectiveDef"
   },
@@ -668,9 +668,6 @@
   {
     "name": "namespaceHTML"
   },
-  {
-    "name": "notImplemented"
-  },
   {
     "name": "pointers"
   },
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 894b1bc552..0be79218fd 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, EmbeddedViewRef, Pipe, PipeTransform, TemplateRef, ViewContainerRef} from '../../src/core';
+import {Component, ComponentFactoryResolver, Directive, EmbeddedViewRef, NgModuleRef, Pipe, PipeTransform, RendererFactory2, TemplateRef, ViewContainerRef, createInjector, defineInjector, ɵAPP_ROOT as APP_ROOT, ɵNgModuleDef as NgModuleDef} from '../../src/core';
 import {getOrCreateNodeInjectorForNode, getOrCreateTemplateRef} from '../../src/render3/di';
-import {NgOnChangesFeature, defineComponent, defineDirective, definePipe, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, projection, projectionDef, reserveSlots, text, textBinding} from '../../src/render3/instructions';
+import {NgOnChangesFeature, defineComponent, defineDirective, definePipe, injectComponentFactoryResolver, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
+import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, load, loadDirective, projection, projectionDef, reserveSlots, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
+import {NgModuleFactory} from '../../src/render3/ng_module_ref';
 import {pipe, pipeBind1} from '../../src/render3/pipe';
 
 import {getRendererFactory2} from './imported_renderer2';
@@ -25,7 +26,8 @@ describe('ViewContainerRef', () => {
     static ngDirectiveDef = defineDirective({
       type: DirectiveWithVCRef,
       selectors: [['', 'vcref', '']],
-      factory: () => directiveInstance = new DirectiveWithVCRef(injectViewContainerRef()),
+      factory: () => directiveInstance = new DirectiveWithVCRef(
+                   injectViewContainerRef(), injectComponentFactoryResolver()),
       inputs: {tplRef: 'tplRef'}
     });
 
@@ -34,7 +36,7 @@ describe('ViewContainerRef', () => {
 
     // injecting a ViewContainerRef to create a dynamic container in which embedded views will be
     // created
-    constructor(public vcref: ViewContainerRef) {}
+    constructor(public vcref: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
   }
 
   describe('API', () => {
@@ -650,6 +652,177 @@ describe('ViewContainerRef', () => {
         expect(() => { directiveInstance !.vcref.move(viewRef !, 42); }).toThrow();
       });
     });
+
+    describe('createComponent', () => {
+      let templateExecutionCounter = 0;
+
+      class EmbeddedComponent {
+        static ngComponentDef = defineComponent({
+          type: EmbeddedComponent,
+          selectors: [['embedded-cmp']],
+          factory: () => new EmbeddedComponent(),
+          template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
+            templateExecutionCounter++;
+            if (rf & RenderFlags.Create) {
+              text(0, 'foo');
+            }
+          }
+        });
+      }
+
+      it('should work without Injector and NgModuleRef', () => {
+        templateExecutionCounter = 0;
+        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
+        expect(fixture.html).toEqual('<p vcref=""></p>');
+        expect(templateExecutionCounter).toEqual(0);
+
+        const componentRef = directiveInstance !.vcref.createComponent(
+            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponent));
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
+        expect(templateExecutionCounter).toEqual(2);
+
+        directiveInstance !.vcref.detach(0);
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p>');
+        expect(templateExecutionCounter).toEqual(2);
+
+        directiveInstance !.vcref.insert(componentRef.hostView);
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
+        expect(templateExecutionCounter).toEqual(3);
+      });
+
+      it('should work with NgModuleRef and Injector', () => {
+        class MyAppModule {
+          static ngInjectorDef = defineInjector({
+            factory: () => new MyAppModule(),
+            imports: [],
+            providers: [
+              {provide: APP_ROOT, useValue: true},
+              {provide: RendererFactory2, useValue: getRendererFactory2(document)}
+            ]
+          });
+          static ngModuleDef: NgModuleDef<any, any, any, any> = { bootstrap: [] } as any;
+        }
+        const myAppModuleFactory = new NgModuleFactory(MyAppModule);
+        const ngModuleRef = myAppModuleFactory.create(null);
+
+        class SomeModule {
+          static ngInjectorDef = defineInjector({
+            factory: () => new SomeModule(),
+            providers: [{provide: NgModuleRef, useValue: ngModuleRef}]
+          });
+        }
+        const injector = createInjector(SomeModule);
+
+        templateExecutionCounter = 0;
+        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
+        expect(fixture.html).toEqual('<p vcref=""></p>');
+        expect(templateExecutionCounter).toEqual(0);
+
+        directiveInstance !.vcref.createComponent(
+            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponent), 0, injector);
+        fixture.update();
+        expect(fixture.html).toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
+        expect(templateExecutionCounter).toEqual(2);
+
+        directiveInstance !.vcref.createComponent(
+            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponent), 0, undefined,
+            undefined, ngModuleRef);
+        fixture.update();
+        expect(fixture.html)
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp>foo</embedded-cmp><embedded-cmp>foo</embedded-cmp>');
+        expect(templateExecutionCounter).toEqual(5);
+      });
+
+      class EmbeddedComponentWithNgContent {
+        static ngComponentDef = defineComponent({
+          type: EmbeddedComponentWithNgContent,
+          selectors: [['embedded-cmp-with-ngcontent']],
+          factory: () => new EmbeddedComponentWithNgContent(),
+          template: (rf: RenderFlags, cmp: EmbeddedComponentWithNgContent) => {
+            if (rf & RenderFlags.Create) {
+              projectionDef();
+              projection(0, 0);
+              element(1, 'hr');
+              projection(2, 1);
+            }
+          }
+        });
+      }
+
+      it('should support projectable nodes', () => {
+        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
+        expect(fixture.html).toEqual('<p vcref=""></p>');
+
+        const myNode = document.createElement('div');
+        const myText = document.createTextNode('bar');
+        const myText2 = document.createTextNode('baz');
+        myNode.appendChild(myText);
+        myNode.appendChild(myText2);
+
+        directiveInstance !.vcref.createComponent(
+            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponentWithNgContent), 0,
+            undefined, [[myNode]]);
+        fixture.update();
+        expect(fixture.html)
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent>');
+      });
+
+      it('should support reprojection of projectable nodes', () => {
+        class Reprojector {
+          static ngComponentDef = defineComponent({
+            type: Reprojector,
+            selectors: [['reprojector']],
+            factory: () => new Reprojector(),
+            template: (rf: RenderFlags, cmp: Reprojector) => {
+              if (rf & RenderFlags.Create) {
+                projectionDef();
+                elementStart(0, 'embedded-cmp-with-ngcontent');
+                { projection(1, 0); }
+                elementEnd();
+              }
+            },
+            directives: [EmbeddedComponentWithNgContent]
+          });
+        }
+
+        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
+        expect(fixture.html).toEqual('<p vcref=""></p>');
+
+        const myNode = document.createElement('div');
+        const myText = document.createTextNode('bar');
+        const myText2 = document.createTextNode('baz');
+        myNode.appendChild(myText);
+        myNode.appendChild(myText2);
+
+        directiveInstance !.vcref.createComponent(
+            directiveInstance !.cfr.resolveComponentFactory(Reprojector), 0, undefined, [[myNode]]);
+        fixture.update();
+        expect(fixture.html)
+            .toEqual(
+                '<p vcref=""></p><reprojector><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent></reprojector>');
+      });
+
+      it('should support many projectable nodes with many slots', () => {
+        const fixture = new TemplateFixture(createTemplate, updateTemplate, [DirectiveWithVCRef]);
+        expect(fixture.html).toEqual('<p vcref=""></p>');
+
+        directiveInstance !.vcref.createComponent(
+            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponentWithNgContent), 0,
+            undefined, [
+              [document.createTextNode('1'), document.createTextNode('2')],
+              [document.createTextNode('3'), document.createTextNode('4')]
+            ]);
+        fixture.update();
+        expect(fixture.html)
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp-with-ngcontent>12<hr>34</embedded-cmp-with-ngcontent>');
+      });
+    });
   });
 
   describe('projection', () => {
@@ -944,43 +1117,44 @@ describe('ViewContainerRef', () => {
 
     // Angular 5 reference: https://stackblitz.com/edit/lifecycle-hooks-vcref
     const log: string[] = [];
-    it('should call all hooks in correct order', () => {
-      @Component({selector: 'hooks', template: `{{name}}`})
-      class ComponentWithHooks {
-        // TODO(issue/24571): remove '!'.
-        name !: string;
 
-        private log(msg: string) { log.push(msg); }
+    @Component({selector: 'hooks', template: `{{name}}`})
+    class ComponentWithHooks {
+      // TODO(issue/24571): remove '!'.
+      name !: string;
 
-        ngOnChanges() { this.log('onChanges-' + this.name); }
-        ngOnInit() { this.log('onInit-' + this.name); }
-        ngDoCheck() { this.log('doCheck-' + this.name); }
+      private log(msg: string) { log.push(msg); }
 
-        ngAfterContentInit() { this.log('afterContentInit-' + this.name); }
-        ngAfterContentChecked() { this.log('afterContentChecked-' + this.name); }
+      ngOnChanges() { this.log('onChanges-' + this.name); }
+      ngOnInit() { this.log('onInit-' + this.name); }
+      ngDoCheck() { this.log('doCheck-' + this.name); }
 
-        ngAfterViewInit() { this.log('afterViewInit-' + this.name); }
-        ngAfterViewChecked() { this.log('afterViewChecked-' + this.name); }
+      ngAfterContentInit() { this.log('afterContentInit-' + this.name); }
+      ngAfterContentChecked() { this.log('afterContentChecked-' + this.name); }
 
-        ngOnDestroy() { this.log('onDestroy-' + this.name); }
+      ngAfterViewInit() { this.log('afterViewInit-' + this.name); }
+      ngAfterViewChecked() { this.log('afterViewChecked-' + this.name); }
 
-        static ngComponentDef = defineComponent({
-          type: ComponentWithHooks,
-          selectors: [['hooks']],
-          factory: () => new ComponentWithHooks(),
-          template: (rf: RenderFlags, cmp: ComponentWithHooks) => {
-            if (rf & RenderFlags.Create) {
-              text(0);
-            }
-            if (rf & RenderFlags.Update) {
-              textBinding(0, interpolation1('', cmp.name, ''));
-            }
-          },
-          features: [NgOnChangesFeature],
-          inputs: {name: 'name'}
-        });
-      }
+      ngOnDestroy() { this.log('onDestroy-' + this.name); }
 
+      static ngComponentDef = defineComponent({
+        type: ComponentWithHooks,
+        selectors: [['hooks']],
+        factory: () => new ComponentWithHooks(),
+        template: (rf: RenderFlags, cmp: ComponentWithHooks) => {
+          if (rf & RenderFlags.Create) {
+            text(0);
+          }
+          if (rf & RenderFlags.Update) {
+            textBinding(0, interpolation1('', cmp.name, ''));
+          }
+        },
+        features: [NgOnChangesFeature],
+        inputs: {name: 'name'}
+      });
+    }
+
+    it('should call all hooks in correct order when creating with createEmbeddedView', () => {
       @Component({
         template: `
           <ng-template #foo>
@@ -1022,6 +1196,8 @@ describe('ViewContainerRef', () => {
         });
       }
 
+      log.length = 0;
+
       const fixture = new ComponentFixture(SomeComponent);
       expect(log).toEqual([
         'onChanges-A', 'onInit-A', 'doCheck-A', 'onChanges-B', 'onInit-B', 'doCheck-B',
@@ -1082,5 +1258,98 @@ describe('ViewContainerRef', () => {
         'afterViewChecked-A', 'afterViewChecked-B'
       ]);
     });
+
+    it('should call all hooks in correct order when creating with createComponent', () => {
+      @Component({
+        template: `
+          <hooks vcref [name]="'A'"></hooks>
+          <hooks [name]="'B'"></hooks>
+        `
+      })
+      class SomeComponent {
+        static ngComponentDef = defineComponent({
+          type: SomeComponent,
+          selectors: [['some-comp']],
+          factory: () => new SomeComponent(),
+          template: (rf: RenderFlags, cmp: SomeComponent) => {
+            if (rf & RenderFlags.Create) {
+              elementStart(0, 'hooks', ['vcref', '']);
+              elementEnd();
+              elementStart(1, 'hooks');
+              elementEnd();
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(0, 'name', bind('A'));
+              elementProperty(1, 'name', bind('B'));
+            }
+          },
+          directives: [ComponentWithHooks, DirectiveWithVCRef]
+        });
+      }
+
+      log.length = 0;
+
+      const fixture = new ComponentFixture(SomeComponent);
+      expect(log).toEqual([
+        'onChanges-A', 'onInit-A', 'doCheck-A', 'onChanges-B', 'onInit-B', 'doCheck-B',
+        'afterContentInit-A', 'afterContentChecked-A', 'afterContentInit-B',
+        'afterContentChecked-B', 'afterViewInit-A', 'afterViewChecked-A', 'afterViewInit-B',
+        'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      fixture.update();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      const componentRef = directiveInstance !.vcref.createComponent(
+          directiveInstance !.cfr.resolveComponentFactory(ComponentWithHooks));
+      expect(fixture.html).toEqual('<hooks vcref="">A</hooks><hooks></hooks><hooks>B</hooks>');
+      expect(log).toEqual([]);
+
+      componentRef.instance.name = 'D';
+      log.length = 0;
+      fixture.update();
+      expect(fixture.html).toEqual('<hooks vcref="">A</hooks><hooks>D</hooks><hooks>B</hooks>');
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'onChanges-D', 'onInit-D', 'doCheck-D', 'afterContentInit-D',
+        'afterContentChecked-D', 'afterViewInit-D', 'afterViewChecked-D', 'afterContentChecked-A',
+        'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      fixture.update();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-D', 'afterContentChecked-D', 'afterViewChecked-D',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      const viewRef = directiveInstance !.vcref.detach(0);
+      fixture.update();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      directiveInstance !.vcref.insert(viewRef !);
+      fixture.update();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-D', 'afterContentChecked-D', 'afterViewChecked-D',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      directiveInstance !.vcref.remove(0);
+      fixture.update();
+      expect(log).toEqual([
+        'onDestroy-D', 'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+    });
   });
 });

From e38b2b502c93b5c80ae28306d1fa620d9d3d21b3 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 6 Jul 2018 15:42:07 -0700
Subject: [PATCH 551/582] build(bazel):
 //modules/benchmarks/src/largetable/render3:perf bazel protractor test
 (#24788)

PR Close #24788
---
 BUILD.bazel                                   |  1 +
 modules/benchmarks/BUILD.bazel                |  8 +++
 modules/benchmarks/src/BUILD.bazel            | 11 ++++
 modules/benchmarks/src/README.md              |  7 ++
 modules/benchmarks/src/largetable/BUILD.bazel | 12 ++++
 .../src/largetable/largetable_perf.spec.ts    | 66 +++++++++++++++++++
 .../src/largetable/render3/BUILD.bazel        | 49 +++++++++++++-
 .../src/largetable/render3/index.html         | 12 ++--
 .../src/largetable/render3/index.ts           |  2 +
 .../render3/protractor.on-prepare.js          | 21 ++++++
 .../src/largetable/render3/tsconfig.json      |  5 ++
 modules/e2e_util/BUILD.bazel                  | 13 ++++
 modules/e2e_util/e2e_util.ts                  |  6 +-
 packages/benchpress/BUILD.bazel               | 18 +++++
 protractor-perf.conf.js                       | 31 ++++++---
 15 files changed, 243 insertions(+), 19 deletions(-)
 create mode 100644 modules/benchmarks/BUILD.bazel
 create mode 100644 modules/benchmarks/src/README.md
 create mode 100644 modules/benchmarks/src/largetable/largetable_perf.spec.ts
 create mode 100644 modules/benchmarks/src/largetable/render3/protractor.on-prepare.js
 create mode 100644 modules/benchmarks/src/largetable/render3/tsconfig.json
 create mode 100644 modules/e2e_util/BUILD.bazel
 create mode 100644 packages/benchpress/BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index b255a31acd..768c6c2ebc 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -5,6 +5,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup")
 exports_files([
     "tsconfig.json",
     "LICENSE",
+    "protractor-perf.conf.js",
 ])
 
 # Developers should always run `bazel run :install`
diff --git a/modules/benchmarks/BUILD.bazel b/modules/benchmarks/BUILD.bazel
new file mode 100644
index 0000000000..8ef1f366db
--- /dev/null
+++ b/modules/benchmarks/BUILD.bazel
@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "favicon",
+    srcs = [
+        "favicon.ico",
+    ],
+)
diff --git a/modules/benchmarks/src/BUILD.bazel b/modules/benchmarks/src/BUILD.bazel
index 5391f3c59d..45901bd2fa 100644
--- a/modules/benchmarks/src/BUILD.bazel
+++ b/modules/benchmarks/src/BUILD.bazel
@@ -12,3 +12,14 @@ ts_library(
         "//packages/core",
     ],
 )
+
+ts_library(
+    name = "bootstrap",
+    srcs = [
+        "bootstrap_ng2.ts",
+        "bootstrap_plain.ts",
+    ],
+    deps = [
+        "//packages:types",
+    ],
+)
diff --git a/modules/benchmarks/src/README.md b/modules/benchmarks/src/README.md
new file mode 100644
index 0000000000..9bd77a618f
--- /dev/null
+++ b/modules/benchmarks/src/README.md
@@ -0,0 +1,7 @@
+# Benchmark Directory Layout
+
+## Bazel
+
+Under bazel the rules for laying out test files are slightly different. Use `largetable/render3` as an example.
+
+Put the perf file in current subdirectory (ie `largetable`) such that the same perf file can be used for each of the sub-subdirectories. (ie `largetable/*` should all be testable with the same perf file `largetable/largetable_perf.spec.ts`). Under bazel, typescript protractor spec files must end with `.spec.ts` or `.test.ts`.
diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel
index 77f2cb24bd..8a6e269adb 100644
--- a/modules/benchmarks/src/largetable/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/BUILD.bazel
@@ -13,3 +13,15 @@ ts_library(
         "//packages/core",
     ],
 )
+
+ts_library(
+    name = "perf_lib",
+    testonly = 1,
+    srcs = [
+        "largetable_perf.spec.ts",
+    ],
+    deps = [
+        "//modules/e2e_util:lib",
+        "//packages:types",
+    ],
+)
diff --git a/modules/benchmarks/src/largetable/largetable_perf.spec.ts b/modules/benchmarks/src/largetable/largetable_perf.spec.ts
new file mode 100644
index 0000000000..90d08cc24f
--- /dev/null
+++ b/modules/benchmarks/src/largetable/largetable_perf.spec.ts
@@ -0,0 +1,66 @@
+/**
+ * @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 {$} from 'protractor';
+
+import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
+
+interface Worker {
+  id: string;
+  prepare?(): void;
+  work(): void;
+}
+
+const CreateOnlyWorker: Worker = {
+  id: 'createOnly',
+  prepare: () => $('#destroyDom').click(),
+  work: () => $('#createDom').click()
+};
+
+const CreateAndDestroyWorker: Worker = {
+  id: 'createDestroy',
+  work: () => {
+    $('#createDom').click();
+    $('#destroyDom').click();
+  }
+};
+
+const UpdateWorker: Worker = {
+  id: 'update',
+  work: () => $('#createDom').click()
+};
+
+describe('largetable benchmark perf', () => {
+
+  afterEach(verifyNoBrowserErrors);
+
+  [CreateOnlyWorker, CreateAndDestroyWorker, UpdateWorker].forEach((worker) => {
+    describe(worker.id, () => {
+      it('should run for render3', (done) => {
+        runTableBenchmark({
+          id: `largeTable.render3.${worker.id}`,
+          url: 'index.html',
+          ignoreBrowserSynchronization: true,
+          worker: worker
+        }).then(done, done.fail);
+      });
+    });
+  });
+
+  function runTableBenchmark(
+      config: {id: string, url: string, ignoreBrowserSynchronization?: boolean, worker: Worker}) {
+    return runBenchmark({
+      id: config.id,
+      url: config.url,
+      ignoreBrowserSynchronization: config.ignoreBrowserSynchronization,
+      params: [{name: 'cols', value: 40}, {name: 'rows', value: 200}],
+      prepare: config.worker.prepare,
+      work: config.worker.work
+    });
+  }
+});
diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
index 959c5afe35..4e5caf6770 100644
--- a/modules/benchmarks/src/largetable/render3/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@@ -1,18 +1,63 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ng_module")
+load("//tools:defaults.bzl", "ts_library")
+load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
+load("//packages/bazel:index.bzl", "protractor_web_test")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
 
-ng_module(
+ts_library(
     name = "largetable_lib",
     srcs = glob(
         [
             "**/*.ts",
         ],
+        exclude = ["protractor.on-prepare.ts"],
     ),
     deps = [
+        "//modules/benchmarks/src:util_lib",
         "//modules/benchmarks/src/largetable:util_lib",
         "//packages:types",
         "//packages/core",
         "@rxjs",
     ],
 )
+
+ng_rollup_bundle(
+    name = "bundle",
+    entry_point = "modules/benchmarks/src/largetable/render3/index.js",
+    deps = [
+        ":largetable_lib",
+    ],
+)
+
+genrule(
+    name = "favicon",
+    srcs = ["//modules/benchmarks:favicon"],
+    outs = ["favicon.ico"],
+    cmd = "cp $< $@",
+)
+
+ts_devserver(
+    name = "devserver",
+    static_files = [
+        ":bundle.min_debug.js",
+        ":bundle.min.js",
+        "index.html",
+        ":favicon",
+    ],
+)
+
+protractor_web_test(
+    name = "perf",
+    configuration = "//:protractor-perf.conf.js",
+    data = [
+        "//packages/bazel/src/protractor/utils",
+        "//packages/benchpress",
+    ],
+    on_prepare = ":protractor.on-prepare.js",
+    server = ":devserver",
+    tags = ["manual"],
+    deps = [
+        "//modules/benchmarks/src/largetable:perf_lib",
+    ],
+)
diff --git a/modules/benchmarks/src/largetable/render3/index.html b/modules/benchmarks/src/largetable/render3/index.html
index 75a5db817e..cd7538e7d0 100644
--- a/modules/benchmarks/src/largetable/render3/index.html
+++ b/modules/benchmarks/src/largetable/render3/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html>
+
 <body>
 
   <h2>Params</h2>
   <form>
     Cols:
     <input type="number" name="cols" placeholder="cols" value="40">
-    <br>
-    Rows:
+    <br> Rows:
     <input type="number" name="rows" placeholder="rows" value="200">
     <br>
     <button>Apply</button>
@@ -28,9 +28,9 @@
   <script>
     // TODO(mlaval): remove once we have a proper solution
     ngDevMode = false;
-    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
-      || '../../bootstrap_ng2.js';
-    document.write('<script src="' + mainUrl + '">\u003c/script>');
+    var bazelBundle = document.location.search.endsWith('debug') ? 'bundle.min_debug.js' : 'bundle.min.js';
+    document.write('<script src="' + bazelBundle + '">\u003c/script>');
   </script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/largetable/render3/index.ts b/modules/benchmarks/src/largetable/render3/index.ts
index e8eb07fceb..8b42c36d96 100644
--- a/modules/benchmarks/src/largetable/render3/index.ts
+++ b/modules/benchmarks/src/largetable/render3/index.ts
@@ -26,3 +26,5 @@ export function main() {
         profile(() => createDom(component), () => destroyDom(component), 'create'));
   }
 }
+
+main();
diff --git a/modules/benchmarks/src/largetable/render3/protractor.on-prepare.js b/modules/benchmarks/src/largetable/render3/protractor.on-prepare.js
new file mode 100644
index 0000000000..6671d2d233
--- /dev/null
+++ b/modules/benchmarks/src/largetable/render3/protractor.on-prepare.js
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+const protractorUtils = require('@angular/bazel/protractor-utils');
+const protractor = require('protractor');
+
+module.exports = function(config) {
+  return protractorUtils.runServer(config.workspace, config.server, '-port', [])
+      .then(serverSpec => {
+        const serverUrl = `http://localhost:${serverSpec.port}`;
+        // Since the browser restarts in this benchmark we need to set both the browser.baseUrl
+        // for the first test and the protractor config.baseUrl for the subsequent tests
+        protractor.browser.baseUrl = serverUrl;
+        return protractor.browser.getProcessedConfig().then((config) => config.baseUrl = serverUrl);
+      });
+};
diff --git a/modules/benchmarks/src/largetable/render3/tsconfig.json b/modules/benchmarks/src/largetable/render3/tsconfig.json
new file mode 100644
index 0000000000..8f3c656796
--- /dev/null
+++ b/modules/benchmarks/src/largetable/render3/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "lib": ["es2015"]
+  }
+}
diff --git a/modules/e2e_util/BUILD.bazel b/modules/e2e_util/BUILD.bazel
new file mode 100644
index 0000000000..a70647c870
--- /dev/null
+++ b/modules/e2e_util/BUILD.bazel
@@ -0,0 +1,13 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "lib",
+    testonly = 1,
+    srcs = glob(["*.ts"]),
+    deps = [
+        "//packages:types",
+        "//packages/benchpress",
+    ],
+)
diff --git a/modules/e2e_util/e2e_util.ts b/modules/e2e_util/e2e_util.ts
index 1defd9b5df..d0e9c1e8fd 100644
--- a/modules/e2e_util/e2e_util.ts
+++ b/modules/e2e_util/e2e_util.ts
@@ -20,8 +20,10 @@ export function readCommandLine(extraOptions?: {[key: string]: any}) {
   const options: {[key: string]: any} = {
     'bundles': {describe: 'Whether to use the angular bundles or not.', default: false}
   };
-  for (const key in extraOptions) {
-    options[key] = extraOptions[key];
+  if (extraOptions) {
+    for (const key in extraOptions) {
+      options[key] = extraOptions[key];
+    }
   }
 
   cmdArgs = yargs.usage('Angular e2e test options.').options(options).help('ng-help').wrap(40).argv;
diff --git a/packages/benchpress/BUILD.bazel b/packages/benchpress/BUILD.bazel
new file mode 100644
index 0000000000..243f8db349
--- /dev/null
+++ b/packages/benchpress/BUILD.bazel
@@ -0,0 +1,18 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "benchpress",
+    srcs = glob(
+        [
+            "*.ts",
+            "src/**/*.ts",
+        ],
+    ),
+    module_name = "@angular/benchpress",
+    deps = [
+        "//packages:types",
+        "//packages/core",
+    ],
+)
diff --git a/protractor-perf.conf.js b/protractor-perf.conf.js
index a2a618be42..d5e937bb09 100644
--- a/protractor-perf.conf.js
+++ b/protractor-perf.conf.js
@@ -6,9 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+// Determine if we run under bazel
+const isBazel = !!process.env.RUNFILES;
+
 // Make sure that the command line is read as the first thing
 // as this could exit node if the help script should be printed.
-require('./dist/all/e2e_util/perf_util').readCommandLine();
+const BASE = isBazel ? 'angular/modules' : 'dist/all';
+require(`./${BASE}/e2e_util/perf_util`).readCommandLine();
 
 var CHROME_OPTIONS = {
   'args': ['--js-flags=--expose-gc', '--no-sandbox'],
@@ -38,14 +42,19 @@ var BROWSER_CAPS = {
   }
 };
 
-exports.config = {
+function mergeInto(src, target) {
+  for (var prop in src) {
+    target[prop] = src[prop];
+  }
+  return target;
+}
+
+const config = {
   onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
   restartBrowserBetweenTests: true,
   allScriptsTimeout: 11000,
-  specs: ['dist/all/**/e2e_test/**/*_perf.js'],
   capabilities: process.env.TRAVIS ? BROWSER_CAPS.ChromeOnTravis : BROWSER_CAPS.LocalChrome,
   directConnect: true,
-  baseUrl: 'http://localhost:8000/',
   framework: 'jasmine2',
   jasmineNodeOpts: {
     showColors: true,
@@ -55,9 +64,13 @@ exports.config = {
   useAllAngular2AppRoots: true
 };
 
-function mergeInto(src, target) {
-  for (var prop in src) {
-    target[prop] = src[prop];
-  }
-  return target;
+// Bazel has different strategy for how specs and baseUrl are specified
+if (!isBazel) {
+  config.baseUrl = 'http://localhost:8000/';
+  config.specs = [
+    'dist/all/**/e2e_test/**/*_perf.spec.js',
+    'dist/all/**/e2e_test/**/*_perf.js',
+  ]
 }
+
+exports.config = config;

From 8450e0ab2f7dc34670bea021c0b2f11d6cb5872c Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 13 Jul 2018 06:35:23 -0700
Subject: [PATCH 552/582] build(bazel): fix broken travis CI (#24788)

PR Close #24788
---
 modules/benchmarks/src/largetable/render3/index.html | 8 +++++++-
 modules/benchmarks/src/largetable/render3/index.ts   | 8 +++++++-
 protractor-perf.conf.js                              | 3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/benchmarks/src/largetable/render3/index.html b/modules/benchmarks/src/largetable/render3/index.html
index cd7538e7d0..85dcfbb742 100644
--- a/modules/benchmarks/src/largetable/render3/index.html
+++ b/modules/benchmarks/src/largetable/render3/index.html
@@ -28,8 +28,14 @@
   <script>
     // TODO(mlaval): remove once we have a proper solution
     ngDevMode = false;
+    var isBazel = location.pathname.indexOf('/all/') !== 0;
+    // isBazel needed while 'scripts/ci/test-e2e.sh test.e2e.protractor-e2e' is run
+    // on Travis
+    // TODO: port remaining protractor e2e tests to bazel protractor_web_test_suite rule
     var bazelBundle = document.location.search.endsWith('debug') ? 'bundle.min_debug.js' : 'bundle.min.js';
-    document.write('<script src="' + bazelBundle + '">\u003c/script>');
+    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
+      || '../../bootstrap_ng2.js';
+    document.write('<script src="' + (isBazel ? bazelBundle : mainUrl) + '">\u003c/script>');
   </script>
 </body>
 
diff --git a/modules/benchmarks/src/largetable/render3/index.ts b/modules/benchmarks/src/largetable/render3/index.ts
index 8b42c36d96..c8d774dbfe 100644
--- a/modules/benchmarks/src/largetable/render3/index.ts
+++ b/modules/benchmarks/src/largetable/render3/index.ts
@@ -27,4 +27,10 @@ export function main() {
   }
 }
 
-main();
+const isBazel = location.pathname.indexOf('/all/') !== 0;
+// isBazel needed while 'scripts/ci/test-e2e.sh test.e2e.protractor-e2e' is run
+// on Travis
+// TODO: port remaining protractor e2e tests to bazel protractor_web_test_suite rule
+if (isBazel) {
+  main();
+}
diff --git a/protractor-perf.conf.js b/protractor-perf.conf.js
index d5e937bb09..409617f293 100644
--- a/protractor-perf.conf.js
+++ b/protractor-perf.conf.js
@@ -8,6 +8,9 @@
 
 // Determine if we run under bazel
 const isBazel = !!process.env.RUNFILES;
+// isBazel needed while 'scripts/ci/test-e2e.sh test.e2e.protractor-e2e' is run
+// on Travis
+// TODO: port remaining protractor e2e tests to bazel protractor_web_test_suite rule
 
 // Make sure that the command line is read as the first thing
 // as this could exit node if the help script should be printed.

From 2cb0f68a7bc0d2aa5eebee936346084f178dc864 Mon Sep 17 00:00:00 2001
From: Wei Huang <huangwe@google.com>
Date: Mon, 16 Jul 2018 12:10:11 -0400
Subject: [PATCH 553/582] test(bazel): allow no sandbox for protractor tests
 (#24906)

It specifies --no-sandbox flag when running the protractor tests as
root. This is needed for running the tests inside a docker container.

PR Close #24906
---
 packages/bazel/src/protractor/protractor.conf.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/bazel/src/protractor/protractor.conf.js b/packages/bazel/src/protractor/protractor.conf.js
index 70ee78a475..dae9bb3c8d 100644
--- a/packages/bazel/src/protractor/protractor.conf.js
+++ b/packages/bazel/src/protractor/protractor.conf.js
@@ -107,6 +107,11 @@ if (process.env['WEB_TEST_METADATA']) {
       if (headless) {
         args.push('--headless');
         args.push('--disable-gpu');
+        const isRoot = process.getuid && process.getuid() == 0;
+        if (isRoot) {
+          // Specify --no-sandbox if it is started by root.
+          args.push('--no-sandbox');
+        }
       }
       setConf(conf, 'directConnect', true, 'is set to true for chrome');
       setConf(

From c0e3852384643e26382e2af70993ddde8e03e102 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 24 Jul 2018 14:26:08 -0700
Subject: [PATCH 554/582] Revert "build: update to newer circleCI bazel remote
 cache proxy (#25054)" (#25076)

This reverts commit d6016f1d1d37e9ab6ee3e7725add1bb63e41f7e4.

PR Close #25076
---
 .circleci/setup_cache.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/setup_cache.sh b/.circleci/setup_cache.sh
index d5c8c35b5a..232596df4a 100755
--- a/.circleci/setup_cache.sh
+++ b/.circleci/setup_cache.sh
@@ -5,7 +5,7 @@
 
 set -u -e
 
-readonly DOWNLOAD_URL="https://6-116431813-gh.circle-artifacts.com/0/pkg/bazel-remote-proxy-$(uname -s)_$(uname -m)"
+readonly DOWNLOAD_URL="https://5-116431813-gh.circle-artifacts.com/0/pkg/bazel-remote-proxy-$(uname -s)_$(uname -m)"
 
 curl --fail -o ~/bazel-remote-proxy "$DOWNLOAD_URL"
 chmod +x ~/bazel-remote-proxy

From 72dd10f78f81e53270bbbaa0b03d0dc4f3bd4796 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 9 Jul 2018 20:59:43 +0200
Subject: [PATCH 555/582] refactor(ivy): cleanup runtime i18n code (#24805)

Fixes #24785

PR Close #24805
---
 packages/core/src/render3/i18n.ts       |  77 ++++----
 packages/core/test/render3/i18n_spec.ts | 251 +++++++++++++++---------
 2 files changed, 200 insertions(+), 128 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index fdcbee7dff..279c8d5b37 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -9,7 +9,7 @@
 import {assertEqual, assertLessThan} from './assert';
 import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load, resetApplicationState} from './instructions';
 import {RENDER_PARENT} from './interfaces/container';
-import {LContainerNode, LElementNode, LNode, TContainerNode, TElementNode, TNodeType} from './interfaces/node';
+import {LContainerNode, LNode, TContainerNode, TElementNode, TNodeType} from './interfaces/node';
 import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
 import {appendChild, createTextNode, getParentLNode, removeChild} from './node_manipulation';
 import {stringify} from './util';
@@ -22,8 +22,10 @@ export const enum I18nInstructions {
   Text = 1 << 29,
   Element = 2 << 29,
   Expression = 3 << 29,
-  CloseNode = 4 << 29,
-  RemoveNode = 5 << 29,
+  TemplateRoot = 4 << 29,
+  Any = 5 << 29,
+  CloseNode = 6 << 29,
+  RemoveNode = 7 << 29,
   /** Used to decode the number encoded with the instruction. */
   IndexMask = (1 << 29) - 1,
   /** Used to test the type of instruction. */
@@ -46,7 +48,7 @@ export type I18nExpInstruction = number | string;
 export type PlaceholderMap = {
   [name: string]: number
 };
-const i18nTagRegex = /\{\$([^}]+)\}/g;
+const i18nTagRegex = /{\$([^}]+)}/g;
 
 /**
  * Takes a translation string, the initial list of placeholders (elements and expressions) and the
@@ -62,8 +64,8 @@ const i18nTagRegex = /\{\$([^}]+)\}/g;
  * their indexes.
  * @param expressions An array containing, for each template, the maps of expression placeholders
  * and their indexes.
- * @param tmplContainers An array of template container placeholders whose content should be ignored
- * when generating the instructions for their parent template.
+ * @param templateRoots An array of template roots whose content should be ignored when
+ * generating the instructions for their parent template.
  * @param lastChildIndex The index of the last child of the i18n node. Used when the i18n block is
  * an ng-container.
  *
@@ -71,13 +73,13 @@ const i18nTagRegex = /\{\$([^}]+)\}/g;
  */
 export function i18nMapping(
     translation: string, elements: (PlaceholderMap | null)[] | null,
-    expressions?: (PlaceholderMap | null)[] | null, tmplContainers?: string[] | null,
+    expressions?: (PlaceholderMap | null)[] | null, templateRoots?: string[] | null,
     lastChildIndex?: number | null): I18nInstruction[][] {
   const translationParts = translation.split(i18nTagRegex);
   const instructions: I18nInstruction[][] = [];
 
   generateMappingInstructions(
-      0, translationParts, instructions, elements, expressions, tmplContainers, lastChildIndex);
+      0, translationParts, instructions, elements, expressions, templateRoots, lastChildIndex);
 
   return instructions;
 }
@@ -96,8 +98,8 @@ export function i18nMapping(
  * their indexes.
  * @param expressions An array containing, for each template, the maps of expression placeholders
  * and their indexes.
- * @param tmplContainers An array of template container placeholders whose content should be ignored
- * when generating the instructions for their parent template.
+ * @param templateRoots An array of template roots whose content should be ignored when
+ * generating the instructions for their parent template.
  * @param lastChildIndex The index of the last child of the i18n node. Used when the i18n block is
  * an ng-container.
  * @returns the current index in `translationParts`
@@ -105,12 +107,16 @@ export function i18nMapping(
 function generateMappingInstructions(
     index: number, translationParts: string[], instructions: I18nInstruction[][],
     elements: (PlaceholderMap | null)[] | null, expressions?: (PlaceholderMap | null)[] | null,
-    tmplContainers?: string[] | null, lastChildIndex?: number | null): number {
+    templateRoots?: string[] | null, lastChildIndex?: number | null): number {
   const tmplIndex = instructions.length;
   const tmplInstructions: I18nInstruction[] = [];
-  const phVisited = [];
+  const phVisited: string[] = [];
   let openedTagCount = 0;
   let maxIndex = 0;
+  let currentElements: PlaceholderMap|null =
+      elements && elements[tmplIndex] ? elements[tmplIndex] : null;
+  let currentExpressions: PlaceholderMap|null =
+      expressions && expressions[tmplIndex] ? expressions[tmplIndex] : null;
 
   instructions.push(tmplInstructions);
 
@@ -120,22 +126,27 @@ function generateMappingInstructions(
     // Odd indexes are placeholders
     if (index & 1) {
       let phIndex;
-
-      if (elements && elements[tmplIndex] &&
-          typeof(phIndex = elements[tmplIndex] ![value]) !== 'undefined') {
+      if (currentElements && currentElements[value] !== undefined) {
+        phIndex = currentElements[value];
         // The placeholder represents a DOM element
         // Add an instruction to move the element
-        tmplInstructions.push(phIndex | I18nInstructions.Element);
+        const isTemplateRoot = templateRoots && templateRoots[tmplIndex] === value;
+        if (isTemplateRoot) {
+          // This is a template root, it has no closing tag, not treating it as an element
+          tmplInstructions.push(phIndex | I18nInstructions.TemplateRoot);
+        } else {
+          tmplInstructions.push(phIndex | I18nInstructions.Element);
+          openedTagCount++;
+        }
         phVisited.push(value);
-        openedTagCount++;
-      } else if (
-          expressions && expressions[tmplIndex] &&
-          typeof(phIndex = expressions[tmplIndex] ![value]) !== 'undefined') {
+      } else if (currentExpressions && currentExpressions[value] !== undefined) {
+        phIndex = currentExpressions[value];
         // The placeholder represents an expression
         // Add an instruction to move the expression
         tmplInstructions.push(phIndex | I18nInstructions.Expression);
         phVisited.push(value);
-      } else {  // It is a closing tag
+      } else {
+        // It is a closing tag
         tmplInstructions.push(I18nInstructions.CloseNode);
 
         if (tmplIndex > 0) {
@@ -148,14 +159,14 @@ function generateMappingInstructions(
         }
       }
 
-      if (typeof phIndex !== 'undefined' && phIndex > maxIndex) {
+      if (phIndex !== undefined && phIndex > maxIndex) {
         maxIndex = phIndex;
       }
 
-      if (tmplContainers && tmplContainers.indexOf(value) !== -1 &&
-          tmplContainers.indexOf(value) >= tmplIndex) {
+      if (templateRoots && templateRoots.indexOf(value) !== -1 &&
+          templateRoots.indexOf(value) >= tmplIndex) {
         index = generateMappingInstructions(
-            index, translationParts, instructions, elements, expressions, tmplContainers,
+            index, translationParts, instructions, elements, expressions, templateRoots,
             lastChildIndex);
       }
 
@@ -165,7 +176,7 @@ function generateMappingInstructions(
     }
   }
 
-  // Check if some elements from the template are missing from the translation
+  // Add instructions to remove elements that are not used in the translation
   if (elements) {
     const tmplElements = elements[tmplIndex];
 
@@ -188,7 +199,7 @@ function generateMappingInstructions(
     }
   }
 
-  // Check if some expressions from the template are missing from the translation
+  // Add instructions to remove expressions that are not used in the translation
   if (expressions) {
     const tmplExpressions = expressions[tmplIndex];
 
@@ -222,9 +233,7 @@ function generateMappingInstructions(
       if (ngDevMode) {
         assertLessThan(i.toString(2).length, 28, `Index ${i} is too big and will overflow`);
       }
-      // We consider those additional placeholders as expressions because we don't care about
-      // their children, all we need to do is to append them
-      tmplInstructions.push(i | I18nInstructions.Expression);
+      tmplInstructions.push(i | I18nInstructions.Any);
     }
   }
 
@@ -258,8 +267,6 @@ function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
 
   // Template containers also have a comment node for the `ViewContainerRef` that should be moved
   if (node.tNode.type === TNodeType.Container && node.dynamicLContainerNode) {
-    // (node.native as RComment).textContent = 'test';
-    // console.log(node.native);
     appendChild(parentNode, node.dynamicLContainerNode.native || null, viewData);
     if (firstTemplatePass) {
       node.tNode.dynamicContainerNode = node.dynamicLContainerNode.tNode;
@@ -302,8 +309,10 @@ export function i18nApply(startIndex: number, instructions: I18nInstruction[]):
         localParentNode = element;
         break;
       case I18nInstructions.Expression:
-        const expr: LNode = load(instruction & I18nInstructions.IndexMask);
-        localPreviousNode = appendI18nNode(expr, localParentNode, localPreviousNode);
+      case I18nInstructions.TemplateRoot:
+      case I18nInstructions.Any:
+        const node: LNode = load(instruction & I18nInstructions.IndexMask);
+        localPreviousNode = appendI18nNode(node, localParentNode, localPreviousNode);
         break;
       case I18nInstructions.Text:
         if (ngDevMode) {
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index b3cc3a957f..d5709c2bd4 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -9,8 +9,8 @@
 import {NgForOfContext} from '@angular/common';
 import {Component} from '../../src/core';
 import {defineComponent} from '../../src/render3/definition';
-import {i18nApply, i18nExpMapping, i18nInterpolation, i18nInterpolationV, i18nMapping} from '../../src/render3/i18n';
-import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
+import {I18nExpInstruction, I18nInstruction, i18nApply, i18nExpMapping, i18nInterpolation, i18nInterpolationV, i18nMapping} from '../../src/render3/i18n';
+import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {NgForOf} from './common_with_def';
 import {ComponentFixture, TemplateFixture} from './render_util';
@@ -21,8 +21,7 @@ describe('Runtime i18n', () => {
     // Open tag placeholders are never re-used (closing tag placeholders can be).
     const MSG_DIV_SECTION_1 =
         `{$START_C}trad 1{$END_C}{$START_A}trad 2{$START_B}trad 3{$END_B}{$END_A}`;
-    const i18n_1 =
-        i18nMapping(MSG_DIV_SECTION_1, [{START_A: 1, START_B: 2, START_REMOVE_ME: 3, START_C: 4}]);
+    let i18n_1: I18nInstruction[][];
     // Initial template:
     // <div i18n>
     //  <a>
@@ -41,20 +40,22 @@ describe('Runtime i18n', () => {
     //  </a>
     // </div>
     function createTemplate() {
+      if (!i18n_1) {
+        i18n_1 = i18nMapping(
+            MSG_DIV_SECTION_1, [{'START_A': 1, 'START_B': 2, 'START_REMOVE_ME': 3, 'START_C': 4}]);
+      }
+
       elementStart(0, 'div');
       {  // Start of translated section 1
         // - i18n sections do not contain any text() instruction
         elementStart(1, 'a');  // START_A
         {
-          elementStart(2, 'b');  // START_B
-          elementEnd();
-          elementStart(3, 'remove-me');  // START_REMOVE_ME
-          elementEnd();
+          element(2, 'b');          // START_B
+          element(3, 'remove-me');  // START_REMOVE_ME
         }
         elementEnd();
-        elementStart(4, 'c');  // START_C
-        elementEnd();
-      }  // End of translated section 1
+        element(4, 'c');  // START_C
+      }                   // End of translated section 1
       elementEnd();
       i18nApply(1, i18n_1[0]);
     }
@@ -65,7 +66,7 @@ describe('Runtime i18n', () => {
 
   it('should support expressions', () => {
     const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
-    const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 1, EXP_2: 2}]);
+    let i18n_1: I18nInstruction[][];
 
     class MyApp {
       exp1 = '1';
@@ -86,6 +87,10 @@ describe('Runtime i18n', () => {
         // </div>
         template: (rf: RenderFlags, ctx: MyApp) => {
           if (rf & RenderFlags.Create) {
+            if (!i18n_1) {
+              i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{'EXP_1': 1, 'EXP_2': 2}]);
+            }
+
             elementStart(0, 'div');
             {
               // Start of translated section 1
@@ -121,7 +126,7 @@ describe('Runtime i18n', () => {
 
   it('should support expressions on removed nodes', () => {
     const MSG_DIV_SECTION_1 = `message`;
-    const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 1}]);
+    let i18n_1: I18nInstruction[][];
 
     class MyApp {
       exp1 = '1';
@@ -141,6 +146,10 @@ describe('Runtime i18n', () => {
         // </div>
         template: (rf: RenderFlags, ctx: MyApp) => {
           if (rf & RenderFlags.Create) {
+            if (!i18n_1) {
+              i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{'EXP_1': 1}]);
+            }
+
             elementStart(0, 'div');
             {
               // Start of translated section 1
@@ -172,7 +181,7 @@ describe('Runtime i18n', () => {
 
   it('should support expressions in attributes', () => {
     const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
-    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {EXP_1: 0, EXP_2: 1});
+    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1});
 
     class MyApp {
       exp1: any = '1';
@@ -189,10 +198,7 @@ describe('Runtime i18n', () => {
         // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end"></div>
         template: (rf: RenderFlags, ctx: MyApp) => {
           if (rf & RenderFlags.Create) {
-            elementStart(0, 'div');
-            // Start of translated section 1
-            // End of translated section 1
-            elementEnd();
+            element(0, 'div');  // translated section 1
           }
           if (rf & RenderFlags.Update) {
             elementProperty(0, 'title', i18nInterpolation(i18n_1, 2, ctx.exp1, ctx.exp2));
@@ -218,11 +224,8 @@ describe('Runtime i18n', () => {
   it('should support both html elements, expressions and expressions in attributes', () => {
     const MSG_DIV_SECTION_1 = `{$EXP_1} {$START_P}trad {$EXP_2}{$END_P}`;
     const MSG_ATTR_1 = `start {$EXP_2} middle {$EXP_1} end`;
-    const i18n_1 = i18nMapping(
-        MSG_DIV_SECTION_1,
-        [{START_REMOVE_ME_1: 2, START_REMOVE_ME_2: 3, START_REMOVE_ME_3: 4, START_P: 5}],
-        [{EXP_1: 1, EXP_2: 6, EXP_3: 7}]);
-    const i18n_2 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0, EXP_2: 1});
+    let i18n_1: I18nInstruction[][];
+    let i18n_2: I18nExpInstruction[];
 
     class MyApp {
       exp1 = '1';
@@ -255,16 +258,28 @@ describe('Runtime i18n', () => {
         // </div>
         template: (rf: RenderFlags, ctx: MyApp) => {
           if (rf & RenderFlags.Create) {
+            if (!i18n_1) {
+              i18n_1 = i18nMapping(
+                  MSG_DIV_SECTION_1, [{
+                    'START_REMOVE_ME_1': 2,
+                    'START_REMOVE_ME_2': 3,
+                    'START_REMOVE_ME_3': 4,
+                    'START_P': 5
+                  }],
+                  [{'EXP_1': 1, 'EXP_2': 6, 'EXP_3': 7}]);
+            }
+            if (!i18n_2) {
+              i18n_2 = i18nExpMapping(MSG_ATTR_1, {'EXP_1': 0, 'EXP_2': 1});
+            }
+
             elementStart(0, 'div');
             {
               // Start of translated section 1
               text(1);                         // EXP_1
               elementStart(2, 'remove-me-1');  // START_REMOVE_ME_1
               {
-                elementStart(3, 'remove-me-2');  // START_REMOVE_ME_2
-                elementEnd();
-                elementStart(4, 'remove-me-3');  // START_REMOVE_ME_3
-                elementEnd();
+                element(3, 'remove-me-2');  // START_REMOVE_ME_2
+                element(4, 'remove-me-3');  // START_REMOVE_ME_3
               }
               elementEnd();
               elementStart(5, 'p');  // START_P
@@ -305,9 +320,9 @@ describe('Runtime i18n', () => {
     const MSG_DIV_SECTION_1 = `trad {$EXP_1}`;
     const MSG_DIV_SECTION_2 = `{$START_C}trad{$END_C}`;
     const MSG_ATTR_1 = `start {$EXP_2} middle {$EXP_1} end`;
-    const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 2}]);
-    const i18n_2 = i18nMapping(MSG_DIV_SECTION_2, [{START_C: 5}]);
-    const i18n_3 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0, EXP_2: 1});
+    let i18n_1: I18nInstruction[][];
+    let i18n_2: I18nInstruction[][];
+    let i18n_3: I18nExpInstruction[];
 
     class MyApp {
       exp1 = '1';
@@ -340,6 +355,16 @@ describe('Runtime i18n', () => {
         // </div>
         template: (rf: RenderFlags, ctx: MyApp) => {
           if (rf & RenderFlags.Create) {
+            if (!i18n_1) {
+              i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{'EXP_1': 2}]);
+            }
+            if (!i18n_2) {
+              i18n_2 = i18nMapping(MSG_DIV_SECTION_2, [{'START_C': 5}]);
+            }
+            if (!i18n_3) {
+              i18n_3 = i18nExpMapping(MSG_ATTR_1, {'EXP_1': 0, 'EXP_2': 1});
+            }
+
             elementStart(0, 'div');
             {
               elementStart(1, 'a');
@@ -353,8 +378,7 @@ describe('Runtime i18n', () => {
               elementStart(4, 'b');
               {
                 // Start of translated section 2
-                elementStart(5, 'c');  // START_C
-                elementEnd();
+                element(5, 'c');  // START_C
                 // End of translated section 2
               }
               elementEnd();
@@ -393,7 +417,7 @@ describe('Runtime i18n', () => {
     it('should support containers', () => {
       const MSG_DIV_SECTION_1 = `valeur: {$EXP_1}`;
       // The indexes are based on the main template function
-      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 0}]);
+      let i18n_1: I18nInstruction[][];
 
       class MyApp {
         exp1 = '1';
@@ -417,6 +441,10 @@ describe('Runtime i18n', () => {
           // ) after
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{'EXP_1': 0}]);
+              }
+
               text(0, 'before (');
               container(1);
               text(2, ') after');
@@ -456,7 +484,7 @@ describe('Runtime i18n', () => {
       // its children are not the only children of their parent, some nodes which are not
       // translated might also be the children of the same parent.
       // This is why we need to pass the `lastChildIndex` to `i18nMapping`
-      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{START_B: 2, START_C: 3}], null, null, 4);
+      let i18n_1: I18nInstruction[][];
       // Initial template:
       // <div i18n>
       //  <a></a>
@@ -476,20 +504,20 @@ describe('Runtime i18n', () => {
       //  <d></d>
       // </div>
       function createTemplate() {
+        if (!i18n_1) {
+          i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{'START_B': 2, 'START_C': 3}], null, null, 4);
+        }
+
         elementStart(0, 'div');
         {
-          elementStart(1, 'a');
-          elementEnd();
+          element(1, 'a');
           {
             // Start of translated section 1
-            elementStart(2, 'b');  // START_B
-            elementEnd();
-            elementStart(3, 'c');  // START_C
-            elementEnd();
+            element(2, 'b');  // START_B
+            element(3, 'c');  // START_C
             // End of translated section 1
           }
-          elementStart(4, 'd');
-          elementEnd();
+          element(4, 'd');
         }
         elementEnd();
         i18nApply(2, i18n_1[0]);
@@ -502,8 +530,7 @@ describe('Runtime i18n', () => {
     it('should support embedded templates', () => {
       const MSG_DIV_SECTION_1 = `{$START_LI}valeur: {$EXP_1}!{$END_LI}`;
       // The indexes are based on each template function
-      const i18n_1 = i18nMapping(
-          MSG_DIV_SECTION_1, [{START_LI: 1}, {START_LI: 0}], [null, {EXP_1: 1}], ['START_LI']);
+      let i18n_1: I18nInstruction[][];
       class MyApp {
         items: string[] = ['1', '2'];
 
@@ -522,6 +549,12 @@ describe('Runtime i18n', () => {
           // </ul>
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1, [{'START_LI': 1}, {'START_LI': 0}], [null, {'EXP_1': 1}],
+                    ['START_LI']);
+              }
+
               elementStart(0, 'ul');
               {
                 // Start of translated section 1
@@ -581,9 +614,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV_SECTION_1 =
           `{$START_LI_0}valeur: {$EXP_1}!{$END_LI_0}{$START_LI_1}valeur bis: {$EXP_2}!{$END_LI_1}`;
       // The indexes are based on each template function
-      const i18n_1 = i18nMapping(
-          MSG_DIV_SECTION_1, [null, {START_LI_0: 0}, {START_LI_1: 0}],
-          [{START_LI_0: 1, START_LI_1: 2}, {EXP_1: 1}, {EXP_2: 1}], ['START_LI_0', 'START_LI_1']);
+      let i18n_1: I18nInstruction[][];
       class MyApp {
         items: string[] = ['1', '2'];
 
@@ -604,6 +635,13 @@ describe('Runtime i18n', () => {
           // </ul>
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1,
+                    [{'START_LI_0': 1, 'START_LI_1': 2}, {'START_LI_0': 0}, {'START_LI_1': 0}],
+                    [null, {'EXP_1': 1}, {'EXP_2': 1}], ['START_LI_0', 'START_LI_1']);
+              }
+
               elementStart(0, 'ul');
               {
                 // Start of translated section 1
@@ -685,9 +723,7 @@ describe('Runtime i18n', () => {
     it('should support nested embedded templates', () => {
       const MSG_DIV_SECTION_1 = `{$START_LI}{$START_SPAN}valeur: {$EXP_1}!{$END_SPAN}{$END_LI}`;
       // The indexes are based on each template function
-      const i18n_1 = i18nMapping(
-          MSG_DIV_SECTION_1, [null, {START_LI: 0}, {START_SPAN: 0}],
-          [{START_LI: 1}, {START_SPAN: 1}, {EXP_1: 1}], ['START_LI', 'START_SPAN']);
+      let i18n_1: I18nInstruction[][];
       class MyApp {
         items: string[] = ['1', '2'];
 
@@ -710,6 +746,13 @@ describe('Runtime i18n', () => {
           // </ul>
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1,
+                    [{'START_LI': 1}, {'START_LI': 0, 'START_SPAN': 1}, {'START_SPAN': 0}],
+                    [null, null, {'EXP_1': 1}], ['START_LI', 'START_SPAN']);
+              }
+
               elementStart(0, 'ul');
               {
                 // Start of translated section 1
@@ -792,9 +835,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV_SECTION_1 =
           `{$START_LI_0}début{$END_LI_0}{$START_LI_1}valeur: {$EXP_1}{$END_LI_1}fin`;
       // The indexes are based on each template function
-      const i18n_1 = i18nMapping(
-          MSG_DIV_SECTION_1, [{START_LI_0: 1, START_LI_2: 3}, {START_LI_1: 0}],
-          [{START_LI_1: 2}, {EXP_1: 1}], ['START_LI_1']);
+      let i18n_1: I18nInstruction[][];
 
       class MyApp {
         items: string[] = ['first', 'second'];
@@ -818,11 +859,17 @@ describe('Runtime i18n', () => {
           // </ul>
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1,
+                    [{'START_LI_0': 1, 'START_LI_1': 2, 'START_LI_2': 3}, {'START_LI_1': 0}],
+                    [null, {'EXP_1': 1}], ['START_LI_1']);
+              }
+
               elementStart(0, 'ul');
               {
                 // Start of translated section 1
-                elementStart(1, 'li');  // START_LI_0
-                elementEnd();
+                element(1, 'li');                                 // START_LI_0
                 container(2, liTemplate, null, ['ngForOf', '']);  // START_LI_1
                 elementStart(3, 'li');                            // START_LI_2
                 { text(4, 'delete me'); }
@@ -859,7 +906,7 @@ describe('Runtime i18n', () => {
       expect(fixture.html)
           .toEqual('<ul><li>début</li><li>valeur: first</li><li>valeur: second</li>fin</ul>');
 
-      // // Change detection cycle, no model changes
+      // Change detection cycle, no model changes
       fixture.update();
       expect(fixture.html)
           .toEqual('<ul><li>début</li><li>valeur: first</li><li>valeur: second</li>fin</ul>');
@@ -884,8 +931,7 @@ describe('Runtime i18n', () => {
     it('should be able to remove containers', () => {
       const MSG_DIV_SECTION_1 = `loop`;
       // The indexes are based on each template function
-      const i18n_1 = i18nMapping(
-          MSG_DIV_SECTION_1, [{START_LI: 1}, {START_LI: 0}], [null, {EXP_1: 1}], ['START_LI']);
+      let i18n_1: I18nInstruction[][];
 
       class MyApp {
         items: string[] = ['first', 'second'];
@@ -905,6 +951,12 @@ describe('Runtime i18n', () => {
           // </ul>
           template: (rf: RenderFlags, myApp: MyApp) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1, [{'START_LI': 1}, {'START_LI': 0}], [null, {'EXP_1': 1}],
+                    ['START_LI']);
+              }
+
               elementStart(0, 'ul');
               {
                 // Start of translated section 1
@@ -982,17 +1034,9 @@ describe('Runtime i18n', () => {
 
       const MSG_DIV_SECTION_1 =
           `{$START_CHILD}Je suis projeté depuis {$START_B}{$EXP_1}{$END_B}{$END_CHILD}`;
-      const i18n_1 = i18nMapping(
-          MSG_DIV_SECTION_1, [{
-            START_CHILD: 1,
-            START_B: 2,
-            START_REMOVE_ME_1: 4,
-            START_REMOVE_ME_2: 5,
-            START_REMOVE_ME_3: 6
-          }],
-          [{EXP_1: 3}]);
+      let i18n_1: I18nInstruction[][];
       const MSG_ATTR_1 = `Enfant de {$EXP_1}`;
-      const i18n_2 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0});
+      let i18n_2: I18nExpInstruction[];
 
       @Component({
         selector: 'parent',
@@ -1017,6 +1061,21 @@ describe('Runtime i18n', () => {
           factory: () => new Parent(),
           template: (rf: RenderFlags, cmp: Parent) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1, [{
+                      'START_CHILD': 1,
+                      'START_B': 2,
+                      'START_REMOVE_ME_1': 4,
+                      'START_REMOVE_ME_2': 5,
+                      'START_REMOVE_ME_3': 6
+                    }],
+                    [{'EXP_1': 3}]);
+              }
+              if (!i18n_2) {
+                i18n_2 = i18nExpMapping(MSG_ATTR_1, {'EXP_1': 0});
+              }
+
               elementStart(0, 'div');
               {
                 // Start of translated section 1
@@ -1024,17 +1083,14 @@ describe('Runtime i18n', () => {
                 {
                   elementStart(2, 'b');  // START_B
                   {
-                    text(3);                         // EXP_1
-                    elementStart(4, 'remove-me-1');  // START_REMOVE_ME_1
-                    elementEnd();
+                    text(3);                    // EXP_1
+                    element(4, 'remove-me-1');  // START_REMOVE_ME_1
                   }
                   elementEnd();
-                  elementStart(5, 'remove-me-2');  // START_REMOVE_ME_2
-                  elementEnd();
+                  element(5, 'remove-me-2');  // START_REMOVE_ME_2
                 }
                 elementEnd();
-                elementStart(6, 'remove-me-3');  // START_REMOVE_ME_3
-                elementEnd();
+                element(6, 'remove-me-3');  // START_REMOVE_ME_3
                 // End of translated section 1
               }
               elementEnd();
@@ -1073,9 +1129,9 @@ describe('Runtime i18n', () => {
       }
 
       const MSG_DIV_SECTION_1 = `Je suis projeté depuis {$EXP_1}`;
-      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{EXP_1: 4}]);
+      let i18n_1: I18nInstruction[][];
       const MSG_ATTR_1 = `Enfant de {$EXP_1}`;
-      const i18n_2 = i18nExpMapping(MSG_ATTR_1, {EXP_1: 0});
+      let i18n_2: I18nExpInstruction[];
 
       @Component({
         selector: 'parent',
@@ -1101,12 +1157,18 @@ describe('Runtime i18n', () => {
           factory: () => new Parent(),
           template: (rf: RenderFlags, cmp: Parent) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(MSG_DIV_SECTION_1, null, [{'EXP_1': 4}]);
+              }
+              if (!i18n_2) {
+                i18n_2 = i18nExpMapping(MSG_ATTR_1, {'EXP_1': 0});
+              }
+
               elementStart(0, 'div');
               {
                 elementStart(1, 'child');
                 {
-                  elementStart(2, 'any');
-                  elementEnd();
+                  element(2, 'any');
                   elementStart(3, 'b');
                   {
                     // Start of translated section 1
@@ -1114,8 +1176,7 @@ describe('Runtime i18n', () => {
                     // End of translated section 1
                   }
                   elementEnd();
-                  elementStart(5, 'any');
-                  elementEnd();
+                  element(5, 'any');
                 }
                 elementEnd();
               }
@@ -1174,7 +1235,7 @@ describe('Runtime i18n', () => {
       }
 
       const MSG_DIV_SECTION_1 = `{$START_B}Bonjour{$END_B} Monde!`;
-      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{START_B: 1}]);
+      let i18n_1: I18nInstruction[][];
 
       @Component({
         selector: 'parent',
@@ -1191,11 +1252,14 @@ describe('Runtime i18n', () => {
           factory: () => new Parent(),
           template: (rf: RenderFlags, cmp: Parent) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{'START_B': 1}]);
+              }
+
               elementStart(0, 'child');
               {
                 // Start of translated section 1
-                elementStart(1, 'b');  // START_B
-                elementEnd();
+                element(1, 'b');  // START_B
                 // End of translated section 1
               }
               elementEnd();
@@ -1232,7 +1296,7 @@ describe('Runtime i18n', () => {
       }
 
       const MSG_DIV_SECTION_1 = `{$START_SPAN_0}Contenu{$END_SPAN_0}`;
-      const i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{START_SPAN_0: 1, START_SPAN_1: 2}]);
+      let i18n_1: I18nInstruction[][];
 
       @Component({
         selector: 'parent',
@@ -1253,13 +1317,15 @@ describe('Runtime i18n', () => {
           factory: () => new Parent(),
           template: (rf: RenderFlags, cmp: Parent) => {
             if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(MSG_DIV_SECTION_1, [{'START_SPAN_0': 1, 'START_SPAN_1': 2}]);
+              }
+
               elementStart(0, 'child');
               {
                 // Start of translated section 1
-                elementStart(1, 'span', ['title', 'keepMe']);  // START_SPAN_0
-                elementEnd();
-                elementStart(2, 'span', ['title', 'deleteMe']);  // START_SPAN_1
-                elementEnd();
+                element(1, 'span', ['title', 'keepMe']);    // START_SPAN_0
+                element(2, 'span', ['title', 'deleteMe']);  // START_SPAN_1
                 // End of translated section 1
               }
               elementEnd();
@@ -1276,7 +1342,7 @@ describe('Runtime i18n', () => {
 
   it('i18nInterpolation should return the same value as i18nInterpolationV', () => {
     const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
-    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {EXP_1: 0, EXP_2: 1});
+    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1});
     let interpolation;
     let interpolationV;
 
@@ -1295,10 +1361,7 @@ describe('Runtime i18n', () => {
         // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end"></div>
         template: (rf: RenderFlags, ctx: MyApp) => {
           if (rf & RenderFlags.Create) {
-            elementStart(0, 'div');
-            // Start of translated section 1
-            // End of translated section 1
-            elementEnd();
+            element(0, 'div');  // translated section 1
           }
           if (rf & RenderFlags.Update) {
             interpolation = i18nInterpolation(i18n_1, 2, ctx.exp1, ctx.exp2);

From 22731a7588d771ac2fe5f351007e1939b61ff7fc Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Thu, 19 Jul 2018 11:02:22 +0200
Subject: [PATCH 556/582] refactor(ivy): split i18nInterpolation into 8
 functions (#24805)

PR Close #24805
---
 .../core/src/core_render3_private_export.ts   |   9 +-
 packages/core/src/render3/i18n.ts             | 372 +++++++++++++++---
 packages/core/src/render3/index.ts            |  11 +-
 packages/core/src/render3/instructions.ts     |   2 +-
 .../render3/compiler_canonical/i18n_spec.ts   |   2 +-
 packages/core/test/render3/i18n_spec.ts       | 320 +++++++++++++--
 6 files changed, 614 insertions(+), 102 deletions(-)

diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index c88234bda0..8107ad315f 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -94,7 +94,14 @@ export {
   whenRendered as ɵwhenRendered,
   iA as ɵiA,
   iEM as ɵiEM,
-  iI as ɵiI,
+  iI1 as ɵiI1,
+  iI2 as ɵiI2,
+  iI3 as ɵiI3,
+  iI4 as ɵiI4,
+  iI5 as ɵiI5,
+  iI6 as ɵiI6,
+  iI7 as ɵiI7,
+  iI8 as ɵiI8,
   iIV as ɵIV,
   iM as ɵiM,
   I18nInstruction as ɵI18nInstruction,
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 279c8d5b37..6c64793290 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -7,7 +7,7 @@
  */
 
 import {assertEqual, assertLessThan} from './assert';
-import {NO_CHANGE, bindingUpdated, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load, resetApplicationState} from './instructions';
+import {NO_CHANGE, bindingUpdated, bindingUpdated2, bindingUpdated4, createLNode, getPreviousOrParentNode, getRenderer, getViewData, load, resetApplicationState} from './instructions';
 import {RENDER_PARENT} from './interfaces/container';
 import {LContainerNode, LNode, TContainerNode, TElementNode, TNodeType} from './interfaces/node';
 import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
@@ -369,43 +369,16 @@ export function i18nExpMapping(
 }
 
 /**
- * Checks if the value of up to 8 expressions have changed and replaces them by their values in a
- * translation, or returns NO_CHANGE.
+ * Checks if the value of an expression has changed and replaces it by its value in a translation,
+ * or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
  *
  * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
  */
-export function i18nInterpolation(
-    instructions: I18nExpInstruction[], numberOfExp: number, v0: any, v1?: any, v2?: any, v3?: any,
-    v4?: any, v5?: any, v6?: any, v7?: any): string|NO_CHANGE {
-  let different = bindingUpdated(v0);
-
-  if (numberOfExp > 1) {
-    different = bindingUpdated(v1) || different;
-
-    if (numberOfExp > 2) {
-      different = bindingUpdated(v2) || different;
-
-      if (numberOfExp > 3) {
-        different = bindingUpdated(v3) || different;
-
-        if (numberOfExp > 4) {
-          different = bindingUpdated(v4) || different;
-
-          if (numberOfExp > 5) {
-            different = bindingUpdated(v5) || different;
-
-            if (numberOfExp > 6) {
-              different = bindingUpdated(v6) || different;
-
-              if (numberOfExp > 7) {
-                different = bindingUpdated(v7) || different;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
+export function i18nInterpolation1(instructions: I18nExpInstruction[], v0: any): string|NO_CHANGE {
+  const different = bindingUpdated(v0);
 
   if (!different) {
     return NO_CHANGE;
@@ -413,35 +386,308 @@ export function i18nInterpolation(
 
   let res = '';
   for (let i = 0; i < instructions.length; i++) {
-    let value: any;
-    // Odd indexes are placeholders
+    // Odd indexes are bindings
     if (i & 1) {
-      switch (instructions[i]) {
-        case 0:
-          value = v0;
-          break;
-        case 1:
-          value = v1;
-          break;
-        case 2:
-          value = v2;
-          break;
-        case 3:
-          value = v3;
-          break;
-        case 4:
-          value = v4;
-          break;
-        case 5:
-          value = v5;
-          break;
-        case 6:
-          value = v6;
-          break;
-        case 7:
-          value = v7;
-          break;
-      }
+      res += stringify(v0);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 2 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation2(instructions: I18nExpInstruction[], v0: any, v1: any): string|
+    NO_CHANGE {
+  const different = bindingUpdated2(v0, v1);
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value = b1 ? v1 : v0;
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 3 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ * @param v2 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation3(
+    instructions: I18nExpInstruction[], v0: any, v1: any, v2: any): string|NO_CHANGE {
+  let different = bindingUpdated2(v0, v1);
+  different = bindingUpdated(v2) || different;
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b2 = idx & 2;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value = b2 ? v2 : (b1 ? v1 : v0);
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 4 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ * @param v2 value checked for change.
+ * @param v3 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation4(
+    instructions: I18nExpInstruction[], v0: any, v1: any, v2: any, v3: any): string|NO_CHANGE {
+  const different = bindingUpdated4(v0, v1, v2, v3);
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b2 = idx & 2;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value = b2 ? (b1 ? v3 : v2) : (b1 ? v1 : v0);
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 5 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ * @param v2 value checked for change.
+ * @param v3 value checked for change.
+ * @param v4 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation5(
+    instructions: I18nExpInstruction[], v0: any, v1: any, v2: any, v3: any, v4: any): string|
+    NO_CHANGE {
+  let different = bindingUpdated4(v0, v1, v2, v3);
+  different = bindingUpdated(v4) || different;
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b4 = idx & 4;
+      const b2 = idx & 2;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value = b4 ? v4 : (b2 ? (b1 ? v3 : v2) : (b1 ? v1 : v0));
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 6 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ * @param v2 value checked for change.
+ * @param v3 value checked for change.
+ * @param v4 value checked for change.
+ * @param v5 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */ export function
+i18nInterpolation6(
+    instructions: I18nExpInstruction[], v0: any, v1: any, v2: any, v3: any, v4: any, v5: any):
+    string|NO_CHANGE {
+  let different = bindingUpdated4(v0, v1, v2, v3);
+  different = bindingUpdated2(v4, v5) || different;
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b4 = idx & 4;
+      const b2 = idx & 2;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value = b4 ? (b1 ? v5 : v4) : (b2 ? (b1 ? v3 : v2) : (b1 ? v1 : v0));
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 7 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ * @param v2 value checked for change.
+ * @param v3 value checked for change.
+ * @param v4 value checked for change.
+ * @param v5 value checked for change.
+ * @param v6 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation7(
+    instructions: I18nExpInstruction[], v0: any, v1: any, v2: any, v3: any, v4: any, v5: any,
+    v6: any): string|NO_CHANGE {
+  let different = bindingUpdated4(v0, v1, v2, v3);
+  different = bindingUpdated2(v4, v5) || different;
+  different = bindingUpdated(v6) || different;
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b4 = idx & 4;
+      const b2 = idx & 2;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value = b4 ? (b2 ? v6 : (b1 ? v5 : v4)) : (b2 ? (b1 ? v3 : v2) : (b1 ? v1 : v0));
+
+      res += stringify(value);
+    } else {
+      res += instructions[i];
+    }
+  }
+
+  return res;
+}
+
+/**
+ * Checks if the values of up to 8 expressions have changed and replaces them by their values in a
+ * translation, or returns NO_CHANGE.
+ *
+ * @param instructions A list of instructions that will be used to translate an attribute.
+ * @param v0 value checked for change.
+ * @param v1 value checked for change.
+ * @param v2 value checked for change.
+ * @param v3 value checked for change.
+ * @param v4 value checked for change.
+ * @param v5 value checked for change.
+ * @param v6 value checked for change.
+ * @param v7 value checked for change.
+ *
+ * @returns The concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ */
+export function i18nInterpolation8(
+    instructions: I18nExpInstruction[], v0: any, v1: any, v2: any, v3: any, v4: any, v5: any,
+    v6: any, v7: any): string|NO_CHANGE {
+  let different = bindingUpdated4(v0, v1, v2, v3);
+  different = bindingUpdated4(v4, v5, v6, v7) || different;
+
+  if (!different) {
+    return NO_CHANGE;
+  }
+
+  let res = '';
+  for (let i = 0; i < instructions.length; i++) {
+    // Odd indexes are bindings
+    if (i & 1) {
+      // Extract bits
+      const idx = instructions[i] as number;
+      const b4 = idx & 4;
+      const b2 = idx & 2;
+      const b1 = idx & 1;
+      // Get the value from the argument vx where x = idx
+      const value =
+          b4 ? (b2 ? (b1 ? v7 : v6) : (b1 ? v5 : v4)) : (b2 ? (b1 ? v3 : v2) : (b1 ? v1 : v0));
 
       res += stringify(value);
     } else {
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 014a092e66..70ba550eb3 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -11,7 +11,7 @@ import {defineComponent, defineDirective, defineNgModule, definePipe} from './de
 import {InheritDefinitionFeature} from './features/inherit_definition_feature';
 import {NgOnChangesFeature} from './features/ng_onchanges_feature';
 import {PublicFeature} from './features/public_feature';
-import {I18nExpInstruction, I18nInstruction, i18nExpMapping, i18nInterpolation, i18nInterpolationV} from './i18n';
+import {I18nExpInstruction, I18nInstruction, i18nExpMapping, i18nInterpolation1, i18nInterpolation2, i18nInterpolation3, i18nInterpolation4, i18nInterpolation5, i18nInterpolation6, i18nInterpolation7, i18nInterpolation8, i18nInterpolationV} from './i18n';
 import {ComponentDef, ComponentDefInternal, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveDefInternal, DirectiveType, PipeDef} from './interfaces/definition';
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef} from './component_ref';
@@ -88,7 +88,14 @@ export {
 export {
   i18nApply as iA,
   i18nMapping as iM,
-  i18nInterpolation as iI,
+  i18nInterpolation1 as iI1,
+  i18nInterpolation2 as iI2,
+  i18nInterpolation3 as iI3,
+  i18nInterpolation4 as iI4,
+  i18nInterpolation5 as iI5,
+  i18nInterpolation6 as iI6,
+  i18nInterpolation7 as iI7,
+  i18nInterpolation8 as iI8,
   i18nInterpolationV as iIV,
   i18nExpMapping as iEM,
   I18nInstruction,
diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index 3b27b0d5d8..f99b34be06 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -2454,7 +2454,7 @@ export function interpolation2(
   return different ? prefix + stringify(v0) + i0 + stringify(v1) + suffix : NO_CHANGE;
 }
 
-/** Creates an interpolation bindings with 3 expressions. */
+/** Creates an interpolation binding with 3 expressions. */
 export function interpolation3(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string|
     NO_CHANGE {
diff --git a/packages/core/test/render3/compiler_canonical/i18n_spec.ts b/packages/core/test/render3/compiler_canonical/i18n_spec.ts
index 3811eb5c18..a27ddb89d2 100644
--- a/packages/core/test/render3/compiler_canonical/i18n_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/i18n_spec.ts
@@ -86,7 +86,7 @@ describe('i18n', () => {
             $r3$.ɵe();
           }
           if (rf & 2) {
-            $r3$.ɵp(0, 'title', $r3$.ɵiI($i18n_1$, 2, ctx.exp1));
+            $r3$.ɵp(0, 'title', $r3$.ɵiI1($i18n_1$, ctx.exp1));
           }
         }
       });
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index d5709c2bd4..d185583385 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -9,7 +9,7 @@
 import {NgForOfContext} from '@angular/common';
 import {Component} from '../../src/core';
 import {defineComponent} from '../../src/render3/definition';
-import {I18nExpInstruction, I18nInstruction, i18nApply, i18nExpMapping, i18nInterpolation, i18nInterpolationV, i18nMapping} from '../../src/render3/i18n';
+import {I18nExpInstruction, I18nInstruction, i18nApply, i18nExpMapping, i18nInterpolation1, i18nInterpolation2, i18nInterpolation3, i18nInterpolation4, i18nInterpolation5, i18nInterpolation6, i18nInterpolation7, i18nInterpolation8, i18nInterpolationV, i18nMapping} from '../../src/render3/i18n';
 import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, projection, projectionDef, text, textBinding} from '../../src/render3/instructions';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {NgForOf} from './common_with_def';
@@ -201,7 +201,7 @@ describe('Runtime i18n', () => {
             element(0, 'div');  // translated section 1
           }
           if (rf & RenderFlags.Update) {
-            elementProperty(0, 'title', i18nInterpolation(i18n_1, 2, ctx.exp1, ctx.exp2));
+            elementProperty(0, 'title', i18nInterpolation2(i18n_1, ctx.exp1, ctx.exp2));
           }
         }
       });
@@ -295,7 +295,7 @@ describe('Runtime i18n', () => {
             textBinding(1, bind(ctx.exp1));
             textBinding(6, bind(ctx.exp2));
             textBinding(7, bind(ctx.exp3));
-            elementProperty(0, 'title', i18nInterpolation(i18n_2, 2, ctx.exp1, ctx.exp2));
+            elementProperty(0, 'title', i18nInterpolation2(i18n_2, ctx.exp1, ctx.exp2));
           }
         }
       });
@@ -389,7 +389,7 @@ describe('Runtime i18n', () => {
           }
           if (rf & RenderFlags.Update) {
             textBinding(2, bind(ctx.exp1));
-            elementProperty(4, 'title', i18nInterpolation(i18n_3, 2, ctx.exp1, ctx.exp2));
+            elementProperty(4, 'title', i18nInterpolation2(i18n_3, ctx.exp1, ctx.exp2));
           }
         }
       });
@@ -1097,7 +1097,7 @@ describe('Runtime i18n', () => {
               i18nApply(1, i18n_1[0]);
             }
             if (rf & RenderFlags.Update) {
-              elementProperty(2, 'title', i18nInterpolation(i18n_2, 1, cmp.name));
+              elementProperty(2, 'title', i18nInterpolation1(i18n_2, cmp.name));
               textBinding(3, bind(cmp.name));
             }
           }
@@ -1184,7 +1184,7 @@ describe('Runtime i18n', () => {
               i18nApply(4, i18n_1[0]);
             }
             if (rf & RenderFlags.Update) {
-              elementProperty(3, 'title', i18nInterpolation(i18n_2, 1, cmp.name));
+              elementProperty(3, 'title', i18nInterpolation1(i18n_2, cmp.name));
               textBinding(4, bind(cmp.name));
             }
           }
@@ -1340,40 +1340,292 @@ describe('Runtime i18n', () => {
     });
   });
 
-  it('i18nInterpolation should return the same value as i18nInterpolationV', () => {
-    const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
-    const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1});
-    let interpolation;
-    let interpolationV;
+  describe('i18nInterpolation', () => {
+    it('i18nInterpolation should return the same value as i18nInterpolationV', () => {
+      const MSG_DIV_SECTION_1 = `start {$EXP_2} middle {$EXP_1} end`;
+      const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1});
+      let interpolation;
+      let interpolationV;
 
-    class MyApp {
-      exp1: any = '1';
-      exp2: any = '2';
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
 
-      static ngComponentDef = defineComponent({
-        type: MyApp,
-        factory: () => new MyApp(),
-        selectors: [['my-app']],
-        // Initial template:
-        // <div i18n i18n-title title="{{exp1}}{{exp2}}"></div>
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title title="{{exp1}}{{exp2}}"></div>
 
-        // Translated to:
-        // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end"></div>
-        template: (rf: RenderFlags, ctx: MyApp) => {
-          if (rf & RenderFlags.Create) {
-            element(0, 'div');  // translated section 1
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              interpolation = i18nInterpolation2(i18n_1, ctx.exp1, ctx.exp2);
+              interpolationV = i18nInterpolationV(i18n_1, [ctx.exp1, ctx.exp2]);
+              elementProperty(0, 'title', interpolation);
+            }
           }
-          if (rf & RenderFlags.Update) {
-            interpolation = i18nInterpolation(i18n_1, 2, ctx.exp1, ctx.exp2);
-            interpolationV = i18nInterpolationV(i18n_1, [ctx.exp1, ctx.exp2]);
-            elementProperty(0, 'title', interpolation);
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(interpolation).toBeDefined();
+      expect(interpolation).toEqual(interpolationV);
+    });
+
+    it('i18nInterpolation3 should work', () => {
+      const MSG_DIV_SECTION_1 = `start {$EXP_1} _ {$EXP_2} _ {$EXP_3} end`;
+      const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1, 'EXP_3': 2});
+
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
+        exp3: any = '3';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title title="{{exp1}}{{exp2}}{{exp3}}"></div>
+
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp1}} _ {{exp2}} _ {{exp3}} end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(0, 'title', i18nInterpolation3(i18n_1, ctx.exp1, ctx.exp2, ctx.exp3));
+            }
           }
-        }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<div title="start 1 _ 2 _ 3 end"></div>');
+    });
+
+    it('i18nInterpolation4 should work', () => {
+      const MSG_DIV_SECTION_1 = `start {$EXP_1} _ {$EXP_2} _ {$EXP_3} _ {$EXP_4} end`;
+      const i18n_1 =
+          i18nExpMapping(MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1, 'EXP_3': 2, 'EXP_4': 3});
+
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
+        exp3: any = '3';
+        exp4: any = '4';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title title="{{exp1}}{{exp2}}{{exp3}}{{exp4}}"></div>
+
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp1}} _ {{exp2}} _ {{exp3}} _ {{exp4}} end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(
+                  0, 'title', i18nInterpolation4(i18n_1, ctx.exp1, ctx.exp2, ctx.exp3, ctx.exp4));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<div title="start 1 _ 2 _ 3 _ 4 end"></div>');
+    });
+
+    it('i18nInterpolation5 should work', () => {
+      const MSG_DIV_SECTION_1 = `start {$EXP_1} _ {$EXP_2} _ {$EXP_3} _ {$EXP_4} _ {$EXP_5} end`;
+      const i18n_1 = i18nExpMapping(
+          MSG_DIV_SECTION_1, {'EXP_1': 0, 'EXP_2': 1, 'EXP_3': 2, 'EXP_4': 3, 'EXP_5': 4});
+
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
+        exp3: any = '3';
+        exp4: any = '4';
+        exp5: any = '5';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title title="{{exp1}}{{exp2}}{{exp3}}{{exp4}}{{exp5}}"></div>
+
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp1}} _ {{exp2}} _ {{exp3}} _ {{exp4}} _ {{exp5}}
+          // end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(
+                  0, 'title',
+                  i18nInterpolation5(i18n_1, ctx.exp1, ctx.exp2, ctx.exp3, ctx.exp4, ctx.exp5));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<div title="start 1 _ 2 _ 3 _ 4 _ 5 end"></div>');
+    });
+
+    it('i18nInterpolation6 should work', () => {
+      const MSG_DIV_SECTION_1 =
+          `start {$EXP_1} _ {$EXP_2} _ {$EXP_3} _ {$EXP_4} _ {$EXP_5} _ {$EXP_6} end`;
+      const i18n_1 = i18nExpMapping(
+          MSG_DIV_SECTION_1,
+          {'EXP_1': 0, 'EXP_2': 1, 'EXP_3': 2, 'EXP_4': 3, 'EXP_5': 4, 'EXP_6': 5});
+
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
+        exp3: any = '3';
+        exp4: any = '4';
+        exp5: any = '5';
+        exp6: any = '6';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title title="{{exp1}}{{exp2}}{{exp3}}{{exp4}}{{exp5}}{{exp6}}"></div>
+
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp1}} _ {{exp2}} _ {{exp3}} _ {{exp4}} _ {{exp5}}
+          // _ {{exp6}} end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(
+                  0, 'title',
+                  i18nInterpolation6(
+                      i18n_1, ctx.exp1, ctx.exp2, ctx.exp3, ctx.exp4, ctx.exp5, ctx.exp6));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<div title="start 1 _ 2 _ 3 _ 4 _ 5 _ 6 end"></div>');
+    });
+
+    it('i18nInterpolation7 should work', () => {
+      const MSG_DIV_SECTION_1 =
+          `start {$EXP_1} _ {$EXP_2} _ {$EXP_3} _ {$EXP_4} _ {$EXP_5} _ {$EXP_6} _ {$EXP_7} end`;
+      const i18n_1 = i18nExpMapping(
+          MSG_DIV_SECTION_1,
+          {'EXP_1': 0, 'EXP_2': 1, 'EXP_3': 2, 'EXP_4': 3, 'EXP_5': 4, 'EXP_6': 5, 'EXP_7': 6});
+
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
+        exp3: any = '3';
+        exp4: any = '4';
+        exp5: any = '5';
+        exp6: any = '6';
+        exp7: any = '7';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title
+          // title="{{exp1}}{{exp2}}{{exp3}}{{exp4}}{{exp5}}{{exp6}}{{exp7}}"></div>
+
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp1}} _ {{exp2}} _ {{exp3}} _ {{exp4}} _ {{exp5}}
+          // _ {{exp6}} _ {{exp7}} end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(
+                  0, 'title', i18nInterpolation7(
+                                  i18n_1, ctx.exp1, ctx.exp2, ctx.exp3, ctx.exp4, ctx.exp5,
+                                  ctx.exp6, ctx.exp7));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<div title="start 1 _ 2 _ 3 _ 4 _ 5 _ 6 _ 7 end"></div>');
+    });
+
+    it('i18nInterpolation8 should work', () => {
+      const MSG_DIV_SECTION_1 =
+          `start {$EXP_1} _ {$EXP_2} _ {$EXP_3} _ {$EXP_4} _ {$EXP_5} _ {$EXP_6} _ {$EXP_7} _ {$EXP_8} end`;
+      const i18n_1 = i18nExpMapping(MSG_DIV_SECTION_1, {
+        'EXP_1': 0,
+        'EXP_2': 1,
+        'EXP_3': 2,
+        'EXP_4': 3,
+        'EXP_5': 4,
+        'EXP_6': 5,
+        'EXP_7': 6,
+        'EXP_8': 7
       });
-    }
 
-    const fixture = new ComponentFixture(MyApp);
-    expect(interpolation).toBeDefined();
-    expect(interpolation).toEqual(interpolationV);
+      class MyApp {
+        exp1: any = '1';
+        exp2: any = '2';
+        exp3: any = '3';
+        exp4: any = '4';
+        exp5: any = '5';
+        exp6: any = '6';
+        exp7: any = '7';
+        exp8: any = '8';
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <div i18n i18n-title
+          // title="{{exp1}}{{exp2}}{{exp3}}{{exp4}}{{exp5}}{{exp6}}{{exp7}}{{exp8}}"></div>
+
+          // Translated to:
+          // <div i18n i18n-title title="start {{exp1}} _ {{exp2}} _ {{exp3}} _ {{exp4}} _ {{exp5}}
+          // _ {{exp6}} _ {{exp7}} _ {{exp8}} end"></div>
+          template: (rf: RenderFlags, ctx: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              element(0, 'div');  // translated section 1
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(
+                  0, 'title', i18nInterpolation8(
+                                  i18n_1, ctx.exp1, ctx.exp2, ctx.exp3, ctx.exp4, ctx.exp5,
+                                  ctx.exp6, ctx.exp7, ctx.exp8));
+            }
+          }
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html).toEqual('<div title="start 1 _ 2 _ 3 _ 4 _ 5 _ 6 _ 7 _ 8 end"></div>');
+    });
+
   });
 });

From 1ceddb6290737fe90dc980fb29e6ed9512b6b4e5 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Fri, 20 Jul 2018 16:21:05 +0200
Subject: [PATCH 557/582] fix(ivy): support re-order embedded templates
 (#24805)

PR Close #24805
---
 packages/core/src/render3/i18n.ts       |  51 ++++++-----
 packages/core/test/render3/i18n_spec.ts | 114 +++++++++++++++++++++++-
 2 files changed, 140 insertions(+), 25 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 6c64793290..78e011c7b4 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -76,10 +76,11 @@ export function i18nMapping(
     expressions?: (PlaceholderMap | null)[] | null, templateRoots?: string[] | null,
     lastChildIndex?: number | null): I18nInstruction[][] {
   const translationParts = translation.split(i18nTagRegex);
-  const instructions: I18nInstruction[][] = [];
+  const nbTemplates = templateRoots ? templateRoots.length + 1 : 1;
+  const instructions: I18nInstruction[][] = (new Array(nbTemplates)).fill(undefined);
 
   generateMappingInstructions(
-      0, translationParts, instructions, elements, expressions, templateRoots, lastChildIndex);
+      0, 0, translationParts, instructions, elements, expressions, templateRoots, lastChildIndex);
 
   return instructions;
 }
@@ -90,7 +91,9 @@ export function i18nMapping(
  *
  * See `i18nMapping()` for more details.
  *
- * @param index The current index in `translationParts`.
+ * @param tmplIndex The order of appearance of the template.
+ * 0 for the root template, following indexes match the order in `templateRoots`.
+ * @param partIndex The current index in `translationParts`.
  * @param translationParts The translation string split into an array of placeholders and text
  * elements.
  * @param instructions The current list of instructions to update.
@@ -102,13 +105,14 @@ export function i18nMapping(
  * generating the instructions for their parent template.
  * @param lastChildIndex The index of the last child of the i18n node. Used when the i18n block is
  * an ng-container.
+ *
  * @returns the current index in `translationParts`
  */
 function generateMappingInstructions(
-    index: number, translationParts: string[], instructions: I18nInstruction[][],
-    elements: (PlaceholderMap | null)[] | null, expressions?: (PlaceholderMap | null)[] | null,
-    templateRoots?: string[] | null, lastChildIndex?: number | null): number {
-  const tmplIndex = instructions.length;
+    tmplIndex: number, partIndex: number, translationParts: string[],
+    instructions: I18nInstruction[][], elements: (PlaceholderMap | null)[] | null,
+    expressions?: (PlaceholderMap | null)[] | null, templateRoots?: string[] | null,
+    lastChildIndex?: number | null): number {
   const tmplInstructions: I18nInstruction[] = [];
   const phVisited: string[] = [];
   let openedTagCount = 0;
@@ -118,20 +122,20 @@ function generateMappingInstructions(
   let currentExpressions: PlaceholderMap|null =
       expressions && expressions[tmplIndex] ? expressions[tmplIndex] : null;
 
-  instructions.push(tmplInstructions);
+  instructions[tmplIndex] = tmplInstructions;
 
-  for (; index < translationParts.length; index++) {
-    const value = translationParts[index];
+  for (; partIndex < translationParts.length; partIndex++) {
+    // The value can either be text or the name of a placeholder (element/template root/expression)
+    const value = translationParts[partIndex];
 
     // Odd indexes are placeholders
-    if (index & 1) {
+    if (partIndex & 1) {
       let phIndex;
       if (currentElements && currentElements[value] !== undefined) {
         phIndex = currentElements[value];
-        // The placeholder represents a DOM element
-        // Add an instruction to move the element
-        const isTemplateRoot = templateRoots && templateRoots[tmplIndex] === value;
-        if (isTemplateRoot) {
+        // The placeholder represents a DOM element, add an instruction to move it
+        let templateRootIndex = templateRoots ? templateRoots.indexOf(value) : -1;
+        if (templateRootIndex !== -1 && (templateRootIndex + 1) !== tmplIndex) {
           // This is a template root, it has no closing tag, not treating it as an element
           tmplInstructions.push(phIndex | I18nInstructions.TemplateRoot);
         } else {
@@ -141,8 +145,7 @@ function generateMappingInstructions(
         phVisited.push(value);
       } else if (currentExpressions && currentExpressions[value] !== undefined) {
         phIndex = currentExpressions[value];
-        // The placeholder represents an expression
-        // Add an instruction to move the expression
+        // The placeholder represents an expression, add an instruction to move it
         tmplInstructions.push(phIndex | I18nInstructions.Expression);
         phVisited.push(value);
       } else {
@@ -163,11 +166,13 @@ function generateMappingInstructions(
         maxIndex = phIndex;
       }
 
-      if (templateRoots && templateRoots.indexOf(value) !== -1 &&
-          templateRoots.indexOf(value) >= tmplIndex) {
-        index = generateMappingInstructions(
-            index, translationParts, instructions, elements, expressions, templateRoots,
-            lastChildIndex);
+      if (templateRoots) {
+        const newTmplIndex = templateRoots.indexOf(value) + 1;
+        if (newTmplIndex !== 0 && newTmplIndex !== tmplIndex) {
+          partIndex = generateMappingInstructions(
+              newTmplIndex, partIndex, translationParts, instructions, elements, expressions,
+              templateRoots, lastChildIndex);
+        }
       }
 
     } else if (value) {
@@ -237,7 +242,7 @@ function generateMappingInstructions(
     }
   }
 
-  return index;
+  return partIndex;
 }
 
 function appendI18nNode(node: LNode, parentNode: LNode, previousNode: LNode) {
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index d185583385..0c96c43d20 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -720,6 +720,116 @@ describe('Runtime i18n', () => {
               '<ul><li>valeur: one!</li><li>valeur: two!</li><li>valeur bis: one!</li><li>valeur bis: two!</li></ul>');
     });
 
+    it('should support changing the order of multiple template roots in the same template', () => {
+      const MSG_DIV_SECTION_1 =
+          `{$START_LI_1}valeur bis: {$EXP_2}!{$END_LI_1}{$START_LI_0}valeur: {$EXP_1}!{$END_LI_0}`;
+      // The indexes are based on each template function
+      let i18n_1: I18nInstruction[][];
+      class MyApp {
+        items: string[] = ['1', '2'];
+
+        static ngComponentDef = defineComponent({
+          type: MyApp,
+          factory: () => new MyApp(),
+          selectors: [['my-app']],
+          // Initial template:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">value: {{item}}</li>
+          //   <li *ngFor="let item of items">value bis: {{item}}</li>
+          // </ul>
+
+          // Translated to:
+          // <ul i18n>
+          //   <li *ngFor="let item of items">valeur bis: {{item}}!</li>
+          //   <li *ngFor="let item of items">valeur: {{item}}!</li>
+          // </ul>
+          template: (rf: RenderFlags, myApp: MyApp) => {
+            if (rf & RenderFlags.Create) {
+              if (!i18n_1) {
+                i18n_1 = i18nMapping(
+                    MSG_DIV_SECTION_1,
+                    [{'START_LI_0': 1, 'START_LI_1': 2}, {'START_LI_0': 0}, {'START_LI_1': 0}],
+                    [null, {'EXP_1': 1}, {'EXP_2': 1}], ['START_LI_0', 'START_LI_1']);
+              }
+
+              elementStart(0, 'ul');
+              {
+                // Start of translated section 1
+                container(1, liTemplate, null, ['ngForOf', '']);     // START_LI_0
+                container(2, liTemplateBis, null, ['ngForOf', '']);  // START_LI_1
+                // End of translated section 1
+              }
+              elementEnd();
+              i18nApply(1, i18n_1[0]);
+            }
+            if (rf & RenderFlags.Update) {
+              elementProperty(1, 'ngForOf', bind(myApp.items));
+              elementProperty(2, 'ngForOf', bind(myApp.items));
+            }
+
+            function liTemplate(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 2
+                elementStart(0, 'li');  // START_LI_0
+                { text(1); }            // EXP_1
+                elementEnd();
+                // End of translated section 2
+                i18nApply(0, i18n_1[1]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+
+            function liTemplateBis(rf1: RenderFlags, row: NgForOfContext<string>) {
+              if (rf1 & RenderFlags.Create) {
+                // This is a container so the whole template is a translated section
+                // Start of translated section 3
+                elementStart(0, 'li');  // START_LI_1
+                { text(1); }            // EXP_2
+                elementEnd();
+                // End of translated section 3
+                i18nApply(0, i18n_1[2]);
+              }
+              if (rf1 & RenderFlags.Update) {
+                textBinding(1, bind(row.$implicit));
+              }
+            }
+          },
+          directives: () => [NgForOf]
+        });
+      }
+
+      const fixture = new ComponentFixture(MyApp);
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li>valeur bis: 1!</li><li>valeur bis: 2!</li><li>valeur: 1!</li><li>valeur: 2!</li></ul>');
+
+      // Change detection cycle, no model changes
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li>valeur bis: 1!</li><li>valeur bis: 2!</li><li>valeur: 1!</li><li>valeur: 2!</li></ul>');
+
+      // Remove the last item
+      fixture.component.items.length = 1;
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur bis: 1!</li><li>valeur: 1!</li></ul>');
+
+      // Change an item
+      fixture.component.items[0] = 'one';
+      fixture.update();
+      expect(fixture.html).toEqual('<ul><li>valeur bis: one!</li><li>valeur: one!</li></ul>');
+
+      // Add an item
+      fixture.component.items.push('two');
+      fixture.update();
+      expect(fixture.html)
+          .toEqual(
+              '<ul><li>valeur bis: one!</li><li>valeur bis: two!</li><li>valeur: one!</li><li>valeur: two!</li></ul>');
+    });
+
     it('should support nested embedded templates', () => {
       const MSG_DIV_SECTION_1 = `{$START_LI}{$START_SPAN}valeur: {$EXP_1}!{$END_SPAN}{$END_LI}`;
       // The indexes are based on each template function
@@ -831,7 +941,7 @@ describe('Runtime i18n', () => {
               '<ul><li><span>valeur: one!</span><span>valeur: two!</span></li><li><span>valeur: one!</span><span>valeur: two!</span></li></ul>');
     });
 
-    it('should be able to move template directives around', () => {
+    it('should be able to move template roots around', () => {
       const MSG_DIV_SECTION_1 =
           `{$START_LI_0}début{$END_LI_0}{$START_LI_1}valeur: {$EXP_1}{$END_LI_1}fin`;
       // The indexes are based on each template function
@@ -928,7 +1038,7 @@ describe('Runtime i18n', () => {
           .toEqual('<ul><li>début</li><li>valeur: one</li><li>valeur: two</li>fin</ul>');
     });
 
-    it('should be able to remove containers', () => {
+    it('should be able to remove template roots', () => {
       const MSG_DIV_SECTION_1 = `loop`;
       // The indexes are based on each template function
       let i18n_1: I18nInstruction[][];

From 65e18dc1bf1c4390e3c61af1e63c04c37b6c107d Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Fri, 20 Jul 2018 14:31:54 +0200
Subject: [PATCH 558/582] docs: refactor style guide example 03-06 (#24996)

PR Close #24996
---
 .../app/heroes/shared/hero.service.avoid.ts     | 12 ++++++------
 .../src/03-06/app/heroes/shared/hero.service.ts | 17 +++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
index 3b983f5bda..9f125bbf0e 100644
--- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
+++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
@@ -3,7 +3,7 @@
 /* avoid */
 
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { map } from 'rxjs/operators';
 import { Hero } from './hero.model';
@@ -16,17 +16,17 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: Http
+    private http: HttpClient
   ) { }
 
   getHero(id: number) {
-    return this.http.get(`api/heroes/${id}`).pipe(
-      map(response => response.json().data as Hero));
+    return this.http.get<Hero>(`api/heroes/${id}`).pipe(
+      map(response => response.data as Hero));
   }
 
   getHeroes() {
-    return this.http.get(`api/heroes`).pipe(
-      map(response => response.json().data as Hero[]));
+    return this.http.get<Hero[]>(`api/heroes`).pipe(
+      map(response => response.data as Hero[]));
   }
 
 }
diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
index 0a50c11bb4..573e847091 100644
--- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
+++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
@@ -1,11 +1,12 @@
 // #docregion
 // #docregion example
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Http }       from '@angular/http';
-import { map }        from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
-import { Hero } from './hero.model';
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
+import { Hero } from './hero.model';
+
 // #enddocregion example
 
 @Injectable()
@@ -16,17 +17,17 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: Http
+    private http: HttpClient
   ) { }
 
   getHero(id: number) {
-    return this.http.get(`api/heroes/${id}`).pipe(
-      map(response => response.json() as Hero));
+    return this.http.get<Hero>(`api/heroes/${id}`).pipe(
+      map(response => response as Hero));
   }
 
   getHeroes() {
-    return this.http.get(`api/heroes`).pipe(
-      map(response => response.json() as Hero[]));
+    return this.http.get<Hero[]>(`api/heroes`).pipe(
+      map(response => response as Hero[]));
   }
 
 }

From d0c066a22332a44014f413203a0c0b80a113a270 Mon Sep 17 00:00:00 2001
From: Daniel Sogl <mytechde@outlook.com>
Date: Tue, 24 Jul 2018 16:09:47 +0200
Subject: [PATCH 559/582] docs: replaced old angular/http example (#25065) PR
 Close #25065

---
 aio/content/guide/glossary.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 5a93329d23..3c615c6c7f 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -580,7 +580,7 @@ For more information, see https://www.npmjs.com/package/@angular-devkit/schemati
 ## Scoped package
 
 A way to group related npm packages. 
-NgModules are delivered within *scoped packages* whose names begin with the Angular *scope name* `@angular`. For example, `@angular/core`, `@angular/common`, `@angular/http`, and `@angular/router`.
+NgModules are delivered within *scoped packages* whose names begin with the Angular *scope name* `@angular`. For example, `@angular/core`, `@angular/common`, `@angular/forms`, and `@angular/router`.
 
 Import a scoped package in the same way that you import a normal package. 
 

From 1e79014fc4d43fb248a8fd4851e0c8aea53c915b Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Tue, 24 Jul 2018 16:21:25 +0200
Subject: [PATCH 560/582] docs: replace angular/http with HttpClient (#25066)

PR Close #25066
---
 aio/content/examples/bootstrapping/src/app/app.module.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/examples/bootstrapping/src/app/app.module.ts b/aio/content/examples/bootstrapping/src/app/app.module.ts
index 58c78b33ac..9b8a4fcaef 100644
--- a/aio/content/examples/bootstrapping/src/app/app.module.ts
+++ b/aio/content/examples/bootstrapping/src/app/app.module.ts
@@ -5,7 +5,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 // #docregion directive-import
@@ -24,7 +24,7 @@ import { ItemDirective } from './item.directive';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule
+    HttpClientModule
   ],
   providers: [],
   bootstrap: [AppComponent]

From 777bd412b23f26f7bb39f9f70afd76a68876589c Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Tue, 24 Jul 2018 16:24:24 +0200
Subject: [PATCH 561/582] docs: replace angular/http with HttpClient (#25068)

PR Close #25068
---
 .../dependency-injection-in-action/src/app/app.module.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
index a240e21f7c..490670a71c 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/app.module.ts
@@ -1,7 +1,7 @@
 // #docregion
 import { BrowserModule }                from '@angular/platform-browser';
 import { FormsModule }                  from '@angular/forms';
-import { HttpModule }                   from '@angular/http';
+import { HttpClientModule }             from '@angular/common/http';
 
 // import { AppRoutingModule }             from './app-routing.module';
 import { LocationStrategy,
@@ -54,7 +54,7 @@ const c_components = [
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     InMemoryWebApiModule.forRoot(HeroData)
     // AppRoutingModule TODO: add routes
   ],

From c205516f0da61b5071d2371b3d52cf93075e87aa Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Tue, 24 Jul 2018 16:39:23 +0200
Subject: [PATCH 562/582] docs: refactor ngmodules example (#25072)

PR Close #25072
---
 aio/content/examples/ngmodules/src/app/app.module.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/aio/content/examples/ngmodules/src/app/app.module.ts b/aio/content/examples/ngmodules/src/app/app.module.ts
index a19fbbae52..cad301d980 100644
--- a/aio/content/examples/ngmodules/src/app/app.module.ts
+++ b/aio/content/examples/ngmodules/src/app/app.module.ts
@@ -1,7 +1,5 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
 
 /* App Root */
 import { AppComponent } from './app.component';

From d4ac9698ba7dd829600ca4c8129fcbeae9cb4bed Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 24 Jul 2018 22:11:30 -0700
Subject: [PATCH 563/582] Revert "docs: refactor style guide example 03-06
 (#24996)"

This reverts commit 65e18dc1bf1c4390e3c61af1e63c04c37b6c107d.
---
 .../app/heroes/shared/hero.service.avoid.ts     | 12 ++++++------
 .../src/03-06/app/heroes/shared/hero.service.ts | 17 ++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
index 9f125bbf0e..3b983f5bda 100644
--- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
+++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
@@ -3,7 +3,7 @@
 /* avoid */
 
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
-import { HttpClient } from '@angular/common/http';
+import { Http } from '@angular/http';
 import { Injectable } from '@angular/core';
 import { map } from 'rxjs/operators';
 import { Hero } from './hero.model';
@@ -16,17 +16,17 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: HttpClient
+    private http: Http
   ) { }
 
   getHero(id: number) {
-    return this.http.get<Hero>(`api/heroes/${id}`).pipe(
-      map(response => response.data as Hero));
+    return this.http.get(`api/heroes/${id}`).pipe(
+      map(response => response.json().data as Hero));
   }
 
   getHeroes() {
-    return this.http.get<Hero[]>(`api/heroes`).pipe(
-      map(response => response.data as Hero[]));
+    return this.http.get(`api/heroes`).pipe(
+      map(response => response.json().data as Hero[]));
   }
 
 }
diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
index 573e847091..0a50c11bb4 100644
--- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
+++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
@@ -1,12 +1,11 @@
 // #docregion
 // #docregion example
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { map } from 'rxjs/operators';
+import { Http }       from '@angular/http';
+import { map }        from 'rxjs/operators';
 
-import { ExceptionService, SpinnerService, ToastService } from '../../core';
 import { Hero } from './hero.model';
-
+import { ExceptionService, SpinnerService, ToastService } from '../../core';
 // #enddocregion example
 
 @Injectable()
@@ -17,17 +16,17 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: HttpClient
+    private http: Http
   ) { }
 
   getHero(id: number) {
-    return this.http.get<Hero>(`api/heroes/${id}`).pipe(
-      map(response => response as Hero));
+    return this.http.get(`api/heroes/${id}`).pipe(
+      map(response => response.json() as Hero));
   }
 
   getHeroes() {
-    return this.http.get<Hero[]>(`api/heroes`).pipe(
-      map(response => response as Hero[]));
+    return this.http.get(`api/heroes`).pipe(
+      map(response => response.json() as Hero[]));
   }
 
 }

From cf81823b07a1388fda456448804f737fa3e9f0f6 Mon Sep 17 00:00:00 2001
From: Daniel <mytechde@outlook.com>
Date: Wed, 25 Jul 2018 13:44:47 +0200
Subject: [PATCH 564/582] docs: refactor style guide example 03-06 (#24996)

docs: refactor style guide example 03-06


docs: refactor style guide example 03-06


docs: refactor style guide example 03-06


PR Close #24996
---
 .../03-06/app/heroes/shared/hero.service.avoid.ts | 12 ++++--------
 .../src/03-06/app/heroes/shared/hero.service.ts   | 15 ++++++---------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
index 3b983f5bda..fea2e49d99 100644
--- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
+++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts
@@ -3,9 +3,8 @@
 /* avoid */
 
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { map } from 'rxjs/operators';
 import { Hero } from './hero.model';
 // #enddocregion example
 
@@ -16,18 +15,15 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: Http
+    private http: HttpClient
   ) { }
 
   getHero(id: number) {
-    return this.http.get(`api/heroes/${id}`).pipe(
-      map(response => response.json().data as Hero));
+    return this.http.get<Hero>(`api/heroes/${id}`);
   }
 
   getHeroes() {
-    return this.http.get(`api/heroes`).pipe(
-      map(response => response.json().data as Hero[]));
+    return this.http.get<Hero[]>(`api/heroes`);
   }
 
 }
-
diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
index 0a50c11bb4..0dd5931a7a 100644
--- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
+++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts
@@ -1,11 +1,11 @@
 // #docregion
 // #docregion example
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Http }       from '@angular/http';
-import { map }        from 'rxjs/operators';
 
-import { Hero } from './hero.model';
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
+import { Hero } from './hero.model';
+
 // #enddocregion example
 
 @Injectable()
@@ -16,18 +16,15 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: Http
+    private http: HttpClient
   ) { }
 
   getHero(id: number) {
-    return this.http.get(`api/heroes/${id}`).pipe(
-      map(response => response.json() as Hero));
+    return this.http.get<Hero>(`api/heroes/${id}`);
   }
 
   getHeroes() {
-    return this.http.get(`api/heroes`).pipe(
-      map(response => response.json() as Hero[]));
+    return this.http.get<Hero[]>(`api/heroes`);
   }
 
 }
-

From 0bcf20c9fa7273371d053ffe1ef91451714b592d Mon Sep 17 00:00:00 2001
From: Johan CHOUQUET <1401825+johanchouquet@users.noreply.github.com>
Date: Thu, 8 Mar 2018 16:37:26 +0100
Subject: [PATCH 565/582] docs(animations): typo fix in the comments (#22652)

PR Close #22652
---
 packages/animations/src/animation_builder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/animations/src/animation_builder.ts b/packages/animations/src/animation_builder.ts
index 0bc5f1404d..ba6c6ec2ac 100644
--- a/packages/animations/src/animation_builder.ts
+++ b/packages/animations/src/animation_builder.ts
@@ -13,7 +13,7 @@ import {AnimationPlayer} from './players/animation_player';
  * BrowserAnimationsModule BrowserAnimationsModule} or {@link NoopAnimationsModule
  * NoopAnimationsModule} modules are used within an application.
  *
- * The purpose if this service is to produce an animation sequence programmatically within an
+ * The purpose of this service is to produce an animation sequence programmatically within an
  * angular component or directive.
  *
  * Programmatic animations are first built and then a player is created when the build animation is

From 1e28495c898d531db15a8ac26c6c6a31cebcafb9 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 24 Jul 2018 11:56:35 +0200
Subject: [PATCH 566/582] fix(ivy): update compiler with latest runtime for
 view queries (#25061)

PR Close #25061
---
 .../compliance/r3_compiler_compliance_spec.ts | 10 ++-
 .../compiler/src/render3/view/compiler.ts     | 87 ++++++++++++-------
 .../compiler/src/render3/view/template.ts     | 44 +++-------
 3 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 3d549e7665..049c9ba8d9 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -963,16 +963,20 @@ describe('compiler compliance', () => {
             type: ViewQueryComponent,
             selectors: [["view-query-component"]],
             factory: function ViewQueryComponent_Factory() { return new ViewQueryComponent(); },
-            template: function ViewQueryComponent_Template(rf, ctx) {
-              var $tmp$;
+            viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵQ(0, SomeDirective, true);
-                $r3$.ɵEe(1, "div", $e0_attrs$);
               }
               if (rf & 2) {
+                var $tmp$;
                 ($r3$.ɵqR(($tmp$ = $r3$.ɵld(0))) && (ctx.someDir = $tmp$.first));
               }
             },
+            template: function ViewQueryComponent_Template(rf, ctx) {
+              if (rf & 1) {
+                $r3$.ɵEe(1, "div", $e0_attrs$);
+              }
+            },
             directives:[SomeDirective]
           });`;
 
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index f008fa572e..4e6bd46be8 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -27,8 +27,8 @@ import {Render3ParseResult} from '../r3_template_transform';
 import {typeWithParameters} from '../util';
 
 import {R3ComponentDef, R3ComponentMetadata, R3DirectiveDef, R3DirectiveMetadata, R3QueryMetadata} from './api';
-import {BindingScope, TemplateDefinitionBuilder} from './template';
-import {CONTEXT_NAME, DefinitionMap, ID_SEPARATOR, MEANING_SEPARATOR, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, temporaryAllocator, unsupported} from './util';
+import {BindingScope, TemplateDefinitionBuilder, renderFlagCheckIfStmt} from './template';
+import {CONTEXT_NAME, DefinitionMap, ID_SEPARATOR, MEANING_SEPARATOR, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, temporaryAllocator, unsupported} from './util';
 
 function baseDirectiveFields(
     meta: R3DirectiveMetadata, constantPool: ConstantPool,
@@ -138,6 +138,10 @@ export function compileComponentFromMetadata(
     directiveMatcher = matcher;
   }
 
+  if (meta.viewQueries.length) {
+    definitionMap.set('viewQuery', createViewQueriesFunction(meta, constantPool));
+  }
+
   // e.g. `template: function MyComponent_Template(_ctx, _cm) {...}`
   const templateTypeName = meta.name;
   const templateName = templateTypeName ? `${templateTypeName}_Template` : null;
@@ -322,32 +326,22 @@ function selectorsFromGlobalMetadata(
   return o.NULL_EXPR;
 }
 
-/**
- *
- * @param meta
- * @param constantPool
- */
-function createQueryDefinitions(
-    queries: R3QueryMetadata[], constantPool: ConstantPool): o.Expression[]|undefined {
-  const queryDefinitions: o.Expression[] = [];
-  for (let i = 0; i < queries.length; i++) {
-    const query = queries[i];
-    const predicate = getQueryPredicate(query, constantPool);
+function createQueryDefinition(
+    query: R3QueryMetadata, constantPool: ConstantPool, idx: number | null): o.Expression {
+  const predicate = getQueryPredicate(query, constantPool);
 
-    // e.g. r3.Q(null, somePredicate, false) or r3.Q(null, ['div'], false)
-    const parameters = [
-      o.literal(null, o.INFERRED_TYPE),
-      predicate,
-      o.literal(query.descendants),
-    ];
+  // e.g. r3.Q(null, somePredicate, false) or r3.Q(0, ['div'], false)
+  const parameters = [
+    o.literal(idx, o.INFERRED_TYPE),
+    predicate,
+    o.literal(query.descendants),
+  ];
 
-    if (query.read) {
-      parameters.push(query.read);
-    }
-
-    queryDefinitions.push(o.importExpr(R3.query).callFn(parameters));
+  if (query.read) {
+    parameters.push(query.read);
   }
-  return queryDefinitions.length > 0 ? queryDefinitions : undefined;
+
+  return o.importExpr(R3.query).callFn(parameters);
 }
 
 // Turn a directive selector into an R3-compatible selector for directive def
@@ -371,11 +365,10 @@ function createHostAttributesArray(meta: R3DirectiveMetadata): o.Expression|null
 // Return a contentQueries function or null if one is not necessary.
 function createContentQueriesFunction(
     meta: R3DirectiveMetadata, constantPool: ConstantPool): o.Expression|null {
-  const queryDefinitions = createQueryDefinitions(meta.queries, constantPool);
-
-  if (queryDefinitions) {
-    const statements: o.Statement[] = queryDefinitions.map((qd: o.Expression) => {
-      return o.importExpr(R3.registerContentQuery).callFn([qd]).toStmt();
+  if (meta.queries.length) {
+    const statements: o.Statement[] = meta.queries.map((query: R3QueryMetadata) => {
+      const queryDefinition = createQueryDefinition(query, constantPool, null);
+      return o.importExpr(R3.registerContentQuery).callFn([queryDefinition]).toStmt();
     });
     const typeName = meta.name;
     return o.fn(
@@ -426,6 +419,40 @@ function createContentQueriesRefreshFunction(meta: R3DirectiveMetadata): o.Expre
   return null;
 }
 
+// Define and update any view queries
+function createViewQueriesFunction(
+    meta: R3ComponentMetadata, constantPool: ConstantPool): o.Expression {
+  const createStatements: o.Statement[] = [];
+  const updateStatements: o.Statement[] = [];
+  const tempAllocator = temporaryAllocator(updateStatements, TEMPORARY_NAME);
+
+  for (let i = 0; i < meta.viewQueries.length; i++) {
+    const query = meta.viewQueries[i];
+
+    // creation, e.g. r3.Q(0, somePredicate, true);
+    const queryDefinition = createQueryDefinition(query, constantPool, i);
+    createStatements.push(queryDefinition.toStmt());
+
+    // update, e.g. (r3.qR(tmp = r3.ɵld(0)) && (ctx.someDir = tmp));
+    const temporary = tempAllocator();
+    const getQueryList = o.importExpr(R3.load).callFn([o.literal(i)]);
+    const refresh = o.importExpr(R3.queryRefresh).callFn([temporary.set(getQueryList)]);
+    const updateDirective = o.variable(CONTEXT_NAME)
+                                .prop(query.propertyName)
+                                .set(query.first ? temporary.prop('first') : temporary);
+    updateStatements.push(refresh.and(updateDirective).toStmt());
+  }
+
+  const viewQueryFnName = meta.name ? `${meta.name}_Query` : null;
+  return o.fn(
+      [new o.FnParam(RENDER_FLAGS, o.NUMBER_TYPE), new o.FnParam(CONTEXT_NAME, null)],
+      [
+        renderFlagCheckIfStmt(core.RenderFlags.Create, createStatements),
+        renderFlagCheckIfStmt(core.RenderFlags.Update, updateStatements)
+      ],
+      o.INFERRED_TYPE, null, viewQueryFnName);
+}
+
 // Return a host binding function or null if one is not necessary.
 function createHostBindingsFunction(
     meta: R3DirectiveMetadata, bindingParser: BindingParser): o.Expression|null {
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index a2a937d7ea..cdb8f76452 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -46,6 +46,12 @@ function mapBindingToInstruction(type: BindingType): o.ExternalReference|undefin
   }
 }
 
+//  if (rf & flags) { .. }
+export function renderFlagCheckIfStmt(
+    flags: core.RenderFlags, statements: o.Statement[]): o.IfStmt {
+  return o.ifStmt(o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(flags), null, false), statements);
+}
+
 export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   private _dataIndex = 0;
   private _bindingContext = 0;
@@ -54,7 +60,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private _variableCode: o.Statement[] = [];
   private _bindingCode: o.Statement[] = [];
   private _postfixCode: o.Statement[] = [];
-  private _temporary = temporaryAllocator(this._prefixCode, TEMPORARY_NAME);
   private _valueConverter: ValueConverter;
   private _unsupported = unsupported;
   private _bindingScope: BindingScope;
@@ -75,6 +80,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       private directiveMatcher: SelectorMatcher|null, private directives: Set<o.Expression>,
       private pipeTypeByName: Map<string, o.Expression>, private pipes: Set<o.Expression>,
       private _namespace: o.ExternalReference) {
+    // view queries can take up space in data and allocation happens earlier (in the "viewQuery"
+    // function)
+    this._dataIndex = viewQueries.length;
     this._bindingScope =
         parentBindingScope.nestedScope((lhsVar: o.ReadVarExpr, expression: o.Expression) => {
           this._bindingCode.push(
@@ -127,32 +135,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       this.instruction(this._creationCode, null, R3.projectionDef, ...parameters);
     }
 
-    // Define and update any view queries
-    for (let query of this.viewQueries) {
-      // e.g. r3.Q(0, somePredicate, true);
-      const querySlot = this.allocateDataSlot();
-      const predicate = getQueryPredicate(query, this.constantPool);
-      const args: o.Expression[] = [
-        o.literal(querySlot, o.INFERRED_TYPE),
-        predicate,
-        o.literal(query.descendants, o.INFERRED_TYPE),
-      ];
-
-      if (query.read) {
-        args.push(query.read);
-      }
-      this.instruction(this._creationCode, null, R3.query, ...args);
-
-      // (r3.qR(tmp = r3.ɵld(0)) && (ctx.someDir = tmp));
-      const temporary = this._temporary();
-      const getQueryList = o.importExpr(R3.load).callFn([o.literal(querySlot)]);
-      const refresh = o.importExpr(R3.queryRefresh).callFn([temporary.set(getQueryList)]);
-      const updateDirective = o.variable(CONTEXT_NAME)
-                                  .prop(query.propertyName)
-                                  .set(query.first ? temporary.prop('first') : temporary);
-      this._bindingCode.push(refresh.and(updateDirective).toStmt());
-    }
-
     t.visitAll(this, nodes);
 
     if (this._pureFunctionSlots > 0) {
@@ -161,15 +143,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
 
     const creationCode = this._creationCode.length > 0 ?
-        [o.ifStmt(
-            o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(core.RenderFlags.Create), null, false),
-            this._creationCode)] :
+        [renderFlagCheckIfStmt(core.RenderFlags.Create, this._creationCode)] :
         [];
 
     const updateCode = this._bindingCode.length > 0 ?
-        [o.ifStmt(
-            o.variable(RENDER_FLAGS).bitwiseAnd(o.literal(core.RenderFlags.Update), null, false),
-            this._bindingCode)] :
+        [renderFlagCheckIfStmt(core.RenderFlags.Update, this._bindingCode)] :
         [];
 
     // Generate maps of placeholder name to node indexes

From 968f153491a57effca41299174d10c6466d5131a Mon Sep 17 00:00:00 2001
From: Adrien Samson <adrien@kyklydse.com>
Date: Fri, 23 Feb 2018 10:24:51 +0100
Subject: [PATCH 567/582] fix(router): Fix _lastPathIndex in deeply nested
 empty paths (#22394)

PR Close #22394
---
 packages/router/src/recognize.ts          | 34 +++++++++++++-------
 packages/router/src/router.ts             |  7 +++-
 packages/router/src/router_module.ts      | 34 ++++++++++++++++++++
 packages/router/test/recognize.spec.ts    | 39 +++++++++++++++++++++++
 tools/public_api_guard/router/router.d.ts |  2 ++
 5 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/packages/router/src/recognize.ts b/packages/router/src/recognize.ts
index b6eeded31a..6c3f8b327f 100644
--- a/packages/router/src/recognize.ts
+++ b/packages/router/src/recognize.ts
@@ -20,20 +20,24 @@ class NoMatch {}
 
 export function recognize(
     rootComponentType: Type<any>| null, config: Routes, urlTree: UrlTree, url: string,
-    paramsInheritanceStrategy: ParamsInheritanceStrategy =
-        'emptyOnly'): Observable<RouterStateSnapshot> {
-  return new Recognizer(rootComponentType, config, urlTree, url, paramsInheritanceStrategy)
+    paramsInheritanceStrategy: ParamsInheritanceStrategy = 'emptyOnly',
+    relativeLinkResolution: 'legacy' | 'corrected' = 'legacy'): Observable<RouterStateSnapshot> {
+  return new Recognizer(
+             rootComponentType, config, urlTree, url, paramsInheritanceStrategy,
+             relativeLinkResolution)
       .recognize();
 }
 
 class Recognizer {
   constructor(
       private rootComponentType: Type<any>|null, private config: Routes, private urlTree: UrlTree,
-      private url: string, private paramsInheritanceStrategy: ParamsInheritanceStrategy) {}
+      private url: string, private paramsInheritanceStrategy: ParamsInheritanceStrategy,
+      private relativeLinkResolution: 'legacy'|'corrected') {}
 
   recognize(): Observable<RouterStateSnapshot> {
     try {
-      const rootSegmentGroup = split(this.urlTree.root, [], [], this.config).segmentGroup;
+      const rootSegmentGroup =
+          split(this.urlTree.root, [], [], this.config, this.relativeLinkResolution).segmentGroup;
 
       const children = this.processSegmentGroup(this.config, rootSegmentGroup, PRIMARY_OUTLET);
 
@@ -134,8 +138,8 @@ class Recognizer {
 
     const childConfig: Route[] = getChildConfig(route);
 
-    const {segmentGroup, slicedSegments} =
-        split(rawSegment, consumedSegments, rawSlicedSegments, childConfig);
+    const {segmentGroup, slicedSegments} = split(
+        rawSegment, consumedSegments, rawSlicedSegments, childConfig, this.relativeLinkResolution);
 
     if (slicedSegments.length === 0 && segmentGroup.hasChildren()) {
       const children = this.processChildren(childConfig, segmentGroup);
@@ -232,7 +236,7 @@ function getPathIndexShift(segmentGroup: UrlSegmentGroup): number {
 
 function split(
     segmentGroup: UrlSegmentGroup, consumedSegments: UrlSegment[], slicedSegments: UrlSegment[],
-    config: Route[]) {
+    config: Route[], relativeLinkResolution: 'legacy' | 'corrected') {
   if (slicedSegments.length > 0 &&
       containsEmptyPathMatchesWithNamedOutlets(segmentGroup, slicedSegments, config)) {
     const s = new UrlSegmentGroup(
@@ -248,7 +252,8 @@ function split(
       containsEmptyPathMatches(segmentGroup, slicedSegments, config)) {
     const s = new UrlSegmentGroup(
         segmentGroup.segments, addEmptyPathsToChildrenIfNeeded(
-                                   segmentGroup, slicedSegments, config, segmentGroup.children));
+                                   segmentGroup, consumedSegments, slicedSegments, config,
+                                   segmentGroup.children, relativeLinkResolution));
     s._sourceSegment = segmentGroup;
     s._segmentIndexShift = consumedSegments.length;
     return {segmentGroup: s, slicedSegments};
@@ -261,14 +266,19 @@ function split(
 }
 
 function addEmptyPathsToChildrenIfNeeded(
-    segmentGroup: UrlSegmentGroup, slicedSegments: UrlSegment[], routes: Route[],
-    children: {[name: string]: UrlSegmentGroup}): {[name: string]: UrlSegmentGroup} {
+    segmentGroup: UrlSegmentGroup, consumedSegments: UrlSegment[], slicedSegments: UrlSegment[],
+    routes: Route[], children: {[name: string]: UrlSegmentGroup},
+    relativeLinkResolution: 'legacy' | 'corrected'): {[name: string]: UrlSegmentGroup} {
   const res: {[name: string]: UrlSegmentGroup} = {};
   for (const r of routes) {
     if (emptyPathMatch(segmentGroup, slicedSegments, r) && !children[getOutlet(r)]) {
       const s = new UrlSegmentGroup([], {});
       s._sourceSegment = segmentGroup;
-      s._segmentIndexShift = segmentGroup.segments.length;
+      if (relativeLinkResolution === 'legacy') {
+        s._segmentIndexShift = segmentGroup.segments.length;
+      } else {
+        s._segmentIndexShift = consumedSegments.length;
+      }
       res[getOutlet(r)] = s;
     }
   }
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index cd8fb98aa4..8ce079e304 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -297,6 +297,11 @@ export class Router {
    */
   urlUpdateStrategy: 'deferred'|'eager' = 'deferred';
 
+  /**
+   * See {@link RouterModule} for more information.
+   */
+  relativeLinkResolution: 'legacy'|'corrected' = 'legacy';
+
   /**
    * Creates the router service.
    */
@@ -676,7 +681,7 @@ export class Router {
         urlAndSnapshot$ = redirectsApplied$.pipe(mergeMap((appliedUrl: UrlTree) => {
           return recognize(
                      this.rootComponentType, this.config, appliedUrl, this.serializeUrl(appliedUrl),
-                     this.paramsInheritanceStrategy)
+                     this.paramsInheritanceStrategy, this.relativeLinkResolution)
               .pipe(map((snapshot: any) => {
                 (this.events as Subject<Event>)
                     .next(new RoutesRecognized(
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index 7566ee1400..384f7e987a 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -417,6 +417,36 @@ export interface ExtraOptions {
    * - `'eager'`, updates browser URL at the beginning of navigation.
    */
   urlUpdateStrategy?: 'deferred'|'eager';
+
+  /**
+   * Enables a bug fix that corrects relative link resolution in components with empty paths.
+   * Example:
+   *
+   * ```
+   * const routes = [
+   *   {
+   *     path: '',
+   *     component: ContainerComponent,
+   *     children: [
+   *       { path: 'a', component: AComponent },
+   *       { path: 'b', component: BComponent },
+   *     ]
+   *   }
+   * ];
+   * ```
+   *
+   * From the `ContainerComponent`, this will not work:
+   *
+   * `<a [routerLink]="['./a']">Link to A</a>`
+   *
+   * However, this will work:
+   *
+   * `<a [routerLink]="['../a']">Link to A</a>`
+   *
+   * In other words, you're required to use `../` rather than `./`. The current default in v6
+   * is `legacy`, and this option will be removed in v7 to default to the corrected behavior.
+   */
+  relativeLinkResolution?: 'legacy'|'corrected';
 }
 
 export function setupRouter(
@@ -465,6 +495,10 @@ export function setupRouter(
     router.urlUpdateStrategy = opts.urlUpdateStrategy;
   }
 
+  if (opts.relativeLinkResolution) {
+    router.relativeLinkResolution = opts.relativeLinkResolution;
+  }
+
   return router;
 }
 
diff --git a/packages/router/test/recognize.spec.ts b/packages/router/test/recognize.spec.ts
index b2537d13c6..0494f2fe66 100644
--- a/packages/router/test/recognize.spec.ts
+++ b/packages/router/test/recognize.spec.ts
@@ -452,6 +452,45 @@ describe('recognize', () => {
             });
       });
 
+      it('should set url segment and index properly with the "corrected" option for nested empty-path segments',
+         () => {
+           const url = tree('a/b') as any;
+           recognize(
+               RootComponent, [{
+                 path: 'a',
+                 children: [{
+                   path: 'b',
+                   component: ComponentB,
+                   children: [{
+                     path: '',
+                     component: ComponentC,
+                     children: [{path: '', component: ComponentD}]
+                   }]
+                 }]
+               }],
+               url, 'a/b', 'emptyOnly', 'corrected')
+               .forEach((s: any) => {
+                 expect(s.root._urlSegment).toBe(url.root);
+                 expect(s.root._lastPathIndex).toBe(-1);
+
+                 const a = s.firstChild(s.root) !;
+                 expect(a._urlSegment).toBe(url.root.children[PRIMARY_OUTLET]);
+                 expect(a._lastPathIndex).toBe(0);
+
+                 const b = s.firstChild(a) !;
+                 expect(b._urlSegment).toBe(url.root.children[PRIMARY_OUTLET]);
+                 expect(b._lastPathIndex).toBe(1);
+
+                 const c = s.firstChild(b) !;
+                 expect(c._urlSegment).toBe(url.root.children[PRIMARY_OUTLET]);
+                 expect(c._lastPathIndex).toBe(1);
+
+                 const d = s.firstChild(c) !;
+                 expect(d._urlSegment).toBe(url.root.children[PRIMARY_OUTLET]);
+                 expect(d._lastPathIndex).toBe(1);
+               });
+         });
+
       it('should set url segment and index properly when nested empty-path segments (2)', () => {
         const url = tree('');
         recognize(
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index 6575a15279..c97c290390 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -119,6 +119,7 @@ export interface ExtraOptions {
     onSameUrlNavigation?: 'reload' | 'ignore';
     paramsInheritanceStrategy?: 'emptyOnly' | 'always';
     preloadingStrategy?: any;
+    relativeLinkResolution?: 'legacy' | 'corrected';
     scrollOffset?: [number, number] | (() => [number, number]);
     scrollPositionRestoration?: 'disabled' | 'enabled' | 'top';
     urlUpdateStrategy?: 'deferred' | 'eager';
@@ -320,6 +321,7 @@ export declare class Router {
     navigated: boolean;
     onSameUrlNavigation: 'reload' | 'ignore';
     paramsInheritanceStrategy: 'emptyOnly' | 'always';
+    relativeLinkResolution: 'legacy' | 'corrected';
     routeReuseStrategy: RouteReuseStrategy;
     readonly routerState: RouterState;
     readonly url: string;

From e1c6fd5453bfb3f55863be07ded82376f86b7e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 25 Jul 2018 10:19:44 -0700
Subject: [PATCH 568/582] Revert "feat(core): add support for using async/await
 with Jasmine" (#25096)

This reverts commit f6829aba55e07609e312b4f67dbc9dbbf36e4e46.

PR Close #25096
---
 .../test/metadata/resource_loading_spec.ts    | 120 +++++++++---------
 .../test/testability/jasmine_await_spec.ts    |  31 -----
 packages/core/testing/src/jasmine_await.ts    |  34 -----
 packages/core/testing/src/testing.ts          |   1 -
 tools/public_api_guard/core/testing.d.ts      |   5 -
 5 files changed, 59 insertions(+), 132 deletions(-)
 delete mode 100644 packages/core/test/testability/jasmine_await_spec.ts
 delete mode 100644 packages/core/testing/src/jasmine_await.ts

diff --git a/packages/core/test/metadata/resource_loading_spec.ts b/packages/core/test/metadata/resource_loading_spec.ts
index 5ee74007ce..2c15e02a90 100644
--- a/packages/core/test/metadata/resource_loading_spec.ts
+++ b/packages/core/test/metadata/resource_loading_spec.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {jasmineAwait} from '@angular/core/testing';
-
 import {Component} from '../../src/core';
 import {clearResolutionOfComponentResourcesQueue, resolveComponentResources} from '../../src/metadata/resource_loading';
 import {ComponentType} from '../../src/render3/interfaces/definition';
@@ -60,59 +58,59 @@ Did you run and wait for 'resolveComponentResources()'?`.trim());
     }
     beforeEach(() => resourceFetchCount = 0);
 
-    it('should resolve template', jasmineAwait(async() => {
-         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
-         const metadata: Component = {templateUrl: 'test://content'};
-         compileComponent(MyComponent, metadata);
-         await resolveComponentResources(testResolver);
-         expect(MyComponent.ngComponentDef).toBeDefined();
-         expect(metadata.templateUrl).toBe(undefined);
-         expect(metadata.template).toBe('content');
-         expect(resourceFetchCount).toBe(1);
-       }));
+    it('should resolve template', async() => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      const metadata: Component = {templateUrl: 'test://content'};
+      compileComponent(MyComponent, metadata);
+      await resolveComponentResources(testResolver);
+      expect(MyComponent.ngComponentDef).toBeDefined();
+      expect(metadata.templateUrl).toBe(undefined);
+      expect(metadata.template).toBe('content');
+      expect(resourceFetchCount).toBe(1);
+    });
 
-    it('should resolve styleUrls', jasmineAwait(async() => {
-         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
-         const metadata: Component = {template: '', styleUrls: ['test://style1', 'test://style2']};
-         compileComponent(MyComponent, metadata);
-         await resolveComponentResources(testResolver);
-         expect(MyComponent.ngComponentDef).toBeDefined();
-         expect(metadata.styleUrls).toBe(undefined);
-         expect(metadata.styles).toEqual(['style1', 'style2']);
-         expect(resourceFetchCount).toBe(2);
-       }));
+    it('should resolve styleUrls', async() => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      const metadata: Component = {template: '', styleUrls: ['test://style1', 'test://style2']};
+      compileComponent(MyComponent, metadata);
+      await resolveComponentResources(testResolver);
+      expect(MyComponent.ngComponentDef).toBeDefined();
+      expect(metadata.styleUrls).toBe(undefined);
+      expect(metadata.styles).toEqual(['style1', 'style2']);
+      expect(resourceFetchCount).toBe(2);
+    });
 
-    it('should cache multiple resolution to same URL', jasmineAwait(async() => {
-         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
-         const metadata: Component = {template: '', styleUrls: ['test://style1', 'test://style1']};
-         compileComponent(MyComponent, metadata);
-         await resolveComponentResources(testResolver);
-         expect(MyComponent.ngComponentDef).toBeDefined();
-         expect(metadata.styleUrls).toBe(undefined);
-         expect(metadata.styles).toEqual(['style1', 'style1']);
-         expect(resourceFetchCount).toBe(1);
-       }));
+    it('should cache multiple resolution to same URL', async() => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      const metadata: Component = {template: '', styleUrls: ['test://style1', 'test://style1']};
+      compileComponent(MyComponent, metadata);
+      await resolveComponentResources(testResolver);
+      expect(MyComponent.ngComponentDef).toBeDefined();
+      expect(metadata.styleUrls).toBe(undefined);
+      expect(metadata.styles).toEqual(['style1', 'style1']);
+      expect(resourceFetchCount).toBe(1);
+    });
 
-    it('should keep order even if the resolution is out of order', jasmineAwait(async() => {
-         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
-         const metadata: Component = {
-           template: '',
-           styles: ['existing'],
-           styleUrls: ['test://style1', 'test://style2']
-         };
-         compileComponent(MyComponent, metadata);
-         const resolvers: any[] = [];
-         const resolved = resolveComponentResources(
-             (url) => new Promise((resolve, response) => resolvers.push(url, resolve)));
-         // Out of order resolution
-         expect(resolvers[0]).toEqual('test://style1');
-         expect(resolvers[2]).toEqual('test://style2');
-         resolvers[3]('second');
-         resolvers[1]('first');
-         await resolved;
-         expect(metadata.styleUrls).toBe(undefined);
-         expect(metadata.styles).toEqual(['existing', 'first', 'second']);
-       }));
+    it('should keep order even if the resolution is out of order', async() => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      const metadata: Component = {
+        template: '',
+        styles: ['existing'],
+        styleUrls: ['test://style1', 'test://style2']
+      };
+      compileComponent(MyComponent, metadata);
+      const resolvers: any[] = [];
+      const resolved = resolveComponentResources(
+          (url) => new Promise((resolve, response) => resolvers.push(url, resolve)));
+      // Out of order resolution
+      expect(resolvers[0]).toEqual('test://style1');
+      expect(resolvers[2]).toEqual('test://style2');
+      resolvers[3]('second');
+      resolvers[1]('first');
+      await resolved;
+      expect(metadata.styleUrls).toBe(undefined);
+      expect(metadata.styles).toEqual(['existing', 'first', 'second']);
+    });
 
   });
 
@@ -123,14 +121,14 @@ Did you run and wait for 'resolveComponentResources()'?`.trim());
       } as any as Response);
     }
 
-    it('should work with fetch', jasmineAwait(async() => {
-         const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
-         const metadata: Component = {templateUrl: 'test://content'};
-         compileComponent(MyComponent, metadata);
-         await resolveComponentResources(fetch);
-         expect(MyComponent.ngComponentDef).toBeDefined();
-         expect(metadata.templateUrl).toBe(undefined);
-         expect(metadata.template).toBe('response for test://content');
-       }));
+    it('should work with fetch', async() => {
+      const MyComponent: ComponentType<any> = (class MyComponent{}) as any;
+      const metadata: Component = {templateUrl: 'test://content'};
+      compileComponent(MyComponent, metadata);
+      await resolveComponentResources(fetch);
+      expect(MyComponent.ngComponentDef).toBeDefined();
+      expect(metadata.templateUrl).toBe(undefined);
+      expect(metadata.template).toBe('response for test://content');
+    });
   });
 });
diff --git a/packages/core/test/testability/jasmine_await_spec.ts b/packages/core/test/testability/jasmine_await_spec.ts
deleted file mode 100644
index e4da8fb785..0000000000
--- a/packages/core/test/testability/jasmine_await_spec.ts
+++ /dev/null
@@ -1,31 +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 {jasmineAwait} from '../../testing';
-
-
-describe('await', () => {
-  let pass: boolean;
-  beforeEach(() => pass = false);
-  afterEach(() => expect(pass).toBe(true));
-
-  it('should convert passes', jasmineAwait(async() => { pass = await Promise.resolve(true); }));
-
-  it('should convert failures', (done) => {
-    const error = new Error();
-    const fakeDone: DoneFn = function() { fail('passed, but should have failed'); } as any;
-    fakeDone.fail = function(value: any) {
-      expect(value).toBe(error);
-      done();
-    };
-    jasmineAwait(async() => {
-      pass = await Promise.resolve(true);
-      throw error;
-    })(fakeDone);
-  });
-});
\ No newline at end of file
diff --git a/packages/core/testing/src/jasmine_await.ts b/packages/core/testing/src/jasmine_await.ts
deleted file mode 100644
index a863e62149..0000000000
--- a/packages/core/testing/src/jasmine_await.ts
+++ /dev/null
@@ -1,34 +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
- */
-
-/**
- * Converts an `async` function, with `await`, into a function which is compatible with Jasmine test
- * framework.
- *
- * For asynchronous function blocks, Jasmine expects `it` (and friends) to take a function which
- * takes a `done` callback. (Jasmine does not understand functions which return `Promise`.) The
- * `jasmineAwait()` wrapper converts the test function returning `Promise` into a function which
- * Jasmine understands.
- *
- *
- * Example:
- * ```
- * it('...', jasmineAwait(async() => {
- *   doSomething();
- *   await asyncFn();
- *   doSomethingAfter();
- * }));
- * ```
- *
- */
-export function jasmineAwait(fn: () => Promise<any>):
-    (done: {(): void; fail: (message?: Error | string) => void;}) => void {
-  return function(done: {(): void; fail: (message?: Error | string) => void;}) {
-    fn().then(done, done.fail);
-  };
-}
diff --git a/packages/core/testing/src/testing.ts b/packages/core/testing/src/testing.ts
index c1ea067aa3..d2d9476c80 100644
--- a/packages/core/testing/src/testing.ts
+++ b/packages/core/testing/src/testing.ts
@@ -13,7 +13,6 @@
  */
 
 export * from './async';
-export * from './jasmine_await';
 export * from './component_fixture';
 export * from './fake_async';
 export * from './test_bed';
diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
index ce962ef4bb..f7676a5f27 100644
--- a/tools/public_api_guard/core/testing.d.ts
+++ b/tools/public_api_guard/core/testing.d.ts
@@ -53,11 +53,6 @@ export declare class InjectSetupWrapper {
     inject(tokens: any[], fn: Function): () => any;
 }
 
-export declare function jasmineAwait(fn: () => Promise<any>): (done: {
-    (): void;
-    fail: (message?: Error | string) => void;
-}) => void;
-
 /** @experimental */
 export declare type MetadataOverride<T> = {
     add?: Partial<T>;

From 48d7205873f13c9a8ea417364d59e23b46478c79 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 25 Jul 2018 14:23:05 -0700
Subject: [PATCH 569/582] release: cut the v6.1.0 release

---
 CHANGELOG.md | 224 ++++++++++++++++++++-------------------------------
 package.json |   2 +-
 2 files changed, 87 insertions(+), 139 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23f330f65f..ca772990c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,38 +1,118 @@
-<a name="6.1.0-rc.3"></a>
-# [6.1.0-rc.3](https://github.com/angular/angular/compare/6.1.0-rc.2...6.1.0-rc.3) (2018-07-19)
-
+<a name="6.1.0"></a>
+# [6.1.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0) (2018-07-25)
 
 ### Bug Fixes
 
+* **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([dc4a3d0](https://github.com/angular/angular/commit/dc4a3d0))
+* **animations:** set animations styles properly on platform-server ([#24624](https://github.com/angular/angular/issues/24624)) ([0b356d4](https://github.com/angular/angular/commit/0b356d4))
+* **animations:** do not throw errors when a destroyed component is animated ([#23836](https://github.com/angular/angular/issues/23836)) ([d2a8687](https://github.com/angular/angular/commit/d2a8687))
+* **animations:** Fix browser detection logic ([#24188](https://github.com/angular/angular/issues/24188)) ([b492b9e](https://github.com/angular/angular/commit/b492b9e))
+* **animations:** properly clean up queried element styles in safari/edge ([#23633](https://github.com/angular/angular/issues/23633)) ([da9ff25](https://github.com/angular/angular/commit/da9ff25))
+* **animations:** retain state styling for nodes that are moved around ([#23534](https://github.com/angular/angular/issues/23534)) ([65211f4](https://github.com/angular/angular/commit/65211f4))
+* **animations:** retain trigger-state for nodes that are moved around ([#24238](https://github.com/angular/angular/issues/24238)) ([8db928d](https://github.com/angular/angular/commit/8db928d))
+* **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([282d351](https://github.com/angular/angular/commit/282d351))
+* **benchpress:** Fix promise chain in chrome_driver_extension. ([#23458](https://github.com/angular/angular/issues/23458)) ([d4b6c41](https://github.com/angular/angular/commit/d4b6c41))
 * **common:** do not round factional seconds ([#24831](https://github.com/angular/angular/issues/24831)) ([a527c69](https://github.com/angular/angular/commit/a527c69)), closes [#24384](https://github.com/angular/angular/issues/24384)
 * **common:** format fractional seconds ([#24844](https://github.com/angular/angular/issues/24844)) ([0b4d85e](https://github.com/angular/angular/commit/0b4d85e)), closes [#24831](https://github.com/angular/angular/issues/24831)
 * **common:** properly update collection reference in NgForOf ([#24684](https://github.com/angular/angular/issues/24684)) ([ff84c5c](https://github.com/angular/angular/commit/ff84c5c)), closes [#24155](https://github.com/angular/angular/issues/24155)
 * **common:** use correct currency format for locale de-AT ([#24658](https://github.com/angular/angular/issues/24658)) ([dcabb05](https://github.com/angular/angular/commit/dcabb05)), closes [#24609](https://github.com/angular/angular/issues/24609)
+* **common:** do not round factional seconds ([#24831](https://github.com/angular/angular/issues/24831)) ([a527c69](https://github.com/angular/angular/commit/a527c69)), closes [#24384](https://github.com/angular/angular/issues/24384)
+* **common:** properly update collection reference in NgForOf ([#24684](https://github.com/angular/angular/issues/24684)) ([ff84c5c](https://github.com/angular/angular/commit/ff84c5c)), closes [#24155](https://github.com/angular/angular/issues/24155)
+* **common:** use correct currency format for locale de-AT ([#24658](https://github.com/angular/angular/issues/24658)) ([dcabb05](https://github.com/angular/angular/commit/dcabb05)), closes [#24609](https://github.com/angular/angular/issues/24609)
+* **common:** use correct ICU plural for locale mk ([#24659](https://github.com/angular/angular/issues/24659)) ([64a8584](https://github.com/angular/angular/commit/64a8584))
 * **compiler:** fix a few non-tree-shakeable code patterns ([#24677](https://github.com/angular/angular/issues/24677)) ([50d4a4f](https://github.com/angular/angular/commit/50d4a4f))
 * **compiler:** i18n_extractor now outputs the correct source file name ([#24885](https://github.com/angular/angular/issues/24885)) ([c8ad965](https://github.com/angular/angular/commit/c8ad965)), closes [#24884](https://github.com/angular/angular/issues/24884)
+* **compiler:** fix a few non-tree-shakeable code patterns ([#24677](https://github.com/angular/angular/issues/24677)) ([50d4a4f](https://github.com/angular/angular/commit/50d4a4f))
+* **compiler:** support `.` in import statements. ([#20634](https://github.com/angular/angular/issues/20634)) ([d8f7b29](https://github.com/angular/angular/commit/d8f7b29)), closes [#20363](https://github.com/angular/angular/issues/20363)
+* **compiler:** avoid a crash in ngc-wrapped. ([#23468](https://github.com/angular/angular/issues/23468)) ([e1c4930](https://github.com/angular/angular/commit/e1c4930))
+* **compiler:** generate constant array for i18n attributes ([#23837](https://github.com/angular/angular/issues/23837)) ([cfde36d](https://github.com/angular/angular/commit/cfde36d))
+* **compiler:** generate core-compliant hostBindings property ([#24087](https://github.com/angular/angular/issues/24087)) ([01b5acd](https://github.com/angular/angular/commit/01b5acd)), closes [#24013](https://github.com/angular/angular/issues/24013)
+* **compiler:** handle undefined annotation metadata ([#23349](https://github.com/angular/angular/issues/23349)) ([ca776c5](https://github.com/angular/angular/commit/ca776c5))
 * **compiler-cli:** Use typescript to resolve modules for metadata ([#22856](https://github.com/angular/angular/issues/22856)) ([0d5f2d3](https://github.com/angular/angular/commit/0d5f2d3))
+* **compiler-cli:** Use typescript to resolve modules for metadata ([#22856](https://github.com/angular/angular/issues/22856)) ([0d5f2d3](https://github.com/angular/angular/commit/0d5f2d3))
+* **compiler-cli:** don't rely on incompatible TS method ([#23550](https://github.com/angular/angular/issues/23550)) ([b1f040f](https://github.com/angular/angular/commit/b1f040f))
+* **core:** stop reusing provider definitions across NgModuleRef instances ([#25022](https://github.com/angular/angular/issues/25022)) ([6b859da](https://github.com/angular/angular/commit/6b859da)), closes [#25018](https://github.com/angular/angular/issues/25018)
 * **core:** mark NgModule as not the root if APP_ROOT is set to false ([#24814](https://github.com/angular/angular/issues/24814)) ([1089261](https://github.com/angular/angular/commit/1089261))
 * **core:** use addCustomEqualityTester instead of overriding toEqual ([#22983](https://github.com/angular/angular/issues/22983)) ([0922228](https://github.com/angular/angular/commit/0922228)), closes [#22939](https://github.com/angular/angular/issues/22939)
+* **core:** mark NgModule as not the root if APP_ROOT is set to false ([#24814](https://github.com/angular/angular/issues/24814)) ([1089261](https://github.com/angular/angular/commit/1089261))
+* **core:** use addCustomEqualityTester instead of overriding toEqual ([#22983](https://github.com/angular/angular/issues/22983)) ([0922228](https://github.com/angular/angular/commit/0922228)), closes [#22939](https://github.com/angular/angular/issues/22939)
+* **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([ccbda9d](https://github.com/angular/angular/commit/ccbda9d))
+* **core:** avoid eager providers re-initialization ([#23559](https://github.com/angular/angular/issues/23559)) ([0c6dc45](https://github.com/angular/angular/commit/0c6dc45))
+* **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([fc03427](https://github.com/angular/angular/commit/fc03427)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
+* **docs-infra:** fix table header layout in API pages ([#24919](https://github.com/angular/angular/issues/24919)) ([3cd9645](https://github.com/angular/angular/commit/3cd9645))
+* **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([b1cda36](https://github.com/angular/angular/commit/b1cda36))
+* **elements:** prevent closure renaming of platform properties ([#23843](https://github.com/angular/angular/issues/23843)) ([d4b8b24](https://github.com/angular/angular/commit/d4b8b24))
+* **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([9367e91](https://github.com/angular/angular/commit/9367e91)), closes [#17195](https://github.com/angular/angular/issues/17195)
+* **language-service:** do not overwrite native `Reflect` ([#24299](https://github.com/angular/angular/issues/24299)) ([6881404](https://github.com/angular/angular/commit/6881404)), closes [#21420](https://github.com/angular/angular/issues/21420)
 * **language-service:** do not overwrite native `Reflect` ([#24299](https://github.com/angular/angular/issues/24299)) ([6881404](https://github.com/angular/angular/commit/6881404)), closes [#21420](https://github.com/angular/angular/issues/21420)
 * **platform-browser:** add missing deps for HammerGesturesPlugin ([#24682](https://github.com/angular/angular/issues/24682)) ([13d60ea](https://github.com/angular/angular/commit/13d60ea))
 * **platform-browser:** mark Meta and Title services as tree shakable providers ([#24815](https://github.com/angular/angular/issues/24815)) ([197387d](https://github.com/angular/angular/commit/197387d))
 * **platform-browser:** workaround wrong import path generated by ngc for DOCUMENT ([#24830](https://github.com/angular/angular/issues/24830)) ([7d27ecc](https://github.com/angular/angular/commit/7d27ecc))
+* **platform-browser:** add missing deps for HammerGesturesPlugin ([#24682](https://github.com/angular/angular/issues/24682)) ([13d60ea](https://github.com/angular/angular/commit/13d60ea))
+* **platform-browser:** mark Meta and Title services as tree shakable providers ([#24815](https://github.com/angular/angular/issues/24815)) ([197387d](https://github.com/angular/angular/commit/197387d))
+* **platform-browser:** workaround wrong import path generated by ngc for DOCUMENT ([#24830](https://github.com/angular/angular/issues/24830)) ([7d27ecc](https://github.com/angular/angular/commit/7d27ecc))
+* **platform-server:** avoid clash between server and client style encapsulation attributes ([#24158](https://github.com/angular/angular/issues/24158)) ([b96a3c8](https://github.com/angular/angular/commit/b96a3c8))
+* **platform-server:** avoid dependency cycle when using http interceptor ([#24229](https://github.com/angular/angular/issues/24229)) ([60aa943](https://github.com/angular/angular/commit/60aa943)), closes [#23023](https://github.com/angular/angular/issues/23023)
+* **platform-server:** don't reflect innerHTML property to attribute ([#24213](https://github.com/angular/angular/issues/24213)) ([6a663a4](https://github.com/angular/angular/commit/6a663a4)), closes [#19278](https://github.com/angular/angular/issues/19278)
+* **platform-server:** provide Domino DOM types globally ([#24116](https://github.com/angular/angular/issues/24116)) ([c73196e](https://github.com/angular/angular/commit/c73196e)), closes [#23280](https://github.com/angular/angular/issues/23280) [#23133](https://github.com/angular/angular/issues/23133)
+* **router:** Fix _lastPathIndex in deeply nested empty paths ([#22394](https://github.com/angular/angular/issues/22394)) ([968f153](https://github.com/angular/angular/commit/968f153))
 * **router:** add ability to recover from malformed url ([#23283](https://github.com/angular/angular/issues/23283)) ([86d254d](https://github.com/angular/angular/commit/86d254d)), closes [#21468](https://github.com/angular/angular/issues/21468)
+* **router:** add ability to recover from malformed url ([#23283](https://github.com/angular/angular/issues/23283)) ([86d254d](https://github.com/angular/angular/commit/86d254d)), closes [#21468](https://github.com/angular/angular/issues/21468)
+* **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([5731d07](https://github.com/angular/angular/commit/5731d07)), closes [#10981](https://github.com/angular/angular/issues/10981)
+* **router:** avoid freezing queryParams in-place ([#22663](https://github.com/angular/angular/issues/22663)) ([89f64e5](https://github.com/angular/angular/commit/89f64e5)), closes [#22617](https://github.com/angular/angular/issues/22617)
+* **router:** cache route handle if found ([#22475](https://github.com/angular/angular/issues/22475)) ([4cfa571](https://github.com/angular/angular/commit/4cfa571)), closes [#22474](https://github.com/angular/angular/issues/22474)
+* **router:** correct the segment parsing so it won't break on ampersand ([#23684](https://github.com/angular/angular/issues/23684)) ([553a680](https://github.com/angular/angular/commit/553a680))
+* **service-worker:** don't include sourceMappingURL in ngsw-worker ([#24877](https://github.com/angular/angular/issues/24877)) ([8620373](https://github.com/angular/angular/commit/8620373)), closes [#23596](https://github.com/angular/angular/issues/23596)
 * **service-worker:** avoid network requests when looking up hashed resources in cache ([#24127](https://github.com/angular/angular/issues/24127)) ([52d43a9](https://github.com/angular/angular/commit/52d43a9))
-
+* **service-worker:** avoid network requests when looking up hashed resources in cache ([#24127](https://github.com/angular/angular/issues/24127)) ([52d43a9](https://github.com/angular/angular/commit/52d43a9))
+* **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([3ed2d75](https://github.com/angular/angular/commit/3ed2d75)), closes [#24095](https://github.com/angular/angular/issues/24095)
+* **service-worker:** add badge to NOTIFICATION_OPTION_NAMES ([#23241](https://github.com/angular/angular/issues/23241)) ([fb59b2d](https://github.com/angular/angular/commit/fb59b2d)), closes [#23196](https://github.com/angular/angular/issues/23196)
+* **service-worker:** check platformBrowser before accessing navigator.serviceWorker ([#21231](https://github.com/angular/angular/issues/21231)) ([0bdd30e](https://github.com/angular/angular/commit/0bdd30e))
+* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([e0ed59e](https://github.com/angular/angular/commit/e0ed59e)), closes [#23526](https://github.com/angular/angular/issues/23526)
+* **service-worker:** deprecate `versionedFiles` in asset-group resources ([#23584](https://github.com/angular/angular/issues/23584)) ([1d378e2](https://github.com/angular/angular/commit/1d378e2))
 
 ### Features
 
 * **bazel:** Initial commit of protractor_web_test_suite ([#24787](https://github.com/angular/angular/issues/24787)) ([71e0df0](https://github.com/angular/angular/commit/71e0df0))
 * **bazel:** protractor_web_test_suite for release ([#24787](https://github.com/angular/angular/issues/24787)) ([161ff5c](https://github.com/angular/angular/commit/161ff5c))
+* **common:** introduce KeyValuePipe ([#24319](https://github.com/angular/angular/issues/24319)) ([2b49bf7](https://github.com/angular/angular/commit/2b49bf7))
+* **compiler:** support `// ...` and `// TODO` in mock compiler expectations ([#23441](https://github.com/angular/angular/issues/23441)) ([c6b206e](https://github.com/angular/angular/commit/c6b206e))
+* **compiler-cli:** update `tsickle` to `0.29.x` ([#24233](https://github.com/angular/angular/issues/24233)) ([f69ac67](https://github.com/angular/angular/commit/f69ac67))
+* **core:** export defaultKeyValueDiffers to private api ([#24319](https://github.com/angular/angular/issues/24319)) ([92b278c](https://github.com/angular/angular/commit/92b278c))
+* **core:** expose a Compiler API for accessing module ids from NgModule types ([#24258](https://github.com/angular/angular/issues/24258)) ([bd02b27](https://github.com/angular/angular/commit/bd02b27))
+* **core:** KeyValueDiffer#diff allows null values ([#24319](https://github.com/angular/angular/issues/24319)) ([52ce9d5](https://github.com/angular/angular/commit/52ce9d5))
 * **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([3553977](https://github.com/angular/angular/commit/3553977))
 * **core:** add support for using async/await with Jasmine ([#24637](https://github.com/angular/angular/issues/24637)) ([71100e6](https://github.com/angular/angular/commit/71100e6))
-* **router:** add urlUpdateStrategy allow updating the browser URL at the beginning of navigation ([#24820](https://github.com/angular/angular/issues/24820)) ([328971f](https://github.com/angular/angular/commit/328971f)), closes [#24616](https://github.com/angular/angular/issues/24616)
+* **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([3553977](https://github.com/angular/angular/commit/3553977))
+* **core:** add support for using async/await with Jasmine ([#24637](https://github.com/angular/angular/issues/24637)) ([71100e6](https://github.com/angular/angular/commit/71100e6))
+(https://github.com/angular/angular/commit/328971f)), closes [#24616](https://github.com/angular/angular/issues/24616)
+* **platform-browser:** add HammerJS lazy-loader symbols to public API ([#23943](https://github.com/angular/angular/issues/23943)) ([26fbf1d](https://github.com/angular/angular/commit/26fbf1d))
+* **platform-browser:** allow lazy-loading HammerJS ([#23906](https://github.com/angular/angular/issues/23906)) ([313bdce](https://github.com/angular/angular/commit/313bdce))
+* **platform-server:** use EventManagerPlugin on the server ([#24132](https://github.com/angular/angular/issues/24132)) ([d6595eb](https://github.com/angular/angular/commit/d6595eb))
+* **router:** add urlUpdateStrategy allow updating the browser URL at the beginning of navigation ([#24820](https://github.com/angular/angular/issues/24820)) ([328971f]
+* **router:** add navigation execution context info to activation hooks ([#24204](https://github.com/angular/angular/issues/24204)) ([20c463e](https://github.com/angular/angular/commit/20c463e)), closes [#24202](https://github.com/angular/angular/issues/24202)
+* **router:** implement scrolling restoration service ([#20030](https://github.com/angular/angular/issues/20030)) ([49c5234](https://github.com/angular/angular/commit/49c5234)), closes [#13636](https://github.com/angular/angular/issues/13636) [#10929](https://github.com/angular/angular/issues/10929) [#7791](https://github.com/angular/angular/issues/7791) [#6595](https://github.com/angular/angular/issues/6595)
 * **service-worker:** add support for `?` in SW config globbing ([#24105](https://github.com/angular/angular/issues/24105)) ([250527c](https://github.com/angular/angular/commit/250527c))
+* typescript 2.9 support ([#24652](https://github.com/angular/angular/issues/24652)) ([e3064d5](https://github.com/angular/angular/commit/e3064d5))
 
+### build
 
-Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.3 instead. Sorry! :-)
+* **bazel:** turn on preserve-symlinks ([#24881](https://github.com/angular/angular/issues/24881)) ([c438b5e](https://github.com/angular/angular/commit/c438b5e))
 
+### BREAKING CHANGES
+
+* **bazel:** Use of @angular/bazel rules now requires calling ng_setup_workspace() in your WORKSPACE file.
+
+For example:
+
+    local_repository(
+        name = "angular",
+        path = "node_modules/@angular/bazel",
+    )
+
+    load("@angular//:index.bzl", "ng_setup_workspace")
+
+    ng_setup_workspace()
 
 <a name="6.0.9"></a>
 ## [6.0.9](https://github.com/angular/angular/compare/6.0.8...6.0.9) (2018-07-11)
@@ -42,37 +122,6 @@ Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.
 * **common:** format fractional seconds ([#24844](https://github.com/angular/angular/issues/24844)) ([3c93d07](https://github.com/angular/angular/commit/3c93d07)), closes [#24831](https://github.com/angular/angular/issues/24831)
 
 
-
-<a name="6.1.0-rc.0"></a>
-# [6.1.0-rc.0](https://github.com/angular/angular/compare/6.1.0-beta.3...6.1.0-rc.0) (2018-07-11)
-
-
-### Bug Fixes
-
-* **common:** do not round factional seconds ([#24831](https://github.com/angular/angular/issues/24831)) ([a527c69](https://github.com/angular/angular/commit/a527c69)), closes [#24384](https://github.com/angular/angular/issues/24384)
-* **common:** properly update collection reference in NgForOf ([#24684](https://github.com/angular/angular/issues/24684)) ([ff84c5c](https://github.com/angular/angular/commit/ff84c5c)), closes [#24155](https://github.com/angular/angular/issues/24155)
-* **common:** use correct currency format for locale de-AT ([#24658](https://github.com/angular/angular/issues/24658)) ([dcabb05](https://github.com/angular/angular/commit/dcabb05)), closes [#24609](https://github.com/angular/angular/issues/24609)
-* **compiler:** fix a few non-tree-shakeable code patterns ([#24677](https://github.com/angular/angular/issues/24677)) ([50d4a4f](https://github.com/angular/angular/commit/50d4a4f))
-* **compiler-cli:** Use typescript to resolve modules for metadata ([#22856](https://github.com/angular/angular/issues/22856)) ([0d5f2d3](https://github.com/angular/angular/commit/0d5f2d3))
-* **core:** mark NgModule as not the root if APP_ROOT is set to false ([#24814](https://github.com/angular/angular/issues/24814)) ([1089261](https://github.com/angular/angular/commit/1089261))
-* **core:** use addCustomEqualityTester instead of overriding toEqual ([#22983](https://github.com/angular/angular/issues/22983)) ([0922228](https://github.com/angular/angular/commit/0922228)), closes [#22939](https://github.com/angular/angular/issues/22939)
-* **language-service:** do not overwrite native `Reflect` ([#24299](https://github.com/angular/angular/issues/24299)) ([6881404](https://github.com/angular/angular/commit/6881404)), closes [#21420](https://github.com/angular/angular/issues/21420)
-* **platform-browser:** add missing deps for HammerGesturesPlugin ([#24682](https://github.com/angular/angular/issues/24682)) ([13d60ea](https://github.com/angular/angular/commit/13d60ea))
-* **platform-browser:** mark Meta and Title services as tree shakable providers ([#24815](https://github.com/angular/angular/issues/24815)) ([197387d](https://github.com/angular/angular/commit/197387d))
-* **platform-browser:** workaround wrong import path generated by ngc for DOCUMENT ([#24830](https://github.com/angular/angular/issues/24830)) ([7d27ecc](https://github.com/angular/angular/commit/7d27ecc))
-* **router:** add ability to recover from malformed url ([#23283](https://github.com/angular/angular/issues/23283)) ([86d254d](https://github.com/angular/angular/commit/86d254d)), closes [#21468](https://github.com/angular/angular/issues/21468)
-* **service-worker:** avoid network requests when looking up hashed resources in cache ([#24127](https://github.com/angular/angular/issues/24127)) ([52d43a9](https://github.com/angular/angular/commit/52d43a9))
-
-
-### Features
-
-* **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([3553977](https://github.com/angular/angular/commit/3553977))
-* **core:** add support for using async/await with Jasmine ([#24637](https://github.com/angular/angular/issues/24637)) ([71100e6](https://github.com/angular/angular/commit/71100e6))
-* typescript 2.9 support ([#24652](https://github.com/angular/angular/issues/24652)) ([e3064d5](https://github.com/angular/angular/commit/e3064d5))
-* **service-worker:** add support for `?` in SW config globbing ([#24105](https://github.com/angular/angular/issues/24105)) ([250527c](https://github.com/angular/angular/commit/250527c))
-
-
-
 <a name="6.0.8"></a>
 ## [6.0.8](https://github.com/angular/angular/compare/6.0.7...6.0.8) (2018-07-11)
 
@@ -93,15 +142,6 @@ Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.
 
 * **core:** add support for ShadowDOM v1 ([#24718](https://github.com/angular/angular/issues/24718)) ([6c55a13](https://github.com/angular/angular/commit/6c55a13))
 
-
-<a name="6.1.0-beta.3"></a>
-# [6.1.0-beta.3](https://github.com/angular/angular/compare/6.1.0-beta.2...6.1.0-beta.3) (2018-06-28)
-
-### Bug Fixes
-
-* **animations:** set animations styles properly on platform-server ([#24624](https://github.com/angular/angular/issues/24624)) ([0b356d4](https://github.com/angular/angular/commit/0b356d4))
-* **common:** use correct ICU plural for locale mk ([#24659](https://github.com/angular/angular/issues/24659)) ([64a8584](https://github.com/angular/angular/commit/64a8584))
-
 <a name="6.0.7"></a>
 ## [6.0.7](https://github.com/angular/angular/compare/6.0.6...6.0.7) (2018-06-27)
 
@@ -111,18 +151,6 @@ Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.
 * **animations:** set animations styles properly on platform-server ([#24624](https://github.com/angular/angular/issues/24624)) ([0b356d4](https://github.com/angular/angular/commit/0b356d4))
 * **common:** use correct ICU plural for locale mk ([#24659](https://github.com/angular/angular/issues/24659)) ([64a8584](https://github.com/angular/angular/commit/64a8584))
 
-
-
-<a name="6.1.0-beta.2"></a>
-# [6.1.0-beta.2](https://github.com/angular/angular/compare/6.1.0-beta.1...6.1.0-beta.2) (2018-06-20)
-
-
-### Bug Fixes
-
-* **compiler:** support `.` in import statements. ([#20634](https://github.com/angular/angular/issues/20634)) ([d8f7b29](https://github.com/angular/angular/commit/d8f7b29)), closes [#20363](https://github.com/angular/angular/issues/20363)
-* **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([ccbda9d](https://github.com/angular/angular/commit/ccbda9d))
-
-
 <a name="6.0.6"></a>
 ## [6.0.6](https://github.com/angular/angular/compare/6.0.5...6.0.6) (2018-06-20)
 
@@ -132,39 +160,6 @@ Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.
 * **compiler:** support `.` in import statements. ([#20634](https://github.com/angular/angular/issues/20634)) ([e543c73](https://github.com/angular/angular/commit/e543c73)), closes [#20363](https://github.com/angular/angular/issues/20363)
 * **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([f5b3661](https://github.com/angular/angular/commit/f5b3661))
 
-
-
-<a name="6.1.0-beta.1"></a>
-# [6.1.0-beta.1](https://github.com/angular/angular/compare/6.1.0-beta.0...6.1.0-beta.1) (2018-06-13)
-
-
-### Bug Fixes
-
-* **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([dc4a3d0](https://github.com/angular/angular/commit/dc4a3d0))
-* **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([282d351](https://github.com/angular/angular/commit/282d351))
-* **docs-infra:** use script nomodule to load IE polyfills, skip other polyfills ([#24317](https://github.com/angular/angular/issues/24317)) ([8be6892](https://github.com/angular/angular/commit/8be6892)), closes [#23647](https://github.com/angular/angular/issues/23647)
-* **ivy:** compute transitive scopes from NgModuleDef only ([#24334](https://github.com/angular/angular/issues/24334)) ([1135563](https://github.com/angular/angular/commit/1135563))
-* **ivy:** correctly handle queries with embedded views ([#24418](https://github.com/angular/angular/issues/24418)) ([014949f](https://github.com/angular/angular/commit/014949f))
-* **ivy:** remove debugger statement ([#24480](https://github.com/angular/angular/issues/24480)) ([70ef061](https://github.com/angular/angular/commit/70ef061))
-* **ivy:** special case [style] and [class] bindings for future use ([#23232](https://github.com/angular/angular/issues/23232)) ([1b253e1](https://github.com/angular/angular/commit/1b253e1))
-* **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([5731d07](https://github.com/angular/angular/commit/5731d07)), closes [#10981](https://github.com/angular/angular/issues/10981)
-* **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([3ed2d75](https://github.com/angular/angular/commit/3ed2d75)), closes [#24095](https://github.com/angular/angular/issues/24095)
-
-
-### Features
-
-* **common:** introduce KeyValuePipe ([#24319](https://github.com/angular/angular/issues/24319)) ([2b49bf7](https://github.com/angular/angular/commit/2b49bf7))
-* **core:** export defaultKeyValueDiffers to private api ([#24319](https://github.com/angular/angular/issues/24319)) ([92b278c](https://github.com/angular/angular/commit/92b278c))
-* **core:** expose a Compiler API for accessing module ids from NgModule types ([#24258](https://github.com/angular/angular/issues/24258)) ([bd02b27](https://github.com/angular/angular/commit/bd02b27))
-* **core:** KeyValueDiffer#diff allows null values ([#24319](https://github.com/angular/angular/issues/24319)) ([52ce9d5](https://github.com/angular/angular/commit/52ce9d5))
-* **ivy:** a generic visitor which allows prefixing nodes for ngtsc ([#24230](https://github.com/angular/angular/issues/24230)) ([ca79e11](https://github.com/angular/angular/commit/ca79e11))
-* **ivy:** add support of ApplicationRef.bootstrapModuleFactory ([#23811](https://github.com/angular/angular/issues/23811)) ([e3759f7](https://github.com/angular/angular/commit/e3759f7))
-* **ivy:** namespaced attributes added to output instructions ([#24386](https://github.com/angular/angular/issues/24386)) ([82c5313](https://github.com/angular/angular/commit/82c5313))
-* **ivy:** now supports SVG and MathML elements ([#24377](https://github.com/angular/angular/issues/24377)) ([8c1ac28](https://github.com/angular/angular/commit/8c1ac28))
-* **router:** implement scrolling restoration service ([#20030](https://github.com/angular/angular/issues/20030)) ([49c5234](https://github.com/angular/angular/commit/49c5234)), closes [#13636](https://github.com/angular/angular/issues/13636) [#10929](https://github.com/angular/angular/issues/10929) [#7791](https://github.com/angular/angular/issues/7791) [#6595](https://github.com/angular/angular/issues/6595)
-
-
-
 <a name="6.0.5"></a>
 ## [6.0.5](https://github.com/angular/angular/compare/6.0.4...6.0.5) (2018-06-13)
 
@@ -174,53 +169,6 @@ Note: the RC.1/2 releases on npm accidentally glitched-out midway, so we cut RC.
 * **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([d20877b](https://github.com/angular/angular/commit/d20877b)), closes [#10981](https://github.com/angular/angular/issues/10981)
 * **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([ea2987c](https://github.com/angular/angular/commit/ea2987c)), closes [#24095](https://github.com/angular/angular/issues/24095)
 
-
-
-<a name="6.1.0-beta.0"></a>
-# [6.1.0-beta.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0-beta.0) (2018-06-06)
-
-
-### Bug Fixes
-
-* **animations:** do not throw errors when a destroyed component is animated ([#23836](https://github.com/angular/angular/issues/23836)) ([d2a8687](https://github.com/angular/angular/commit/d2a8687))
-* **animations:** Fix browser detection logic ([#24188](https://github.com/angular/angular/issues/24188)) ([b492b9e](https://github.com/angular/angular/commit/b492b9e))
-* **animations:** properly clean up queried element styles in safari/edge ([#23633](https://github.com/angular/angular/issues/23633)) ([da9ff25](https://github.com/angular/angular/commit/da9ff25))
-* **animations:** retain state styling for nodes that are moved around ([#23534](https://github.com/angular/angular/issues/23534)) ([65211f4](https://github.com/angular/angular/commit/65211f4))
-* **animations:** retain trigger-state for nodes that are moved around ([#24238](https://github.com/angular/angular/issues/24238)) ([8db928d](https://github.com/angular/angular/commit/8db928d))
-* **benchpress:** Fix promise chain in chrome_driver_extension. ([#23458](https://github.com/angular/angular/issues/23458)) ([d4b6c41](https://github.com/angular/angular/commit/d4b6c41))
-* **compiler:** avoid a crash in ngc-wrapped. ([#23468](https://github.com/angular/angular/issues/23468)) ([e1c4930](https://github.com/angular/angular/commit/e1c4930))
-* **compiler:** generate constant array for i18n attributes ([#23837](https://github.com/angular/angular/issues/23837)) ([cfde36d](https://github.com/angular/angular/commit/cfde36d))
-* **compiler:** generate core-compliant hostBindings property ([#24087](https://github.com/angular/angular/issues/24087)) ([01b5acd](https://github.com/angular/angular/commit/01b5acd)), closes [#24013](https://github.com/angular/angular/issues/24013)
-* **compiler:** handle undefined annotation metadata ([#23349](https://github.com/angular/angular/issues/23349)) ([ca776c5](https://github.com/angular/angular/commit/ca776c5))
-* **compiler-cli:** don't rely on incompatible TS method ([#23550](https://github.com/angular/angular/issues/23550)) ([b1f040f](https://github.com/angular/angular/commit/b1f040f))
-* **core:** avoid eager providers re-initialization ([#23559](https://github.com/angular/angular/issues/23559)) ([0c6dc45](https://github.com/angular/angular/commit/0c6dc45))
-* **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([fc03427](https://github.com/angular/angular/commit/fc03427)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
-* **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([b1cda36](https://github.com/angular/angular/commit/b1cda36))
-* **elements:** prevent closure renaming of platform properties ([#23843](https://github.com/angular/angular/issues/23843)) ([d4b8b24](https://github.com/angular/angular/commit/d4b8b24))
-* **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([9367e91](https://github.com/angular/angular/commit/9367e91)), closes [#17195](https://github.com/angular/angular/issues/17195)
-* **platform-server:** avoid clash between server and client style encapsulation attributes ([#24158](https://github.com/angular/angular/issues/24158)) ([b96a3c8](https://github.com/angular/angular/commit/b96a3c8))
-* **platform-server:** avoid dependency cycle when using http interceptor ([#24229](https://github.com/angular/angular/issues/24229)) ([60aa943](https://github.com/angular/angular/commit/60aa943)), closes [#23023](https://github.com/angular/angular/issues/23023)
-* **platform-server:** don't reflect innerHTML property to attibute ([#24213](https://github.com/angular/angular/issues/24213)) ([6a663a4](https://github.com/angular/angular/commit/6a663a4)), closes [#19278](https://github.com/angular/angular/issues/19278)
-* **platform-server:** provide Domino DOM types globally ([#24116](https://github.com/angular/angular/issues/24116)) ([c73196e](https://github.com/angular/angular/commit/c73196e)), closes [#23280](https://github.com/angular/angular/issues/23280) [#23133](https://github.com/angular/angular/issues/23133)
-* **router:** avoid freezing queryParams in-place ([#22663](https://github.com/angular/angular/issues/22663)) ([89f64e5](https://github.com/angular/angular/commit/89f64e5)), closes [#22617](https://github.com/angular/angular/issues/22617)
-* **router:** cache route handle if found ([#22475](https://github.com/angular/angular/issues/22475)) ([4cfa571](https://github.com/angular/angular/commit/4cfa571)), closes [#22474](https://github.com/angular/angular/issues/22474)
-* **router:** correct the segment parsing so it won't break on ampersand ([#23684](https://github.com/angular/angular/issues/23684)) ([553a680](https://github.com/angular/angular/commit/553a680))
-* **service-worker:** add badge to NOTIFICATION_OPTION_NAMES ([#23241](https://github.com/angular/angular/issues/23241)) ([fb59b2d](https://github.com/angular/angular/commit/fb59b2d)), closes [#23196](https://github.com/angular/angular/issues/23196)
-* **service-worker:** check platformBrowser before accessing navigator.serviceWorker ([#21231](https://github.com/angular/angular/issues/21231)) ([0bdd30e](https://github.com/angular/angular/commit/0bdd30e))
-* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([e0ed59e](https://github.com/angular/angular/commit/e0ed59e)), closes [#23526](https://github.com/angular/angular/issues/23526)
-* **service-worker:** deprecate `versionedFiles` in asset-group resources ([#23584](https://github.com/angular/angular/issues/23584)) ([1d378e2](https://github.com/angular/angular/commit/1d378e2))
-
-
-### Features
-
-* **compiler:** support `// ...` and `// TODO` in mock compiler expectations ([#23441](https://github.com/angular/angular/issues/23441)) ([c6b206e](https://github.com/angular/angular/commit/c6b206e))
-* **compiler-cli:** update `tsickle` to `0.29.x` ([#24233](https://github.com/angular/angular/issues/24233)) ([f69ac67](https://github.com/angular/angular/commit/f69ac67))
-* **platform-browser:** add HammerJS lazy-loader symbols to public API ([#23943](https://github.com/angular/angular/issues/23943)) ([26fbf1d](https://github.com/angular/angular/commit/26fbf1d))
-* **platform-browser:** allow lazy-loading HammerJS ([#23906](https://github.com/angular/angular/issues/23906)) ([313bdce](https://github.com/angular/angular/commit/313bdce))
-* **platform-server:** use EventManagerPlugin on the server ([#24132](https://github.com/angular/angular/issues/24132)) ([d6595eb](https://github.com/angular/angular/commit/d6595eb))
-* **router:** add navigation execution context info to activation hooks ([#24204](https://github.com/angular/angular/issues/24204)) ([20c463e](https://github.com/angular/angular/commit/20c463e)), closes [#24202](https://github.com/angular/angular/issues/24202)
-
-
 <a name="6.0.4"></a>
 ## [6.0.4](https://github.com/angular/angular/compare/6.0.3...6.0.4) (2018-06-06)
 
diff --git a/package.json b/package.json
index ec0c270098..3ea3ec2179 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "6.1.0-rc.3",
+  "version": "6.1.0",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",

From f902b5ec59a7499dc3bb02d9f20c83ef60028a7c Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 24 Jul 2018 16:05:23 -0700
Subject: [PATCH 570/582] feat(ivy): resolve forwardRef() for queries (#25080)

@ContentChild[ren] and @ViewChild[ren] can contain a forwardRef() to a
type. This commit allows ngtsc to unwrap the forward reference and
deal with the node inside.

It includes two modes of support for forward reference resolution -
a foreign function resolver which understands deeply nested forward
references in expressions that are being statically evaluated, and
an unwrapForwardRef() function which deals only with top-level nodes.

Both will be useful in the future, but for now only unwrapForwardRef()
is used.

PR Close #25080
---
 .../src/ngtsc/annotations/src/directive.ts    |  7 +-
 .../src/ngtsc/annotations/src/ng_module.ts    |  4 +-
 .../src/ngtsc/annotations/src/util.ts         | 68 ++++++++++++++++++-
 .../src/ngtsc/metadata/src/resolver.ts        | 36 +++++-----
 .../test/ngtsc/fake_core/index.ts             |  6 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 24 +++++++
 6 files changed, 122 insertions(+), 23 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 36909e4226..5b8f39063d 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -14,7 +14,7 @@ import {Reference, filterToMembersWithDecorator, reflectObjectLiteral, staticall
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {getConstructorDependencies, isAngularCore, unwrapExpression} from './util';
+import {getConstructorDependencies, isAngularCore, unwrapExpression, unwrapForwardRef} from './util';
 
 const EMPTY_OBJECT: {[key: string]: string} = {};
 
@@ -156,12 +156,13 @@ export function extractQueryMetadata(
     throw new Error(`@${name} must have arguments`);
   }
   const first = name === 'ViewChild' || name === 'ContentChild';
-  const arg = staticallyResolve(args[0], reflector, checker);
+  const node = unwrapForwardRef(args[0], reflector);
+  const arg = staticallyResolve(node, reflector, checker);
 
   // Extract the predicate
   let predicate: Expression|string[]|null = null;
   if (arg instanceof Reference) {
-    predicate = new WrappedNodeExpr(args[0]);
+    predicate = new WrappedNodeExpr(node);
   } else if (typeof arg === 'string') {
     predicate = [arg];
   } else if (isStringArrayOrDie(arg, '@' + name)) {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index f0fe5b322d..68f6fd8744 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -67,14 +67,14 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
     if (ngModule.has('imports')) {
       const importsMeta = staticallyResolve(
           ngModule.get('imports') !, this.reflector, this.checker,
-          node => this._extractModuleFromModuleWithProvidersFn(node));
+          ref => this._extractModuleFromModuleWithProvidersFn(ref.node));
       imports = resolveTypeList(importsMeta, 'imports');
     }
     let exports: Reference[] = [];
     if (ngModule.has('exports')) {
       const exportsMeta = staticallyResolve(
           ngModule.get('exports') !, this.reflector, this.checker,
-          node => this._extractModuleFromModuleWithProvidersFn(node));
+          ref => this._extractModuleFromModuleWithProvidersFn(ref.node));
       exports = resolveTypeList(exportsMeta, 'exports');
     }
 
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index fe82cfdfca..8cd5ea2caf 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -10,7 +10,7 @@ import {Expression, R3DependencyMetadata, R3ResolvedDependencyType, WrappedNodeE
 import * as ts from 'typescript';
 
 import {Decorator, ReflectionHost} from '../../host';
-import {Reference} from '../../metadata';
+import {AbsoluteReference, Reference} from '../../metadata';
 
 export function getConstructorDependencies(
     clazz: ts.ClassDeclaration, reflector: ReflectionHost,
@@ -103,3 +103,69 @@ export function unwrapExpression(node: ts.Expression): ts.Expression {
   }
   return node;
 }
+
+function expandForwardRef(arg: ts.Expression): ts.Expression|null {
+  if (!ts.isArrowFunction(arg) && !ts.isFunctionExpression(arg)) {
+    return null;
+  }
+
+  const body = arg.body;
+  // Either the body is a ts.Expression directly, or a block with a single return statement.
+  if (ts.isBlock(body)) {
+    // Block body - look for a single return statement.
+    if (body.statements.length !== 1) {
+      return null;
+    }
+    const stmt = body.statements[0];
+    if (!ts.isReturnStatement(stmt) || stmt.expression === undefined) {
+      return null;
+    }
+    return stmt.expression;
+  } else {
+    // Shorthand body - return as an expression.
+    return body;
+  }
+}
+
+/**
+ * Possibly resolve a forwardRef() expression into the inner value.
+ *
+ * @param node the forwardRef() expression to resolve
+ * @param reflector a ReflectionHost
+ * @returns the resolved expression, if the original expression was a forwardRef(), or the original
+ * expression otherwise
+ */
+export function unwrapForwardRef(node: ts.Expression, reflector: ReflectionHost): ts.Expression {
+  if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression) ||
+      node.arguments.length !== 1) {
+    return node;
+  }
+  const expr = expandForwardRef(node.arguments[0]);
+  if (expr === null) {
+    return node;
+  }
+  const imp = reflector.getImportOfIdentifier(node.expression);
+  if (imp === null || imp.from !== '@angular/core' || imp.name !== 'forwardRef') {
+    return node;
+  } else {
+    return expr;
+  }
+}
+
+/**
+ * A foreign function resolver for `staticallyResolve` which unwraps forwardRef() expressions.
+ *
+ * @param ref a Reference to the declaration of the function being called (which might be
+ * forwardRef)
+ * @param args the arguments to the invocation of the forwardRef expression
+ * @returns an unwrapped argument if `ref` pointed to forwardRef, or null otherwise
+ */
+export function forwardRefResolver(
+    ref: Reference<ts.FunctionDeclaration|ts.MethodDeclaration>,
+    args: ts.Expression[]): ts.Expression|null {
+  if (!(ref instanceof AbsoluteReference) || ref.moduleName !== '@angular/core' ||
+      ref.symbolName !== 'forwardRef' || args.length !== 1) {
+    return null;
+  }
+  return expandForwardRef(args[0]);
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index 98a4e7cb21..698d3ab15d 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -84,8 +84,8 @@ type Scope = Map<ts.ParameterDeclaration, ResolvedValue>;
  * For example, if an expression evaluates to a function or class definition, it will be returned
  * as a `Reference` (assuming references are allowed in evaluation).
  */
-export abstract class Reference {
-  constructor(readonly node: ts.Node) {}
+export abstract class Reference<T extends ts.Node = ts.Node> {
+  constructor(readonly node: T) {}
 
   /**
    * Whether an `Expression` can be generated which references the node.
@@ -110,8 +110,8 @@ export abstract class Reference {
  * This is used for returning references to things like method declarations, which are not directly
  * referenceable.
  */
-export class NodeReference extends Reference {
-  constructor(node: ts.Node, readonly moduleName: string|null) { super(node); }
+export class NodeReference<T extends ts.Node = ts.Node> extends Reference<T> {
+  constructor(node: T, readonly moduleName: string|null) { super(node); }
 
   toExpression(context: ts.SourceFile): null { return null; }
 
@@ -123,8 +123,8 @@ export class NodeReference extends Reference {
  *
  * Imports generated by `ResolvedReference`s are always relative.
  */
-export class ResolvedReference extends Reference {
-  constructor(node: ts.Node, protected identifier: ts.Identifier) { super(node); }
+export class ResolvedReference<T extends ts.Node = ts.Node> extends Reference<T> {
+  constructor(node: T, protected identifier: ts.Identifier) { super(node); }
 
   readonly expressable = true;
 
@@ -169,7 +169,7 @@ export class ResolvedReference extends Reference {
 export class AbsoluteReference extends Reference {
   constructor(
       node: ts.Node, private identifier: ts.Identifier, readonly moduleName: string,
-      private symbolName: string) {
+      readonly symbolName: string) {
     super(node);
   }
 
@@ -203,8 +203,9 @@ export class AbsoluteReference extends Reference {
  */
 export function staticallyResolve(
     node: ts.Expression, host: ReflectionHost, checker: ts.TypeChecker,
-    foreignFunctionResolver?: (node: ts.FunctionDeclaration | ts.MethodDeclaration) =>
-        ts.Expression | null): ResolvedValue {
+    foreignFunctionResolver?:
+        (node: Reference<ts.FunctionDeclaration|ts.MethodDeclaration>, args: ts.Expression[]) =>
+            ts.Expression | null): ResolvedValue {
   return new StaticInterpreter(host, checker).visit(node, {
     absoluteModuleName: null,
     scope: new Map<ts.ParameterDeclaration, ResolvedValue>(), foreignFunctionResolver,
@@ -253,7 +254,9 @@ const UNARY_OPERATORS = new Map<ts.SyntaxKind, (a: any) => any>([
 interface Context {
   absoluteModuleName: string|null;
   scope: Scope;
-  foreignFunctionResolver?(node: ts.FunctionDeclaration|ts.MethodDeclaration): ts.Expression|null;
+  foreignFunctionResolver?
+      (ref: Reference<ts.FunctionDeclaration|ts.MethodDeclaration>,
+       args: ReadonlyArray<ts.Expression>): ts.Expression|null;
 }
 
 class StaticInterpreter {
@@ -516,7 +519,7 @@ class StaticInterpreter {
     const lhs = this.visitExpression(node.expression, context);
     if (!(lhs instanceof Reference)) {
       throw new Error(`attempting to call something that is not a function: ${lhs}`);
-    } else if (!isFunctionOrMethodDeclaration(lhs.node)) {
+    } else if (!isFunctionOrMethodReference(lhs)) {
       throw new Error(
           `calling something that is not a function declaration? ${ts.SyntaxKind[lhs.node.kind]}`);
     }
@@ -528,10 +531,11 @@ class StaticInterpreter {
     if (fn.body === undefined) {
       let expr: ts.Expression|null = null;
       if (context.foreignFunctionResolver) {
-        expr = context.foreignFunctionResolver(fn);
+        expr = context.foreignFunctionResolver(lhs, node.arguments);
       }
       if (expr === null) {
-        throw new Error(`could not resolve foreign function declaration`);
+        throw new Error(
+            `could not resolve foreign function declaration: ${node.getSourceFile().fileName} ${(lhs.node.name as ts.Identifier).text}`);
       }
 
       // If the function is declared in a different file, resolve the foreign function expression
@@ -642,9 +646,9 @@ class StaticInterpreter {
   }
 }
 
-function isFunctionOrMethodDeclaration(node: ts.Node): node is ts.FunctionDeclaration|
-    ts.MethodDeclaration {
-  return ts.isFunctionDeclaration(node) || ts.isMethodDeclaration(node);
+function isFunctionOrMethodReference(ref: Reference<ts.Node>):
+    ref is Reference<ts.FunctionDeclaration|ts.MethodDeclaration> {
+  return ts.isFunctionDeclaration(ref.node) || ts.isMethodDeclaration(ref.node);
 }
 
 function literal(value: ResolvedValue): any {
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index e20fecbc82..2f5dbf682f 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -48,4 +48,8 @@ export class ChangeDetectorRef {}
 export class ElementRef {}
 export class Injector {}
 export class TemplateRef {}
-export class ViewContainerRef {}
\ No newline at end of file
+export class ViewContainerRef {}
+
+export function forwardRef<T>(fn: () => T): T {
+  return fn();
+}
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 044480c114..352bcb4e02 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -449,6 +449,30 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain(`i0.ɵQ(1, ["test1"], true)`);
   });
 
+  it('should handle queries that use forwardRef', () => {
+    writeConfig();
+    write(`test.ts`, `
+        import {Component, ContentChild, TemplateRef, ViewContainerRef, forwardRef} from '@angular/core';
+
+        @Component({
+          selector: 'test',
+          template: '<div #foo></div>',
+        })
+        class FooCmp {
+          @ContentChild(forwardRef(() => TemplateRef)) child: any;
+
+          @ContentChild(forwardRef(function() { return ViewContainerRef; })) child2: any;
+        }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+    const jsContents = getContents('test.js');
+    expect(jsContents).toContain(`i0.ɵQ(null, TemplateRef, true)`);
+    expect(jsContents).toContain(`i0.ɵQ(null, ViewContainerRef, true)`);
+  });
+
   it('should generate host bindings for directives', () => {
     writeConfig();
     write(`test.ts`, `

From ed7aa1c3e57f5462d8006991f0bd8af9bec4d925 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 24 Jul 2018 16:10:15 -0700
Subject: [PATCH 571/582] fix(ivy): force new imports for .d.ts files (#25080)

When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.

In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.

ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.

In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.

This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.

PR Close #25080
---
 .../src/ngtsc/annotations/src/ng_module.ts    |  8 +--
 .../ngtsc/annotations/src/selector_scope.ts   |  4 +-
 .../src/ngtsc/annotations/src/util.ts         | 13 ++--
 .../compiler-cli/src/ngtsc/metadata/index.ts  |  2 +-
 .../src/ngtsc/metadata/src/resolver.ts        | 41 +++++++++++--
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 59 +++++++++++++++++++
 packages/compiler/src/compiler.ts             |  1 +
 .../src/render3/r3_module_compiler.ts         | 18 +++---
 packages/compiler/src/render3/util.ts         |  5 ++
 packages/core/src/render3/jit/module.ts       | 19 ++++--
 10 files changed, 136 insertions(+), 34 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index 68f6fd8744..1421362c39 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -14,7 +14,7 @@ import {Reference, ResolvedValue, reflectObjectLiteral, staticallyResolve} from
 import {AnalysisOutput, CompileResult, DecoratorHandler} from '../../transform';
 
 import {SelectorScopeRegistry} from './selector_scope';
-import {getConstructorDependencies, isAngularCore, referenceToExpression, unwrapExpression} from './util';
+import {getConstructorDependencies, isAngularCore, toR3Reference, unwrapExpression} from './util';
 
 export interface NgModuleAnalysis {
   ngModuleDef: R3NgModuleMetadata;
@@ -87,9 +87,9 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
     const ngModuleDef: R3NgModuleMetadata = {
       type: new WrappedNodeExpr(node.name !),
       bootstrap: [],
-      declarations: declarations.map(decl => referenceToExpression(decl, context)),
-      exports: exports.map(exp => referenceToExpression(exp, context)),
-      imports: imports.map(imp => referenceToExpression(imp, context)),
+      declarations: declarations.map(decl => toR3Reference(decl, context)),
+      exports: exports.map(exp => toR3Reference(exp, context)),
+      imports: imports.map(imp => toR3Reference(imp, context)),
       emitInline: false,
     };
 
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
index 997c60c96e..8927f24c84 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
@@ -13,7 +13,7 @@ import {ReflectionHost} from '../../host';
 import {AbsoluteReference, Reference, reflectTypeEntityToDeclaration} from '../../metadata';
 import {reflectIdentifierOfDeclaration, reflectNameOfDeclaration} from '../../metadata/src/reflector';
 
-import {referenceToExpression} from './util';
+import {toR3Reference} from './util';
 
 
 
@@ -384,7 +384,7 @@ function convertReferenceMap(
     map: Map<string, Reference>, context: ts.SourceFile): Map<string, Expression> {
   return new Map<string, Expression>(Array.from(map.entries()).map(([selector, ref]): [
     string, Expression
-  ] => [selector, referenceToExpression(ref, context)]));
+  ] => [selector, toR3Reference(ref, context).value]));
 }
 
 function convertScopeToExpressions(
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index 8cd5ea2caf..45cc51d530 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, R3DependencyMetadata, R3ResolvedDependencyType, WrappedNodeExpr} from '@angular/compiler';
+import {Expression, R3DependencyMetadata, R3Reference, R3ResolvedDependencyType, WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Decorator, ReflectionHost} from '../../host';
-import {AbsoluteReference, Reference} from '../../metadata';
+import {AbsoluteReference, ImportMode, Reference} from '../../metadata';
 
 export function getConstructorDependencies(
     clazz: ts.ClassDeclaration, reflector: ReflectionHost,
@@ -79,12 +79,13 @@ export function getConstructorDependencies(
   return useType;
 }
 
-export function referenceToExpression(ref: Reference, context: ts.SourceFile): Expression {
-  const exp = ref.toExpression(context);
-  if (exp === null) {
+export function toR3Reference(ref: Reference, context: ts.SourceFile): R3Reference {
+  const value = ref.toExpression(context, ImportMode.UseExistingImport);
+  const type = ref.toExpression(context, ImportMode.ForceNewImport);
+  if (value === null || type === null) {
     throw new Error(`Could not refer to ${ts.SyntaxKind[ref.node.kind]}`);
   }
-  return exp;
+  return {value, type};
 }
 
 export function isAngularCore(decorator: Decorator): boolean {
diff --git a/packages/compiler-cli/src/ngtsc/metadata/index.ts b/packages/compiler-cli/src/ngtsc/metadata/index.ts
index dd4a581356..3178a1376e 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/index.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/index.ts
@@ -7,4 +7,4 @@
  */
 
 export {TypeScriptReflectionHost, filterToMembersWithDecorator, findMember, reflectObjectLiteral, reflectTypeEntityToDeclaration} from './src/reflector';
-export {AbsoluteReference, Reference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';
+export {AbsoluteReference, ImportMode, Reference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index 698d3ab15d..c523822c57 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -78,6 +78,11 @@ export interface ResolvedValueArray extends Array<ResolvedValue> {}
  */
 type Scope = Map<ts.ParameterDeclaration, ResolvedValue>;
 
+export enum ImportMode {
+  UseExistingImport,
+  ForceNewImport,
+}
+
 /**
  * A reference to a `ts.Node`.
  *
@@ -99,7 +104,7 @@ export abstract class Reference<T extends ts.Node = ts.Node> {
    * This could be a local variable reference, if the symbol is imported, or it could be a new
    * import if needed.
    */
-  abstract toExpression(context: ts.SourceFile): Expression|null;
+  abstract toExpression(context: ts.SourceFile, importMode?: ImportMode): Expression|null;
 
   abstract withIdentifier(identifier: ts.Identifier): Reference;
 }
@@ -115,7 +120,7 @@ export class NodeReference<T extends ts.Node = ts.Node> extends Reference<T> {
 
   toExpression(context: ts.SourceFile): null { return null; }
 
-  withIdentifier(identifier: ts.Identifier): NodeReference { return this; }
+  withIdentifier(identifier: ts.Identifier): NodeReference<T> { return this; }
 }
 
 /**
@@ -128,8 +133,20 @@ export class ResolvedReference<T extends ts.Node = ts.Node> extends Reference<T>
 
   readonly expressable = true;
 
-  toExpression(context: ts.SourceFile): Expression {
-    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.identifier).getSourceFile()) {
+  toExpression(context: ts.SourceFile, importMode: ImportMode = ImportMode.UseExistingImport):
+      Expression {
+    let compareCtx: ts.Node|null = null;
+    switch (importMode) {
+      case ImportMode.UseExistingImport:
+        compareCtx = this.identifier;
+        break;
+      case ImportMode.ForceNewImport:
+        compareCtx = this.node;
+        break;
+      default:
+        throw new Error(`Unsupported ImportMode: ${ImportMode[importMode]}`);
+    }
+    if (ts.getOriginalNode(context) === ts.getOriginalNode(compareCtx).getSourceFile()) {
       return new WrappedNodeExpr(this.identifier);
     } else {
       // Relative import from context -> this.node.getSourceFile().
@@ -175,8 +192,20 @@ export class AbsoluteReference extends Reference {
 
   readonly expressable = true;
 
-  toExpression(context: ts.SourceFile): Expression {
-    if (ts.getOriginalNode(context) === ts.getOriginalNode(this.identifier).getSourceFile()) {
+  toExpression(context: ts.SourceFile, importMode: ImportMode = ImportMode.UseExistingImport):
+      Expression {
+    let compareCtx: ts.Node|null = null;
+    switch (importMode) {
+      case ImportMode.UseExistingImport:
+        compareCtx = this.identifier;
+        break;
+      case ImportMode.ForceNewImport:
+        compareCtx = this.node;
+        break;
+      default:
+        throw new Error(`Unsupported ImportMode: ${ImportMode[importMode]}`);
+    }
+    if (ts.getOriginalNode(context) === ts.getOriginalNode(compareCtx).getSourceFile()) {
       return new WrappedNodeExpr(this.identifier);
     } else {
       return new ExternalExpr(new ExternalReference(this.moduleName, this.symbolName));
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 352bcb4e02..be3cc935d8 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -246,6 +246,65 @@ describe('ngtsc behavioral tests', () => {
     expect(dtsContents).toContain('static ngInjectorDef: i0.ɵInjectorDef');
   });
 
+  it('should compile NgModules with references to local components', () => {
+    writeConfig();
+    write('test.ts', `
+      import {NgModule} from '@angular/core';
+      import {Foo} from './foo';
+
+      @NgModule({
+        declarations: [Foo],
+      })
+      export class FooModule {}
+    `);
+    write('foo.ts', `
+      import {Component} from '@angular/core';
+      @Component({selector: 'foo', template: ''})
+      export class Foo {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    const dtsContents = getContents('test.d.ts');
+
+    expect(jsContents).toContain('import { Foo } from \'./foo\';');
+    expect(jsContents).not.toMatch(/as i[0-9] from '.\/foo'/);
+    expect(dtsContents).toContain('as i1 from \'./foo\';');
+  });
+
+  it('should compile NgModules with references to absolute components', () => {
+    writeConfig();
+    write('test.ts', `
+      import {NgModule} from '@angular/core';
+      import {Foo} from 'foo';
+
+      @NgModule({
+        declarations: [Foo],
+      })
+      export class FooModule {}
+    `);
+    write('node_modules/foo/index.d.ts', `
+      import * as i0 from '@angular/core';
+      export class Foo {
+        static ngComponentDef: i0.ɵComponentDef<Foo, 'foo'>;
+      }
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+
+    const jsContents = getContents('test.js');
+    const dtsContents = getContents('test.d.ts');
+
+    expect(jsContents).toContain('import { Foo } from \'foo\';');
+    expect(jsContents).not.toMatch(/as i[0-9] from 'foo'/);
+    expect(dtsContents).toContain('as i1 from \'foo\';');
+  });
+
   it('should compile Pipes without errors', () => {
     writeConfig();
     write('test.ts', `
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index 2f81a1cd85..ca762310af 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -86,5 +86,6 @@ export {R3DependencyMetadata, R3FactoryMetadata, R3ResolvedDependencyType} from
 export {compileInjector, compileNgModule, R3InjectorMetadata, R3NgModuleMetadata} from './render3/r3_module_compiler';
 export {compilePipeFromMetadata, R3PipeMetadata} from './render3/r3_pipe_compiler';
 export {makeBindingParser, parseTemplate} from './render3/view/template';
+export {R3Reference} from './render3/util';
 export {compileComponentFromMetadata, compileDirectiveFromMetadata, parseHostBindings} from './render3/view/compiler';
 // This file only reexports content of the `src` folder. Keep it that way.
\ No newline at end of file
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index e9938bf5a5..a1153a0ef7 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -15,7 +15,7 @@ import {OutputContext} from '../util';
 
 import {R3DependencyMetadata, compileFactoryFunction} from './r3_factory';
 import {Identifiers as R3} from './r3_identifiers';
-import {convertMetaToOutput, mapToMapExpression} from './util';
+import {R3Reference, convertMetaToOutput, mapToMapExpression} from './util';
 
 export interface R3NgModuleDef {
   expression: o.Expression;
@@ -40,17 +40,17 @@ export interface R3NgModuleMetadata {
   /**
    * An array of expressions representing the directives and pipes declared by the module.
    */
-  declarations: o.Expression[];
+  declarations: R3Reference[];
 
   /**
    * An array of expressions representing the imports of the module.
    */
-  imports: o.Expression[];
+  imports: R3Reference[];
 
   /**
    * An array of expressions representing the exports of the module.
    */
-  exports: o.Expression[];
+  exports: R3Reference[];
 
   /**
    * Whether to emit the selector scope values (declarations, imports, exports) inline into the
@@ -68,9 +68,9 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
   const expression = o.importExpr(R3.defineNgModule).callFn([mapToMapExpression({
     type: moduleType,
     bootstrap: o.literalArr(bootstrap),
-    declarations: o.literalArr(declarations),
-    imports: o.literalArr(imports),
-    exports: o.literalArr(exports),
+    declarations: o.literalArr(declarations.map(ref => ref.value)),
+    imports: o.literalArr(imports.map(ref => ref.value)),
+    exports: o.literalArr(exports.map(ref => ref.value)),
   })]);
 
   const type = new o.ExpressionType(o.importExpr(R3.NgModuleDef, [
@@ -148,7 +148,7 @@ function accessExportScope(module: o.Expression): o.Expression {
   return new o.ReadPropExpr(selectorScope, 'exported');
 }
 
-function tupleTypeOf(exp: o.Expression[]): o.Type {
-  const types = exp.map(type => o.typeofExpr(type));
+function tupleTypeOf(exp: R3Reference[]): o.Type {
+  const types = exp.map(ref => o.typeofExpr(ref.type));
   return exp.length > 0 ? o.expressionType(o.literalArr(types)) : o.NONE_TYPE;
 }
\ No newline at end of file
diff --git a/packages/compiler/src/render3/util.ts b/packages/compiler/src/render3/util.ts
index ae619ef2da..c006c298f5 100644
--- a/packages/compiler/src/render3/util.ts
+++ b/packages/compiler/src/render3/util.ts
@@ -47,3 +47,8 @@ export function typeWithParameters(type: o.Expression, numParams: number): o.Exp
   }
   return o.expressionType(type, null, params);
 }
+
+export interface R3Reference {
+  value: o.Expression;
+  type: o.Expression;
+}
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 823f30a001..91e1297306 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, R3InjectorMetadata, R3NgModuleMetadata, WrappedNodeExpr, compileInjector, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
+import {Expression, R3InjectorMetadata, R3NgModuleMetadata, R3Reference, WrappedNodeExpr, compileInjector, compileNgModule as compileR3NgModule, jitExpression} from '@angular/compiler';
 
 import {ModuleWithProviders, NgModule, NgModuleDefInternal, NgModuleTransitiveScopes} from '../../metadata/ng_module';
 import {Type} from '../../type';
@@ -28,11 +28,13 @@ export function compileNgModule(type: Type<any>, ngModule: NgModule): void {
         const meta: R3NgModuleMetadata = {
           type: wrap(type),
           bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(wrap),
-          declarations: declarations.map(wrap),
-          imports:
-              flatten(ngModule.imports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
-          exports:
-              flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders).map(wrap),
+          declarations: declarations.map(wrapReference),
+          imports: flatten(ngModule.imports || EMPTY_ARRAY)
+                       .map(expandModuleWithProviders)
+                       .map(wrapReference),
+          exports: flatten(ngModule.exports || EMPTY_ARRAY)
+                       .map(expandModuleWithProviders)
+                       .map(wrapReference),
           emitInline: true,
         };
         const res = compileR3NgModule(meta);
@@ -210,6 +212,11 @@ function wrap(value: Type<any>): Expression {
   return new WrappedNodeExpr(value);
 }
 
+function wrapReference(value: Type<any>): R3Reference {
+  const wrapped = wrap(value);
+  return {value: wrapped, type: wrapped};
+}
+
 function isModuleWithProviders(value: any): value is ModuleWithProviders {
   return (value as{ngModule?: any}).ngModule !== undefined;
 }

From 13a0d527f6a85349a2d454ab47533aeda521598b Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 25 Jul 2018 11:16:00 -0700
Subject: [PATCH 572/582] fix(ivy): correctly write cross-file references
 (#25080)

There is a bug in the existing handling for cross-file references.
Suppose there are two files, module.ts and component.ts.

component.ts declares two components, one of which uses the other.
In the Ivy model, this means the component will get a directives:
reference to the other in its defineComponent call.

That reference is generated by looking at the declared components
of the module (in module.ts). However, the way ngtsc tracks this
reference, it ends up comparing the identifier of the component
in module.ts with the component.ts file, detecting they're not in
the same file, and generating a relative import.

This commit changes ngtsc to track all identifiers of a reference,
including the one by which it is declared. This allows toExpression()
to correctly decide that a local reference is okay in component.ts.

PR Close #25080
---
 .../src/ngtsc/metadata/src/resolver.ts        | 74 +++++++++----------
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 34 +++++++++
 2 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
index c523822c57..66f4e66648 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
@@ -106,7 +106,7 @@ export abstract class Reference<T extends ts.Node = ts.Node> {
    */
   abstract toExpression(context: ts.SourceFile, importMode?: ImportMode): Expression|null;
 
-  abstract withIdentifier(identifier: ts.Identifier): Reference;
+  abstract addIdentifier(identifier: ts.Identifier): void;
 }
 
 /**
@@ -120,7 +120,7 @@ export class NodeReference<T extends ts.Node = ts.Node> extends Reference<T> {
 
   toExpression(context: ts.SourceFile): null { return null; }
 
-  withIdentifier(identifier: ts.Identifier): NodeReference<T> { return this; }
+  addIdentifier(identifier: ts.Identifier): void {}
 }
 
 /**
@@ -129,25 +129,18 @@ export class NodeReference<T extends ts.Node = ts.Node> extends Reference<T> {
  * Imports generated by `ResolvedReference`s are always relative.
  */
 export class ResolvedReference<T extends ts.Node = ts.Node> extends Reference<T> {
-  constructor(node: T, protected identifier: ts.Identifier) { super(node); }
+  protected identifiers: ts.Identifier[] = [];
+
+  constructor(node: T, protected primaryIdentifier: ts.Identifier) { super(node); }
 
   readonly expressable = true;
 
   toExpression(context: ts.SourceFile, importMode: ImportMode = ImportMode.UseExistingImport):
       Expression {
-    let compareCtx: ts.Node|null = null;
-    switch (importMode) {
-      case ImportMode.UseExistingImport:
-        compareCtx = this.identifier;
-        break;
-      case ImportMode.ForceNewImport:
-        compareCtx = this.node;
-        break;
-      default:
-        throw new Error(`Unsupported ImportMode: ${ImportMode[importMode]}`);
-    }
-    if (ts.getOriginalNode(context) === ts.getOriginalNode(compareCtx).getSourceFile()) {
-      return new WrappedNodeExpr(this.identifier);
+    const localIdentifier =
+        pickIdentifier(context, this.primaryIdentifier, this.identifiers, importMode);
+    if (localIdentifier !== null) {
+      return new WrappedNodeExpr(localIdentifier);
     } else {
       // Relative import from context -> this.node.getSourceFile().
       // TODO(alxhub): investigate the impact of multiple source roots here.
@@ -165,16 +158,14 @@ export class ResolvedReference<T extends ts.Node = ts.Node> extends Reference<T>
       // same.
       if (relative === './') {
         // Same file after all.
-        return new WrappedNodeExpr(this.identifier);
+        return new WrappedNodeExpr(this.primaryIdentifier);
       } else {
-        return new ExternalExpr(new ExternalReference(relative, this.identifier.text));
+        return new ExternalExpr(new ExternalReference(relative, this.primaryIdentifier.text));
       }
     }
   }
 
-  withIdentifier(identifier: ts.Identifier): ResolvedReference {
-    return new ResolvedReference(this.node, identifier);
-  }
+  addIdentifier(identifier: ts.Identifier): void { this.identifiers.push(identifier); }
 }
 
 /**
@@ -184,8 +175,9 @@ export class ResolvedReference<T extends ts.Node = ts.Node> extends Reference<T>
  * the module specifier will be an absolute module name, not a relative path.
  */
 export class AbsoluteReference extends Reference {
+  private identifiers: ts.Identifier[] = [];
   constructor(
-      node: ts.Node, private identifier: ts.Identifier, readonly moduleName: string,
+      node: ts.Node, private primaryIdentifier: ts.Identifier, readonly moduleName: string,
       readonly symbolName: string) {
     super(node);
   }
@@ -194,26 +186,29 @@ export class AbsoluteReference extends Reference {
 
   toExpression(context: ts.SourceFile, importMode: ImportMode = ImportMode.UseExistingImport):
       Expression {
-    let compareCtx: ts.Node|null = null;
-    switch (importMode) {
-      case ImportMode.UseExistingImport:
-        compareCtx = this.identifier;
-        break;
-      case ImportMode.ForceNewImport:
-        compareCtx = this.node;
-        break;
-      default:
-        throw new Error(`Unsupported ImportMode: ${ImportMode[importMode]}`);
-    }
-    if (ts.getOriginalNode(context) === ts.getOriginalNode(compareCtx).getSourceFile()) {
-      return new WrappedNodeExpr(this.identifier);
+    const localIdentifier =
+        pickIdentifier(context, this.primaryIdentifier, this.identifiers, importMode);
+    if (localIdentifier !== null) {
+      return new WrappedNodeExpr(localIdentifier);
     } else {
       return new ExternalExpr(new ExternalReference(this.moduleName, this.symbolName));
     }
   }
 
-  withIdentifier(identifier: ts.Identifier): AbsoluteReference {
-    return new AbsoluteReference(this.node, identifier, this.moduleName, this.symbolName);
+  addIdentifier(identifier: ts.Identifier): void { this.identifiers.push(identifier); }
+}
+
+function pickIdentifier(
+    context: ts.SourceFile, primary: ts.Identifier, secondaries: ts.Identifier[],
+    mode: ImportMode): ts.Identifier|null {
+  context = ts.getOriginalNode(context) as ts.SourceFile;
+  let localIdentifier: ts.Identifier|null = null;
+  if (ts.getOriginalNode(primary).getSourceFile() === context) {
+    return primary;
+  } else if (mode === ImportMode.UseExistingImport) {
+    return secondaries.find(id => ts.getOriginalNode(id).getSourceFile() === context) || null;
+  } else {
+    return null;
   }
 }
 
@@ -426,10 +421,9 @@ class StaticInterpreter {
     const result = this.visitDeclaration(
         decl.node, {...context, absoluteModuleName: decl.viaModule || context.absoluteModuleName});
     if (result instanceof Reference) {
-      return result.withIdentifier(node);
-    } else {
-      return result;
+      result.addIdentifier(node);
     }
+    return result;
   }
 
   private visitDeclaration(node: ts.Declaration, context: Context): ResolvedValue {
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index be3cc935d8..71e51a193f 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -568,4 +568,38 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('i0.ɵd(dirIndex).onClick($event)');
     expect(jsContents).toContain('i0.ɵd(dirIndex).onChange(i0.ɵd(dirIndex).arg)');
   });
+
+  it('should correctly recognize local symbols', () => {
+    writeConfig();
+    write('module.ts', `
+        import {NgModule} from '@angular/core';
+        import {Dir, Comp} from './test';
+
+        @NgModule({
+          declarations: [Dir, Comp],
+          exports: [Dir, Comp],
+        })
+        class Module {}
+    `);
+    write(`test.ts`, `
+        import {Component, Directive} from '@angular/core';
+
+        @Directive({
+          selector: '[dir]',
+        })
+        export class Dir {}
+
+        @Component({
+          selector: 'test',
+          template: '<div dir>Test</div>',
+        })
+        export class Comp {}
+    `);
+
+    const exitCode = main(['-p', basePath], errorSpy);
+    expect(errorSpy).not.toHaveBeenCalled();
+    expect(exitCode).toBe(0);
+    const jsContents = getContents('test.js');
+    expect(jsContents).not.toMatch(/import \* as i[0-9] from ['"].\/test['"]/);
+  });
 });

From e0c0c44d997ef3deb9a021500c00e95466dcbdfb Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 26 Jul 2018 08:49:14 -0700
Subject: [PATCH 573/582] fix(ivy): allow relative imports of .d.ts files
 (#25080)

ngtsc used to assume that all .d.ts dependencies (that is, third party
packages) were imported via an absolute module path. It turns out this
assumption isn't valid; some build tools allow relative imports of
other compilation units.

In the absolute case, ngtsc assumes (and still does) that all referenced
types are available through the entrypoint from which an @NgModule was
imported. This commit adds support for relative imports, in which case
ngtsc will use relative path resolution to determine the imports.

PR Close #25080
---
 .../ngtsc/annotations/src/selector_scope.ts   | 26 ++++++++++---------
 .../compiler-cli/src/ngtsc/metadata/index.ts  |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
index 8927f24c84..f504411411 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/selector_scope.ts
@@ -10,7 +10,7 @@ import {Expression, ExternalExpr, ExternalReference} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {ReflectionHost} from '../../host';
-import {AbsoluteReference, Reference, reflectTypeEntityToDeclaration} from '../../metadata';
+import {AbsoluteReference, Reference, ResolvedReference, reflectTypeEntityToDeclaration} from '../../metadata';
 import {reflectIdentifierOfDeclaration, reflectNameOfDeclaration} from '../../metadata/src/reflector';
 
 import {toR3Reference} from './util';
@@ -199,10 +199,6 @@ export class SelectorScopeRegistry {
     } else {
       // The module wasn't analyzed before, and probably has a precompiled ngModuleDef with a type
       // annotation that specifies the needed metadata.
-      if (ngModuleImportedFrom === null) {
-        // TODO(alxhub): handle hand-compiled ngModuleDef in the current Program.
-        throw new Error(`Need to read .d.ts module but ngModuleImportedFrom is unspecified`);
-      }
       data = this._readMetadataFromCompiledClass(node, ngModuleImportedFrom);
       // Note that data here could still be null, if the class didn't have a precompiled
       // ngModuleDef.
@@ -267,7 +263,7 @@ export class SelectorScopeRegistry {
    * @param ngModuleImportedFrom module specifier of the import path to assume for all declarations
    * stemming from this module.
    */
-  private _readMetadataFromCompiledClass(clazz: ts.Declaration, ngModuleImportedFrom: string):
+  private _readMetadataFromCompiledClass(clazz: ts.Declaration, ngModuleImportedFrom: string|null):
       ModuleData|null {
     // This operation is explicitly not memoized, as it depends on `ngModuleImportedFrom`.
     // TODO(alxhub): investigate caching of .d.ts module metadata.
@@ -348,7 +344,8 @@ export class SelectorScopeRegistry {
    * This operation assumes that these types should be imported from `ngModuleImportedFrom` unless
    * they themselves were imported from another absolute path.
    */
-  private _extractReferencesFromType(def: ts.TypeNode, ngModuleImportedFrom: string): Reference[] {
+  private _extractReferencesFromType(def: ts.TypeNode, ngModuleImportedFrom: string|null):
+      Reference[] {
     if (!ts.isTupleTypeNode(def)) {
       return [];
     }
@@ -357,11 +354,16 @@ export class SelectorScopeRegistry {
         throw new Error(`Expected TypeQueryNode`);
       }
       const type = element.exprName;
-      const {node, from} = reflectTypeEntityToDeclaration(type, this.checker);
-      const moduleName = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
-      const clazz = node as ts.Declaration;
-      const id = reflectIdentifierOfDeclaration(clazz);
-      return new AbsoluteReference(node, id !, moduleName, id !.text);
+      if (ngModuleImportedFrom !== null) {
+        const {node, from} = reflectTypeEntityToDeclaration(type, this.checker);
+        const moduleName = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
+        const id = reflectIdentifierOfDeclaration(node);
+        return new AbsoluteReference(node, id !, moduleName, id !.text);
+      } else {
+        const {node} = reflectTypeEntityToDeclaration(type, this.checker);
+        const id = reflectIdentifierOfDeclaration(node);
+        return new ResolvedReference(node, id !);
+      }
     });
   }
 }
diff --git a/packages/compiler-cli/src/ngtsc/metadata/index.ts b/packages/compiler-cli/src/ngtsc/metadata/index.ts
index 3178a1376e..b15062c49d 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/index.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/index.ts
@@ -7,4 +7,4 @@
  */
 
 export {TypeScriptReflectionHost, filterToMembersWithDecorator, findMember, reflectObjectLiteral, reflectTypeEntityToDeclaration} from './src/reflector';
-export {AbsoluteReference, ImportMode, Reference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';
+export {AbsoluteReference, ImportMode, Reference, ResolvedReference, ResolvedValue, isDynamicValue, staticallyResolve} from './src/resolver';

From 6fe865b080bf79f9ee0fbbf407018e0491fae170 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 26 Jul 2018 09:10:42 -0700
Subject: [PATCH 574/582] fix(ivy): don't use a custom ts.CompilerHost for
 ngtsc (#25080)

ngtsc used to have a custom ts.CompilerHost which delegated to the plain
ts.CompilerHost. There's no need for this wrapper class and it causes
issues with CLI integration, so delete it.

PR Close #25080
---
 .../compiler-cli/src/ngtsc/compiler_host.ts   | 77 -------------------
 packages/compiler-cli/src/ngtsc/program.ts    |  1 -
 .../src/transformers/compiler_host.ts         |  4 -
 3 files changed, 82 deletions(-)
 delete mode 100644 packages/compiler-cli/src/ngtsc/compiler_host.ts

diff --git a/packages/compiler-cli/src/ngtsc/compiler_host.ts b/packages/compiler-cli/src/ngtsc/compiler_host.ts
deleted file mode 100644
index d8fef66138..0000000000
--- a/packages/compiler-cli/src/ngtsc/compiler_host.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import * as ts from 'typescript';
-
-/**
- * The TypeScript compiler host used by `ngtsc`.
- *
- * It's mostly identical to the native `CompilerHost`, but also includes the ability to
- * asynchronously resolve resources.
- */
-export interface CompilerHost extends ts.CompilerHost {
-  /**
-   * Begin processing a resource file.
-   *
-   * When the returned Promise resolves, `loadResource` should be able to synchronously produce a
-   * `string` for the given file.
-   */
-  preloadResource(file: string): Promise<void>;
-
-  /**
-   * Like `readFile`, but reads the contents of a resource file which may have been pre-processed
-   * by `preloadResource`.
-   */
-  loadResource(file: string): string|undefined;
-}
-
-/**
- * Implementation of `CompilerHost` which delegates to a native TypeScript host in most cases.
- */
-export class NgtscCompilerHost implements CompilerHost {
-  constructor(private delegate: ts.CompilerHost) {}
-
-  getSourceFile(
-      fileName: string, languageVersion: ts.ScriptTarget,
-      onError?: ((message: string) => void)|undefined,
-      shouldCreateNewSourceFile?: boolean|undefined): ts.SourceFile|undefined {
-    return this.delegate.getSourceFile(
-        fileName, languageVersion, onError, shouldCreateNewSourceFile);
-  }
-
-  getDefaultLibFileName(options: ts.CompilerOptions): string {
-    return this.delegate.getDefaultLibFileName(options);
-  }
-
-  writeFile(
-      fileName: string, data: string, writeByteOrderMark: boolean,
-      onError: ((message: string) => void)|undefined,
-      sourceFiles: ReadonlyArray<ts.SourceFile>): void {
-    return this.delegate.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
-  }
-
-  getCurrentDirectory(): string { return this.delegate.getCurrentDirectory(); }
-
-  getDirectories(path: string): string[] { return this.delegate.getDirectories(path); }
-
-  getCanonicalFileName(fileName: string): string {
-    return this.delegate.getCanonicalFileName(fileName);
-  }
-
-  useCaseSensitiveFileNames(): boolean { return this.delegate.useCaseSensitiveFileNames(); }
-
-  getNewLine(): string { return this.delegate.getNewLine(); }
-
-  fileExists(fileName: string): boolean { return this.delegate.fileExists(fileName); }
-
-  readFile(fileName: string): string|undefined { return this.delegate.readFile(fileName); }
-
-  loadResource(file: string): string|undefined { throw new Error('Method not implemented.'); }
-
-  preloadResource(file: string): Promise<void> { throw new Error('Method not implemented.'); }
-}
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index d2e5731ab3..54ca39ea67 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -13,7 +13,6 @@ import * as ts from 'typescript';
 import * as api from '../transformers/api';
 
 import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, ResourceLoader, SelectorScopeRegistry} from './annotations';
-import {CompilerHost} from './compiler_host';
 import {TypeScriptReflectionHost} from './metadata';
 import {FileResourceLoader, HostResourceLoader} from './resource_loader';
 import {IvyCompilation, ivyTransformFactory} from './transform';
diff --git a/packages/compiler-cli/src/transformers/compiler_host.ts b/packages/compiler-cli/src/transformers/compiler_host.ts
index 683d4a05c3..5472045d56 100644
--- a/packages/compiler-cli/src/transformers/compiler_host.ts
+++ b/packages/compiler-cli/src/transformers/compiler_host.ts
@@ -12,7 +12,6 @@ import * as ts from 'typescript';
 
 import {TypeCheckHost} from '../diagnostics/translate_diagnostics';
 import {METADATA_VERSION, ModuleMetadata} from '../metadata/index';
-import {NgtscCompilerHost} from '../ngtsc/compiler_host';
 
 import {CompilerHost, CompilerOptions, LibrarySummary} from './api';
 import {MetadataReaderHost, createMetadataReaderCache, readMetadata} from './metadata_reader';
@@ -24,9 +23,6 @@ const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;
 export function createCompilerHost(
     {options, tsHost = ts.createCompilerHost(options, true)}:
         {options: CompilerOptions, tsHost?: ts.CompilerHost}): CompilerHost {
-  if (options.enableIvy === 'ngtsc' || options.enableIvy === 'tsc') {
-    return new NgtscCompilerHost(tsHost);
-  }
   return tsHost;
 }
 

From 0d1d5898e370d111b0e7840c3231bbe3f50173a7 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 26 Jul 2018 09:16:07 -0700
Subject: [PATCH 575/582] fix(bazel): allow compile_strategy to be (privately)
 imported (#25080)

compile_strategy() is used to decide whether to build Angular code
using ngc (legacy) or ngtsc (local). In order for g3 BUILD rules
to switch properly and allow testing of Ivy in g3, they need to
import this function.

This commit removes the _ prefix which allows the function to be
imported.

PR Close #25080
---
 packages/bazel/src/ng_module.bzl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index 4244a74567..be0ef7a001 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -14,7 +14,7 @@ load(":rules_typescript.bzl",
     "ts_providers_dict_to_struct",
 )
 
-def _compile_strategy(ctx):
+def compile_strategy(ctx):
   """Detect which strategy should be used to implement ng_module.
 
   Depending on the value of the 'compile' define flag or the '_global_mode' attribute, ng_module
@@ -50,7 +50,7 @@ def _compiler_name(ctx):
     the name of the current compiler to be displayed in build output
   """
 
-  strategy = _compile_strategy(ctx)
+  strategy = compile_strategy(ctx)
   if strategy == 'legacy':
     return 'ngc'
   elif strategy == 'global':
@@ -72,7 +72,7 @@ def _enable_ivy_value(ctx):
     the value of enableIvy that needs to be set in angularCompilerOptions in the generated tsconfig
   """
 
-  strategy = _compile_strategy(ctx)
+  strategy = compile_strategy(ctx)
   if strategy == 'legacy':
     return False
   elif strategy == 'global':
@@ -95,7 +95,7 @@ def _include_ng_files(ctx):
     factory files), false otherwise
   """
 
-  strategy = _compile_strategy(ctx)
+  strategy = compile_strategy(ctx)
   return strategy == 'legacy' or strategy == 'global'
 
 def _basename_of(ctx, file):

From 8de304c15a0878881ee1bb89f290ebdabb97a855 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 26 Jul 2018 13:32:23 -0700
Subject: [PATCH 576/582] fix(ivy): wait for preanalyze promises in
 loadNgStructureAsync() (#25080)

loadNgStructureAsync() for ngtsc has a bug where it returns a
Promise<Promise[]> instead of awaiting the entire array of Promises.

This commit uses Promise.all() to await the whole set.

PR Close #25080
---
 packages/compiler-cli/src/ngtsc/program.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 54ca39ea67..6d4544f8af 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -75,12 +75,11 @@ export class NgtscProgram implements api.Program {
   async loadNgStructureAsync(): Promise<void> {
     if (this.compilation === undefined) {
       this.compilation = this.makeCompilation();
-
-      await this.tsProgram.getSourceFiles()
-          .filter(file => !file.fileName.endsWith('.d.ts'))
-          .map(file => this.compilation !.analyzeAsync(file))
-          .filter((result): result is Promise<void> => result !== undefined);
     }
+    await Promise.all(this.tsProgram.getSourceFiles()
+                          .filter(file => !file.fileName.endsWith('.d.ts'))
+                          .map(file => this.compilation !.analyzeAsync(file))
+                          .filter((result): result is Promise<void> => result !== undefined));
   }
 
   listLazyRoutes(entryRoute?: string|undefined): api.LazyRoute[] {

From 3169edd77a0090f482851874aa393b2626760096 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 26 Jul 2018 13:33:55 -0700
Subject: [PATCH 577/582] fix(ivy): don't crash in listLazyRoutes() (#25080)

This commit replaces the "not implemented" error when calling
listLazyRoutes() with an empty result, which will allow testing
in the CLI before listLazyRoutes() is implemented.

PR Close #25080
---
 packages/compiler-cli/src/ngtsc/program.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 6d4544f8af..48df2fbae4 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -82,9 +82,7 @@ export class NgtscProgram implements api.Program {
                           .filter((result): result is Promise<void> => result !== undefined));
   }
 
-  listLazyRoutes(entryRoute?: string|undefined): api.LazyRoute[] {
-    throw new Error('Method not implemented.');
-  }
+  listLazyRoutes(entryRoute?: string|undefined): api.LazyRoute[] { return []; }
 
   getLibrarySummaries(): Map<string, api.LibrarySummary> {
     throw new Error('Method not implemented.');

From 323faf954b964890c1a4e372aa29cc7256160990 Mon Sep 17 00:00:00 2001
From: George Wilde <georgewilde@users.noreply.github.com>
Date: Mon, 16 Jul 2018 08:45:03 +0100
Subject: [PATCH 578/582] docs(router): Removed unneeded trailing text.
 (#24894) PR Close #24894

---
 packages/router/src/config.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/router/src/config.ts b/packages/router/src/config.ts
index 26512fbb28..047c73bf9c 100644
--- a/packages/router/src/config.ts
+++ b/packages/router/src/config.ts
@@ -252,7 +252,6 @@ import {UrlSegment, UrlSegmentGroup} from './url_tree';
  * Then it will extract the set of routes defined in that NgModule, and will transparently add
  * those routes to the main configuration.
  *
- *  use Routes
  */
 export type Routes = Route[];
 

From 1d051c58416939b7eabde2966033b0e68a4fb073 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 25 Jun 2018 11:22:23 -0700
Subject: [PATCH 579/582] build(bazel): use bazel managed node_modules for
 downstream angular from source build support (#24663)

PR Close #24663
---
 BUILD.bazel                                   |  221 +--
 WORKSPACE                                     |   40 +-
 index.bzl                                     |   19 +
 integration/bazel/WORKSPACE                   |   32 +-
 karma-js.conf.js                              |    1 +
 modules/benchmarks/e2e_test/largeform_perf.ts |    2 +-
 .../benchmarks/e2e_test/largetable_perf.ts    |   12 +-
 modules/benchmarks/e2e_test/tree_perf.ts      |   10 +-
 modules/types.d.ts                            |   10 +-
 package.json                                  |    3 +-
 packages/bazel/src/ngc-wrapped/index.ts       |    6 +
 .../test/ngc-wrapped/tsconfig_template.ts     |    2 +-
 packages/compiler-cli/BUILD.bazel             |    2 +-
 packages/compiler-cli/test/test_support.ts    |    3 +-
 .../test/transformers/node_emitter_spec.ts    |   13 +-
 .../hello_world_r2/bundle.golden_symbols.json |    6 +-
 packages/core/test/bundling/todo/BUILD.bazel  |    2 +-
 packages/elements/test/BUILD.bazel            |   10 +-
 packages/types.d.ts                           |   10 +-
 packages/upgrade/test/common/test_helpers.ts  |    2 +-
 tools/defaults.bzl                            |   11 +-
 tools/ng_setup_workspace.bzl                  |  238 +++
 tools/postinstall-patches.js                  |   13 +
 tools/types.d.ts                              |    6 +-
 yarn.lock                                     | 1682 +++++++++--------
 25 files changed, 1231 insertions(+), 1125 deletions(-)
 create mode 100644 index.bzl
 create mode 100644 tools/ng_setup_workspace.bzl

diff --git a/BUILD.bazel b/BUILD.bazel
index 768c6c2ebc..74ef2eb41f 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -15,220 +15,19 @@ alias(
     actual = "@nodejs//:yarn",
 )
 
-node_modules_filegroup(
+alias(
     name = "node_modules",
-    packages = [
-        "adm-zip",
-        "ajv",
-        "angular",
-        "angular-1.5",
-        "angular-mocks",
-        "angular-mocks-1.5",
-        "anymatch",
-        "arr-diff",
-        "arr-flatten",
-        "arr-union",
-        "array-unique",
-        "asn1",
-        "assert-plus",
-        "assign-symbols",
-        "async-each",
-        "asynckit",
-        "atob",
-        "aws-sign2",
-        "aws4",
-        "balanced-match",
-        "base",
-        "base64-js",
-        "binary-extensions",
-        "blocking-proxy",
-        "brace-expansion",
-        "braces",
-        "bytebuffer",
-        "cache-base",
-        "caseless",
-        "chokidar",
-        "class-utils",
-        "co",
-        "collection-visit",
-        "combined-stream",
-        "component-emitter",
-        "concat-map",
-        "copy-descriptor",
-        "core-util-is",
-        "debug",
-        "decode-uri-component",
-        "define-property",
-        "delayed-stream",
-        "domino",
-        "expand-brackets",
-        "expand-range",
-        "extend",
-        "extend-shallow",
-        "extglob",
-        "extsprintf",
-        "fast-deep-equal",
-        "fast-json-stable-stringify",
-        "filename-regex",
-        "fill-range",
-        "for-in",
-        "for-own",
-        "forever-agent",
-        "form-data",
-        "fragment-cache",
-        "fs.realpath",
-        "get-value",
-        "glob",
-        "glob-base",
-        "glob-parent",
-        "graceful-fs",
-        "hammerjs",
-        "har-schema",
-        "har-validator",
-        "has-value",
-        "has-values",
-        "http-signature",
-        "https-proxy-agent",
-        "inflight",
-        "inherits",
-        "is-accessor-descriptor",
-        "is-binary-path",
-        "is-buffer",
-        "is-data-descriptor",
-        "is-descriptor",
-        "is-dotfile",
-        "is-equal-shallow",
-        "is-extendable",
-        "is-extglob",
-        "is-glob",
-        "is-number",
-        "is-plain-object",
-        "is-posix-bracket",
-        "is-primitive",
-        "is-typedarray",
-        "is-windows",
-        "isarray",
-        "isobject",
-        "isstream",
-        "jasmine",
-        "jasmine-core",
-        "jasminewd2",
-        "json-schema",
-        "json-schema-traverse",
-        "json-stable-stringify",
-        "json-stringify-safe",
-        "jsprim",
-        "kind-of",
-        "long",
-        "lru-cache",
-        "map-cache",
-        "map-visit",
-        "math-random",
-        "micromatch",
-        "mime-db",
-        "mime-types",
-        "minimatch",
-        "minimist",
-        "mixin-deep",
-        "nanomatch",
-        "normalize-path",
-        "oauth-sign",
-        "object.omit",
-        "object.pick",
-        "object-copy",
-        "object-visit",
-        "once",
-        "optimist",
-        "options",
-        "os-tmpdir",
-        "parse-glob",
-        "pascalcase",
-        "path-dirname",
-        "path-is-absolute",
-        "performance-now",
-        "posix-character-classes",
-        "preserve",
-        "process-nextick-args",
-        "protobufjs",
-        "protractor",
-        "qs",
-        "randomatic",
-        "readable-stream",
-        "readdirp",
-        "reflect-metadata",
-        "regex-cache",
-        "regex-not",
-        "remove-trailing-separator",
-        "repeat-element",
-        "repeat-string",
-        "request",
-        "ret",
-        "rimraf",
-        "safe-buffer",
-        "safe-regex",
-        "sax",
-        "semver",
-        "set-immediate-shim",
-        "set-value",
-        "shelljs",
-        "sigmund",
-        "snapdragon",
-        "snapdragon-node",
-        "snapdragon-util",
-        "source-map",
-        "source-map-resolve",
-        "source-map-support",
-        "source-map-url",
-        "split-string",
-        "sshpk",
-        "static-extend",
-        "stringstream",
-        "tmp",
-        "to-object-path",
-        "to-regex",
-        "to-regex-range",
-        "tough-cookie",
-        "tsickle",
-        "tslib",
-        "tsutils",
-        "tunnel-agent",
-        "typescript",
-        "union-value",
-        "unset-value",
-        "upath",
-        "uri-js",
-        "urix",
-        "use",
-        "util-deprecate",
-        "uuid",
-        "verror",
-        "webdriver-js-extender",
-        "webdriver-manager",
-        "wordwrap",
-        "wrappy",
-        "xhr2",
-        "xml2js",
-        "xmlbuilder",
-        "zone.js",
-        "@angular-devkit/core",
-        "@angular-devkit/schematics",
-        "@types",
-        "@webcomponents/custom-elements",
-    ],
-    patterns = [
-        "node_modules/protractor/**",
-        "node_modules/@schematics/angular/**",
-    ],
+    actual = "@angular_deps//:node_modules",
 )
 
 filegroup(
     name = "web_test_bootstrap_scripts",
     # do not sort
     srcs = [
-        "//:node_modules/reflect-metadata/Reflect.js",
-        "//:node_modules/zone.js/dist/zone.js",
-        "//:node_modules/zone.js/dist/zone-testing.js",
-        "//:node_modules/zone.js/dist/task-tracking.js",
+        "@angular_deps//:node_modules/reflect-metadata/Reflect.js",
+        "@angular_deps//:node_modules/zone.js/dist/zone.js",
+        "@angular_deps//:node_modules/zone.js/dist/zone-testing.js",
+        "@angular_deps//:node_modules/zone.js/dist/task-tracking.js",
         "//:test-events.js",
     ],
 )
@@ -236,9 +35,9 @@ filegroup(
 filegroup(
     name = "angularjs_scripts",
     srcs = [
-        "//:node_modules/angular-1.5/angular.js",
-        "//:node_modules/angular-mocks-1.5/angular-mocks.js",
-        "//:node_modules/angular-mocks/angular-mocks.js",
-        "//:node_modules/angular/angular.js",
+        "@angular_deps//:node_modules/angular-1.5/angular.js",
+        "@angular_deps//:node_modules/angular-mocks-1.5/angular-mocks.js",
+        "@angular_deps//:node_modules/angular-mocks/angular-mocks.js",
+        "@angular_deps//:node_modules/angular/angular.js",
     ],
 )
diff --git a/WORKSPACE b/WORKSPACE
index 550831a6ed..ea4eaaa5dd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -6,9 +6,9 @@ workspace(name = "angular")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.10.1.zip",
-    strip_prefix = "rules_nodejs-0.10.1",
-    sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/20ff5892612f8359aec8aaf26dd3902a24976ada.zip",
+    strip_prefix = "rules_nodejs-20ff5892612f8359aec8aaf26dd3902a24976ada",
+    sha256 = "07da9d4c3e688a02745d0f50709a87744706d4f5d1959b799b0ac38e97acd622",
 )
 
 http_archive(
@@ -71,6 +71,22 @@ http_archive(
     sha256 = "8a517806d2b7c8505ba5c53934e7d7c70d341b68ffd268e9044d35b564a48828",
 )
 
+#
+# Point Bazel to WORKSPACEs that live in subdirectories
+#
+
+local_repository(
+    name = "rxjs",
+    path = "node_modules/rxjs/src",
+)
+
+# Point to the integration test workspace just so that Bazel doesn't descend into it
+# when expanding the //... pattern
+local_repository(
+    name = "bazel_integration_test",
+    path = "integration/bazel",
+)
+
 #
 # Load and install our dependencies downloaded above.
 #
@@ -100,26 +116,10 @@ load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 
-load("//packages/bazel/src:ng_setup_workspace.bzl", "ng_setup_workspace")
+load("@angular//:index.bzl", "ng_setup_workspace")
 
 ng_setup_workspace()
 
-#
-# Point Bazel to WORKSPACEs that live in subdirectories
-#
-
-local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
-
-# Point to the integration test workspace just so that Bazel doesn't descend into it
-# when expanding the //... pattern
-local_repository(
-    name = "bazel_integration_test",
-    path = "integration/bazel",
-)
-
 #
 # Ask Bazel to manage these toolchain dependencies for us.
 # Bazel will run `yarn install` when one of these toolchains is requested during
diff --git a/index.bzl b/index.bzl
new file mode 100644
index 0000000000..5178b8ba4c
--- /dev/null
+++ b/index.bzl
@@ -0,0 +1,19 @@
+# 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
+""" Public API surface is re-exported here.
+"""
+
+load("//packages/bazel:index.bzl",
+    _ng_module = "ng_module",
+    _ng_package = "ng_package",
+    _protractor_web_test = "protractor_web_test",
+    _protractor_web_test_suite = "protractor_web_test_suite")
+load("//tools:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
+
+ng_module = _ng_module
+ng_package = _ng_package
+protractor_web_test = _protractor_web_test
+protractor_web_test_suite = _protractor_web_test_suite
+ng_setup_workspace = _ng_setup_workspace
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 8fd3999ee0..485675c9b0 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -38,6 +38,20 @@ http_archive(
     sha256 = "b243c4d64f054c174051785862ab079050d90b37a1cef7da93821c6981cb9ad4",
 )
 
+#
+# Point Bazel to WORKSPACEs that live in subdirectories
+#
+
+local_repository(
+    name = "angular",
+    path = "node_modules/@angular/bazel",
+)
+
+local_repository(
+    name = "rxjs",
+    path = "node_modules/rxjs/src",
+)
+
 #
 # Load and install our dependencies downloaded above.
 #
@@ -68,24 +82,6 @@ load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 
 sass_repositories()
 
-#
-# Point Bazel to WORKSPACEs that live in subdirectories
-#
-
-local_repository(
-    name = "angular",
-    path = "node_modules/@angular/bazel",
-)
-
-local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
-
-#
-# Load and install our dependencies from local repositories
-#
-
 load("@angular//:index.bzl", "ng_setup_workspace")
 
 ng_setup_workspace()
diff --git a/karma-js.conf.js b/karma-js.conf.js
index 910a13bab3..a6adca6057 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -110,6 +110,7 @@ module.exports = function(config) {
     // don't need this entire config file.
     proxies: {
       '/base/angular/': '/base/',
+      '/base/angular_deps/': '/base/',
     },
 
     reporters: ['dots'],
diff --git a/modules/benchmarks/e2e_test/largeform_perf.ts b/modules/benchmarks/e2e_test/largeform_perf.ts
index a088fef63b..63aaebd3ed 100644
--- a/modules/benchmarks/e2e_test/largeform_perf.ts
+++ b/modules/benchmarks/e2e_test/largeform_perf.ts
@@ -29,7 +29,7 @@ describe('largeform benchmark perf', () => {
 
   [CreateAndDestroyWorker].forEach((worker) => {
     describe(worker.id, () => {
-      it('should run for ng2', (done) => {
+      it('should run for ng2', (done: any) => {
         runLargeFormBenchmark({
           id: `largeform.ng2.${worker.id}`,
           url: 'all/benchmarks/src/largeform/ng2/index.html',
diff --git a/modules/benchmarks/e2e_test/largetable_perf.ts b/modules/benchmarks/e2e_test/largetable_perf.ts
index 16b576c6ff..045c5ef56a 100644
--- a/modules/benchmarks/e2e_test/largetable_perf.ts
+++ b/modules/benchmarks/e2e_test/largetable_perf.ts
@@ -40,7 +40,7 @@ describe('largetable benchmark perf', () => {
 
   [CreateOnlyWorker, CreateAndDestroyWorker, UpdateWorker].forEach((worker) => {
     describe(worker.id, () => {
-      it('should run for ng2', (done) => {
+      it('should run for ng2', (done: any) => {
         runTableBenchmark({
           id: `largeTable.ng2.${worker.id}`,
           url: 'all/benchmarks/src/largetable/ng2/index.html',
@@ -48,7 +48,7 @@ describe('largetable benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should run for ng2 with ngSwitch', (done) => {
+      it('should run for ng2 with ngSwitch', (done: any) => {
         runTableBenchmark({
           id: `largeTable.ng2_switch.${worker.id}`,
           url: 'all/benchmarks/src/largetable/ng2_switch/index.html',
@@ -56,7 +56,7 @@ describe('largetable benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should run for render3', (done) => {
+      it('should run for render3', (done: any) => {
         runTableBenchmark({
           id: `largeTable.render3.${worker.id}`,
           url: 'all/benchmarks/src/largetable/render3/index.html',
@@ -65,7 +65,7 @@ describe('largetable benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should run for iv', (done) => {
+      it('should run for iv', (done: any) => {
         runTableBenchmark({
           id: `largeTable.iv.${worker.id}`,
           url: 'all/benchmarks/src/largetable/iv/index.html',
@@ -74,7 +74,7 @@ describe('largetable benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should run for the baseline', (done) => {
+      it('should run for the baseline', (done: any) => {
         runTableBenchmark({
           id: `largeTable.baseline.${worker.id}`,
           url: 'all/benchmarks/src/largetable/baseline/index.html',
@@ -83,7 +83,7 @@ describe('largetable benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should run for incremental-dom', (done) => {
+      it('should run for incremental-dom', (done: any) => {
         runTableBenchmark({
           id: `largeTable.incremental_dom.${worker.id}`,
           url: 'all/benchmarks/src/largetable/incremental_dom/index.html',
diff --git a/modules/benchmarks/e2e_test/tree_perf.ts b/modules/benchmarks/e2e_test/tree_perf.ts
index 07d700a3e9..ceddb69ed1 100644
--- a/modules/benchmarks/e2e_test/tree_perf.ts
+++ b/modules/benchmarks/e2e_test/tree_perf.ts
@@ -24,7 +24,7 @@ describe('tree benchmark perf', () => {
   Benchmarks.forEach(benchmark => {
     describe(benchmark.id, () => {
       // This is actually a destroyOnly benchmark
-      it('should work for createOnly', (done) => {
+      it('should work for createOnly', (done: any) => {
         runTreeBenchmark({
           id: 'createOnly',
           benchmark,
@@ -33,7 +33,7 @@ describe('tree benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should work for createOnlyForReal', (done) => {
+      it('should work for createOnlyForReal', (done: any) => {
         runTreeBenchmark({
           id: 'createOnlyForReal',
           benchmark,
@@ -42,7 +42,7 @@ describe('tree benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should work for createDestroy', (done) => {
+      it('should work for createDestroy', (done: any) => {
         runTreeBenchmark({
           id: 'createDestroy',
           benchmark,
@@ -53,13 +53,13 @@ describe('tree benchmark perf', () => {
         }).then(done, done.fail);
       });
 
-      it('should work for update', (done) => {
+      it('should work for update', (done: any) => {
         runTreeBenchmark({id: 'update', benchmark, work: () => $(CreateBtn).click()})
             .then(done, done.fail);
       });
 
       if (benchmark.buttons.indexOf(DetectChangesBtn) !== -1) {
-        it('should work for detectChanges', (done) => {
+        it('should work for detectChanges', (done: any) => {
           runTreeBenchmark({
             id: 'detectChanges',
             benchmark,
diff --git a/modules/types.d.ts b/modules/types.d.ts
index 0dbf2fff2b..657b0469a2 100644
--- a/modules/types.d.ts
+++ b/modules/types.d.ts
@@ -8,11 +8,11 @@
 
 // This file contains all ambient imports needed to compile the modules/ source code
 
-/// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
-/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
-/// <reference path="../node_modules/@types/jasminewd2/index.d.ts" />
-/// <reference path="../node_modules/@types/node/index.d.ts" />
-/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
+/// <reference types="hammerjs" />
+/// <reference types="jasmine" />
+/// <reference types="jasminewd2" />
+/// <reference types="node" />
+/// <reference types="zone.js" />
 /// <reference path="../tools/types-ext/jasminewd2.d.ts" />
 /// <reference path="./es6-subset.d.ts" />
 /// <reference path="./system.d.ts" />
diff --git a/package.json b/package.json
index 3ea3ec2179..e40acbb2b4 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
     "prebuildifier": "bazel build --noshow_progress @com_github_bazelbuild_buildtools//buildifier",
     "buildifier": "find . -type f \\( -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/*/buildifier",
     "preinstall": "node tools/yarn/check-yarn.js",
-    "postinstall": "yarn update-webdriver && node ./tools/postinstall-patches.js",
+    "postinstall": "yarn update-webdriver && node ./tools/postinstall-patches.js && yarn patch-types",
+    "patch-types": "mkdir -p node_modules/@types/zone.js && cp -f node_modules/zone.js/dist/zone.js.d.ts node_modules/@types/zone.js/index.d.ts",
     "update-webdriver": "webdriver-manager update --gecko false $CHROMEDRIVER_VERSION_ARG",
     "check-env": "gulp check-env",
     "commitmsg": "node ./scripts/git/commit-msg.js"
diff --git a/packages/bazel/src/ngc-wrapped/index.ts b/packages/bazel/src/ngc-wrapped/index.ts
index a787b4026c..a22de56b4e 100644
--- a/packages/bazel/src/ngc-wrapped/index.ts
+++ b/packages/bazel/src/ngc-wrapped/index.ts
@@ -207,6 +207,12 @@ export function compile({allowNonHermeticReads, allDepsCompiledWithBazel = true,
     if (fileName ===
         path.join(compilerOpts.baseUrl, bazelOpts.package, compilerOpts.flatModuleOutFile + '.ts'))
       return true;
+    // Also handle the case when angular is build from source as an external repository
+    if (fileName ===
+        path.join(
+            compilerOpts.baseUrl, 'external/angular', bazelOpts.package,
+            compilerOpts.flatModuleOutFile + '.ts'))
+      return true;
     return origBazelHostShouldNameModule(fileName) || NGC_GEN_FILES.test(fileName);
   };
 
diff --git a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
index 05a8ee90b4..07c06ce281 100644
--- a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
+++ b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
@@ -70,7 +70,7 @@ export function createTsConfig(options: TsConfigOptions) {
       'tsickleExternsPath': '',
       // we don't copy the node_modules into our tmp dir, so we should look in
       // the original workspace directory for it
-      'nodeModulesPrefix': '../angular/node_modules',
+      'nodeModulesPrefix': '../angular/external/angular_deps/node_modules',
     },
     'files': options.files,
     'angularCompilerOptions': {
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 4cf8888f12..4840768b04 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -21,7 +21,7 @@ ts_library(
         ],
     ),
     module_name = "@angular/compiler-cli",
-    node_modules = "@//:node_modules",
+    node_modules = "@angular_deps//:node_modules",
     tsconfig = ":tsconfig",
     deps = [
         "//packages/compiler",
diff --git a/packages/compiler-cli/test/test_support.ts b/packages/compiler-cli/test/test_support.ts
index c957a735e4..022e82fd40 100644
--- a/packages/compiler-cli/test/test_support.ts
+++ b/packages/compiler-cli/test/test_support.ts
@@ -124,7 +124,8 @@ export function setupBazelTo(basePath: string) {
   }
 
   // Link typescript
-  const typescriptSource = path.join(sources, 'angular/node_modules/typescript');
+  const typescriptSource =
+      path.join(sources, 'angular/external/angular_deps/node_modules/typescript');
   const typescriptDest = path.join(nodeModulesPath, 'typescript');
   if (fs.existsSync(typescriptSource)) {
     fs.symlinkSync(typescriptSource, typescriptDest);
diff --git a/packages/compiler-cli/test/transformers/node_emitter_spec.ts b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
index 353a0c0a64..9fdbe6ccbb 100644
--- a/packages/compiler-cli/test/transformers/node_emitter_spec.ts
+++ b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
@@ -8,12 +8,13 @@
 
 import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '@angular/compiler';
 import * as o from '@angular/compiler/src/output/output_ast';
-import {MappingItem, RawSourceMap, SourceMapConsumer} from 'source-map';
 import * as ts from 'typescript';
 
 import {TypeScriptNodeEmitter} from '../../src/transformers/node_emitter';
 import {Directory, MockAotContext, MockCompilerHost} from '../mocks';
 
+const sourceMap = require('source-map');
+
 const someGenFilePath = '/somePackage/someGenFile';
 const someGenFileName = someGenFilePath + '.ts';
 const someSourceFilePath = '/somePackage/someSourceFile';
@@ -469,16 +470,16 @@ describe('TypeScriptNodeEmitter', () => {
       return result;
     }
 
-    function mappingItemsOf(text: string): MappingItem[] {
+    function mappingItemsOf(text: string) {
       // find the source map:
       const sourceMapMatch = /sourceMappingURL\=data\:application\/json;base64,(.*)$/.exec(text);
       const sourceMapBase64 = sourceMapMatch ![1];
       const sourceMapBuffer = Buffer.from(sourceMapBase64, 'base64');
       const sourceMapText = sourceMapBuffer.toString('utf8');
-      const sourceMap: RawSourceMap = JSON.parse(sourceMapText);
-      const consumer = new SourceMapConsumer(sourceMap);
-      const mappings: MappingItem[] = [];
-      consumer.eachMapping(mapping => { mappings.push(mapping); });
+      const sourceMapParsed = JSON.parse(sourceMapText);
+      const consumer = new sourceMap.SourceMapConsumer(sourceMapParsed);
+      const mappings: any[] = [];
+      consumer.eachMapping((mapping: any) => { mappings.push(mapping); });
       return mappings;
     }
 
diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index cabdda2fb0..e686f5de62 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -3134,6 +3134,9 @@
   {
     "name": "isIdentifierStart"
   },
+  {
+    "name": "isInteropObservable"
+  },
   {
     "name": "isIterable"
   },
@@ -3167,9 +3170,6 @@
   {
     "name": "isObject"
   },
-  {
-    "name": "isObservable"
-  },
   {
     "name": "isPrefixEnd"
   },
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index 1535f80fb8..1945a0d006 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -76,7 +76,7 @@ js_expected_symbol_test(
 genrule(
     name = "tslib",
     srcs = [
-        "//:node_modules/tslib/tslib.js",
+        "@angular_deps//:node_modules/tslib/tslib.js",
     ],
     outs = [
         "tslib.js",
diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel
index bdf3c5912c..ec44be216b 100644
--- a/packages/elements/test/BUILD.bazel
+++ b/packages/elements/test/BUILD.bazel
@@ -24,10 +24,10 @@ filegroup(
     name = "elements_test_bootstrap_scripts",
     # do not sort
     srcs = [
-        "//:node_modules/@webcomponents/custom-elements/src/native-shim.js",
-        "//:node_modules/reflect-metadata/Reflect.js",
-        "//:node_modules/zone.js/dist/zone.js",
-        "//:node_modules/zone.js/dist/zone-testing.js",
+        "@angular_deps//:node_modules/@webcomponents/custom-elements/src/native-shim.js",
+        "@angular_deps//:node_modules/reflect-metadata/Reflect.js",
+        "@angular_deps//:node_modules/zone.js/dist/zone.js",
+        "@angular_deps//:node_modules/zone.js/dist/zone-testing.js",
     ],
 )
 
@@ -38,7 +38,7 @@ ts_web_test_suite(
     ],
     # do not sort
     deps = [
-        "//:node_modules/tslib/tslib.js",
+        "@angular_deps//:node_modules/tslib/tslib.js",
         "//tools/testing:browser",
         ":test_lib",
     ],
diff --git a/packages/types.d.ts b/packages/types.d.ts
index eb1d9387a5..530beb389c 100644
--- a/packages/types.d.ts
+++ b/packages/types.d.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// This file contains all ambient imports needed to compile the modules/ source code
+// This file contains all ambient imports needed to compile the packages/ source code
 
-/// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
-/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
-/// <reference path="../node_modules/@types/node/index.d.ts" />
-/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
+/// <reference types="hammerjs" />
+/// <reference types="jasmine" />
+/// <reference types="node" />
+/// <reference types="zone.js" />
 /// <reference path="./es6-subset.d.ts" />
 /// <reference path="./goog.d.ts" />
 /// <reference path="./system.d.ts" />
diff --git a/packages/upgrade/test/common/test_helpers.ts b/packages/upgrade/test/common/test_helpers.ts
index c0f78a6b4f..ced3860b0e 100644
--- a/packages/upgrade/test/common/test_helpers.ts
+++ b/packages/upgrade/test/common/test_helpers.ts
@@ -55,7 +55,7 @@ export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) {
                 (prev, file) => prev.then(() => new Promise<void>((resolve, reject) => {
                                             const restoreMethods = patchJasmineMethods();
                                             const script = document.createElement('script');
-                                            script.src = `base/angular/node_modules/${file}`;
+                                            script.src = `base/angular_deps/node_modules/${file}`;
                                             script.onerror = reject;
                                             script.onload = () => {
                                               document.body.removeChild(script);
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index c58c92b0e9..9e4a5a105d 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -5,6 +5,7 @@ load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_p
 load("//packages/bazel/src:ng_module.bzl", _internal_global_ng_module = "internal_global_ng_module")
 
 DEFAULT_TSCONFIG = "//packages:tsconfig-build.json"
+DEFAULT_NODE_MODULES = "@angular_deps//:node_modules"
 
 # Packages which are versioned together on npm
 ANGULAR_SCOPED_PACKAGES = ["@angular/%s" % p for p in [
@@ -37,17 +38,17 @@ PKG_GROUP_REPLACEMENTS = {
     ]""" % ",\n      ".join(["\"%s\"" % s for s in ANGULAR_SCOPED_PACKAGES])
 }
 
-def ts_library(tsconfig = None, **kwargs):
+def ts_library(tsconfig = None, node_modules = DEFAULT_NODE_MODULES, **kwargs):
   if not tsconfig:
     tsconfig = DEFAULT_TSCONFIG
-  _ts_library(tsconfig = tsconfig, **kwargs)
+  _ts_library(tsconfig = tsconfig, node_modules = node_modules, **kwargs)
 
-def ng_module(name, tsconfig = None, entry_point = None, **kwargs):
+def ng_module(name, tsconfig = None, entry_point = None, node_modules = DEFAULT_NODE_MODULES, **kwargs):
   if not tsconfig:
     tsconfig = DEFAULT_TSCONFIG
   if not entry_point:
     entry_point = "public_api.ts"
-  _ng_module(name = name, flat_module_out_file = name, tsconfig = tsconfig, entry_point = entry_point, **kwargs)
+  _ng_module(name = name, flat_module_out_file = name, tsconfig = tsconfig, entry_point = entry_point, node_modules = node_modules, **kwargs)
 
 # ivy_ng_module behaves like ng_module, and under --define=compile=legacy it runs ngc with global
 # analysis but produces Ivy outputs. Under other compile modes, it behaves as ng_module.
@@ -82,7 +83,7 @@ def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
   if not bootstrap:
     bootstrap = ["//:web_test_bootstrap_scripts"]
   local_deps = [
-    "//:node_modules/tslib/tslib.js",
+    "@angular_deps//:node_modules/tslib/tslib.js",
     "//tools/testing:browser",
   ] + deps
 
diff --git a/tools/ng_setup_workspace.bzl b/tools/ng_setup_workspace.bzl
new file mode 100644
index 0000000000..1e3c90bcac
--- /dev/null
+++ b/tools/ng_setup_workspace.bzl
@@ -0,0 +1,238 @@
+# 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
+
+"Install angular source dependencies"
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
+load("@angular//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
+
+def ng_setup_workspace():
+  """This repository rule should be called from your WORKSPACE file.
+
+  It creates some additional Bazel external repositories that are used internally
+  to build angular
+  """
+  yarn_install(
+      name = "angular_deps",
+      package_json = "@angular//:package.json",
+      yarn_lock = "@angular//:yarn.lock",
+      data = ["@angular//:tools/yarn/check-yarn.js", "@angular//:tools/postinstall-patches.js"],
+      node_modules_filegroup = """
+filegroup(
+    name = "node_modules",  
+    srcs = glob(["/".join([
+        "node_modules",
+        pkg,
+        "**",
+        ext,
+    ]) for pkg in [
+        "adm-zip",
+        "ajv",
+        "angular",
+        "angular-1.5",
+        "angular-mocks",
+        "angular-mocks-1.5",
+        "anymatch",
+        "arr-diff",
+        "arr-flatten",
+        "arr-union",
+        "array-unique",
+        "asn1",
+        "assert-plus",
+        "assign-symbols",
+        "async-each",
+        "asynckit",
+        "atob",
+        "aws-sign2",
+        "aws4",
+        "balanced-match",
+        "base",
+        "base64-js",
+        "binary-extensions",
+        "blocking-proxy",
+        "brace-expansion",
+        "braces",
+        "bytebuffer",
+        "cache-base",
+        "caseless",
+        "chokidar",
+        "class-utils",
+        "co",
+        "collection-visit",
+        "combined-stream",
+        "component-emitter",
+        "concat-map",
+        "copy-descriptor",
+        "core-util-is",
+        "debug",
+        "decode-uri-component",
+        "define-property",
+        "delayed-stream",
+        "domino",
+        "expand-brackets",
+        "expand-range",
+        "extend",
+        "extend-shallow",
+        "extglob",
+        "extsprintf",
+        "fast-deep-equal",
+        "fast-json-stable-stringify",
+        "filename-regex",
+        "fill-range",
+        "for-in",
+        "for-own",
+        "forever-agent",
+        "form-data",
+        "fragment-cache",
+        "fs.realpath",
+        "get-value",
+        "glob",
+        "glob-base",
+        "glob-parent",
+        "graceful-fs",
+        "hammerjs",
+        "har-schema",
+        "har-validator",
+        "has-value",
+        "has-values",
+        "http-signature",
+        "https-proxy-agent",
+        "inflight",
+        "inherits",
+        "is-accessor-descriptor",
+        "is-binary-path",
+        "is-buffer",
+        "is-data-descriptor",
+        "is-descriptor",
+        "is-dotfile",
+        "is-equal-shallow",
+        "is-extendable",
+        "is-extglob",
+        "is-glob",
+        "is-number",
+        "is-plain-object",
+        "is-posix-bracket",
+        "is-primitive",
+        "is-typedarray",
+        "is-windows",
+        "isarray",
+        "isobject",
+        "isstream",
+        "jasmine",
+        "jasmine-core",
+        "jasminewd2",
+        "json-schema",
+        "json-schema-traverse",
+        "json-stable-stringify",
+        "json-stringify-safe",
+        "jsprim",
+        "kind-of",
+        "long",
+        "lru-cache",
+        "map-cache",
+        "map-visit",
+        "math-random",
+        "micromatch",
+        "mime-db",
+        "mime-types",
+        "minimatch",
+        "minimist",
+        "mixin-deep",
+        "nanomatch",
+        "normalize-path",
+        "oauth-sign",
+        "object.omit",
+        "object.pick",
+        "object-copy",
+        "object-visit",
+        "once",
+        "optimist",
+        "options",
+        "os-tmpdir",
+        "parse-glob",
+        "pascalcase",
+        "path-dirname",
+        "path-is-absolute",
+        "performance-now",
+        "posix-character-classes",
+        "preserve",
+        "process-nextick-args",
+        "protobufjs",
+        "protractor",
+        "qs",
+        "randomatic",
+        "readable-stream",
+        "readdirp",
+        "reflect-metadata",
+        "regex-cache",
+        "regex-not",
+        "remove-trailing-separator",
+        "repeat-element",
+        "repeat-string",
+        "request",
+        "ret",
+        "rimraf",
+        "safe-buffer",
+        "safe-regex",
+        "safer-buffer",
+        "sax",
+        "semver",
+        "set-immediate-shim",
+        "set-value",
+        "shelljs",
+        "sigmund",
+        "snapdragon",
+        "snapdragon-node",
+        "snapdragon-util",
+        "source-map",
+        "source-map-resolve",
+        "source-map-support",
+        "source-map-url",
+        "split-string",
+        "sshpk",
+        "static-extend",
+        "stringstream",
+        "tmp",
+        "to-object-path",
+        "to-regex",
+        "to-regex-range",
+        "tough-cookie",
+        "tsickle",
+        "tslib",
+        "tsutils",
+        "tunnel-agent",
+        "typescript",
+        "union-value",
+        "unset-value",
+        "upath",
+        "uri-js",
+        "urix",
+        "use",
+        "util-deprecate",
+        "uuid",
+        "verror",
+        "webdriver-js-extender",
+        "webdriver-manager",
+        "wordwrap",
+        "wrappy",
+        "xhr2",
+        "xml2js",
+        "xmlbuilder",
+        "zone.js",
+        "@angular-devkit/core",
+        "@angular-devkit/schematics",
+        "@types",
+        "@webcomponents/custom-elements",
+    ] for ext in [
+        "*.js",
+        "*.json",
+        "*.d.ts",
+    ]] + [
+        "node_modules/protractor/**",
+        "node_modules/@schematics/angular/**",
+    ]))
+""")
+
+  _ng_setup_workspace()
diff --git a/tools/postinstall-patches.js b/tools/postinstall-patches.js
index f406a97d52..68cb13623d 100644
--- a/tools/postinstall-patches.js
+++ b/tools/postinstall-patches.js
@@ -6,6 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+try {
+  require.resolve('shelljs');
+} catch (e) {
+  // We are in an bazel managed external node_modules repository
+  // and the resolve has failed because node did not preserve the symlink
+  // when loading the script.
+  // This can be fixed using the --preserve-symlinks-main flag which
+  // is introduced in node 10.2.0
+  console.warn(
+      'Running postinstall-patches.js script in an external repository requires --preserve-symlinks-main node flag introduced in node 10.2.0');
+  process.exit(0);
+}
+
 const {set, cd, sed, rm} = require('shelljs');
 const path = require('path');
 const log = console.log;
diff --git a/tools/types.d.ts b/tools/types.d.ts
index e4c8edfafa..ab3d9db318 100644
--- a/tools/types.d.ts
+++ b/tools/types.d.ts
@@ -1,5 +1,5 @@
 // This file contains all ambient imports needed to compile the tools source code
 
-/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
-/// <reference path="../node_modules/@types/node/index.d.ts" />
-/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
+/// <reference types="jasmine" />
+/// <reference types="node" />
+/// <reference types="zone.js" />
diff --git a/yarn.lock b/yarn.lock
index e4fa0830cb..86a9be8662 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,67 +2,45 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/core@0.5.4":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.4.tgz#94b7462f5039cf811c7e06db0c87bb2299d61c71"
+"@angular-devkit/core@0.5.13":
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.13.tgz#c48c83c1bf38917e6af3f399d221d29466be9677"
   dependencies:
-    ajv "~5.5.1"
-    chokidar "^1.7.0"
-    rxjs "^6.0.0-beta.3"
+    ajv "~6.4.0"
+    chokidar "^2.0.3"
+    rxjs "^6.0.0"
     source-map "^0.5.6"
 
-"@angular-devkit/core@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.5.tgz#659c9ef3f22c3e99c459e325441b1009412a4af6"
+"@angular-devkit/schematics@0.5.13", "@angular-devkit/schematics@^0.5.5":
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.13.tgz#be90657c668cddae4054645a61d4cf852de51ede"
   dependencies:
-    ajv "~5.5.1"
-    chokidar "^1.7.0"
-    rxjs "^6.0.0-beta.3"
-    source-map "^0.5.6"
-
-"@angular-devkit/schematics@0.5.4":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.4.tgz#6a4b0abb30091fa1a5d0751737f9ed036ac8704f"
-  dependencies:
-    "@angular-devkit/core" "0.5.4"
-    "@ngtools/json-schema" "^1.1.0"
-    rxjs "^6.0.0-beta.3"
-
-"@angular-devkit/schematics@^0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.5.tgz#c0b20980993237f2eeb4182e253c7c9efa299f3b"
-  dependencies:
-    "@angular-devkit/core" "0.5.5"
-    "@ngtools/json-schema" "^1.1.0"
-    rxjs "^6.0.0-beta.3"
+    "@angular-devkit/core" "0.5.13"
+    rxjs "^6.0.0"
 
 "@bazel/ibazel@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.1.1.tgz#f970c08b4e4efb0ab17e04ade3cc610554f33bed"
 
-"@ngtools/json-schema@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
-
 "@schematics/angular@^0.5.4":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.5.4.tgz#1c87706703a985fd291d283a4db1a9fc0aa6238f"
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.5.13.tgz#e93e249f3903c8465e476c0d0a87668f0d5354bd"
   dependencies:
-    "@angular-devkit/core" "0.5.4"
-    "@angular-devkit/schematics" "0.5.4"
-    typescript "~2.6.2"
+    "@angular-devkit/core" "0.5.13"
+    "@angular-devkit/schematics" "0.5.13"
+    typescript ">=2.6.2 <2.8"
 
 "@types/angular@^1.6.47":
-  version "1.6.47"
-  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.47.tgz#f7a31279a02c0892ed9aa76aae2da1b17791bacd"
+  version "1.6.48"
+  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.48.tgz#e8f77bf41d00d3293421cbaaed2bafb4d5f399f9"
 
 "@types/base64-js@1.2.5":
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/@types/base64-js/-/base64-js-1.2.5.tgz#582b2476169a6cba460a214d476c744441d873d5"
 
 "@types/chai@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.2.tgz#f1af664769cfb50af805431c407425ed619daa21"
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.4.tgz#5ca073b330d90b4066d6ce18f60d57f2084ce8ca"
 
 "@types/chokidar@1.7.3":
   version "1.7.3"
@@ -71,12 +49,12 @@
     "@types/node" "*"
 
 "@types/diff@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.2.2.tgz#4d6f45537322a7a420d353a0939513c7e96d14a6"
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.5.1.tgz#30253f6e177564ad7da707b1ebe46d3eade71706"
 
 "@types/events@*":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
 
 "@types/fs-extra@4.0.2":
   version "4.0.2"
@@ -115,13 +93,17 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
 
 "@types/node@*":
-  version "8.0.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.28.tgz#86206716f8d9251cf41692e384264cbd7058ad60"
+  version "10.5.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707"
 
-"@types/node@6.0.88", "@types/node@^6.0.46":
+"@types/node@6.0.88":
   version "6.0.88"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
 
+"@types/node@^6.0.46":
+  version "6.0.114"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.114.tgz#c42cd56479f32bc1576a5cb19f8a208da9a2b052"
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -131,42 +113,44 @@
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.7.tgz#5d3613d1ab3ca08b74d19683a3a7c573129ab18f"
 
 "@types/selenium-webdriver@^2.53.35", "@types/selenium-webdriver@~2.53.39":
-  version "2.53.42"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.42.tgz#74cb77fb6052edaff2a8984ddafd88d419f25cac"
+  version "2.53.43"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707"
 
 "@types/shelljs@^0.7.8":
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.8.tgz#4b4d6ee7926e58d7bca448a50ba442fd9f6715bd"
+  version "0.7.9"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.9.tgz#3abecb72d9cad9cd4b0e7cb86ed10a97d93ba602"
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
 "@types/source-map@^0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.7.tgz#165eeb583c1ef00196fe4ef4da5d7832b03b275b"
+  dependencies:
+    source-map "*"
 
 "@types/systemjs@0.19.32":
   version "0.19.32"
   resolved "https://registry.yarnpkg.com/@types/systemjs/-/systemjs-0.19.32.tgz#e9204c4cdbc8e275d645c00e6150e68fc5615a24"
 
 "@webcomponents/custom-elements@^1.0.4":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.0.8.tgz#b7b8ef7248f7681d1ad4286a0ada5fe3c2bc7228"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.1.2.tgz#041e4c20df35245f4d160b50d044b8cff192962c"
 
 Base64@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz#ba3a4230708e186705065e66babdd4c35cf60028"
 
 JSONStream@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
 abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
 accepts@~1.2.12, accepts@~1.2.13:
   version "1.2.13"
@@ -175,14 +159,7 @@ accepts@~1.2.12, accepts@~1.2.13:
     mime-types "~2.1.6"
     negotiator "0.5.3"
 
-accepts@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
-  dependencies:
-    mime-types "~2.1.16"
-    negotiator "0.6.1"
-
-accepts@~1.3.4:
+accepts@~1.3.0, accepts@~1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
   dependencies:
@@ -193,10 +170,14 @@ acorn@^1.0.3:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014"
 
-acorn@^4.0.1, acorn@^4.0.3:
+acorn@^4.0.1:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
+acorn@^5.2.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -209,9 +190,9 @@ adm-zip@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
 
-adm-zip@^0.4.7, adm-zip@~0.4.3, adm-zip@~0.4.x:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"
+adm-zip@^0.4.7, adm-zip@^0.4.9, adm-zip@~0.4.3, adm-zip@~0.4.x:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
 
 after@0.8.2:
   version "0.8.2"
@@ -225,21 +206,19 @@ agent-base@2:
     semver "~5.0.1"
 
 agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   dependencies:
     es6-promisify "^5.0.0"
 
-ajv@^5.1.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
+ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    json-schema-traverse "^0.3.0"
     json-stable-stringify "^1.0.1"
 
-ajv@~5.5.1:
+ajv@^5.1.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -248,6 +227,15 @@ ajv@~5.5.1:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
+  dependencies:
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+    uri-js "^3.0.2"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -285,12 +273,18 @@ amqplib@^0.5.2:
   resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.5.11.tgz#a0e1dd0ea55fd77ee7a757d75536c5e964c86f81"
 
 "angular-mocks@npm:angular-mocks@1.6":
-  version "1.6.9"
-  resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.9.tgz#4fed8c8293a5080e0919a7ff0dcf0f704864b7ba"
+  version "1.6.10"
+  resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.10.tgz#6a139e43c461d0c9a5a1acebc91e63db16031176"
 
 "angular@npm:angular@1.6":
-  version "1.6.9"
-  resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.9.tgz#bc812932e18909038412d594a5990f4bb66c0619"
+  version "1.6.10"
+  resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826"
+
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  dependencies:
+    ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0, ansi-regex@^2.1.1:
   version "2.1.1"
@@ -304,6 +298,10 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-wrap@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+
 any-promise@^1.0.0, any-promise@^1.1.0, any-promise@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -386,8 +384,8 @@ archy@^1.0.0:
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -443,8 +441,8 @@ array-slice@^0.2.3:
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
 
 array-slice@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
 
 array-union@^1.0.1:
   version "1.0.2"
@@ -468,7 +466,7 @@ arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
 
-arrify@^1.0.0:
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
@@ -535,13 +533,7 @@ async@^1.3.0, async@^1.4.0, async@^1.5.2, async@~1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.0.1, async@^2.1.2, async@~2.6.0:
+async@^2.0.0, async@^2.0.1, async@^2.1.2, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
@@ -561,9 +553,9 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+atob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
 
 aws-sign2@~0.6.0:
   version "0.6.0"
@@ -574,8 +566,8 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
 aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
 axios@^0.15.3:
   version "0.15.3"
@@ -622,10 +614,14 @@ base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
 
-base64-js@1.2.1, base64-js@^1.0.2:
+base64-js@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
 
+base64-js@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+
 base64-url@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/base64-url/-/base64-url-1.2.1.tgz#199fd661702a0e7b7dcae6e0698bb089c52f6d78"
@@ -634,10 +630,6 @@ base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
 
-base64url@2.0.0, base64url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -663,8 +655,8 @@ batch@0.5.3:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -683,8 +675,8 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
 binary-extensions@^1.0.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
 "binary@>= 0.3.0 < 1", binary@^0.3.0:
   version "0.3.0"
@@ -700,10 +692,11 @@ bitsyntax@~0.0.4:
     buffer-more-ints "0.0.2"
 
 bl@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
   dependencies:
-    readable-stream "^2.0.5"
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
 
 bl@~1.1.2:
   version "1.1.2"
@@ -799,8 +792,8 @@ bower@1.8.2:
   resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.2.tgz#adf53529c8d4af02ef24fb8d5341c1419d33e2f7"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -835,8 +828,8 @@ braces@^2.3.0, braces@^2.3.1:
     to-regex "^3.0.1"
 
 browser-resolve@^1.11.0:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
   dependencies:
     resolve "1.1.7"
 
@@ -866,6 +859,17 @@ browserstacktunnel-wrapper@~2.0.1:
     https-proxy-agent "^1.0.0"
     unzip "~0.1.9"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+
+buffer-alloc@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
 buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -874,6 +878,14 @@ buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+
+buffer-from@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
+
 buffer-more-ints@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
@@ -953,6 +965,14 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  dependencies:
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
+
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
@@ -1006,7 +1026,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.7.0:
+chokidar@1.7.0, chokidar@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1061,8 +1081,8 @@ clang-format@1.0.41:
     resolve "^1.1.6"
 
 clang-format@^1.0.32:
-  version "1.0.55"
-  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.0.55.tgz#8031271329e27a779a5d08fc5dce24d7c52c14d5"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.2.3.tgz#2763561aa7449c43737480f8df3a2b5b66e6cf37"
   dependencies:
     async "^1.5.2"
     glob "^7.0.0"
@@ -1144,8 +1164,8 @@ clone@^0.2.0:
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
 
 clone@^1.0.0, clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
 co@^4.6.0:
   version "4.6.0"
@@ -1166,13 +1186,17 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+
 colors@0.6.0-1:
   version "0.6.0-1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.0-1.tgz#6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"
 
 colors@^1.1.0, colors@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e"
 
 colour@~0.7.1:
   version "0.7.1"
@@ -1184,18 +1208,12 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
-combined-stream@1.0.6:
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-1.0.0.tgz#5e6a88e7070ff5908836ead19169548c30f90bcd"
@@ -1207,8 +1225,8 @@ commander@2.9.0:
     graceful-readlink ">= 1.0.0"
 
 commander@^2.5.0, commander@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
 
 commander@~2.13.0:
   version "2.13.0"
@@ -1252,8 +1270,8 @@ component-inherit@0.0.3:
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
 
 compress-commons@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.0.tgz#58587092ef20d37cb58baf000112c9278ff73b9f"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
   dependencies:
     buffer-crc32 "^0.2.1"
     crc32-stream "^2.0.0"
@@ -1261,14 +1279,14 @@ compress-commons@^1.2.0:
     readable-stream "^2.0.0"
 
 compressible@~2.0.5:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
   dependencies:
-    mime-db ">= 1.29.0 < 2"
+    mime-db ">= 1.34.0 < 2"
 
 compression@~1.5.2:
   version "1.5.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.5.2.tgz#b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"
+  resolved "http://registry.npmjs.org/compression/-/compression-1.5.2.tgz#b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"
   dependencies:
     accepts "~1.2.12"
     bytes "2.1.0"
@@ -1282,9 +1300,10 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 concat-stream@^1.4.7, concat-stream@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
+    buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
@@ -1372,42 +1391,48 @@ content-type@~1.0.1, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-conventional-changelog-angular@^1.0.0, conventional-changelog-angular@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz#50b2d45008448455fdf67e06ea01972fbd08182a"
+conventional-changelog-angular@^1.0.0, conventional-changelog-angular@^1.6.6:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
   dependencies:
     compare-func "^1.3.1"
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-atom@^0.1.0, conventional-changelog-atom@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz#d40a9b297961b53c745e5d1718fd1a3379f6a92f"
+conventional-changelog-atom@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz#12595ad5267a6937c34cf900281b1c65198a4c63"
   dependencies:
     q "^1.4.1"
 
+conventional-changelog-atom@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
+  dependencies:
+    q "^1.5.1"
+
 conventional-changelog-codemirror@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz#7577a591dbf9b538e7a150a7ee62f65a2872b334"
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-codemirror@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz#3cc925955f3b14402827b15168049821972d9459"
+conventional-changelog-codemirror@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-core@^1.3.0, conventional-changelog-core@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz#ddf767c405850dfc8df31726c80fa1a6a10bdc7b"
+conventional-changelog-core@^1.3.0:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.5.tgz#5db7566dad7c0cb75daf47fbb2976f7bf9928c1d"
   dependencies:
-    conventional-changelog-writer "^2.0.1"
-    conventional-commits-parser "^2.0.0"
+    conventional-changelog-writer "^2.0.3"
+    conventional-commits-parser "^2.1.0"
     dateformat "^1.0.12"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.2.0"
+    git-raw-commits "^1.3.0"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.2.1"
+    git-semver-tags "^1.2.3"
     lodash "^4.0.0"
     normalize-package-data "^2.3.5"
     q "^1.4.1"
@@ -1415,23 +1440,47 @@ conventional-changelog-core@^1.3.0, conventional-changelog-core@^1.9.1:
     read-pkg-up "^1.0.1"
     through2 "^2.0.0"
 
-conventional-changelog-ember@^0.2.0, conventional-changelog-ember@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz#c6aff35976284e7222649f81c62bd96ff3217bd2"
+conventional-changelog-core@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
+  dependencies:
+    conventional-changelog-writer "^3.0.9"
+    conventional-commits-parser "^2.1.7"
+    dateformat "^3.0.0"
+    get-pkg-repo "^1.0.0"
+    git-raw-commits "^1.3.6"
+    git-remote-origin-url "^2.0.0"
+    git-semver-tags "^1.3.6"
+    lodash "^4.2.1"
+    normalize-package-data "^2.3.5"
+    q "^1.5.1"
+    read-pkg "^1.1.0"
+    read-pkg-up "^1.0.1"
+    through2 "^2.0.0"
+
+conventional-changelog-ember@^0.2.0:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.10.tgz#dcd6e4cdc2e6c2b58653cf4d2cb1656a60421929"
   dependencies:
     q "^1.4.1"
 
+conventional-changelog-ember@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
+  dependencies:
+    q "^1.5.1"
+
 conventional-changelog-eslint@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz#a52411e999e0501ce500b856b0a643d0330907e2"
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-eslint@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz#b4b9b5dc09417844d87c7bcfb16bdcc686c4b1c1"
+conventional-changelog-eslint@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
 conventional-changelog-express@^0.1.0:
   version "0.1.0"
@@ -1439,11 +1488,11 @@ conventional-changelog-express@^0.1.0:
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-express@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz#8d666ad41b10ebf964a4602062ddd2e00deb518d"
+conventional-changelog-express@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
@@ -1464,19 +1513,23 @@ conventional-changelog-jshint@^0.1.0:
     compare-func "^1.3.1"
     q "^1.4.1"
 
-conventional-changelog-jshint@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz#63ad7aec66cd1ae559bafe80348c4657a6eb1872"
+conventional-changelog-jshint@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
   dependencies:
     compare-func "^1.3.1"
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-writer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz#47c10d0faba526b78d194389d1e931d09ee62372"
+conventional-changelog-preset-loader@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
+
+conventional-changelog-writer@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-2.0.3.tgz#073b0c39f1cc8fc0fd9b1566e93833f51489c81c"
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^1.0.0"
+    conventional-commits-filter "^1.1.1"
     dateformat "^1.0.11"
     handlebars "^4.0.2"
     json-stringify-safe "^5.0.1"
@@ -1486,6 +1539,21 @@ conventional-changelog-writer@^2.0.1:
     split "^1.0.0"
     through2 "^2.0.0"
 
+conventional-changelog-writer@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
+  dependencies:
+    compare-func "^1.3.1"
+    conventional-commits-filter "^1.1.6"
+    dateformat "^3.0.0"
+    handlebars "^4.0.2"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    semver "^5.5.0"
+    split "^1.0.0"
+    through2 "^2.0.0"
+
 conventional-changelog@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.0.tgz#8ae3fb59feb74bbee0a25833ee1f83dad4a07874"
@@ -1502,35 +1570,36 @@ conventional-changelog@1.1.0:
     conventional-changelog-jshint "^0.1.0"
 
 conventional-changelog@^1.1.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.5.tgz#4c46fb64b2986cab19888d8c4b87ca7c0e431bfd"
+  version "1.1.24"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
   dependencies:
-    conventional-changelog-angular "^1.5.0"
-    conventional-changelog-atom "^0.1.1"
-    conventional-changelog-codemirror "^0.2.0"
-    conventional-changelog-core "^1.9.1"
-    conventional-changelog-ember "^0.2.7"
-    conventional-changelog-eslint "^0.2.0"
-    conventional-changelog-express "^0.2.0"
+    conventional-changelog-angular "^1.6.6"
+    conventional-changelog-atom "^0.2.8"
+    conventional-changelog-codemirror "^0.3.8"
+    conventional-changelog-core "^2.0.11"
+    conventional-changelog-ember "^0.3.12"
+    conventional-changelog-eslint "^1.0.9"
+    conventional-changelog-express "^0.3.6"
     conventional-changelog-jquery "^0.1.0"
     conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.2.0"
+    conventional-changelog-jshint "^0.3.8"
+    conventional-changelog-preset-loader "^1.1.8"
 
-conventional-commits-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz#6fc2a659372bc3f2339cf9ffff7e1b0344b93039"
+conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz#71d01910cb0a99aeb20c144e50f81f4df3178447"
+conventional-commits-parser@^2.1.0, conventional-commits-parser@^2.1.7:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
     lodash "^4.2.1"
-    meow "^3.3.0"
+    meow "^4.0.0"
     split2 "^2.0.0"
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
@@ -1558,14 +1627,10 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-core-js@^2.2.0:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
 
-core-js@^2.4.0, core-js@^2.4.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
-
 core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
@@ -1593,8 +1658,8 @@ crc@3.3.0:
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.3.0.tgz#fa622e1bc388bf257309082d6b65200ce67090ba"
 
 crc@^3.4.4:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
 
 cross-spawn@^5.0.1:
   version "5.1.0"
@@ -1692,13 +1757,11 @@ dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
 
-debug@2, debug@2.6.8, debug@^2.2.0:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
+dateformat@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -1716,10 +1779,21 @@ debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
 decompress-zip@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/decompress-zip/-/decompress-zip-0.3.0.tgz#ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"
@@ -1732,18 +1806,10 @@ decompress-zip@0.3.0:
     readable-stream "^1.1.8"
     touch "0.0.3"
 
-deep-equal@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -1758,13 +1824,6 @@ defaults@^1.0.0:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -1784,7 +1843,7 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defined@^1.0.0, defined@~1.0.0:
+defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
@@ -1820,11 +1879,7 @@ depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
-depd@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.2:
+depd@~1.1.0, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
@@ -1836,11 +1891,9 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
-detect-file@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
-  dependencies:
-    fs-exists-sync "^0.1.0"
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
 
 detect-libc@^1.0.2:
   version "1.0.3"
@@ -1859,10 +1912,10 @@ detective@0.1.1:
     uglify-js "~1.2.5"
 
 detective@^4.3.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
   dependencies:
-    acorn "^4.0.3"
+    acorn "^5.2.1"
     defined "^1.0.0"
 
 di@^0.0.1:
@@ -1873,11 +1926,7 @@ diff@^2.0.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99"
 
-diff@^3.2.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
-
-diff@^3.5.0:
+diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -1898,8 +1947,8 @@ dom-serialize@^2.2.0:
     void-elements "^2.0.0"
 
 domain-browser@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
 domino@2.0.1:
   version "2.0.1"
@@ -1937,11 +1986,10 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-ecdsa-sig-formatter@1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz#4bc926274ec3b5abb5016e7e1d60921ac262b2a1"
+ecdsa-sig-formatter@1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3"
   dependencies:
-    base64url "^2.0.0"
     safe-buffer "^5.0.1"
 
 ee-first@1.1.1:
@@ -1953,12 +2001,12 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
 encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
 end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   dependencies:
     once "^1.4.0"
 
@@ -2030,14 +2078,14 @@ entities@1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
 errno@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
-    prr "~0.0.0"
+    prr "~1.0.1"
 
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+error-ex@^1.2.0, error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   dependencies:
     is-arrayish "^0.2.1"
 
@@ -2048,42 +2096,25 @@ errorhandler@~1.4.2:
     accepts "~1.3.0"
     escape-html "~1.0.3"
 
-es-abstract@^1.5.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee"
+es5-ext@^0.10.12, es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
+  version "0.10.45"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653"
   dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
-es5-ext@^0.10.12, es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
-  version "0.10.30"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939"
-  dependencies:
-    es6-iterator "2"
-    es6-symbol "~3.1"
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+    next-tick "1"
 
 es6-error@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.0.tgz#f094c7041f662599bb12720da059d6b9c7ff0f40"
 
-es6-iterator@2, es6-iterator@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   dependencies:
     d "1"
-    es5-ext "^0.10.14"
-    es6-symbol "^3.1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
 
 es6-module-loader@^0.17.4:
   version "0.17.11"
@@ -2092,8 +2123,8 @@ es6-module-loader@^0.17.4:
     when "^3.7.2"
 
 es6-promise@^4.0.3:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
 
 es6-promise@~3.0.2:
   version "3.0.2"
@@ -2105,7 +2136,7 @@ es6-promisify@5.0.0, es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1:
+es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2168,6 +2199,10 @@ estree-walker@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
 
+estree-walker@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+
 esutils@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
@@ -2189,7 +2224,7 @@ event-emitter@^0.3.5:
 
 event-stream@^3.1.5, event-stream@^3.3.2:
   version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+  resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
   dependencies:
     duplexer "~0.1.1"
     from "~0"
@@ -2199,9 +2234,9 @@ event-stream@^3.1.5, event-stream@^3.3.2:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
 
 events@^1.0.0:
   version "1.1.1"
@@ -2262,13 +2297,7 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expand-tilde@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
-  dependencies:
-    os-homedir "^1.0.1"
-
-expand-tilde@^2.0.2:
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
   dependencies:
@@ -2324,20 +2353,25 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
 fancy-log@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
   dependencies:
-    chalk "^1.1.1"
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
     time-stamp "^1.0.0"
 
 fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -2362,12 +2396,12 @@ filename-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -2418,14 +2452,14 @@ find-up@^2.0.0:
   dependencies:
     locate-path "^2.0.0"
 
-findup-sync@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
   dependencies:
-    detect-file "^0.1.0"
-    is-glob "^2.0.1"
-    micromatch "^2.3.7"
-    resolve-dir "^0.1.0"
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
 
 findup-sync@~0.3.0:
   version "0.3.0"
@@ -2479,9 +2513,9 @@ first-chunk-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
 
-flagged-respawn@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
+flagged-respawn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
 
 follow-redirects@1.0.0:
   version "1.0.0"
@@ -2489,11 +2523,11 @@ follow-redirects@1.0.0:
   dependencies:
     debug "^2.2.0"
 
-for-each@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.2.tgz#2c40450b9348e97f281322593ba96704b9abd4d4"
+follow-redirects@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.1.tgz#67a8f14f5a1f67f962c2c46469c79eaec0a90291"
   dependencies:
-    is-function "~1.0.0"
+    debug "^3.1.0"
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
@@ -2511,10 +2545,6 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -2535,7 +2565,15 @@ form-data@~2.0.0:
     combined-stream "^1.0.5"
     mime-types "^2.1.11"
 
-form-data@~2.3.0:
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+form-data@~2.3.0, form-data@~2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
@@ -2543,14 +2581,6 @@ form-data@~2.3.0:
     combined-stream "1.0.6"
     mime-types "^2.1.12"
 
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -2571,9 +2601,9 @@ fs-access@^1.0.0:
   dependencies:
     null-check "^1.0.0"
 
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
 
 fs-extra@0.30.0, fs-extra@~0.30.0:
   version "0.30.0"
@@ -2616,14 +2646,14 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@1.1.2, fsevents@^1.0.0:
+fsevents@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
   dependencies:
     nan "^2.3.0"
     node-pre-gyp "^0.6.36"
 
-fsevents@^1.2.2:
+fsevents@^1.0.0, fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   dependencies:
@@ -2663,10 +2693,6 @@ ftp@~0.3.10:
     readable-stream "1.1.x"
     xregexp "2.0.0"
 
-function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-
 fx-runner@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fx-runner/-/fx-runner-1.0.5.tgz#713519aca7598a8319e03fa1110b89b97ef1063f"
@@ -2752,13 +2778,13 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.2.0.tgz#0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"
+git-raw-commits@^1.3.0, git-raw-commits@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
-    meow "^3.3.0"
+    meow "^4.0.0"
     split2 "^2.0.0"
     through2 "^2.0.0"
 
@@ -2769,12 +2795,12 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.1.tgz#6ccd2a52e735b736748dc762444fcd9588e27490"
+git-semver-tags@^1.2.3, git-semver-tags@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
   dependencies:
-    meow "^3.3.0"
-    semver "^5.0.1"
+    meow "^4.0.0"
+    semver "^5.5.0"
 
 gitconfiglocal@^1.0.0:
   version "1.0.0"
@@ -2825,7 +2851,7 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@~7.1.2:
+glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -2863,21 +2889,23 @@ glob@~3.1.21:
     inherits "1"
     minimatch "~0.2.11"
 
-global-modules@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
   dependencies:
-    global-prefix "^0.1.4"
-    is-windows "^0.2.0"
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
 
-global-prefix@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
   dependencies:
-    homedir-polyfill "^1.0.0"
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
     ini "^1.3.4"
-    is-windows "^0.2.0"
-    which "^1.2.12"
+    is-windows "^1.0.1"
+    which "^1.2.14"
 
 globby@^5.0.0:
   version "5.0.0"
@@ -2899,8 +2927,8 @@ globule@~0.1.0:
     minimatch "~0.2.11"
 
 glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
   dependencies:
     sparkles "^1.0.0"
 
@@ -3031,8 +3059,8 @@ hammerjs@2.0.8:
   resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
 
 handlebars@^4.0.2:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
     async "^1.4.0"
     optimist "^0.6.1"
@@ -3040,6 +3068,10 @@ handlebars@^4.0.2:
   optionalDependencies:
     uglify-js "^2.6"
 
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3053,6 +3085,13 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
@@ -3117,19 +3156,13 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1, has@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  dependencies:
-    function-bind "^1.0.2"
-
 "hashish@>=0.0.2 <0.1":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554"
   dependencies:
     traverse ">=0.2.4"
 
-hawk@~3.1.3:
+hawk@3.1.3, hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -3159,18 +3192,18 @@ hoek@2.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
 
-homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
+homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
 http-browserify@^1.3.2:
   version "1.7.0"
@@ -3196,8 +3229,8 @@ http-errors@~1.3.1:
     statuses "1"
 
 http-parser-js@>=0.4.0:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.6.tgz#195273f58704c452d671076be201329dd341dc55"
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
@@ -3207,11 +3240,12 @@ http-proxy-agent@^2.1.0:
     debug "3.1.0"
 
 http-proxy@^1.13.0:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
 
 http-signature@~1.1.0:
   version "1.1.1"
@@ -3279,19 +3313,15 @@ iconv-lite@0.4.15:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-iconv-lite@0.4.23, iconv-lite@^0.4.4:
+iconv-lite@0.4.23, iconv-lite@^0.4.4, iconv-lite@^0.4.5:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.5:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
 ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
 
 ignore-walk@^3.0.1:
   version "3.0.1"
@@ -3313,6 +3343,10 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -3344,21 +3378,17 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.2.0:
+ini@^1.2.0, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
 interpret@^0.6.4:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
 
 interpret@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
 invert-kv@^1.0.0:
   version "1.0.0"
@@ -3374,12 +3404,12 @@ is-absolute@^0.1.7:
   dependencies:
     is-relative "^0.1.0"
 
-is-absolute@^0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
   dependencies:
-    is-relative "^0.2.1"
-    is-windows "^0.2.0"
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -3404,8 +3434,8 @@ is-binary-path@^1.0.0:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
@@ -3413,10 +3443,6 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
-
 is-ci@^1.0.10:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
@@ -3435,10 +3461,6 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -3499,10 +3521,6 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
-is-function@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
-
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -3525,12 +3543,17 @@ is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
 
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
 is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
@@ -3550,6 +3573,10 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -3559,17 +3586,21 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
 
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
   dependencies:
     path-is-inside "^1.0.1"
 
+is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -3592,21 +3623,15 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
 is-relative@^0.1.0:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
 
-is-relative@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
   dependencies:
-    is-unc-path "^0.1.1"
+    is-unc-path "^1.0.0"
 
 is-stream@^1.1.0:
   version "1.1.0"
@@ -3616,10 +3641,6 @@ is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
 
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
-
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
@@ -3630,21 +3651,17 @@ is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
-is-unc-path@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
   dependencies:
-    unc-path-regex "^0.1.0"
+    unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-is-windows@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
-
-is-windows@^1.0.2:
+is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
@@ -3694,9 +3711,9 @@ jasmine-core@^3.1.0, jasmine-core@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
 
-jasmine-core@~2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+jasmine-core@~2.99.0:
+  version "2.99.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
 
 jasmine-diff@^0.1.3:
   version "0.1.3"
@@ -3705,12 +3722,12 @@ jasmine-diff@^0.1.3:
     diff "^3.2.0"
 
 jasmine@^2.5.3:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  version "2.99.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
-    jasmine-core "~2.8.0"
+    jasmine-core "~2.99.0"
 
 jasmine@^3.1.0:
   version "3.1.0"
@@ -3720,8 +3737,8 @@ jasmine@^3.1.0:
     jasmine-core "~3.1.0"
 
 jasminewd2@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.1.0.tgz#da595275d1ae631de736ac0a7c7d85c9f73ef652"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
 
 jetpack-id@0.0.4:
   version "0.0.4"
@@ -3791,6 +3808,10 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
+json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -3881,8 +3902,8 @@ jszip@^2.4.0:
     pako "~1.0.2"
 
 jszip@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.4.tgz#fc323fe41bb1730348d20dd022aa4d8b57cbbcf9"
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
   dependencies:
     core-js "~2.3.0"
     es6-promise "~3.0.2"
@@ -3890,21 +3911,19 @@ jszip@^3.1.3:
     pako "~1.0.2"
     readable-stream "~2.0.6"
 
-jwa@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.5.tgz#a0552ce0220742cd52e153774a32905c30e756e5"
+jwa@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6"
   dependencies:
-    base64url "2.0.0"
     buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.9"
+    ecdsa-sig-formatter "1.0.10"
     safe-buffer "^5.0.1"
 
 jws@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.4.tgz#f9e8b9338e8a847277d6444b1464f61880e050a2"
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f"
   dependencies:
-    base64url "^2.0.0"
-    jwa "^1.1.4"
+    jwa "^1.1.5"
     safe-buffer "^5.0.1"
 
 karma-browserstack-launcher@^1.3.0:
@@ -4045,22 +4064,21 @@ lie@~3.1.0:
     immediate "~3.0.5"
 
 liftoff@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
   dependencies:
     extend "^3.0.0"
-    findup-sync "^0.4.2"
+    findup-sync "^2.0.0"
     fined "^1.0.1"
-    flagged-respawn "^0.3.2"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.mapvalues "^4.4.0"
+    flagged-respawn "^1.0.0"
+    is-plain-object "^2.0.4"
+    object.map "^1.0.0"
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
 livereload-js@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.2.2.tgz#6c87257e648ab475bc24ea257457edcc1f8d0bc2"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
 
 load-json-file@^1.0.0:
   version "1.1.0"
@@ -4081,6 +4099,15 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 loader-utils@^0.2.11:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
@@ -4151,14 +4178,6 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isplainobject@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -4167,10 +4186,6 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.mapvalues@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-
 lodash.once@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -4221,14 +4236,10 @@ lodash@4.11.1:
   version "4.11.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.11.1.tgz#a32106eb8e2ec8e82c241611414773c9df15f8bc"
 
-lodash@4.17.10, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.5.0:
+lodash@4.17.10, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0, lodash@^4.8.0, lodash@~4.17.2:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.1, lodash@^4.8.0, lodash@~4.17.2:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -4291,14 +4302,7 @@ lru-cache@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.5.0.tgz#d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"
 
-lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^4.1.2:
+lru-cache@^4.0.1, lru-cache@^4.1.2:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   dependencies:
@@ -4355,6 +4359,12 @@ mailgun-js@^0.18.0:
     proxy-agent "~3.0.0"
     tsscmp "~1.0.0"
 
+make-iterator@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  dependencies:
+    kind-of "^6.0.2"
+
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -4363,6 +4373,10 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+
 map-stream@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
@@ -4384,6 +4398,10 @@ map-visit@^1.0.0:
     buffers "~0.1.1"
     readable-stream "~1.0.0"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -4402,8 +4420,8 @@ memoizeasync@^1.1.0:
     passerror "1.1.1"
 
 memoizee@^0.4.3:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.11.tgz#bde9817663c9e40fdb2a4ea1c367296087ae8c8f"
+  version "0.4.12"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.12.tgz#780e99a219c50c549be6d0fc61765080975c58fb"
   dependencies:
     d "1"
     es5-ext "^0.10.30"
@@ -4440,20 +4458,34 @@ meow@^3.3.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
-method-override@~2.3.5:
-  version "2.3.9"
-  resolved "https://registry.yarnpkg.com/method-override/-/method-override-2.3.9.tgz#bd151f2ce34cf01a76ca400ab95c012b102d8f71"
+meow@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
   dependencies:
-    debug "2.6.8"
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist "^1.1.3"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+
+method-override@~2.3.5:
+  version "2.3.10"
+  resolved "https://registry.yarnpkg.com/method-override/-/method-override-2.3.10.tgz#e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"
+  dependencies:
+    debug "2.6.9"
     methods "~1.1.2"
-    parseurl "~1.3.1"
-    vary "~1.1.1"
+    parseurl "~1.3.2"
+    vary "~1.1.2"
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
+micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -4471,7 +4503,7 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.4:
+micromatch@^3.0.4, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -4489,21 +4521,15 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-"mime-db@>= 1.29.0 < 2", mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+"mime-db@>= 1.34.0 < 2":
+  version "1.34.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.34.0.tgz#452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"
 
 mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
-mime-types@~2.1.18:
+mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
@@ -4514,12 +4540,12 @@ mime@1.3.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
 mime@^1.3.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
@@ -4546,11 +4572,18 @@ minimatch@~0.2.11:
     lru-cache "2"
     sigmund "~1.0.0"
 
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -4595,12 +4628,12 @@ mkpath@^0.1.0:
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-0.1.0.tgz#7554a6f8d871834cc97b5462b122c4c124d6de91"
 
 modify-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
 
 moment@2.x.x:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
 morgan@~1.6.1:
   version "1.6.1"
@@ -4665,11 +4698,7 @@ mz@2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.3.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
-nan@^2.9.2:
+nan@^2.3.0, nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -4690,10 +4719,10 @@ nanomatch@^1.2.9:
     to-regex "^3.0.1"
 
 natives@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.4.tgz#2f0f224fc9a7dd53407c7667c84cf8dbe773de58"
 
-needle@^2.2.0:
+needle@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
   dependencies:
@@ -4746,12 +4775,12 @@ next-tick@1:
     vm-browserify "0.0.4"
 
 node-pre-gyp@^0.10.0:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3"
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
-    needle "^2.2.0"
+    needle "^2.2.1"
     nopt "^4.0.1"
     npm-packlist "^1.1.6"
     npmlog "^4.0.2"
@@ -4761,17 +4790,18 @@ node-pre-gyp@^0.10.0:
     tar "^4"
 
 node-pre-gyp@^0.6.36:
-  version "0.6.37"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz#3c872b236b2e266e4140578fe1ee88f693323a05"
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
   dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
     mkdirp "^0.5.1"
     nopt "^4.0.1"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "^2.81.0"
+    request "2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tape "^4.6.3"
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
@@ -4952,14 +4982,6 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.3.0.tgz#5b1eb8e6742e2ee83342a637034d844928ba2f6d"
-
-object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -4975,6 +4997,13 @@ object.defaults@^1.1.0:
     for-own "^1.0.0"
     isobject "^3.0.0"
 
+object.map@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  dependencies:
+    for-own "^1.0.0"
+    make-iterator "^1.0.0"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -5056,7 +5085,7 @@ os-browserify@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
@@ -5082,20 +5111,13 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.0:
+osenv@^0.1.0, osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 "over@>= 0.0.5 < 1":
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708"
@@ -5105,8 +5127,10 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
 p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  dependencies:
+    p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -5114,6 +5138,10 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
 pac-proxy-agent@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896"
@@ -5146,10 +5174,10 @@ pako@~1.0.2:
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
 parse-filepath@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
   dependencies:
-    is-absolute "^0.2.3"
+    is-absolute "^1.0.0"
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
@@ -5172,6 +5200,13 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -5264,6 +5299,12 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -5282,6 +5323,10 @@ pegjs@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"
 
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -5290,6 +5335,10 @@ pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -5321,8 +5370,8 @@ pretty-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
 private@^0.1.6, private@~0.1.5:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -5402,9 +5451,9 @@ proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
 
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
 
 pseudomap@^1.0.2:
   version "1.0.2"
@@ -5427,6 +5476,10 @@ punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+
 q@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.0.1.tgz#11872aeedee89268110b10a718448ffb10112a14"
@@ -5435,11 +5488,7 @@ q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-q@^1.1.2, q@^1.4.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
-q@^1.5.0, q@~1.5.0:
+q@^1.1.2, q@^1.4.1, q@^1.5.0, q@^1.5.1, q@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -5455,7 +5504,7 @@ qs@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.0.tgz#a9f31142af468cb72b25b30136ba2456834916be"
 
-qs@6.5.2:
+qs@6.5.2, qs@~6.5.1:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
@@ -5467,9 +5516,9 @@ qs@~6.2.0:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
 
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 querystring-es3@~0.2.0:
   version "0.2.1"
@@ -5479,16 +5528,21 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 range-parser@^1.2.0:
   version "1.2.0"
@@ -5515,16 +5569,7 @@ raw-body@~2.1.2, raw-body@~2.1.5:
     iconv-lite "0.4.13"
     unpipe "1.0.0"
 
-rc@^1.1.7:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-rc@^1.2.7:
+rc@^1.1.7, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
@@ -5554,6 +5599,13 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -5570,6 +5622,14 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
 read@1, read@1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -5585,7 +5645,7 @@ readable-stream@1.1.x, "readable-stream@1.x >=1.1.9", readable-stream@^1.0.27-1,
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@2, readable-stream@^2.3.0:
+readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -5606,18 +5666,6 @@ readable-stream@2, readable-stream@^2.3.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
 readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -5660,6 +5708,13 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
 redis-commands@^1.2.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2"
@@ -5677,12 +5732,12 @@ redis@^2.7.1:
     redis-parser "^2.6.0"
 
 reflect-metadata@^0.1.3:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
 
 regenerator-runtime@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
 regenerator-runtime@^0.9.5:
   version "0.9.6"
@@ -5759,6 +5814,33 @@ request@2.75.0, request@2.75.x:
     tough-cookie "~2.3.0"
     tunnel-agent "~0.4.1"
 
+request@2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
 request@2.85.0:
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
@@ -5786,34 +5868,7 @@ request@2.85.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@2.x, request@^2.78.0, request@^2.81.0:
-  version "2.82.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.82.0.tgz#2ba8a92cd7ac45660ea2b10a53ae67cd247516ea"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.2"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.0.0, request@^2.74.0:
+request@2.x, request@^2.0.0, request@^2.74.0, request@^2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
@@ -5881,16 +5936,16 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-requires-port@1.x.x:
+requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
-resolve-dir@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
   dependencies:
-    expand-tilde "^1.2.2"
-    global-modules "^0.2.3"
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
@@ -5908,9 +5963,9 @@ resolve@^0.7.1:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.7.4.tgz#395a9ef9e873fbfe12bd14408bd91bb936003d69"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
     path-parse "^1.0.5"
 
@@ -5921,12 +5976,6 @@ response-time@~2.3.1:
     depd "~1.1.0"
     on-headers "~1.0.1"
 
-resumer@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
-  dependencies:
-    through "~2.3.4"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -5982,10 +6031,10 @@ rollup-plugin-sourcemaps@0.4.2:
     source-map-resolve "^0.5.0"
 
 rollup-pluginutils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
   dependencies:
-    estree-walker "^0.3.0"
+    estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
 rollup@0.47.4:
@@ -5993,22 +6042,12 @@ rollup@0.47.4:
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e"
 
 rxjs@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1"
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.0.0-beta.3:
-  version "6.0.0-tactical-rc.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-tactical-rc.1.tgz#1fe1f1204132d1c71c72f249a487f8e76a5ec1d5"
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-safe-buffer@^5.1.2:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
@@ -6018,7 +6057,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
@@ -6084,17 +6123,17 @@ selenium-webdriver@^2.53.2:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
-"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.1, semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
 semver@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.0.tgz#85f2cf8550465c4df000cf7d86f6b054106ab9e5"
 
-semver@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+semver@5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
 semver@~5.0.1:
   version "5.0.3"
@@ -6215,8 +6254,8 @@ shell-quote@1.6.1:
     jsonify "~0.0.0"
 
 shelljs@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1"
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -6302,8 +6341,8 @@ sntp@1.x.x:
     hoek "2.x.x"
 
 sntp@2.x.x:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.0.2.tgz#5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
   dependencies:
     hoek "4.x.x"
 
@@ -6374,10 +6413,11 @@ source-list-map@~0.1.7:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
 source-map-resolve@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.0.tgz#fcad0b64b70afb27699e425950cb5ebcd410bc20"
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
   dependencies:
-    atob "^2.0.0"
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
     urix "^0.1.0"
@@ -6395,15 +6435,20 @@ source-map-support@0.4.3:
     source-map "^0.5.3"
 
 source-map-support@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
   dependencies:
+    buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
+source-map@*:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+
 source-map@0.1.31:
   version "0.1.31"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.31.tgz#9f704d0d69d9e138a81badf6ebb4fde33d151c61"
@@ -6425,8 +6470,8 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
 sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
 
 spawn-sync@1.0.15:
   version "1.0.15"
@@ -6435,19 +6480,27 @@ spawn-sync@1.0.15:
     concat-stream "^1.4.7"
     os-shim "^0.1.2"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -6456,8 +6509,8 @@ split-string@^3.0.1, split-string@^3.0.2:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
   dependencies:
     through2 "^2.0.2"
 
@@ -6478,13 +6531,14 @@ sprintf-js@^1.0.3:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
     dashdash "^1.12.0"
     getpass "^0.1.1"
+    safer-buffer "^2.0.2"
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
@@ -6498,11 +6552,7 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-statuses@1, statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-
-"statuses@>= 1.4.0 < 2":
+statuses@1, "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
@@ -6510,6 +6560,10 @@ statuses@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28"
 
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
 stream-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-1.0.0.tgz#bf9b4abfb42b274d751479e44e0ff2656b6f1193"
@@ -6531,8 +6585,8 @@ stream-combiner@~0.0.4:
     duplexer "~0.1.1"
 
 stream-consume@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
 
 stream-counter@~0.2.0:
   version "0.2.0"
@@ -6567,7 +6621,7 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
@@ -6575,31 +6629,17 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0:
+"string-width@^1.0.2 || 2", string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.trim@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.0"
-    function-bind "^1.0.2"
-
 string_decoder@~0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -6607,8 +6647,8 @@ string_decoder@~1.1.1:
     safe-buffer "~5.1.0"
 
 stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -6678,27 +6718,9 @@ tapable@^0.1.8, tapable@~0.1.8:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
 
-tape@^4.6.3:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-4.8.0.tgz#f6a9fec41cc50a1de50fa33603ab580991f6068e"
-  dependencies:
-    deep-equal "~1.0.1"
-    defined "~1.0.0"
-    for-each "~0.3.2"
-    function-bind "~1.1.0"
-    glob "~7.1.2"
-    has "~1.0.1"
-    inherits "~2.0.3"
-    minimist "~1.2.0"
-    object-inspect "~1.3.0"
-    resolve "~1.4.0"
-    resumer "~0.0.0"
-    string.prototype.trim "~1.1.2"
-    through "~2.3.8"
-
 tar-pack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
   dependencies:
     debug "^2.2.0"
     fstream "^1.0.10"
@@ -6710,12 +6732,15 @@ tar-pack@^3.4.0:
     uid-number "^0.0.6"
 
 tar-stream@^1.5.0:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
   dependencies:
     bl "^1.0.0"
+    buffer-alloc "^1.1.0"
     end-of-stream "^1.0.0"
-    readable-stream "^2.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.0"
     xtend "^4.0.0"
 
 tar@^2.2.1:
@@ -6743,8 +6768,8 @@ temp@~0.4.0:
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.4.0.tgz#671ad63d57be0fe9d7294664b3fc400636678a60"
 
 text-extensions@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.6.0.tgz#771561b26022783a45f5b6c2e78ad6e7de9fe322"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
 
 thenify-all@^1.0.0:
   version "1.6.0"
@@ -6776,7 +6801,7 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@~2.3, through@~2.3.1, through@~2.3.4, through@~2.3.8:
+through@2, "through@>=2.2.7 <3", through@~2.3, through@~2.3.1, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -6801,8 +6826,8 @@ timers-browserify@^1.0.1:
     process "~0.11.0"
 
 timers-ext@0.1, timers-ext@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.2.tgz#61cc47a76c1abd3195f14527f978d58ae94c5204"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.5.tgz#77147dd4e76b660c2abb8785db96574cbbd12922"
   dependencies:
     es5-ext "~0.10.14"
     next-tick "1"
@@ -6848,6 +6873,10 @@ to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
 
+to-buffer@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -6882,13 +6911,7 @@ touch@0.0.3:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@~2.3.0, tough-cookie@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
-  dependencies:
-    punycode "^1.4.1"
-
-tough-cookie@~2.3.3:
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
@@ -6906,6 +6929,10 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
@@ -6920,13 +6947,9 @@ tsickle@0.32:
     source-map "^0.6.0"
     source-map-support "^0.5.0"
 
-tslib@^1.0.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
-
-tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+tslib@^1.0.0, tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
 tslint-eslint-rules@4.1.1:
   version "4.1.1"
@@ -6980,10 +7003,10 @@ tsutils@^1.4.0:
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
 
 tsutils@^2.8.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.2.tgz#2c1486ba431260845b0ac6f902afd9d708a8ea6a"
+  version "2.27.2"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
@@ -7009,14 +7032,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.10, type-is@~1.6.6:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.15"
-
-type-is@~1.6.16:
+type-is@~1.6.10, type-is@~1.6.16, type-is@~1.6.6:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
   dependencies:
@@ -7031,9 +7047,9 @@ typescript@2.9.x:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
 
-typescript@~2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+"typescript@>=2.6.2 <2.8":
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
 
 uglify-es@^3.3.9:
   version "3.3.9"
@@ -7100,7 +7116,7 @@ ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
 
-unc-path-regex@^0.1.0:
+unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
@@ -7112,8 +7128,8 @@ underscore.string@3.3.4:
     util-deprecate "^1.0.2"
 
 underscore@1.x:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
 
 underscore@~1.7.0:
   version "1.7.0"
@@ -7146,8 +7162,8 @@ universal-analytics@0.4.15:
     uuid "^3.0.0"
 
 universalify@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
@@ -7175,6 +7191,12 @@ upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
+uri-js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+  dependencies:
+    punycode "^2.1.0"
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -7207,12 +7229,18 @@ util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@~0.10.3:
+util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
     inherits "2.0.1"
 
+util@~0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  dependencies:
+    inherits "2.0.3"
+
 utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
@@ -7222,8 +7250,8 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
 
 uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
 uws@~9.14.0:
   version "9.14.0"
@@ -7236,19 +7264,19 @@ v8flags@^2.0.2:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 vargs@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
 
-vary@^1, vary@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
+vary@^1, vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
 vary@~1.0.1:
   version "1.0.1"
@@ -7294,10 +7322,14 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vlq@0.2.2, vlq@^0.2.1:
+vlq@0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
 
+vlq@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -7351,17 +7383,17 @@ webdriver-js-extender@^1.0.0:
     selenium-webdriver "^2.53.2"
 
 webdriver-manager@^12.0.6:
-  version "12.0.6"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.0.6.tgz#3df1a481977010b4cbf8c9d85c7a577828c0e70b"
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
   dependencies:
-    adm-zip "^0.4.7"
+    adm-zip "^0.4.9"
     chalk "^1.1.1"
     del "^2.2.0"
     glob "^7.0.3"
     ini "^1.3.4"
     minimist "^1.2.0"
     q "^1.4.1"
-    request "^2.78.0"
+    request "^2.87.0"
     rimraf "^2.5.2"
     semver "^5.3.0"
     xml2js "^0.4.17"
@@ -7401,8 +7433,8 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.2.tgz#0e18781de629a18308ce1481650f67ffa2693a5d"
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
 
 when@3.7.2:
   version "3.7.2"
@@ -7427,23 +7459,17 @@ which@1.2.4:
     is-absolute "^0.1.7"
     isexe "^1.1.1"
 
-which@^1.2.1:
+which@^1.2.1, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
     isexe "^2.0.0"
 
-which@^1.2.12, which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  dependencies:
-    isexe "^2.0.0"
-
 wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   dependencies:
-    string-width "^1.0.2"
+    string-width "^1.0.2 || 2"
 
 window-size@0.1.0:
   version "0.1.0"
@@ -7485,8 +7511,8 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
 ws@^1.0.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"
   dependencies:
     options ">=0.0.5"
     ultron "1.0.x"
@@ -7524,9 +7550,9 @@ xml2js@^0.4.17, xml2js@~0.4.4:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
-xmlbuilder@>=1.0.0, xmlbuilder@~9.0.1:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f"
+xmlbuilder@>=1.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55"
 
 xmlbuilder@^4.1.0:
   version "4.2.1"
@@ -7534,6 +7560,10 @@ xmlbuilder@^4.1.0:
   dependencies:
     lodash "^4.0.0"
 
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+
 xmldom@^0.1.27:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"

From dd44f63c73a30e3bf2d1223579f2239fa34bc726 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 13 Jul 2018 17:27:36 -0700
Subject: [PATCH 580/582] build(bazel): show bazel progress in CircleCI to
 prevent 10m timeout with no output (#24663)

PR Close #24663
---
 .circleci/bazel.rc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/bazel.rc b/.circleci/bazel.rc
index dc31222442..b63cdfecbd 100644
--- a/.circleci/bazel.rc
+++ b/.circleci/bazel.rc
@@ -3,7 +3,10 @@
 # See remote cache documentation in /docs/BAZEL.md
 
 # Don't be spammy in the logs
-build --noshow_progress
+# TODO(gmagolan): Hide progress again once build performance improves
+# Presently, CircleCI can timeout during bazel test ... with the following
+# error: Too long with no output (exceeded 10m0s)
+# build --noshow_progress
 
 # Don't run manual tests
 test --test_tag_filters=-manual

From e265ccd82c509c93000a0363e0b6f69cc2f31ea1 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 23 Jul 2018 11:39:51 -0700
Subject: [PATCH 581/582] build(bazel): add comment for patch-types work-around
 (#24663)

PR Close #24663
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e40acbb2b4..2f3bcb8861 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "buildifier": "find . -type f \\( -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/*/buildifier",
     "preinstall": "node tools/yarn/check-yarn.js",
     "postinstall": "yarn update-webdriver && node ./tools/postinstall-patches.js && yarn patch-types",
+    "patch-types": "work-around for issue https://github.com/angular/angular/issues/25051",
     "patch-types": "mkdir -p node_modules/@types/zone.js && cp -f node_modules/zone.js/dist/zone.js.d.ts node_modules/@types/zone.js/index.d.ts",
     "update-webdriver": "webdriver-manager update --gecko false $CHROMEDRIVER_VERSION_ARG",
     "check-env": "gulp check-env",

From 601064e41de55ed69749cfa9edae9503490dafb2 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Mon, 23 Jul 2018 12:46:30 -0700
Subject: [PATCH 582/582] build(bazel): add comment about angular bazel rules
 API re-export from /index.bzl (#24663)

PR Close #24663
---
 index.bzl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/index.bzl b/index.bzl
index 5178b8ba4c..e0078cc901 100644
--- a/index.bzl
+++ b/index.bzl
@@ -3,6 +3,13 @@
 # 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
 """ Public API surface is re-exported here.
+
+This API is exported for user's building angular from source in downstream
+projects. The rules from packages/bazel are re-exported here as well
+as the ng_setup_workspace repository rule needed when building angular
+from source downstream. Alternately, this API is available from the
+@angular/bazel npm package if the npm distribution of angular is
+used in a downstream project.
 """
 
 load("//packages/bazel:index.bzl",